Merge pull request #1600 from phalcon/development

0.10.5
zephir-lang · Nov 10, 2017 · 04eb328 · 04eb328
2 parents 11e3984 + d10b3c1
commit 04eb328
Show file tree

Hide file tree

Showing 28 changed files with 319 additions and 130 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,15 @@
 language: php
+
+dist: trusty
+# Change to `true' to enable debug mode
 sudo: false
 
 php:
   - 5.5
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
 
 git:
   depth: 1
@@ -20,75 +24,118 @@ env:
     - LIBRARY_PATH="$TRAVIS_BUILD_DIR/build/lib":$LIBRARY_PATH
     - C_INCLUDE_PATH="$TRAVIS_BUILD_DIR/build/include"
     - CFLAGS="-g3 -O0 -Wall -fvisibility=hidden"
-    - ZEPHIR_PARSER_VERSION="v1.1.0"
+    - REPORT_EXIT_STATUS=1
+    - PATH="${HOME}/bin:${PATH}"
   matrix:
-    - CC="ccache gcc"
-    - CC="clang"
-    - CC="gcc" ZEPHIR_PARSER_VERSION="development"
+    - CC="gcc"   RE2C_VERSION="0.13.6" ZEPHIR_PARSER_VERSION="v1.1.1"
+    - CC="clang" RE2C_VERSION="0.13.6" ZEPHIR_PARSER_VERSION="v1.1.1"
+    - CC="gcc"   RE2C_VERSION="0.13.6" ZEPHIR_PARSER_VERSION="development"
+    - CC="clang" RE2C_VERSION="0.13.6" ZEPHIR_PARSER_VERSION="development"
+    - CC="gcc"   RE2C_VERSION="1.0.3"  ZEPHIR_PARSER_VERSION="v1.1.1"
+    - CC="clang" RE2C_VERSION="1.0.3"  ZEPHIR_PARSER_VERSION="v1.1.1"
+    - CC="gcc"   RE2C_VERSION="1.0.3"  ZEPHIR_PARSER_VERSION="development"
+    - CC="clang" RE2C_VERSION="1.0.3"  ZEPHIR_PARSER_VERSION="development"
 
 matrix:
   fast_finish: true
   allow_failures:
     - php: nightly
+    - php: 7.2
+  exclude:
+    - env: CC="gcc"
+      compiler: clang
+    - env: CC="clang"
+      compiler: gcc
   include:
-    - env: CC="ccache gcc"
+    - env: CC="gcc" RE2C_VERSION="0.13.6" ZEPHIR_PARSER_VERSION="v1.1.1"
       php: nightly
       compiler: gcc
-    - env: CC="clang"
+    - env: CC="gcc" RE2C_VERSION="1.0.3" ZEPHIR_PARSER_VERSION="v1.1.1"
       php: nightly
-      compiler: clang
-    - env: CC="gcc" ZEPHIR_PARSER_VERSION="development"
+      compiler: gcc
+    - env: CC="gcc" RE2C_VERSION="0.13.6" ZEPHIR_PARSER_VERSION="development"
+      php: nightly
+      compiler: gcc
+    - env: CC="gcc" RE2C_VERSION="1.0.3" ZEPHIR_PARSER_VERSION="development"
       php: nightly
       compiler: gcc
+    - env: CC="clang" RE2C_VERSION="0.13.6" ZEPHIR_PARSER_VERSION="v1.1.1"
+      php: nightly
+      compiler: clang
+    - env: CC="clang" RE2C_VERSION="1.0.3" ZEPHIR_PARSER_VERSION="v1.1.1"
+      php: nightly
+      compiler: clang
+    - env: CC="clang" RE2C_VERSION="0.13.6" ZEPHIR_PARSER_VERSION="development"
+      php: nightly
+      compiler: clang
+    - env: CC="clang" RE2C_VERSION="1.0.3" ZEPHIR_PARSER_VERSION="development"
+      php: nightly
+      compiler: clang
 
 cache:
   apt: true
   ccache: true
-  timeout: 691200
+  timeout: 604800
   directories:
     - vendor
     - $HOME/.ccache
     - $HOME/.composer/cache
+    - $HOME/.local/opt/re2c
+    - $HOME/.cache/re2c
 
 before_install:
   - if [[ ! -z "${GH_TOKEN}" ]]; then composer config github-oauth.github.com ${GH_TOKEN}; echo "Configured Github token"; fi;
 
 install:
   - composer --prefer-source install
-  - bash unit-tests/ci/install_zephir_parser.sh
+  - bash ./unit-tests/ci/install-re2c $RE2C_VERSION
+  - bash ./unit-tests/ci/install_zephir_parser.sh
   - ./install
 
 before_script:
+  #- $CC --version
   - $(phpenv which php) compiler.php help
   - $(phpenv which php) compiler.php generate
   - $(phpenv which php) compiler.php stubs
   - $(phpenv which php) compiler.php api
   - (cd ext; $(phpenv which phpize) && ./configure --silent --with-php-config=$(phpenv which php-config) --enable-test && make -j"$(getconf _NPROCESSORS_ONLN)" && make --silent install && phpenv config-add ../unit-tests/ci/test.ini)
