diff --git a/src/parser/xhpast/__tests__/data/base-fail-parse.php.expect b/src/parser/xhpast/__tests__/data/base-fail-parse.php.expect
--- a/src/parser/xhpast/__tests__/data/base-fail-parse.php.expect
+++ b/src/parser/xhpast/__tests__/data/base-fail-parse.php.expect
@@ -1,4 +1,4 @@
 {
-  "tree"   : [],
-  "stream" : []
+  "tree": [],
+  "stream": []
 }
diff --git a/src/parser/xhpast/__tests__/data/base-pass.php.expect b/src/parser/xhpast/__tests__/data/base-pass.php.expect
--- a/src/parser/xhpast/__tests__/data/base-pass.php.expect
+++ b/src/parser/xhpast/__tests__/data/base-pass.php.expect
@@ -1,5 +1,5 @@
 {
-  "tree"   : [
+  "tree": [
     9000,
     0,
     0,
@@ -18,7 +18,7 @@
       ]
     ]
   ],
-  "stream" : [
+  "stream": [
     [
       371,
       6
diff --git a/src/parser/xhpast/__tests__/data/php-access-on-instanciation.expect b/src/parser/xhpast/__tests__/data/php-access-on-instanciation.expect
--- a/src/parser/xhpast/__tests__/data/php-access-on-instanciation.expect
+++ b/src/parser/xhpast/__tests__/data/php-access-on-instanciation.expect
@@ -1,5 +1,5 @@
 {
-  "tree"   : [
+  "tree": [
     9000,
     0,
     74,
@@ -337,7 +337,7 @@
       ]
     ]
   ],
-  "stream" : [
+  "stream": [
     [
       371,
       6
diff --git a/src/parser/xhpast/__tests__/data/php-array-dereference-2.expect b/src/parser/xhpast/__tests__/data/php-array-dereference-2.expect
--- a/src/parser/xhpast/__tests__/data/php-array-dereference-2.expect
+++ b/src/parser/xhpast/__tests__/data/php-array-dereference-2.expect
@@ -1,5 +1,5 @@
 {
-  "tree"   : [
+  "tree": [
     9000,
     0,
     19,
@@ -92,7 +92,7 @@
       ]
     ]
   ],
-  "stream" : [
+  "stream": [
     [
       371,
       6
diff --git a/src/parser/xhpast/__tests__/data/php-array-dereference-3.expect b/src/parser/xhpast/__tests__/data/php-array-dereference-3.expect
--- a/src/parser/xhpast/__tests__/data/php-array-dereference-3.expect
+++ b/src/parser/xhpast/__tests__/data/php-array-dereference-3.expect
@@ -1,5 +1,5 @@
 {
-  "tree"   : [
+  "tree": [
     9000,
     0,
     20,
@@ -111,7 +111,7 @@
       ]
     ]
   ],
-  "stream" : [
+  "stream": [
     [
       371,
       6
diff --git a/src/parser/xhpast/__tests__/data/php-binary-literal.php.expect b/src/parser/xhpast/__tests__/data/php-binary-literal.php.expect
--- a/src/parser/xhpast/__tests__/data/php-binary-literal.php.expect
+++ b/src/parser/xhpast/__tests__/data/php-binary-literal.php.expect
@@ -1,5 +1,5 @@
 {
-  "tree"   : [
+  "tree": [
     9000,
     0,
     2,
@@ -30,7 +30,7 @@
       ]
     ]
   ],
-  "stream" : [
+  "stream": [
     [
       371,
       6
diff --git a/src/parser/xhpast/__tests__/data/php-callable-typehint.php.expect b/src/parser/xhpast/__tests__/data/php-callable-typehint.php.expect
--- a/src/parser/xhpast/__tests__/data/php-callable-typehint.php.expect
+++ b/src/parser/xhpast/__tests__/data/php-callable-typehint.php.expect
@@ -1,5 +1,5 @@
 {
-  "tree"   : [
+  "tree": [
     9000,
     0,
     13,
@@ -78,7 +78,7 @@
       ]
     ]
   ],
-  "stream" : [
+  "stream": [
     [
       371,
       6
diff --git a/src/parser/xhpast/__tests__/data/php-comments.php.expect b/src/parser/xhpast/__tests__/data/php-comments.php.expect
--- a/src/parser/xhpast/__tests__/data/php-comments.php.expect
+++ b/src/parser/xhpast/__tests__/data/php-comments.php.expect
@@ -1,5 +1,5 @@
 {
-  "tree"   : [
+  "tree": [
     9000,
     0,
     8,
@@ -18,7 +18,7 @@
       ]
     ]
   ],
-  "stream" : [
+  "stream": [
     [
       371,
       6
diff --git a/src/parser/xhpast/__tests__/data/php-empty-heredoc.php.expect b/src/parser/xhpast/__tests__/data/php-empty-heredoc.php.expect
--- a/src/parser/xhpast/__tests__/data/php-empty-heredoc.php.expect
+++ b/src/parser/xhpast/__tests__/data/php-empty-heredoc.php.expect
@@ -1,5 +1,5 @@
 {
-  "tree"   : [
+  "tree": [
     9000,
     0,
     8,
@@ -47,7 +47,7 @@
       ]
     ]
   ],
-  "stream" : [
+  "stream": [
     [
       371,
       6
diff --git a/src/parser/xhpast/__tests__/data/php-finally.php.expect b/src/parser/xhpast/__tests__/data/php-finally.php.expect
--- a/src/parser/xhpast/__tests__/data/php-finally.php.expect
+++ b/src/parser/xhpast/__tests__/data/php-finally.php.expect
@@ -1,5 +1,5 @@
 {
-  "tree"   : [
+  "tree": [
     9000,
     0,
     21,
@@ -76,7 +76,7 @@
       ]
     ]
   ],
-  "stream" : [
+  "stream": [
     [
       371,
       6
diff --git a/src/parser/xhpast/__tests__/data/php-heredoc-terminal.php.expect b/src/parser/xhpast/__tests__/data/php-heredoc-terminal.php.expect
--- a/src/parser/xhpast/__tests__/data/php-heredoc-terminal.php.expect
+++ b/src/parser/xhpast/__tests__/data/php-heredoc-terminal.php.expect
@@ -1,5 +1,5 @@
 {
-  "tree"   : [
+  "tree": [
     9000,
     0,
     2,
@@ -30,7 +30,7 @@
       ]
     ]
   ],
-  "stream" : [
+  "stream": [
     [
       371,
       6
diff --git a/src/parser/xhpast/__tests__/data/php-literals.php.expect b/src/parser/xhpast/__tests__/data/php-literals.php.expect
--- a/src/parser/xhpast/__tests__/data/php-literals.php.expect
+++ b/src/parser/xhpast/__tests__/data/php-literals.php.expect
@@ -1,5 +1,5 @@
 {
-  "tree"   : [
+  "tree": [
     9000,
     0,
     39,
@@ -186,7 +186,7 @@
       ]
     ]
   ],
-  "stream" : [
+  "stream": [
     [
       371,
       6
diff --git a/src/parser/xhpast/__tests__/data/php-syntax.php.expect b/src/parser/xhpast/__tests__/data/php-syntax.php.expect
--- a/src/parser/xhpast/__tests__/data/php-syntax.php.expect
+++ b/src/parser/xhpast/__tests__/data/php-syntax.php.expect
@@ -4708,11 +4708,21 @@
                         1172
                       ],
                       [
+                        9081,
+                        1174,
+                        1174
+                      ],
+                      [
                         9047,
                         1176,
                         1176
                       ],
                       [
+                        9081,
+                        1178,
+                        1178
+                      ],
+                      [
                         9047,
                         1180,
                         1180
@@ -4744,9 +4754,19 @@
                         1185
                       ],
                       [
+                        9081,
+                        1187,
+                        1187
+                      ],
+                      [
                         9005
                       ],
                       [
+                        9081,
+                        1188,
+                        1188
+                      ],
+                      [
                         9047,
                         1190,
                         1190
diff --git a/src/parser/xhpast/__tests__/data/php-tags.php.expect b/src/parser/xhpast/__tests__/data/php-tags.php.expect
--- a/src/parser/xhpast/__tests__/data/php-tags.php.expect
+++ b/src/parser/xhpast/__tests__/data/php-tags.php.expect
@@ -1,5 +1,5 @@
 {
-  "tree"   : [
+  "tree": [
     9000,
     0,
     20,
@@ -114,7 +114,7 @@
       ]
     ]
   ],
-  "stream" : [
+  "stream": [
     [
       371,
       6
diff --git a/src/parser/xhpast/__tests__/data/php-yield.php.expect b/src/parser/xhpast/__tests__/data/php-yield.php.expect
--- a/src/parser/xhpast/__tests__/data/php-yield.php.expect
+++ b/src/parser/xhpast/__tests__/data/php-yield.php.expect
@@ -1,5 +1,5 @@
 {
-  "tree"   : [
+  "tree": [
     9000,
     0,
     54,
@@ -208,7 +208,7 @@
       ]
     ]
   ],
-  "stream" : [
+  "stream": [
     [
       371,
       6
diff --git a/src/parser/xhpast/bin/PhutilXHPASTBinary.php b/src/parser/xhpast/bin/PhutilXHPASTBinary.php
--- a/src/parser/xhpast/bin/PhutilXHPASTBinary.php
+++ b/src/parser/xhpast/bin/PhutilXHPASTBinary.php
@@ -8,7 +8,7 @@
    * This is the version that would be obtained with an up-to-date XHPAST
    * build. The //actual// XHPAST build version may vary.
    */
-  const EXPECTED_VERSION = '5.5.8/1i';
+  const EXPECTED_VERSION = '5.5.8/1j';
 
   /**
    * The XHPAST build version.
diff --git a/support/xhpast/parser.y b/support/xhpast/parser.y
--- a/support/xhpast/parser.y
+++ b/support/xhpast/parser.y
@@ -1786,13 +1786,17 @@
 | expr '?' expr ':' expr {
     $$ = NNEW(n_TERNARY_EXPRESSION);
     $$->appendChild($1);
+    $$->appendChild(NTYPE($2, n_OPERATOR));
     $$->appendChild($3);
+    $$->appendChild(NTYPE($4, n_OPERATOR));
     $$->appendChild($5);
   }
 | expr '?' ':' expr {
     $$ = NNEW(n_TERNARY_EXPRESSION);
     $$->appendChild($1);
+    $$->appendChild(NTYPE($2, n_OPERATOR));
     $$->appendChild(NNEW(n_EMPTY));
+    $$->appendChild(NTYPE($3, n_OPERATOR));
     $$->appendChild($4);
   }
 | internal_functions_in_yacc
diff --git a/support/xhpast/parser.yacc.cpp b/support/xhpast/parser.yacc.cpp
--- a/support/xhpast/parser.yacc.cpp
+++ b/support/xhpast/parser.yacc.cpp
@@ -661,24 +661,24 @@
     1600,  1606,  1612,  1618,  1624,  1630,  1636,  1642,  1668,  1674,
     1680,  1686,  1692,  1698,  1704,  1710,  1715,  1720,  1725,  1730,
     1736,  1742,  1748,  1754,  1760,  1766,  1772,  1778,  1784,  1785,
-    1786,  1792,  1798,  1799,  1804,  1809,  1814,  1819,  1824,  1829,
-    1834,  1839,  1844,  1848,  1849,  1850,  1851,  1856,  1862,  1876,
-    1899,  1905,  1911,  1917,  1926,  1930,  1933,  1941,  1944,  1949,
-    1953,  1962,  1967,  1974,  1980,  1989,  1998,  2007,  2016,  2024,
-    2027,  2030,  2034,  2041,  2044,  2048,  2055,  2056,  2060,  2075,
-    2079,  2082,  2088,  2094,  2097,  2101,  2109,  2112,  2118,  2121,
-    2124,  2127,  2130,  2133,  2136,  2139,  2142,  2145,  2148,  2151,
-    2157,  2158,  2159,  2163,  2167,  2172,  2177,  2182,  2187,  2191,
-    2199,  2200,  2201,  2202,  2205,  2208,  2212,  2215,  2221,  2224,
-    2228,  2239,  2246,  2253,  2263,  2264,  2268,  2272,  2276,  2280,
-    2306,  2310,  2313,  2319,  2329,  2335,  2344,  2350,  2351,  2352,
-    2358,  2359,  2374,  2379,  2387,  2391,  2397,  2406,  2407,  2408,
-    2412,  2413,  2416,  2428,  2432,  2438,  2444,  2448,  2451,  2459,
-    2462,  2468,  2469,  2473,  2479,  2485,  2489,  2493,  2499,  2502,
-    2517,  2520,  2527,  2528,  2532,  2538,  2541,  2547,  2554,  2561,
-    2568,  2575,  2582,  2589,  2596,  2606,  2616,  2626,  2629,  2632,
-    2642,  2645,  2651,  2655,  2661,  2666,  2672,  2678,  2684,  2693,
-    2698,  2706,  2715,  2720
+    1786,  1794,  1802,  1803,  1808,  1813,  1818,  1823,  1828,  1833,
+    1838,  1843,  1848,  1852,  1853,  1854,  1855,  1860,  1866,  1880,
+    1903,  1909,  1915,  1921,  1930,  1934,  1937,  1945,  1948,  1953,
+    1957,  1966,  1971,  1978,  1984,  1993,  2002,  2011,  2020,  2028,
+    2031,  2034,  2038,  2045,  2048,  2052,  2059,  2060,  2064,  2079,
+    2083,  2086,  2092,  2098,  2101,  2105,  2113,  2116,  2122,  2125,
+    2128,  2131,  2134,  2137,  2140,  2143,  2146,  2149,  2152,  2155,
+    2161,  2162,  2163,  2167,  2171,  2176,  2181,  2186,  2191,  2195,
+    2203,  2204,  2205,  2206,  2209,  2212,  2216,  2219,  2225,  2228,
+    2232,  2243,  2250,  2257,  2267,  2268,  2272,  2276,  2280,  2284,
+    2310,  2314,  2317,  2323,  2333,  2339,  2348,  2354,  2355,  2356,
+    2362,  2363,  2378,  2383,  2391,  2395,  2401,  2410,  2411,  2412,
+    2416,  2417,  2420,  2432,  2436,  2442,  2448,  2452,  2455,  2463,
+    2466,  2472,  2473,  2477,  2483,  2489,  2493,  2497,  2503,  2506,
+    2521,  2524,  2531,  2532,  2536,  2542,  2545,  2551,  2558,  2565,
+    2572,  2579,  2586,  2593,  2600,  2610,  2620,  2630,  2633,  2636,
+    2646,  2649,  2655,  2659,  2665,  2670,  2676,  2682,  2688,  2697,
+    2702,  2710,  2719,  2724
 };
 #endif
 
@@ -5925,145 +5925,149 @@
     {
     (yyval) = NNEW(n_TERNARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-4]));
+    (yyval)->appendChild(NTYPE((yyvsp[-3]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[-2]));
+    (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5932 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5934 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 261:
-#line 1792 "parser.y" /* yacc.c:1646  */
+#line 1794 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_TERNARY_EXPRESSION);
     (yyval)->appendChild((yyvsp[-3]));
+    (yyval)->appendChild(NTYPE((yyvsp[-2]), n_OPERATOR));
     (yyval)->appendChild(NNEW(n_EMPTY));
+    (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5943 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5947 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 263:
-#line 1799 "parser.y" /* yacc.c:1646  */
+#line 1803 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CAST_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5953 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5957 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 264:
-#line 1804 "parser.y" /* yacc.c:1646  */
+#line 1808 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CAST_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5963 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5967 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 265:
-#line 1809 "parser.y" /* yacc.c:1646  */
+#line 1813 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CAST_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5973 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5977 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 266:
-#line 1814 "parser.y" /* yacc.c:1646  */
+#line 1818 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CAST_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5983 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5987 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 267:
-#line 1819 "parser.y" /* yacc.c:1646  */
+#line 1823 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CAST_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 5993 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 5997 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 268:
-#line 1824 "parser.y" /* yacc.c:1646  */
+#line 1828 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CAST_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 6003 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6007 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 269:
-#line 1829 "parser.y" /* yacc.c:1646  */
+#line 1833 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CAST_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 6013 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6017 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 270:
-#line 1834 "parser.y" /* yacc.c:1646  */
+#line 1838 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 6023 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6027 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 271:
-#line 1839 "parser.y" /* yacc.c:1646  */
+#line 1843 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 6033 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6037 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 272:
-#line 1844 "parser.y" /* yacc.c:1646  */
+#line 1848 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[0]), n_BACKTICKS_EXPRESSION);
     (yyval) = (yyvsp[0]);
   }
-#line 6042 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6046 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 276:
-#line 1851 "parser.y" /* yacc.c:1646  */
+#line 1855 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 6052 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6056 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 277:
-#line 1856 "parser.y" /* yacc.c:1646  */
+#line 1860 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[0]), n_YIELD);
     (yyvsp[0])->appendChild(NNEW(n_EMPTY));
     (yyvsp[0])->appendChild(NNEW(n_EMPTY));
     (yyval) = (yyvsp[0]);
   }
-#line 6063 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6067 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 278:
-#line 1865 "parser.y" /* yacc.c:1646  */
+#line 1869 "parser.y" /* yacc.c:1646  */
     {
     NSPAN((yyvsp[-8]), n_FUNCTION_DECLARATION, (yyvsp[0]));
     (yyvsp[-8])->appendChild(NNEW(n_EMPTY));
@@ -6075,11 +6079,11 @@
 
     (yyval) = (yyvsp[-8]);
   }
-#line 6079 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6083 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 279:
-#line 1879 "parser.y" /* yacc.c:1646  */
+#line 1883 "parser.y" /* yacc.c:1646  */
     {
     NSPAN((yyvsp[-8]), n_FUNCTION_DECLARATION, (yyvsp[0]));
     NMORE((yyvsp[-8]), (yyvsp[-9]));
@@ -6097,143 +6101,143 @@
 
     (yyval) = (yyvsp[-8]);
   }
-#line 6101 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6105 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 280:
-#line 1899 "parser.y" /* yacc.c:1646  */
+#line 1903 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-1]), n_YIELD);
     (yyvsp[0])->appendChild(NNEW(n_EMPTY));
     (yyvsp[-1])->appendChild((yyvsp[0]));
     (yyval) = (yyvsp[-1]);
   }
-#line 6112 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6116 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 281:
-#line 1905 "parser.y" /* yacc.c:1646  */
+#line 1909 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-1]), n_YIELD);
     (yyvsp[0])->appendChild(NNEW(n_EMPTY));
     (yyvsp[-1])->appendChild((yyvsp[0]));
     (yyval) = (yyvsp[-1]);
   }
-#line 6123 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6127 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 282:
-#line 1911 "parser.y" /* yacc.c:1646  */
+#line 1915 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-3]), n_YIELD);
     (yyvsp[-3])->appendChild((yyvsp[-2]));
     (yyvsp[-3])->appendChild((yyvsp[0]));
     (yyval) = (yyvsp[-3]);
   }
-#line 6134 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6138 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 283:
-#line 1917 "parser.y" /* yacc.c:1646  */
+#line 1921 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-3]), n_YIELD);
     (yyvsp[-3])->appendChild((yyvsp[-2]));
     (yyvsp[-3])->appendChild((yyvsp[0]));
     (yyval) = (yyvsp[-3]);
   }
-#line 6145 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6149 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 285:
-#line 1930 "parser.y" /* yacc.c:1646  */
+#line 1934 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 6153 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6157 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 286:
-#line 1933 "parser.y" /* yacc.c:1646  */
+#line 1937 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-3]), n_LEXICAL_VARIABLE_LIST);
     (yyvsp[-3])->appendChildren((yyvsp[-1]));
     (yyval) = (yyvsp[-3]);
   }
-#line 6163 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6167 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 287:
-#line 1941 "parser.y" /* yacc.c:1646  */
+#line 1945 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = (yyvsp[-2])->appendChild(NTYPE((yyvsp[0]), n_VARIABLE));
   }
-#line 6171 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6175 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 288:
-#line 1944 "parser.y" /* yacc.c:1646  */
+#line 1948 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-1]), n_VARIABLE_REFERENCE);
     (yyvsp[-1])->appendChild(NTYPE((yyvsp[0]), n_VARIABLE));
     (yyval) = (yyvsp[-3])->appendChild((yyvsp[-1]));
   }
-#line 6181 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6185 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 289:
-#line 1949 "parser.y" /* yacc.c:1646  */
+#line 1953 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_LEXICAL_VARIABLE_LIST);
     (yyval)->appendChild(NTYPE((yyvsp[0]), n_VARIABLE));
   }
-#line 6190 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6194 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 290:
-#line 1953 "parser.y" /* yacc.c:1646  */
+#line 1957 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-1]), n_VARIABLE_REFERENCE);
     (yyvsp[-1])->appendChild(NTYPE((yyvsp[0]), n_VARIABLE));
     (yyval) = NNEW(n_LEXICAL_VARIABLE_LIST);
     (yyval)->appendChild((yyvsp[-1]));
   }
-#line 6201 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6205 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 291:
-#line 1962 "parser.y" /* yacc.c:1646  */
+#line 1966 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_FUNCTION_CALL);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
   }
-#line 6211 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6215 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 292:
-#line 1968 "parser.y" /* yacc.c:1646  */
+#line 1972 "parser.y" /* yacc.c:1646  */
     {
     NMORE((yyvsp[-3]), (yyvsp[-5]));
     (yyval) = NNEW(n_FUNCTION_CALL);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
   }
-#line 6222 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6226 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 293:
-#line 1974 "parser.y" /* yacc.c:1646  */
+#line 1978 "parser.y" /* yacc.c:1646  */
     {
     NMORE((yyvsp[-3]), (yyvsp[-4]));
     (yyval) = NNEW(n_FUNCTION_CALL);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
   }
-#line 6233 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6237 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 294:
-#line 1981 "parser.y" /* yacc.c:1646  */
+#line 1985 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_STATIC_ACCESS);
     (yyval)->appendChild((yyvsp[-5]));
@@ -6242,11 +6246,11 @@
     (yyval) = NNEW(n_FUNCTION_CALL)->appendChild((yyval));
     (yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
   }
-#line 6246 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6250 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 295:
-#line 1990 "parser.y" /* yacc.c:1646  */
+#line 1994 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_STATIC_ACCESS);
     (yyval)->appendChild((yyvsp[-5]));
@@ -6255,11 +6259,11 @@
     (yyval) = NNEW(n_FUNCTION_CALL)->appendChild((yyval));
     (yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
   }
-#line 6259 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6263 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 296:
-#line 1999 "parser.y" /* yacc.c:1646  */
+#line 2003 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_STATIC_ACCESS);
     (yyval)->appendChild((yyvsp[-5]));
@@ -6268,11 +6272,11 @@
     (yyval) = NNEW(n_FUNCTION_CALL)->appendChild((yyval));
     (yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
   }
-#line 6272 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6276 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 297:
-#line 2008 "parser.y" /* yacc.c:1646  */
+#line 2012 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_STATIC_ACCESS);
     (yyval)->appendChild((yyvsp[-5]));
@@ -6281,81 +6285,81 @@
     (yyval) = NNEW(n_FUNCTION_CALL)->appendChild((yyval));
     (yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
   }
-#line 6285 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6289 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 298:
-#line 2016 "parser.y" /* yacc.c:1646  */
+#line 2020 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_FUNCTION_CALL);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
   }
-#line 6295 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6299 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 299:
-#line 2024 "parser.y" /* yacc.c:1646  */
+#line 2028 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
   }
-#line 6303 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6307 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 300:
-#line 2027 "parser.y" /* yacc.c:1646  */
+#line 2031 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
   }
-#line 6311 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6315 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 301:
-#line 2030 "parser.y" /* yacc.c:1646  */
+#line 2034 "parser.y" /* yacc.c:1646  */
     {
     NMORE((yyvsp[0]), (yyvsp[-2]));
     (yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
   }
-#line 6320 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6324 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 302:
-#line 2034 "parser.y" /* yacc.c:1646  */
+#line 2038 "parser.y" /* yacc.c:1646  */
     {
     NMORE((yyvsp[0]), (yyvsp[-1]));
     (yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
   }
-#line 6329 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6333 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 303:
-#line 2041 "parser.y" /* yacc.c:1646  */
+#line 2045 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
   }
-#line 6337 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6341 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 304:
-#line 2044 "parser.y" /* yacc.c:1646  */
+#line 2048 "parser.y" /* yacc.c:1646  */
     {
     NMORE((yyvsp[0]), (yyvsp[-2]));
     (yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
   }
-#line 6346 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6350 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 305:
-#line 2048 "parser.y" /* yacc.c:1646  */
+#line 2052 "parser.y" /* yacc.c:1646  */
     {
     NMORE((yyvsp[0]), (yyvsp[-1]));
     (yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
   }
-#line 6355 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6359 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 308:
-#line 2063 "parser.y" /* yacc.c:1646  */
+#line 2067 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_OBJECT_PROPERTY_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
@@ -6368,282 +6372,282 @@
       (yyval)->appendChild(*ii);
     }
   }
-#line 6372 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6376 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 310:
-#line 2079 "parser.y" /* yacc.c:1646  */
+#line 2083 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = (yyvsp[-1])->appendChild((yyvsp[0]));
   }
-#line 6380 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6384 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 311:
-#line 2082 "parser.y" /* yacc.c:1646  */
+#line 2086 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 6388 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6392 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 312:
-#line 2088 "parser.y" /* yacc.c:1646  */
+#line 2092 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = (yyvsp[0]);
   }
-#line 6396 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6400 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 313:
-#line 2094 "parser.y" /* yacc.c:1646  */
+#line 2098 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 6404 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6408 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 314:
-#line 2097 "parser.y" /* yacc.c:1646  */
+#line 2101 "parser.y" /* yacc.c:1646  */
     {
     NSPAN((yyvsp[-1]), n_EMPTY, (yyvsp[0]));
     (yyval) = (yyvsp[-1]);
   }
-#line 6413 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6417 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 315:
-#line 2101 "parser.y" /* yacc.c:1646  */
+#line 2105 "parser.y" /* yacc.c:1646  */
     {
     NSPAN((yyvsp[-2]), n_PARENTHETICAL_EXPRESSION, (yyvsp[0]));
     (yyvsp[-2])->appendChild((yyvsp[-1]));
     (yyval) = (yyvsp[-2]);
   }
-#line 6423 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6427 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 316:
-#line 2109 "parser.y" /* yacc.c:1646  */
+#line 2113 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 6431 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6435 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 317:
-#line 2112 "parser.y" /* yacc.c:1646  */
+#line 2116 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
   }
-#line 6439 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6443 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 318:
-#line 2118 "parser.y" /* yacc.c:1646  */
+#line 2122 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_NUMERIC_SCALAR);
   }
-#line 6447 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6451 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 319:
-#line 2121 "parser.y" /* yacc.c:1646  */
+#line 2125 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_NUMERIC_SCALAR);
   }
-#line 6455 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6459 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 320:
-#line 2124 "parser.y" /* yacc.c:1646  */
+#line 2128 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_STRING_SCALAR);
   }
-#line 6463 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6467 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 321:
-#line 2127 "parser.y" /* yacc.c:1646  */
+#line 2131 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
   }
-#line 6471 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6475 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 322:
-#line 2130 "parser.y" /* yacc.c:1646  */
+#line 2134 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
   }
-#line 6479 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6483 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 323:
-#line 2133 "parser.y" /* yacc.c:1646  */
+#line 2137 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
   }
-#line 6487 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6491 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 324:
-#line 2136 "parser.y" /* yacc.c:1646  */
+#line 2140 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
   }
-#line 6495 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6499 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 325:
-#line 2139 "parser.y" /* yacc.c:1646  */
+#line 2143 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
   }
-#line 6503 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6507 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 326:
-#line 2142 "parser.y" /* yacc.c:1646  */
+#line 2146 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
   }
-#line 6511 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6515 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 327:
-#line 2145 "parser.y" /* yacc.c:1646  */
+#line 2149 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
   }
-#line 6519 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6523 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 328:
-#line 2148 "parser.y" /* yacc.c:1646  */
+#line 2152 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
   }
-#line 6527 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6531 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 329:
-#line 2151 "parser.y" /* yacc.c:1646  */
+#line 2155 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_HEREDOC);
   }
-#line 6535 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6539 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 332:
-#line 2159 "parser.y" /* yacc.c:1646  */
+#line 2163 "parser.y" /* yacc.c:1646  */
     {
     NMORE((yyvsp[0]), (yyvsp[-2]));
     (yyval) = (yyvsp[0]);
   }
-#line 6544 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6548 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 333:
-#line 2163 "parser.y" /* yacc.c:1646  */
+#line 2167 "parser.y" /* yacc.c:1646  */
     {
     NMORE((yyvsp[0]), (yyvsp[-1]));
     (yyval) = (yyvsp[0]);
   }
-#line 6553 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6557 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 334:
-#line 2167 "parser.y" /* yacc.c:1646  */
+#line 2171 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 6563 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6567 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 335:
-#line 2172 "parser.y" /* yacc.c:1646  */
+#line 2176 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
     (yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 6573 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6577 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 336:
-#line 2177 "parser.y" /* yacc.c:1646  */
+#line 2181 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-3]), n_ARRAY_LITERAL);
     (yyvsp[-3])->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
     (yyval) = (yyvsp[-3]);
   }
-#line 6583 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6587 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 337:
-#line 2182 "parser.y" /* yacc.c:1646  */
+#line 2186 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-2]), n_ARRAY_LITERAL);
     (yyvsp[-2])->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
     (yyval) = (yyvsp[-2]);
   }
-#line 6593 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6597 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 339:
-#line 2191 "parser.y" /* yacc.c:1646  */
+#line 2195 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_STATIC_ACCESS);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[0]), n_STRING));
   }
-#line 6603 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6607 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 343:
-#line 2202 "parser.y" /* yacc.c:1646  */
+#line 2206 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NMORE((yyvsp[0]), (yyvsp[-2]));
   }
-#line 6611 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6615 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 344:
-#line 2205 "parser.y" /* yacc.c:1646  */
+#line 2209 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NMORE((yyvsp[0]), (yyvsp[-1]));
   }
-#line 6619 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6623 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 346:
-#line 2212 "parser.y" /* yacc.c:1646  */
+#line 2216 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE_LIST);
   }
-#line 6627 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6631 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 347:
-#line 2215 "parser.y" /* yacc.c:1646  */
+#line 2219 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NMORE((yyvsp[-1]), (yyvsp[0]));
   }
-#line 6635 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6639 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 348:
-#line 2221 "parser.y" /* yacc.c:1646  */
+#line 2225 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 6643 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6647 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 350:
-#line 2232 "parser.y" /* yacc.c:1646  */
+#line 2236 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild((yyvsp[-2]));
@@ -6651,11 +6655,11 @@
 
     (yyval) = (yyvsp[-4])->appendChild((yyval));
   }
-#line 6655 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6659 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 351:
-#line 2239 "parser.y" /* yacc.c:1646  */
+#line 2243 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild(NNEW(n_EMPTY));
@@ -6663,11 +6667,11 @@
 
     (yyval) = (yyvsp[-2])->appendChild((yyval));
   }
-#line 6667 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6671 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 352:
-#line 2246 "parser.y" /* yacc.c:1646  */
+#line 2250 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild((yyvsp[-2]));
@@ -6675,11 +6679,11 @@
 
     (yyval) = NNEW(n_ARRAY_VALUE_LIST)->appendChild((yyval));
   }
-#line 6679 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6683 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 353:
-#line 2253 "parser.y" /* yacc.c:1646  */
+#line 2257 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild(NNEW(n_EMPTY));
@@ -6687,11 +6691,11 @@
 
     (yyval) = NNEW(n_ARRAY_VALUE_LIST)->appendChild((yyval));
   }
-#line 6691 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6695 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 359:
-#line 2283 "parser.y" /* yacc.c:1646  */
+#line 2287 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_OBJECT_PROPERTY_ACCESS);
     (yyval)->appendChild((yyvsp[-4]));
@@ -6715,27 +6719,27 @@
       }
     }
   }
