fix bug

optimistex · Oct 24, 2016 · f70f1ac · f70f1ac
1 parent 36b6986
commit f70f1ac
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/Expression.lib.php b/Expression.lib.php
@@ -195,8 +195,13 @@ function nfx($expr)
         $ops_r = array('+' => 0, '-' => 0, '*' => 0, '/' => 0, '%' => 0, '^' => 1, '>' => 0,
             '<' => 0, '>=' => 0, '<=' => 0, '==' => 0, '!=' => 0, '=~' => 0,
             '&&' => 0, '||' => 0, '!' => 0); // right-associative operator?
-        $ops_p = array('+' => 4, '-' => 4, '*' => 4, '/' => 4, '_' => 4, '%' => 4, '^' => 5, '>' => 2, '<' => 2,
-            '>=' => 2, '<=' => 2, '==' => 2, '!=' => 2, '=~' => 2, '&&' => 1, '||' => 1, '!' => 5); // operator precedence
+        $ops_p = array(
+            '&&' => 1, '||' => 1,
+            '>' => 2, '<' => 2, '>=' => 2, '<=' => 2, '==' => 2, '!=' => 2, '=~' => 2,
+            '+' => 3, '-' => 3,
+            '*' => 4, '/' => 4, '_' => 4, '%' => 4,
+            '^' => 5, '!' => 5,
+        ); // operator precedence
 
         $expecting_op = false; // we use this in syntax-checking the expression
         // and determining when a - is a negation

diff --git a/tests/Expression.php b/tests/Expression.php
@@ -269,6 +269,22 @@ public function testCustomClosures()
         }
     }
 
+    public function testPriorityOperands()
+    {
+        $data = [
+            '2+2*2' => 6,
+            '2-2+2*2+2/2*-1+2' => 5,
+            '2+1 > 2+2' => false,
+            '2+1 < 2+2' => true,
+            '2+2*2-2/2 >= 2*2+-2/2*2' => true,
+        ];
+
+        $expr = new Expression();
+        foreach ($data as $formula => $result) {
+            $this->assertEquals($expr->evaluate($formula), $result);
+        }
+    }
+
     // -------------------------------------------------------------------------
     public function testBug_1()
     {