Merge pull request #8 from phalcon/development

1.0.2

Author: sergeyklay

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.0.1-{build}
+version: 1.0.2-{build}
 
 build: false
 environment:
@@ -47,6 +47,9 @@ matrix:
 clone_depth: 1
 clone_folder: c:\projects\parser
 
+only_commits:
+    message: /\[win build\]/
+
 branches:
     only:
         - master
@@ -55,6 +58,7 @@ init:
     - SET PATH=C:\Program Files (x86)\MSBuild\%PHP_VC%.0\Bin;C:\Program Files\OpenSSL;C:\php;C:\php-sdk\bin;C:\php-devpack;%PATH%
     - SET PATH=C:\Program Files (x86)\Microsoft Visual Studio %PHP_VC%.0\VC;C:\Program Files (x86)\Microsoft Visual Studio %PHP_VC%.0\VC\bin;%PATH%
     - SET ANSICON=121x90 (121x90)
+    - ps: IF ($env:APPVEYOR_REPO_BRANCH -eq "development") {$env:APPVEYOR_CACHE_SKIP_SAVE = "true"}
 
 os: Windows Server 2012 R2
 platform:
@@ -102,6 +106,11 @@ install:
         } Else {
             $env:PHP_DEPS_URL="http://windows.php.net/downloads/php-sdk/deps-${env:PHP_TARGET}-vc${env:PHP_VC}-${env:PLATFORM}.7z"
         }
+        If ($env:PHP_TYPE -Match "nts-Win32") {
+            $env:RELEASE_ZIPBALL="zephir_parser_${env:PLATFORM}_vc${env:PHP_VC}_php${env:PHP_TARGET}-nts_${env:APPVEYOR_BUILD_VERSION}"
+        } Else {
+            $env:RELEASE_ZIPBALL="zephir_parser_${env:PLATFORM}_vc${env:PHP_VC}_php${env:PHP_TARGET}_${env:APPVEYOR_BUILD_VERSION}"
+        }
     # ==================================================
     - echo Initializing Build
     # ==================================================
@@ -170,21 +179,21 @@ after_build:
     - echo Collect artifacts and zip
     # ==================================================
     - cd %APPVEYOR_BUILD_FOLDER%\package
-    - ps: 7z a zephir_parser_${env:PLATFORM}_vc${env:PHP_VC}_php${env:PHP_VERSION}_${env:APPVEYOR_BUILD_VERSION}.zip *.*
-    - ps: mv *.zip ${env:APPVEYOR_BUILD_FOLDER}\
+    - 7z a %RELEASE_ZIPBALL%.zip *.*
+    - mv %RELEASE_ZIPBALL%.zip %APPVEYOR_BUILD_FOLDER%\
 
 on_failure:
     - 'dir'
     - ps: >-