-#line 6719 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6723 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 361:
-#line 2310 "parser.y" /* yacc.c:1646  */
+#line 2314 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = (yyvsp[-1])->appendChildren((yyvsp[0]));
   }
-#line 6727 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6731 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 362:
-#line 2313 "parser.y" /* yacc.c:1646  */
+#line 2317 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 6735 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6739 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 363:
-#line 2319 "parser.y" /* yacc.c:1646  */
+#line 2323 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
     (yyval)->appendChild((yyvsp[-1]));
@@ -6743,49 +6747,49 @@
       (yyval)->appendChild((yyvsp[0]));
     }
   }
-#line 6747 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6751 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 364:
-#line 2329 "parser.y" /* yacc.c:1646  */
+#line 2333 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 6758 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6762 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 365:
-#line 2335 "parser.y" /* yacc.c:1646  */
+#line 2339 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 6769 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6773 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 366:
-#line 2344 "parser.y" /* yacc.c:1646  */
+#line 2348 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
   }
-#line 6777 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6781 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 369:
-#line 2352 "parser.y" /* yacc.c:1646  */
+#line 2356 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 6785 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6789 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 371:
-#line 2359 "parser.y" /* yacc.c:1646  */
+#line 2363 "parser.y" /* yacc.c:1646  */
     {
     xhpast::Node *last = (yyvsp[-1]);
     NMORE((yyvsp[-1]), (yyvsp[0]));
@@ -6798,61 +6802,61 @@
 
     (yyval) = (yyvsp[-1]);
   }
