Merge pull request #91 from phalcon/development

sergeyklay · web-flow · commit 3cdd0eb17e2e · 2020-04-04T17:19:42.000+03:00
1.3.4
diff --git a/.dir-locals.el b/.dir-locals.el
@@ -0,0 +1,7 @@
+;;; Directory Local Variables
+;; For more information see (info "(emacs) Directory Variables")
+
+((nil . ((fill-column . 78)))
+ (c-mode . ((c-file-style . "k&r")
+            (tab-width . 4)
+            (c-basic-offset . 4))))
diff --git a/.github/issue_template/bug_report.md b/.github/issue_template/bug_report.md
diff --git a/.github/issue_template/feature_request.md b/.github/issue_template/feature_request.md
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,8 +8,8 @@ on:
       - '*.md'
   pull_request:
     branches:
-      - 'master'
-      - 'development'
+      - master
+      - development
   schedule:
     - cron: '0 11 * * *'
 
@@ -21,23 +21,24 @@ jobs:
       matrix:
         re2c:
           - '0.13.6'
-          - '1.2.1'
+          - '1.3'
         php:
           - '7.0'
           - '7.1'
           - '7.3'
           - '7.4'
         name:
-          - 'Ubuntu'
-          - 'macOS X'
+          - Ubuntu
+          - macOS
 
         include:
-          - name: 'Ubuntu'
+          - name: Ubuntu
             os: ubuntu-latest
             ccov: ON
-          - name: 'macOS X'
-            os: macOS-latest
-            ccov: ON
+
+          - name: macOS
+            os: macos-latest
+            ccov: OFF
 
     name: "${{ matrix.name }}: PHP ${{ matrix.php }}, re2c ${{ matrix.re2c }}"
     runs-on: ${{ matrix.os }}
@@ -47,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
@@ -64,7 +65,7 @@ jobs:
           sudo apt-get install --no-install-recommends --quiet --yes lcov gdb
 
       - name: Setup Prerequisites (macOS)
-        if: runner.os == 'macOS'
+        if: runner.os == 'macOS' && matrix.ccov == 'ON'
         run: |
           brew install lcov
           sudo xcode-select -switch /Applications/Xcode.app
@@ -87,17 +88,23 @@ jobs:
         run: echo '/tmp/core.%e.%p.%t' | sudo tee /proc/sys/kernel/core_pattern
 
       - name: Install re2c ${{ matrix.re2c }}
-        if: runner.os != 'Windows'
         run: .ci/install-re2c.sh
 
-      - name: Build extensions (Linux)
-        if: runner.os != 'Windows'
+      - name: Build extensions
         run: |
           phpize
-          ./configure \
-            --enable-zephir-parser \
-            --enable-zephir-parser-debug \
-            --enable-coverage
+
+          if [ "${{ matrix.ccov}}" = "ON" ]; then
+            ./configure \
+              --enable-zephir-parser \
+              --enable-zephir-parser-debug \
+              --enable-coverage
+          else
+            ./configure \
+              --enable-zephir-parser \
+              --enable-zephir-parser-debug
+          fi
+
           make -j$(getconf _NPROCESSORS_ONLN)
 
       - name: Preparing to collect coverage data
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,14 +5,19 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+## [1.3.4] - 2020-04-04
+### 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
 
 ## [1.3.2] - 2019-09-30
 ### Changed
 - Files `parser.c` and `scanner.c` no longer distributed.
-  Package maintainer should re-generate they by himself.
+  Package maintainer should re-generate they by himself
   [#75](https://github.com/phalcon/php-zephir-parser/pull/75)
 
 ### Fixed
@@ -30,7 +35,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [1.3.0] - 2019-04-27
 ### Added
 - Added support for "use" keyword in closures
-  [phalcon/zephir#1848](https://github.com/phalcon/zephir/issues/1848)
+  [phalcon/zephir#1848](https://github.com/phalcon/zephir/issues/1848),
   [phalcon/zephir#888](https://github.com/phalcon/zephir/issues/888)
 
 ### Fixed
@@ -146,7 +151,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
  - Initial stable release
 
-[Unreleased]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.3...HEAD
+[Unreleased]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.4...HEAD
+[1.3.4]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.3...v1.3.4
 [1.3.3]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.2...v1.3.3
 [1.3.2]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.1...v1.3.2
 [1.3.1]: https://github.com/phalcon/php-zephir-parser/compare/v1.3.0...v1.3.1
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.3.3
+1.3.4
diff --git a/parser/zephir.lemon b/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 .
diff --git a/tests/operators/bug89.phpt b/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)
+  }
+}
diff --git a/zephir_parser.h b/zephir_parser.h
@@ -15,7 +15,7 @@ extern zend_module_entry zephir_parser_module_entry;
 #define phpext_zephir_parser_ptr &zephir_parser_module_entry
 
 #define PHP_ZEPHIR_PARSER_NAME "Zephir Parser"
-#define PHP_ZEPHIR_PARSER_VERSION "1.3.3"
+#define PHP_ZEPHIR_PARSER_VERSION "1.3.4"
 #define PHP_ZEPHIR_PARSER_AUTHOR "Zephir Team and contributors"
 #define PHP_ZEPHIR_PARSER_DESCRIPTION "The Zephir Parser delivered as a C extension for the PHP language."
 