-        if (Test-Path -Path ${env:PHP_SRC}\compile-errors.log) {
+        If (Test-Path -Path ${env:PHP_SRC}\compile-errors.log) {
             type ${env:PHP_SRC}\compile-errors.log
         }
 
-        if (Test-Path -Path ${env:PHP_SRC}\compile.log) {
+        If (Test-Path -Path ${env:PHP_SRC}\compile.log) {
             type ${env:PHP_SRC}\compile.log
         }
 
-        if (Test-Path -Path ${env:PHP_SRC}\configure.js) {
+        If (Test-Path -Path ${env:PHP_SRC}\configure.js) {
             type ${env:PHP_SRC}\configure.js
         }
 
@@ -202,4 +211,3 @@ notifications:
         - [email protected]
       subject: "Build Zephir Parser [{{status}}]"
       on_build_status_changed: true
-

.github/ISSUE_TEMPLATE.md

@@ -17,10 +17,10 @@
 ```
 ### Details
 
-* Zephir Parser version: (`php --ri "Zephir Parser""`)
-* PHP Version: (`php -v`)
+* Zephir Parser version (`php --ri "Zephir Parser"`):
+* PHP Version (`php -v`):
 * Operating System:
 * Installation type: Compiling from source || installing via package manager
-* Compiller version (if any):
+* Compiler version (if any):
 * Zephir version (if any):
 * Other related info: 

.gitignore

@@ -13,17 +13,18 @@
 acinclude.m4
 aclocal.m4
 autom4te.cache
-build
+/build
 config.guess
 config.h
 config.h.in
+config.h.in~
 config.log
 config.nice
 config.status
 config.sub
 configure
 configure.in
-include
+/include
 install-sh
 libtool
 ltmain.sh
@@ -33,7 +34,7 @@ Makefile.global
 Makefile.objects
 missing
 mkinstalldirs
-modules
+/modules
 run-tests.php
 tests/*/*.diff
 tests/*/*.out
@@ -45,16 +46,14 @@ tests/*/*.sh
 # Parser files
 parser/lemon
 parser/scanner.c
-
 parser/parser.c
-
 parser/parser.php5.c
 parser/parser.php5.h
 parser/parser.php5.out
-
 parser/parser.php7.c
 parser/parser.php7.h
 parser/parser.php7.out
 
 vendor
 composer.lock
+phpunit.xml

.travis.yml

@@ -18,48 +18,50 @@ compiler:
 
 env:
     global:
-        - LD_LIBRARY_PATH="$TRAVIS_BUILD_DIR/build/lib":$LD_LIBRARY_PATH
-        - LIBRARY_PATH="$TRAVIS_BUILD_DIR/build/lib":$LIBRARY_PATH
-        - C_INCLUDE_PATH="$TRAVIS_BUILD_DIR/build/include"
+        - CFLAGS="-g3 -O0 -Wall -fvisibility=hidden"
+        - ZEND_DONT_UNLOAD_MODULES=1
+        - USE_ZEND_ALLOC=0
     matrix:
-        - CC="ccache gcc" CFLAGS="-g3 -O0 -fno-delete-null-pointer-checks -Wall -std=gnu90 -fvisibility=hidden"
-        - CC="ccache clang" CFLAGS="-g3 -O0 -fcolor-diagnostics -Wall -std=gnu90"
+        - CC="gcc"
+        - CC="clang"
 
 matrix:
     fast_finish: true
     allow_failures:
         - php: nightly
     include:
-        - env: CC="ccache gcc" CFLAGS="-g3 -O0 -fno-delete-null-pointer-checks -Wall -std=gnu90 -fvisibility=hidden"
+        - env: CC="gcc"
           php: nightly
           compiler: gcc
-        - env: CC="ccache clang" CFLAGS="-g3 -O0 -fcolor-diagnostics -Wall -std=gnu90"
+        - env: CC="clang"
           php: nightly
           compiler: clang
 
 cache:
     apt: true
-    ccache: true
     timeout: 691200
     directories:
         - vendor
-        - $HOME/.ccache
         - $HOME/.composer/cache
 
 install:
-    - bash ./tests/ci/install-travis
-    - composer --prefer-source install
+    - phpenv config-rm xdebug.ini || true
+    - bash ./unit-tests/ci/install-travis
+    - composer install --quiet --no-interaction --no-ansi --no-progress --optimize-autoloader --dev --prefer-dist --no-suggest --ignore-platform-reqs
 
 before_install:
     - if [[ ! -z "${GH_TOKEN}" ]]; then composer config github-oauth.github.com ${GH_TOKEN}; echo "Configured Github token"; fi;
 
 script:
     - php --ri "Zephir Parser"
-    - valgrind --read-var-info=yes --error-exitcode=1 --fullpath-after= --track-origins=yes --leak-check=full ./vendor/bin/phpunit -c phpunit.xml.dist --debug tests/
+    - valgrind --read-var-info=yes --error-exitcode=1 --fullpath-after= --track-origins=yes --leak-check=full --num-callers=20 --suppressions=unit-tests/ci/zephir_parser.3.7.0.sup $(phpenv which php) ./unit-tests/phpunit -c phpunit.xml.dist --debug unit-tests/
 
 notifications:
     email:
-        - [email protected]
+        recipients:
+            - [email protected]
+        on_success: change
+        on_failure: always
 
 addons:
     apt:

CHANGELOG.md

@@ -6,7 +6,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-## 1.0.1 - 2017-03-31
+## [1.0.2] - 2017-04-14
+### Added
+- Added an ability to use parentheses in for loops [#3](https://github.com/phalcon/php-zephir-parser/issues/3)
+
+### Changed
+- Improved install script to use specific optimizations for gcc and add ability to install on Gentoo and macOS
+
+### Fixed
+- Fixed parser memory leaks [#2](https://github.com/phalcon/php-zephir-parser/issues/2)
+
+## [1.0.1] - 2017-03-31
 ### Added
 - Added script to build development version (Linux)
 - Added ability to compile extension for PHP 7 (Windows)
@@ -22,6 +32,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Removing unused structures
 - Removing unused variables
 
-## 1.0.0 - 2017-03-26
+## [1.0.0] - 2017-03-26
 ### Added
  - Initial stable release

VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

composer.json

@@ -4,7 +4,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Zephir\\Parser\\Tests\\": "tests/Extension/"
+            "Zephir\\Parser\\Tests\\": "unit-tests/Extension/"
         }
     }
 }

install

@@ -14,32 +14,32 @@
 # [email protected] so we can mail you a copy immediately.
 
 #  Available params:
-#  --arch
 #  --phpize
 #  --php-config
 #
 #  Example:
 #  ./install --phpize /usr/bin/phpize5.6 --php-config /usr/bin/php-config5.6
 
+set -e
+
 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)}
 
 if [ x"$RE2C_BIN" = x ]; then
   echo -e "error: unable to locate the re2c"
-  exit 2
+  exit 1
 fi
 
 if [ x"$GCC_BIN" = x ]; then
 	echo -e "error: unable to locate the gcc"
 	exit 1
 fi
 
-# Check best compilation flags for compiller
+# Check best compilation flags for compiler
 export CC=gcc
 export CFLAGS="-march=native -mtune=native -O2 -fomit-frame-pointer"
-export CPPFLAGS="-DZEPHIR_PARSER_RELEASE"
 
 # Set defaults
 PHPIZE_BIN=$(command -v phpize 2>/dev/null)
@@ -75,6 +75,11 @@ if [ "${PHP_FULL_VERSION:0:3}" == "5.3" ]; then
 	exit 1
 fi
 
+if [ "${PHP_FULL_VERSION:0:3}" == "5.4" ]; then
+	echo "php 5.4 is no longer supported"
+	exit 1
+fi
+
 # Detect possible flags
 echo "int main() {}" > t.c
 gcc ${CFLAGS} t.c -o t 2> t.t
@@ -88,11 +93,13 @@ if [ $? != 0 ]; then
 	fi
 fi
 
+# Activate some gcc specific optimizations for gcc >= 4
 if [ $(gcc -dumpversion | cut -f1 -d.) -ge 4 ]; then
-	gcc ${CFLAGS} -fvisibility=hidden t.c -o t 2> t.t
-	export CFLAGS="$CFLAGS -fvisibility=hidden"
+	gcc ${CFLAGS} -fvisibility=hidden t.c -o t 2> t.t && export CFLAGS="$CFLAGS -fvisibility=hidden"
 fi
 
+gcc ${CFLAGS} -flto t.c -o t 2> t.t && { export CFLAGS="$CFLAGS -flto"; export LDFLAGS="$LDFLAGS $CFLAGS"; }
+
 rm -f t.t t.c t
 
 cd ${CURRENT_DIR}/parser
@@ -109,7 +116,8 @@ rm -f \
 	parser.php5.out \
 	parser.php7.c \
 	parser.php7.h \
-	parser.php7.out
+	parser.php7.out \
+	config.h.in~
 
 ${RE2C_BIN} -o scanner.c scanner.re
 
@@ -147,22 +155,34 @@ fi
 
 # Perform the compilation
 ${PHPIZE_BIN}
-./configure --silent --with-php-config=${PHPCONFIG_BIN} --enable-zephir_parser
-make -s  -j"$(getconf _NPROCESSORS_ONLN)"
 
-echo
+# For some reason the libtool script being generated by autogen contains lines referring
+# to "$echo message" instead of "echo message".
+export echo=echo
 
-make -s install
+# Detect Gentoo Linux
+if [ -f /etc/gentoo-release ]; then
+    LIBTOOLIZE_BIN=$(command -v libtoolize 2>/dev/null)
+    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
+fi
 
-echo
+./configure --silent --with-php-config=${PHPCONFIG_BIN} --enable-zephir_parser
+
+make -s -j"$(getconf _NPROCESSORS_ONLN)"
+make -s install
 
 # Clean current compilation
 if [ -f Makefile ]; then
 	make -s clean
 	${PHPIZE_BIN} --clean
 fi
 
-
 cd ${CURRENT_DIR}/parser
 
 # Cleanup
@@ -177,7 +197,8 @@ rm -f \
 	parser.php5.out \
 	parser.php7.c \
 	parser.php7.h \
-	parser.php7.out
+	parser.php7.out \
+	config.h.in~
 
 echo -e "\nThanks for compiling Zephir Parser!\nBuild succeed: Please restart your web server to complete the installation\n"