-#line 6802 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6806 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 372:
-#line 2374 "parser.y" /* yacc.c:1646  */
+#line 2378 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_STATIC_ACCESS);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 6812 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6816 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 373:
-#line 2379 "parser.y" /* yacc.c:1646  */
+#line 2383 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_STATIC_ACCESS);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 6822 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6826 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 375:
-#line 2391 "parser.y" /* yacc.c:1646  */
+#line 2395 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 6833 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6837 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 376:
-#line 2397 "parser.y" /* yacc.c:1646  */
+#line 2401 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 6844 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6848 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 381:
-#line 2413 "parser.y" /* yacc.c:1646  */
+#line 2417 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
   }
-#line 6852 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6856 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 382:
-#line 2416 "parser.y" /* yacc.c:1646  */
+#line 2420 "parser.y" /* yacc.c:1646  */
     {
     xhpast::Node *last = (yyvsp[-1]);
     NMORE((yyvsp[-1]), (yyvsp[0]));
@@ -6865,114 +6869,114 @@
 
     (yyval) = (yyvsp[-1]);
   }
-#line 6869 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6873 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 384:
-#line 2432 "parser.y" /* yacc.c:1646  */
+#line 2436 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 6880 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6884 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 385:
-#line 2438 "parser.y" /* yacc.c:1646  */
+#line 2442 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 6891 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6895 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 387:
-#line 2448 "parser.y" /* yacc.c:1646  */
+#line 2452 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[0]), n_VARIABLE);
   }
