Adding unit test for Luigi Pulcini's logical expression pull request

bylexus · Aug 24, 2024 · f50a02b · f50a02b
1 parent e1ae97a
commit f50a02b
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 9 deletions.
diff --git a/dist/fparser.d.ts b/dist/fparser.d.ts
@@ -203,7 +203,7 @@ export default class Formula {
      */
     buildExpressionTree(expressions: Expression[]): Expression;
     isOperator(char: string | null): false | RegExpMatchArray | null;
-    isOperatorExpr(expr: Expression): expr is PowerExpression | MultDivExpression | PlusMinusExpression | LogicalExpression;
+    isOperatorExpr(expr: Expression): boolean;
     registerVariable(varName: string): void;
     getVariables(): string[];
     /**

diff --git a/dist/fparser.js b/dist/fparser.js
diff --git a/dist/fparser.js.map b/dist/fparser.js.map
diff --git a/dist/fparser.umd.cjs b/dist/fparser.umd.cjs
diff --git a/dist/fparser.umd.cjs.map b/dist/fparser.umd.cjs.map
diff --git a/spec/specs/exprTreeSpec.js b/spec/specs/exprTreeSpec.js
@@ -60,6 +60,38 @@ describe('Expression Tree tests', function () {
             );
         });
 
+        it('evaluates the order of logical expressions correct', () => {
+            // logical operators should have the lowest precedence.
+            // 3+2>1*4<2^3 should be evaulated as:
+            // ( 3+2 )>( 1*4 )<( 2^3 )
+            //    (5   >   4) < 8
+            //        1       < 8
+            // which evaulates to 1
+            const formulaStr = '3+2>1*4<2^3';
+            const f = new Fparser();
+            let ret = f.parse(formulaStr);
+            expect(ret).toEqual(
+                new Fparser.LogicalExpression(
+                    '<',
+                    new Fparser.LogicalExpression(
+                        '>',
+                        new Fparser.PlusMinusExpression(
+                            '+',
+                            new Fparser.ValueExpression(3),
+                            new Fparser.ValueExpression(2)
+                        ),
+                        new Fparser.MultDivExpression(
+                            '*',
+                            new Fparser.ValueExpression(1),
+                            new Fparser.ValueExpression(4)
+                        )
+                    ),
+                    new Fparser.PowerExpression(new Fparser.ValueExpression(2), new Fparser.ValueExpression(3))
+                )
+            );
+            expect(ret.evaluate()).toBe(1);
+        });
+
         it('parses parentheses correctly', () => {
             const formulaStr = '2*(3+4)/4x*(3-y)';
             const f = new Fparser();