Merge pull request #90 from phalcon/fix/fixed-operators-precedence

Fixed operator precedence

Author: sergeyklay

.github/workflows/main.yml

@@ -8,8 +8,8 @@ on:
       - '*.md'
   pull_request:
     branches:
-      - 'master'
-      - 'development'
+      - master
+      - development
   schedule:
     - cron: '0 11 * * *'
 
@@ -21,7 +21,7 @@ jobs:
       matrix:
         re2c:
           - '0.13.6'
-          - '1.2.1'
+          - '1.3'
         php:
           - '7.0'
           - '7.1'
@@ -48,12 +48,12 @@ jobs:
       USE_ZEND_ALLOC: 0
 
     steps:
-      - uses: actions/checkout@v2-beta
+      - uses: actions/checkout@v2
         with:
           fetch-depth: 5
 
       - name: Install PHP ${{ matrix.php }}
-        uses: shivammathur/setup-php@v1
+        uses: shivammathur/setup-php@v2
         with:
           php-version: '${{ matrix.php }}'
           coverage: none

CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Fixed
+- Fixed operator precedence
+  [#89](https://github.com/phalcon/php-zephir-parser/issues/89)
+
 ## [1.3.3] - 2019-12-10
 ### Added
 - Added PHP 7.4 support

parser/zephir.lemon

@@ -31,7 +31,7 @@
 %name xx_
 
 // Define operator precedence early so that this is the first occurrence
-// of the operator tokens in the grammer.  Keeping the operators together
+// of the operator tokens in the grammar.  Keeping the operators together
 // causes them to be assigned integer values that are close together,
 // which keeps parser tables smaller.
 //
@@ -46,8 +46,12 @@
 %left OR .
 %left AND .
 %left INSTANCEOF .
-%left BITWISE_OR BITWISE_XOR BITWISE_SHIFTLEFT BITWISE_SHIFTRIGHT .
-%left EQUALS IDENTICAL LESS GREATER LESSEQUAL GREATEREQUAL NOTIDENTICAL NOTEQUALS .
+%left BITWISE_OR .
+%left BITWISE_XOR .
+%left BITWISE_AND .
+%left EQUALS IDENTICAL NOTIDENTICAL NOTEQUALS .
+%left LESS GREATER LESSEQUAL GREATEREQUAL .
+%left BITWISE_SHIFTLEFT BITWISE_SHIFTRIGHT .
 %left ADD SUB CONCAT .
 %left MUL DIV MOD .
 %right ISSET FETCH EMPTY .
@@ -57,7 +61,6 @@
 %right NEW .
 %right NOT .
 %right BITWISE_NOT .
-%left BITWISE_AND .
 %right PARENTHESES_CLOSE .
 %right SBRACKET_OPEN .
 %right ARROW .

tests/operators/bug89.phpt

@@ -0,0 +1,125 @@
+--TEST--
+Tests bitwise operators priority
+--SKIPIF--
+<?php include(__DIR__ . '/../skipif.inc'); ?>
+--FILE--
+<?php
+
+$code =<<<ZEP
+function test () {
+    let t = u & v << 7;
+}
+ZEP;
+
+var_dump(zephir_parse_file($code, '(eval code)'));
+
+?>
+--EXPECT--
+array(1) {
+  [0]=>
+  array(6) {
+    ["type"]=>
+    string(8) "function"
+    ["name"]=>
+    string(4) "test"
+    ["statements"]=>
+    array(1) {
+      [0]=>
+      array(5) {
+        ["type"]=>
+        string(3) "let"
+        ["assignments"]=>
+        array(1) {
+          [0]=>
+          array(7) {
+            ["assign-type"]=>
+            string(8) "variable"
+            ["operator"]=>
+            string(6) "assign"
+            ["variable"]=>
+            string(1) "t"
+            ["expr"]=>
+            array(6) {
+              ["type"]=>
+              string(11) "bitwise_and"
+              ["left"]=>
+              array(5) {
+                ["type"]=>
+                string(8) "variable"
+                ["value"]=>
+                string(1) "u"
+                ["file"]=>
+                string(11) "(eval code)"
+                ["line"]=>
+                int(2)
+                ["char"]=>
+                int(15)
+              }
+              ["right"]=>
+              array(6) {
+                ["type"]=>
+                string(17) "bitwise_shiftleft"
+                ["left"]=>
+                array(5) {
+                  ["type"]=>
+                  string(8) "variable"
+                  ["value"]=>
+                  string(1) "v"
+                  ["file"]=>
+                  string(11) "(eval code)"
+                  ["line"]=>
+                  int(2)
+                  ["char"]=>
+                  int(20)
+                }
+                ["right"]=>
+                array(5) {
+                  ["type"]=>
+                  string(3) "int"
+                  ["value"]=>
+                  string(1) "7"
+                  ["file"]=>
+                  string(11) "(eval code)"
+                  ["line"]=>
+                  int(2)
+                  ["char"]=>
+                  int(23)
+                }
+                ["file"]=>
+                string(11) "(eval code)"
+                ["line"]=>
+                int(2)
+                ["char"]=>
+                int(23)
+              }
+              ["file"]=>
+              string(11) "(eval code)"
+              ["line"]=>
+              int(2)
+              ["char"]=>
+              int(23)
+            }
+            ["file"]=>
+            string(11) "(eval code)"
+            ["line"]=>
+            int(2)
+            ["char"]=>
+            int(23)
+          }
+        }
+        ["file"]=>
+        string(11) "(eval code)"
+        ["line"]=>
+        int(3)
+        ["char"]=>
+        int(1)
+      }
+    }
+    ["file"]=>
+    string(11) "(eval code)"
+    ["line"]=>
+    int(1)
+    ["char"]=>
+    int(9)
+  }
+}