-#line 6899 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6903 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 388:
-#line 2451 "parser.y" /* yacc.c:1646  */
+#line 2455 "parser.y" /* yacc.c:1646  */
     {
     NSPAN((yyvsp[-3]), n_VARIABLE_EXPRESSION, (yyvsp[0]));
     (yyvsp[-3])->appendChild((yyvsp[-1]));
     (yyval) = (yyvsp[-3]);
   }
-#line 6909 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6913 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 389:
-#line 2459 "parser.y" /* yacc.c:1646  */
+#line 2463 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 6917 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6921 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 390:
-#line 2462 "parser.y" /* yacc.c:1646  */
+#line 2466 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = (yyvsp[0]);
   }
-#line 6925 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6929 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 393:
-#line 2473 "parser.y" /* yacc.c:1646  */
+#line 2477 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 6936 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6940 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 394:
-#line 2479 "parser.y" /* yacc.c:1646  */
+#line 2483 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 6947 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6951 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 396:
-#line 2489 "parser.y" /* yacc.c:1646  */
+#line 2493 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[0]), n_STRING);
     (yyval) = (yyvsp[0]);
   }
-#line 6956 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6960 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 397:
-#line 2493 "parser.y" /* yacc.c:1646  */
+#line 2497 "parser.y" /* yacc.c:1646  */
     {
   (yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
   }
-#line 6964 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6968 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 398:
-#line 2499 "parser.y" /* yacc.c:1646  */
+#line 2503 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[0]), n_VARIABLE_VARIABLE);
   }
