Release v1.1.1 [win build]

1.1.1

Author: sergeyklay

.appveyor.yml

@@ -1,5 +1,4 @@
-# --
-version: 1.1.0-{build}
+version: 1.1.1-{build}
 
 build: false
 environment:
@@ -187,6 +186,7 @@ build_script:
     - cp %APPVEYOR_BUILD_FOLDER%\CONTRIBUTING.md .\
     - cp %APPVEYOR_BUILD_FOLDER%\README.md .\
     - cp %APPVEYOR_BUILD_FOLDER%\README.WIN32-BUILD-SYSTEM .\
+    - cp %APPVEYOR_BUILD_FOLDER%\NO_WARRANTY .\
 
 after_build:
     # ==================================================

.gitignore

@@ -43,7 +43,12 @@ tests/*/*.exp
 tests/*/*.log
 tests/*/*.sh
 
+# Tests
 php_test_results_*
+*.out
+*.exp
+*.diff
+*.php
 
 # Parser files
 parser/lemon

.travis.yml

@@ -8,6 +8,7 @@ php:
     - 5.6
     - 7.0
     - 7.1
+    - 7.2
 
 git:
     depth: 1
@@ -21,43 +22,63 @@ env:
         - CFLAGS="-g3 -O0 -Wall -fvisibility=hidden"
         - ZEND_DONT_UNLOAD_MODULES=1
         - USE_ZEND_ALLOC=0
+        - REPORT_EXIT_STATUS=1
     matrix:
-        - CC="gcc"
-        - CC="clang"
+        # Minimal re2c version
+        - CC="gcc" RE2C_VERSION="0.13.6"
+        - CC="clang" RE2C_VERSION="0.13.6"
+        # Latest stable re2c version
+        - CC="gcc" RE2C_VERSION="1.0.3"
+        - CC="clang" RE2C_VERSION="1.0.3"
 
 matrix:
     fast_finish: true
     allow_failures:
-        - php: nightly
-    include:
+        - php: 7.2
+    exclude:
         - env: CC="gcc"
-          php: nightly
-          compiler: gcc
-        - env: CC="clang"
-          php: nightly
           compiler: clang
+        - env: CC="clang"
+          compiler: gcc
 
 cache:
     apt: true
-    timeout: 691200
+    ccache: true
+    timeout: 604800
+    directories:
+        - $HOME/.ccache
+        - $HOME/.local/opt/re2c
+        - $HOME/.cache/re2c
 
 install:
     - phpenv config-rm xdebug.ini || true
-    - bash ./install-development
+    - bash ./install-re2c $RE2C_VERSION
+    - bash ./install-development --phpize $(phpenv which phpize) --php-config $(phpenv which php-config)
 
 script:
-    - valgrind --read-var-info=yes --error-exitcode=1 --fullpath-after= --track-origins=yes --leak-check=full --num-callers=20 --suppressions=$(pwd)/tests/zephir_parser.3.7.0.sup $(phpenv which php) -d variables_order=EGPCS run-tests.php -p $(which php) -d extension=$(pwd)/modules/zephir_parser.so -d variables_order=EGPCS -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --set-timeout 120
-
-notifications:
-    email:
-        recipients:
-            - [email protected]
-        on_success: change
-        on_failure: always
+    - |
+        valgrind \
+            --read-var-info=yes \
+            --error-exitcode=1 \
+            --fullpath-after= \
+            --track-origins=yes \
+            --leak-check=full \
+            --num-callers=20 \
+            --run-libc-freeres=no \
+            --suppressions=$(pwd)/tests/php-leaks.supp \
+            $(phpenv which php) \
+                -d variables_order=EGPCS \
+                run-tests.php \
+                -p $(which php) \
+                -d extension=$(pwd)/modules/zephir_parser.so \
+                -d variables_order=EGPCS \
+                -g "FAIL,XFAIL,BORK,WARN,SKIP" \
+                --offline \
+                --show-diff \
+                --set-timeout 120
 
 addons:
     apt:
         packages:
-            - re2c
             - valgrind
             - gdb

CHANGELOG.md

@@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [1.1.1] - 2017-11-09
+### Changed
+- Improved install scripts
+- Refactored tests
+- Added re2c check to install script
+
+### Fixed
+- Fixed `mod-assign` operator recognition
+- Fixed issue with incorrectly used `YYMARKER` and `YYCURSOR` [#31](https://github.com/phalcon/php-zephir-parser/issues/31),
+[phalcon/zephir#1591](https://github.com/phalcon/zephir/issues/1591), [phalcon/cphalcon#13140](https://github.com/phalcon/cphalcon/issues/13140)
+- Improved scanner by removing reundant rules
+
 ## [1.1.0] - 2017-10-12
 ### Added
 - Added support syntax assign-bitwise operators [#14](https://github.com/phalcon/php-zephir-parser/issues/14),
@@ -57,7 +69,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.1.0...HEAD
+[Unreleased]: https://github.com/phalcon/php-zephir-parser/compare/v1.1.1...HEAD
+[1.1.1]: https://github.com/phalcon/php-zephir-parser/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/phalcon/php-zephir-parser/compare/v1.0.3...v1.1.0
 [1.0.3]: https://github.com/phalcon/php-zephir-parser/compare/v1.0.2...v1.0.3
 [1.0.2]: https://github.com/phalcon/php-zephir-parser/compare/v1.0.1...v1.0.2

NO_WARRANTY

@@ -0,0 +1,2 @@
+Zephir Parser is distributed with no warranty whatever.  The authors and any
+other contributors take no responsibility for the consequences of its use.

README.md

@@ -7,8 +7,9 @@ The Zephir Parser delivered as a C extension for the PHP language.
 
 Supported PHP versions: **5.5**, **5.6**, **7.0**, **7.1**, **7.2**
 
-**NOTE:** The `development` branch will always contain the latest **unstable** version.
-If you wish to check older versions or formal, tagged release, please switch to the relevant
+**NOTE:** The [`development`](https://github.com/phalcon/php-zephir-parser/tree/development)
+branch will always contain the latest **unstable** version. If you wish to check older versions
+or formal, tagged release, please switch to the relevant
 [branch](https://github.com/phalcon/php-zephir-parser/branches)/[tag](https://github.com/phalcon/php-zephir-parser/tags).
 
 ## Get Started
@@ -38,7 +39,7 @@ Prerequisite packages are:
 
 * OS: Linux || Solaris || FreeBSD || macOS || Windows
 * Compiller: `g++` >= 4.4 || `clang++` >= 3.x || `vc++` >= 11
-* [`re2c`](http://re2c.org/) >= 0.13
+* [`re2c`](http://re2c.org/) >= 0.13.6
 
 #### Ubuntu
 

TODO

@@ -0,0 +1 @@
+TODO

VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

ide/zephir_parser.php

@@ -1,24 +1,25 @@
 <?php
 
 /*
- +--------------------------------------------------------------------------+
- | Zephir Parser                                                            |
- +--------------------------------------------------------------------------+
- | Copyright (c) 2013-2017 Zephir Team and contributors                     |
- +--------------------------------------------------------------------------+
- | This source file is subject the MIT license, that is bundled with        |
- | this package in the file LICENSE, and is available through the           |
- | world-wide-web at the following url:                                     |
- | https://zephir-lang.com/license.html                                     |
- |                                                                          |
- | If you did not receive a copy of the MIT license and are unable          |
- | to obtain it through the world-wide-web, please send a note to           |
- | [email protected] so we can mail you a copy immediately.           |
- +--------------------------------------------------------------------------+
+  +--------------------------------------------------------------------------+
+  | Zephir Parser                                                            |
+  | Copyright (c) 2013-present Zephir Team (https://zephir-lang.com/)        |
+  |                                                                          |
+  | This source file is subject the MIT license, that is bundled with this   |
+  | package in the file LICENSE, and is available through the world-wide-web |
+  | at the following url: http://zephir-lang.com/license.html                |
+  +--------------------------------------------------------------------------+
 */
 
 /**
- * Parses a file and returning an intermediate array representation.
+ * Parses a file and returning an intermediate representation.
+ *
+ * Example:
+ * <code>
+ * function parse_file(string $file_path): array {
+ *     return zephir_parse_file(file_get_contents($file_path), $file_path);
+ * }
+ * </code>
  *
  * @param string $content
  * @param string $filepath

install

@@ -6,55 +6,72 @@
 # This source file is subject the MIT license, that is bundled with this
 # package in the file LICENSE, and is available through the world-wide-web
 # at the following url: http://zephir-lang.com/license.html
-
-#  Available params:
-#  --phpize
-#  --php-config
 #
-#  Example:
-#  ./install --phpize /usr/bin/phpize5.6 --php-config /usr/bin/php-config5.6
-
-set -e
+#  Available options:
+#  --phpize <PATH>        Path to custom `phpize' executable
+#  --php-config <PATH>    Path to custom `php-config' executable
+#
+#  Available env. vars:
+#  RE2C_BIN               Path to custom `re2c'
+#
+#  Usage:
+#
+#  Build and install extension using default PHP's paths:
+#  ./install-development
+#
+#  Build and install extension using custom PHP's paths:
+#  ./install-development --phpize /usr/bin/phpize5.6 --php-config /usr/bin/php-config5.6
 
 CURRENT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
-GCC_BIN=$(command -v gcc 2>/dev/null)
-RE2C_BIN=${RE2C_BIN:-$(command -v re2c 2>/dev/null)}
+GCC_BIN=`command -v gcc 2>/dev/null || true`
+RE2C_BIN=${RE2C_BIN:-`command -v re2c 2>/dev/null || true`}
 
 if [ x"$RE2C_BIN" = x ]; then
-  echo -e "error: unable to locate the re2c"
-  exit 1
+	echo -e "error: unable to locate the re2c"
+	exit 1
 fi
 
 if [ x"$GCC_BIN" = x ]; then
 	echo -e "error: unable to locate the gcc"
 	exit 1
 fi
 
+re2c_vernum=`re2c --vernum 2>/dev/null`
+if test -z "$re2c_vernum"; then
+	echo "error: unable to locate the re2c"
+	exit 1
+fi
+
+if test "$re2c_vernum" -lt "1306"; then
+	echo "error: minimal required version of re2c is 0.13.6"
+	exit 1
+fi
+
 # Check best compilation flags for compiler
 export CC=gcc
 export CFLAGS="-march=native -mtune=native -O2 -fomit-frame-pointer"
 
 # Set defaults
-PHPIZE_BIN=$(command -v phpize 2>/dev/null)
-PHPCONFIG_BIN=$(command -v php-config 2>/dev/null)
+PHPIZE_BIN=`command -v phpize 2>/dev/null || true`
+PHPCONFIG_BIN=`command -v php-config 2>/dev/null || true`
 
 # Translate long options to short
 for arg in "$@"; do
-  shift
-  case "$arg" in
-    "--phpize") set -- "$@" "-i" ;;
-    "--php-config") set -- "$@" "-c" ;;
-    *) set -- "$@" "$arg"
-  esac
+	shift
+	case "$arg" in
+		"--phpize") set -- "$@" "-i" ;;
+		"--php-config") set -- "$@" "-c" ;;
+		*) set -- "$@" "$arg"
+	esac
 done
 
 # Options switcher
 while getopts i:c: opts; do
-   case ${opts} in
-      i) PHPIZE_BIN=${OPTARG} ;;
-      c) PHPCONFIG_BIN=${OPTARG} ;;
-   esac
+	case ${opts} in
+		i) PHPIZE_BIN=${OPTARG} ;;
+		c) PHPCONFIG_BIN=${OPTARG} ;;
+	esac
 done
 
 PHP_FULL_VERSION=`${PHPCONFIG_BIN} --version`
@@ -113,7 +130,7 @@ rm -f \
 	parser.php7.out \
 	config.h.in~
 
-${RE2C_BIN} -o scanner.c scanner.re
+${RE2C_BIN} --no-generation-date -o scanner.c scanner.re
 
 # Compile lemon
 ${CC} lemon.c -o lemon
@@ -147,7 +164,6 @@ if [ -f Makefile ]; then
 	${PHPIZE_BIN} --clean
 fi
 
-# Perform the compilation
 ${PHPIZE_BIN}
 
 # For some reason the libtool script being generated by autogen contains lines referring
@@ -156,18 +172,22 @@ export echo=echo
 
 # Detect Gentoo Linux
 if [ -f /etc/gentoo-release ]; then
-    LIBTOOLIZE_BIN=$(command -v libtoolize 2>/dev/null)
-    aclocal && ${LIBTOOLIZE_BIN} --force && autoheader && autoconf
+	LIBTOOLIZE_BIN=`command -v libtoolize 2>/dev/null || true`
+	aclocal && ${LIBTOOLIZE_BIN} --force && autoheader && autoconf
 fi
 
 # Detect macOS
 if [ "$(uname -s 2>/dev/null)" = "Darwin" ]; then
-    LIBTOOLIZE_BIN=$(command -v glibtoolize 2>/dev/null)
-    aclocal && ${LIBTOOLIZE_BIN} --force && autoheader && autoconf
+	LIBTOOLIZE_BIN=`command -v glibtoolize 2>/dev/null || true`
+	aclocal && ${LIBTOOLIZE_BIN} --force && autoheader && autoconf
 fi
 
-./configure --silent --with-php-config=${PHPCONFIG_BIN} --enable-zephir_parser
+./configure \
+	--silent \
+	--with-php-config=${PHPCONFIG_BIN} \
+	--enable-zephir_parser
 
+# Perform the compilation
 make -s -j"$(getconf _NPROCESSORS_ONLN)"
 make -s install
 
@@ -195,4 +215,3 @@ rm -f \
 	config.h.in~
 
 echo -e "\nThanks for compiling Zephir Parser!\nBuild succeed: Please restart your web server to complete the installation\n"
-