+  #- ls -1 `$(phpenv which php-config) --extension-dir`
+  #- $(phpenv which php) -m
+  #- phpenv versions
   - ulimit -c unlimited || true
-  - $CC --version
+  # Uncomment to setting core dump
+  #- echo '/tmp/core_%e.%p' | sudo tee /proc/sys/kernel/core_pattern &> /dev/null
+  - sudo chmod +s $(which gdb)
 
 script:
   - echo 'variables_order=EGPCS' >> "$(phpenv root)/versions/$(phpenv version-name)/etc/php.ini"
   - vendor/bin/phpcs --standard=PSR2 --report=emacs --extensions=php --warning-severity=0 Library/ unit-tests/Extension/ unit-tests/Zephir/
-  - valgrind --read-var-info=yes --error-exitcode=1 --fullpath-after= --track-origins=yes --leak-check=full ./unit-tests/phpunit --not-exit -c phpunit.xml.dist --debug unit-tests/
+  - |
+      valgrind \
+        --read-var-info=yes \
+        --error-exitcode=1 \
+        --fullpath-after= \
+        --track-origins=yes \
+        --leak-check=full \
+        --run-libc-freeres=no \
+        ./unit-tests/phpunit \
+          --not-exit \
+          -c phpunit.xml.dist \
+          --debug \
+          unit-tests/
   - $(phpenv which php) unit-tests/microbench.php
 
 after_success:
   - if [[ ! -z "${CODECOV_TOKEN}" ]]; then bash <(curl -s https://codecov.io/bash); fi;
 
 after_failure:
-  - ./unit-tests/ci/after_failure.sh
-
-notifications:
-    email:
-        recipients:
-            - [email protected]
-        on_success: change
-        on_failure: always
+  #  Uncomment to debug core dump
+  # - ./unit-tests/ci/after_failure.sh
+  - $(phpenv which php) -m
+  - $(phpenv which php) -i
 
 addons:
   apt:
     packages:
-      - re2c
       - valgrind
       - gdb
diff --git a/LICENSE b/LICENSE
@@ -1,8 +1,8 @@
-Copyright (c) 2013-present Zephir Team
-https://zephir-lang.com
 
 MIT License
 
+Copyright (c) 2013-present Zephir Team
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

diff --git a/Library/Backends/ZendEngine3/Backend.php b/Library/Backends/ZendEngine3/Backend.php
@@ -623,7 +623,7 @@ public function resolveValue($value, CompilationContext $context, $usePointer =
         if ($value == 'null' || $value == 'true' || $value == 'false') {
             $varName = '__$' . $value;
             if (!$context->symbolTable->hasVariable($varName)) {
-                $tempVariable = new Variable('variable', $varName, $context->currentBranch);
+                $tempVariable = new Variable('variable', $varName, $context->branchManager->getCurrentBranch());
                 $context->symbolTable->addRawVariable($tempVariable);
             }
             $tempVariable = $context->symbolTable->getVariableForWrite($varName, $context);

diff --git a/Library/BranchManager.php b/Library/BranchManager.php
@@ -20,13 +20,15 @@
  */
 class BranchManager
 {
+    /** @var Branch|null */
     protected $currentBranch;
 
     protected $level = 0;
 
     protected $uniqueId = 1;
 
-    protected $rootBranch = null;
+    /** @var Branch|null */
+    protected $rootBranch;
 
     /**
      * Sets the current active branch in the manager
@@ -68,7 +70,7 @@ public function removeBranch(Branch $branch)
     /**
      * Returns the active branch in the manager
      *
-     * @return Branch
+     * @return null|Branch
      */
     public function getCurrentBranch()
     {
@@ -85,6 +87,9 @@ public function setRootBranch(Branch $branch)
         $this->rootBranch = $branch;
     }
 
+    /**
+     * @return null|Branch
+     */
     public function getRootBranch()
     {
         return $this->rootBranch;

diff --git a/Library/Call.php b/Library/Call.php
@@ -660,7 +660,7 @@ public function getReadOnlyResolvedParams($parameters, CompilationContext $compi
     public function addCallStatusFlag(CompilationContext $compilationContext)
     {
         if (!$compilationContext->symbolTable->hasVariable('ZEPHIR_LAST_CALL_STATUS')) {
-            $callStatus = new Variable('int', 'ZEPHIR_LAST_CALL_STATUS', $compilationContext->currentBranch);
+            $callStatus = new Variable('int', 'ZEPHIR_LAST_CALL_STATUS', $compilationContext->branchManager->getCurrentBranch());
             $callStatus->setIsInitialized(true, $compilationContext);
             $callStatus->increaseUses();
             $callStatus->setReadOnly(true);

diff --git a/Library/ClassMethod.php b/Library/ClassMethod.php
@@ -1511,6 +1511,20 @@ public function compile(CompilationContext $compilationContext)
         $typeInference = $this->typeInference;
         $callGathererPass = $this->callGathererPass;
 
+        /**
+         * Initialization of parameters happens in a fictitious external branch
+         */
+        $branch = new Branch();
+        $branch->setType(Branch::TYPE_EXTERNAL);
+
+        /**
+         * BranchManager helps to create graphs of conditional/loop/root/jump branches
+         */
+        $branchManager = new BranchManager();
+        $branchManager->addBranch($branch);
+
+        $compilationContext->branchManager = $branchManager;
+
         /**
          * Every method has its own symbol table
          */
@@ -1531,25 +1545,12 @@ public function compile(CompilationContext $compilationContext)
             }
         }
 
-        /**
-         * Initialization of parameters happens in a fictitious external branch
-         */
-        $branch = new Branch();
-        $branch->setType(Branch::TYPE_EXTERNAL);
-
-        /**
-         * BranchManager helps to create graphs of conditional/loop/root/jump branches
-         */
-        $branchManager = new BranchManager();
-        $branchManager->addBranch($branch);
-
         /**
          * Cache Manager manages function calls, method calls and class entries caches
          */
         $cacheManager = new CacheManager();
         $cacheManager->setGatherer($callGathererPass);
 
-        $compilationContext->branchManager = $branchManager;
         $compilationContext->cacheManager  = $cacheManager;
         $compilationContext->typeInference = $typeInference;
         $compilationContext->symbolTable   = $symbolTable;

diff --git a/Library/Commands/CommandAbstract.php b/Library/Commands/CommandAbstract.php
diff --git a/Library/Commands/CommandBuild.php b/Library/Commands/CommandBuild.php
@@ -55,7 +55,7 @@ public function getUsage()
 Description:
     The options are as follows:
 
-    --backend=ZendEngine2|ZendEngine3        The extension namespace.
+    --backend=ZendEngine2|ZendEngine3        Used backend to build extension.
 EOL;
 
         return sprintf($template, $this->getCommand());

diff --git a/Library/Commands/CommandBuildDev.php b/Library/Commands/CommandBuildDev.php
@@ -55,7 +55,7 @@ public function getUsage()
 Description:
     The options are as follows:
 
-    --backend=ZendEngine2|ZendEngine3        The extension namespace.
+    --backend=ZendEngine2|ZendEngine3        Used backend to build extension.
 EOL;
 
         return sprintf($template, $this->getCommand());

diff --git a/Library/Commands/CommandCompile.php b/Library/Commands/CommandCompile.php
@@ -55,7 +55,7 @@ public function getUsage()
 Description:
     The options are as follows:
 
-    --backend=ZendEngine2|ZendEngine3        The extension namespace.
+    --backend=ZendEngine2|ZendEngine3        Used backend to compile extension.
 EOL;
 
         return sprintf($template, $this->getCommand());

diff --git a/Library/Commands/CommandGenerate.php b/Library/Commands/CommandGenerate.php
@@ -55,7 +55,7 @@ public function getUsage()
 Description:
     The options are as follows:
 
-    --backend=ZendEngine2|ZendEngine3        The extension namespace.
+    --backend=ZendEngine2|ZendEngine3        Used backend to generate extension.
 EOL;
 
         return sprintf($template, $this->getCommand());

diff --git a/Library/Commands/CommandInitialize.php b/Library/Commands/CommandInitialize.php
@@ -81,7 +81,8 @@ public function getUsage()
 Description:
     The options are as follows:
 
-    namespace        The extension namespace.
+    namespace                                The extension namespace.
+    --backend=ZendEngine2|ZendEngine3        Used backend to create extension.
 EOL;
 
         return sprintf($template, $this->getCommand());

diff --git a/Library/Compiler.php b/Library/Compiler.php
@@ -31,7 +31,7 @@
  */
 class Compiler
 {
-    const VERSION = '0.10.4';
+    const VERSION = '0.10.5';
 
     public $parserCompiled = false;
 

diff --git a/Library/Expression/StaticPropertyAccess.php b/Library/Expression/StaticPropertyAccess.php
@@ -30,14 +30,17 @@ class StaticPropertyAccess
 
     protected $_readOnly = false;
 
+    /**
+     * @var Variable|null
+     */
     protected $_expectingVariable;
 
     /**
      * Sets if the variable must be resolved into a direct variable symbol
      * create a temporary value or ignore the return value
      *
      * @param boolean $expecting
-     * @param Variable $expectingVariable
+     * @param Variable|null $expectingVariable
      */
     public function setExpectReturn($expecting, Variable $expectingVariable = null)
     {

diff --git a/Library/Operators/BaseOperator.php b/Library/Operators/BaseOperator.php
diff --git a/Library/Optimizers/MathOptimizer.php b/Library/Optimizers/MathOptimizer.php
diff --git a/Library/Optimizers/OptimizerAbstract.php b/Library/Optimizers/OptimizerAbstract.php