-#line 6972 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6976 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 399:
-#line 2502 "parser.y" /* yacc.c:1646  */
+#line 2506 "parser.y" /* yacc.c:1646  */
     {
     (yyvsp[0]) = NTYPE((yyvsp[0]), n_VARIABLE_VARIABLE);
 
@@ -6985,61 +6989,61 @@
 
     (yyval) = (yyvsp[-1]);
   }
-#line 6989 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 6993 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 400:
-#line 2517 "parser.y" /* yacc.c:1646  */
+#line 2521 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = (yyvsp[-2])->appendChild((yyvsp[0]));
   }
-#line 6997 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7001 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 401:
-#line 2520 "parser.y" /* yacc.c:1646  */
+#line 2524 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ASSIGNMENT_LIST);
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 7006 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7010 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 403:
-#line 2528 "parser.y" /* yacc.c:1646  */
+#line 2532 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_LIST);
     (yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
   }
-#line 7015 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7019 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 404:
-#line 2532 "parser.y" /* yacc.c:1646  */
+#line 2536 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
   }
-#line 7023 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7027 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 405:
-#line 2538 "parser.y" /* yacc.c:1646  */
+#line 2542 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE_LIST);
   }
-#line 7031 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7035 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 406:
-#line 2541 "parser.y" /* yacc.c:1646  */
+#line 2545 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NMORE((yyvsp[-1]), (yyvsp[0]));
   }
