diff --git a/hphp/compiler/parser/hphp.tab.cpp b/hphp/compiler/parser/hphp.tab.cpp
index 5766a4e2a..6b10dee8a 100644
--- a/hphp/compiler/parser/hphp.tab.cpp
+++ b/hphp/compiler/parser/hphp.tab.cpp
@@ -1566,78 +1566,78 @@ static const yytype_int16 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   822,   822,   822,   827,   829,   832,   834,   835,   836,
-     837,   838,   841,   843,   843,   845,   845,   847,   848,   853,
-     854,   855,   856,   857,   858,   862,   864,   867,   868,   869,
-     870,   875,   876,   880,   881,   883,   886,   892,   899,   906,
-     910,   916,   918,   921,   922,   923,   924,   927,   928,   932,
-     937,   937,   941,   941,   946,   945,   949,   949,   952,   953,
-     954,   955,   956,   957,   958,   959,   960,   961,   962,   963,
-     964,   967,   965,   970,   972,   980,   983,   984,   988,   989,
-     990,   991,   992,   999,  1005,  1009,  1009,  1015,  1016,  1020,
-    1021,  1025,  1030,  1029,  1039,  1038,  1051,  1050,  1069,  1067,
-    1086,  1085,  1094,  1092,  1104,  1103,  1115,  1113,  1126,  1127,
-    1131,  1134,  1137,  1138,  1139,  1142,  1144,  1147,  1148,  1151,
-    1152,  1155,  1156,  1160,  1161,  1166,  1167,  1170,  1171,  1175,
-    1176,  1180,  1181,  1185,  1186,  1190,  1191,  1196,  1197,  1202,
-    1203,  1204,  1205,  1208,  1211,  1213,  1216,  1217,  1221,  1223,
-    1226,  1229,  1232,  1233,  1236,  1237,  1241,  1243,  1245,  1246,
-    1250,  1252,  1254,  1257,  1260,  1263,  1266,  1270,  1277,  1279,
-    1282,  1283,  1284,  1286,  1291,  1292,  1295,  1296,  1297,  1301,
-    1302,  1304,  1305,  1309,  1311,  1314,  1314,  1318,  1317,  1321,
-    1325,  1323,  1336,  1333,  1344,  1346,  1348,  1350,  1352,  1356,
-    1357,  1358,  1361,  1367,  1370,  1376,  1379,  1384,  1386,  1391,
-    1396,  1400,  1401,  1407,  1408,  1413,  1414,  1419,  1420,  1424,
-    1425,  1429,  1431,  1437,  1442,  1443,  1445,  1449,  1450,  1451,
-    1452,  1456,  1457,  1458,  1459,  1460,  1461,  1463,  1468,  1471,
-    1472,  1476,  1477,  1480,  1481,  1484,  1485,  1488,  1489,  1493,
-    1494,  1495,  1496,  1497,  1498,  1501,  1503,  1505,  1506,  1509,
-    1511,  1515,  1517,  1521,  1525,  1526,  1530,  1531,  1535,  1539,
-    1543,  1548,  1549,  1550,  1553,  1555,  1556,  1557,  1560,  1561,
-    1562,  1563,  1564,  1565,  1566,  1567,  1568,  1569,  1570,  1571,
-    1572,  1573,  1574,  1575,  1576,  1577,  1578,  1579,  1580,  1581,
-    1582,  1583,  1584,  1585,  1586,  1587,  1588,  1589,  1590,  1591,
-    1592,  1593,  1594,  1595,  1596,  1597,  1598,  1599,  1600,  1601,
-    1603,  1604,  1606,  1608,  1609,  1610,  1611,  1612,  1613,  1614,
-    1615,  1616,  1617,  1618,  1619,  1620,  1621,  1622,  1623,  1624,
-    1625,  1627,  1626,  1635,  1634,  1642,  1643,  1644,  1648,  1653,
-    1660,  1665,  1672,  1674,  1678,  1680,  1684,  1689,  1690,  1694,
-    1701,  1708,  1710,  1715,  1716,  1717,  1721,  1725,  1729,  1730,
-    1731,  1732,  1736,  1742,  1747,  1756,  1757,  1760,  1763,  1766,
-    1767,  1770,  1774,  1777,  1780,  1787,  1788,  1792,  1793,  1795,
-    1799,  1800,  1801,  1802,  1803,  1804,  1805,  1806,  1807,  1808,
-    1809,  1810,  1811,  1812,  1813,  1814,  1815,  1816,  1817,  1818,
-    1819,  1820,  1821,  1822,  1823,  1824,  1825,  1826,  1827,  1828,
-    1829,  1830,  1831,  1832,  1833,  1834,  1835,  1836,  1837,  1838,
-    1839,  1840,  1841,  1842,  1843,  1844,  1845,  1846,  1847,  1848,
-    1849,  1850,  1851,  1852,  1853,  1854,  1855,  1856,  1857,  1858,
-    1859,  1860,  1861,  1862,  1863,  1864,  1865,  1866,  1867,  1868,
-    1869,  1870,  1871,  1872,  1873,  1877,  1882,  1883,  1886,  1887,
-    1888,  1892,  1893,  1894,  1898,  1899,  1900,  1904,  1905,  1906,
-    1909,  1911,  1915,  1916,  1917,  1919,  1920,  1921,  1922,  1923,
-    1924,  1925,  1926,  1927,  1928,  1931,  1936,  1937,  1938,  1939,
-    1940,  1942,  1945,  1946,  1950,  1953,  1959,  1960,  1961,  1962,
-    1963,  1964,  1965,  1970,  1972,  1976,  1977,  1980,  1981,  1985,
-    1988,  1990,  1992,  1996,  1997,  1998,  2000,  2003,  2007,  2008,
-    2009,  2012,  2013,  2014,  2015,  2016,  2018,  2019,  2025,  2027,
-    2030,  2033,  2035,  2037,  2040,  2042,  2046,  2048,  2051,  2055,
-    2062,  2064,  2067,  2068,  2073,  2076,  2080,  2080,  2085,  2088,
-    2089,  2093,  2094,  2099,  2100,  2104,  2105,  2109,  2110,  2114,
-    2116,  2120,  2121,  2122,  2123,  2124,  2125,  2126,  2127,  2130,
-    2132,  2136,  2137,  2138,  2139,  2140,  2142,  2144,  2146,  2150,
-    2151,  2152,  2156,  2159,  2162,  2165,  2168,  2171,  2177,  2181,
-    2188,  2189,  2194,  2196,  2197,  2200,  2201,  2204,  2205,  2209,
-    2210,  2214,  2215,  2216,  2217,  2218,  2221,  2224,  2225,  2226,
-    2228,  2230,  2234,  2235,  2236,  2238,  2239,  2240,  2244,  2246,
-    2249,  2251,  2252,  2253,  2254,  2257,  2259,  2260,  2264,  2266,
-    2269,  2271,  2272,  2273,  2277,  2279,  2282,  2285,  2287,  2289,
-    2293,  2294,  2296,  2297,  2303,  2304,  2306,  2308,  2310,  2312,
-    2315,  2316,  2317,  2321,  2322,  2323,  2324,  2325,  2326,  2327,
-    2331,  2332,  2336,  2345,  2352,  2353,  2359,  2360,  2368,  2371,
-    2375,  2378,  2383,  2384,  2385,  2386,  2390,  2391,  2395,  2397,
-    2398,  2400,  2403,  2405,  2410,  2416,  2418,  2422,  2425,  2428,
-    2437,  2440,  2443,  2444,  2447,  2448,  2452,  2457,  2461,  2467,
-    2475,  2476
+       0,   822,   822,   822,   827,   829,   832,   833,   834,   835,
+     836,   837,   840,   842,   842,   844,   844,   846,   847,   852,
+     853,   854,   855,   856,   857,   861,   863,   866,   867,   868,
+     869,   874,   875,   879,   880,   882,   885,   891,   898,   905,
+     909,   915,   917,   920,   921,   922,   923,   926,   927,   931,
+     936,   936,   940,   940,   945,   944,   948,   948,   951,   952,
+     953,   954,   955,   956,   957,   958,   959,   960,   961,   962,
+     963,   966,   964,   969,   971,   979,   982,   983,   987,   988,
+     989,   990,   991,   998,  1004,  1008,  1008,  1014,  1015,  1019,
+    1020,  1024,  1029,  1028,  1038,  1037,  1050,  1049,  1068,  1066,
+    1085,  1084,  1093,  1091,  1103,  1102,  1114,  1112,  1125,  1126,
+    1130,  1133,  1136,  1137,  1138,  1141,  1143,  1146,  1147,  1150,
+    1151,  1154,  1155,  1159,  1160,  1165,  1166,  1169,  1170,  1174,
+    1175,  1179,  1180,  1184,  1185,  1189,  1190,  1195,  1196,  1201,
+    1202,  1203,  1204,  1207,  1210,  1212,  1215,  1216,  1220,  1222,
+    1225,  1228,  1231,  1232,  1235,  1236,  1240,  1242,  1244,  1245,
+    1249,  1251,  1253,  1256,  1259,  1262,  1265,  1269,  1276,  1278,
+    1281,  1282,  1283,  1285,  1290,  1291,  1294,  1295,  1296,  1300,
+    1301,  1303,  1304,  1308,  1310,  1313,  1313,  1317,  1316,  1320,
+    1324,  1322,  1335,  1332,  1343,  1345,  1347,  1349,  1351,  1355,
+    1356,  1357,  1360,  1366,  1369,  1375,  1378,  1383,  1385,  1390,
+    1395,  1399,  1400,  1406,  1407,  1412,  1413,  1418,  1419,  1423,
+    1424,  1428,  1430,  1436,  1441,  1442,  1444,  1448,  1449,  1450,
+    1451,  1455,  1456,  1457,  1458,  1459,  1460,  1462,  1467,  1470,
+    1471,  1475,  1476,  1479,  1480,  1483,  1484,  1487,  1488,  1492,
+    1493,  1494,  1495,  1496,  1497,  1500,  1502,  1504,  1505,  1508,
+    1510,  1514,  1516,  1520,  1524,  1525,  1529,  1530,  1534,  1538,
+    1542,  1547,  1548,  1549,  1552,  1554,  1555,  1556,  1559,  1560,
+    1561,  1562,  1563,  1564,  1565,  1566,  1567,  1568,  1569,  1570,
+    1571,  1572,  1573,  1574,  1575,  1576,  1577,  1578,  1579,  1580,
+    1581,  1582,  1583,  1584,  1585,  1586,  1587,  1588,  1589,  1590,
+    1591,  1592,  1593,  1594,  1595,  1596,  1597,  1598,  1599,  1600,
+    1602,  1603,  1605,  1607,  1608,  1609,  1610,  1611,  1612,  1613,
+    1614,  1615,  1616,  1617,  1618,  1619,  1620,  1621,  1622,  1623,
+    1624,  1626,  1625,  1634,  1633,  1641,  1642,  1643,  1647,  1652,
+    1659,  1664,  1671,  1673,  1677,  1679,  1683,  1688,  1689,  1693,
+    1700,  1707,  1709,  1714,  1715,  1716,  1720,  1724,  1728,  1729,
+    1730,  1731,  1735,  1741,  1746,  1755,  1756,  1759,  1762,  1765,
+    1766,  1769,  1773,  1776,  1779,  1786,  1787,  1791,  1792,  1794,
+    1798,  1799,  1800,  1801,  1802,  1803,  1804,  1805,  1806,  1807,
+    1808,  1809,  1810,  1811,  1812,  1813,  1814,  1815,  1816,  1817,
+    1818,  1819,  1820,  1821,  1822,  1823,  1824,  1825,  1826,  1827,
+    1828,  1829,  1830,  1831,  1832,  1833,  1834,  1835,  1836,  1837,
+    1838,  1839,  1840,  1841,  1842,  1843,  1844,  1845,  1846,  1847,
+    1848,  1849,  1850,  1851,  1852,  1853,  1854,  1855,  1856,  1857,
+    1858,  1859,  1860,  1861,  1862,  1863,  1864,  1865,  1866,  1867,
+    1868,  1869,  1870,  1871,  1872,  1876,  1881,  1882,  1885,  1886,
+    1887,  1891,  1892,  1893,  1897,  1898,  1899,  1903,  1904,  1905,
+    1908,  1910,  1914,  1915,  1916,  1918,  1919,  1920,  1921,  1922,
+    1923,  1924,  1925,  1926,  1927,  1930,  1935,  1936,  1937,  1938,
+    1939,  1941,  1944,  1945,  1949,  1952,  1958,  1959,  1960,  1961,
+    1962,  1963,  1964,  1969,  1971,  1975,  1976,  1979,  1980,  1984,
+    1987,  1989,  1991,  1995,  1996,  1997,  1999,  2002,  2006,  2007,
+    2008,  2011,  2012,  2013,  2014,  2015,  2017,  2018,  2024,  2026,
+    2029,  2032,  2034,  2036,  2039,  2041,  2045,  2047,  2050,  2054,
+    2061,  2063,  2066,  2067,  2072,  2075,  2079,  2079,  2084,  2087,
+    2088,  2092,  2093,  2098,  2099,  2103,  2104,  2108,  2109,  2113,
+    2115,  2119,  2120,  2121,  2122,  2123,  2124,  2125,  2126,  2129,
+    2131,  2135,  2136,  2137,  2138,  2139,  2141,  2143,  2145,  2149,
+    2150,  2151,  2155,  2158,  2161,  2164,  2167,  2170,  2176,  2180,
+    2187,  2188,  2193,  2195,  2196,  2199,  2200,  2203,  2204,  2208,
+    2209,  2213,  2214,  2215,  2216,  2217,  2220,  2223,  2224,  2225,
+    2227,  2229,  2233,  2234,  2235,  2237,  2238,  2239,  2243,  2245,
+    2248,  2250,  2251,  2252,  2253,  2256,  2258,  2259,  2263,  2265,
+    2268,  2270,  2271,  2272,  2276,  2278,  2281,  2284,  2286,  2288,
+    2292,  2293,  2295,  2296,  2302,  2303,  2305,  2307,  2309,  2311,
+    2314,  2315,  2316,  2320,  2321,  2322,  2323,  2324,  2325,  2326,
+    2330,  2331,  2335,  2344,  2351,  2352,  2358,  2359,  2367,  2370,
+    2374,  2377,  2382,  2383,  2384,  2385,  2389,  2390,  2394,  2396,
+    2397,  2399,  2402,  2404,  2409,  2415,  2417,  2421,  2424,  2427,
+    2436,  2439,  2442,  2443,  2446,  2447,  2451,  2456,  2460,  2466,
+    2474,  2475
 };
 #endif
 
