Release PHP-Parser 2.0.0

Instead of the ugly undefined variable hack

CHANGELOG.md

@@ -1,8 +1,18 @@
-Version 2.0.0-dev
------------------------
+Version 2.0.1-dev
+-----------------
 
 Nothing yet.
 
+Version 2.0.0 (2015-12-04)
+--------------------------
+
+### Changed
+
+* String parts of encapsed strings are now represented using `Scalar\EncapsStringPart` nodes.
+  Previously raw strings were used. This affects the `parts` child of `Scalar\Encaps` and
+  `Expr\ShellExec`. The change has been done to allow assignment of attributes to encapsed string
+  parts.
+
 Version 2.0.0-beta1 (2015-10-21)
 --------------------------------
 

README.md

@@ -1,12 +1,13 @@
 PHP Parser
 ==========
 
-This is a PHP 5.2 to PHP 5.6 parser written in PHP. Its purpose is to simplify static code analysis and
+This is a PHP 5.2 to PHP 7.0 parser written in PHP. Its purpose is to simplify static code analysis and
 manipulation.
 
-[**Documentation for version 1.x**][doc_1_x] (stable; for running on PHP >= 5.3).
 
-[Documentation for version 2.x-dev][doc_master] (dev; for running on PHP >= 5.4).
+[**Documentation for version 2.x**][doc_master] (stable; for running on PHP >= 5.4; for parsing PHP 5.2 to PHP 7.0).
+
+[Documentation for version 1.x][doc_1_x] (stable; for running on PHP >= 5.3; for parsing PHP 5.2 to PHP 5.6).
 
 In a Nutshell
 -------------

UPGRADE-2.0.md

@@ -69,3 +69,6 @@ deprecated. Instead `Name::concat()` and `Name->slice()` should be used.
   implement a `getSubNodeNames()` method.
 * The default value for `Scalar` node constructors was removed. This means that something like
   `new LNumber()` should be replaced by `new LNumber(0)`.
+* String parts of encapsed strings are now represented using `Scalar\EncapsStringPart` nodes, while
+  previously raw strings were used. This affects the `parts` child of `Scalar\Encaps` and
+  `Expr\ShellExec`.

doc/0_Introduction.markdown

@@ -1,7 +1,7 @@
 Introduction
 ============
 
-This project is a PHP 5.2 to PHP 5.6 parser **written in PHP itself**.
+This project is a PHP 5.2 to PHP 7.0 parser **written in PHP itself**.
 
 What is this for?
 -----------------

grammar/php5.y

@@ -704,7 +704,7 @@ exit_expr:
 backticks_expr:
       /* empty */                                           { $$ = array(); }
     | T_ENCAPSED_AND_WHITESPACE
-          { $$ = array(Scalar\String_::parseEscapeSequences($1, '`', false)); }
+          { $$ = array(Scalar\EncapsedStringPart[Scalar\String_::parseEscapeSequences($1, '`', false)]); }
     | encaps_list                                           { parseEncapsed($1, '`', false); $$ = $1; }
 ;
 
@@ -916,9 +916,13 @@ array_pair:
 
 encaps_list:
       encaps_list encaps_var                                { push($1, $2); }
-    | encaps_list T_ENCAPSED_AND_WHITESPACE                 { push($1, $2); }
+    | encaps_list encaps_string_part                        { push($1, $2); }
     | encaps_var                                            { init($1); }
-    | T_ENCAPSED_AND_WHITESPACE encaps_var                  { init($1, $2); }
+    | encaps_string_part encaps_var                         { init($1, $2); }
+;
+
+encaps_string_part:
+      T_ENCAPSED_AND_WHITESPACE                             { $$ = Scalar\EncapsedStringPart[$1]; }
 ;
 
 encaps_var:

grammar/php7.y

@@ -635,7 +635,8 @@ exit_expr:
 
 backticks_expr:
       /* empty */                                           { $$ = array(); }
-    | T_ENCAPSED_AND_WHITESPACE                             { $$ = array(Scalar\String_::parseEscapeSequences($1, '`')); }
+    | T_ENCAPSED_AND_WHITESPACE
+          { $$ = array(Scalar\EncapsedStringPart[Scalar\String_::parseEscapeSequences($1, '`')]); }
     | encaps_list                                           { parseEncapsed($1, '`', true); $$ = $1; }
 ;
 
@@ -783,9 +784,13 @@ array_pair:
 
 encaps_list:
       encaps_list encaps_var                                { push($1, $2); }
-    | encaps_list T_ENCAPSED_AND_WHITESPACE                 { push($1, $2); }
+    | encaps_list encaps_string_part                        { push($1, $2); }
     | encaps_var                                            { init($1); }
-    | T_ENCAPSED_AND_WHITESPACE encaps_var                  { init($1, $2); }
+    | encaps_string_part encaps_var                         { init($1, $2); }
+;
+
+encaps_string_part:
+      T_ENCAPSED_AND_WHITESPACE                             { $$ = Scalar\EncapsedStringPart[$1]; }
 ;
 
 encaps_var:

grammar/rebuildParsers.php