-#line 7039 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7043 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 407:
-#line 2547 "parser.y" /* yacc.c:1646  */
+#line 2551 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild((yyvsp[-2]));
@@ -7047,11 +7051,11 @@
 
     (yyval) = (yyvsp[-4])->appendChild((yyval));
   }
-#line 7051 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7055 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 408:
-#line 2554 "parser.y" /* yacc.c:1646  */
+#line 2558 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild(NNEW(n_EMPTY));
@@ -7059,11 +7063,11 @@
 
     (yyval) = (yyvsp[-2])->appendChild((yyval));
   }
-#line 7063 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7067 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 409:
-#line 2561 "parser.y" /* yacc.c:1646  */
+#line 2565 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild((yyvsp[-2]));
@@ -7071,11 +7075,11 @@
 
     (yyval) = NNEW(n_ARRAY_VALUE_LIST)->appendChild((yyval));
   }
-#line 7075 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7079 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 410:
-#line 2568 "parser.y" /* yacc.c:1646  */
+#line 2572 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild(NNEW(n_EMPTY));
@@ -7083,11 +7087,11 @@
 
     (yyval) = NNEW(n_ARRAY_VALUE_LIST)->appendChild((yyval));
   }
-#line 7087 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7091 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 411:
-#line 2575 "parser.y" /* yacc.c:1646  */
+#line 2579 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild((yyvsp[-3]));
@@ -7095,11 +7099,11 @@
 
     (yyval) = (yyvsp[-5])->appendChild((yyval));
   }