@@ -5515,42 +5515,41 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 832 "hphp.y"
-    { _p->nns((yyvsp[(1) - (1)]).num() == T_DECLARE);
-                                         (yyval) = (yyvsp[(1) - (1)]);;}
+    { _p->nns((yyvsp[(1) - (1)]).num()); (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 7:
 
 /* Line 1455 of yacc.c  */
-#line 834 "hphp.y"
+#line 833 "hphp.y"
     { _p->nns(); (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 8:
 
 /* Line 1455 of yacc.c  */
-#line 835 "hphp.y"
+#line 834 "hphp.y"
     { _p->nns(); (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 9:
 
 /* Line 1455 of yacc.c  */
-#line 836 "hphp.y"
+#line 835 "hphp.y"
     { _p->nns(); (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 10:
 
 /* Line 1455 of yacc.c  */
-#line 837 "hphp.y"
+#line 836 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]); ;}
     break;
 
   case 11:
 
 /* Line 1455 of yacc.c  */
-#line 838 "hphp.y"
+#line 837 "hphp.y"
     { _p->onHaltCompiler();
                                          _p->finiParseTree();
                                          YYACCEPT;;}
@@ -5559,7 +5558,7 @@ yyreduce:
   case 12:
 
 /* Line 1455 of yacc.c  */
-#line 841 "hphp.y"
+#line 840 "hphp.y"
     { _p->onNamespaceStart((yyvsp[(2) - (3)]).text(), true);
                                          (yyval).reset();;}
     break;
@@ -5567,42 +5566,42 @@ yyreduce:
   case 13:
 
 /* Line 1455 of yacc.c  */
-#line 843 "hphp.y"
+#line 842 "hphp.y"
     { _p->onNamespaceStart((yyvsp[(2) - (3)]).text());;}
     break;
 
   case 14:
 
 /* Line 1455 of yacc.c  */
-#line 844 "hphp.y"
+#line 843 "hphp.y"
     { _p->onNamespaceEnd(); (yyval) = (yyvsp[(5) - (6)]);;}
     break;
 
   case 15:
 
 /* Line 1455 of yacc.c  */
-#line 845 "hphp.y"
+#line 844 "hphp.y"
     { _p->onNamespaceStart("");;}
     break;
 
   case 16:
 
 /* Line 1455 of yacc.c  */
-#line 846 "hphp.y"
+#line 845 "hphp.y"
     { _p->onNamespaceEnd(); (yyval) = (yyvsp[(4) - (5)]);;}
     break;
 
   case 17:
 
 /* Line 1455 of yacc.c  */
-#line 847 "hphp.y"
+#line 846 "hphp.y"
     { _p->nns(); (yyval).reset();;}
     break;
 
   case 18:
 
 /* Line 1455 of yacc.c  */
-#line 848 "hphp.y"
+#line 847 "hphp.y"
     { _p->nns();
                                          _p->finishStatement((yyval), (yyvsp[(1) - (2)])); (yyval) = 1;;}
     break;
@@ -5610,126 +5609,126 @@ yyreduce:
   case 19:
 
 /* Line 1455 of yacc.c  */
-#line 853 "hphp.y"
+#line 852 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 20:
 
 /* Line 1455 of yacc.c  */
-#line 854 "hphp.y"
+#line 853 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 21:
 
 /* Line 1455 of yacc.c  */
-#line 855 "hphp.y"
+#line 854 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 22:
 
 /* Line 1455 of yacc.c  */
-#line 856 "hphp.y"
+#line 855 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 23:
 
 /* Line 1455 of yacc.c  */
-#line 857 "hphp.y"
+#line 856 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 24:
 
 /* Line 1455 of yacc.c  */
-#line 858 "hphp.y"
+#line 857 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 25:
 
 /* Line 1455 of yacc.c  */
-#line 863 "hphp.y"
+#line 862 "hphp.y"
     { ;}
     break;
 
   case 26:
 
 /* Line 1455 of yacc.c  */
-#line 864 "hphp.y"
+#line 863 "hphp.y"
     { ;}
     break;
 
   case 27:
 
 /* Line 1455 of yacc.c  */
-#line 867 "hphp.y"
+#line 866 "hphp.y"
     { _p->onUse((yyvsp[(1) - (1)]).text(),"");;}
     break;
 
   case 28:
 
 /* Line 1455 of yacc.c  */
-#line 868 "hphp.y"
+#line 867 "hphp.y"
     { _p->onUse((yyvsp[(2) - (2)]).text(),"");;}
     break;
 
   case 29:
 
 /* Line 1455 of yacc.c  */
-#line 869 "hphp.y"
+#line 868 "hphp.y"
     { _p->onUse((yyvsp[(1) - (3)]).text(),(yyvsp[(3) - (3)]).text());;}
     break;
 
   case 30:
 
 /* Line 1455 of yacc.c  */
-#line 871 "hphp.y"
+#line 870 "hphp.y"
     { _p->onUse((yyvsp[(2) - (4)]).text(),(yyvsp[(4) - (4)]).text());;}
     break;
 
   case 31:
 
 /* Line 1455 of yacc.c  */
-#line 875 "hphp.y"
+#line 874 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 32:
 
 /* Line 1455 of yacc.c  */
-#line 877 "hphp.y"
+#line 876 "hphp.y"
     { (yyval) = (yyvsp[(1) - (3)]) + (yyvsp[(2) - (3)]) + (yyvsp[(3) - (3)]); (yyval) = (yyvsp[(1) - (3)]).num() | 2;;}
     break;
 
   case 33:
 
 /* Line 1455 of yacc.c  */
-#line 880 "hphp.y"
+#line 879 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]); (yyval) = (yyval).num() | 1;;}
     break;
 
   case 34:
 
 /* Line 1455 of yacc.c  */
-#line 882 "hphp.y"
+#line 881 "hphp.y"
     { (yyval).set((yyvsp[(3) - (3)]).num() | 2, _p->nsDecl((yyvsp[(3) - (3)]).text()));;}
     break;
 
   case 35:
 
 /* Line 1455 of yacc.c  */
-#line 883 "hphp.y"
+#line 882 "hphp.y"
     { (yyval) = (yyvsp[(2) - (2)]); (yyval) = (yyval).num() | 2;;}
     break;
 
   case 36:
 
 /* Line 1455 of yacc.c  */
-#line 886 "hphp.y"
+#line 885 "hphp.y"
     { if ((yyvsp[(1) - (1)]).num() & 1) {
                                            (yyvsp[(1) - (1)]).setText(_p->resolve((yyvsp[(1) - (1)]).text(),0));
                                          }
@@ -5739,7 +5738,7 @@ yyreduce:
   case 37:
 
 /* Line 1455 of yacc.c  */
-#line 893 "hphp.y"
+#line 892 "hphp.y"
     { if ((yyvsp[(1) - (2)]).num() & 1) {
                                            (yyvsp[(1) - (2)]).setText(_p->resolve((yyvsp[(1) - (2)]).text(),0));
                                          }
@@ -5749,7 +5748,7 @@ yyreduce:
   case 38:
 
 /* Line 1455 of yacc.c  */
-#line 900 "hphp.y"
+#line 899 "hphp.y"
     { if ((yyvsp[(1) - (2)]).num() & 1) {
                                            (yyvsp[(1) - (2)]).setText(_p->resolve((yyvsp[(1) - (2)]).text(),1));
                                          }
@@ -5759,7 +5758,7 @@ yyreduce:
   case 39:
 
 /* Line 1455 of yacc.c  */
-#line 908 "hphp.y"
+#line 907 "hphp.y"
     { (yyvsp[(3) - (5)]).setText(_p->nsDecl((yyvsp[(3) - (5)]).text()));
                                          on_constant(_p,(yyval),&(yyvsp[(1) - (5)]),(yyvsp[(3) - (5)]),(yyvsp[(5) - (5)]));;}
     break;
@@ -5767,7 +5766,7 @@ yyreduce:
   case 40:
 
 /* Line 1455 of yacc.c  */
-#line 911 "hphp.y"
+#line 910 "hphp.y"
     { (yyvsp[(2) - (4)]).setText(_p->nsDecl((yyvsp[(2) - (4)]).text()));
                                          on_constant(_p,(yyval),  0,(yyvsp[(2) - (4)]),(yyvsp[(4) - (4)]));;}
     break;
@@ -5775,77 +5774,77 @@ yyreduce:
   case 41:
 
 /* Line 1455 of yacc.c  */
-#line 917 "hphp.y"
+#line 916 "hphp.y"
     { _p->addStatement((yyval),(yyvsp[(1) - (2)]),(yyvsp[(2) - (2)]));;}
     break;
 
   case 42:
 
 /* Line 1455 of yacc.c  */
-#line 918 "hphp.y"
+#line 917 "hphp.y"
     { _p->onStatementListStart((yyval));;}
     break;
 
   case 43:
 
 /* Line 1455 of yacc.c  */
-#line 921 "hphp.y"
+#line 920 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 44:
 
 /* Line 1455 of yacc.c  */
-#line 922 "hphp.y"
+#line 921 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 45:
 
 /* Line 1455 of yacc.c  */
-#line 923 "hphp.y"
+#line 922 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 46:
 
 /* Line 1455 of yacc.c  */
-#line 924 "hphp.y"
+#line 923 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 47:
 
 /* Line 1455 of yacc.c  */
-#line 927 "hphp.y"
+#line 926 "hphp.y"
     { _p->onBlock((yyval), (yyvsp[(2) - (3)]));;}
     break;
 
   case 48:
 
 /* Line 1455 of yacc.c  */
-#line 931 "hphp.y"
+#line 930 "hphp.y"
     { _p->onIf((yyval),(yyvsp[(2) - (5)]),(yyvsp[(3) - (5)]),(yyvsp[(4) - (5)]),(yyvsp[(5) - (5)]));;}
     break;
 
   case 49:
 
 /* Line 1455 of yacc.c  */
-#line 936 "hphp.y"
+#line 935 "hphp.y"
     { _p->onIf((yyval),(yyvsp[(2) - (8)]),(yyvsp[(4) - (8)]),(yyvsp[(5) - (8)]),(yyvsp[(6) - (8)]));;}
     break;
 
   case 50:
 
 /* Line 1455 of yacc.c  */
-#line 937 "hphp.y"
+#line 936 "hphp.y"
     { _p->pushLabelScope();;}
     break;
 
   case 51:
 
 /* Line 1455 of yacc.c  */
-#line 938 "hphp.y"
+#line 937 "hphp.y"
     { _p->popLabelScope();
                                          _p->onWhile((yyval),(yyvsp[(2) - (4)]),(yyvsp[(4) - (4)]));;}
     break;
@@ -5853,14 +5852,14 @@ yyreduce:
   case 52:
 
 /* Line 1455 of yacc.c  */
-#line 941 "hphp.y"
+#line 940 "hphp.y"
     { _p->pushLabelScope();;}
     break;
 
   case 53:
 
 /* Line 1455 of yacc.c  */
-#line 943 "hphp.y"
+#line 942 "hphp.y"
     { _p->popLabelScope();
                                          _p->onDo((yyval),(yyvsp[(3) - (6)]),(yyvsp[(5) - (6)]));;}
     break;
@@ -5868,14 +5867,14 @@ yyreduce:
   case 54:
 
 /* Line 1455 of yacc.c  */
-#line 946 "hphp.y"
+#line 945 "hphp.y"
     { _p->pushLabelScope();;}
     break;
 
   case 55:
 
 /* Line 1455 of yacc.c  */
-#line 947 "hphp.y"
+#line 946 "hphp.y"
     { _p->popLabelScope();
                                          _p->onFor((yyval),(yyvsp[(3) - (10)]),(yyvsp[(5) - (10)]),(yyvsp[(7) - (10)]),(yyvsp[(10) - (10)]));;}
     break;
@@ -5883,14 +5882,14 @@ yyreduce:
   case 56:
 
 /* Line 1455 of yacc.c  */
-#line 949 "hphp.y"
+#line 948 "hphp.y"
     { _p->pushLabelScope();;}
     break;
 
   case 57:
 
 /* Line 1455 of yacc.c  */
-#line 950 "hphp.y"
+#line 949 "hphp.y"
     { _p->popLabelScope();
                                          _p->onSwitch((yyval),(yyvsp[(2) - (4)]),(yyvsp[(4) - (4)]));;}
     break;
@@ -5898,105 +5897,105 @@ yyreduce:
   case 58:
 
 /* Line 1455 of yacc.c  */
-#line 952 "hphp.y"
+#line 951 "hphp.y"
     { _p->onBreak((yyval), NULL);;}
     break;
 
   case 59:
 
 /* Line 1455 of yacc.c  */
-#line 953 "hphp.y"
+#line 952 "hphp.y"
     { _p->onBreak((yyval), &(yyvsp[(2) - (3)]));;}
     break;
 
   case 60:
 
 /* Line 1455 of yacc.c  */
-#line 954 "hphp.y"
+#line 953 "hphp.y"
     { _p->onContinue((yyval), NULL);;}
     break;
 
   case 61:
 
 /* Line 1455 of yacc.c  */
-#line 955 "hphp.y"
+#line 954 "hphp.y"
     { _p->onContinue((yyval), &(yyvsp[(2) - (3)]));;}
     break;
 
   case 62:
 
 /* Line 1455 of yacc.c  */
-#line 956 "hphp.y"
+#line 955 "hphp.y"
     { _p->onReturn((yyval), NULL);;}
     break;
 
   case 63:
 
 /* Line 1455 of yacc.c  */
-#line 957 "hphp.y"
+#line 956 "hphp.y"
     { _p->onReturn((yyval), &(yyvsp[(2) - (3)]));;}
     break;
 
   case 64:
 
 /* Line 1455 of yacc.c  */
-#line 958 "hphp.y"
+#line 957 "hphp.y"
     { _p->onYieldBreak((yyval));;}
     break;
 
   case 65:
 
 /* Line 1455 of yacc.c  */
-#line 959 "hphp.y"
+#line 958 "hphp.y"
     { _p->onGlobal((yyval), (yyvsp[(2) - (3)]));;}
     break;
 
   case 66:
 
 /* Line 1455 of yacc.c  */
-#line 960 "hphp.y"
+#line 959 "hphp.y"
     { _p->onStatic((yyval), (yyvsp[(2) - (3)]));;}
     break;
 
   case 67:
 
 /* Line 1455 of yacc.c  */
-#line 961 "hphp.y"
+#line 960 "hphp.y"
     { _p->onEcho((yyval), (yyvsp[(2) - (3)]), 0);;}
     break;
 
   case 68:
 
 /* Line 1455 of yacc.c  */
-#line 962 "hphp.y"
+#line 961 "hphp.y"
     { _p->onUnset((yyval), (yyvsp[(3) - (5)]));;}
     break;
 
   case 69:
 
 /* Line 1455 of yacc.c  */
-#line 963 "hphp.y"
-    { (yyval).reset();;}
+#line 962 "hphp.y"
+    { (yyval).reset(); (yyval) = ';';}
     break;
 
   case 70:
 
 /* Line 1455 of yacc.c  */
-#line 964 "hphp.y"
+#line 963 "hphp.y"
     { _p->onEcho((yyval), (yyvsp[(1) - (1)]), 1);;}
     break;
 
   case 71:
 
 /* Line 1455 of yacc.c  */
-#line 967 "hphp.y"
+#line 966 "hphp.y"
     { _p->pushLabelScope();;}
     break;
 
   case 72:
 
 /* Line 1455 of yacc.c  */
-#line 968 "hphp.y"
+#line 967 "hphp.y"
     { _p->popLabelScope();
                                          _p->onForEach((yyval),(yyvsp[(3) - (9)]),(yyvsp[(5) - (9)]),(yyvsp[(6) - (9)]),(yyvsp[(9) - (9)]));;}
     break;
@@ -6004,35 +6003,35 @@ yyreduce:
   case 73:
 
 /* Line 1455 of yacc.c  */
-#line 971 "hphp.y"
+#line 970 "hphp.y"
     { _p->onBlock((yyval), (yyvsp[(5) - (5)])); (yyval) = T_DECLARE;;}
     break;
 
   case 74:
 
 /* Line 1455 of yacc.c  */
-#line 979 "hphp.y"
+#line 978 "hphp.y"
     { _p->onTry((yyval),(yyvsp[(3) - (14)]),(yyvsp[(7) - (14)]),(yyvsp[(8) - (14)]),(yyvsp[(11) - (14)]),(yyvsp[(13) - (14)]),(yyvsp[(14) - (14)]));;}
     break;
 
   case 75:
 
 /* Line 1455 of yacc.c  */
-#line 982 "hphp.y"
+#line 981 "hphp.y"
     { _p->onTry((yyval), (yyvsp[(3) - (5)]), (yyvsp[(5) - (5)]));;}
     break;
 
   case 76:
 
 /* Line 1455 of yacc.c  */
-#line 983 "hphp.y"
+#line 982 "hphp.y"
     { _p->onThrow((yyval), (yyvsp[(2) - (3)]));;}
     break;
 
   case 77:
 
 /* Line 1455 of yacc.c  */
-#line 984 "hphp.y"
+#line 983 "hphp.y"
     { _p->onGoto((yyval), (yyvsp[(2) - (3)]), true);
                                          _p->addGoto((yyvsp[(2) - (3)]).text(),
                                                      _p->getLocation(),
@@ -6042,35 +6041,35 @@ yyreduce:
   case 78:
 
 /* Line 1455 of yacc.c  */
-#line 988 "hphp.y"
+#line 987 "hphp.y"
     { _p->onExpStatement((yyval), (yyvsp[(1) - (2)]));;}
     break;
 
   case 79:
 
 /* Line 1455 of yacc.c  */
-#line 989 "hphp.y"
+#line 988 "hphp.y"
     { _p->onExpStatement((yyval), (yyvsp[(1) - (2)]));;}
     break;
 
   case 80:
 
 /* Line 1455 of yacc.c  */
-#line 990 "hphp.y"
+#line 989 "hphp.y"
     { _p->onExpStatement((yyval), (yyvsp[(1) - (2)]));;}
     break;
 
   case 81:
 
 /* Line 1455 of yacc.c  */
-#line 991 "hphp.y"
+#line 990 "hphp.y"
     { _p->onExpStatement((yyval), (yyvsp[(1) - (2)]));;}
     break;
 
   case 82:
 
 /* Line 1455 of yacc.c  */
-#line 992 "hphp.y"
+#line 991 "hphp.y"
     { _p->onLabel((yyval), (yyvsp[(1) - (2)]));
                                          _p->addLabel((yyvsp[(1) - (2)]).text(),
                                                       _p->getLocation(),
@@ -6080,63 +6079,63 @@ yyreduce:
   case 83:
 
 /* Line 1455 of yacc.c  */
-#line 1004 "hphp.y"
+#line 1003 "hphp.y"
     { _p->onCatch((yyval), (yyvsp[(1) - (9)]), (yyvsp[(4) - (9)]), (yyvsp[(5) - (9)]), (yyvsp[(8) - (9)]));;}
     break;
 
   case 84:
 
 /* Line 1455 of yacc.c  */
-#line 1005 "hphp.y"
+#line 1004 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 85:
 
 /* Line 1455 of yacc.c  */
-#line 1009 "hphp.y"
+#line 1008 "hphp.y"
     { finally_statement(_p);;}
     break;
 
   case 86:
 
 /* Line 1455 of yacc.c  */
-#line 1011 "hphp.y"
+#line 1010 "hphp.y"
     { _p->onFinally((yyval), (yyvsp[(4) - (5)]));;}
     break;
 
   case 88:
 
 /* Line 1455 of yacc.c  */
-#line 1016 "hphp.y"
+#line 1015 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 89:
 
 /* Line 1455 of yacc.c  */
-#line 1020 "hphp.y"
+#line 1019 "hphp.y"
     { (yyval) = 1;;}
     break;
 
   case 90:
 
 /* Line 1455 of yacc.c  */
-#line 1021 "hphp.y"
+#line 1020 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 91:
 
 /* Line 1455 of yacc.c  */
-#line 1025 "hphp.y"
+#line 1024 "hphp.y"
     { _p->pushFuncLocation();;}
     break;
 
   case 92:
 
 /* Line 1455 of yacc.c  */
-#line 1030 "hphp.y"
+#line 1029 "hphp.y"
     { (yyvsp[(3) - (3)]).setText(_p->nsDecl((yyvsp[(3) - (3)]).text()));
                                          _p->onFunctionStart((yyvsp[(3) - (3)]));
                                          _p->pushLabelInfo();;}
@@ -6145,7 +6144,7 @@ yyreduce:
   case 93:
 
 /* Line 1455 of yacc.c  */
-#line 1035 "hphp.y"
+#line 1034 "hphp.y"
     { _p->onFunction((yyval),0,(yyvsp[(8) - (11)]),(yyvsp[(2) - (11)]),(yyvsp[(3) - (11)]),(yyvsp[(6) - (11)]),(yyvsp[(10) - (11)]),0);
                                          _p->popLabelInfo();
                                          _p->popTypeScope();;}
@@ -6154,7 +6153,7 @@ yyreduce:
   case 94:
 
 /* Line 1455 of yacc.c  */
-#line 1039 "hphp.y"
+#line 1038 "hphp.y"
     { (yyvsp[(4) - (4)]).setText(_p->nsDecl((yyvsp[(4) - (4)]).text()));
                                          _p->onFunctionStart((yyvsp[(4) - (4)]));
                                          _p->pushLabelInfo();;}
@@ -6163,7 +6162,7 @@ yyreduce:
   case 95:
 
 /* Line 1455 of yacc.c  */
-#line 1044 "hphp.y"
+#line 1043 "hphp.y"
     { _p->onFunction((yyval),0,(yyvsp[(9) - (12)]),(yyvsp[(3) - (12)]),(yyvsp[(4) - (12)]),(yyvsp[(7) - (12)]),(yyvsp[(11) - (12)]),&(yyvsp[(1) - (12)]));
                                          _p->popLabelInfo();
                                          _p->popTypeScope();;}
@@ -6172,7 +6171,7 @@ yyreduce:
   case 96:
 
 /* Line 1455 of yacc.c  */
-#line 1051 "hphp.y"
+#line 1050 "hphp.y"
     { (yyvsp[(2) - (2)]).setText(_p->nsDecl((yyvsp[(2) - (2)]).text()));
                                          _p->onClassStart((yyvsp[(1) - (2)]).num(),(yyvsp[(2) - (2)]));;}
     break;
@@ -6180,7 +6179,7 @@ yyreduce:
   case 97:
 
 /* Line 1455 of yacc.c  */
-#line 1054 "hphp.y"
+#line 1053 "hphp.y"
     { Token stmts;
                                          if (_p->peekClass()) {
                                            xhp_collect_attributes(_p,stmts,(yyvsp[(7) - (8)]));
@@ -6199,7 +6198,7 @@ yyreduce:
   case 98:
 
 /* Line 1455 of yacc.c  */
-#line 1069 "hphp.y"
+#line 1068 "hphp.y"
     { (yyvsp[(3) - (3)]).setText(_p->nsDecl((yyvsp[(3) - (3)]).text()));
                                          _p->onClassStart((yyvsp[(2) - (3)]).num(),(yyvsp[(3) - (3)]));;}
     break;
@@ -6207,7 +6206,7 @@ yyreduce:
   case 99:
 
 /* Line 1455 of yacc.c  */
-#line 1072 "hphp.y"
+#line 1071 "hphp.y"
     { Token stmts;
                                          if (_p->peekClass()) {
                                            xhp_collect_attributes(_p,stmts,(yyvsp[(8) - (9)]));
@@ -6226,7 +6225,7 @@ yyreduce:
   case 100:
 
 /* Line 1455 of yacc.c  */
-#line 1086 "hphp.y"
+#line 1085 "hphp.y"
     { (yyvsp[(2) - (2)]).setText(_p->nsDecl((yyvsp[(2) - (2)]).text()));
                                          _p->onClassStart(T_INTERFACE,(yyvsp[(2) - (2)]));;}
     break;
@@ -6234,7 +6233,7 @@ yyreduce:
   case 101:
 
 /* Line 1455 of yacc.c  */
-#line 1089 "hphp.y"
+#line 1088 "hphp.y"
     { _p->onInterface((yyval),(yyvsp[(2) - (7)]),(yyvsp[(4) - (7)]),(yyvsp[(6) - (7)]),0);
                                          _p->popClass();
                                          _p->popTypeScope();;}
@@ -6243,7 +6242,7 @@ yyreduce:
   case 102:
 
 /* Line 1455 of yacc.c  */
-#line 1094 "hphp.y"
+#line 1093 "hphp.y"
     { (yyvsp[(3) - (3)]).setText(_p->nsDecl((yyvsp[(3) - (3)]).text()));
                                          _p->onClassStart(T_INTERFACE,(yyvsp[(3) - (3)]));;}
     break;
@@ -6251,7 +6250,7 @@ yyreduce:
   case 103:
 
 /* Line 1455 of yacc.c  */
-#line 1097 "hphp.y"
+#line 1096 "hphp.y"
     { _p->onInterface((yyval),(yyvsp[(3) - (8)]),(yyvsp[(5) - (8)]),(yyvsp[(7) - (8)]),&(yyvsp[(1) - (8)]));
                                          _p->popClass();
                                          _p->popTypeScope();;}
@@ -6260,7 +6259,7 @@ yyreduce:
   case 104:
 
 /* Line 1455 of yacc.c  */
-#line 1104 "hphp.y"
+#line 1103 "hphp.y"
     { (yyvsp[(2) - (2)]).setText(_p->nsDecl((yyvsp[(2) - (2)]).text()));
                                          _p->onClassStart(T_TRAIT, (yyvsp[(2) - (2)]));;}
     break;
@@ -6268,7 +6267,7 @@ yyreduce:
   case 105:
 
 /* Line 1455 of yacc.c  */
-#line 1107 "hphp.y"
+#line 1106 "hphp.y"
     { Token t_ext, t_imp;
                                          t_ext.reset(); t_imp.reset();
                                          _p->onClass((yyval),T_TRAIT,(yyvsp[(2) - (7)]),t_ext,t_imp,
@@ -6280,7 +6279,7 @@ yyreduce:
   case 106:
 
 /* Line 1455 of yacc.c  */
-#line 1115 "hphp.y"
+#line 1114 "hphp.y"
     { (yyvsp[(3) - (3)]).setText(_p->nsDecl((yyvsp[(3) - (3)]).text()));
                                          _p->onClassStart(T_TRAIT, (yyvsp[(3) - (3)]));;}
     break;
@@ -6288,7 +6287,7 @@ yyreduce:
   case 107:
 
 /* Line 1455 of yacc.c  */
-#line 1118 "hphp.y"
+#line 1117 "hphp.y"
     { Token t_ext, t_imp;
                                          t_ext.reset(); t_imp.reset();
                                          _p->onClass((yyval),T_TRAIT,(yyvsp[(3) - (8)]),t_ext,t_imp,
@@ -6300,14 +6299,14 @@ yyreduce:
   case 108:
 
 /* Line 1455 of yacc.c  */
-#line 1126 "hphp.y"
+#line 1125 "hphp.y"
     { _p->pushClass(false); (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 109:
 
 /* Line 1455 of yacc.c  */
-#line 1127 "hphp.y"
+#line 1126 "hphp.y"
     { (yyvsp[(1) - (1)]).xhpLabel(); _p->pushTypeScope();
                                          _p->pushClass(true); (yyval) = (yyvsp[(1) - (1)]);;}
     break;
@@ -6315,525 +6314,525 @@ yyreduce:
   case 110:
 
 /* Line 1455 of yacc.c  */
-#line 1131 "hphp.y"
+#line 1130 "hphp.y"
     { _p->pushClass(false); (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 111:
 
 /* Line 1455 of yacc.c  */
-#line 1134 "hphp.y"
+#line 1133 "hphp.y"
     { _p->pushClass(false); (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 112:
 
 /* Line 1455 of yacc.c  */
-#line 1137 "hphp.y"
+#line 1136 "hphp.y"
     { (yyval) = T_CLASS;;}
     break;
 
   case 113:
 
 /* Line 1455 of yacc.c  */
-#line 1138 "hphp.y"
+#line 1137 "hphp.y"
     { (yyval) = T_ABSTRACT;;}
     break;
 
   case 114:
 
 /* Line 1455 of yacc.c  */
-#line 1139 "hphp.y"
+#line 1138 "hphp.y"
     { (yyval) = T_FINAL;;}
     break;
 
   case 115:
 
 /* Line 1455 of yacc.c  */
-#line 1143 "hphp.y"
+#line 1142 "hphp.y"
     { (yyval) = (yyvsp[(2) - (2)]);;}
     break;
 
   case 116:
 
 /* Line 1455 of yacc.c  */
-#line 1144 "hphp.y"
+#line 1143 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 117:
 
 /* Line 1455 of yacc.c  */
-#line 1147 "hphp.y"
+#line 1146 "hphp.y"
     { (yyval) = (yyvsp[(2) - (2)]);;}
     break;
 
   case 118:
 
 /* Line 1455 of yacc.c  */
-#line 1148 "hphp.y"
+#line 1147 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 119:
 
 /* Line 1455 of yacc.c  */
-#line 1151 "hphp.y"
+#line 1150 "hphp.y"
     { (yyval) = (yyvsp[(2) - (2)]);;}
     break;
 
   case 120:
 
 /* Line 1455 of yacc.c  */
-#line 1152 "hphp.y"
+#line 1151 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 121:
 
 /* Line 1455 of yacc.c  */
-#line 1155 "hphp.y"
+#line 1154 "hphp.y"
     { _p->onInterfaceName((yyval), NULL, (yyvsp[(1) - (1)]));;}
     break;
 
   case 122:
 
 /* Line 1455 of yacc.c  */
-#line 1157 "hphp.y"
+#line 1156 "hphp.y"
     { _p->onInterfaceName((yyval), &(yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));;}
     break;
 
   case 123:
 
 /* Line 1455 of yacc.c  */
-#line 1160 "hphp.y"
+#line 1159 "hphp.y"
     { _p->onTraitName((yyval), NULL, (yyvsp[(1) - (1)]));;}
     break;
 
   case 124:
 
 /* Line 1455 of yacc.c  */
-#line 1162 "hphp.y"
+#line 1161 "hphp.y"
     { _p->onTraitName((yyval), &(yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));;}
     break;
 
   case 125:
 
 /* Line 1455 of yacc.c  */
-#line 1166 "hphp.y"
+#line 1165 "hphp.y"
     { (yyval) = (yyvsp[(2) - (2)]);;}
     break;
 
   case 126:
 
 /* Line 1455 of yacc.c  */
-#line 1167 "hphp.y"
+#line 1166 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 127:
 
 /* Line 1455 of yacc.c  */
-#line 1170 "hphp.y"
+#line 1169 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 128:
 
 /* Line 1455 of yacc.c  */
-#line 1171 "hphp.y"
+#line 1170 "hphp.y"
     { (yyval) = (yyvsp[(2) - (2)]); (yyval) = 1;;}
     break;
 
   case 129:
 
 /* Line 1455 of yacc.c  */
-#line 1175 "hphp.y"
+#line 1174 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 130:
 
 /* Line 1455 of yacc.c  */
-#line 1177 "hphp.y"
+#line 1176 "hphp.y"
     { (yyval) = (yyvsp[(2) - (4)]);;}
     break;
 
   case 131:
 
 /* Line 1455 of yacc.c  */
-#line 1180 "hphp.y"
+#line 1179 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 132:
 
 /* Line 1455 of yacc.c  */
-#line 1182 "hphp.y"
+#line 1181 "hphp.y"
     { (yyval) = (yyvsp[(2) - (4)]);;}
     break;
 
   case 133:
 
 /* Line 1455 of yacc.c  */
-#line 1185 "hphp.y"
+#line 1184 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 134:
 
 /* Line 1455 of yacc.c  */
-#line 1187 "hphp.y"
+#line 1186 "hphp.y"
     { (yyval) = (yyvsp[(2) - (4)]);;}
     break;
 
   case 135:
 
 /* Line 1455 of yacc.c  */
-#line 1190 "hphp.y"
+#line 1189 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 136:
 
 /* Line 1455 of yacc.c  */
-#line 1192 "hphp.y"
+#line 1191 "hphp.y"
     { (yyval) = (yyvsp[(2) - (4)]);;}
     break;
 
   case 139:
 
 /* Line 1455 of yacc.c  */
-#line 1202 "hphp.y"
+#line 1201 "hphp.y"
     { (yyval) = (yyvsp[(2) - (3)]);;}
     break;
 
   case 140:
 
 /* Line 1455 of yacc.c  */
-#line 1203 "hphp.y"
+#line 1202 "hphp.y"
     { (yyval) = (yyvsp[(3) - (4)]);;}
     break;
 
   case 141:
 
 /* Line 1455 of yacc.c  */
-#line 1204 "hphp.y"
+#line 1203 "hphp.y"
     { (yyval) = (yyvsp[(2) - (4)]);;}
     break;
 
   case 142:
 
 /* Line 1455 of yacc.c  */
-#line 1205 "hphp.y"
+#line 1204 "hphp.y"
     { (yyval) = (yyvsp[(3) - (5)]);;}
     break;
 
   case 143:
 
 /* Line 1455 of yacc.c  */
-#line 1210 "hphp.y"
+#line 1209 "hphp.y"
     { _p->onCase((yyval),(yyvsp[(1) - (5)]),&(yyvsp[(3) - (5)]),(yyvsp[(5) - (5)]));;}
     break;
 
   case 144:
 
 /* Line 1455 of yacc.c  */
-#line 1212 "hphp.y"
+#line 1211 "hphp.y"
     { _p->onCase((yyval),(yyvsp[(1) - (4)]),NULL,(yyvsp[(4) - (4)]));;}
     break;
 
   case 145:
 
 /* Line 1455 of yacc.c  */
-#line 1213 "hphp.y"
+#line 1212 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 146:
 
 /* Line 1455 of yacc.c  */
-#line 1216 "hphp.y"
+#line 1215 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 147:
 
 /* Line 1455 of yacc.c  */
-#line 1217 "hphp.y"
+#line 1216 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 148:
 
 /* Line 1455 of yacc.c  */
-#line 1222 "hphp.y"
+#line 1221 "hphp.y"
     { _p->onElseIf((yyval),(yyvsp[(1) - (4)]),(yyvsp[(3) - (4)]),(yyvsp[(4) - (4)]));;}
     break;
 
   case 149:
 
 /* Line 1455 of yacc.c  */
-#line 1223 "hphp.y"
+#line 1222 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 150:
 
 /* Line 1455 of yacc.c  */
-#line 1228 "hphp.y"
+#line 1227 "hphp.y"
     { _p->onElseIf((yyval),(yyvsp[(1) - (5)]),(yyvsp[(3) - (5)]),(yyvsp[(5) - (5)]));;}
     break;
 
   case 151:
 
 /* Line 1455 of yacc.c  */
-#line 1229 "hphp.y"
+#line 1228 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 152:
 
 /* Line 1455 of yacc.c  */
-#line 1232 "hphp.y"
+#line 1231 "hphp.y"
     { (yyval) = (yyvsp[(2) - (2)]);;}
     break;
 
   case 153:
 
 /* Line 1455 of yacc.c  */
-#line 1233 "hphp.y"
+#line 1232 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 154:
 
 /* Line 1455 of yacc.c  */
-#line 1236 "hphp.y"
+#line 1235 "hphp.y"
     { (yyval) = (yyvsp[(3) - (3)]);;}
     break;
 
   case 155:
 
 /* Line 1455 of yacc.c  */
-#line 1237 "hphp.y"
+#line 1236 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 156:
 
 /* Line 1455 of yacc.c  */
-#line 1242 "hphp.y"
+#line 1241 "hphp.y"
     { only_in_strict_mode(_p); (yyval) = (yyvsp[(1) - (3)]); ;}
     break;
 
   case 157:
 
 /* Line 1455 of yacc.c  */
-#line 1244 "hphp.y"
+#line 1243 "hphp.y"
     { (yyval) = (yyvsp[(1) - (2)]);;}
     break;
 
   case 158:
 
 /* Line 1455 of yacc.c  */
-#line 1245 "hphp.y"
+#line 1244 "hphp.y"
     { only_in_strict_mode(_p); (yyval).reset(); ;}
     break;
 
   case 159:
 
 /* Line 1455 of yacc.c  */
-#line 1246 "hphp.y"
+#line 1245 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 160:
 
 /* Line 1455 of yacc.c  */
-#line 1251 "hphp.y"
+#line 1250 "hphp.y"
     { _p->onParam((yyval),NULL,(yyvsp[(2) - (3)]),(yyvsp[(3) - (3)]),0,NULL,&(yyvsp[(1) - (3)]));;}
     break;
 
   case 161:
 
 /* Line 1455 of yacc.c  */
-#line 1253 "hphp.y"
+#line 1252 "hphp.y"
     { _p->onParam((yyval),NULL,(yyvsp[(2) - (4)]),(yyvsp[(4) - (4)]),1,NULL,&(yyvsp[(1) - (4)]));;}
     break;
 
   case 162:
 
 /* Line 1455 of yacc.c  */
-#line 1256 "hphp.y"
+#line 1255 "hphp.y"
     { _p->onParam((yyval),NULL,(yyvsp[(2) - (6)]),(yyvsp[(4) - (6)]),1,&(yyvsp[(6) - (6)]),&(yyvsp[(1) - (6)]));;}
     break;
 
   case 163:
 
 /* Line 1455 of yacc.c  */
-#line 1259 "hphp.y"
+#line 1258 "hphp.y"
     { _p->onParam((yyval),NULL,(yyvsp[(2) - (5)]),(yyvsp[(3) - (5)]),0,&(yyvsp[(5) - (5)]),&(yyvsp[(1) - (5)]));;}
     break;
 
   case 164:
 
 /* Line 1455 of yacc.c  */
-#line 1262 "hphp.y"
+#line 1261 "hphp.y"
     { _p->onParam((yyval),&(yyvsp[(1) - (5)]),(yyvsp[(4) - (5)]),(yyvsp[(5) - (5)]),0,NULL,&(yyvsp[(3) - (5)]));;}
     break;
 
   case 165:
 
 /* Line 1455 of yacc.c  */
-#line 1265 "hphp.y"
+#line 1264 "hphp.y"
     { _p->onParam((yyval),&(yyvsp[(1) - (6)]),(yyvsp[(4) - (6)]),(yyvsp[(6) - (6)]),1,NULL,&(yyvsp[(3) - (6)]));;}
     break;
 
   case 166:
 
 /* Line 1455 of yacc.c  */
-#line 1269 "hphp.y"
+#line 1268 "hphp.y"
     { _p->onParam((yyval),&(yyvsp[(1) - (8)]),(yyvsp[(4) - (8)]),(yyvsp[(6) - (8)]),1,&(yyvsp[(8) - (8)]),&(yyvsp[(3) - (8)]));;}
     break;
 
   case 167:
 
 /* Line 1455 of yacc.c  */
-#line 1273 "hphp.y"
+#line 1272 "hphp.y"
     { _p->onParam((yyval),&(yyvsp[(1) - (7)]),(yyvsp[(4) - (7)]),(yyvsp[(5) - (7)]),0,&(yyvsp[(7) - (7)]),&(yyvsp[(3) - (7)]));;}
     break;
 
   case 168:
 
 /* Line 1455 of yacc.c  */
-#line 1278 "hphp.y"
+#line 1277 "hphp.y"
     { (yyval) = (yyvsp[(1) - (2)]);;}
     break;
 
   case 169:
 
 /* Line 1455 of yacc.c  */
-#line 1279 "hphp.y"
+#line 1278 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 170:
 
 /* Line 1455 of yacc.c  */
-#line 1282 "hphp.y"
+#line 1281 "hphp.y"
     { _p->onCallParam((yyval),NULL,(yyvsp[(1) - (1)]),0);;}
     break;
 
   case 171:
 
 /* Line 1455 of yacc.c  */
-#line 1283 "hphp.y"
+#line 1282 "hphp.y"
     { _p->onCallParam((yyval),NULL,(yyvsp[(2) - (2)]),1);;}
     break;
 
   case 172:
 
 /* Line 1455 of yacc.c  */
-#line 1285 "hphp.y"
+#line 1284 "hphp.y"
     { _p->onCallParam((yyval),&(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),0);;}
     break;
 
   case 173:
 
 /* Line 1455 of yacc.c  */
-#line 1287 "hphp.y"
+#line 1286 "hphp.y"
     { _p->onCallParam((yyval),&(yyvsp[(1) - (4)]),(yyvsp[(4) - (4)]),1);;}
     break;
 
   case 174:
 
 /* Line 1455 of yacc.c  */
-#line 1291 "hphp.y"
+#line 1290 "hphp.y"
     { _p->onGlobalVar((yyval), &(yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));;}
     break;
 
   case 175:
 
 /* Line 1455 of yacc.c  */
-#line 1292 "hphp.y"
+#line 1291 "hphp.y"
     { _p->onGlobalVar((yyval), NULL, (yyvsp[(1) - (1)]));;}
     break;
 
   case 176:
 
 /* Line 1455 of yacc.c  */
-#line 1295 "hphp.y"
+#line 1294 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 177:
 
 /* Line 1455 of yacc.c  */
-#line 1296 "hphp.y"
+#line 1295 "hphp.y"
     { (yyval) = (yyvsp[(2) - (2)]); (yyval) = 1;;}
     break;
 
   case 178:
 
 /* Line 1455 of yacc.c  */
-#line 1297 "hphp.y"
+#line 1296 "hphp.y"
     { (yyval) = (yyvsp[(3) - (4)]); (yyval) = 1;;}
     break;
 
   case 179:
 
 /* Line 1455 of yacc.c  */
-#line 1301 "hphp.y"
+#line 1300 "hphp.y"
     { _p->onStaticVariable((yyval),&(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),0);;}
     break;
 
   case 180:
 
 /* Line 1455 of yacc.c  */
-#line 1303 "hphp.y"
+#line 1302 "hphp.y"
     { _p->onStaticVariable((yyval),&(yyvsp[(1) - (5)]),(yyvsp[(3) - (5)]),&(yyvsp[(5) - (5)]));;}
     break;
 
   case 181:
 
 /* Line 1455 of yacc.c  */
-#line 1304 "hphp.y"
+#line 1303 "hphp.y"
     { _p->onStaticVariable((yyval),0,(yyvsp[(1) - (1)]),0);;}
     break;
 
   case 182:
 
 /* Line 1455 of yacc.c  */
-#line 1305 "hphp.y"
+#line 1304 "hphp.y"
     { _p->onStaticVariable((yyval),0,(yyvsp[(1) - (3)]),&(yyvsp[(3) - (3)]));;}
     break;
 
   case 183:
 
 /* Line 1455 of yacc.c  */
-#line 1310 "hphp.y"
+#line 1309 "hphp.y"
     { _p->onClassStatement((yyval), (yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]));;}
     break;
 
   case 184:
 
 /* Line 1455 of yacc.c  */
-#line 1311 "hphp.y"
+#line 1310 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 185:
 
 /* Line 1455 of yacc.c  */
-#line 1314 "hphp.y"
+#line 1313 "hphp.y"
     { _p->onClassVariableModifer((yyvsp[(1) - (1)]));;}
     break;
 
   case 186:
 
 /* Line 1455 of yacc.c  */
-#line 1315 "hphp.y"
+#line 1314 "hphp.y"
     { _p->onClassVariableStart
                                          ((yyval),&(yyvsp[(1) - (4)]),(yyvsp[(3) - (4)]),NULL);;}
     break;
@@ -6841,14 +6840,14 @@ yyreduce:
   case 187:
 
 /* Line 1455 of yacc.c  */
-#line 1318 "hphp.y"
+#line 1317 "hphp.y"
     { _p->onClassVariableModifer((yyvsp[(1) - (2)]));;}
     break;
 
   case 188:
 
 /* Line 1455 of yacc.c  */
-#line 1319 "hphp.y"
+#line 1318 "hphp.y"
     { _p->onClassVariableStart
                                          ((yyval),&(yyvsp[(1) - (5)]),(yyvsp[(4) - (5)]),&(yyvsp[(2) - (5)]));;}
     break;
@@ -6856,7 +6855,7 @@ yyreduce:
   case 189:
 
 /* Line 1455 of yacc.c  */
-#line 1321 "hphp.y"
+#line 1320 "hphp.y"
     { _p->onClassVariableStart
                                          ((yyval),NULL,(yyvsp[(1) - (2)]),NULL);;}
     break;
@@ -6864,7 +6863,7 @@ yyreduce:
   case 190:
 
 /* Line 1455 of yacc.c  */
-#line 1325 "hphp.y"
+#line 1324 "hphp.y"
     { _p->onMethodStart((yyvsp[(4) - (5)]), (yyvsp[(1) - (5)]));
                                          _p->pushLabelInfo();;}
     break;
@@ -6872,7 +6871,7 @@ yyreduce:
   case 191:
 
 /* Line 1455 of yacc.c  */
-#line 1330 "hphp.y"
+#line 1329 "hphp.y"
     { _p->onMethod((yyval),(yyvsp[(1) - (10)]),(yyvsp[(9) - (10)]),(yyvsp[(3) - (10)]),(yyvsp[(4) - (10)]),(yyvsp[(7) - (10)]),(yyvsp[(10) - (10)]),0);
                                          _p->popLabelInfo();
                                          _p->popTypeScope();;}
@@ -6881,7 +6880,7 @@ yyreduce:
   case 192:
 
 /* Line 1455 of yacc.c  */
-#line 1336 "hphp.y"
+#line 1335 "hphp.y"
     { _p->onMethodStart((yyvsp[(5) - (6)]), (yyvsp[(2) - (6)]));
                                          _p->pushLabelInfo();;}
     break;
@@ -6889,7 +6888,7 @@ yyreduce:
   case 193:
 
 /* Line 1455 of yacc.c  */
-#line 1341 "hphp.y"
+#line 1340 "hphp.y"
     { _p->onMethod((yyval),(yyvsp[(2) - (11)]),(yyvsp[(10) - (11)]),(yyvsp[(4) - (11)]),(yyvsp[(5) - (11)]),(yyvsp[(8) - (11)]),(yyvsp[(11) - (11)]),&(yyvsp[(1) - (11)]));
                                          _p->popLabelInfo();
                                          _p->popTypeScope();;}
@@ -6898,28 +6897,28 @@ yyreduce:
   case 194:
 
 /* Line 1455 of yacc.c  */
-#line 1345 "hphp.y"
+#line 1344 "hphp.y"
     { _p->xhpSetAttributes((yyvsp[(2) - (3)]));;}
     break;
 
   case 195:
 
 /* Line 1455 of yacc.c  */
-#line 1347 "hphp.y"
+#line 1346 "hphp.y"
     { xhp_category_stmt(_p,(yyval),(yyvsp[(2) - (3)]));;}
     break;
 
   case 196:
 
 /* Line 1455 of yacc.c  */
-#line 1349 "hphp.y"
+#line 1348 "hphp.y"
     { xhp_children_stmt(_p,(yyval),(yyvsp[(2) - (3)]));;}
     break;
 
   case 197:
 
 /* Line 1455 of yacc.c  */
-#line 1350 "hphp.y"
+#line 1349 "hphp.y"
     { Token t; t.reset();
                                          _p->onTraitUse((yyval),(yyvsp[(2) - (3)]),t); ;}
     break;
@@ -6927,42 +6926,42 @@ yyreduce:
   case 198:
 
 /* Line 1455 of yacc.c  */
-#line 1353 "hphp.y"
+#line 1352 "hphp.y"
     { _p->onTraitUse((yyval),(yyvsp[(2) - (5)]),(yyvsp[(4) - (5)])); ;}
     break;
 
   case 199:
 
 /* Line 1455 of yacc.c  */
-#line 1356 "hphp.y"
+#line 1355 "hphp.y"
     { _p->onTraitRule((yyval),(yyvsp[(1) - (2)]),(yyvsp[(2) - (2)])); ;}
     break;
 
   case 200:
 
 /* Line 1455 of yacc.c  */
-#line 1357 "hphp.y"
+#line 1356 "hphp.y"
     { _p->onTraitRule((yyval),(yyvsp[(1) - (2)]),(yyvsp[(2) - (2)])); ;}
     break;
 
   case 201:
 
 /* Line 1455 of yacc.c  */
-#line 1358 "hphp.y"
+#line 1357 "hphp.y"
     { (yyval).reset(); ;}
     break;
 
   case 202:
 
 /* Line 1455 of yacc.c  */
-#line 1364 "hphp.y"
+#line 1363 "hphp.y"
     { _p->onTraitPrecRule((yyval),(yyvsp[(1) - (6)]),(yyvsp[(3) - (6)]),(yyvsp[(5) - (6)]));;}
     break;
 
   case 203:
 
 /* Line 1455 of yacc.c  */
-#line 1368 "hphp.y"
+#line 1367 "hphp.y"
     { _p->onTraitAliasRuleModify((yyval),(yyvsp[(1) - (5)]),(yyvsp[(3) - (5)]),
                                                                     (yyvsp[(4) - (5)]));;}
     break;
@@ -6970,7 +6969,7 @@ yyreduce:
   case 204:
 
 /* Line 1455 of yacc.c  */
-#line 1371 "hphp.y"
+#line 1370 "hphp.y"
     { Token t; t.reset();
                                          _p->onTraitAliasRuleModify((yyval),(yyvsp[(1) - (4)]),(yyvsp[(3) - (4)]),
                                                                     t);;}
@@ -6979,14 +6978,14 @@ yyreduce:
   case 205:
 
 /* Line 1455 of yacc.c  */
-#line 1378 "hphp.y"
+#line 1377 "hphp.y"
     { _p->onTraitAliasRuleStart((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]));;}
     break;
 
   case 206:
 
 /* Line 1455 of yacc.c  */
-#line 1379 "hphp.y"
+#line 1378 "hphp.y"
     { Token t; t.reset();
                                          _p->onTraitAliasRuleStart((yyval),t,(yyvsp[(1) - (1)]));;}
     break;
@@ -6994,7 +6993,7 @@ yyreduce:
   case 207:
 
 /* Line 1455 of yacc.c  */
-#line 1384 "hphp.y"
+#line 1383 "hphp.y"
     { xhp_attribute_list(_p,(yyval),
                                          _p->xhpGetAttributes(),(yyvsp[(1) - (1)]));;}
     break;
@@ -7002,14 +7001,14 @@ yyreduce:
   case 208:
 
 /* Line 1455 of yacc.c  */
-#line 1387 "hphp.y"
+#line 1386 "hphp.y"
     { xhp_attribute_list(_p,(yyval), &(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]));;}
     break;
 
   case 209:
 
 /* Line 1455 of yacc.c  */
-#line 1394 "hphp.y"
+#line 1393 "hphp.y"
     { xhp_attribute(_p,(yyval),(yyvsp[(1) - (4)]),(yyvsp[(2) - (4)]),(yyvsp[(3) - (4)]),(yyvsp[(4) - (4)]));
                                          (yyval) = 1;;}
     break;
@@ -7017,21 +7016,21 @@ yyreduce:
   case 210:
 
 /* Line 1455 of yacc.c  */
-#line 1396 "hphp.y"
+#line 1395 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]); (yyval) = 0;;}
     break;
 
   case 211:
 
 /* Line 1455 of yacc.c  */
-#line 1400 "hphp.y"
+#line 1399 "hphp.y"
     { (yyval) = 4;;}
     break;
 
   case 212:
 
 /* Line 1455 of yacc.c  */
-#line 1401 "hphp.y"
+#line 1400 "hphp.y"
     { /* This case handles all types other
                                             than "array", "var" and "enum".
                                             For now we just use type code 5;
@@ -7043,63 +7042,63 @@ yyreduce:
   case 213:
 
 /* Line 1455 of yacc.c  */
-#line 1407 "hphp.y"
+#line 1406 "hphp.y"
     { (yyval) = 6;;}
     break;
 
   case 214:
 
 /* Line 1455 of yacc.c  */
-#line 1409 "hphp.y"
+#line 1408 "hphp.y"
     { (yyval) = (yyvsp[(3) - (4)]); (yyval) = 7;;}
     break;
 
   case 215:
 
 /* Line 1455 of yacc.c  */
-#line 1413 "hphp.y"
+#line 1412 "hphp.y"
     { _p->onArrayPair((yyval),  0,0,(yyvsp[(1) - (1)]),0);;}
     break;
 
   case 216:
 
 /* Line 1455 of yacc.c  */
-#line 1415 "hphp.y"
+#line 1414 "hphp.y"
     { _p->onArrayPair((yyval),&(yyvsp[(1) - (3)]),0,(yyvsp[(3) - (3)]),0);;}
     break;
 
   case 217:
 
 /* Line 1455 of yacc.c  */
-#line 1419 "hphp.y"
+#line 1418 "hphp.y"
     { (yyval) = (yyvsp[(2) - (2)]);;}
     break;
 
   case 218:
 
 /* Line 1455 of yacc.c  */
-#line 1420 "hphp.y"
+#line 1419 "hphp.y"
     { scalar_null(_p, (yyval));;}
     break;
 
   case 219:
 
 /* Line 1455 of yacc.c  */
-#line 1424 "hphp.y"
+#line 1423 "hphp.y"
     { scalar_num(_p, (yyval), "1");;}
     break;
 
   case 220:
 
 /* Line 1455 of yacc.c  */
-#line 1425 "hphp.y"
+#line 1424 "hphp.y"
     { scalar_num(_p, (yyval), "0");;}
     break;
 
   case 221:
 
 /* Line 1455 of yacc.c  */
-#line 1429 "hphp.y"
+#line 1428 "hphp.y"
     { Token t; scalar_num(_p, t, "1");
                                          _p->onArrayPair((yyval),0,&(yyvsp[(1) - (1)]),t,0);;}
     break;
@@ -7107,7 +7106,7 @@ yyreduce:
   case 222:
 
 /* Line 1455 of yacc.c  */
-#line 1432 "hphp.y"
+#line 1431 "hphp.y"
     { Token t; scalar_num(_p, t, "1");
                                          _p->onArrayPair((yyval),&(yyvsp[(1) - (3)]),&(yyvsp[(3) - (3)]),t,0);;}
     break;
@@ -7115,7 +7114,7 @@ yyreduce:
   case 223:
 
 /* Line 1455 of yacc.c  */
-#line 1437 "hphp.y"
+#line 1436 "hphp.y"
     { _p->onScalar((yyval),
                                          T_CONSTANT_ENCAPSED_STRING, (yyvsp[(1) - (1)]));;}
     break;
@@ -7123,14 +7122,14 @@ yyreduce:
   case 224:
 
 /* Line 1455 of yacc.c  */
-#line 1442 "hphp.y"
+#line 1441 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]); (yyval) = 2;;}
     break;
 
   case 225:
 
 /* Line 1455 of yacc.c  */
-#line 1443 "hphp.y"
+#line 1442 "hphp.y"
     { (yyval) = -1;
                                          if ((yyvsp[(1) - (1)]).same("any")) (yyval) = 1;;}
     break;
@@ -7138,91 +7137,91 @@ yyreduce:
   case 226:
 
 /* Line 1455 of yacc.c  */
-#line 1445 "hphp.y"
+#line 1444 "hphp.y"
     { (yyval) = 0;;}
     break;
 
   case 227:
 
 /* Line 1455 of yacc.c  */
-#line 1449 "hphp.y"
+#line 1448 "hphp.y"
     { xhp_children_paren(_p, (yyval), (yyvsp[(2) - (3)]), 0);;}
     break;
 
   case 228:
 
 /* Line 1455 of yacc.c  */
-#line 1450 "hphp.y"
+#line 1449 "hphp.y"
     { xhp_children_paren(_p, (yyval), (yyvsp[(2) - (4)]), 1);;}
     break;
 
   case 229:
 
 /* Line 1455 of yacc.c  */
-#line 1451 "hphp.y"
+#line 1450 "hphp.y"
     { xhp_children_paren(_p, (yyval), (yyvsp[(2) - (4)]), 2);;}
     break;
 
   case 230:
 
 /* Line 1455 of yacc.c  */
-#line 1452 "hphp.y"
+#line 1451 "hphp.y"
     { xhp_children_paren(_p, (yyval), (yyvsp[(2) - (4)]), 3);;}
     break;
 
   case 231:
 
 /* Line 1455 of yacc.c  */
-#line 1456 "hphp.y"
+#line 1455 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 232:
 
 /* Line 1455 of yacc.c  */
-#line 1457 "hphp.y"
+#line 1456 "hphp.y"
     { xhp_children_decl(_p,(yyval),(yyvsp[(1) - (1)]),0,  0);;}
     break;
 
   case 233:
 
 /* Line 1455 of yacc.c  */
-#line 1458 "hphp.y"
+#line 1457 "hphp.y"
     { xhp_children_decl(_p,(yyval),(yyvsp[(1) - (2)]),1,  0);;}
     break;
 
   case 234:
 
 /* Line 1455 of yacc.c  */
-#line 1459 "hphp.y"
+#line 1458 "hphp.y"
     { xhp_children_decl(_p,(yyval),(yyvsp[(1) - (2)]),2,  0);;}
     break;
 
   case 235:
 
 /* Line 1455 of yacc.c  */
-#line 1460 "hphp.y"
+#line 1459 "hphp.y"
     { xhp_children_decl(_p,(yyval),(yyvsp[(1) - (2)]),3,  0);;}
     break;
 
   case 236:
 
 /* Line 1455 of yacc.c  */
-#line 1462 "hphp.y"
+#line 1461 "hphp.y"
     { xhp_children_decl(_p,(yyval),(yyvsp[(1) - (3)]),4,&(yyvsp[(3) - (3)]));;}
     break;
 
   case 237:
 
 /* Line 1455 of yacc.c  */
-#line 1464 "hphp.y"
+#line 1463 "hphp.y"
     { xhp_children_decl(_p,(yyval),(yyvsp[(1) - (3)]),5,&(yyvsp[(3) - (3)]));;}
     break;
 
   case 238:
 
 /* Line 1455 of yacc.c  */
-#line 1468 "hphp.y"
+#line 1467 "hphp.y"
     { (yyval) = -1;
                                          if ((yyvsp[(1) - (1)]).same("any")) (yyval) = 1; else
                                          if ((yyvsp[(1) - (1)]).same("pcdata")) (yyval) = 2;;}
@@ -7231,567 +7230,567 @@ yyreduce:
   case 239:
 
 /* Line 1455 of yacc.c  */
-#line 1471 "hphp.y"
+#line 1470 "hphp.y"
     { (yyvsp[(1) - (1)]).xhpLabel();  (yyval) = (yyvsp[(1) - (1)]); (yyval) = 3;;}
     break;
 
   case 240:
 
 /* Line 1455 of yacc.c  */
-#line 1472 "hphp.y"
+#line 1471 "hphp.y"
     { (yyvsp[(1) - (1)]).xhpLabel(0); (yyval) = (yyvsp[(1) - (1)]); (yyval) = 4;;}
     break;
 
   case 241:
 
 /* Line 1455 of yacc.c  */
-#line 1476 "hphp.y"
+#line 1475 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 242:
 
 /* Line 1455 of yacc.c  */
-#line 1477 "hphp.y"
+#line 1476 "hphp.y"
     { _p->finishStatement((yyval), (yyvsp[(2) - (3)])); (yyval) = 1;;}
     break;
 
   case 243:
 
 /* Line 1455 of yacc.c  */
-#line 1480 "hphp.y"
+#line 1479 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 244:
 
 /* Line 1455 of yacc.c  */
-#line 1481 "hphp.y"
+#line 1480 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 245:
 
 /* Line 1455 of yacc.c  */
-#line 1484 "hphp.y"
+#line 1483 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 246:
 
 /* Line 1455 of yacc.c  */
-#line 1485 "hphp.y"
+#line 1484 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 247:
 
 /* Line 1455 of yacc.c  */
-#line 1488 "hphp.y"
+#line 1487 "hphp.y"
     { _p->onMemberModifier((yyval),NULL,(yyvsp[(1) - (1)]));;}
     break;
 
   case 248:
 
 /* Line 1455 of yacc.c  */
-#line 1490 "hphp.y"
+#line 1489 "hphp.y"
     { _p->onMemberModifier((yyval),&(yyvsp[(1) - (2)]),(yyvsp[(2) - (2)]));;}
     break;
 
   case 249:
 
 /* Line 1455 of yacc.c  */
-#line 1493 "hphp.y"
+#line 1492 "hphp.y"
     { (yyval) = T_PUBLIC;;}
     break;
 
   case 250:
 
 /* Line 1455 of yacc.c  */
-#line 1494 "hphp.y"
+#line 1493 "hphp.y"
     { (yyval) = T_PROTECTED;;}
     break;
 
   case 251:
 
 /* Line 1455 of yacc.c  */
-#line 1495 "hphp.y"
+#line 1494 "hphp.y"
     { (yyval) = T_PRIVATE;;}
     break;
 
   case 252:
 
 /* Line 1455 of yacc.c  */
-#line 1496 "hphp.y"
+#line 1495 "hphp.y"
     { (yyval) = T_STATIC;;}
     break;
 
   case 253:
 
 /* Line 1455 of yacc.c  */
-#line 1497 "hphp.y"
+#line 1496 "hphp.y"
     { (yyval) = T_ABSTRACT;;}
     break;
 
   case 254:
 
 /* Line 1455 of yacc.c  */
-#line 1498 "hphp.y"
+#line 1497 "hphp.y"
     { (yyval) = T_FINAL;;}
     break;
 
   case 255:
 
 /* Line 1455 of yacc.c  */
-#line 1502 "hphp.y"
+#line 1501 "hphp.y"
     { _p->onClassVariable((yyval),&(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),0);;}
     break;
 
   case 256:
 
 /* Line 1455 of yacc.c  */
-#line 1504 "hphp.y"
+#line 1503 "hphp.y"
     { _p->onClassVariable((yyval),&(yyvsp[(1) - (5)]),(yyvsp[(3) - (5)]),&(yyvsp[(5) - (5)]));;}
     break;
 
   case 257:
 
 /* Line 1455 of yacc.c  */
-#line 1505 "hphp.y"
+#line 1504 "hphp.y"
     { _p->onClassVariable((yyval),0,(yyvsp[(1) - (1)]),0);;}
     break;
 
   case 258:
 
 /* Line 1455 of yacc.c  */
-#line 1506 "hphp.y"
+#line 1505 "hphp.y"
     { _p->onClassVariable((yyval),0,(yyvsp[(1) - (3)]),&(yyvsp[(3) - (3)]));;}
     break;
 
   case 259:
 
 /* Line 1455 of yacc.c  */
-#line 1510 "hphp.y"
+#line 1509 "hphp.y"
     { _p->onClassConstant((yyval),&(yyvsp[(1) - (5)]),(yyvsp[(3) - (5)]),(yyvsp[(5) - (5)]));;}
     break;
 
   case 260:
 
 /* Line 1455 of yacc.c  */
-#line 1511 "hphp.y"
+#line 1510 "hphp.y"
     { _p->onClassConstant((yyval),0,(yyvsp[(2) - (4)]),(yyvsp[(4) - (4)]));;}
     break;
 
   case 261:
 
 /* Line 1455 of yacc.c  */
-#line 1516 "hphp.y"
+#line 1515 "hphp.y"
     { _p->onNewObject((yyval), (yyvsp[(2) - (3)]), (yyvsp[(3) - (3)]));;}
     break;
 
   case 262:
 
 /* Line 1455 of yacc.c  */
-#line 1517 "hphp.y"
+#line 1516 "hphp.y"
     { (yyval) = (yyvsp[(2) - (3)]);;}
     break;
 
   case 263:
 
 /* Line 1455 of yacc.c  */
-#line 1521 "hphp.y"
+#line 1520 "hphp.y"
     { (yyval) = (yyvsp[(2) - (3)]);;}
     break;
 
   case 264:
 
 /* Line 1455 of yacc.c  */
-#line 1525 "hphp.y"
+#line 1524 "hphp.y"
     { _p->onExprListElem((yyval), &(yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));;}
     break;
 
   case 265:
 
 /* Line 1455 of yacc.c  */
-#line 1526 "hphp.y"
+#line 1525 "hphp.y"
     { _p->onExprListElem((yyval), NULL, (yyvsp[(1) - (1)]));;}
     break;
 
   case 266:
 
 /* Line 1455 of yacc.c  */
-#line 1530 "hphp.y"
+#line 1529 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 267:
 
 /* Line 1455 of yacc.c  */
-#line 1531 "hphp.y"
+#line 1530 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 268:
 
 /* Line 1455 of yacc.c  */
-#line 1535 "hphp.y"
+#line 1534 "hphp.y"
     { _p->onYield((yyval), (yyvsp[(2) - (2)]));;}
     break;
 
   case 269:
 
 /* Line 1455 of yacc.c  */
-#line 1539 "hphp.y"
+#line 1538 "hphp.y"
     { _p->onAssign((yyval), (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), 0, true);;}
     break;
 
   case 270:
 
 /* Line 1455 of yacc.c  */
-#line 1544 "hphp.y"
+#line 1543 "hphp.y"
     { _p->onListAssignment((yyval), (yyvsp[(3) - (6)]), &(yyvsp[(6) - (6)]), true);;}
     break;
 
   case 271:
 
 /* Line 1455 of yacc.c  */
-#line 1548 "hphp.y"
+#line 1547 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 272:
 
 /* Line 1455 of yacc.c  */
-#line 1549 "hphp.y"
+#line 1548 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 273:
 
 /* Line 1455 of yacc.c  */
-#line 1550 "hphp.y"
+#line 1549 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 274:
 
 /* Line 1455 of yacc.c  */
-#line 1554 "hphp.y"
+#line 1553 "hphp.y"
     { _p->onListAssignment((yyval), (yyvsp[(3) - (6)]), &(yyvsp[(6) - (6)]));;}
     break;
 
   case 275:
 
 /* Line 1455 of yacc.c  */
-#line 1555 "hphp.y"
+#line 1554 "hphp.y"
     { _p->onAssign((yyval), (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), 0);;}
     break;
 
   case 276:
 
 /* Line 1455 of yacc.c  */
-#line 1556 "hphp.y"
+#line 1555 "hphp.y"
     { _p->onAssign((yyval), (yyvsp[(1) - (4)]), (yyvsp[(4) - (4)]), 1);;}
     break;
 
   case 277:
 
 /* Line 1455 of yacc.c  */
-#line 1559 "hphp.y"
+#line 1558 "hphp.y"
     { _p->onAssignNew((yyval),(yyvsp[(1) - (6)]),(yyvsp[(5) - (6)]),(yyvsp[(6) - (6)]));;}
     break;
 
   case 278:
 
 /* Line 1455 of yacc.c  */
-#line 1560 "hphp.y"
+#line 1559 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),T_CLONE,1);;}
     break;
 
   case 279:
 
 /* Line 1455 of yacc.c  */
-#line 1561 "hphp.y"
+#line 1560 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_PLUS_EQUAL);;}
     break;
 
   case 280:
 
 /* Line 1455 of yacc.c  */
-#line 1562 "hphp.y"
+#line 1561 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_MINUS_EQUAL);;}
     break;
 
   case 281:
 
 /* Line 1455 of yacc.c  */
-#line 1563 "hphp.y"
+#line 1562 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_MUL_EQUAL);;}
     break;
 
   case 282:
 
 /* Line 1455 of yacc.c  */
-#line 1564 "hphp.y"
+#line 1563 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_DIV_EQUAL);;}
     break;
 
   case 283:
 
 /* Line 1455 of yacc.c  */
-#line 1565 "hphp.y"
+#line 1564 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_CONCAT_EQUAL);;}
     break;
 
   case 284:
 
 /* Line 1455 of yacc.c  */
-#line 1566 "hphp.y"
+#line 1565 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_MOD_EQUAL);;}
     break;
 
   case 285:
 
 /* Line 1455 of yacc.c  */
-#line 1567 "hphp.y"
+#line 1566 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_AND_EQUAL);;}
     break;
 
   case 286:
 
 /* Line 1455 of yacc.c  */
-#line 1568 "hphp.y"
+#line 1567 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_OR_EQUAL);;}
     break;
 
   case 287:
 
 /* Line 1455 of yacc.c  */
-#line 1569 "hphp.y"
+#line 1568 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_XOR_EQUAL);;}
     break;
 
   case 288:
 
 /* Line 1455 of yacc.c  */
-#line 1570 "hphp.y"
+#line 1569 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_SL_EQUAL);;}
     break;
 
   case 289:
 
 /* Line 1455 of yacc.c  */
-#line 1571 "hphp.y"
+#line 1570 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_SR_EQUAL);;}
     break;
 
   case 290:
 
 /* Line 1455 of yacc.c  */
-#line 1572 "hphp.y"
+#line 1571 "hphp.y"
     { UEXP((yyval),(yyvsp[(1) - (2)]),T_INC,0);;}
     break;
 
   case 291:
 
 /* Line 1455 of yacc.c  */
-#line 1573 "hphp.y"
+#line 1572 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),T_INC,1);;}
     break;
 
   case 292:
 
 /* Line 1455 of yacc.c  */
-#line 1574 "hphp.y"
+#line 1573 "hphp.y"
     { UEXP((yyval),(yyvsp[(1) - (2)]),T_DEC,0);;}
     break;
 
   case 293:
 
 /* Line 1455 of yacc.c  */
-#line 1575 "hphp.y"
+#line 1574 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),T_DEC,1);;}
     break;
 
   case 294:
 
 /* Line 1455 of yacc.c  */
-#line 1576 "hphp.y"
+#line 1575 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_BOOLEAN_OR);;}
     break;
 
   case 295:
 
 /* Line 1455 of yacc.c  */
-#line 1577 "hphp.y"
+#line 1576 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_BOOLEAN_AND);;}
     break;
 
   case 296:
 
 /* Line 1455 of yacc.c  */
-#line 1578 "hphp.y"
+#line 1577 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_LOGICAL_OR);;}
     break;
 
   case 297:
 
 /* Line 1455 of yacc.c  */
-#line 1579 "hphp.y"
+#line 1578 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_LOGICAL_AND);;}
     break;
 
   case 298:
 
 /* Line 1455 of yacc.c  */
-#line 1580 "hphp.y"
+#line 1579 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_LOGICAL_XOR);;}
     break;
 
   case 299:
 
 /* Line 1455 of yacc.c  */
-#line 1581 "hphp.y"
+#line 1580 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),'|');;}
     break;
 
   case 300:
 
 /* Line 1455 of yacc.c  */
-#line 1582 "hphp.y"
+#line 1581 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),'&');;}
     break;
 
   case 301:
 
 /* Line 1455 of yacc.c  */
-#line 1583 "hphp.y"
+#line 1582 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),'^');;}
     break;
 
   case 302:
 
 /* Line 1455 of yacc.c  */
-#line 1584 "hphp.y"
+#line 1583 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),'.');;}
     break;
 
   case 303:
 
 /* Line 1455 of yacc.c  */
-#line 1585 "hphp.y"
+#line 1584 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),'+');;}
     break;
 
   case 304:
 
 /* Line 1455 of yacc.c  */
-#line 1586 "hphp.y"
+#line 1585 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),'-');;}
     break;
 
   case 305:
 
 /* Line 1455 of yacc.c  */
-#line 1587 "hphp.y"
+#line 1586 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),'*');;}
     break;
 
   case 306:
 
 /* Line 1455 of yacc.c  */
-#line 1588 "hphp.y"
+#line 1587 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),'/');;}
     break;
 
   case 307:
 
 /* Line 1455 of yacc.c  */
-#line 1589 "hphp.y"
+#line 1588 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),'%');;}
     break;
 
   case 308:
 
 /* Line 1455 of yacc.c  */
-#line 1590 "hphp.y"
+#line 1589 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_SL);;}
     break;
 
   case 309:
 
 /* Line 1455 of yacc.c  */
-#line 1591 "hphp.y"
+#line 1590 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_SR);;}
     break;
 
   case 310:
 
 /* Line 1455 of yacc.c  */
-#line 1592 "hphp.y"
+#line 1591 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),'+',1);;}
     break;
 
   case 311:
 
 /* Line 1455 of yacc.c  */
-#line 1593 "hphp.y"
+#line 1592 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),'-',1);;}
     break;
 
   case 312:
 
 /* Line 1455 of yacc.c  */
-#line 1594 "hphp.y"
+#line 1593 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),'!',1);;}
     break;
 
   case 313:
 
 /* Line 1455 of yacc.c  */
-#line 1595 "hphp.y"
+#line 1594 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),'~',1);;}
     break;
 
   case 314:
 
 /* Line 1455 of yacc.c  */
-#line 1596 "hphp.y"
+#line 1595 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_IS_IDENTICAL);;}
     break;
 
   case 315:
 
 /* Line 1455 of yacc.c  */
-#line 1597 "hphp.y"
+#line 1596 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_IS_NOT_IDENTICAL);;}
     break;
 
   case 316:
 
 /* Line 1455 of yacc.c  */
-#line 1598 "hphp.y"
+#line 1597 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_IS_EQUAL);;}
     break;
 
   case 317:
 
 /* Line 1455 of yacc.c  */
-#line 1599 "hphp.y"
+#line 1598 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_IS_NOT_EQUAL);;}
     break;
 
   case 318:
 
 /* Line 1455 of yacc.c  */
-#line 1600 "hphp.y"
+#line 1599 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),'<');;}
     break;
 
   case 319:
 
 /* Line 1455 of yacc.c  */
-#line 1601 "hphp.y"
+#line 1600 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),
                                               T_IS_SMALLER_OR_EQUAL);;}
     break;
@@ -7799,14 +7798,14 @@ yyreduce:
   case 320:
 
 /* Line 1455 of yacc.c  */
-#line 1603 "hphp.y"
+#line 1602 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),'>');;}
     break;
 
   case 321:
 
 /* Line 1455 of yacc.c  */
-#line 1604 "hphp.y"
+#line 1603 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),
                                               T_IS_GREATER_OR_EQUAL);;}
     break;
@@ -7814,140 +7813,140 @@ yyreduce:
   case 322:
 
 /* Line 1455 of yacc.c  */
-#line 1607 "hphp.y"
+#line 1606 "hphp.y"
     { BEXP((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),T_INSTANCEOF);;}
     break;
 
   case 323:
 
 /* Line 1455 of yacc.c  */
-#line 1608 "hphp.y"
+#line 1607 "hphp.y"
     { (yyval) = (yyvsp[(2) - (3)]);;}
     break;
 
   case 324:
 
 /* Line 1455 of yacc.c  */
-#line 1609 "hphp.y"
+#line 1608 "hphp.y"
     { _p->onQOp((yyval), (yyvsp[(1) - (5)]), &(yyvsp[(3) - (5)]), (yyvsp[(5) - (5)]));;}
     break;
 
   case 325:
 
 /* Line 1455 of yacc.c  */
-#line 1610 "hphp.y"
+#line 1609 "hphp.y"
     { _p->onQOp((yyval), (yyvsp[(1) - (4)]),   0, (yyvsp[(4) - (4)]));;}
     break;
 
   case 326:
 
 /* Line 1455 of yacc.c  */
-#line 1611 "hphp.y"
+#line 1610 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 327:
 
 /* Line 1455 of yacc.c  */
-#line 1612 "hphp.y"
+#line 1611 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),T_INT_CAST,1);;}
     break;
 
   case 328:
 
 /* Line 1455 of yacc.c  */
-#line 1613 "hphp.y"
+#line 1612 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),T_DOUBLE_CAST,1);;}
     break;
 
   case 329:
 
 /* Line 1455 of yacc.c  */
-#line 1614 "hphp.y"
+#line 1613 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),T_STRING_CAST,1);;}
     break;
 
   case 330:
 
 /* Line 1455 of yacc.c  */
-#line 1615 "hphp.y"
+#line 1614 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),T_ARRAY_CAST,1);;}
     break;
 
   case 331:
 
 /* Line 1455 of yacc.c  */
-#line 1616 "hphp.y"
+#line 1615 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),T_OBJECT_CAST,1);;}
     break;
 
   case 332:
 
 /* Line 1455 of yacc.c  */
-#line 1617 "hphp.y"
+#line 1616 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),T_BOOL_CAST,1);;}
     break;
 
   case 333:
 
 /* Line 1455 of yacc.c  */
-#line 1618 "hphp.y"
+#line 1617 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),T_UNSET_CAST,1);;}
     break;
 
   case 334:
 
 /* Line 1455 of yacc.c  */
-#line 1619 "hphp.y"
+#line 1618 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),T_EXIT,1);;}
     break;
 
   case 335:
 
 /* Line 1455 of yacc.c  */
-#line 1620 "hphp.y"
+#line 1619 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),'@',1);;}
     break;
 
   case 336:
 
 /* Line 1455 of yacc.c  */
-#line 1621 "hphp.y"
+#line 1620 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]); ;}
     break;
 
   case 337:
 
 /* Line 1455 of yacc.c  */
-#line 1622 "hphp.y"
+#line 1621 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]); ;}
     break;
 
   case 338:
 
 /* Line 1455 of yacc.c  */
-#line 1623 "hphp.y"
+#line 1622 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]); ;}
     break;
 
   case 339:
 
 /* Line 1455 of yacc.c  */
-#line 1624 "hphp.y"
+#line 1623 "hphp.y"
     { _p->onEncapsList((yyval),'`',(yyvsp[(2) - (3)]));;}
     break;
 
   case 340:
 
 /* Line 1455 of yacc.c  */
-#line 1625 "hphp.y"
+#line 1624 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),T_PRINT,1);;}
     break;
 
   case 341:
 
 /* Line 1455 of yacc.c  */
-#line 1627 "hphp.y"
+#line 1626 "hphp.y"
     { Token t; _p->onClosureStart(t);
                                          _p->pushLabelInfo();;}
     break;
@@ -7955,7 +7954,7 @@ yyreduce:
   case 342:
 
 /* Line 1455 of yacc.c  */
-#line 1631 "hphp.y"
+#line 1630 "hphp.y"
     { Token u; u.reset();
                                          _p->onClosure((yyval),u,(yyvsp[(2) - (11)]),(yyvsp[(5) - (11)]),(yyvsp[(8) - (11)]),(yyvsp[(10) - (11)]),0);
                                          _p->popLabelInfo();;}
@@ -7964,7 +7963,7 @@ yyreduce:
   case 343:
 
 /* Line 1455 of yacc.c  */
-#line 1635 "hphp.y"
+#line 1634 "hphp.y"
     { Token t; _p->onClosureStart(t);
                                          _p->pushLabelInfo();;}
     break;
@@ -7972,7 +7971,7 @@ yyreduce:
   case 344:
 
 /* Line 1455 of yacc.c  */
-#line 1639 "hphp.y"
+#line 1638 "hphp.y"
     { Token u; u.reset();
                                          _p->onClosure((yyval),u,(yyvsp[(3) - (12)]),(yyvsp[(6) - (12)]),(yyvsp[(9) - (12)]),(yyvsp[(11) - (12)]),1);
                                          _p->popLabelInfo();;}
@@ -7981,28 +7980,28 @@ yyreduce:
   case 345:
 
 /* Line 1455 of yacc.c  */
-#line 1642 "hphp.y"
+#line 1641 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 346:
 
 /* Line 1455 of yacc.c  */
-#line 1643 "hphp.y"
+#line 1642 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 347:
 
 /* Line 1455 of yacc.c  */
-#line 1644 "hphp.y"
+#line 1643 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 348:
 
 /* Line 1455 of yacc.c  */
-#line 1651 "hphp.y"
+#line 1650 "hphp.y"
     { validate_shape_keyname((yyvsp[(3) - (5)]), _p);
                                         _p->onArrayPair((yyval),&(yyvsp[(1) - (5)]),&(yyvsp[(3) - (5)]),(yyvsp[(5) - (5)]),0); ;}
     break;
@@ -8010,7 +8009,7 @@ yyreduce:
   case 349:
 
 /* Line 1455 of yacc.c  */
-#line 1655 "hphp.y"
+#line 1654 "hphp.y"
     { validate_shape_keyname((yyvsp[(1) - (3)]), _p);
                                         _p->onArrayPair((yyval),  0,&(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),0); ;}
     break;
@@ -8018,7 +8017,7 @@ yyreduce:
   case 350:
 
 /* Line 1455 of yacc.c  */
-#line 1663 "hphp.y"
+#line 1662 "hphp.y"
     { validate_shape_keyname((yyvsp[(3) - (5)]), _p);
                                         _p->onArrayPair((yyval),&(yyvsp[(1) - (5)]),&(yyvsp[(3) - (5)]),(yyvsp[(5) - (5)]),0); ;}
     break;
@@ -8026,7 +8025,7 @@ yyreduce:
   case 351:
 
 /* Line 1455 of yacc.c  */
-#line 1667 "hphp.y"
+#line 1666 "hphp.y"
     { validate_shape_keyname((yyvsp[(1) - (3)]), _p);
                                         _p->onArrayPair((yyval),  0,&(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),0); ;}
     break;
@@ -8034,35 +8033,35 @@ yyreduce:
   case 352:
 
 /* Line 1455 of yacc.c  */
-#line 1673 "hphp.y"
+#line 1672 "hphp.y"
     { (yyval) = (yyvsp[(1) - (2)]); ;}
     break;
 
   case 353:
 
 /* Line 1455 of yacc.c  */
-#line 1674 "hphp.y"
+#line 1673 "hphp.y"
     { (yyval).reset(); ;}
     break;
 
   case 354:
 
 /* Line 1455 of yacc.c  */
-#line 1679 "hphp.y"
+#line 1678 "hphp.y"
     { (yyval) = (yyvsp[(1) - (2)]); ;}
     break;
 
   case 355:
 
 /* Line 1455 of yacc.c  */
-#line 1680 "hphp.y"
+#line 1679 "hphp.y"
     { (yyval).reset(); ;}
     break;
 
   case 356:
 
 /* Line 1455 of yacc.c  */
-#line 1684 "hphp.y"
+#line 1683 "hphp.y"
     { only_in_strict_mode(_p);
                                         _p->onArray((yyval), (yyvsp[(3) - (4)]), T_ARRAY); ;}
     break;
@@ -8070,21 +8069,21 @@ yyreduce:
   case 357:
 
 /* Line 1455 of yacc.c  */
-#line 1689 "hphp.y"
+#line 1688 "hphp.y"
     { _p->onArray((yyval),(yyvsp[(3) - (4)]),T_ARRAY);;}
     break;
 
   case 358:
 
 /* Line 1455 of yacc.c  */
-#line 1690 "hphp.y"
+#line 1689 "hphp.y"
     { _p->onArray((yyval),(yyvsp[(2) - (3)]),T_ARRAY);;}
     break;
 
   case 359:
 
 /* Line 1455 of yacc.c  */
-#line 1695 "hphp.y"
+#line 1694 "hphp.y"
     { Token t;
                                          _p->onName(t,(yyvsp[(1) - (4)]),Parser::StringName);
                                          BEXP((yyval),t,(yyvsp[(3) - (4)]),T_COLLECTION);;}
@@ -8093,7 +8092,7 @@ yyreduce:
   case 360:
 
 /* Line 1455 of yacc.c  */
-#line 1702 "hphp.y"
+#line 1701 "hphp.y"
     { Token t;
                                          _p->onName(t,(yyvsp[(1) - (4)]),Parser::StringName);
                                          BEXP((yyval),t,(yyvsp[(3) - (4)]),T_COLLECTION);;}
@@ -8102,91 +8101,91 @@ yyreduce:
   case 361:
 
 /* Line 1455 of yacc.c  */
-#line 1709 "hphp.y"
+#line 1708 "hphp.y"
     { _p->onRefDim((yyval), (yyvsp[(1) - (4)]), (yyvsp[(3) - (4)]));;}
     break;
 
   case 362:
 
 /* Line 1455 of yacc.c  */
-#line 1711 "hphp.y"
+#line 1710 "hphp.y"
     { _p->onRefDim((yyval), (yyvsp[(1) - (4)]), (yyvsp[(3) - (4)]));;}
     break;
 
   case 363:
 
 /* Line 1455 of yacc.c  */
-#line 1715 "hphp.y"
+#line 1714 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 364:
 
 /* Line 1455 of yacc.c  */
-#line 1716 "hphp.y"
+#line 1715 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 365:
 
 /* Line 1455 of yacc.c  */
-#line 1717 "hphp.y"
+#line 1716 "hphp.y"
     { (yyval) = (yyvsp[(2) - (3)]);;}
     break;
 
   case 366:
 
 /* Line 1455 of yacc.c  */
-#line 1724 "hphp.y"
+#line 1723 "hphp.y"
     { (yyval) = (yyvsp[(3) - (5)]);;}
     break;
 
   case 367:
 
 /* Line 1455 of yacc.c  */
-#line 1725 "hphp.y"
+#line 1724 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 368:
 
 /* Line 1455 of yacc.c  */
-#line 1729 "hphp.y"
+#line 1728 "hphp.y"
     { _p->onClosureParam((yyval),&(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),0);;}
     break;
 
   case 369:
 
 /* Line 1455 of yacc.c  */
-#line 1730 "hphp.y"
+#line 1729 "hphp.y"
     { _p->onClosureParam((yyval),&(yyvsp[(1) - (4)]),(yyvsp[(4) - (4)]),1);;}
     break;
 
   case 370:
 
 /* Line 1455 of yacc.c  */
-#line 1731 "hphp.y"
+#line 1730 "hphp.y"
     { _p->onClosureParam((yyval),  0,(yyvsp[(1) - (1)]),0);;}
     break;
 
   case 371:
 
 /* Line 1455 of yacc.c  */
-#line 1732 "hphp.y"
+#line 1731 "hphp.y"
     { _p->onClosureParam((yyval),  0,(yyvsp[(2) - (2)]),1);;}
     break;
 
   case 372:
 
 /* Line 1455 of yacc.c  */
-#line 1739 "hphp.y"
+#line 1738 "hphp.y"
     { xhp_tag(_p,(yyval),(yyvsp[(2) - (4)]),(yyvsp[(3) - (4)]));;}
     break;
 
   case 373:
 
 /* Line 1455 of yacc.c  */
-#line 1742 "hphp.y"
+#line 1741 "hphp.y"
     { Token t1; _p->onArray(t1,(yyvsp[(1) - (2)]));
                                          Token t2; _p->onArray(t2,(yyvsp[(2) - (2)]));
                                          _p->onCallParam((yyvsp[(1) - (2)]),NULL,t1,0);
@@ -8197,7 +8196,7 @@ yyreduce:
   case 374:
 
 /* Line 1455 of yacc.c  */
-#line 1749 "hphp.y"
+#line 1748 "hphp.y"
     { _p->onArray((yyvsp[(4) - (6)]),(yyvsp[(1) - (6)]));
                                          _p->onArray((yyvsp[(5) - (6)]),(yyvsp[(3) - (6)]));
                                          _p->onCallParam((yyvsp[(2) - (6)]),NULL,(yyvsp[(4) - (6)]),0);
@@ -8208,49 +8207,49 @@ yyreduce:
   case 375:
 
 /* Line 1455 of yacc.c  */
-#line 1756 "hphp.y"
+#line 1755 "hphp.y"
     { (yyval).reset(); (yyval).setText("");;}
     break;
 
   case 376:
 
 /* Line 1455 of yacc.c  */
-#line 1757 "hphp.y"
+#line 1756 "hphp.y"
     { (yyval).reset(); (yyval).setText((yyvsp[(1) - (1)]));;}
     break;
 
   case 377:
 
 /* Line 1455 of yacc.c  */
-#line 1762 "hphp.y"
+#line 1761 "hphp.y"
     { _p->onArrayPair((yyval),&(yyvsp[(1) - (4)]),&(yyvsp[(2) - (4)]),(yyvsp[(4) - (4)]),0);;}
     break;
 
   case 378:
 
 /* Line 1455 of yacc.c  */
-#line 1763 "hphp.y"
+#line 1762 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 379:
 
 /* Line 1455 of yacc.c  */
-#line 1766 "hphp.y"
+#line 1765 "hphp.y"
     { _p->onArrayPair((yyval),&(yyvsp[(1) - (2)]),0,(yyvsp[(2) - (2)]),0);;}
     break;
 
   case 380:
 
 /* Line 1455 of yacc.c  */
-#line 1767 "hphp.y"
+#line 1766 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 381:
 
 /* Line 1455 of yacc.c  */
-#line 1770 "hphp.y"
+#line 1769 "hphp.y"
     { _p->onScalar((yyval),
                                          T_CONSTANT_ENCAPSED_STRING, (yyvsp[(1) - (1)]));;}
     break;
@@ -8258,7 +8257,7 @@ yyreduce:
   case 382:
 
 /* Line 1455 of yacc.c  */
-#line 1774 "hphp.y"
+#line 1773 "hphp.y"
     { (yyvsp[(1) - (1)]).xhpDecode();
                                          _p->onScalar((yyval),
                                          T_CONSTANT_ENCAPSED_STRING, (yyvsp[(1) - (1)]));;}
@@ -8267,14 +8266,14 @@ yyreduce:
   case 383:
 
 /* Line 1455 of yacc.c  */
-#line 1777 "hphp.y"
+#line 1776 "hphp.y"
     { (yyval) = (yyvsp[(2) - (3)]);;}
     break;
 
   case 384:
 
 /* Line 1455 of yacc.c  */
-#line 1780 "hphp.y"
+#line 1779 "hphp.y"
     { (yyval).reset();
                                          if ((yyvsp[(1) - (1)]).htmlTrim()) {
                                            (yyvsp[(1) - (1)]).xhpDecode();
@@ -8287,602 +8286,602 @@ yyreduce:
   case 385:
 
 /* Line 1455 of yacc.c  */
-#line 1787 "hphp.y"
+#line 1786 "hphp.y"
     { (yyval) = (yyvsp[(2) - (3)]); ;}
     break;
 
   case 386:
 
 /* Line 1455 of yacc.c  */
-#line 1788 "hphp.y"
+#line 1787 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]); ;}
     break;
 
   case 387:
 
 /* Line 1455 of yacc.c  */
-#line 1792 "hphp.y"
+#line 1791 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 388:
 
 /* Line 1455 of yacc.c  */
-#line 1794 "hphp.y"
+#line 1793 "hphp.y"
     { (yyval) = (yyvsp[(1) - (3)]) + ":" + (yyvsp[(3) - (3)]);;}
     break;
 
   case 389:
 
 /* Line 1455 of yacc.c  */
-#line 1796 "hphp.y"
+#line 1795 "hphp.y"
     { (yyval) = (yyvsp[(1) - (3)]) + "-" + (yyvsp[(3) - (3)]);;}
     break;
 
   case 390:
 
 /* Line 1455 of yacc.c  */
-#line 1799 "hphp.y"
+#line 1798 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 391:
 
 /* Line 1455 of yacc.c  */
-#line 1800 "hphp.y"
+#line 1799 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 392:
 
 /* Line 1455 of yacc.c  */
-#line 1801 "hphp.y"
+#line 1800 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 393:
 
 /* Line 1455 of yacc.c  */
-#line 1802 "hphp.y"
+#line 1801 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 394:
 
 /* Line 1455 of yacc.c  */
-#line 1803 "hphp.y"
+#line 1802 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 395:
 
 /* Line 1455 of yacc.c  */
-#line 1804 "hphp.y"
+#line 1803 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 396:
 
 /* Line 1455 of yacc.c  */
-#line 1805 "hphp.y"
+#line 1804 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 397:
 
 /* Line 1455 of yacc.c  */
-#line 1806 "hphp.y"
+#line 1805 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 398:
 
 /* Line 1455 of yacc.c  */
-#line 1807 "hphp.y"
+#line 1806 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 399:
 
 /* Line 1455 of yacc.c  */
-#line 1808 "hphp.y"
+#line 1807 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 400:
 
 /* Line 1455 of yacc.c  */
-#line 1809 "hphp.y"
+#line 1808 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 401:
 
 /* Line 1455 of yacc.c  */
-#line 1810 "hphp.y"
+#line 1809 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 402:
 
 /* Line 1455 of yacc.c  */
-#line 1811 "hphp.y"
+#line 1810 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 403:
 
 /* Line 1455 of yacc.c  */
-#line 1812 "hphp.y"
+#line 1811 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 404:
 
 /* Line 1455 of yacc.c  */
-#line 1813 "hphp.y"
+#line 1812 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 405:
 
 /* Line 1455 of yacc.c  */
-#line 1814 "hphp.y"
+#line 1813 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 406:
 
 /* Line 1455 of yacc.c  */
-#line 1815 "hphp.y"
+#line 1814 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 407:
 
 /* Line 1455 of yacc.c  */
-#line 1816 "hphp.y"
+#line 1815 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 408:
 
 /* Line 1455 of yacc.c  */
-#line 1817 "hphp.y"
+#line 1816 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 409:
 
 /* Line 1455 of yacc.c  */
-#line 1818 "hphp.y"
+#line 1817 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 410:
 
 /* Line 1455 of yacc.c  */
-#line 1819 "hphp.y"
+#line 1818 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 411:
 
 /* Line 1455 of yacc.c  */
-#line 1820 "hphp.y"
+#line 1819 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 412:
 
 /* Line 1455 of yacc.c  */
-#line 1821 "hphp.y"
+#line 1820 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 413:
 
 /* Line 1455 of yacc.c  */
-#line 1822 "hphp.y"
+#line 1821 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 414:
 
 /* Line 1455 of yacc.c  */
-#line 1823 "hphp.y"
+#line 1822 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 415:
 
 /* Line 1455 of yacc.c  */
-#line 1824 "hphp.y"
+#line 1823 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 416:
 
 /* Line 1455 of yacc.c  */
-#line 1825 "hphp.y"
+#line 1824 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 417:
 
 /* Line 1455 of yacc.c  */
-#line 1826 "hphp.y"
+#line 1825 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 418:
 
 /* Line 1455 of yacc.c  */
-#line 1827 "hphp.y"
+#line 1826 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 419:
 
 /* Line 1455 of yacc.c  */
-#line 1828 "hphp.y"
+#line 1827 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 420:
 
 /* Line 1455 of yacc.c  */
-#line 1829 "hphp.y"
+#line 1828 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 421:
 
 /* Line 1455 of yacc.c  */
-#line 1830 "hphp.y"
+#line 1829 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 422:
 
 /* Line 1455 of yacc.c  */
-#line 1831 "hphp.y"
+#line 1830 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 423:
 
 /* Line 1455 of yacc.c  */
-#line 1832 "hphp.y"
+#line 1831 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 424:
 
 /* Line 1455 of yacc.c  */
-#line 1833 "hphp.y"
+#line 1832 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 425:
 
 /* Line 1455 of yacc.c  */
-#line 1834 "hphp.y"
+#line 1833 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 426:
 
 /* Line 1455 of yacc.c  */
-#line 1835 "hphp.y"
+#line 1834 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 427:
 
 /* Line 1455 of yacc.c  */
-#line 1836 "hphp.y"
+#line 1835 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 428:
 
 /* Line 1455 of yacc.c  */
-#line 1837 "hphp.y"
+#line 1836 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 429:
 
 /* Line 1455 of yacc.c  */
-#line 1838 "hphp.y"
+#line 1837 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 430:
 
 /* Line 1455 of yacc.c  */
-#line 1839 "hphp.y"
+#line 1838 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 431:
 
 /* Line 1455 of yacc.c  */
-#line 1840 "hphp.y"
+#line 1839 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 432:
 
 /* Line 1455 of yacc.c  */
-#line 1841 "hphp.y"
+#line 1840 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 433:
 
 /* Line 1455 of yacc.c  */
-#line 1842 "hphp.y"
+#line 1841 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 434:
 
 /* Line 1455 of yacc.c  */
-#line 1843 "hphp.y"
+#line 1842 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 435:
 
 /* Line 1455 of yacc.c  */
-#line 1844 "hphp.y"
+#line 1843 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 436:
 
 /* Line 1455 of yacc.c  */
-#line 1845 "hphp.y"
+#line 1844 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 437:
 
 /* Line 1455 of yacc.c  */
-#line 1846 "hphp.y"
+#line 1845 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 438:
 
 /* Line 1455 of yacc.c  */
-#line 1847 "hphp.y"
+#line 1846 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 439:
 
 /* Line 1455 of yacc.c  */
-#line 1848 "hphp.y"
+#line 1847 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 440:
 
 /* Line 1455 of yacc.c  */
-#line 1849 "hphp.y"
+#line 1848 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 441:
 
 /* Line 1455 of yacc.c  */
-#line 1850 "hphp.y"
+#line 1849 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 442:
 
 /* Line 1455 of yacc.c  */
-#line 1851 "hphp.y"
+#line 1850 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 443:
 
 /* Line 1455 of yacc.c  */
-#line 1852 "hphp.y"
+#line 1851 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 444:
 
 /* Line 1455 of yacc.c  */
-#line 1853 "hphp.y"
+#line 1852 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 445:
 
 /* Line 1455 of yacc.c  */
-#line 1854 "hphp.y"
+#line 1853 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 446:
 
 /* Line 1455 of yacc.c  */
-#line 1855 "hphp.y"
+#line 1854 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 447:
 
 /* Line 1455 of yacc.c  */
-#line 1856 "hphp.y"
+#line 1855 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 448:
 
 /* Line 1455 of yacc.c  */
-#line 1857 "hphp.y"
+#line 1856 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 449:
 
 /* Line 1455 of yacc.c  */
-#line 1858 "hphp.y"
+#line 1857 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 450:
 
 /* Line 1455 of yacc.c  */
-#line 1859 "hphp.y"
+#line 1858 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 451:
 
 /* Line 1455 of yacc.c  */
-#line 1860 "hphp.y"
+#line 1859 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 452:
 
 /* Line 1455 of yacc.c  */
-#line 1861 "hphp.y"
+#line 1860 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 453:
 
 /* Line 1455 of yacc.c  */
-#line 1862 "hphp.y"
+#line 1861 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 454:
 
 /* Line 1455 of yacc.c  */
-#line 1863 "hphp.y"
+#line 1862 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 455:
 
 /* Line 1455 of yacc.c  */
-#line 1864 "hphp.y"
+#line 1863 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 456:
 
 /* Line 1455 of yacc.c  */
-#line 1865 "hphp.y"
+#line 1864 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 457:
 
 /* Line 1455 of yacc.c  */
-#line 1866 "hphp.y"
+#line 1865 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 458:
 
 /* Line 1455 of yacc.c  */
-#line 1867 "hphp.y"
+#line 1866 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 459:
 
 /* Line 1455 of yacc.c  */
-#line 1868 "hphp.y"
+#line 1867 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 460:
 
 /* Line 1455 of yacc.c  */
-#line 1869 "hphp.y"
+#line 1868 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 461:
 
 /* Line 1455 of yacc.c  */
-#line 1870 "hphp.y"
+#line 1869 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 462:
 
 /* Line 1455 of yacc.c  */
-#line 1871 "hphp.y"
+#line 1870 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 463:
 
 /* Line 1455 of yacc.c  */
-#line 1872 "hphp.y"
+#line 1871 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 464:
 
 /* Line 1455 of yacc.c  */
-#line 1873 "hphp.y"
+#line 1872 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 465:
 
 /* Line 1455 of yacc.c  */
-#line 1878 "hphp.y"
+#line 1877 "hphp.y"
     { _p->onCall((yyval),0,(yyvsp[(1) - (4)]),(yyvsp[(3) - (4)]),NULL);;}
     break;
 
   case 466:
 
 /* Line 1455 of yacc.c  */
-#line 1882 "hphp.y"
+#line 1881 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 467:
 
 /* Line 1455 of yacc.c  */
-#line 1883 "hphp.y"
+#line 1882 "hphp.y"
     { (yyvsp[(1) - (1)]).xhpLabel(); (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 468:
 
 /* Line 1455 of yacc.c  */
-#line 1886 "hphp.y"
+#line 1885 "hphp.y"
     { _p->onName((yyval),(yyvsp[(1) - (1)]),Parser::StringName);;}
     break;
 
   case 469:
 
 /* Line 1455 of yacc.c  */
-#line 1887 "hphp.y"
+#line 1886 "hphp.y"
     { _p->onName((yyval),(yyvsp[(1) - (1)]),Parser::StaticName);;}
     break;
 
   case 470:
 
 /* Line 1455 of yacc.c  */
-#line 1888 "hphp.y"
+#line 1887 "hphp.y"
     { _p->onName((yyval),(yyvsp[(1) - (1)]),
                                          Parser::StaticClassExprName);;}
     break;
@@ -8890,98 +8889,98 @@ yyreduce:
   case 471:
 
 /* Line 1455 of yacc.c  */
-#line 1892 "hphp.y"
+#line 1891 "hphp.y"
     { _p->onName((yyval),(yyvsp[(1) - (1)]),Parser::StringName);;}
     break;
 
   case 472:
 
 /* Line 1455 of yacc.c  */
-#line 1893 "hphp.y"
+#line 1892 "hphp.y"
     { _p->onName((yyval),(yyvsp[(1) - (1)]),Parser::StaticName);;}
     break;
 
   case 473:
 
 /* Line 1455 of yacc.c  */
-#line 1894 "hphp.y"
+#line 1893 "hphp.y"
     { _p->onName((yyval),(yyvsp[(1) - (1)]),Parser::ExprName);;}
     break;
 
   case 474:
 
 /* Line 1455 of yacc.c  */
-#line 1898 "hphp.y"
+#line 1897 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 475:
 
 /* Line 1455 of yacc.c  */
-#line 1899 "hphp.y"
+#line 1898 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 476:
 
 /* Line 1455 of yacc.c  */
-#line 1900 "hphp.y"
+#line 1899 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 477:
 
 /* Line 1455 of yacc.c  */
-#line 1904 "hphp.y"
+#line 1903 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 478:
 
 /* Line 1455 of yacc.c  */
-#line 1905 "hphp.y"
+#line 1904 "hphp.y"
     { _p->addEncap((yyval), NULL, (yyvsp[(1) - (1)]), 0);;}
     break;
 
   case 479:
 
 /* Line 1455 of yacc.c  */
-#line 1906 "hphp.y"
+#line 1905 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 480:
 
 /* Line 1455 of yacc.c  */
-#line 1910 "hphp.y"
+#line 1909 "hphp.y"
     { (yyval) = (yyvsp[(2) - (3)]);;}
     break;
 
   case 481:
 
 /* Line 1455 of yacc.c  */
-#line 1911 "hphp.y"
+#line 1910 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 482:
 
 /* Line 1455 of yacc.c  */
-#line 1915 "hphp.y"
+#line 1914 "hphp.y"
     { _p->onScalar((yyval), T_LNUMBER,  (yyvsp[(1) - (1)]));;}
     break;
 
   case 483:
 
 /* Line 1455 of yacc.c  */
-#line 1916 "hphp.y"
+#line 1915 "hphp.y"
     { _p->onScalar((yyval), T_DNUMBER,  (yyvsp[(1) - (1)]));;}
     break;
 
   case 484:
 
 /* Line 1455 of yacc.c  */
-#line 1917 "hphp.y"
+#line 1916 "hphp.y"
     { _p->onScalar((yyval),
                                          T_CONSTANT_ENCAPSED_STRING,  (yyvsp[(1) - (1)]));;}
     break;
@@ -8989,119 +8988,119 @@ yyreduce:
   case 485:
 
 /* Line 1455 of yacc.c  */
-#line 1919 "hphp.y"
+#line 1918 "hphp.y"
     { _p->onScalar((yyval), T_LINE,     (yyvsp[(1) - (1)]));;}
     break;
 
   case 486:
 
 /* Line 1455 of yacc.c  */
-#line 1920 "hphp.y"
+#line 1919 "hphp.y"
     { _p->onScalar((yyval), T_FILE,     (yyvsp[(1) - (1)]));;}
     break;
 
   case 487:
 
 /* Line 1455 of yacc.c  */
-#line 1921 "hphp.y"
+#line 1920 "hphp.y"
     { _p->onScalar((yyval), T_DIR,      (yyvsp[(1) - (1)]));;}
     break;
 
   case 488:
 
 /* Line 1455 of yacc.c  */
-#line 1922 "hphp.y"
+#line 1921 "hphp.y"
     { _p->onScalar((yyval), T_CLASS_C,  (yyvsp[(1) - (1)]));;}
     break;
 
   case 489:
 
 /* Line 1455 of yacc.c  */
-#line 1923 "hphp.y"
+#line 1922 "hphp.y"
     { _p->onScalar((yyval), T_TRAIT_C,  (yyvsp[(1) - (1)]));;}
     break;
 
   case 490:
 
 /* Line 1455 of yacc.c  */
-#line 1924 "hphp.y"
+#line 1923 "hphp.y"
     { _p->onScalar((yyval), T_METHOD_C, (yyvsp[(1) - (1)]));;}
     break;
 
   case 491:
 
 /* Line 1455 of yacc.c  */
-#line 1925 "hphp.y"
+#line 1924 "hphp.y"
     { _p->onScalar((yyval), T_FUNC_C,   (yyvsp[(1) - (1)]));;}
     break;
 
   case 492:
 
 /* Line 1455 of yacc.c  */
-#line 1926 "hphp.y"
+#line 1925 "hphp.y"
     { _p->onScalar((yyval), T_NS_C,  (yyvsp[(1) - (1)]));;}
     break;
 
   case 493:
 
 /* Line 1455 of yacc.c  */
-#line 1927 "hphp.y"
+#line 1926 "hphp.y"
     { _p->onScalar((yyval), T_COMPILER_HALT_OFFSET, (yyvsp[(1) - (1)]));;}
     break;
 
   case 494:
 
 /* Line 1455 of yacc.c  */
-#line 1930 "hphp.y"
+#line 1929 "hphp.y"
     { _p->onScalar((yyval), T_CONSTANT_ENCAPSED_STRING, (yyvsp[(2) - (3)]));;}
     break;
 
   case 495:
 
 /* Line 1455 of yacc.c  */
-#line 1932 "hphp.y"
+#line 1931 "hphp.y"
     { (yyval).setText(""); _p->onScalar((yyval), T_CONSTANT_ENCAPSED_STRING, (yyval));;}
     break;
 
   case 496:
 
 /* Line 1455 of yacc.c  */
-#line 1936 "hphp.y"
+#line 1935 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 497:
 
 /* Line 1455 of yacc.c  */
-#line 1937 "hphp.y"
+#line 1936 "hphp.y"
     { _p->onConstantValue((yyval), (yyvsp[(1) - (1)]));;}
     break;
 
   case 498:
 
 /* Line 1455 of yacc.c  */
-#line 1938 "hphp.y"
+#line 1937 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),'+',1);;}
     break;
 
   case 499:
 
 /* Line 1455 of yacc.c  */
-#line 1939 "hphp.y"
+#line 1938 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),'-',1);;}
     break;
 
   case 500:
 
 /* Line 1455 of yacc.c  */
-#line 1941 "hphp.y"
+#line 1940 "hphp.y"
     { _p->onArray((yyval),(yyvsp[(3) - (4)]),T_ARRAY); ;}
     break;
 
   case 501:
 
 /* Line 1455 of yacc.c  */
-#line 1943 "hphp.y"
+#line 1942 "hphp.y"
     { only_in_strict_mode(_p);
                                          _p->onArray((yyval),(yyvsp[(3) - (4)]),T_ARRAY); ;}
     break;
@@ -9109,28 +9108,28 @@ yyreduce:
   case 502:
 
 /* Line 1455 of yacc.c  */
-#line 1945 "hphp.y"
+#line 1944 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 503:
 
 /* Line 1455 of yacc.c  */
-#line 1946 "hphp.y"
+#line 1945 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 504:
 
 /* Line 1455 of yacc.c  */
-#line 1952 "hphp.y"
+#line 1951 "hphp.y"
     { _p->onClassConst((yyval), (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), 1);;}
     break;
 
   case 505:
 
 /* Line 1455 of yacc.c  */
-#line 1954 "hphp.y"
+#line 1953 "hphp.y"
     { (yyvsp[(1) - (3)]).xhpLabel();
                                          _p->onClassConst((yyval), (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), 1);;}
     break;
@@ -9138,49 +9137,49 @@ yyreduce:
   case 506:
 
 /* Line 1455 of yacc.c  */
-#line 1959 "hphp.y"
+#line 1958 "hphp.y"
     { _p->onConstantValue((yyval), (yyvsp[(1) - (1)]));;}
     break;
 
   case 507:
 
 /* Line 1455 of yacc.c  */
-#line 1960 "hphp.y"
+#line 1959 "hphp.y"
     { _p->onConstantValue((yyval), (yyvsp[(1) - (1)]));;}
     break;
 
   case 508:
 
 /* Line 1455 of yacc.c  */
-#line 1961 "hphp.y"
+#line 1960 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 509:
 
 /* Line 1455 of yacc.c  */
-#line 1962 "hphp.y"
+#line 1961 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 510:
 
 /* Line 1455 of yacc.c  */
-#line 1963 "hphp.y"
+#line 1962 "hphp.y"
     { _p->onEncapsList((yyval),'"',(yyvsp[(2) - (3)]));;}
     break;
 
   case 511:
 
 /* Line 1455 of yacc.c  */
-#line 1964 "hphp.y"
+#line 1963 "hphp.y"
     { _p->onEncapsList((yyval),'\'',(yyvsp[(2) - (3)]));;}
     break;
 
   case 512:
 
 /* Line 1455 of yacc.c  */
-#line 1966 "hphp.y"
+#line 1965 "hphp.y"
     { _p->onEncapsList((yyval),T_START_HEREDOC,
                                                           (yyvsp[(2) - (3)]));;}
     break;
@@ -9188,91 +9187,91 @@ yyreduce:
   case 513:
 
 /* Line 1455 of yacc.c  */
-#line 1971 "hphp.y"
+#line 1970 "hphp.y"
     { (yyval) = (yyvsp[(1) - (2)]);;}
     break;
 
   case 514:
 
 /* Line 1455 of yacc.c  */
-#line 1972 "hphp.y"
+#line 1971 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 515:
 
 /* Line 1455 of yacc.c  */
-#line 1976 "hphp.y"
+#line 1975 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 516:
 
 /* Line 1455 of yacc.c  */
-#line 1977 "hphp.y"
+#line 1976 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 517:
 
 /* Line 1455 of yacc.c  */
-#line 1980 "hphp.y"
+#line 1979 "hphp.y"
     { only_in_hphp_syntax(_p); (yyval).reset();;}
     break;
 
   case 518:
 
 /* Line 1455 of yacc.c  */
-#line 1981 "hphp.y"
+#line 1980 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 519:
 
 /* Line 1455 of yacc.c  */
-#line 1987 "hphp.y"
+#line 1986 "hphp.y"
     { _p->onArrayPair((yyval),&(yyvsp[(1) - (5)]),&(yyvsp[(3) - (5)]),(yyvsp[(5) - (5)]),0);;}
     break;
 
   case 520:
 
 /* Line 1455 of yacc.c  */
-#line 1989 "hphp.y"
+#line 1988 "hphp.y"
     { _p->onArrayPair((yyval),&(yyvsp[(1) - (3)]),  0,(yyvsp[(3) - (3)]),0);;}
     break;
 
   case 521:
 
 /* Line 1455 of yacc.c  */
-#line 1991 "hphp.y"
+#line 1990 "hphp.y"
     { _p->onArrayPair((yyval),  0,&(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),0);;}
     break;
 
   case 522:
 
 /* Line 1455 of yacc.c  */
-#line 1992 "hphp.y"
+#line 1991 "hphp.y"
     { _p->onArrayPair((yyval),  0,  0,(yyvsp[(1) - (1)]),0);;}
     break;
 
   case 523:
 
 /* Line 1455 of yacc.c  */
-#line 1996 "hphp.y"
+#line 1995 "hphp.y"
     { _p->onScalar((yyval), T_LNUMBER,  (yyvsp[(1) - (1)]));;}
     break;
 
   case 524:
 
 /* Line 1455 of yacc.c  */
-#line 1997 "hphp.y"
+#line 1996 "hphp.y"
     { _p->onScalar((yyval), T_DNUMBER,  (yyvsp[(1) - (1)]));;}
     break;
 
   case 525:
 
 /* Line 1455 of yacc.c  */
-#line 1998 "hphp.y"
+#line 1997 "hphp.y"
     { _p->onScalar((yyval),
                                          T_CONSTANT_ENCAPSED_STRING,  (yyvsp[(1) - (1)]));;}
     break;
@@ -9280,84 +9279,84 @@ yyreduce:
   case 526:
 
 /* Line 1455 of yacc.c  */
-#line 2002 "hphp.y"
+#line 2001 "hphp.y"
     { _p->onScalar((yyval), T_CONSTANT_ENCAPSED_STRING, (yyvsp[(2) - (3)]));;}
     break;
 
   case 527:
 
 /* Line 1455 of yacc.c  */
-#line 2004 "hphp.y"
+#line 2003 "hphp.y"
     { (yyval).setText(""); _p->onScalar((yyval), T_CONSTANT_ENCAPSED_STRING, (yyval));;}
     break;
 
   case 528:
 
 /* Line 1455 of yacc.c  */
-#line 2007 "hphp.y"
+#line 2006 "hphp.y"
     { _p->onScalar((yyval),T_LNUMBER,(yyvsp[(1) - (1)]));;}
     break;
 
   case 529:
 
 /* Line 1455 of yacc.c  */
-#line 2008 "hphp.y"
+#line 2007 "hphp.y"
     { _p->onScalar((yyval),T_DNUMBER,(yyvsp[(1) - (1)]));;}
     break;
 
   case 530:
 
 /* Line 1455 of yacc.c  */
-#line 2009 "hphp.y"
+#line 2008 "hphp.y"
     { constant_ae(_p,(yyval),(yyvsp[(1) - (1)]));;}
     break;
 
   case 531:
 
 /* Line 1455 of yacc.c  */
-#line 2012 "hphp.y"
+#line 2011 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 532:
 
 /* Line 1455 of yacc.c  */
-#line 2013 "hphp.y"
+#line 2012 "hphp.y"
     { constant_ae(_p,(yyval),(yyvsp[(1) - (1)]));;}
     break;
 
   case 533:
 
 /* Line 1455 of yacc.c  */
-#line 2014 "hphp.y"
+#line 2013 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),'+',1);;}
     break;
 
   case 534:
 
 /* Line 1455 of yacc.c  */
-#line 2015 "hphp.y"
+#line 2014 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),'-',1);;}
     break;
 
   case 535:
 
 /* Line 1455 of yacc.c  */
-#line 2017 "hphp.y"
+#line 2016 "hphp.y"
     { _p->onArray((yyval),(yyvsp[(3) - (4)]),T_ARRAY);;}
     break;
 
   case 536:
 
 /* Line 1455 of yacc.c  */
-#line 2018 "hphp.y"
+#line 2017 "hphp.y"
     { _p->onArray((yyval),(yyvsp[(2) - (3)]),T_ARRAY);;}
     break;
 
   case 537:
 
 /* Line 1455 of yacc.c  */
-#line 2020 "hphp.y"
+#line 2019 "hphp.y"
     { only_in_strict_mode(_p);
                                          _p->onArray((yyval),(yyvsp[(3) - (4)]),T_ARRAY); ;}
     break;
@@ -9365,77 +9364,77 @@ yyreduce:
   case 538:
 
 /* Line 1455 of yacc.c  */
-#line 2026 "hphp.y"
+#line 2025 "hphp.y"
     { (yyval) = (yyvsp[(1) - (2)]);;}
     break;
 
   case 539:
 
 /* Line 1455 of yacc.c  */
-#line 2027 "hphp.y"
+#line 2026 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 540:
 
 /* Line 1455 of yacc.c  */
-#line 2032 "hphp.y"
+#line 2031 "hphp.y"
     { _p->onArrayPair((yyval),&(yyvsp[(1) - (5)]),&(yyvsp[(3) - (5)]),(yyvsp[(5) - (5)]),0);;}
     break;
 
   case 541:
 
 /* Line 1455 of yacc.c  */
-#line 2034 "hphp.y"
+#line 2033 "hphp.y"
     { _p->onArrayPair((yyval),&(yyvsp[(1) - (3)]),  0,(yyvsp[(3) - (3)]),0);;}
     break;
 
   case 542:
 
 /* Line 1455 of yacc.c  */
-#line 2036 "hphp.y"
+#line 2035 "hphp.y"
     { _p->onArrayPair((yyval),  0,&(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),0);;}
     break;
 
   case 543:
 
 /* Line 1455 of yacc.c  */
-#line 2037 "hphp.y"
+#line 2036 "hphp.y"
     { _p->onArrayPair((yyval),  0,  0,(yyvsp[(1) - (1)]),0);;}
     break;
 
   case 544:
 
 /* Line 1455 of yacc.c  */
-#line 2041 "hphp.y"
+#line 2040 "hphp.y"
     { _p->onArrayPair((yyval),&(yyvsp[(1) - (3)]),  0,(yyvsp[(3) - (3)]),0);;}
     break;
 
   case 545:
 
 /* Line 1455 of yacc.c  */
-#line 2042 "hphp.y"
+#line 2041 "hphp.y"
     { _p->onArrayPair((yyval),  0,  0,(yyvsp[(1) - (1)]),0);;}
     break;
 
   case 546:
 
 /* Line 1455 of yacc.c  */
-#line 2047 "hphp.y"
+#line 2046 "hphp.y"
     { (yyval) = (yyvsp[(1) - (2)]); ;}
     break;
 
   case 547:
 
 /* Line 1455 of yacc.c  */
-#line 2048 "hphp.y"
+#line 2047 "hphp.y"
     { (yyval).reset(); ;}
     break;
 
   case 548:
 
 /* Line 1455 of yacc.c  */
-#line 2053 "hphp.y"
+#line 2052 "hphp.y"
     { validate_shape_keyname((yyvsp[(3) - (5)]), _p);
                                          _p->onArrayPair((yyval),&(yyvsp[(1) - (5)]),&(yyvsp[(3) - (5)]),(yyvsp[(5) - (5)]),0); ;}
     break;
@@ -9443,7 +9442,7 @@ yyreduce:
   case 549:
 
 /* Line 1455 of yacc.c  */
-#line 2057 "hphp.y"
+#line 2056 "hphp.y"
     { validate_shape_keyname((yyvsp[(1) - (3)]), _p);
                                          _p->onArrayPair((yyval),  0,&(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),0); ;}
     break;
@@ -9451,28 +9450,28 @@ yyreduce:
   case 550:
 
 /* Line 1455 of yacc.c  */
-#line 2063 "hphp.y"
+#line 2062 "hphp.y"
     { (yyval) = (yyvsp[(1) - (2)]);;}
     break;
 
   case 551:
 
 /* Line 1455 of yacc.c  */
-#line 2064 "hphp.y"
+#line 2063 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 552:
 
 /* Line 1455 of yacc.c  */
-#line 2067 "hphp.y"
+#line 2066 "hphp.y"
     { _p->onArray((yyval),(yyvsp[(2) - (3)]),T_ARRAY);;}
     break;
 
   case 553:
 
 /* Line 1455 of yacc.c  */
-#line 2068 "hphp.y"
+#line 2067 "hphp.y"
     { Token t; t.reset();
                                          _p->onArray((yyval),t,T_ARRAY);;}
     break;
@@ -9480,693 +9479,693 @@ yyreduce:
   case 554:
 
 /* Line 1455 of yacc.c  */
-#line 2075 "hphp.y"
+#line 2074 "hphp.y"
     { _p->onUserAttribute((yyval),&(yyvsp[(1) - (4)]),(yyvsp[(3) - (4)]),(yyvsp[(4) - (4)]));;}
     break;
 
   case 555:
 
 /* Line 1455 of yacc.c  */
-#line 2077 "hphp.y"
+#line 2076 "hphp.y"
     { _p->onUserAttribute((yyval),  0,(yyvsp[(1) - (2)]),(yyvsp[(2) - (2)]));;}
     break;
 
   case 556:
 
 /* Line 1455 of yacc.c  */
-#line 2080 "hphp.y"
+#line 2079 "hphp.y"
     { user_attribute_check(_p);;}
     break;
 
   case 557:
 
 /* Line 1455 of yacc.c  */
-#line 2082 "hphp.y"
+#line 2081 "hphp.y"
     { (yyval) = (yyvsp[(2) - (3)]);;}
     break;
 
   case 558:
 
 /* Line 1455 of yacc.c  */
-#line 2085 "hphp.y"
+#line 2084 "hphp.y"
     { (yyval) = (yyvsp[(2) - (3)]);;}
     break;
 
   case 559:
 
 /* Line 1455 of yacc.c  */
-#line 2088 "hphp.y"
+#line 2087 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 560:
 
 /* Line 1455 of yacc.c  */
-#line 2089 "hphp.y"
+#line 2088 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 561:
 
 /* Line 1455 of yacc.c  */
-#line 2093 "hphp.y"
+#line 2092 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 562:
 
 /* Line 1455 of yacc.c  */
-#line 2095 "hphp.y"
+#line 2094 "hphp.y"
     { (yyval) = (yyvsp[(2) - (2)]);;}
     break;
 
   case 563:
 
 /* Line 1455 of yacc.c  */
-#line 2099 "hphp.y"
+#line 2098 "hphp.y"
     { (yyval) = (yyvsp[(2) - (2)]);;}
     break;
 
   case 564:
 
 /* Line 1455 of yacc.c  */
-#line 2100 "hphp.y"
+#line 2099 "hphp.y"
     { (yyval) = (yyvsp[(3) - (4)]);;}
     break;
 
   case 565:
 
 /* Line 1455 of yacc.c  */
-#line 2104 "hphp.y"
+#line 2103 "hphp.y"
     { (yyval) = (yyvsp[(2) - (3)]);;}
     break;
 
   case 566:
 
 /* Line 1455 of yacc.c  */
-#line 2105 "hphp.y"
+#line 2104 "hphp.y"
     { (yyval) = (yyvsp[(2) - (3)]);;}
     break;
 
   case 567:
 
 /* Line 1455 of yacc.c  */
-#line 2109 "hphp.y"
+#line 2108 "hphp.y"
     { _p->onRefDim((yyval), (yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]));;}
     break;
 
   case 568:
 
 /* Line 1455 of yacc.c  */
-#line 2110 "hphp.y"
+#line 2109 "hphp.y"
     { _p->onRefDim((yyval), (yyvsp[(2) - (4)]), (yyvsp[(4) - (4)]));;}
     break;
 
   case 569:
 
 /* Line 1455 of yacc.c  */
-#line 2115 "hphp.y"
+#line 2114 "hphp.y"
     { _p->onRefDim((yyval), (yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]));;}
     break;
 
   case 570:
 
 /* Line 1455 of yacc.c  */
-#line 2116 "hphp.y"
+#line 2115 "hphp.y"
     { _p->onRefDim((yyval), (yyvsp[(2) - (4)]), (yyvsp[(4) - (4)]));;}
     break;
 
   case 571:
 
 /* Line 1455 of yacc.c  */
-#line 2120 "hphp.y"
+#line 2119 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 572:
 
 /* Line 1455 of yacc.c  */
-#line 2121 "hphp.y"
+#line 2120 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 573:
 
 /* Line 1455 of yacc.c  */
-#line 2122 "hphp.y"
+#line 2121 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 574:
 
 /* Line 1455 of yacc.c  */
-#line 2123 "hphp.y"
+#line 2122 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 575:
 
 /* Line 1455 of yacc.c  */
-#line 2124 "hphp.y"
+#line 2123 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 576:
 
 /* Line 1455 of yacc.c  */
-#line 2125 "hphp.y"
+#line 2124 "hphp.y"
     { _p->onObjectProperty((yyval),(yyvsp[(1) - (2)]),(yyvsp[(2) - (2)]));;}
     break;
 
   case 577:
 
 /* Line 1455 of yacc.c  */
-#line 2126 "hphp.y"
+#line 2125 "hphp.y"
     { _p->onObjectProperty((yyval),(yyvsp[(2) - (4)]),(yyvsp[(4) - (4)]));;}
     break;
 
   case 578:
 
 /* Line 1455 of yacc.c  */
-#line 2129 "hphp.y"
+#line 2128 "hphp.y"
     { _p->onStaticMember((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]));;}
     break;
 
   case 579:
 
 /* Line 1455 of yacc.c  */
-#line 2131 "hphp.y"
+#line 2130 "hphp.y"
     { _p->onCall((yyval),1,(yyvsp[(1) - (4)]),(yyvsp[(3) - (4)]),NULL);;}
     break;
 
   case 580:
 
 /* Line 1455 of yacc.c  */
-#line 2132 "hphp.y"
+#line 2131 "hphp.y"
     { (yyval) = (yyvsp[(2) - (3)]);;}
     break;
 
   case 581:
 
 /* Line 1455 of yacc.c  */
-#line 2136 "hphp.y"
+#line 2135 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 582:
 
 /* Line 1455 of yacc.c  */
-#line 2137 "hphp.y"
+#line 2136 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 583:
 
 /* Line 1455 of yacc.c  */
-#line 2138 "hphp.y"
+#line 2137 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 584:
 
 /* Line 1455 of yacc.c  */
-#line 2139 "hphp.y"
+#line 2138 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 585:
 
 /* Line 1455 of yacc.c  */
-#line 2141 "hphp.y"
+#line 2140 "hphp.y"
     { _p->onObjectProperty((yyval),(yyvsp[(1) - (2)]),(yyvsp[(2) - (2)]));;}
     break;
 
   case 586:
 
 /* Line 1455 of yacc.c  */
-#line 2143 "hphp.y"
+#line 2142 "hphp.y"
     { _p->onObjectProperty((yyval),(yyvsp[(2) - (4)]),(yyvsp[(4) - (4)]));;}
     break;
 
   case 587:
 
 /* Line 1455 of yacc.c  */
-#line 2145 "hphp.y"
+#line 2144 "hphp.y"
     { _p->onCall((yyval),1,(yyvsp[(1) - (4)]),(yyvsp[(3) - (4)]),NULL);;}
     break;
 
   case 588:
 
 /* Line 1455 of yacc.c  */
-#line 2146 "hphp.y"
+#line 2145 "hphp.y"
     { (yyval) = (yyvsp[(2) - (3)]);;}
     break;
 
   case 589:
 
 /* Line 1455 of yacc.c  */
-#line 2150 "hphp.y"
+#line 2149 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 590:
 
 /* Line 1455 of yacc.c  */
-#line 2151 "hphp.y"
+#line 2150 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 591:
 
 /* Line 1455 of yacc.c  */
-#line 2152 "hphp.y"
+#line 2151 "hphp.y"
     { (yyval) = (yyvsp[(2) - (3)]);;}
     break;
 
   case 592:
 
 /* Line 1455 of yacc.c  */
-#line 2158 "hphp.y"
+#line 2157 "hphp.y"
     { _p->onObjectMethodCall((yyval),(yyvsp[(1) - (7)]),(yyvsp[(3) - (7)]),(yyvsp[(6) - (7)]));;}
     break;
 
   case 593:
 
 /* Line 1455 of yacc.c  */
-#line 2161 "hphp.y"
+#line 2160 "hphp.y"
     { _p->onObjectMethodCall((yyval),(yyvsp[(1) - (6)]),(yyvsp[(3) - (6)]),(yyvsp[(5) - (6)]));;}
     break;
 
   case 594:
 
 /* Line 1455 of yacc.c  */
-#line 2164 "hphp.y"
+#line 2163 "hphp.y"
     { _p->onObjectMethodCall((yyval),(yyvsp[(1) - (8)]),(yyvsp[(4) - (8)]),(yyvsp[(7) - (8)]));;}
     break;
 
   case 595:
 
 /* Line 1455 of yacc.c  */
-#line 2167 "hphp.y"
+#line 2166 "hphp.y"
     { _p->onObjectMethodCall((yyval),(yyvsp[(2) - (9)]),(yyvsp[(5) - (9)]),(yyvsp[(8) - (9)]));;}
     break;
 
   case 596:
 
 /* Line 1455 of yacc.c  */
-#line 2170 "hphp.y"
+#line 2169 "hphp.y"
     { _p->onObjectMethodCall((yyval),(yyvsp[(2) - (8)]),(yyvsp[(5) - (8)]),(yyvsp[(7) - (8)]));;}
     break;
 
   case 597:
 
 /* Line 1455 of yacc.c  */
-#line 2173 "hphp.y"
+#line 2172 "hphp.y"
     { _p->onObjectMethodCall((yyval),(yyvsp[(2) - (10)]),(yyvsp[(6) - (10)]),(yyvsp[(9) - (10)]));;}
     break;
 
   case 598:
 
 /* Line 1455 of yacc.c  */
-#line 2180 "hphp.y"
+#line 2179 "hphp.y"
     { _p->onCall((yyval),0,(yyvsp[(3) - (7)]),(yyvsp[(6) - (7)]),&(yyvsp[(1) - (7)]));;}
     break;
 
   case 599:
 
 /* Line 1455 of yacc.c  */
-#line 2184 "hphp.y"
+#line 2183 "hphp.y"
     { _p->onCall((yyval),1,(yyvsp[(3) - (6)]),(yyvsp[(5) - (6)]),&(yyvsp[(1) - (6)]));;}
     break;
 
   case 600:
 
 /* Line 1455 of yacc.c  */
-#line 2188 "hphp.y"
+#line 2187 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 601:
 
 /* Line 1455 of yacc.c  */
-#line 2190 "hphp.y"
+#line 2189 "hphp.y"
     { _p->onIndirectRef((yyval),(yyvsp[(1) - (2)]),(yyvsp[(2) - (2)]));;}
     break;
 
   case 602:
 
 /* Line 1455 of yacc.c  */
-#line 2195 "hphp.y"
+#line 2194 "hphp.y"
     { _p->onRefDim((yyval), (yyvsp[(1) - (4)]), (yyvsp[(3) - (4)]));;}
     break;
 
   case 603:
 
 /* Line 1455 of yacc.c  */
-#line 2196 "hphp.y"
+#line 2195 "hphp.y"
     { _p->onRefDim((yyval), (yyvsp[(1) - (4)]), (yyvsp[(3) - (4)]));;}
     break;
 
   case 604:
 
 /* Line 1455 of yacc.c  */
-#line 2197 "hphp.y"
+#line 2196 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 605:
 
 /* Line 1455 of yacc.c  */
-#line 2200 "hphp.y"
+#line 2199 "hphp.y"
     { _p->onSimpleVariable((yyval), (yyvsp[(1) - (1)]));;}
     break;
 
   case 606:
 
 /* Line 1455 of yacc.c  */
-#line 2201 "hphp.y"
+#line 2200 "hphp.y"
     { _p->onDynamicVariable((yyval), (yyvsp[(3) - (4)]), 0);;}
     break;
 
   case 607:
 
 /* Line 1455 of yacc.c  */
-#line 2204 "hphp.y"
+#line 2203 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 608:
 
 /* Line 1455 of yacc.c  */
-#line 2205 "hphp.y"
+#line 2204 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 609:
 
 /* Line 1455 of yacc.c  */
-#line 2209 "hphp.y"
+#line 2208 "hphp.y"
     { (yyval) = 1;;}
     break;
 
   case 610:
 
 /* Line 1455 of yacc.c  */
-#line 2210 "hphp.y"
+#line 2209 "hphp.y"
     { (yyval)++;;}
     break;
 
   case 611:
 
 /* Line 1455 of yacc.c  */
-#line 2214 "hphp.y"
+#line 2213 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 612:
 
 /* Line 1455 of yacc.c  */
-#line 2215 "hphp.y"
+#line 2214 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 613:
 
 /* Line 1455 of yacc.c  */
-#line 2216 "hphp.y"
+#line 2215 "hphp.y"
     { _p->onObjectProperty((yyval),(yyvsp[(1) - (2)]),(yyvsp[(2) - (2)]));;}
     break;
 
   case 614:
 
 /* Line 1455 of yacc.c  */
-#line 2217 "hphp.y"
+#line 2216 "hphp.y"
     { _p->onObjectProperty((yyval),(yyvsp[(2) - (4)]),(yyvsp[(4) - (4)]));;}
     break;
 
   case 615:
 
 /* Line 1455 of yacc.c  */
-#line 2220 "hphp.y"
+#line 2219 "hphp.y"
     { _p->onStaticMember((yyval),(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]));;}
     break;
 
   case 616:
 
 /* Line 1455 of yacc.c  */
-#line 2221 "hphp.y"
+#line 2220 "hphp.y"
     { (yyval) = (yyvsp[(2) - (3)]);;}
     break;
 
   case 618:
 
 /* Line 1455 of yacc.c  */
-#line 2225 "hphp.y"
+#line 2224 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]);;}
     break;
 
   case 619:
 
 /* Line 1455 of yacc.c  */
-#line 2227 "hphp.y"
+#line 2226 "hphp.y"
     { _p->onObjectProperty((yyval),(yyvsp[(1) - (2)]),(yyvsp[(2) - (2)]));;}
     break;
 
   case 620:
 
 /* Line 1455 of yacc.c  */
-#line 2229 "hphp.y"
+#line 2228 "hphp.y"
     { _p->onObjectProperty((yyval),(yyvsp[(2) - (4)]),(yyvsp[(4) - (4)]));;}
     break;
 
   case 621:
 
 /* Line 1455 of yacc.c  */
-#line 2230 "hphp.y"
+#line 2229 "hphp.y"
     { (yyval) = (yyvsp[(2) - (3)]);;}
     break;
 
   case 622:
 
 /* Line 1455 of yacc.c  */
-#line 2234 "hphp.y"
+#line 2233 "hphp.y"
     { _p->onAListVar((yyval),&(yyvsp[(1) - (2)]),NULL);;}
     break;
 
   case 623:
 
 /* Line 1455 of yacc.c  */
-#line 2235 "hphp.y"
+#line 2234 "hphp.y"
     { _p->onAListVar((yyval),&(yyvsp[(1) - (3)]),&(yyvsp[(3) - (3)]));;}
     break;
 
   case 624:
 
 /* Line 1455 of yacc.c  */
-#line 2237 "hphp.y"
+#line 2236 "hphp.y"
     { _p->onAListSub((yyval),&(yyvsp[(1) - (6)]),(yyvsp[(5) - (6)]));;}
     break;
 
   case 625:
 
 /* Line 1455 of yacc.c  */
-#line 2238 "hphp.y"
+#line 2237 "hphp.y"
     { _p->onAListVar((yyval),NULL,NULL);;}
     break;
 
   case 626:
 
 /* Line 1455 of yacc.c  */
-#line 2239 "hphp.y"
+#line 2238 "hphp.y"
     { _p->onAListVar((yyval),NULL,&(yyvsp[(1) - (1)]));;}
     break;
 
   case 627:
 
 /* Line 1455 of yacc.c  */
-#line 2240 "hphp.y"
+#line 2239 "hphp.y"
     { _p->onAListSub((yyval),NULL,(yyvsp[(3) - (4)]));;}
     break;
 
   case 628:
 
 /* Line 1455 of yacc.c  */
-#line 2245 "hphp.y"
+#line 2244 "hphp.y"
     { (yyval) = (yyvsp[(1) - (2)]);;}
     break;
 
   case 629:
 
 /* Line 1455 of yacc.c  */
-#line 2246 "hphp.y"
+#line 2245 "hphp.y"
     { (yyval).reset();;}
     break;
 
   case 630:
 
 /* Line 1455 of yacc.c  */
-#line 2250 "hphp.y"
+#line 2249 "hphp.y"
     { _p->onArrayPair((yyval),&(yyvsp[(1) - (5)]),&(yyvsp[(3) - (5)]),(yyvsp[(5) - (5)]),0);;}
     break;
 
   case 631:
 
 /* Line 1455 of yacc.c  */
-#line 2251 "hphp.y"
+#line 2250 "hphp.y"
     { _p->onArrayPair((yyval),&(yyvsp[(1) - (3)]),  0,(yyvsp[(3) - (3)]),0);;}
     break;
 
   case 632:
 
 /* Line 1455 of yacc.c  */
-#line 2252 "hphp.y"
+#line 2251 "hphp.y"
     { _p->onArrayPair((yyval),  0,&(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]),0);;}
     break;
 
   case 633:
 
 /* Line 1455 of yacc.c  */
-#line 2253 "hphp.y"
+#line 2252 "hphp.y"
     { _p->onArrayPair((yyval),  0,  0,(yyvsp[(1) - (1)]),0);;}
     break;
 
   case 634:
 
 /* Line 1455 of yacc.c  */
-#line 2256 "hphp.y"
+#line 2255 "hphp.y"
     { _p->onArrayPair((yyval),&(yyvsp[(1) - (6)]),&(yyvsp[(3) - (6)]),(yyvsp[(6) - (6)]),1);;}
     break;
 
   case 635:
 
 /* Line 1455 of yacc.c  */
-#line 2258 "hphp.y"
+#line 2257 "hphp.y"
     { _p->onArrayPair((yyval),&(yyvsp[(1) - (4)]),  0,(yyvsp[(4) - (4)]),1);;}
     break;
 
   case 636:
 
 /* Line 1455 of yacc.c  */
-#line 2259 "hphp.y"
+#line 2258 "hphp.y"
     { _p->onArrayPair((yyval),  0,&(yyvsp[(1) - (4)]),(yyvsp[(4) - (4)]),1);;}
     break;
 
   case 637:
 
 /* Line 1455 of yacc.c  */
-#line 2260 "hphp.y"
+#line 2259 "hphp.y"
     { _p->onArrayPair((yyval),  0,  0,(yyvsp[(2) - (2)]),1);;}
     break;
 
   case 638:
 
 /* Line 1455 of yacc.c  */
-#line 2265 "hphp.y"
+#line 2264 "hphp.y"
     { (yyval) = (yyvsp[(1) - (2)]);;}
     break;
 
   case 639:
 
 /* Line 1455 of yacc.c  */
-#line 2266 "hphp.y"
+#line 2265 "hphp.y"
     { _p->onEmptyCollection((yyval));;}
     break;
 
   case 640:
 
 /* Line 1455 of yacc.c  */
-#line 2270 "hphp.y"
+#line 2269 "hphp.y"
     { _p->onCollectionPair((yyval),&(yyvsp[(1) - (5)]),&(yyvsp[(3) - (5)]),(yyvsp[(5) - (5)]));;}
     break;
 
   case 641:
 
 /* Line 1455 of yacc.c  */
-#line 2271 "hphp.y"
+#line 2270 "hphp.y"
     { _p->onCollectionPair((yyval),&(yyvsp[(1) - (3)]),  0,(yyvsp[(3) - (3)]));;}
     break;
 
   case 642:
 
 /* Line 1455 of yacc.c  */
-#line 2272 "hphp.y"
+#line 2271 "hphp.y"
     { _p->onCollectionPair((yyval),  0,&(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]));;}
     break;
 
   case 643:
 
 /* Line 1455 of yacc.c  */
-#line 2273 "hphp.y"
+#line 2272 "hphp.y"
     { _p->onCollectionPair((yyval),  0,  0,(yyvsp[(1) - (1)]));;}
     break;
 
   case 644:
 
 /* Line 1455 of yacc.c  */
-#line 2278 "hphp.y"
+#line 2277 "hphp.y"
     { (yyval) = (yyvsp[(1) - (2)]);;}
     break;
 
   case 645:
 
 /* Line 1455 of yacc.c  */
-#line 2279 "hphp.y"
+#line 2278 "hphp.y"
     { _p->onEmptyCollection((yyval));;}
     break;
 
   case 646:
 
 /* Line 1455 of yacc.c  */
-#line 2284 "hphp.y"
+#line 2283 "hphp.y"
     { _p->onCollectionPair((yyval),&(yyvsp[(1) - (5)]),&(yyvsp[(3) - (5)]),(yyvsp[(5) - (5)]));;}
     break;
 
   case 647:
 
 /* Line 1455 of yacc.c  */
-#line 2286 "hphp.y"
+#line 2285 "hphp.y"
     { _p->onCollectionPair((yyval),&(yyvsp[(1) - (3)]),  0,(yyvsp[(3) - (3)]));;}
     break;
 
   case 648:
 
 /* Line 1455 of yacc.c  */
-#line 2288 "hphp.y"
+#line 2287 "hphp.y"
     { _p->onCollectionPair((yyval),  0,&(yyvsp[(1) - (3)]),(yyvsp[(3) - (3)]));;}
     break;
 
   case 649:
 
 /* Line 1455 of yacc.c  */
-#line 2289 "hphp.y"
+#line 2288 "hphp.y"
     { _p->onCollectionPair((yyval),  0,  0,(yyvsp[(1) - (1)]));;}
     break;
 
   case 650:
 
 /* Line 1455 of yacc.c  */
-#line 2293 "hphp.y"
+#line 2292 "hphp.y"
     { _p->addEncap((yyval), &(yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]), -1);;}
     break;
 
   case 651:
 
 /* Line 1455 of yacc.c  */
-#line 2295 "hphp.y"
+#line 2294 "hphp.y"
     { _p->addEncap((yyval), &(yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]), 0);;}
     break;
 
   case 652:
 
 /* Line 1455 of yacc.c  */
-#line 2296 "hphp.y"
+#line 2295 "hphp.y"
     { _p->addEncap((yyval), NULL, (yyvsp[(1) - (1)]), -1);;}
     break;
 
   case 653:
 
 /* Line 1455 of yacc.c  */
-#line 2298 "hphp.y"
+#line 2297 "hphp.y"
     { _p->addEncap((yyval), NULL, (yyvsp[(1) - (2)]), 0);
                                          _p->addEncap((yyval), &(yyval), (yyvsp[(2) - (2)]), -1); ;}
     break;
@@ -10174,140 +10173,140 @@ yyreduce:
   case 654:
 
 /* Line 1455 of yacc.c  */
-#line 2303 "hphp.y"
+#line 2302 "hphp.y"
     { _p->onSimpleVariable((yyval), (yyvsp[(1) - (1)]));;}
     break;
 
   case 655:
 
 /* Line 1455 of yacc.c  */
-#line 2305 "hphp.y"
+#line 2304 "hphp.y"
     { _p->encapRefDim((yyval), (yyvsp[(1) - (4)]), (yyvsp[(3) - (4)]));;}
     break;
 
   case 656:
 
 /* Line 1455 of yacc.c  */
-#line 2307 "hphp.y"
+#line 2306 "hphp.y"
     { _p->encapObjProp((yyval), (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));;}
     break;
 
   case 657:
 
 /* Line 1455 of yacc.c  */
-#line 2309 "hphp.y"
+#line 2308 "hphp.y"
     { _p->onDynamicVariable((yyval), (yyvsp[(2) - (3)]), 1);;}
     break;
 
   case 658:
 
 /* Line 1455 of yacc.c  */
-#line 2311 "hphp.y"
+#line 2310 "hphp.y"
     { _p->encapArray((yyval), (yyvsp[(2) - (6)]), (yyvsp[(4) - (6)]));;}
     break;
 
   case 659:
 
 /* Line 1455 of yacc.c  */
-#line 2312 "hphp.y"
+#line 2311 "hphp.y"
     { (yyval) = (yyvsp[(2) - (3)]);;}
     break;
 
   case 660:
 
 /* Line 1455 of yacc.c  */
-#line 2315 "hphp.y"
+#line 2314 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]); (yyval) = T_STRING;;}
     break;
 
   case 661:
 
 /* Line 1455 of yacc.c  */
-#line 2316 "hphp.y"
+#line 2315 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]); (yyval) = T_NUM_STRING;;}
     break;
 
   case 662:
 
 /* Line 1455 of yacc.c  */
-#line 2317 "hphp.y"
+#line 2316 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]); (yyval) = T_VARIABLE;;}
     break;
 
   case 663:
 
 /* Line 1455 of yacc.c  */
-#line 2321 "hphp.y"
+#line 2320 "hphp.y"
     { UEXP((yyval),(yyvsp[(3) - (4)]),T_ISSET,1);;}
     break;
 
   case 664:
 
 /* Line 1455 of yacc.c  */
-#line 2322 "hphp.y"
+#line 2321 "hphp.y"
     { UEXP((yyval),(yyvsp[(3) - (4)]),T_EMPTY,1);;}
     break;
 
   case 665:
 
 /* Line 1455 of yacc.c  */
-#line 2323 "hphp.y"
+#line 2322 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),T_INCLUDE,1);;}
     break;
 
   case 666:
 
 /* Line 1455 of yacc.c  */
-#line 2324 "hphp.y"
+#line 2323 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),T_INCLUDE_ONCE,1);;}
     break;
 
   case 667:
 
 /* Line 1455 of yacc.c  */
-#line 2325 "hphp.y"
+#line 2324 "hphp.y"
     { UEXP((yyval),(yyvsp[(3) - (4)]),T_EVAL,1);;}
     break;
 
   case 668:
 
 /* Line 1455 of yacc.c  */
-#line 2326 "hphp.y"
+#line 2325 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),T_REQUIRE,1);;}
     break;
 
   case 669:
 
 /* Line 1455 of yacc.c  */
-#line 2327 "hphp.y"
+#line 2326 "hphp.y"
     { UEXP((yyval),(yyvsp[(2) - (2)]),T_REQUIRE_ONCE,1);;}
     break;
 
   case 670:
 
 /* Line 1455 of yacc.c  */
-#line 2331 "hphp.y"
+#line 2330 "hphp.y"
     { _p->onExprListElem((yyval), NULL, (yyvsp[(1) - (1)]));;}
     break;
 
   case 671:
 
 /* Line 1455 of yacc.c  */
-#line 2332 "hphp.y"
+#line 2331 "hphp.y"
     { _p->onExprListElem((yyval), &(yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));;}
     break;
 
   case 672:
 
 /* Line 1455 of yacc.c  */
-#line 2337 "hphp.y"
+#line 2336 "hphp.y"
     { _p->onClassConst((yyval), (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), 0);;}
     break;
 
   case 673:
 
 /* Line 1455 of yacc.c  */
-#line 2346 "hphp.y"
+#line 2345 "hphp.y"
     { only_in_strict_mode(_p);
                                          _p->onTypedef((yyval), (yyvsp[(2) - (5)]), (yyvsp[(4) - (5)]));
                                          _p->popTypeScope(); ;}
@@ -10316,28 +10315,28 @@ yyreduce:
   case 674:
 
 /* Line 1455 of yacc.c  */
-#line 2352 "hphp.y"
+#line 2351 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]); ;}
     break;
 
   case 675:
 
 /* Line 1455 of yacc.c  */
-#line 2353 "hphp.y"
+#line 2352 "hphp.y"
     { only_in_strict_mode(_p); (yyval) = (yyvsp[(2) - (2)]); ;}
     break;
 
   case 676:
 
 /* Line 1455 of yacc.c  */
-#line 2359 "hphp.y"
+#line 2358 "hphp.y"
     { _p->pushTypeScope(); (yyval) = (yyvsp[(1) - (1)]); ;}
     break;
 
   case 677:
 
 /* Line 1455 of yacc.c  */
-#line 2363 "hphp.y"
+#line 2362 "hphp.y"
     { _p->pushTypeScope(); (yyval) = (yyvsp[(1) - (4)]);
                                          only_in_strict_mode(_p); ;}
     break;
@@ -10345,21 +10344,21 @@ yyreduce:
   case 678:
 
 /* Line 1455 of yacc.c  */
-#line 2370 "hphp.y"
+#line 2369 "hphp.y"
     { only_in_strict_mode(_p); (yyval) = (yyvsp[(2) - (3)]); ;}
     break;
 
   case 679:
 
 /* Line 1455 of yacc.c  */
-#line 2371 "hphp.y"
+#line 2370 "hphp.y"
     { (yyval).reset(); ;}
     break;
 
   case 680:
 
 /* Line 1455 of yacc.c  */
-#line 2375 "hphp.y"
+#line 2374 "hphp.y"
     { Token t; t.reset();
                                          _p->onTypeList((yyvsp[(1) - (1)]), t);
                                          (yyval) = (yyvsp[(1) - (1)]); ;}
@@ -10368,7 +10367,7 @@ yyreduce:
   case 681:
 
 /* Line 1455 of yacc.c  */
-#line 2378 "hphp.y"
+#line 2377 "hphp.y"
     { _p->onTypeList((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
                                          (yyval) = (yyvsp[(1) - (3)]); ;}
     break;
@@ -10376,98 +10375,98 @@ yyreduce:
   case 682:
 
 /* Line 1455 of yacc.c  */
-#line 2383 "hphp.y"
+#line 2382 "hphp.y"
     { (yyval) = (yyvsp[(1) - (3)]); ;}
     break;
 
   case 683:
 
 /* Line 1455 of yacc.c  */
-#line 2384 "hphp.y"
+#line 2383 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]); ;}
     break;
 
   case 684:
 
 /* Line 1455 of yacc.c  */
-#line 2385 "hphp.y"
+#line 2384 "hphp.y"
     { (yyval).reset(); ;}
     break;
 
   case 685:
 
 /* Line 1455 of yacc.c  */
-#line 2386 "hphp.y"
+#line 2385 "hphp.y"
     { (yyval).reset(); ;}
     break;
 
   case 686:
 
 /* Line 1455 of yacc.c  */
-#line 2390 "hphp.y"
+#line 2389 "hphp.y"
     { (yyval).reset(); ;}
     break;
 
   case 687:
 
 /* Line 1455 of yacc.c  */
-#line 2391 "hphp.y"
+#line 2390 "hphp.y"
     { only_in_strict_mode(_p); (yyval) = (yyvsp[(2) - (2)]); ;}
     break;
 
   case 688:
 
 /* Line 1455 of yacc.c  */
-#line 2396 "hphp.y"
+#line 2395 "hphp.y"
     { _p->addTypeVar((yyvsp[(1) - (3)]).text()); ;}
     break;
 
   case 689:
 
 /* Line 1455 of yacc.c  */
-#line 2397 "hphp.y"
+#line 2396 "hphp.y"
     { _p->addTypeVar((yyvsp[(1) - (1)]).text()); ;}
     break;
 
   case 691:
 
 /* Line 1455 of yacc.c  */
-#line 2402 "hphp.y"
+#line 2401 "hphp.y"
     { _p->addTypeVar((yyvsp[(1) - (5)]).text()); ;}
     break;
 
   case 692:
 
 /* Line 1455 of yacc.c  */
-#line 2404 "hphp.y"
+#line 2403 "hphp.y"
     { _p->addTypeVar((yyvsp[(1) - (3)]).text()); ;}
     break;
 
   case 694:
 
 /* Line 1455 of yacc.c  */
-#line 2412 "hphp.y"
+#line 2411 "hphp.y"
     { validate_shape_keyname((yyvsp[(1) - (3)]), _p); ;}
     break;
 
   case 697:
 
 /* Line 1455 of yacc.c  */
-#line 2423 "hphp.y"
+#line 2422 "hphp.y"
     { (yyval) = (yyvsp[(1) - (2)]); ;}
     break;
 
   case 698:
 
 /* Line 1455 of yacc.c  */
-#line 2425 "hphp.y"
+#line 2424 "hphp.y"
     {;}
     break;
 
   case 699:
 
 /* Line 1455 of yacc.c  */
-#line 2429 "hphp.y"
+#line 2428 "hphp.y"
     { only_in_strict_mode(_p);
                                          (yyval).setText("array"); ;}
     break;
@@ -10475,7 +10474,7 @@ yyreduce:
   case 700:
 
 /* Line 1455 of yacc.c  */
-#line 2437 "hphp.y"
+#line 2436 "hphp.y"
     { only_in_strict_mode(_p);
                                          _p->onTypeSpecialization((yyvsp[(2) - (2)]), '?');
                                          (yyval) = (yyvsp[(2) - (2)]); ;}
@@ -10484,7 +10483,7 @@ yyreduce:
   case 701:
 
 /* Line 1455 of yacc.c  */
-#line 2440 "hphp.y"
+#line 2439 "hphp.y"
     { only_in_strict_mode(_p);
                                          _p->onTypeSpecialization((yyvsp[(2) - (2)]), '@');
                                          (yyval) = (yyvsp[(2) - (2)]); ;}
@@ -10493,14 +10492,14 @@ yyreduce:
   case 702:
 
 /* Line 1455 of yacc.c  */
-#line 2443 "hphp.y"
+#line 2442 "hphp.y"
     { _p->onTypeAnnotation((yyval), (yyvsp[(1) - (2)]), (yyvsp[(2) - (2)])); ;}
     break;
 
   case 703:
 
 /* Line 1455 of yacc.c  */
-#line 2444 "hphp.y"
+#line 2443 "hphp.y"
     { Token t; t.reset();
                                          (yyvsp[(1) - (1)]).setText("array");
                                          _p->onTypeAnnotation((yyval), (yyvsp[(1) - (1)]), t); ;}
@@ -10509,14 +10508,14 @@ yyreduce:
   case 704:
 
 /* Line 1455 of yacc.c  */
-#line 2447 "hphp.y"
+#line 2446 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]); ;}
     break;
 
   case 705:
 
 /* Line 1455 of yacc.c  */
-#line 2449 "hphp.y"
+#line 2448 "hphp.y"
     { only_in_strict_mode(_p);
                                          (yyvsp[(1) - (4)]).setText("array");
                                          _p->onTypeAnnotation((yyval), (yyvsp[(1) - (4)]), (yyvsp[(3) - (4)])); ;}
@@ -10525,7 +10524,7 @@ yyreduce:
   case 706:
 
 /* Line 1455 of yacc.c  */
-#line 2453 "hphp.y"
+#line 2452 "hphp.y"
     { only_in_strict_mode(_p);
                                          _p->onTypeList((yyvsp[(3) - (6)]), (yyvsp[(5) - (6)]));
                                          (yyvsp[(1) - (6)]).setText("array");
@@ -10535,7 +10534,7 @@ yyreduce:
   case 707:
 
 /* Line 1455 of yacc.c  */
-#line 2457 "hphp.y"
+#line 2456 "hphp.y"
     { (yyvsp[(1) - (1)]).xhpLabel();
                                          Token t; t.reset();
                                          _p->onTypeAnnotation((yyval), (yyvsp[(1) - (1)]), t);
@@ -10545,7 +10544,7 @@ yyreduce:
   case 708:
 
 /* Line 1455 of yacc.c  */
-#line 2463 "hphp.y"
+#line 2462 "hphp.y"
     { only_in_strict_mode(_p);
                                         _p->onTypeList((yyvsp[(7) - (8)]), (yyvsp[(4) - (8)]));
                                         _p->onTypeAnnotation((yyval), (yyvsp[(2) - (8)]), (yyvsp[(7) - (8)]));
@@ -10555,7 +10554,7 @@ yyreduce:
   case 709:
 
 /* Line 1455 of yacc.c  */
-#line 2467 "hphp.y"
+#line 2466 "hphp.y"
     { only_in_strict_mode(_p);
                                         _p->onTypeList((yyvsp[(2) - (5)]), (yyvsp[(4) - (5)]));
                                         Token t; t.reset(); t.setText("array");
@@ -10566,21 +10565,21 @@ yyreduce:
   case 710:
 
 /* Line 1455 of yacc.c  */
-#line 2475 "hphp.y"
+#line 2474 "hphp.y"
     { (yyval) = (yyvsp[(1) - (1)]); ;}
     break;
 
   case 711:
 
 /* Line 1455 of yacc.c  */
-#line 2476 "hphp.y"
+#line 2475 "hphp.y"
     { (yyval).reset(); ;}
     break;
 
 
 
 /* Line 1455 of yacc.c  */
-#line 10584 "new_hphp.tab.cpp"
+#line 10583 "new_hphp.tab.cpp"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -10799,7 +10798,7 @@ yyreturn:
 
 
 /* Line 1675 of yacc.c  */
-#line 2479 "hphp.y"
+#line 2478 "hphp.y"
 
 bool Parser::parseImpl() {
   return yyparse(this) == 0;
diff --git a/hphp/test/zend/bad/zend/ns_071.php.expectf b/hphp/test/zend/bad/zend/ns_071.php.expectf
index c3c97de5b..420b54dd9 100644
--- a/hphp/test/zend/bad/zend/ns_071.php.expectf
+++ b/hphp/test/zend/bad/zend/ns_071.php.expectf
@@ -1,3 +1,3 @@
 NULL
 
-HipHop Fatal error: %a
+HipHop Fatal error: %a
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/ns_072.php.expectf b/hphp/test/zend/bad/zend/ns_072.php.expectf
index 3f8ba7c40..8c4b97a10 100644
--- a/hphp/test/zend/bad/zend/ns_072.php.expectf
+++ b/hphp/test/zend/bad/zend/ns_072.php.expectf
@@ -2,4 +2,4 @@ object(foo\test)#%d (0) {
 }
 NULL
 
-HipHop Fatal error: %a
+HipHop Fatal error: %a
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/bug55086.php b/hphp/test/zend/good/zend/bug55086.php
similarity index 100%
rename from hphp/test/zend/bad/zend/bug55086.php
rename to hphp/test/zend/good/zend/bug55086.php
diff --git a/hphp/test/zend/bad/zend/bug55086.php.expectf b/hphp/test/zend/good/zend/bug55086.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/bug55086.php.expectf
rename to hphp/test/zend/good/zend/bug55086.php.expectf
diff --git a/hphp/test/zend/bad/zend/call_user_func_001.php b/hphp/test/zend/good/zend/call_user_func_001.php
similarity index 100%
rename from hphp/test/zend/bad/zend/call_user_func_001.php
rename to hphp/test/zend/good/zend/call_user_func_001.php
diff --git a/hphp/test/zend/bad/zend/call_user_func_001.php.expectf b/hphp/test/zend/good/zend/call_user_func_001.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/call_user_func_001.php.expectf
rename to hphp/test/zend/good/zend/call_user_func_001.php.expectf
diff --git a/hphp/test/zend/bad/zend/class_constants_004.php b/hphp/test/zend/good/zend/class_constants_004.php
similarity index 100%
rename from hphp/test/zend/bad/zend/class_constants_004.php
rename to hphp/test/zend/good/zend/class_constants_004.php
diff --git a/hphp/test/zend/bad/zend/class_constants_004.php.expectf b/hphp/test/zend/good/zend/class_constants_004.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/class_constants_004.php.expectf
rename to hphp/test/zend/good/zend/class_constants_004.php.expectf
diff --git a/hphp/test/zend/bad/zend/ns_082.php b/hphp/test/zend/good/zend/ns_082.php
similarity index 100%
rename from hphp/test/zend/bad/zend/ns_082.php
rename to hphp/test/zend/good/zend/ns_082.php
diff --git a/hphp/test/zend/bad/zend/ns_082.php.expectf b/hphp/test/zend/good/zend/ns_082.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/ns_082.php.expectf
rename to hphp/test/zend/good/zend/ns_082.php.expectf
diff --git a/hphp/util/parser/hphp.y b/hphp/util/parser/hphp.y
index 172d700eb..67760c787 100644
--- a/hphp/util/parser/hphp.y
+++ b/hphp/util/parser/hphp.y
@@ -829,8 +829,7 @@ top_statement_list:
   |                                    { }
 ;
 top_statement:
-    statement                          { _p->nns($1.num() == T_DECLARE);
-                                         $$ = $1;}
+    statement                          { _p->nns($1.num()); $$ = $1;}
   | function_declaration_statement     { _p->nns(); $$ = $1;}
   | class_declaration_statement        { _p->nns(); $$ = $1;}
   | trait_declaration_statement        { _p->nns(); $$ = $1;}
@@ -960,7 +959,7 @@ statement:
   | T_STATIC static_var_list ';'       { _p->onStatic($$, $2);}
   | T_ECHO expr_list ';'               { _p->onEcho($$, $2, 0);}
   | T_UNSET '(' variable_list ')' ';'  { _p->onUnset($$, $3);}
-  | ';'                                { $$.reset();}
+  | ';'                                { $$.reset(); $$ = ';'}
   | T_INLINE_HTML                      { _p->onEcho($$, $1, 1);}
   | T_FOREACH '(' expr
     T_AS foreach_variable
diff --git a/hphp/util/parser/parser.cpp b/hphp/util/parser/parser.cpp
index 252f4d67c..579a4adae 100644
--- a/hphp/util/parser/parser.cpp
+++ b/hphp/util/parser/parser.cpp
@@ -287,13 +287,13 @@ void ParserBase::popLabelInfo() {
 ///////////////////////////////////////////////////////////////////////////////
 // namespace support
 
-void ParserBase::nns(bool declare /* = false */) {
-  if (m_nsState == SeenNamespaceStatement) {
-    error("No code may exist outside of namespace {}: %s",
-          getMessage().c_str());
+void ParserBase::nns(int token) {
+  if (m_nsState == SeenNamespaceStatement && token != ';') {
+    error("No code may exist outside of namespace {}: %d %s",
+          token, getMessage().c_str());
     return;
   }
-  if (m_nsState == SeenNothing && !declare) {
+  if (m_nsState == SeenNothing && token != T_DECLARE) {
     m_nsState = SeenNonNamespaceStatement;
   }
 }
@@ -305,6 +305,11 @@ void ParserBase::onNamespaceStart(const std::string &ns,
           "statement in the script: %s", getMessage().c_str());
     return;
   }
+  if (m_nsState != SeenNothing && file_scope != m_nsFileScope) {
+    error("Cannot mix bracketed namespace declarations with unbracketed "
+          "namespace declarations");
+  }
+
   m_nsState = InsideNamespace;
   m_nsFileScope = file_scope;
   m_aliases.clear();
diff --git a/hphp/util/parser/parser.h b/hphp/util/parser/parser.h
index 6b378e190..a0e43264b 100644
--- a/hphp/util/parser/parser.h
+++ b/hphp/util/parser/parser.h
@@ -172,7 +172,7 @@ public:
   void onNamespaceStart(const std::string &ns, bool file_scope = false);
   void onNamespaceEnd();
   void onUse(const std::string &ns, const std::string &as);
-  void nns(bool declare = false);
+  void nns(int token = 0);
   std::string nsDecl(const std::string &name);
   std::string resolve(const std::string &ns, bool cls);