@@ -156,17 +156,17 @@ function resolveMacros($code) {
             if ('parseEncapsed' == $name) {
                 assertArgs(3, $args, $name);
 
-                return 'foreach (' . $args[0] . ' as &$s) { if (is_string($s)) {'
-                     . ' $s = Node\Scalar\String_::parseEscapeSequences($s, ' . $args[1] . ', ' . $args[2] . '); } }';
+                return 'foreach (' . $args[0] . ' as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) {'
+                     . ' $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, ' . $args[1] . ', ' . $args[2] . '); } }';
             }
 
             if ('parseEncapsedDoc' == $name) {
                 assertArgs(2, $args, $name);
 
-                return 'foreach (' . $args[0] . ' as &$s) { if (is_string($s)) {'
-                     . ' $s = Node\Scalar\String_::parseEscapeSequences($s, null, ' . $args[1] . '); } }'
-                     . ' $s = preg_replace(\'~(\r\n|\n|\r)\z~\', \'\', $s);'
-                     . ' if (\'\' === $s) array_pop(' . $args[0] . ');';
+                return 'foreach (' . $args[0] . ' as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) {'
+                     . ' $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, null, ' . $args[1] . '); } }'
+                     . ' $s->value = preg_replace(\'~(\r\n|\n|\r)\z~\', \'\', $s->value);'
+                     . ' if (\'\' === $s->value) array_pop(' . $args[0] . ');';
             }
 
             return $matches[0];

lib/PhpParser/Lexer.php

@@ -67,14 +67,21 @@ class Lexer
     }
 
     protected function resetErrors() {
-        // set error_get_last() to defined state by forcing an undefined variable error
-        set_error_handler(function() { return false; }, 0);
-        @$undefinedVariable;
-        restore_error_handler();
+        if (function_exists('error_clear_last')) {
+            error_clear_last();
+        } else {
+            // set error_get_last() to defined state by forcing an undefined variable error
+            set_error_handler(function() { return false; }, 0);
+            @$undefinedVariable;
+            restore_error_handler();
+        }
     }
 
     protected function handleErrors() {
         $error = error_get_last();
+        if (null === $error) {
+            return;
+        }
 
         if (preg_match(
             '~^Unterminated comment starting line ([0-9]+)$~',

lib/PhpParser/Node/Scalar/EncapsedStringPart.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace PhpParser\Node\Scalar;
+
+use PhpParser\Node\Scalar;
+
+class EncapsedStringPart extends Scalar
+{
+    /** @var string String value */
+    public $value;
+
+    /**
+     * Constructs a node representing a string part of an encapsed string.
+     *
+     * @param string $value      String value
+     * @param array  $attributes Additional attributes
+     */
+    public function __construct($value, array $attributes = array()) {
+        parent::__construct($attributes);
+        $this->value = $value;
+    }
+
+    public function getSubNodeNames() {
+        return array('value');
+    }
+}

lib/PhpParser/Parser/Php7.php

@@ -18,15 +18,15 @@ use PhpParser\Node\Stmt;
 class Php7 extends \PhpParser\ParserAbstract
 {
     protected $tokenToSymbolMapSize = 392;
-    protected $actionTableSize = 1023;
-    protected $gotoTableSize = 397;
+    protected $actionTableSize = 1018;
+    protected $gotoTableSize = 403;
 
     protected $invalidSymbol = 157;
     protected $errorSymbol = 1;
     protected $defaultAction = -32766;
     protected $unexpectedTokenRule = 32767;
 
-    protected $YY2TBLSTATE  = 348;
+    protected $YY2TBLSTATE  = 346;
     protected $YYNLSTATES   = 557;
 
     protected $symbolToName = array(
@@ -233,109 +233,108 @@ class Php7 extends \PhpParser\ParserAbstract
     );
 
     protected $action = array(
-          697,   58,   59,  393,   60,   61,-32766,-32766,-32766,-32766,
-           62,   63, 1016,   64, 1018, 1017,-32766,-32766,-32766,-32766,
-        -32766,-32766,  108,  109,  110,-32766,-32766,   57,-32766,-32766,
+          697,   58,   59,  391,   60,   61,-32766,-32766,-32766,-32766,
+           62,   63, 1017,   64, 1019, 1018,-32766,-32766,-32766,-32766,
+        -32766,-32766,  108,  109,  110,-32766,-32766, -403,-32766,-32766,
         -32766,-32766,-32766,-32766,-32767,-32767,-32767,-32767,-32767,-32766,
           975,-32766,-32766,-32766,-32766,-32766,   65,   66,-32766,-32766,
-        -32766, 1006,   67,  129,   68,  233,  234,   69,   70,   71,
-           72,   73,   74,   75,   76,  357,   40,  247,   77,  362,
-          394,    0,-32766, 1006,  940,  941,  395,  131,  975,   55,
-          686,  277,  939,   50,   27,  396,  741,  397,  268,  398,
-        -32766,  399,  355,-32766,  400,-32766,-32766,-32766,   51,   52,
-          401,  363,  308,   53,  402,  140,-32766,   78,  955,  130,
-          300,  301,  403,  404,  299,-32766,  289,  286,  405,  406,
-          407,  672,  713,  408,  409,  765,  766,  420,  410,  411,
-          364,  945,  946,  947,  948,  942,  943,  256,  420,   42,
-          267,  364,  420,  949,  944,  364,  954,  692,  529,  227,
-           79, -446,  265,-32766,  266,  286,  561,  562,  563,  564,
+        -32766,  444,   67,  129,   68,  233,  234,   69,   70,   71,
+           72,   73,   74,   75,   76,  355,   40,  247,   77,  360,
+          392,    0,-32766,  283,  940,  941,  393,  353,  975,   55,
+          686,  227,  939,   50,   27,  394,  297,  395, -403,  396,
+        -32766,  397, -437,-32766,  398,-32766,-32766,-32766,   51,   52,
+          399,  361, -403,   53,  400,  140,-32766,   78,  953, -403,
+          298,  299,  401,  402,  988,-32766,  287,  285,  403,  404,
+          405,  672,  713,  406,  407,  765,  766,  418,  408,  409,
+          362,  945,  946,  947,  948,  942,  943,  255,  418,   42,
+          268,  362,  418,  949,  944,  362,  131,  692,  529,  276,
+           79, -447,  265,-32766,  266,  285,  561,  562,  563,  564,
           565,  128,  566,  567,  568,  604,  605,-32766,-32766,-32766,
-           33, -193, -193, -193,-32766,  319,  280,  463,  526,  814,
-          815,  816,  813,  812,  811,  806,  381,-32766, 1013,-32766,
-        -32766,-32766,-32766,-32766,-32766,  390,-32767,-32767,-32767,-32767,
-          106,  107,  108,  109,  110,  742, -447,  240,  569,  551,
-        -32766,-32766,-32766,  814,  815,  816,  813,  812,  811, -191,
-         -191, -191,  570,  571,  572,  573,  574,  575,  576,  254,
-        -32766,  627,-32766,-32766,-32766,-32766,   43,  236,  577,  578,
+           33, -193, -193, -193,-32766,  254,  279,  463,  526,  814,
+          815,  816,  813,  812,  811,  806,  137,-32766, 1014,-32766,
+        -32766,-32766,-32766,-32766,-32766,  388,-32767,-32767,-32767,-32767,
+          106,  107,  108,  109,  110, -191, -191, -191,  569,  551,
+        -32766,-32766,-32766,  814,  815,  816,  813,  812,  811,-32766,
+         -198, -446,  570,  571,  572,  573,  574,  575,  576,  975,
+        -32766,  627,-32766,-32766,-32766,-32766,   39, -437,  577,  578,
           579,  580,  581,  582,  583,  584,  585,  586,  587,  607,
           608,  609,  610,  611,  599,  600,  601,  602,  603,  588,
           589,  590,  591,  592,  593,  594,  621,  622,  623,  624,
           625,  626,  595,  596,  597,  598,-32766,  619,  617,  618,
-          614,  615,  366,  606,  612,  613,   39, -405, -198,   88,
-           89,   90,  269,-32766,-32766,  229, -446,  616, -446,   -1,
-          284,  410,-32766,-32766,-32766,-32766,  382, -146,  239,   44,
+          614,  615,  364,  606,  612,  613,  239, -404,  379,   88,
+           89,   90,  317,-32766,-32766, 1009, -447,  616, -447,  136,
+           46,  359,-32766,-32766,-32766,-32766,  285,  643,  644,   44,
           237,   91,   92,   93,   94,   95,   96,   97,   98,   99,
           100,  101,  102,  103,  104,  105,  106,  107,  108,  109,
-          110,  111,  112,  113, -404,  253,  787,  361,  356, -183,
-         -183, -183,  765,  766,  264,-32766,-32766,  114, -405,  953,
-        -32766, -447,  629, -447, -403,  420,-32766,  635,  364,-32766,
-        -32766,-32766, -405,-32766, -202,-32766, -437,-32766,  975, -405,
-        -32766, -408, -219, -147,-32766,-32766,-32766,  366,  282,-32766,
-        -32766,   46,  379,-32766,  237,  638,-32766,  419,-32766,-32766,
-        -32766,-32766,  127, -183,-32766, -404,  133,-32766,-32766,-32766,
-        -32766,   40,  356,  111,  112,  113,  988,  253,  264, -404,
-          517,  629,  373,  975,  146, -403, -404,  939, -407,  114,
-        -32766,  635,  135,-32766,-32766,-32766,  629,  771,  144, -403,
-        -32766,  772,  143,-32766,-32766,-32766, -403,-32766,  136,-32766,
-          991,-32766,  282,  139,-32766,  286,  919,  132,-32766,-32766,
-        -32766,  366, -146,-32766,-32766,  370,  141,-32766,  531,  230,
-        -32766,  419,-32766,-32766,  411,  550,  544,   34,-32766,  643,
-          644,-32766,-32766,-32766,-32766,  356,  518,  420,  137,  364,
-          364,  264,  912,  792,  555,   81, -182, -182, -182,  706,
-          286,  302,  374,  696,  635,-32766,  135,-32766,-32766,-32766,
-          255,  629,  506,  507,  253,-32766,  496,   28,-32766,-32766,
-        -32766, -437,-32766,  350,-32766,  282,-32766, -219, -147,-32766,
-          142,  310,  637,-32766,-32766,-32766,  366,   22,-32766,-32766,
-           56,  539,-32766,  238,  114,-32766,  419,-32766,-32766,  366,
-         -182, -248,  247,-32766,  643,  644,-32766,-32766,-32766,-32766,
-        -32766,-32766, -197,  642,-32766,-32766,-32766,  491,  492,-32766,
-        -32766,-32766,-32766,  791,  546,-32766,  803,  556,-32766,-32766,
-          514,-32766,-32766,-32766,-32766,  629,-32766,-32766,-32766,-32766,
-        -32766,  629,-32766,-32766,-32766,  656,-32766,  456,-32766,  455,
-        -32766,  636,  533,-32766,  915,  445,  134,-32766,-32766,-32766,
-          366,  440,-32766,-32766,  366,  630,-32766, 1011,  788,-32766,
-          419,-32766,-32766,  439,  369,-32766,-32766,-32766,  371,  366,
-        -32766,-32766,-32766,-32766,-32766,-32766,-32766,-32766,  444,  516,
-        -32766,-32766,  683,  684,-32766,  505,  494,  288,-32766,-32766,
-        -32766,-32766,-32766, 1006,  629,  287,-32766,-32766,-32766,  497,
-          452,-32766,-32766,-32766,  525,-32766,  509,-32766,  281,-32766,
-          515,  501,-32766,  489,  458,  -70,-32766,-32766,-32766,  366,
-           37,-32766,-32766,  226,  502,-32766,  538,  368,-32766,  419,
-        -32766,-32766,  388,-32766,-32766,-32766,-32766,  410,  334,-32766,
-        -32766,-32766,-32766,  279,  307,  715,  714,  335,  952,  370,
-          278, 1010,    0,-32766,-32766,-32766,-32766,  283,-32766,    0,
-          629,  329,    0,    0,-32766,-32766,-32766,-32766,-32766,-32766,
-            0,-32766,    0,-32766,   36,-32766, -363,   30,-32766,  352,
-          900,    0,-32766,-32766,-32766,  366,  351,-32766,-32766,  339,
-          322,-32766,  235,  449,-32766,  419,-32766,-32766,  708,  366,
-          639,  640,-32766,  797,  694,-32766,-32766,-32766,-32766,  725,
-        -32766,-32766,  685,-32766,  796,  799,  798,  687,  727,-32766,
-        -32766,-32766,-32766,  675,  736,  735,  729,  744,-32766,  677,
-          688,-32766,-32766,  682,  629,  695,  681,  680,-32766,  641,
-          543,-32766,-32766,-32766,  542,-32766,   49,-32766,   48,-32766,
-          795,  981,-32766,  553,  549,  548,-32766,-32766,-32766,  366,
-          545,-32766,-32766,  541,  540,-32766,  535,  532,-32766,  419,
-        -32766,-32766,  530,  554,  883,   87,-32766,  275,  536,-32766,
-        -32766,-32766,-32766,-32766,  276,  349,  348,  980,  986,  629,
-          989,  969,  976,-32766, 1012,  534,-32766,-32766,-32766,  646,
-        -32766,  645,-32766, 1015,-32766,-32766,-32766,-32766, 1014,  712,
-          648,-32766,-32766,-32766,  366,  804,-32766,-32766,  700,  907,
-        -32766,  906,  734,-32766,  419,-32766,-32766,  733,  908,  710,
-          709,-32766,  702,  711,-32766,-32766,-32766,-32766,   45,  115,
-          116,  117,  118,  119,  120,  121,  122,  123,  124,  125,
-          126,  366,  647,  673,  968,   38, -406, -407,  359,  354,
-        -32766,-32766,-32766,-32766,  285, -408, -428,  252,  251,  250,
-          249,-32766,-32766,-32766,-32766,  232,  231,  228,  147,  844,
-          846,  145,  138,   86,   85,   84,   83,   82,   80,   54,
-         -403,   47, -430,   41,    0,  476, -199,   21,   26,   29,
-          260,    0,  309,  471,  487,  524,  887,  884,  937,  929,
-          522,  391,  387,  385,  383,   25,   24,   23, -198,    0,
-            0,  967,  938,  495,    0,    0,    0,    0,    0,    0,
+          110,  111,  112,  113,   34,  253,  787,  144,  354, -182,
+         -182, -182,  765,  766,  264,  229,-32766,  114, -404,  240,
+        -32766,  348,  629,   43,  236,  418,-32766,  635,  362,-32766,
+        -32766,-32766, -404,-32766, -202,-32766, -446,-32766, -446, -404,
+        -32766, -407, -219, -147,-32766,-32766,-32766,  364,  281,-32766,
+        -32766,  772,  146,-32766,  237,  638,-32766,  417,-32766,-32766,
+          143,   -1,  371, -182,-32766, -405,  377,-32766,-32766,-32766,
+        -32766,  372,   40,  111,  112,  113, -146,  253,  380,-32766,
+        -32766,-32766,  629,  139,  975,  127,  517,  300,  939,  114,
+        -32766,  741,  135,-32766,-32766,-32766,  629,  771,  132,-32766,
+        -32766,-32766,-32766,-32766,-32766,-32766,  354,-32766,  133,-32766,
+          696,-32766,  264,  408,-32766,   57,  912,  919,-32766,-32766,
+        -32766,  364,  706,-32766,-32766,  635, -405,-32766,  141,  238,
+        -32766,  417,-32766,-32766,  368,  409,  256,  531,-32766,  550,
+         -405,-32766,-32766,-32766,-32766,  788,  281, -405,  418, -408,
+        -32766,  362,  518,  637,  555,  362,   81,  506,  507,  792,
+          991,  285,-32766,-32766,  354,-32766,  135,-32766,-32766,  253,
+          264,  629,  496,   28,  114,-32766,  269,  247,-32766,-32766,
+        -32766,   56,-32766,  635,-32766,  539,-32766, -219, -147,-32766,
+          306,  538, -197,-32766,-32766,-32766,  364,  130,-32766,-32766,
+          514, -248,-32766,  642,  281,-32766,  417,-32766,-32766,  630,
+          742,   22,  684,-32766,  142,  308,-32766,-32766,-32766,-32766,
+        -32766, -146,  643,  644,-32766,-32766,  629,  327,  683,  456,
+        -32766,-32766,  629,-32766,-32766,-32766,  443,-32766,  438,-32766,
+        -32766,-32766,-32766,-32766,-32766,  491,  492,  437,-32766,-32766,
+        -32766,  364,  134,-32766,-32766,  656,  536,-32766,  364,  369,
+        -32766,  417,-32766,-32766,  364, -183, -183, -183,-32766,-32766,
+        -32766,-32766,-32766,-32766,-32766,-32766,-32766, 1012,-32766,-32766,
+        -32766,-32766,  636,  533,-32766,-32766,-32766,-32766,  791,  546,
+          803,  556,  455,  367,-32766,-32766,  915,-32766,-32766,-32766,
+          629,  516,  447,  494,-32766,  505,  497,-32766,-32766,-32766,
+          442,-32766,  515,-32766,  452,-32766,  366,  489,-32766, -183,
+          386,  525,-32766,-32766,-32766,  364,  501,-32766,-32766,  364,
+          -70,-32766,  458,  235,-32766,  417,-32766,-32766,   37,  226,
+        -32766,-32766,-32766,  509,  502,-32766,-32766,-32766,-32766,-32766,
+        -32766,-32766,-32766,  280,-32766,-32766,-32766,  714,  715,  408,
+          641,  976,  883,  282,  952,  277,    0,  278,  955,-32766,
+            0,-32766,-32766,-32766,-32766,  629,-32766,-32766,-32766,-32766,
+            0,    0,-32766,-32766,-32766,    0,-32766,  333,-32766,  708,
+        -32766,   30, -363,-32766,   36,  305,  969,-32766,-32766,-32766,
+          364,  350,-32766,-32766,  364,  349,-32766,  230,  449,-32766,
+          417,-32766,-32766,  368,  337,-32766,-32766,-32766,  320,  332,
+        -32766,-32766,-32766,-32766,-32766,-32766,-32766,-32766,-32766,  680,
+          681,  542,   49,   48,  796,  685,  695,  682,  688,  798,
+          799,  677,  744,-32766,  729,  797,-32766,-32766,  640,  629,
+          532,  639,  735,-32766,  736,  675,-32766,-32766,-32766,  727,
+        -32766,  725,-32766,  694,-32766,  543,  795,-32766,  687,  981,
+           87,-32766,-32766,-32766,  364,  535,-32766,-32766,  540,  541,
+        -32766,  545,  548,-32766,  417,-32766,-32766,  549,  553,  554,
+          274,-32766,  275,  544,-32766,-32766,-32766,-32766,-32766,  346,
+          347,  530,  900,  986,  629,  989, 1013,  645,-32766, 1016,
+         1015,-32766,-32766,-32766,  648,-32766,  647,-32766,  712,-32766,
+        -32766,-32766,-32766,  804,  700,  907,-32766,-32766,-32766,  364,
+          906,-32766,-32766,  709,  702,-32766,  734,  733,-32766,  417,
+        -32766,-32766,  908,  710,  711,  673,-32766,  534,  646,-32766,
+        -32766,-32766,-32766,   45,  115,  116,  117,  118,  119,  120,
+          121,  122,  123,  124,  125,  126,  364, -406, -407, -408,
+         -428,  357,  352,  284,  252,-32766,-32766,-32766,-32766, -430,
+           38,  251,  250,  249,  232,  231,-32766,-32766,-32766,-32766,
+          228,  147,  145,  138,  844,  846,   86,   85,   84,   83,
+           82,   80,   54,   47,   41, -403,  476, -199, -198,   21,
+           26,   29,  260,  307,  471,  487,    0,  524,  887,  884,
+          937,  929,  522,  389,  385,  383,  381,   25,   24,   23,
+            0, -374,    0,  938,  495, 1011,  980,  968,  967,    0,
+          954,    0,    0,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,    0,    0,    0, -403,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0, -403,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0, -403,    0,    0,    0,    0,
-            0,    0, -403
+         -403,    0,    0,    0,    0,    0,    0, -403
     );
 
     protected $actionCheck = array(
@@ -346,158 +345,157 @@ class Php7 extends \PhpParser\ParserAbstract
            79,   30,   31,   32,   33,   34,   47,   48,    8,    9,
            10,   82,   53,   13,   55,   56,   57,   58,   59,   60,
            61,   62,   63,   64,   65,  123,   67,   68,   69,   70,
-           71,    0,  130,   82,   75,   76,   77,    7,   79,   67,
-           81,    7,   83,   84,   85,   86,   29,   88,  128,   90,
+           71,    0,  130,    7,   75,   76,   77,    7,   79,   67,
+           81,   13,   83,   84,   85,   86,    7,   88,  128,   90,
            67,   92,    7,  151,   95,    8,    9,   10,   99,  100,
           101,  102,  142,  104,  105,   67,   83,  108,  139,  149,
-          111,  112,  113,  114,    7,   28,   67,  156,  119,  120,
+          111,  112,  113,  114,   77,   28,   67,  156,  119,  120,
           121,  122,  123,  124,  125,  130,  131,  143,  129,  130,
           146,  132,  133,  134,  135,  136,  137,  138,  143,    7,
-          128,  146,  143,  144,  145,  146,  155,  148,  149,   13,
+          128,  146,  143,  144,  145,  146,    7,  148,  149,    7,
           151,    7,  153,  130,  155,  156,    2,    3,    4,    5,
             6,  149,    8,    9,   10,   11,   12,    8,    9,   10,
-          103,   72,   73,   74,  151,   79,  109,  128,   77,  112,
-          113,  114,  115,  116,  117,  118,   29,   28,  150,   30,
+          103,   72,   73,   74,  151,    7,  109,  128,   77,  112,
+          113,  114,  115,  116,  117,  118,  149,   28,  150,   30,
            31,   32,   33,   34,   35,    7,   41,   42,   43,   44,
-           45,   46,   47,   48,   49,  148,    7,   35,   54,   29,
-            8,    9,   10,  112,  113,  114,  115,  116,  117,   72,
-           73,   74,   68,   69,   70,   71,   72,   73,   74,    7,
-           28,   77,   30,   31,   32,   33,  140,  141,   84,   85,
+           45,   46,   47,   48,   49,   72,   73,   74,   54,   29,
+            8,    9,   10,  112,  113,  114,  115,  116,  117,    8,
+          152,    7,   68,   69,   70,   71,   72,   73,   74,   79,
+           28,   77,   30,   31,   32,   33,    7,  152,   84,   85,
            86,   87,   88,   89,   90,   91,   92,   93,   94,   95,
            96,   97,   98,   99,  100,  101,  102,  103,  104,  105,
           106,  107,  108,  109,  110,  111,  112,  113,  114,  115,
           116,  117,  118,  119,  120,  121,    1,  123,  124,  125,
-          126,  127,  102,  129,  130,  131,    7,   67,  152,    8,
-            9,   10,   82,  113,  114,    7,  152,  143,  154,    0,
-            7,  129,  122,  123,  124,  125,  149,    7,    7,   28,
+          126,  127,  102,  129,  130,  131,    7,   67,   29,    8,
+            9,   10,   79,  113,  114,   82,  152,  143,  154,  149,
+           13,    7,  122,  123,  124,  125,  156,  102,  103,   28,
            35,   30,   31,   32,   33,   34,   35,   36,   37,   38,
            39,   40,   41,   42,   43,   44,   45,   46,   47,   48,
-           49,   50,   51,   52,   67,   54,  148,    7,  103,   96,
-           97,   98,  130,  131,  109,    8,   71,   66,  128,  139,
-            1,  152,   77,  154,   67,  143,   81,  122,  146,   84,
-           85,   86,  142,   88,  152,   90,    7,   92,   79,  149,
+           49,   50,   51,   52,    7,   54,  148,   15,  103,   96,
+           97,   98,  130,  131,  109,    7,   71,   66,  128,   35,
+            1,  146,   77,  140,  141,  143,   81,  122,  146,   84,
+           85,   86,  142,   88,  152,   90,  152,   92,  154,  149,
            95,  151,    7,    7,   99,  100,  101,  102,  143,  104,
-          105,   13,    7,  108,   35,  150,  111,  112,  113,  114,
-            8,    9,   15,  150,  119,  128,   15,  122,  123,  124,
-          125,   67,  103,   50,   51,   52,   77,   54,  109,  142,
-           77,   77,    7,   79,   15,  128,  149,   83,  151,   66,
-           71,  122,  147,  148,  149,    1,   77,  152,   15,  142,
-           81,  152,   15,   84,   85,   86,  149,   88,  149,   90,
-          152,   92,  143,   15,   95,  156,  112,   15,   99,  100,
-          101,  102,  152,  104,  105,  146,   29,  108,  149,   35,
-          111,  112,  113,  114,  130,   29,   29,    7,  119,  102,
-          103,  122,  123,  124,  125,  103,  143,  143,  149,  146,
-          146,  109,  152,  150,   29,  151,   96,   97,   98,   35,
-          156,    7,    7,   29,  122,   71,  147,  148,  149,    1,
-           29,   77,   72,   73,   54,   81,   72,   73,   84,   85,
-           86,  152,   88,  146,   90,  143,   92,  152,  152,   95,
-           97,   98,  150,   99,  100,  101,  102,  152,  104,  105,
-           67,   29,  108,   35,   66,  111,  112,  113,  114,  102,
-          150,   79,   68,  119,  102,  103,  122,  123,  124,  125,
-          113,  114,   74,  148,    8,    9,   10,  106,  107,  122,
-          123,  124,  125,  148,  149,  103,  148,  149,    1,   71,
-           74,  109,  148,  149,   28,   77,   30,   31,   32,   81,
-          118,   77,   84,   85,   86,   77,   88,   77,   90,   77,
-           92,  148,  149,   95,   79,   77,   29,   99,  100,  101,
-          102,   77,  104,  105,  102,   77,  108,   77,  148,  111,
-          112,  113,  114,   77,   77,  113,  114,  119,   77,  102,
-          122,  123,  124,  125,  122,  123,  124,  125,   79,   79,
-          113,  114,  148,  148,    1,   79,   79,   82,   71,  122,
-          123,  124,  125,   82,   77,   82,  148,  149,   81,   87,
-           86,   84,   85,   86,   89,   88,   96,   90,  110,   92,
-           91,   93,   95,  109,   94,   94,   99,  100,  101,  102,
-           94,  104,  105,   94,   96,  108,   29,  102,  111,  112,
-          113,  114,  102,    8,    9,   10,  119,  129,  146,  122,
-          123,  124,  125,  127,  142,  123,  123,  146,  139,  146,
-          126,  154,   -1,   28,   71,   30,   31,  126,    1,   -1,
-           77,   78,   -1,   -1,   81,  148,  149,   84,   85,   86,
-           -1,   88,   -1,   90,  142,   92,  142,  142,   95,  146,
-          153,   -1,   99,  100,  101,  102,  146,  104,  105,  146,
-          146,  108,   35,  146,  111,  112,  113,  114,  147,  102,
-          148,  148,  119,  148,  148,  122,  123,  124,  125,  148,
-          113,  114,  148,    1,  148,  148,  148,  148,  148,  122,
-          123,  124,  125,  148,  148,  148,  148,  148,   71,  148,
-          148,  148,  149,  148,   77,  148,  148,  148,   81,  148,
-          148,   84,   85,   86,  148,   88,  148,   90,  148,   92,
-          148,  150,   95,  149,  149,  149,   99,  100,  101,  102,
-          149,  104,  105,  149,  149,  108,  149,  149,  111,  112,
-          113,  114,  149,  149,  152,  149,  119,  149,   29,  122,
-          123,  124,  125,   71,  149,  149,  149,  154,  150,   77,
-          150,  150,  150,   81,  150,  150,   84,   85,   86,  150,
-           88,  150,   90,  150,   92,  148,  149,   95,  150,  150,
-          150,   99,  100,  101,  102,  150,  104,  105,  150,  150,
-          108,  150,  150,  111,  112,  113,  114,  150,  150,  150,
-          150,  119,  150,  150,  122,  123,  124,  125,   15,   16,
-           17,   18,   19,   20,   21,   22,   23,   24,   25,   26,
-           27,  102,  150,  150,  154,  151,  151,  151,  151,  151,
-          148,  149,  113,  114,  151,  151,  151,  151,  151,  151,
-          151,  122,  123,  124,  125,  151,  151,  151,  151,   56,
-           57,  151,  151,  151,  151,  151,  151,  151,  151,  151,
-           67,  151,  151,  151,   -1,  152,  152,  152,  152,  152,
-          152,   -1,  152,  152,  152,  152,  152,  152,  152,  152,
-          152,  152,  152,  152,  152,  152,  152,  152,  152,   -1,
-           -1,  154,  154,  154,   -1,   -1,   -1,   -1,   -1,   -1,
+          105,  152,   15,  108,   35,  150,  111,  112,  113,  114,
+           15,    0,    7,  150,  119,   67,    7,  122,  123,  124,
+          125,    7,   67,   50,   51,   52,    7,   54,  149,    8,
+            9,   10,   77,   15,   79,   15,   77,    7,   83,   66,
+           71,   29,  147,  148,  149,    1,   77,  152,   15,   28,
+           81,   30,   31,   84,   85,   86,  103,   88,   15,   90,
+           29,   92,  109,  129,   95,   67,  152,  112,   99,  100,
+          101,  102,   35,  104,  105,  122,  128,  108,   29,   35,
+          111,  112,  113,  114,  146,  130,   29,  149,  119,   29,
+          142,  122,  123,  124,  125,  148,  143,  149,  143,  151,
+            1,  146,  143,  150,   29,  146,  151,   72,   73,  150,
+          152,  156,    8,    9,  103,   71,  147,  148,  149,   54,
+          109,   77,   72,   73,   66,   81,  128,   68,   84,   85,
+           86,   67,   88,  122,   90,   29,   92,  152,  152,   95,
+          142,   29,   74,   99,  100,  101,  102,  149,  104,  105,
+           74,   79,  108,  148,  143,  111,  112,  113,  114,   77,
+          148,  152,  148,  119,   97,   98,  122,  123,  124,  125,
+           71,  152,  102,  103,    1,  103,   77,   78,  148,   77,
+           81,  109,   77,   84,   85,   86,   77,   88,   77,   90,
+          118,   92,  148,  149,   95,  106,  107,   77,   99,  100,
+          101,  102,   29,  104,  105,   77,   29,  108,  102,   77,
+          111,  112,  113,  114,  102,   96,   97,   98,  119,  113,
+          114,  122,  123,  124,  125,  113,  114,   77,  122,  123,
+          124,  125,  148,  149,  122,  123,  124,  125,  148,  149,
+          148,  149,   77,   77,   71,   82,   79,  148,  149,    1,
+           77,   79,   82,   79,   81,   79,   87,   84,   85,   86,
+           79,   88,   91,   90,   86,   92,  102,  109,   95,  150,
+          102,   89,   99,  100,  101,  102,   93,  104,  105,  102,
+           94,  108,   94,   35,  111,  112,  113,  114,   94,   94,
+          113,  114,  119,   96,   96,  122,  123,  124,  125,  122,
+          123,  124,  125,  110,    8,    9,   10,  123,  123,  129,
+          148,  150,  152,  126,  139,  126,   -1,  127,  139,   71,
+           -1,  148,  149,    1,   28,   77,   30,   31,   32,   81,
+           -1,   -1,   84,   85,   86,   -1,   88,  146,   90,  147,
+           92,  142,  142,   95,  142,  142,  150,   99,  100,  101,
+          102,  146,  104,  105,  102,  146,  108,   35,  146,  111,
+          112,  113,  114,  146,  146,  113,  114,  119,  146,  146,
+          122,  123,  124,  125,  122,  123,  124,  125,    1,  148,
+          148,  148,  148,  148,  148,  148,  148,  148,  148,  148,
+          148,  148,  148,   71,  148,  148,  148,  149,  148,   77,
+          149,  148,  148,   81,  148,  148,   84,   85,   86,  148,
+           88,  148,   90,  148,   92,  148,  148,   95,  148,  150,
+          149,   99,  100,  101,  102,  149,  104,  105,  149,  149,
+          108,  149,  149,  111,  112,  113,  114,  149,  149,  149,
+          149,  119,  149,   29,  122,  123,  124,  125,   71,  149,
+          149,  149,  153,  150,   77,  150,  150,  150,   81,  150,
+          150,   84,   85,   86,  150,   88,  150,   90,  150,   92,
+          148,  149,   95,  150,  150,  150,   99,  100,  101,  102,
+          150,  104,  105,  150,  150,  108,  150,  150,  111,  112,
+          113,  114,  150,  150,  150,  150,  119,  150,  150,  122,
+          123,  124,  125,   15,   16,   17,   18,   19,   20,   21,
+           22,   23,   24,   25,   26,   27,  102,  151,  151,  151,
+          151,  151,  151,  151,  151,  148,  149,  113,  114,  151,
+          151,  151,  151,  151,  151,  151,  122,  123,  124,  125,
+          151,  151,  151,  151,   56,   57,  151,  151,  151,  151,
+          151,  151,  151,  151,  151,   67,  152,  152,  152,  152,
+          152,  152,  152,  152,  152,  152,   -1,  152,  152,  152,
+          152,  152,  152,  152,  152,  152,  152,  152,  152,  152,
+           -1,  153,   -1,  154,  154,  154,  154,  154,  154,   -1,
+          155,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+           -1,   -1,   -1,   -1,   -1,   -1,  128,   -1,   -1,   -1,
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-           -1,  128,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-           -1,   -1,   -1,   -1,   -1,  142,   -1,   -1,   -1,   -1,
-           -1,   -1,  149
+          142,   -1,   -1,   -1,   -1,   -1,   -1,  149
     );
 
     protected $actionBase = array(
-            0,  243,  390,  299,  235,  372,  147,   99,  753,  695,
-          562,  568,  569,  732,  730,  721,  478,  565,  719,  718,
-          715,  647,  502,  437,  180,  437,  799,  517,  517,  517,
-          289,  333,  605,  154,  154,  154,  154,  101,  275,  349,
-          707,  707,  707,  633,  567,  424,  498,  762,  762,  762,
-          762,  762,  762,  762,  762,  762,  762,  762,  762,  762,
-          762,  762,  762,  762,  762,  762,  762,  762,  762,  762,
-          762,  762,  762,  762,  762,  762,  762,  762,  762,  762,
-          762,  762,  762,  762,  762,  762,  762,  762,  762,  762,
-          762,  762,  762,  762,  762,  762,  762,  762,  762,  762,
-          762,  762,  762,  762,  762,  762,  762,  762,  762,  762,
-          762,  762,  762,  762,  762,  762,  762,  762,  762,  762,
-          762,  762,  762,  762,  762,  762,  762,  762,  762,  762,
-          762,  762,  762,  762,  762,  762,  762,  762,  762,  762,
-          762,  762,  762,  762,  762,  762,  762,  762,   57,  619,
-          368,  606,  798,  804,  801,  796,  795,  579,  800,  805,
-          694,  692,  427,  691,  651,  688,  690,  802,  819,  797,
-          803,  281,  281,  281,  281,  281,  281,  281,  281,  281,
-          281,  281,  281,  281,  281,  281,  281,  337,   40,  382,
+            0,  499,  243,  391,  235,  333,  133,   99,  725,  727,
+          549,  563,  551,  714,  713,  710,  448,  562,  705,  704,
+          703,  492,  486,  794,  180,  794,  557,  632,  632,  632,
+          150,  339,  627,  154,  154,  154,  154,  101,  275,  349,
+          628,  628,  628,  479,  553,  702,  424,  757,  757,  757,
+          757,  757,  757,  757,  757,  757,  757,  757,  757,  757,
+          757,  757,  757,  757,  757,  757,  757,  757,  757,  757,
+          757,  757,  757,  757,  757,  757,  757,  757,  757,  757,
+          757,  757,  757,  757,  757,  757,  757,  757,  757,  757,
+          757,  757,  757,  757,  757,  757,  757,  757,  757,  757,
+          757,  757,  757,  757,  757,  757,  757,  757,  757,  757,
+          757,  757,  757,  757,  757,  757,  757,  757,  757,  757,
+          757,  757,  757,  757,  757,  757,  757,  757,  757,  757,
+          757,  757,  757,  757,  757,  757,  757,  757,  757,  757,
+          757,  757,  757,  757,  757,  757,  757,  757,  392,  650,
+          287,  645,  790,  796,  792,  788,  787,  575,  791,  797,
+          686,  541,  429,  576,  649,  683,  685,  793,  810,  789,
+          795,  281,  281,  281,  281,  281,  281,  281,  281,  281,
+          281,  281,  281,  281,  281,  281,  281,  211,   40,  484,
             8,    8,    8,    8,    8,    8,    8,    8,    8,    8,
             8,    8,    8,    8,    8,    8,    8,    8,   87,   87,
-           87,  675,  546,  202,   11,  873,  159,   -2,   -2,   -2,
-           -2,   -2,  155,  155,  155,  155,  172,  172,  558,  558,
-          474,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-          334,  709,  733,  729,  728,  -25,  -25,  -58,  462,  212,
-          212,  212,  212,   23,   -5,   -5,  210,  -31,   -9,  220,
-          267,  353,  353,  353,  367,  563,  555,  329,  329,  559,
-          561,  287,  287,  -40,  287,  442,  442,  442,  -16,  -16,
-          -16,  -16,  309,  -16,  -16,  -16,  676,   96,   96,  -65,
-          578,  727,  415,  560,  722,   12,  199,  144,  590,  583,
-          -39,  575,  -39,  451,  434,  430,  584,  -39,  -39,  157,
-           57,  418,  450,  614,  510,  405,  602,  484,  485,   49,
-          443,  375,  678,  603,  793,  300,  672,  359,  288,   38,
-          450,  450,  450,  279,  685,  687,  365,  136,  752,  686,
-          366,  710,  701,  460,  188,  699,  330,  652,  504,  504,
-          504,  504,  504,  504,  454,  504,  524,  754,  754,  512,
-          557,  454,  788,  454,  504,  754,  454,  132,  454,  574,
-          504,  581,  581,  524,  549,  566,  754,  754,  566,  512,
-          454,  646,  642,  554,  601,  471,  471,  554,  454,  471,
-          557,  471,   71,  787,  786,  464,  785,  790,  784,  757,
-          783,  536,  673,  573,  572,  775,  774,  782,  518,  537,
-          776,  792,  597,  641,  541,  377,  585,  463,  755,  575,
-          553,  468,  468,  468,  463,  764,  468,  468,  468,  468,
-          468,  468,  468,  468,  818,  552,  564,  639,  638,  637,
-          432,  635,  594,  570,  381,  668,  597,  597,  577,  528,
-          769,  807,  781,  650,   70,  428,  768,  542,  508,  551,
-          767,  667,  806,  530,  703,  597,  468,  765,  791,  817,
-          750,  756,  683,  812,  222,  593,  632,  293,  547,  665,
-          664,  648,  815,  811,  810,  580,  293,  631,  794,  758,
-          556,  763,  661,  417,  413,  708,  780,  629,  814,  813,
-          816,  628,  627,  656,  655,  399,  777,  436,  496,  626,
-          515,  550,  654,  766,  625,  620,  808,  571,  553,  582,
-          548,  576,  674,  809,  455,  611,  618,  617,  616,    0,
+           87,  401,  676,  202,   11,  868,  159,   -2,   -2,   -2,
+           -2,   -2,  155,  155,  155,  155,  314,  314,  560,  560,
+          439,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+          335,  698,  724,  723,  722,  -25,  -25,  -58,  452,  212,
+          212,  212,  212,   23,   -5,  -31,   -5,  559,  815,  328,
+          220,  353,  353,  353,  205,  550,  213,  213,   37,   37,
+          -40,  -40,  378,  -40,  450,  450,  450,  -16,  -16,  -16,
+          -16,  318,  -16,  -16,  -16,  651,  543,  -65,  578,  717,
+          470,  577,  716,   12,  144,  214,  589,  585,  -39,  544,
+          -39,  469,  430,  415,  580,  -39,  -39,  259,  392,  472,
+          445,  617,  482,  385,  633,  410,  394,   49,  464,  389,
+          671,  630,  784,  399,  540,   85,  338,   38,  445,  445,
+          445,  229,  673,  680,  365,   68,  696,  681,  366,  694,
+          687,  327,  188,  728,  294,  648,  485,  485,  485,  485,
+          485,  485,  417,  485,  491,  759,  759,  545,  554,  417,
+          781,  417,  485,  759,  417,  132,  417,  569,  485,  567,
+          567,  491,  561,  570,  759,  759,  570,  545,  417,  613,
+          647,  538,  572,  437,  437,  538,  417,  437,  554,  437,
+           71,  780,  779,  411,  778,  782,  777,  750,  776,  500,
+          682,  564,  565,  764,  763,  775,  489,  546,  769,  783,
+          592,  542,  512,  400,  579,  444,  746,  544,  597,  438,
+          438,  438,  444,  748,  438,  438,  438,  438,  438,  438,
+          438,  438,  809,  583,  558,  611,  612,  618,  413,  619,
+          602,  568,  423,  631,  555,  592,  592,  808,  679,  462,
+          762,  799,  772,  615,  139,  398,  761,  603,  508,  571,
+          760,  656,  798,  530,  689,  592,  438,  749,  758,  814,
+          813,  747,  812,  804,  168,  598,  620,   66,  811,  659,
+          660,  614,  807,  803,  802,  548,   66,  623,  785,  751,
+          556,  752,  662,  375,  322,  690,  771,  624,  806,  805,
+          786,  626,  634,  663,  668,  367,  770,  440,  456,  636,
+          547,  552,  669,  753,  637,  641,  800,  566,  597,  582,
+          573,  574,  670,  801,  455,  643,  621,  622,  616,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,   -1,   -1,
@@ -523,19 +521,19 @@ class Php7 extends \PhpParser\ParserAbstract
           281,  281,  281,  281,  281,  281,  281,  281,  281,  281,
           281,  281,  281,  281,  281,  281,  281,  281,  281,  281,
           281,  281,    0,  281,  281,  281,  281,  281,  281,  353,
-          353,  353,  353,  334,  334,  334,  334,  334,    0,    0,
+          353,  353,  353,  335,  335,  335,  335,  335,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,   67,   67,
-           67,   67,  353,  353,  334,   67,  504,  504,  504,  504,
-          334,  504,  504,   96,   96,   96,    0,    0,    0,    0,
-            0,  504,   96,   96,  -39,  -39,   96,   96,    0,    0,
-            0,    0,  504,  504,  504,  504,  504,  504,  504,  504,
-          504,  504,  504,  -39,    0,    0,    0,  423,  423,  293,
-          423,  423,    0,    0,    0,  504,  504,    0,  549,    0,
-            0,    0,    0,  754,    0,    0,    0,    0,    0,  468,
-           70,  769,    0,  107,    0,    0,    0,    0,    0,  528,
-          107,  301,    0,  301,    0,    0,    0,  468,  468,  468,
-            0,  528,  528,    0,    0,   74,  528,    0,   74,   85,
-            0,    0,   85,    0,  293
+           67,   67,  353,  353,  335,   67,  485,  485,  485,  485,
+          335,  485,  213,  485,  213,  213,    0,    0,    0,    0,
+            0,  485,  213,    0,    0,  -39,  -39,    0,    0,    0,
+            0,  485,  485,  485,  485,  485,  485,  485,  485,  485,
+          485,  485,  -39,  213,    0,  447,  447,   66,  447,  447,
+            0,    0,    0,  485,  485,    0,  561,    0,    0,    0,
+            0,  759,    0,    0,    0,    0,    0,  438,  139,  762,
+            0,   79,    0,    0,    0,    0,    0,  462,   79,  279,
+            0,  279,    0,    0,    0,  438,  438,  438,    0,  462,
+          462,    0,    0,  142,  462,    0,  142,   70,    0,    0,
+           70,    0,   66
     );
 
     protected $actionDefault = array(
@@ -565,25 +563,25 @@ class Php7 extends \PhpParser\ParserAbstract
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,  250,  250,  250,  250,  305,  306,32767,  251,  210,
           210,  210,  210,32767,  210,32767,32767,32767,32767,  393,
-          322,  300,  301,  299,32767,  373,32767,32767,32767,32767,
-          375,  288,  290,  368,  271,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,  374,32767,32767,
-        32767,32767,32767,32767,32767,  370,  403,  403,32767,32767,
-        32767,  362,32767,  144,  194,  196,  378,32767,32767,32767,
-        32767,32767,  310,32767,32767,32767,32767,32767,32767,  452,
-        32767,32767,32767,32767,32767,  403,32767,  403,32767,32767,
-          302,  303,  304,32767,32767,32767,  403,  403,32767,32767,
-          403,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,  148,32767,32767,  376,  376,32767,
-        32767,  148,  371,  148,32767,32767,  148,  399,  148,  161,
-        32767,  159,  159,32767,32767,  163,32767,  417,  163,32767,
-          148,  180,  180,  354,  150,  212,  212,  354,  148,  212,
-        32767,  212,32767,32767,32767,   72,32767,32767,32767,32767,
+          322,  300,  301,  299,32767,  373,32767,  375,32767,32767,
+          288,  290,  368,  271,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,  364,32767,32767,32767,32767,  394,  415,  362,
-        32767,  308,  309,  311,32767,  405,  333,  334,  335,  336,
-          337,  338,  339,  341,32767,  367,32767,32767,32767,32767,
-        32767,32767,   74,   98,  226,32767,   74,  365,32767,32767,
+        32767,32767,32767,  370,  403,  403,32767,32767,32767,  362,
+        32767,  144,  194,  196,  378,32767,32767,32767,32767,32767,
+          310,32767,32767,32767,32767,32767,32767,  453,32767,32767,
+        32767,32767,32767,  403,32767,  403,32767,32767,  302,  303,
+          304,32767,32767,32767,  403,  403,32767,32767,  403,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,  148,32767,32767,  376,  376,32767,32767,  148,
+          371,  148,32767,32767,  148,  399,  148,  161,32767,  159,
+          159,32767,32767,  163,32767,  417,  163,32767,  148,  180,
+          180,  354,  150,  212,  212,  354,  148,  212,32767,  212,
+        32767,32767,32767,   72,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
+          364,32767,32767,32767,32767,  394,  415,  362,32767,  308,
+          309,  311,32767,  405,  333,  334,  335,  336,  337,  338,
+          339,  341,32767,  367,32767,32767,32767,32767,32767,32767,
+           74,   98,  226,32767,  452,   74,  365,  452,32767,32767,
         32767,32767,32767,32767,  267,32767,32767,   74,32767,   74,
         32767,32767,32767,32767,  403,  366,  307,  379,  421,32767,
         32767,  404,32767,32767,  201,   74,32767,  162,32767,32767,
@@ -600,44 +598,45 @@ class Php7 extends \PhpParser\ParserAbstract
     protected $goto = array(
           177,  177,  150,  150,  150,  160,  162,  193,  178,  175,
           175,  175,  175,  176,  176,  176,  176,  176,  176,  176,
-          171,  172,  173,  174,  190,  188,  191,  421,  422,  312,
-          423,  426,  427,  428,  429,  430,  431,  432,  433,  831,
+          171,  172,  173,  174,  190,  188,  191,  419,  420,  310,
+          421,  424,  425,  426,  427,  428,  429,  430,  431,  831,
           151,  152,  153,  154,  155,  156,  157,  158,  159,  161,
           187,  189,  192,  208,  211,  212,  213,  214,  216,  217,
           218,  219,  220,  221,  222,  223,  224,  225,  245,  246,
-          261,  262,  263,  330,  331,  332,  466,  194,  195,  196,
+          261,  262,  263,  328,  329,  330,  466,  194,  195,  196,
           197,  198,  199,  200,  201,  202,  203,  204,  205,  206,
           163,  207,  164,  179,  180,  181,  209,  182,  165,  166,
           167,  183,  168,  210,  148,  184,  185,  169,  186,  170,
-          519,  442,  291, 1005, 1005,  467,  802,  528,  468,  690,
-          513,  800,  446,  446,  446, 1008, 1005,  504,   32,  446,
-          512,  664,  311,    9,  757,  757,  995,  995,    4,    6,
-            5,   10,   11, 1008, 1008,  459,  446,   12,   13,  527,
-            1,   14,   15,   16,   17,    2,   18,   19,    7,   20,
-          424,  424,  424,  424,  424,  424,  424,  424,  424,  424,
-          424,  424,  424,  424,  424,  337,  500,  327,  327,  274,
-          325,  325,  271,  272,  296,  464,  336,  297,  340,  488,
-          774,  916,  633,  633,  633,  446,  446,  457,  475,  446,
-          446,  462,  446,  657,  438,  441,  451,  469,  470,  472,
-          242,  447,  634,  634,  634,  243,  244,  465,  425,  425,
-          425,  425,  425,  425,  425,  425,  425,  425,  425,  425,
-          425,  425,  425,  632,  632,  632,  999,  657,  657,  483,
-          484,  523,  313,  314,  481,  498,  450,  499,  460,  829,
-          917,  743,  728,  726,  724,  726,  537,  436,  752,  747,
-          384,  918,  971,  486,  292,  347,  270,  258,   35,  435,
-          992,  326,  293,  294,  878,  435,  298,  761,  982,  770,
-          341,  320,  653,  323,  778,  651,  547,  650,  650,  658,
-          658,  658,  660,  345,  649,  909,  914,  378,  781,  661,
-          480,  389,  731,  818,    0,    0,    0,    0,    0,    0,
+          519,  440,  436,  439,  451,  469,  470,  472,  289, 1006,
+         1006,  445,  445,  445,  690,   32,  468,  527,  445, 1006,
+          242,    9,  433,  916,  664,  243,  244,    6,  433,   10,
+           11,  481,  498,  459,  445,   12,   13,  774,    1,   14,
+           15,   16,   17,    2,   18,   19,    7,   20,  422,  422,
+          422,  422,  422,  422,  422,  422,  422,  422,  422,  422,
+          422,  422,  422,  335,  500,  325,  325,  273,  323,  323,
+          270,  271,  294,  464,  334,  295,  338,  488,  633,  633,
+          633,  462,  917,  445,  445,  457,  475,  445,  445,    4,
+          445,    5,  657,  918,  971,  467,  802,  528,  999,  446,
+          513,  800,  634,  634,  634,  465,  423,  423,  423,  423,
+          423,  423,  423,  423,  423,  423,  423,  423,  423,  423,
+          423,  632,  632,  632,  657,  657,  311,  504, 1005, 1005,
+          512,  312,  309,  499,  450,  829,  460,  992, 1005,  743,
+          728,  726,  724,  726,  537,  434,  752,  747,  382,  757,
+          757,  995,  995,  483,  484,  523,   35, 1008,  324,  486,
+          290,  345,  267,  258,  878,  770,  761,  982,  296,  339,
+          291,  292,  653,  318,  650,  650,  658,  658,  658,  660,
+          321,  649,  651,  778,  547,  343,  909,  376,  914,  661,
+          480,  781,  731,  387,  818,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,  920,    0,  764,  764,
-          764,  764,  920,  764,  764,  979,    0,    0,    0,  810,
-            0,  979,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,  990,  990,  722,  722,  722,
-          722,    0,  717,  723,  511,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,  977,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,    0,    0,  780,    0,
-          780,    0,    0,    0,    0,  983,  984
+          764,  764,  920,  764,    0,  764,  810,    0,    0,    0,
+            0,    0,    0,  979,    0,    0,    0,    0,    0,  979,
+            0,    0,    0,    0,    0,    0,  722,  722,  722,  722,
+            0,  717,  723,  511,  990,  990,    0,    0,    0,    0,
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+            0,  977,    0,    0,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,    0,  780,    0,  780,    0,    0,    0,
+            0,  983,  984
     );
 
     protected $gotoCheck = array(
@@ -652,65 +651,68 @@ class Php7 extends \PhpParser\ParserAbstract
            22,   22,   22,   22,   22,   22,   22,   22,   22,   22,
            22,   22,   22,   22,   22,   22,   22,   22,   22,   22,
            22,   22,   22,   22,   22,   22,   22,   22,   22,   22,
-           48,    7,   60,  118,  118,    6,    6,    6,   74,   41,
-            6,    6,    7,    7,    7,  118,  118,   52,   86,    7,
-           52,   24,   52,   25,   65,   65,   65,   65,    2,   25,
-            2,   25,   25,  118,  118,    7,    7,   25,   25,    4,
-           25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
+           48,    7,   35,   35,   35,   35,   35,   35,   60,  119,
+          119,    7,    7,    7,   41,   86,   74,    4,    7,  119,
+           56,   25,  103,   70,   24,   56,   56,   25,  103,   25,
+           25,   32,   32,    7,    7,   25,   25,   72,   25,   25,
+           25,   25,   25,   25,   25,   25,   25,   25,  107,  107,
           107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
-          107,  107,  107,  107,  107,   42,   42,   42,   42,   42,
-           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
-           72,   70,   10,   10,   10,    7,    7,    7,    7,    7,
-            7,  109,    7,   18,   35,   35,   35,   35,   35,   35,
-           56,    7,   11,   11,   11,   56,   56,    7,  108,  108,
+          107,  107,  107,   42,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   10,   10,
+           10,  109,   70,    7,    7,    7,    7,    7,    7,    2,
+            7,    2,   18,   70,   70,    6,    6,    6,  117,    7,
+            6,    6,   11,   11,   11,    7,  108,  108,  108,  108,
           108,  108,  108,  108,  108,  108,  108,  108,  108,  108,
-          108,  108,  108,    9,    9,    9,  117,   18,   18,   51,
-           51,   51,   38,   49,   32,   32,   49,   40,   49,   89,
-           70,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-           49,   70,   70,   58,   58,   58,  106,  106,   49,  103,
-          115,   39,   60,   60,   90,  103,   13,   67,  112,   69,
-           17,    8,   20,   12,   73,   19,   62,   18,   18,   18,
-           18,   18,   18,   16,   18,   96,   98,   54,   75,   21,
-           55,   94,   59,   88,   -1,   -1,   -1,   -1,   -1,   -1,
+          108,    9,    9,    9,   18,   18,   38,   52,  118,  118,
+           52,   49,   52,   40,   49,   89,   49,  115,  118,    9,
+            9,    9,    9,    9,    9,    9,    9,    9,   49,   65,
+           65,   65,   65,   51,   51,   51,   49,  118,   39,   58,
+           58,   58,  106,  106,   90,   69,   67,  112,   13,   17,
+           60,   60,   20,    8,   18,   18,   18,   18,   18,   18,
+           12,   18,   19,   73,   62,   16,   96,   54,   98,   21,
+           55,   75,   59,   94,   88,   -1,   -1,   -1,   -1,   -1,
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
            -1,   -1,   -1,   -1,   -1,   -1,   48,   -1,   48,   48,
-           48,   48,   48,   48,   48,   74,   -1,   -1,   -1,   86,
+           48,   48,   48,   48,   -1,   48,   86,   -1,   -1,   -1,
+           -1,   -1,   -1,   74,   -1,   -1,   -1,   -1,   -1,   74,
+           -1,   -1,   -1,   -1,   -1,   -1,   48,   48,   48,   48,
+           -1,   48,   48,   48,   74,   74,   -1,   -1,   -1,   -1,
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
            -1,   74,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-           -1,   -1,   -1,   -1,   -1,   74,   74,   48,   48,   48,
-           48,   -1,   48,   48,   48,   -1,   -1,   -1,   -1,   -1,
-           -1,   -1,   -1,   -1,   74,   -1,   -1,   -1,   -1,   -1,
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   74,   -1,
-           74,   -1,   -1,   -1,   -1,   74,   74
+           -1,   -1,   -1,   -1,   74,   -1,   74,   -1,   -1,   -1,
+           -1,   74,   74
     );
 
     protected $gotoBase = array(
-            0,    0, -393,    0,  112,    0,   85, -153,   -1,  230,
-          189,  209,  -15,   12,    0,    0,  -56,    4,  -61,  -14,
-            5,  -74,  -38,    0,   97, -397,    0,    0,    0,    0,
-            0,    0,  196,    0,    0,  152,    0,    0,  192,   39,
-           20,   94,  -51,    0,    0,    0,    0,    0,   79, -120,
-            0,  -11, -259,    0,  -75,  -78, -325,    0,  -16,  -77,
-         -270,    0,  -24,    0,    0,  -92,    0,   23,    0,   24,
-         -115,    0,  151,  -18,   88,  -76,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,   91,    0,  -87,   19,
-           21,    0,    0,    0,  -86,    0,  -63,    0,  -65,    0,
-            0,    0,    0,   22,    0,    0,    1,  -66,   -8,  160,
-            0,    0,   10,    0,    0,   41,    0,  194, -144,    0
+            0,    0, -332,    0,   90,    0,  175, -153,    2,  228,
+          185,  209,   -6,   14,    0,    0,  -52,    4,  -62,   -5,
+            6,  -72,  -38,    0,  100, -399,    0,    0,    0,    0,
+            0,    0,   93,    0,    0,   60,    0,    0,  186,   36,
+           16,   99,  -53,    0,    0,    0,    0,    0,   79, -120,
+            0,   13, -147,    0,  -73,  -76, -405,    0,   -9,  -75,
+         -262,    0,  -14,    0,    0,   33,    0,   22,    0,   19,
+         -171,    0,  108,   -7,   96,  -71,    0,    0,    0,    0,
+            0,    0,    0,    0,    0,    0,   88,    0,  -84,   15,
+           21,    0,    0,    0,  -82,    0,  -60,    0,  -61,    0,
+            0,    0,    0, -115,    0,    0,    7,  -68,  -10,  150,
+            0,    0,    8,    0,    0,   18,    0,  166,  -19, -138,
+            0
     );
 
     protected $gotoDefault = array(
-        -32768,  392,    3,  559,  620,  628,  493,  412,  443,  669,
-          670,  671,  316,  353,  413,  315,  342,  338,  659,  652,
-          654,  662,  149,  343,  665,    8,  667,  304,  674,  305,
-          508,  676,  453,  678,  679,  437,  317,  318,  454,  324,
-          482,  689,  215,  321,  691,  303,  693,  699,  306,  510,
-          490,  473,  503,  414,  375,  479,  241,  461,  477,  730,
-          290,  738,  552,  746,  749,  415,  474,  760,  380,  768,
-          934,  333,  773,  779,  966,  782,  785,  360,  344,  485,
+        -32768,  390,    3,  559,  620,  628,  493,  410,  441,  669,
+          670,  671,  314,  351,  411,  313,  340,  336,  659,  652,
+          654,  662,  149,  341,  665,    8,  667,  302,  674,  303,
+          508,  676,  453,  678,  679,  435,  315,  316,  454,  322,
+          482,  689,  215,  319,  691,  301,  693,  699,  304,  510,
+          490,  473,  503,  412,  373,  479,  241,  461,  477,  730,
+          288,  738,  552,  746,  749,  413,  474,  760,  378,  768,
+          934,  331,  773,  779,  966,  782,  785,  358,  342,  485,
           789,  790,   31,  794,  520,  521,  809,  248,  817,  830,
-          358,  897,  899,  448,  386,  910,  372,  346,  913,  970,
-          365,  416,  376,  926,  273,  295,  257,  417,  259,  434,
-          998,  418,  377,  973,  328,  993,  367, 1000, 1007,  478
+          356,  897,  899,  448,  384,  910,  370,  344,  913,  970,
+          363,  414,  374,  926,  272,  293,  257,  415,  259,  432,
+          998,  416,  375,  973,  326,  993,  365, 1000, 1007,  286,
+          478
     );
 
     protected $ruleToNonTerminal = array(
@@ -759,8 +761,8 @@ class Php7 extends \PhpParser\ParserAbstract
            74,  113,  104,  104,  104,  104,  104,  104,  102,  102,
           102,  112,  112,  112,   65,  114,  114,  115,  115,  115,
           109,  109,  116,  116,  117,  117,  117,  117,  106,  106,
-          106,  106,  118,  118,  118,  118,  118,  118,  118,  119,
-          119,  119
+          106,  106,  119,  118,  118,  118,  118,  118,  118,  118,
+          120,  120,  120
     );
 
     protected $ruleToLength = array(
@@ -809,8 +811,8 @@ class Php7 extends \PhpParser\ParserAbstract
             2,    3,    1,    4,    4,    3,    3,    3,    1,    3,
             1,    1,    3,    1,    4,    3,    1,    1,    1,    0,
             0,    2,    3,    1,    3,    1,    4,    2,    2,    2,
-            1,    2,    1,    4,    3,    3,    3,    6,    3,    1,
-            1,    1
+            1,    2,    1,    1,    4,    3,    3,    3,    6,    3,
+            1,    1,    1
     );
 
     protected function reduceRule0() {
@@ -2310,11 +2312,11 @@ class Php7 extends \PhpParser\ParserAbstract
     }
 
     protected function reduceRule374() {
-         $this->semValue = array(Scalar\String_::parseEscapeSequences($this->semStack[$this->stackPos-(1-1)], '`'));
+         $this->semValue = array(new Scalar\EncapsedStringPart(Scalar\String_::parseEscapeSequences($this->semStack[$this->stackPos-(1-1)], '`'), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes));
     }
 
     protected function reduceRule375() {
-         foreach ($this->semStack[$this->stackPos-(1-1)] as &$s) { if (is_string($s)) { $s = Node\Scalar\String_::parseEscapeSequences($s, '`', true); } }; $this->semValue = $this->semStack[$this->stackPos-(1-1)];
+         foreach ($this->semStack[$this->stackPos-(1-1)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '`', true); } }; $this->semValue = $this->semStack[$this->stackPos-(1-1)];
     }
 
     protected function reduceRule376() {
@@ -2402,11 +2404,11 @@ class Php7 extends \PhpParser\ParserAbstract
     }
 
     protected function reduceRule397() {
-         foreach ($this->semStack[$this->stackPos-(3-2)] as &$s) { if (is_string($s)) { $s = Node\Scalar\String_::parseEscapeSequences($s, '"', true); } }; $this->semValue = new Scalar\Encapsed($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
+         foreach ($this->semStack[$this->stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '"', true); } }; $this->semValue = new Scalar\Encapsed($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
     }
 
     protected function reduceRule398() {
-         foreach ($this->semStack[$this->stackPos-(3-2)] as &$s) { if (is_string($s)) { $s = Node\Scalar\String_::parseEscapeSequences($s, null, true); } } $s = preg_replace('~(\r\n|\n|\r)\z~', '', $s); if ('' === $s) array_pop($this->semStack[$this->stackPos-(3-2)]);; $this->semValue = new Scalar\Encapsed($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
+         foreach ($this->semStack[$this->stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, null, true); } } $s->value = preg_replace('~(\r\n|\n|\r)\z~', '', $s->value); if ('' === $s->value) array_pop($this->semStack[$this->stackPos-(3-2)]);; $this->semValue = new Scalar\Encapsed($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
     }
 
     protected function reduceRule399() {
@@ -2622,19 +2624,19 @@ class Php7 extends \PhpParser\ParserAbstract
     }
 
     protected function reduceRule452() {
-         $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
+         $this->semValue = new Scalar\EncapsedStringPart($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
     }
 
     protected function reduceRule453() {
-         $this->semValue = new Expr\ArrayDimFetch(new Expr\Variable(substr($this->semStack[$this->stackPos-(4-1)], 1), $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes), $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
+         $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
     }
 
     protected function reduceRule454() {
-         $this->semValue = new Expr\PropertyFetch(new Expr\Variable(substr($this->semStack[$this->stackPos-(3-1)], 1), $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes), $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
+         $this->semValue = new Expr\ArrayDimFetch(new Expr\Variable(substr($this->semStack[$this->stackPos-(4-1)], 1), $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes), $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
     }
 
     protected function reduceRule455() {
-         $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
+         $this->semValue = new Expr\PropertyFetch(new Expr\Variable(substr($this->semStack[$this->stackPos-(3-1)], 1), $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes), $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
     }
 
     protected function reduceRule456() {
@@ -2642,15 +2644,15 @@ class Php7 extends \PhpParser\ParserAbstract
     }
 
     protected function reduceRule457() {
-         $this->semValue = new Expr\ArrayDimFetch(new Expr\Variable($this->semStack[$this->stackPos-(6-2)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes), $this->semStack[$this->stackPos-(6-4)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes);
+         $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
     }
 
     protected function reduceRule458() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
+         $this->semValue = new Expr\ArrayDimFetch(new Expr\Variable($this->semStack[$this->stackPos-(6-2)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes), $this->semStack[$this->stackPos-(6-4)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes);
     }
 
     protected function reduceRule459() {
-         $this->semValue = new Scalar\String_($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
+         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
     }
 
     protected function reduceRule460() {
@@ -2658,6 +2660,10 @@ class Php7 extends \PhpParser\ParserAbstract
     }
 
     protected function reduceRule461() {
+         $this->semValue = new Scalar\String_($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
+    }
+
+    protected function reduceRule462() {
          $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
     }
 }

lib/PhpParser/PrettyPrinter/Standard.php

@@ -772,8 +772,8 @@ class Standard extends PrettyPrinterAbstract
     protected function pEncapsList(array $encapsList, $quote) {
         $return = '';
         foreach ($encapsList as $element) {
-            if (is_string($element)) {
-                $return .= addcslashes($element, "\n\r\t\f\v$" . $quote . "\\");
+            if ($element instanceof Scalar\EncapsedStringPart) {
+                $return .= addcslashes($element->value, "\n\r\t\f\v$" . $quote . "\\");
             } else {
                 $return .= '{' . $this->p($element) . '}';
             }

test/code/parser/expr/shellExec.test

@@ -14,12 +14,16 @@ array(
     )
     1: Expr_ShellExec(
         parts: array(
-            0: test
+            0: Scalar_EncapsedStringPart(
+                value: test
+            )
         )
     )
     2: Expr_ShellExec(
         parts: array(
-            0: test
+            0: Scalar_EncapsedStringPart(
+                value: test
+            )
             1: Expr_Variable(
                 name: A
             )
@@ -27,12 +31,16 @@ array(
     )
     3: Expr_ShellExec(
         parts: array(
-            0: test `
+            0: Scalar_EncapsedStringPart(
+                value: test `
+            )
         )
     )
     4: Expr_ShellExec(
         parts: array(
-            0: test \"
+            0: Scalar_EncapsedStringPart(
+                value: test \"
+            )
         )
     )
 )

test/code/parser/scalar/docString.test

@@ -42,7 +42,9 @@ array(
     )
     4: Scalar_Encapsed(
         parts: array(
-            0: Test
+            0: Scalar_EncapsedStringPart(
+                value: Test
+            )
             1: Expr_Variable(
                 name: a
             )
@@ -50,18 +52,24 @@ array(
     )
     5: Scalar_Encapsed(
         parts: array(
-            0: Test
+            0: Scalar_EncapsedStringPart(
+                value: Test
+            )
             1: Expr_Variable(
                 name: a
             )
-            2:  and
+            2: Scalar_EncapsedStringPart(
+                value:  and
+            )
             3: Expr_PropertyFetch(
                 var: Expr_Variable(
                     name: b
                 )
                 name: c
             )
-            4:  test
+            4: Scalar_EncapsedStringPart(
+                value:  test
+            )
         )
     )
 )

test/code/parser/scalar/docStringNewlines.test

@@ -31,8 +31,10 @@ array(
             0: Expr_Variable(
                 name: var
             )
-            1:
+            1: Scalar_EncapsedStringPart(
+                value:
 
+            )
         )
     )
     4: Scalar_String(
@@ -51,8 +53,10 @@ array(
             0: Expr_Variable(
                 name: var
             )
-            1:
+            1: Scalar_EncapsedStringPart(
+                value:
 
+            )
         )
     )
 )

test/code/parser/scalar/encapsedString.test

@@ -137,25 +137,35 @@ array(
     )
     11: Scalar_Encapsed(
         parts: array(
-            0: \{
+            0: Scalar_EncapsedStringPart(
+                value: \{
+            )
             1: Expr_Variable(
                 name: A
             )
-            2: }
+            2: Scalar_EncapsedStringPart(
+                value: }
+            )
         )
     )
     12: Scalar_Encapsed(
         parts: array(
-            0: \{
+            0: Scalar_EncapsedStringPart(
+                value: \{
+            )
             1: Expr_Variable(
                 name: A
             )
-            2:  }
+            2: Scalar_EncapsedStringPart(
+                value:  }
+            )
         )
     )
     13: Scalar_Encapsed(
         parts: array(
-            0: \
+            0: Scalar_EncapsedStringPart(
+                value: \
+            )
             1: Expr_Variable(
                 name: A
             )
@@ -163,11 +173,15 @@ array(
     )
     14: Scalar_Encapsed(
         parts: array(
-            0: \{
+            0: Scalar_EncapsedStringPart(
+                value: \{
+            )
             1: Expr_Variable(
                 name: A
             )
-            2:  }
+            2: Scalar_EncapsedStringPart(
+                value:  }
+            )
         )
     )
     15: Scalar_Encapsed(
@@ -177,12 +191,16 @@ array(
                     name: A
                 )
             )
-            1: [B]
+            1: Scalar_EncapsedStringPart(
+                value: [B]
+            )
         )
     )
     16: Scalar_Encapsed(
         parts: array(
-            0: $
+            0: Scalar_EncapsedStringPart(
+                value: $
+            )
             1: Expr_ArrayDimFetch(
                 var: Expr_Variable(
                     name: A
@@ -195,11 +213,15 @@ array(
     )
     17: Scalar_Encapsed(
         parts: array(
-            0: A
+            0: Scalar_EncapsedStringPart(
+                value: A
+            )
             1: Expr_Variable(
                 name: B
             )
-            2:  C
+            2: Scalar_EncapsedStringPart(
+                value:  C
+            )
         )
     )
     18: Scalar_Encapsed(