-#line 7099 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7103 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 412:
-#line 2582 "parser.y" /* yacc.c:1646  */
+#line 2586 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild(NNEW(n_EMPTY));
@@ -7107,11 +7111,11 @@
 
     (yyval) = (yyvsp[-3])->appendChild((yyval));
   }
-#line 7111 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7115 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 413:
-#line 2589 "parser.y" /* yacc.c:1646  */
+#line 2593 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild((yyvsp[-3]));
@@ -7119,11 +7123,11 @@
 
     (yyval) = NNEW(n_ARRAY_VALUE_LIST)->appendChild((yyval));
   }
-#line 7123 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7127 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 414:
-#line 2596 "parser.y" /* yacc.c:1646  */
+#line 2600 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_ARRAY_VALUE);
     (yyval)->appendChild(NNEW(n_EMPTY));
@@ -7131,11 +7135,11 @@
 
     (yyval) = NNEW(n_ARRAY_VALUE_LIST)->appendChild((yyval));
   }
-#line 7135 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7139 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 415:
-#line 2606 "parser.y" /* yacc.c:1646  */
+#line 2610 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-3]), n_SYMBOL_NAME);
 
@@ -7146,11 +7150,11 @@
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-2]));
   }
-#line 7150 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7154 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 416:
-#line 2616 "parser.y" /* yacc.c:1646  */
+#line 2620 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-3]), n_SYMBOL_NAME);
 
