pass new php7 syntax

Author: ichiriac

src/parser/expr.js

@@ -88,8 +88,11 @@ module.exports = function(api, tokens, EOF) {
           } else if (this.token === tokens.T_CURLY_OPEN || this.token === '[') {
             // @fixme - should avoid a new token (could be resolved)
             return ['deference', expr, this.read_encapsed_string_item()];
+          } else if (this.token === '(') {
+            // https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y#L1118
+            return ['call', expr, this.read_function_argument_list()];
           } else {
-            return expr;            
+            return expr;
           }
 
         case '`':

src/parser/scalar.js

@@ -37,15 +37,22 @@ module.exports = function(api, tokens, EOF) {
           // TEXTS
           case tokens.T_CONSTANT_ENCAPSED_STRING:
             var value = this.text();
+            value = value.substring(1, value.length - 1).replace(
+              /\\[rntvef"'\\\$]/g,
+              function(seq) {
+                return specialChar[seq];
+              }
+            );
             this.next();
-            return [
-              'string', 
-              value
-                .substring(1, value.length - 1)
-                .replace(/\\[rntvef"'\\\$]/g, function(seq) {
-                  return specialChar[seq];
-                })
-            ];
+            if (this.token === tokens.T_DOUBLE_COLON) {
+              // https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y#L1151
+              return this.read_static_getter(
+                ['string', value]
+              );
+            } else {
+              // dirrect string
+              return ['string', value];
+            }
           case tokens.T_START_HEREDOC:
             return this.next().read_encapsed_string(
               tokens.T_END_HEREDOC

src/parser/variable.js

@@ -42,27 +42,32 @@ module.exports = function(api, tokens, EOF) {
 
       // static mode
       if (this.token === tokens.T_DOUBLE_COLON) {
-        var getter = null;
-        if (this.next().is([tokens.T_VARIABLE, '$'])) {   
-          getter = this.read_reference_variable(encapsed);
-        } else if (
-          this.token === tokens.T_STRING
-          || this.token === tokens.T_CLASS
-        ) {
-          getter = this.text();
-          this.next();
-        } else {
-          this.error([tokens.T_VARIABLE, tokens.T_STRING]);
-        }
-        if (result[0] != 'ns') {
-          result = ['lookup', 'class', result];
-        }
-        result = ['static', 'get', result, getter];
+        result = this.read_static_getter(result, encapsed);
       }
 
       return this.recursive_variable_chain_scan(result, read_only, encapsed);
     }
 
+    // resolves a static call
+    ,read_static_getter: function(from, encapsed) {
+      var getter = null;
+      if (this.next().is([tokens.T_VARIABLE, '$'])) {   
+        getter = this.read_reference_variable(encapsed);
+      } else if (
+        this.token === tokens.T_STRING
+        || this.token === tokens.T_CLASS
+      ) {
+        getter = this.text();
+        this.next();
+      } else {
+        this.error([tokens.T_VARIABLE, tokens.T_STRING]);
+      }
+      if (from[0] != 'ns') {
+        from = ['lookup', 'class', from];
+      }
+      return ['static', 'get', from, getter];
+    }
+
     ,recursive_variable_chain_scan: function(result, read_only, encapsed) {
       recursive_scan_loop:
       while(this.token != EOF) {

test/parser/php7.parser

@@ -0,0 +1,132 @@
+Test PHP7 syntax
+--PASS:Return type declarations--
+function arraysSum(array ...$arrays): array
+{
+    return array_map(function(array $array): int {
+        return array_sum($array);
+    }, $arrays);
+}
+
+print_r(arraysSum([1,2,3], [4,5,6], [7,8,9]));
+--PASS--
+// Fetches the value of $_GET['user'] and returns 'nobody'
+// if it does not exist.
+$username = $_GET['user'] ?? 'nobody';
+// This is equivalent to:
+$username = isset($_GET['user']) ? $_GET['user'] : 'nobody';
+--PASS:Spaceship operator--
+// Integers
+echo 1 <=> 1; // 0
+echo 1 <=> 2; // -1
+echo 2 <=> 1; // 1
+
+// Floats
+echo 1.5 <=> 1.5; // 0
+echo 1.5 <=> 2.5; // -1
+echo 2.5 <=> 1.5; // 1
+ 
+// Strings
+echo "a" <=> "a"; // 0
+echo "a" <=> "b"; // -1
+echo "b" <=> "a"; // 1
+--PASS:Constant arrays using define()--
+define('ANIMALS', [
+    'dog',
+    'cat',
+    'bird'
+]);
+--PASS:Anonymous classes--
+interface Logger {
+    public function log(string $msg);
+}
+
+class Application {
+    private $logger;
+
+    public function getLogger(): Logger {
+         return $this->logger;
+    }
+
+    public function setLogger(Logger $logger) {
+         $this->logger = $logger;
+    }
+}
+
+$app = new Application;
+$app->setLogger(new class implements Logger {
+    public function log(string $msg) {
+        echo $msg;
+    }
+});
+
+var_dump($app->getLogger());
+--PASS:Unicode codepoint escape syntax--
+
+echo "\u{aa}";
+echo "\u{0000aa}";
+echo "\u{9999}";
+--PASS:Closure::call()--
+
+class A {private $x = 1;}
+
+// Pre PHP 7 code
+$getXCB = function() {return $this->x;};
+$getX = $getXCB->bindTo(new A, 'A'); // intermediate closure
+echo $getX();
+
+// PHP 7+ code
+$getX = function() {return $this->x;};
+echo $getX->call(new A);
+--PASS:Group use declarations--
+// Pre PHP 7 code
+use some\ns\ClassA;
+use some\ns\ClassB;
+use some\ns\ClassC as C;
+
+use function some\ns\fn_a;
+use function some\ns\fn_b;
+use function some\ns\fn_c;
+
+use const some\ns\ConstA;
+use const some\ns\ConstB;
+use const some\ns\ConstC;
+
+// PHP 7+ code
+use some\ns\{ClassA, ClassB, ClassC as C};
+use function some\ns\{fn_a, fn_b, fn_c};
+use const some\ns\{ConstA, ConstB, ConstC};
+--PASS:Generator Return Expressions--
+$gen = (function() {
+    yield 1;
+    yield 2;
+
+    return 3;
+})();
+
+foreach ($gen as $val) {
+    echo $val, PHP_EOL;
+}
+
+echo $gen->getReturn(), PHP_EOL;
+--PASS:Generator delegation--
+function gen()
+{
+    yield 1;
+    yield 2;
+    yield from gen2();
+}
+
+function gen2()
+{
+    yield 3;
+    yield 4;
+}
+
+foreach (gen() as $val)
+{
+    echo $val, PHP_EOL;
+}
+--PASS--
+(clone $foo)->bar();
+class foo { static $bar = 'baz'; }
+var_dump('foo'::$bar);

test/token/edge.php

@@ -0,0 +1,2 @@
+<?php
+// edge cases for improving code coverage on lexer