@@ -7161,27 +7165,27 @@
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-2]));
   }
-#line 7165 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7169 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 417:
-#line 2626 "parser.y" /* yacc.c:1646  */
+#line 2630 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[-1]), n_INCLUDE_FILE)->appendChild((yyvsp[0]));
   }
-#line 7173 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7177 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 418:
-#line 2629 "parser.y" /* yacc.c:1646  */
+#line 2633 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[-1]), n_INCLUDE_FILE)->appendChild((yyvsp[0]));
   }
-#line 7181 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7185 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 419:
-#line 2632 "parser.y" /* yacc.c:1646  */
+#line 2636 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-3]), n_SYMBOL_NAME);
 
@@ -7192,146 +7196,146 @@
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-2]));
   }
-#line 7196 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7200 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 420:
-#line 2642 "parser.y" /* yacc.c:1646  */
+#line 2646 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[-1]), n_INCLUDE_FILE)->appendChild((yyvsp[0]));
   }
-#line 7204 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7208 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 421:
-#line 2645 "parser.y" /* yacc.c:1646  */
+#line 2649 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NTYPE((yyvsp[-1]), n_INCLUDE_FILE)->appendChild((yyvsp[0]));
   }
-#line 7212 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7216 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 422:
-#line 2651 "parser.y" /* yacc.c:1646  */
+#line 2655 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_EMPTY);
     (yyval)->appendChild((yyvsp[0]));
   }
-#line 7221 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7225 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 423:
-#line 2655 "parser.y" /* yacc.c:1646  */
+#line 2659 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = (yyvsp[-2])->appendChild((yyvsp[0]));
   }
-#line 7229 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7233 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 424:
-#line 2661 "parser.y" /* yacc.c:1646  */
+#line 2665 "parser.y" /* yacc.c:1646  */
     {
     NSPAN((yyvsp[-2]), n_PARENTHETICAL_EXPRESSION, (yyvsp[0]));
     (yyvsp[-2])->appendChild((yyvsp[-1]));
     (yyval) = (yyvsp[-2]);
   }
-#line 7239 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7243 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 425:
-#line 2666 "parser.y" /* yacc.c:1646  */
+#line 2670 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
   }
-#line 7247 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7251 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 426:
-#line 2672 "parser.y" /* yacc.c:1646  */
+#line 2676 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 7258 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7262 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 427:
-#line 2678 "parser.y" /* yacc.c:1646  */
+#line 2682 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild((yyvsp[-3]));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 7269 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7273 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 428:
-#line 2684 "parser.y" /* yacc.c:1646  */
+#line 2688 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_INDEX_ACCESS);
     (yyval)->appendChild(NTYPE((yyvsp[-3]), n_STRING_SCALAR));
     (yyval)->appendChild((yyvsp[-1]));
     NMORE((yyval), (yyvsp[0]));
   }
-#line 7280 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7284 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 429:
-#line 2693 "parser.y" /* yacc.c:1646  */
+#line 2697 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-3]), n_ARRAY_LITERAL);
     (yyvsp[-3])->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
     (yyval) = (yyvsp[-3]);
   }
-#line 7290 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7294 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 430:
-#line 2698 "parser.y" /* yacc.c:1646  */
+#line 2702 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-2]), n_ARRAY_LITERAL);
     (yyvsp[-2])->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
     (yyval) = (yyvsp[-2]);
   }
-#line 7300 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7304 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 431:
-#line 2706 "parser.y" /* yacc.c:1646  */
+#line 2710 "parser.y" /* yacc.c:1646  */
     {
     NTYPE((yyvsp[-2]), n_NEW);
     (yyvsp[-2])->appendChild((yyvsp[-1]));
     (yyvsp[-2])->appendChild((yyvsp[0]));
     (yyval) = (yyvsp[-2]);
   }
-#line 7311 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7315 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 432:
-#line 2715 "parser.y" /* yacc.c:1646  */
+#line 2719 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_STATIC_ACCESS);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[0]), n_STRING));
   }
-#line 7321 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7325 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
   case 433:
-#line 2720 "parser.y" /* yacc.c:1646  */
+#line 2724 "parser.y" /* yacc.c:1646  */
     {
     (yyval) = NNEW(n_CLASS_STATIC_ACCESS);
     (yyval)->appendChild((yyvsp[-2]));
     (yyval)->appendChild(NTYPE((yyvsp[0]), n_STRING));
   }
-#line 7331 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7335 "parser.yacc.cpp" /* yacc.c:1646  */
     break;
 
 
-#line 7335 "parser.yacc.cpp" /* yacc.c:1646  */
+#line 7339 "parser.yacc.cpp" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -7559,7 +7563,7 @@
 #endif
   return yyresult;
 }
-#line 2727 "parser.y" /* yacc.c:1906  */
+#line 2731 "parser.y" /* yacc.c:1906  */
 
 
 const char* yytokname(int tok) {
diff --git a/support/xhpast/xhpast.cpp b/support/xhpast/xhpast.cpp
--- a/support/xhpast/xhpast.cpp
+++ b/support/xhpast/xhpast.cpp
@@ -14,7 +14,7 @@
 int main(int argc, char* argv[]) {
   if (argc != 1) {
     // Coupling: modify also src/parser/xhpast/bin/PhutilXHPASTBinary.php
-    cout << "5.5.8/1i\n";
+    cout << "5.5.8/1j\n";
     return 0;
   }