D13976.id33716.diff
No OneTemporary
Actions

Size

128 KB

Referenced Files

None

Subscribers

None

D13976.id33716.diff
View Options

	diff --git a/support/xhpast/parser.y b/support/xhpast/parser.y
	--- a/support/xhpast/parser.y
	+++ b/support/xhpast/parser.y
	@@ -52,18 +52,6 @@
	yyextra->error = error;
	}

	-/*
	-
	-TODO: Restore this.
	-
	-static void replacestr(string &source, const string &find, const string &rep) {
	- size_t j;
	- while ((j = source.find(find)) != std::string::npos) {
	- source.replace(j, find.length(), rep);
	- }
	-}
	-*/
	-
	%}

	%expect 5
	diff --git a/support/xhpast/parser.yacc.cpp b/support/xhpast/parser.yacc.cpp
	--- a/support/xhpast/parser.yacc.cpp
	+++ b/support/xhpast/parser.yacc.cpp
	@@ -122,20 +122,8 @@
	yyextra->error = error;
	}

	-/*
	-
	-TODO: Restore this.
	-
	-static void replacestr(string &source, const string &find, const string &rep) {
	- size_t j;
	- while ((j = source.find(find)) != std::string::npos) {
	- source.replace(j, find.length(), rep);
	- }
	-}
	-*/
	-

	-#line 139 "parser.yacc.cpp" /* yacc.c:339 */
	+#line 127 "parser.yacc.cpp" /* yacc.c:339 */

	# ifndef YY_NULLPTR
	# if defined __cplusplus && 201103L <= __cplusplus
	@@ -324,7 +312,7 @@

	/* Copy the second part of user declarations. */

	-#line 328 "parser.yacc.cpp" /* yacc.c:358 */
	+#line 316 "parser.yacc.cpp" /* yacc.c:358 */

	#ifdef short
	# undef short
	@@ -635,50 +623,50 @@
	/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
	static const yytype_uint16 yyrline[] =
	{
	- 0, 219, 219, 225, 228, 234, 237, 243, 244, 245,
	- 246, 251, 258, 264, 272, 278, 285, 288, 295, 300,
	- 306, 312, 322, 329, 339, 342, 348, 349, 350, 351,
	- 359, 360, 366, 369, 372, 378, 381, 411, 430, 437,
	- 445, 458, 465, 472, 479, 486, 493, 500, 507, 514,
	- 519, 524, 529, 533, 537, 541, 547, 565, 582, 588,
	- 592, 610, 618, 629, 630, 636, 639, 649, 653, 660,
	- 672, 676, 683, 687, 691, 695, 698, 704, 719, 731,
	- 746, 750, 757, 764, 771, 774, 780, 784, 787, 795,
	- 798, 806, 809, 815, 818, 824, 825, 833, 834, 842,
	- 843, 851, 852, 860, 866, 877, 880, 890, 895, 907,
	- 910, 918, 928, 929, 933, 934, 942, 945, 955, 958,
	- 968, 971, 979, 982, 990, 991, 997, 1005, 1014, 1023,
	- 1031, 1039, 1048, 1058, 1070, 1073, 1076, 1079, 1085, 1086,
	- 1092, 1095, 1098, 1103, 1106, 1109, 1117, 1121, 1128, 1131,
	- 1135, 1142, 1150, 1158, 1166, 1177, 1180, 1186, 1194, 1198,
	- 1201, 1201, 1218, 1226, 1229, 1235, 1238, 1244, 1247, 1253,
	- 1257, 1264, 1267, 1273, 1281, 1285, 1292, 1296, 1302, 1310,
	- 1316, 1325, 1328, 1336, 1339, 1345, 1346, 1353, 1356, 1363,
	- 1367, 1373, 1374, 1375, 1376, 1377, 1378, 1382, 1389, 1396,
	- 1403, 1413, 1422, 1434, 1437, 1444, 1447, 1452, 1455, 1462,
	- 1470, 1476, 1486, 1500, 1505, 1511, 1517, 1523, 1529, 1535,
	- 1541, 1547, 1553, 1559, 1565, 1571, 1576, 1581, 1586, 1591,
	- 1597, 1603, 1609, 1615, 1621, 1627, 1633, 1639, 1665, 1671,
	- 1677, 1683, 1689, 1695, 1701, 1707, 1712, 1717, 1722, 1727,
	- 1733, 1739, 1745, 1751, 1757, 1763, 1769, 1775, 1781, 1782,
	- 1783, 1789, 1795, 1796, 1801, 1806, 1811, 1816, 1821, 1826,
	- 1831, 1836, 1841, 1845, 1846, 1847, 1848, 1853, 1859, 1873,
	- 1896, 1902, 1908, 1914, 1923, 1927, 1930, 1938, 1941, 1946,
	- 1950, 1959, 1964, 1971, 1977, 1986, 1995, 2004, 2013, 2021,
	- 2024, 2027, 2031, 2038, 2041, 2045, 2052, 2053, 2057, 2072,
	- 2076, 2079, 2085, 2091, 2094, 2098, 2106, 2109, 2115, 2118,
	- 2121, 2124, 2127, 2130, 2133, 2136, 2139, 2142, 2145, 2148,
	- 2154, 2155, 2156, 2160, 2164, 2169, 2174, 2179, 2184, 2188,
	- 2196, 2197, 2198, 2199, 2202, 2205, 2209, 2212, 2218, 2221,
	- 2225, 2236, 2243, 2250, 2260, 2261, 2265, 2269, 2273, 2277,
	- 2303, 2307, 2310, 2316, 2326, 2332, 2341, 2347, 2348, 2349,
	- 2355, 2356, 2371, 2376, 2384, 2388, 2394, 2403, 2404, 2405,
	- 2409, 2410, 2413, 2425, 2429, 2435, 2441, 2445, 2448, 2456,
	- 2459, 2465, 2466, 2470, 2476, 2482, 2486, 2490, 2496, 2499,
	- 2514, 2517, 2524, 2525, 2529, 2535, 2538, 2544, 2551, 2558,
	- 2565, 2572, 2579, 2586, 2593, 2603, 2613, 2623, 2626, 2629,
	- 2639, 2642, 2648, 2652, 2658, 2663, 2669, 2675, 2681, 2690,
	- 2695, 2703, 2712, 2717
	+ 0, 207, 207, 213, 216, 222, 225, 231, 232, 233,
	+ 234, 239, 246, 252, 260, 266, 273, 276, 283, 288,
	+ 294, 300, 310, 317, 327, 330, 336, 337, 338, 339,
	+ 347, 348, 354, 357, 360, 366, 369, 399, 418, 425,
	+ 433, 446, 453, 460, 467, 474, 481, 488, 495, 502,
	+ 507, 512, 517, 521, 525, 529, 535, 553, 570, 576,
	+ 580, 598, 606, 617, 618, 624, 627, 637, 641, 648,
	+ 660, 664, 671, 675, 679, 683, 686, 692, 707, 719,
	+ 734, 738, 745, 752, 759, 762, 768, 772, 775, 783,
	+ 786, 794, 797, 803, 806, 812, 813, 821, 822, 830,
	+ 831, 839, 840, 848, 854, 865, 868, 878, 883, 895,
	+ 898, 906, 916, 917, 921, 922, 930, 933, 943, 946,
	+ 956, 959, 967, 970, 978, 979, 985, 993, 1002, 1011,
	+ 1019, 1027, 1036, 1046, 1058, 1061, 1064, 1067, 1073, 1074,
	+ 1080, 1083, 1086, 1091, 1094, 1097, 1105, 1109, 1116, 1119,
	+ 1123, 1130, 1138, 1146, 1154, 1165, 1168, 1174, 1182, 1186,
	+ 1189, 1189, 1206, 1214, 1217, 1223, 1226, 1232, 1235, 1241,
	+ 1245, 1252, 1255, 1261, 1269, 1273, 1280, 1284, 1290, 1298,
	+ 1304, 1313, 1316, 1324, 1327, 1333, 1334, 1341, 1344, 1351,
	+ 1355, 1361, 1362, 1363, 1364, 1365, 1366, 1370, 1377, 1384,
	+ 1391, 1401, 1410, 1422, 1425, 1432, 1435, 1440, 1443, 1450,
	+ 1458, 1464, 1474, 1488, 1493, 1499, 1505, 1511, 1517, 1523,
	+ 1529, 1535, 1541, 1547, 1553, 1559, 1564, 1569, 1574, 1579,
	+ 1585, 1591, 1597, 1603, 1609, 1615, 1621, 1627, 1653, 1659,
	+ 1665, 1671, 1677, 1683, 1689, 1695, 1700, 1705, 1710, 1715,
	+ 1721, 1727, 1733, 1739, 1745, 1751, 1757, 1763, 1769, 1770,
	+ 1771, 1777, 1783, 1784, 1789, 1794, 1799, 1804, 1809, 1814,
	+ 1819, 1824, 1829, 1833, 1834, 1835, 1836, 1841, 1847, 1861,
	+ 1884, 1890, 1896, 1902, 1911, 1915, 1918, 1926, 1929, 1934,
	+ 1938, 1947, 1952, 1959, 1965, 1974, 1983, 1992, 2001, 2009,
	+ 2012, 2015, 2019, 2026, 2029, 2033, 2040, 2041, 2045, 2060,
	+ 2064, 2067, 2073, 2079, 2082, 2086, 2094, 2097, 2103, 2106,
	+ 2109, 2112, 2115, 2118, 2121, 2124, 2127, 2130, 2133, 2136,
	+ 2142, 2143, 2144, 2148, 2152, 2157, 2162, 2167, 2172, 2176,
	+ 2184, 2185, 2186, 2187, 2190, 2193, 2197, 2200, 2206, 2209,
	+ 2213, 2224, 2231, 2238, 2248, 2249, 2253, 2257, 2261, 2265,
	+ 2291, 2295, 2298, 2304, 2314, 2320, 2329, 2335, 2336, 2337,
	+ 2343, 2344, 2359, 2364, 2372, 2376, 2382, 2391, 2392, 2393,
	+ 2397, 2398, 2401, 2413, 2417, 2423, 2429, 2433, 2436, 2444,
	+ 2447, 2453, 2454, 2458, 2464, 2470, 2474, 2478, 2484, 2487,
	+ 2502, 2505, 2512, 2513, 2517, 2523, 2526, 2532, 2539, 2546,
	+ 2553, 2560, 2567, 2574, 2581, 2591, 2601, 2611, 2614, 2617,
	+ 2627, 2630, 2636, 2640, 2646, 2651, 2657, 2663, 2669, 2678,
	+ 2683, 2691, 2700, 2705
	};
	#endif

	@@ -3487,57 +3475,57 @@
	switch (yyn)
	{
	case 2:
	-#line 219 "parser.y" /* yacc.c:1646 */
	+#line 207 "parser.y" /* yacc.c:1646 */
	{
	*root = NNEW(n_PROGRAM)->appendChild((yyvsp[0]));
	}
	-#line 3495 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3483 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 3:
	-#line 225 "parser.y" /* yacc.c:1646 */
	+#line 213 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[-1])->appendChild((yyvsp[0]));
	}
	-#line 3503 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3491 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 4:
	-#line 228 "parser.y" /* yacc.c:1646 */
	+#line 216 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_STATEMENT_LIST);
	}
	-#line 3511 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3499 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 5:
	-#line 234 "parser.y" /* yacc.c:1646 */
	+#line 222 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_SYMBOL_NAME);
	}
	-#line 3519 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3507 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 6:
	-#line 237 "parser.y" /* yacc.c:1646 */
	+#line 225 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NMORE((yyvsp[-2]), (yyvsp[0]));
	}
	-#line 3527 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3515 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 10:
	-#line 246 "parser.y" /* yacc.c:1646 */
	+#line 234 "parser.y" /* yacc.c:1646 */
	{
	(yyvsp[-3]) = NSPAN((yyvsp[-3]), n_HALT_COMPILER, (yyvsp[-1]));
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-3]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 3537 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3525 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 11:
	-#line 251 "parser.y" /* yacc.c:1646 */
	+#line 239 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyvsp[-2]), n_NAMESPACE, (yyvsp[-1]));
	(yyvsp[-2])->appendChild((yyvsp[-1]));
	@@ -3545,22 +3533,22 @@
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-2]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 3549 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3537 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 12:
	-#line 258 "parser.y" /* yacc.c:1646 */
	+#line 246 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyvsp[-4]), n_NAMESPACE, (yyvsp[0]));
	(yyvsp[-4])->appendChild((yyvsp[-3]));
	(yyvsp[-4])->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-4]));
	}
	-#line 3560 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3548 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 13:
	-#line 264 "parser.y" /* yacc.c:1646 */
	+#line 252 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyvsp[-3]), n_NAMESPACE, (yyvsp[0]));
	(yyvsp[-3])->appendChild(NNEW(n_EMPTY));
	@@ -3569,80 +3557,80 @@
	(yyvsp[-3])->appendChild((yyvsp[-1]));
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-3]));
	}
	-#line 3573 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3561 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 14:
	-#line 272 "parser.y" /* yacc.c:1646 */
	+#line 260 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyvsp[-2]), n_USE, (yyvsp[-1]));
	(yyvsp[-2])->appendChild((yyvsp[-1]));
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-2]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 3584 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3572 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 15:
	-#line 278 "parser.y" /* yacc.c:1646 */
	+#line 266 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 3593 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3581 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 16:
	-#line 285 "parser.y" /* yacc.c:1646 */
	+#line 273 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[-2])->appendChild((yyvsp[0]));
	}
	-#line 3601 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3589 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 17:
	-#line 288 "parser.y" /* yacc.c:1646 */
	+#line 276 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_USE_LIST);
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 3610 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3598 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 18:
	-#line 295 "parser.y" /* yacc.c:1646 */
	+#line 283 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_USE);
	(yyval)->appendChild((yyvsp[0]));
	(yyval)->appendChild(NNEW(n_EMPTY));
	}
	-#line 3620 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3608 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 19:
	-#line 300 "parser.y" /* yacc.c:1646 */
	+#line 288 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_USE);
	(yyval)->appendChild((yyvsp[-2]));
	NTYPE((yyvsp[0]), n_STRING);
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 3631 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3619 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 20:
	-#line 306 "parser.y" /* yacc.c:1646 */
	+#line 294 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_USE);
	NMORE((yyvsp[0]), (yyvsp[-1]));
	(yyval)->appendChild((yyvsp[0]));
	(yyval)->appendChild(NNEW(n_EMPTY));
	}
	-#line 3642 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3630 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 21:
	-#line 312 "parser.y" /* yacc.c:1646 */
	+#line 300 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_USE);
	NMORE((yyvsp[-2]), (yyvsp[-3]));
	@@ -3650,11 +3638,11 @@
	NTYPE((yyvsp[0]), n_STRING);
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 3654 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3642 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 22:
	-#line 322 "parser.y" /* yacc.c:1646 */
	+#line 310 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyval), (yyvsp[0]));
	(yyval)->appendChild(
	@@ -3662,11 +3650,11 @@
	->appendChild(NTYPE((yyvsp[-2]), n_STRING))
	->appendChild((yyvsp[0])));
	}
	-#line 3666 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3654 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 23:
	-#line 329 "parser.y" /* yacc.c:1646 */
	+#line 317 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyval), n_CONSTANT_DECLARATION_LIST, (yyvsp[0]));
	(yyval)->appendChild(
	@@ -3674,80 +3662,80 @@
	->appendChild(NTYPE((yyvsp[-2]), n_STRING))
	->appendChild((yyvsp[0])));
	}
	-#line 3678 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3666 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 24:
	-#line 339 "parser.y" /* yacc.c:1646 */
	+#line 327 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[-1])->appendChild((yyvsp[0]));
	}
	-#line 3686 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3674 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 25:
	-#line 342 "parser.y" /* yacc.c:1646 */
	+#line 330 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_STATEMENT_LIST);
	}
	-#line 3694 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3682 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 29:
	-#line 351 "parser.y" /* yacc.c:1646 */
	+#line 339 "parser.y" /* yacc.c:1646 */
	{
	(yyvsp[-3]) = NSPAN((yyvsp[-3]), n_HALT_COMPILER, (yyvsp[-1]));
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-3]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 3704 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3692 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 31:
	-#line 360 "parser.y" /* yacc.c:1646 */
	+#line 348 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_STRING);
	(yyval) = NNEW(n_LABEL);
	(yyval)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 3715 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3703 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 32:
	-#line 366 "parser.y" /* yacc.c:1646 */
	+#line 354 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_OPEN_TAG);
	}
	-#line 3723 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3711 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 33:
	-#line 369 "parser.y" /* yacc.c:1646 */
	+#line 357 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_OPEN_TAG);
	}
	-#line 3731 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3719 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 34:
	-#line 372 "parser.y" /* yacc.c:1646 */
	+#line 360 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_CLOSE_TAG);
	}
	-#line 3739 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3727 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 35:
	-#line 378 "parser.y" /* yacc.c:1646 */
	+#line 366 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
	}
	-#line 3747 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3735 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 36:
	-#line 381 "parser.y" /* yacc.c:1646 */
	+#line 369 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CONDITION_LIST);

	@@ -3778,11 +3766,11 @@

	(yyval) = NNEW(n_STATEMENT)->appendChild((yyval));
	}
	-#line 3782 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3770 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 37:
	-#line 415 "parser.y" /* yacc.c:1646 */
	+#line 403 "parser.y" /* yacc.c:1646 */
	{

	(yyval) = NNEW(n_CONDITION_LIST);
	@@ -3798,11 +3786,11 @@
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyval));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 3802 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3790 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 38:
	-#line 430 "parser.y" /* yacc.c:1646 */
	+#line 418 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-4]), n_WHILE);
	(yyvsp[-4])->appendChild(NSPAN((yyvsp[-3]), n_CONTROL_CONDITION, (yyvsp[-1]))->appendChild((yyvsp[-2])));
	@@ -3810,11 +3798,11 @@

	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-4]));
	}
	-#line 3814 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3802 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 39:
	-#line 437 "parser.y" /* yacc.c:1646 */
	+#line 425 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-6]), n_DO_WHILE);
	(yyvsp[-6])->appendChild((yyvsp[-5]));
	@@ -3823,11 +3811,11 @@
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-6]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 3827 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3815 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 40:
	-#line 445 "parser.y" /* yacc.c:1646 */
	+#line 433 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-8]), n_FOR);

	@@ -3841,11 +3829,11 @@

	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-8]));
	}
	-#line 3845 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3833 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 41:
	-#line 458 "parser.y" /* yacc.c:1646 */
	+#line 446 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-4]), n_SWITCH);
	(yyvsp[-4])->appendChild(NSPAN((yyvsp[-3]), n_CONTROL_CONDITION, (yyvsp[-1]))->appendChild((yyvsp[-2])));
	@@ -3853,11 +3841,11 @@

	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-4]));
	}
	-#line 3857 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3845 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 42:
	-#line 465 "parser.y" /* yacc.c:1646 */
	+#line 453 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_BREAK);
	(yyvsp[-1])->appendChild(NNEW(n_EMPTY));
	@@ -3865,11 +3853,11 @@
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 3869 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3857 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 43:
	-#line 472 "parser.y" /* yacc.c:1646 */
	+#line 460 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_BREAK);
	(yyvsp[-2])->appendChild((yyvsp[-1]));
	@@ -3877,11 +3865,11 @@
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-2]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 3881 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3869 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 44:
	-#line 479 "parser.y" /* yacc.c:1646 */
	+#line 467 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_CONTINUE);
	(yyvsp[-1])->appendChild(NNEW(n_EMPTY));
	@@ -3889,11 +3877,11 @@
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 3893 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3881 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 45:
	-#line 486 "parser.y" /* yacc.c:1646 */
	+#line 474 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_CONTINUE);
	(yyvsp[-2])->appendChild((yyvsp[-1]));
	@@ -3901,11 +3889,11 @@
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-2]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 3905 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3893 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 46:
	-#line 493 "parser.y" /* yacc.c:1646 */
	+#line 481 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_RETURN);
	(yyvsp[-1])->appendChild(NNEW(n_EMPTY));
	@@ -3913,11 +3901,11 @@
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 3917 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3905 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 47:
	-#line 500 "parser.y" /* yacc.c:1646 */
	+#line 488 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_RETURN);
	(yyvsp[-2])->appendChild((yyvsp[-1]));
	@@ -3925,11 +3913,11 @@
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-2]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 3929 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3917 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 48:
	-#line 507 "parser.y" /* yacc.c:1646 */
	+#line 495 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_RETURN);
	(yyvsp[-2])->appendChild((yyvsp[-1]));
	@@ -3937,79 +3925,79 @@
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-2]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 3941 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3929 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 49:
	-#line 514 "parser.y" /* yacc.c:1646 */
	+#line 502 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[-1]), (yyvsp[-2]));
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 3951 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3939 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 50:
	-#line 519 "parser.y" /* yacc.c:1646 */
	+#line 507 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[-1]), (yyvsp[-2]));
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 3961 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3949 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 51:
	-#line 524 "parser.y" /* yacc.c:1646 */
	+#line 512 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[-1]), (yyvsp[-2]));
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 3971 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3959 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 52:
	-#line 529 "parser.y" /* yacc.c:1646 */
	+#line 517 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[0]), n_INLINE_HTML);
	(yyval) = (yyvsp[0]);
	}
	-#line 3980 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3968 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 53:
	-#line 533 "parser.y" /* yacc.c:1646 */
	+#line 521 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 3989 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3977 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 54:
	-#line 537 "parser.y" /* yacc.c:1646 */
	+#line 525 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 3998 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3986 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 55:
	-#line 541 "parser.y" /* yacc.c:1646 */
	+#line 529 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[-2]), (yyvsp[-1]));
	NMORE((yyvsp[-2]), (yyvsp[-4]));
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-2]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 4009 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 3997 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 56:
	-#line 548 "parser.y" /* yacc.c:1646 */
	+#line 536 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-7]), n_FOREACH);
	NSPAN((yyvsp[-6]), n_FOREACH_EXPRESSION, (yyvsp[-1]));
	@@ -4027,11 +4015,11 @@

	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-7]));
	}
	-#line 4031 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4019 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 57:
	-#line 566 "parser.y" /* yacc.c:1646 */
	+#line 554 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-7]), n_FOREACH);
	NSPAN((yyvsp[-6]), n_FOREACH_EXPRESSION, (yyvsp[-1]));
	@@ -4048,31 +4036,31 @@

	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-7]));
	}
	-#line 4052 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4040 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 58:
	-#line 582 "parser.y" /* yacc.c:1646 */
	+#line 570 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-4]), n_DECLARE);
	(yyvsp[-4])->appendChild((yyvsp[-2]));
	(yyvsp[-4])->appendChild((yyvsp[0]));
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-4]));
	}
	-#line 4063 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4051 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 59:
	-#line 588 "parser.y" /* yacc.c:1646 */
	+#line 576 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_STATEMENT)->appendChild(NNEW(n_EMPTY));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 4072 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4060 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 60:
	-#line 596 "parser.y" /* yacc.c:1646 */
	+#line 584 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-13]), n_TRY);
	(yyvsp[-13])->appendChild(NEXPAND((yyvsp[-12]), (yyvsp[-11]), (yyvsp[-10])));
	@@ -4087,11 +4075,11 @@

	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-13]));
	}
	-#line 4091 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4079 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 61:
	-#line 610 "parser.y" /* yacc.c:1646 */
	+#line 598 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_THROW);
	(yyvsp[-2])->appendChild((yyvsp[-1]));
	@@ -4100,11 +4088,11 @@
	NMORE((yyval), (yyvsp[0]));

	}
	-#line 4104 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4092 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 62:
	-#line 618 "parser.y" /* yacc.c:1646 */
	+#line 606 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_GOTO);
	NTYPE((yyvsp[-1]), n_STRING);
	@@ -4113,56 +4101,56 @@
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-2]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 4117 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4105 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 64:
	-#line 630 "parser.y" /* yacc.c:1646 */
	+#line 618 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 4125 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4113 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 65:
	-#line 636 "parser.y" /* yacc.c:1646 */
	+#line 624 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 4133 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4121 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 66:
	-#line 639 "parser.y" /* yacc.c:1646 */
	+#line 627 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-3]), n_FINALLY);
	(yyvsp[-3])->appendChild((yyvsp[-1]));
	NMORE((yyvsp[-3]), (yyvsp[0]));
	(yyval) = (yyvsp[-3]);
	}
	-#line 4144 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4132 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 67:
	-#line 649 "parser.y" /* yacc.c:1646 */
	+#line 637 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CATCH_LIST);
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 4153 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4141 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 68:
	-#line 653 "parser.y" /* yacc.c:1646 */
	+#line 641 "parser.y" /* yacc.c:1646 */
	{
	(yyvsp[-1])->appendChild((yyvsp[0]));
	(yyval) = (yyvsp[-1]);
	}
	-#line 4162 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4150 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 69:
	-#line 661 "parser.y" /* yacc.c:1646 */
	+#line 649 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-7]), n_CATCH);
	(yyvsp[-7])->appendChild((yyvsp[-5]));
	@@ -4171,45 +4159,45 @@
	NMORE((yyvsp[-7]), (yyvsp[0]));
	(yyval) = (yyvsp[-7]);
	}
	-#line 4175 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4163 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 70:
	-#line 672 "parser.y" /* yacc.c:1646 */
	+#line 660 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNSET_LIST);
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 4184 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4172 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 71:
	-#line 676 "parser.y" /* yacc.c:1646 */
	+#line 664 "parser.y" /* yacc.c:1646 */
	{
	(yyvsp[-2])->appendChild((yyvsp[0]));
	(yyval) = (yyvsp[-2]);
	}
	-#line 4193 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4181 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 75:
	-#line 695 "parser.y" /* yacc.c:1646 */
	+#line 683 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 4201 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4189 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 76:
	-#line 698 "parser.y" /* yacc.c:1646 */
	+#line 686 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_REFERENCE);
	}
	-#line 4209 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4197 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 77:
	-#line 705 "parser.y" /* yacc.c:1646 */
	+#line 693 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyvsp[-8]), n_FUNCTION_DECLARATION, (yyvsp[0]));
	(yyvsp[-8])->appendChild(NNEW(n_EMPTY));
	@@ -4221,11 +4209,11 @@

	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-8]));
	}
	-#line 4225 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4213 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 78:
	-#line 720 "parser.y" /* yacc.c:1646 */
	+#line 708 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_DECLARATION);
	(yyval)->appendChild((yyvsp[-6]));
	@@ -4237,11 +4225,11 @@

	(yyval) = NNEW(n_STATEMENT)->appendChild((yyval));
	}
	-#line 4241 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4229 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 79:
	-#line 731 "parser.y" /* yacc.c:1646 */
	+#line 719 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INTERFACE_DECLARATION);
	(yyval)->appendChild(NNEW(n_CLASS_ATTRIBUTES));
	@@ -4254,20 +4242,20 @@

	(yyval) = NNEW(n_STATEMENT)->appendChild((yyval));
	}
	-#line 4258 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4246 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 80:
	-#line 746 "parser.y" /* yacc.c:1646 */
	+#line 734 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[0]), n_CLASS_ATTRIBUTES);
	(yyval) = (yyvsp[0]);
	}
	-#line 4267 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4255 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 81:
	-#line 750 "parser.y" /* yacc.c:1646 */
	+#line 738 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[0]), n_CLASS_ATTRIBUTES);
	NMORE((yyvsp[0]), (yyvsp[-1]));
	@@ -4275,11 +4263,11 @@

	(yyval) = (yyvsp[0]);
	}
	-#line 4279 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4267 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 82:
	-#line 757 "parser.y" /* yacc.c:1646 */
	+#line 745 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[0]), n_CLASS_ATTRIBUTES);
	NMORE((yyvsp[0]), (yyvsp[-1]));
	@@ -4287,155 +4275,155 @@

	(yyval) = (yyvsp[0]);
	}
	-#line 4291 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4279 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 83:
	-#line 764 "parser.y" /* yacc.c:1646 */
	+#line 752 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_ATTRIBUTES);
	(yyval)->appendChild(NTYPE((yyvsp[0]), n_STRING));
	}
	-#line 4300 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4288 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 84:
	-#line 771 "parser.y" /* yacc.c:1646 */
	+#line 759 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 4308 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4296 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 85:
	-#line 774 "parser.y" /* yacc.c:1646 */
	+#line 762 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[-1]), n_EXTENDS_LIST)->appendChild((yyvsp[0]));
	}
	-#line 4316 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4304 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 87:
	-#line 784 "parser.y" /* yacc.c:1646 */
	+#line 772 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 4324 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4312 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 88:
	-#line 787 "parser.y" /* yacc.c:1646 */
	+#line 775 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_EXTENDS_LIST);
	(yyvsp[-1])->appendChildren((yyvsp[0]));
	(yyval) = (yyvsp[-1]);
	}
	-#line 4334 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4322 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 89:
	-#line 795 "parser.y" /* yacc.c:1646 */
	+#line 783 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 4342 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4330 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 90:
	-#line 798 "parser.y" /* yacc.c:1646 */
	+#line 786 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_IMPLEMENTS_LIST);
	(yyvsp[-1])->appendChildren((yyvsp[0]));
	(yyval) = (yyvsp[-1]);
	}
	-#line 4352 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4340 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 91:
	-#line 806 "parser.y" /* yacc.c:1646 */
	+#line 794 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_IMPLEMENTS_LIST)->appendChild((yyvsp[0]));
	}
	-#line 4360 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4348 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 92:
	-#line 809 "parser.y" /* yacc.c:1646 */
	+#line 797 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[-2])->appendChild((yyvsp[0]));
	}
	-#line 4368 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4356 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 93:
	-#line 815 "parser.y" /* yacc.c:1646 */
	+#line 803 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 4376 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4364 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 94:
	-#line 818 "parser.y" /* yacc.c:1646 */
	+#line 806 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[0]);
	}
	-#line 4384 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4372 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 96:
	-#line 825 "parser.y" /* yacc.c:1646 */
	+#line 813 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_VARIABLE_REFERENCE);
	(yyvsp[-1])->appendChild((yyvsp[0]));
	(yyval) = (yyvsp[-1]);
	}
	-#line 4394 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4382 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 98:
	-#line 834 "parser.y" /* yacc.c:1646 */
	+#line 822 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[-2]), (yyvsp[-3]));
	NMORE((yyvsp[-2]), (yyvsp[0]));
	(yyval) = (yyvsp[-2]);
	}
	-#line 4404 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4392 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 100:
	-#line 843 "parser.y" /* yacc.c:1646 */
	+#line 831 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[-2]), (yyvsp[-3]));
	NMORE((yyvsp[-2]), (yyvsp[0]));
	(yyval) = (yyvsp[-2]);
	}
	-#line 4414 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4402 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 102:
	-#line 852 "parser.y" /* yacc.c:1646 */
	+#line 840 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[-2]), (yyvsp[-3]));
	NMORE((yyvsp[-2]), (yyvsp[0]));
	(yyval) = (yyvsp[-2]);
	}
	-#line 4424 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4412 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 103:
	-#line 860 "parser.y" /* yacc.c:1646 */
	+#line 848 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_DECLARE_DECLARATION);
	(yyval)->appendChild(NTYPE((yyvsp[-2]), n_STRING));
	(yyval)->appendChild((yyvsp[0]));
	(yyval) = NNEW(n_DECLARE_DECLARATION_LIST)->appendChild((yyval));
	}
	-#line 4435 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4423 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 104:
	-#line 866 "parser.y" /* yacc.c:1646 */
	+#line 854 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_DECLARE_DECLARATION);
	(yyval)->appendChild(NTYPE((yyvsp[-2]), n_STRING));
	@@ -4444,19 +4432,19 @@
	(yyvsp[-4])->appendChild((yyval));
	(yyval) = (yyvsp[-4]);
	}
	-#line 4448 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4436 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 105:
	-#line 877 "parser.y" /* yacc.c:1646 */
	+#line 865 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
	}
	-#line 4456 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4444 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 106:
	-#line 880 "parser.y" /* yacc.c:1646 */
	+#line 868 "parser.y" /* yacc.c:1646 */
	{
	// ...why does this rule exist?

	@@ -4467,21 +4455,21 @@
	(yyval)->appendChildren((yyvsp[-1]));
	NEXPAND((yyvsp[-3]), (yyval), (yyvsp[0]));
	}
	-#line 4471 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4459 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 107:
	-#line 890 "parser.y" /* yacc.c:1646 */
	+#line 878 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[-2]), (yyvsp[0]));
	NMORE((yyvsp[-2]), (yyvsp[-3]));
	(yyval) = (yyvsp[-2]);
	}
	-#line 4481 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4469 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 108:
	-#line 895 "parser.y" /* yacc.c:1646 */
	+#line 883 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-3]), n_STATEMENT);
	(yyvsp[-4])->appendChild(NNEW(n_EMPTY));
	@@ -4491,19 +4479,19 @@
	NMORE((yyval), (yyvsp[0]));
	NMORE((yyval), (yyvsp[-4]));
	}
	-#line 4495 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4483 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 109:
	-#line 907 "parser.y" /* yacc.c:1646 */
	+#line 895 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_STATEMENT_LIST);
	}
	-#line 4503 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4491 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 110:
	-#line 910 "parser.y" /* yacc.c:1646 */
	+#line 898 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-3]), n_CASE);
	(yyvsp[-3])->appendChild((yyvsp[-2]));
	@@ -4512,11 +4500,11 @@
	(yyvsp[-4])->appendChild((yyvsp[-3]));
	(yyval) = (yyvsp[-4]);
	}
	-#line 4516 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4504 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 111:
	-#line 918 "parser.y" /* yacc.c:1646 */
	+#line 906 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_DEFAULT);
	(yyvsp[-2])->appendChild((yyvsp[0]));
	@@ -4524,29 +4512,29 @@
	(yyvsp[-3])->appendChild((yyvsp[-2]));
	(yyval) = (yyvsp[-3]);
	}
	-#line 4528 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4516 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 115:
	-#line 934 "parser.y" /* yacc.c:1646 */
	+#line 922 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[-2]), (yyvsp[0]));
	NMORE((yyvsp[-2]), (yyvsp[-3]));
	(yyval) = (yyvsp[-2]);
	}
	-#line 4538 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4526 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 116:
	-#line 942 "parser.y" /* yacc.c:1646 */
	+#line 930 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CONDITION_LIST);
	}
	-#line 4546 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4534 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 117:
	-#line 945 "parser.y" /* yacc.c:1646 */
	+#line 933 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-4]), n_ELSEIF);
	(yyvsp[-4])->appendChild(NSPAN((yyvsp[-3]), n_CONTROL_CONDITION, (yyvsp[-1]))->appendChild((yyvsp[-2])));
	@@ -4554,19 +4542,19 @@

	(yyval) = (yyvsp[-5])->appendChild((yyvsp[-4]));
	}
	-#line 4558 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4546 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 118:
	-#line 955 "parser.y" /* yacc.c:1646 */
	+#line 943 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CONDITION_LIST);
	}
	-#line 4566 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4554 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 119:
	-#line 958 "parser.y" /* yacc.c:1646 */
	+#line 946 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-5]), n_ELSEIF);
	(yyvsp[-5])->appendChild((yyvsp[-3]));
	@@ -4574,55 +4562,55 @@

	(yyval) = (yyvsp[-6])->appendChild((yyvsp[-5]));
	}
	-#line 4578 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4566 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 120:
	-#line 968 "parser.y" /* yacc.c:1646 */
	+#line 956 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 4586 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4574 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 121:
	-#line 971 "parser.y" /* yacc.c:1646 */
	+#line 959 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_ELSE);
	(yyvsp[-1])->appendChild((yyvsp[0]));
	(yyval) = (yyvsp[-1]);
	}
	-#line 4596 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4584 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 122:
	-#line 979 "parser.y" /* yacc.c:1646 */
	+#line 967 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 4604 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4592 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 123:
	-#line 982 "parser.y" /* yacc.c:1646 */
	+#line 970 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_ELSE);
	(yyvsp[-2])->appendChild((yyvsp[0]));
	(yyval) = (yyvsp[-2]);
	}
	-#line 4614 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4602 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 125:
	-#line 991 "parser.y" /* yacc.c:1646 */
	+#line 979 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_DECLARATION_PARAMETER_LIST);
	}
	-#line 4622 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4610 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 126:
	-#line 997 "parser.y" /* yacc.c:1646 */
	+#line 985 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_DECLARATION_PARAMETER);
	(yyval)->appendChild((yyvsp[-1]));
	@@ -4631,11 +4619,11 @@

	(yyval) = NNEW(n_DECLARATION_PARAMETER_LIST)->appendChild((yyval));
	}
	-#line 4635 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4623 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 127:
	-#line 1005 "parser.y" /* yacc.c:1646 */
	+#line 993 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_DECLARATION_PARAMETER);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -4645,11 +4633,11 @@

	(yyval) = NNEW(n_DECLARATION_PARAMETER_LIST)->appendChild((yyval));
	}
	-#line 4649 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4637 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 128:
	-#line 1014 "parser.y" /* yacc.c:1646 */
	+#line 1002 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_DECLARATION_PARAMETER);
	(yyval)->appendChild((yyvsp[-4]));
	@@ -4659,11 +4647,11 @@

	(yyval) = NNEW(n_DECLARATION_PARAMETER_LIST)->appendChild((yyval));
	}
	-#line 4663 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4651 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 129:
	-#line 1023 "parser.y" /* yacc.c:1646 */
	+#line 1011 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_DECLARATION_PARAMETER);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -4672,11 +4660,11 @@

	(yyval) = NNEW(n_DECLARATION_PARAMETER_LIST)->appendChild((yyval));
	}
	-#line 4676 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4664 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 130:
	-#line 1031 "parser.y" /* yacc.c:1646 */
	+#line 1019 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_DECLARATION_PARAMETER);
	(yyval)->appendChild((yyvsp[-1]));
	@@ -4685,11 +4673,11 @@

	(yyval) = (yyvsp[-3])->appendChild((yyval));
	}
	-#line 4689 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4677 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 131:
	-#line 1039 "parser.y" /* yacc.c:1646 */
	+#line 1027 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_DECLARATION_PARAMETER);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -4699,11 +4687,11 @@

	(yyval) = (yyvsp[-4])->appendChild((yyval));
	}
	-#line 4703 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4691 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 132:
	-#line 1049 "parser.y" /* yacc.c:1646 */
	+#line 1037 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_DECLARATION_PARAMETER);
	(yyval)->appendChild((yyvsp[-4]));
	@@ -4713,11 +4701,11 @@

	(yyval) = (yyvsp[-6])->appendChild((yyval));
	}
	-#line 4717 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4705 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 133:
	-#line 1059 "parser.y" /* yacc.c:1646 */
	+#line 1047 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_DECLARATION_PARAMETER);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -4726,147 +4714,147 @@

	(yyval) = (yyvsp[-5])->appendChild((yyval));
	}
	-#line 4730 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4718 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 134:
	-#line 1070 "parser.y" /* yacc.c:1646 */
	+#line 1058 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 4738 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4726 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 135:
	-#line 1073 "parser.y" /* yacc.c:1646 */
	+#line 1061 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[0]);
	}
	-#line 4746 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4734 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 136:
	-#line 1076 "parser.y" /* yacc.c:1646 */
	+#line 1064 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_TYPE_NAME);
	}
	-#line 4754 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4742 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 137:
	-#line 1079 "parser.y" /* yacc.c:1646 */
	+#line 1067 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_TYPE_NAME);
	}
	-#line 4762 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4750 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 139:
	-#line 1086 "parser.y" /* yacc.c:1646 */
	+#line 1074 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CALL_PARAMETER_LIST);
	}
	-#line 4770 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4758 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 140:
	-#line 1092 "parser.y" /* yacc.c:1646 */
	+#line 1080 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CALL_PARAMETER_LIST)->appendChild((yyvsp[0]));
	}
	-#line 4778 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4766 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 141:
	-#line 1095 "parser.y" /* yacc.c:1646 */
	+#line 1083 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CALL_PARAMETER_LIST)->appendChild((yyvsp[0]));
	}
	-#line 4786 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4774 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 142:
	-#line 1098 "parser.y" /* yacc.c:1646 */
	+#line 1086 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_VARIABLE_REFERENCE);
	(yyvsp[-1])->appendChild((yyvsp[0]));
	(yyval) = NNEW(n_CALL_PARAMETER_LIST)->appendChild((yyvsp[-1]));
	}
	-#line 4796 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4784 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 143:
	-#line 1103 "parser.y" /* yacc.c:1646 */
	+#line 1091 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[-2])->appendChild((yyvsp[0]));
	}
	-#line 4804 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4792 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 144:
	-#line 1106 "parser.y" /* yacc.c:1646 */
	+#line 1094 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[-2])->appendChild((yyvsp[0]));
	}
	-#line 4812 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4800 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 145:
	-#line 1109 "parser.y" /* yacc.c:1646 */
	+#line 1097 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_VARIABLE_REFERENCE);
	(yyvsp[-1])->appendChild((yyvsp[0]));
	(yyval) = (yyvsp[-3])->appendChild((yyvsp[-1]));
	}
	-#line 4822 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4810 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 146:
	-#line 1117 "parser.y" /* yacc.c:1646 */
	+#line 1105 "parser.y" /* yacc.c:1646 */
	{
	(yyvsp[-2])->appendChild((yyvsp[0]));
	(yyval) = (yyvsp[-2]);
	}
	-#line 4831 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4819 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 147:
	-#line 1121 "parser.y" /* yacc.c:1646 */
	+#line 1109 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_GLOBAL_DECLARATION_LIST);
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 4840 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4828 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 148:
	-#line 1128 "parser.y" /* yacc.c:1646 */
	+#line 1116 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_VARIABLE);
	}
	-#line 4848 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4836 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 149:
	-#line 1131 "parser.y" /* yacc.c:1646 */
	+#line 1119 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[-1]), n_VARIABLE_VARIABLE);
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 4857 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4845 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 150:
	-#line 1135 "parser.y" /* yacc.c:1646 */
	+#line 1123 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[-3]), n_VARIABLE_VARIABLE);
	(yyval)->appendChild((yyvsp[-1]));
	}
	-#line 4866 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4854 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 151:
	-#line 1142 "parser.y" /* yacc.c:1646 */
	+#line 1130 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[0]), n_VARIABLE);
	(yyval) = NNEW(n_STATIC_DECLARATION);
	@@ -4875,11 +4863,11 @@

	(yyval) = (yyvsp[-2])->appendChild((yyval));
	}
	-#line 4879 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4867 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 152:
	-#line 1150 "parser.y" /* yacc.c:1646 */
	+#line 1138 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_VARIABLE);
	(yyval) = NNEW(n_STATIC_DECLARATION);
	@@ -4888,11 +4876,11 @@

	(yyval) = (yyvsp[-4])->appendChild((yyval));
	}
	-#line 4892 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4880 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 153:
	-#line 1158 "parser.y" /* yacc.c:1646 */
	+#line 1146 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[0]), n_VARIABLE);
	(yyval) = NNEW(n_STATIC_DECLARATION);
	@@ -4901,11 +4889,11 @@

	(yyval) = NNEW(n_STATIC_DECLARATION_LIST)->appendChild((yyval));
	}
	-#line 4905 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4893 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 154:
	-#line 1166 "parser.y" /* yacc.c:1646 */
	+#line 1154 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_VARIABLE);
	(yyval) = NNEW(n_STATIC_DECLARATION);
	@@ -4914,27 +4902,27 @@

	(yyval) = NNEW(n_STATIC_DECLARATION_LIST)->appendChild((yyval));
	}
	-#line 4918 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4906 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 155:
	-#line 1177 "parser.y" /* yacc.c:1646 */
	+#line 1165 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[-1])->appendChild((yyvsp[0]));
	}
	-#line 4926 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4914 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 156:
	-#line 1180 "parser.y" /* yacc.c:1646 */
	+#line 1168 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_STATEMENT_LIST);
	}
	-#line 4934 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4922 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 157:
	-#line 1186 "parser.y" /* yacc.c:1646 */
	+#line 1174 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_MEMBER_DECLARATION_LIST);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -4943,36 +4931,36 @@
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyval));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 4947 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4935 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 158:
	-#line 1194 "parser.y" /* yacc.c:1646 */
	+#line 1182 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_STATEMENT)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 4956 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4944 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 159:
	-#line 1198 "parser.y" /* yacc.c:1646 */
	+#line 1186 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[0]);
	}
	-#line 4964 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4952 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 160:
	-#line 1201 "parser.y" /* yacc.c:1646 */
	+#line 1189 "parser.y" /* yacc.c:1646 */
	{
	/* empty */
	}
	-#line 4972 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4960 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 161:
	-#line 1203 "parser.y" /* yacc.c:1646 */
	+#line 1191 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_METHOD_DECLARATION);
	NMORE((yyval), (yyvsp[-7]));
	@@ -4985,256 +4973,256 @@

	(yyval) = NNEW(n_STATEMENT)->appendChild((yyval));
	}
	-#line 4989 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4977 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 162:
	-#line 1218 "parser.y" /* yacc.c:1646 */
	+#line 1206 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[-2]), n_TRAIT_USE);
	(yyval)->appendChildren((yyvsp[-1]));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 4999 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4987 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 163:
	-#line 1226 "parser.y" /* yacc.c:1646 */
	+#line 1214 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_TRAIT_USE_LIST)->appendChild((yyvsp[0]));
	}
	-#line 5007 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 4995 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 164:
	-#line 1229 "parser.y" /* yacc.c:1646 */
	+#line 1217 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[-2])->appendChild((yyvsp[0]));
	}
	-#line 5015 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5003 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 165:
	-#line 1235 "parser.y" /* yacc.c:1646 */
	+#line 1223 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 5023 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5011 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 166:
	-#line 1238 "parser.y" /* yacc.c:1646 */
	+#line 1226 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
	}
	-#line 5031 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5019 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 167:
	-#line 1244 "parser.y" /* yacc.c:1646 */
	+#line 1232 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_TRAIT_ADAPTATION_LIST);
	}
	-#line 5039 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5027 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 168:
	-#line 1247 "parser.y" /* yacc.c:1646 */
	+#line 1235 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[0]);
	}
	-#line 5047 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5035 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 169:
	-#line 1253 "parser.y" /* yacc.c:1646 */
	+#line 1241 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_TRAIT_ADAPTATION_LIST);
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5056 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5044 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 170:
	-#line 1257 "parser.y" /* yacc.c:1646 */
	+#line 1245 "parser.y" /* yacc.c:1646 */
	{
	(yyvsp[-1])->appendChild((yyvsp[0]));
	(yyval) = (yyvsp[-1]);
	}
	-#line 5065 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5053 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 171:
	-#line 1264 "parser.y" /* yacc.c:1646 */
	+#line 1252 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NMORE((yyvsp[-1]), (yyvsp[0]));
	}
	-#line 5073 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5061 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 172:
	-#line 1267 "parser.y" /* yacc.c:1646 */
	+#line 1255 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NMORE((yyvsp[-1]), (yyvsp[0]));
	}
	-#line 5081 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5069 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 173:
	-#line 1273 "parser.y" /* yacc.c:1646 */
	+#line 1261 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_TRAIT_INSTEADOF);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5091 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5079 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 174:
	-#line 1281 "parser.y" /* yacc.c:1646 */
	+#line 1269 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_TRAIT_REFERENCE_LIST);
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5100 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5088 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 175:
	-#line 1285 "parser.y" /* yacc.c:1646 */
	+#line 1273 "parser.y" /* yacc.c:1646 */
	{
	(yyvsp[-2])->appendChild((yyvsp[0]));
	(yyval) = (yyvsp[-2]);
	}
	-#line 5109 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5097 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 176:
	-#line 1292 "parser.y" /* yacc.c:1646 */
	+#line 1280 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_TRAIT_METHOD_REFERENCE);
	(yyval)->appendChild(NTYPE((yyvsp[0]), n_STRING));
	}
	-#line 5118 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5106 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 177:
	-#line 1296 "parser.y" /* yacc.c:1646 */
	+#line 1284 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[0]);
	}
	-#line 5126 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5114 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 178:
	-#line 1302 "parser.y" /* yacc.c:1646 */
	+#line 1290 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_TRAIT_METHOD_REFERENCE);
	NEXPAND((yyvsp[-2]), (yyvsp[-1]), NTYPE((yyvsp[0]), n_STRING));
	(yyval) = (yyvsp[-1]);
	}
	-#line 5136 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5124 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 179:
	-#line 1310 "parser.y" /* yacc.c:1646 */
	+#line 1298 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_TRAIT_AS);
	(yyval)->appendChild((yyvsp[-3]));
	(yyval)->appendChild((yyvsp[-1]));
	(yyval)->appendChild(NTYPE((yyvsp[0]), n_STRING));
	}
	-#line 5147 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5135 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 180:
	-#line 1316 "parser.y" /* yacc.c:1646 */
	+#line 1304 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_TRAIT_AS);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild((yyvsp[0]));
	(yyval)->appendChild(NNEW(n_EMPTY));
	}
	-#line 5158 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5146 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 181:
	-#line 1325 "parser.y" /* yacc.c:1646 */
	+#line 1313 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 5166 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5154 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 182:
	-#line 1328 "parser.y" /* yacc.c:1646 */
	+#line 1316 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_METHOD_MODIFIER_LIST);
	(yyval)->appendChild(NTYPE((yyvsp[0]), n_STRING));
	}
	-#line 5175 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5163 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 183:
	-#line 1336 "parser.y" /* yacc.c:1646 */
	+#line 1324 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 5183 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5171 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 184:
	-#line 1339 "parser.y" /* yacc.c:1646 */
	+#line 1327 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
	}
	-#line 5191 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5179 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 186:
	-#line 1346 "parser.y" /* yacc.c:1646 */
	+#line 1334 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_MEMBER_MODIFIER_LIST);
	(yyval)->appendChild(NTYPE((yyvsp[0]), n_STRING));
	}
	-#line 5200 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5188 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 187:
	-#line 1353 "parser.y" /* yacc.c:1646 */
	+#line 1341 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_METHOD_MODIFIER_LIST);
	}
	-#line 5208 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5196 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 188:
	-#line 1356 "parser.y" /* yacc.c:1646 */
	+#line 1344 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[0]), n_METHOD_MODIFIER_LIST);
	(yyval) = (yyvsp[0]);
	}
	-#line 5217 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5205 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 189:
	-#line 1363 "parser.y" /* yacc.c:1646 */
	+#line 1351 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_MEMBER_MODIFIER_LIST);
	(yyval)->appendChild(NTYPE((yyvsp[0]), n_STRING));
	}
	-#line 5226 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5214 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 190:
	-#line 1367 "parser.y" /* yacc.c:1646 */
	+#line 1355 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[-1])->appendChild(NTYPE((yyvsp[0]), n_STRING));
	}
	-#line 5234 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5222 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 197:
	-#line 1382 "parser.y" /* yacc.c:1646 */
	+#line 1370 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_MEMBER_DECLARATION);
	(yyval)->appendChild(NTYPE((yyvsp[0]), n_VARIABLE));
	@@ -5242,11 +5230,11 @@

	(yyval) = (yyvsp[-2])->appendChild((yyval));
	}
	-#line 5246 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5234 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 198:
	-#line 1389 "parser.y" /* yacc.c:1646 */
	+#line 1377 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_MEMBER_DECLARATION);
	(yyval)->appendChild(NTYPE((yyvsp[-2]), n_VARIABLE));
	@@ -5254,11 +5242,11 @@

	(yyval) = (yyvsp[-4])->appendChild((yyval));
	}
	-#line 5258 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5246 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 199:
	-#line 1396 "parser.y" /* yacc.c:1646 */
	+#line 1384 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_MEMBER_DECLARATION);
	(yyval)->appendChild(NTYPE((yyvsp[0]), n_VARIABLE));
	@@ -5266,11 +5254,11 @@

	(yyval) = NNEW(n_CLASS_MEMBER_DECLARATION_LIST)->appendChild((yyval));
	}
	-#line 5270 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5258 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 200:
	-#line 1403 "parser.y" /* yacc.c:1646 */
	+#line 1391 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_MEMBER_DECLARATION);
	(yyval)->appendChild(NTYPE((yyvsp[-2]), n_VARIABLE));
	@@ -5278,11 +5266,11 @@

	(yyval) = NNEW(n_CLASS_MEMBER_DECLARATION_LIST)->appendChild((yyval));
	}
	-#line 5282 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5270 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 201:
	-#line 1413 "parser.y" /* yacc.c:1646 */
	+#line 1401 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_CONSTANT_DECLARATION);
	(yyval)->appendChild(NTYPE((yyvsp[-2]), n_STRING));
	@@ -5292,11 +5280,11 @@

	(yyval) = (yyvsp[-4]);
	}
	-#line 5296 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5284 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 202:
	-#line 1422 "parser.y" /* yacc.c:1646 */
	+#line 1410 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-3]), n_CLASS_CONSTANT_DECLARATION_LIST);
	(yyval) = NNEW(n_CLASS_CONSTANT_DECLARATION);
	@@ -5306,53 +5294,53 @@

	(yyval) = (yyvsp[-3]);
	}
	-#line 5310 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5298 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 203:
	-#line 1434 "parser.y" /* yacc.c:1646 */
	+#line 1422 "parser.y" /* yacc.c:1646 */
	{
	(yyvsp[-2])->appendChild((yyvsp[0]));
	}
	-#line 5318 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5306 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 204:
	-#line 1437 "parser.y" /* yacc.c:1646 */
	+#line 1425 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ECHO_LIST);
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5327 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5315 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 205:
	-#line 1444 "parser.y" /* yacc.c:1646 */
	+#line 1432 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 5335 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5323 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 207:
	-#line 1452 "parser.y" /* yacc.c:1646 */
	+#line 1440 "parser.y" /* yacc.c:1646 */
	{
	(yyvsp[-2])->appendChild((yyvsp[0]));
	}
	-#line 5343 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5331 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 208:
	-#line 1455 "parser.y" /* yacc.c:1646 */
	+#line 1443 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EXPRESSION_LIST);
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5352 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5340 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 209:
	-#line 1462 "parser.y" /* yacc.c:1646 */
	+#line 1450 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-5]), n_LIST);
	(yyvsp[-5])->appendChild(NEXPAND((yyvsp[-4]), (yyvsp[-3]), (yyvsp[-2])));
	@@ -5361,22 +5349,22 @@
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5365 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5353 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 210:
	-#line 1470 "parser.y" /* yacc.c:1646 */
	+#line 1458 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5376 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5364 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 211:
	-#line 1476 "parser.y" /* yacc.c:1646 */
	+#line 1464 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -5387,11 +5375,11 @@

	(yyval)->appendChild((yyvsp[-1]));
	}
	-#line 5391 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5379 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 212:
	-#line 1486 "parser.y" /* yacc.c:1646 */
	+#line 1474 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-5]));
	@@ -5406,270 +5394,270 @@

	(yyval)->appendChild((yyvsp[-3]));
	}
	-#line 5410 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5398 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 213:
	-#line 1500 "parser.y" /* yacc.c:1646 */
	+#line 1488 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5420 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5408 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 214:
	-#line 1505 "parser.y" /* yacc.c:1646 */
	+#line 1493 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5431 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5419 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 215:
	-#line 1511 "parser.y" /* yacc.c:1646 */
	+#line 1499 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5442 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5430 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 216:
	-#line 1517 "parser.y" /* yacc.c:1646 */
	+#line 1505 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5453 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5441 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 217:
	-#line 1523 "parser.y" /* yacc.c:1646 */
	+#line 1511 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5464 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5452 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 218:
	-#line 1529 "parser.y" /* yacc.c:1646 */
	+#line 1517 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5475 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5463 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 219:
	-#line 1535 "parser.y" /* yacc.c:1646 */
	+#line 1523 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5486 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5474 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 220:
	-#line 1541 "parser.y" /* yacc.c:1646 */
	+#line 1529 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5497 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5485 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 221:
	-#line 1547 "parser.y" /* yacc.c:1646 */
	+#line 1535 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5508 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5496 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 222:
	-#line 1553 "parser.y" /* yacc.c:1646 */
	+#line 1541 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5519 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5507 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 223:
	-#line 1559 "parser.y" /* yacc.c:1646 */
	+#line 1547 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5530 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5518 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 224:
	-#line 1565 "parser.y" /* yacc.c:1646 */
	+#line 1553 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5541 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5529 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 225:
	-#line 1571 "parser.y" /* yacc.c:1646 */
	+#line 1559 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNARY_POSTFIX_EXPRESSION);
	(yyval)->appendChild((yyvsp[-1]));
	(yyval)->appendChild(NTYPE((yyvsp[0]), n_OPERATOR));
	}
	-#line 5551 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5539 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 226:
	-#line 1576 "parser.y" /* yacc.c:1646 */
	+#line 1564 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5561 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5549 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 227:
	-#line 1581 "parser.y" /* yacc.c:1646 */
	+#line 1569 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNARY_POSTFIX_EXPRESSION);
	(yyval)->appendChild((yyvsp[-1]));
	(yyval)->appendChild(NTYPE((yyvsp[0]), n_OPERATOR));
	}
	-#line 5571 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5559 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 228:
	-#line 1586 "parser.y" /* yacc.c:1646 */
	+#line 1574 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5581 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5569 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 229:
	-#line 1591 "parser.y" /* yacc.c:1646 */
	+#line 1579 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5592 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5580 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 230:
	-#line 1597 "parser.y" /* yacc.c:1646 */
	+#line 1585 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5603 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5591 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 231:
	-#line 1603 "parser.y" /* yacc.c:1646 */
	+#line 1591 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5614 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5602 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 232:
	-#line 1609 "parser.y" /* yacc.c:1646 */
	+#line 1597 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5625 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5613 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 233:
	-#line 1615 "parser.y" /* yacc.c:1646 */
	+#line 1603 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5636 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5624 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 234:
	-#line 1621 "parser.y" /* yacc.c:1646 */
	+#line 1609 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5647 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5635 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 235:
	-#line 1627 "parser.y" /* yacc.c:1646 */
	+#line 1615 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5658 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5646 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 236:
	-#line 1633 "parser.y" /* yacc.c:1646 */
	+#line 1621 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5669 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5657 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 237:
	-#line 1639 "parser.y" /* yacc.c:1646 */
	+#line 1627 "parser.y" /* yacc.c:1646 */
	{

	/* The concatenation operator generates n_CONCATENATION_LIST instead of
	@@ -5696,369 +5684,369 @@
	(yyval)->appendChild((yyvsp[0]));
	}
	}
	-#line 5700 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5688 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 238:
	-#line 1665 "parser.y" /* yacc.c:1646 */
	+#line 1653 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5711 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5699 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 239:
	-#line 1671 "parser.y" /* yacc.c:1646 */
	+#line 1659 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5722 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5710 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 240:
	-#line 1677 "parser.y" /* yacc.c:1646 */
	+#line 1665 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5733 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5721 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 241:
	-#line 1683 "parser.y" /* yacc.c:1646 */
	+#line 1671 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5744 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5732 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 242:
	-#line 1689 "parser.y" /* yacc.c:1646 */
	+#line 1677 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5755 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5743 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 243:
	-#line 1695 "parser.y" /* yacc.c:1646 */
	+#line 1683 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5766 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5754 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 244:
	-#line 1701 "parser.y" /* yacc.c:1646 */
	+#line 1689 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5777 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5765 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 245:
	-#line 1707 "parser.y" /* yacc.c:1646 */
	+#line 1695 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5787 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5775 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 246:
	-#line 1712 "parser.y" /* yacc.c:1646 */
	+#line 1700 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5797 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5785 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 247:
	-#line 1717 "parser.y" /* yacc.c:1646 */
	+#line 1705 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5807 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5795 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 248:
	-#line 1722 "parser.y" /* yacc.c:1646 */
	+#line 1710 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5817 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5805 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 249:
	-#line 1727 "parser.y" /* yacc.c:1646 */
	+#line 1715 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5828 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5816 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 250:
	-#line 1733 "parser.y" /* yacc.c:1646 */
	+#line 1721 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5839 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5827 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 251:
	-#line 1739 "parser.y" /* yacc.c:1646 */
	+#line 1727 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5850 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5838 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 252:
	-#line 1745 "parser.y" /* yacc.c:1646 */
	+#line 1733 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5861 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5849 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 253:
	-#line 1751 "parser.y" /* yacc.c:1646 */
	+#line 1739 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5872 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5860 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 254:
	-#line 1757 "parser.y" /* yacc.c:1646 */
	+#line 1745 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5883 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5871 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 255:
	-#line 1763 "parser.y" /* yacc.c:1646 */
	+#line 1751 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5894 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5882 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 256:
	-#line 1769 "parser.y" /* yacc.c:1646 */
	+#line 1757 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5905 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5893 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 257:
	-#line 1775 "parser.y" /* yacc.c:1646 */
	+#line 1763 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5916 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5904 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 260:
	-#line 1783 "parser.y" /* yacc.c:1646 */
	+#line 1771 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_TERNARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-4]));
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5927 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5915 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 261:
	-#line 1789 "parser.y" /* yacc.c:1646 */
	+#line 1777 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_TERNARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-3]));
	(yyval)->appendChild(NNEW(n_EMPTY));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5938 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5926 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 263:
	-#line 1796 "parser.y" /* yacc.c:1646 */
	+#line 1784 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CAST_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5948 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5936 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 264:
	-#line 1801 "parser.y" /* yacc.c:1646 */
	+#line 1789 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CAST_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5958 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5946 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 265:
	-#line 1806 "parser.y" /* yacc.c:1646 */
	+#line 1794 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CAST_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5968 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5956 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 266:
	-#line 1811 "parser.y" /* yacc.c:1646 */
	+#line 1799 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CAST_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5978 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5966 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 267:
	-#line 1816 "parser.y" /* yacc.c:1646 */
	+#line 1804 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CAST_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5988 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5976 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 268:
	-#line 1821 "parser.y" /* yacc.c:1646 */
	+#line 1809 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CAST_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 5998 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5986 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 269:
	-#line 1826 "parser.y" /* yacc.c:1646 */
	+#line 1814 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CAST_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 6008 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 5996 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 270:
	-#line 1831 "parser.y" /* yacc.c:1646 */
	+#line 1819 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 6018 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6006 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 271:
	-#line 1836 "parser.y" /* yacc.c:1646 */
	+#line 1824 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 6028 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6016 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 272:
	-#line 1841 "parser.y" /* yacc.c:1646 */
	+#line 1829 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[0]), n_BACKTICKS_EXPRESSION);
	(yyval) = (yyvsp[0]);
	}
	-#line 6037 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6025 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 276:
	-#line 1848 "parser.y" /* yacc.c:1646 */
	+#line 1836 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 6047 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6035 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 277:
	-#line 1853 "parser.y" /* yacc.c:1646 */
	+#line 1841 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[0]), n_YIELD);
	(yyvsp[0])->appendChild(NNEW(n_EMPTY));
	(yyvsp[0])->appendChild(NNEW(n_EMPTY));
	(yyval) = (yyvsp[0]);
	}
	-#line 6058 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6046 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 278:
	-#line 1862 "parser.y" /* yacc.c:1646 */
	+#line 1850 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyvsp[-8]), n_FUNCTION_DECLARATION, (yyvsp[0]));
	(yyvsp[-8])->appendChild(NNEW(n_EMPTY));
	@@ -6070,11 +6058,11 @@

	(yyval) = (yyvsp[-8]);
	}
	-#line 6074 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6062 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 279:
	-#line 1876 "parser.y" /* yacc.c:1646 */
	+#line 1864 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyvsp[-8]), n_FUNCTION_DECLARATION, (yyvsp[0]));
	NMORE((yyvsp[-8]), (yyvsp[-9]));
	@@ -6092,143 +6080,143 @@

	(yyval) = (yyvsp[-8]);
	}
	-#line 6096 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6084 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 280:
	-#line 1896 "parser.y" /* yacc.c:1646 */
	+#line 1884 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_YIELD);
	(yyvsp[0])->appendChild(NNEW(n_EMPTY));
	(yyvsp[-1])->appendChild((yyvsp[0]));
	(yyval) = (yyvsp[-1]);
	}
	-#line 6107 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6095 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 281:
	-#line 1902 "parser.y" /* yacc.c:1646 */
	+#line 1890 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_YIELD);
	(yyvsp[0])->appendChild(NNEW(n_EMPTY));
	(yyvsp[-1])->appendChild((yyvsp[0]));
	(yyval) = (yyvsp[-1]);
	}
	-#line 6118 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6106 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 282:
	-#line 1908 "parser.y" /* yacc.c:1646 */
	+#line 1896 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-3]), n_YIELD);
	(yyvsp[-3])->appendChild((yyvsp[-2]));
	(yyvsp[-3])->appendChild((yyvsp[0]));
	(yyval) = (yyvsp[-3]);
	}
	-#line 6129 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6117 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 283:
	-#line 1914 "parser.y" /* yacc.c:1646 */
	+#line 1902 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-3]), n_YIELD);
	(yyvsp[-3])->appendChild((yyvsp[-2]));
	(yyvsp[-3])->appendChild((yyvsp[0]));
	(yyval) = (yyvsp[-3]);
	}
	-#line 6140 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6128 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 285:
	-#line 1927 "parser.y" /* yacc.c:1646 */
	+#line 1915 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 6148 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6136 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 286:
	-#line 1930 "parser.y" /* yacc.c:1646 */
	+#line 1918 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-3]), n_LEXICAL_VARIABLE_LIST);
	(yyvsp[-3])->appendChildren((yyvsp[-1]));
	(yyval) = (yyvsp[-3]);
	}
	-#line 6158 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6146 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 287:
	-#line 1938 "parser.y" /* yacc.c:1646 */
	+#line 1926 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[-2])->appendChild(NTYPE((yyvsp[0]), n_VARIABLE));
	}
	-#line 6166 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6154 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 288:
	-#line 1941 "parser.y" /* yacc.c:1646 */
	+#line 1929 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_VARIABLE_REFERENCE);
	(yyvsp[-1])->appendChild(NTYPE((yyvsp[0]), n_VARIABLE));
	(yyval) = (yyvsp[-3])->appendChild((yyvsp[-1]));
	}
	-#line 6176 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6164 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 289:
	-#line 1946 "parser.y" /* yacc.c:1646 */
	+#line 1934 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_LEXICAL_VARIABLE_LIST);
	(yyval)->appendChild(NTYPE((yyvsp[0]), n_VARIABLE));
	}
	-#line 6185 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6173 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 290:
	-#line 1950 "parser.y" /* yacc.c:1646 */
	+#line 1938 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_VARIABLE_REFERENCE);
	(yyvsp[-1])->appendChild(NTYPE((yyvsp[0]), n_VARIABLE));
	(yyval) = NNEW(n_LEXICAL_VARIABLE_LIST);
	(yyval)->appendChild((yyvsp[-1]));
	}
	-#line 6196 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6184 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 291:
	-#line 1959 "parser.y" /* yacc.c:1646 */
	+#line 1947 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_FUNCTION_CALL);
	(yyval)->appendChild((yyvsp[-3]));
	(yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
	}
	-#line 6206 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6194 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 292:
	-#line 1965 "parser.y" /* yacc.c:1646 */
	+#line 1953 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[-3]), (yyvsp[-5]));
	(yyval) = NNEW(n_FUNCTION_CALL);
	(yyval)->appendChild((yyvsp[-3]));
	(yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
	}
	-#line 6217 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6205 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 293:
	-#line 1971 "parser.y" /* yacc.c:1646 */
	+#line 1959 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[-3]), (yyvsp[-4]));
	(yyval) = NNEW(n_FUNCTION_CALL);
	(yyval)->appendChild((yyvsp[-3]));
	(yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
	}
	-#line 6228 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6216 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 294:
	-#line 1978 "parser.y" /* yacc.c:1646 */
	+#line 1966 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_STATIC_ACCESS);
	(yyval)->appendChild((yyvsp[-5]));
	@@ -6237,11 +6225,11 @@
	(yyval) = NNEW(n_FUNCTION_CALL)->appendChild((yyval));
	(yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
	}
	-#line 6241 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6229 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 295:
	-#line 1987 "parser.y" /* yacc.c:1646 */
	+#line 1975 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_STATIC_ACCESS);
	(yyval)->appendChild((yyvsp[-5]));
	@@ -6250,11 +6238,11 @@
	(yyval) = NNEW(n_FUNCTION_CALL)->appendChild((yyval));
	(yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
	}
	-#line 6254 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6242 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 296:
	-#line 1996 "parser.y" /* yacc.c:1646 */
	+#line 1984 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_STATIC_ACCESS);
	(yyval)->appendChild((yyvsp[-5]));
	@@ -6263,11 +6251,11 @@
	(yyval) = NNEW(n_FUNCTION_CALL)->appendChild((yyval));
	(yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
	}
	-#line 6267 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6255 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 297:
	-#line 2005 "parser.y" /* yacc.c:1646 */
	+#line 1993 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_STATIC_ACCESS);
	(yyval)->appendChild((yyvsp[-5]));
	@@ -6276,81 +6264,81 @@
	(yyval) = NNEW(n_FUNCTION_CALL)->appendChild((yyval));
	(yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
	}
	-#line 6280 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6268 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 298:
	-#line 2013 "parser.y" /* yacc.c:1646 */
	+#line 2001 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_FUNCTION_CALL);
	(yyval)->appendChild((yyvsp[-3]));
	(yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
	}
	-#line 6290 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6278 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 299:
	-#line 2021 "parser.y" /* yacc.c:1646 */
	+#line 2009 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
	}
	-#line 6298 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6286 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 300:
	-#line 2024 "parser.y" /* yacc.c:1646 */
	+#line 2012 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
	}
	-#line 6306 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6294 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 301:
	-#line 2027 "parser.y" /* yacc.c:1646 */
	+#line 2015 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[0]), (yyvsp[-2]));
	(yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
	}
	-#line 6315 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6303 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 302:
	-#line 2031 "parser.y" /* yacc.c:1646 */
	+#line 2019 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[0]), (yyvsp[-1]));
	(yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
	}
	-#line 6324 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6312 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 303:
	-#line 2038 "parser.y" /* yacc.c:1646 */
	+#line 2026 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
	}
	-#line 6332 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6320 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 304:
	-#line 2041 "parser.y" /* yacc.c:1646 */
	+#line 2029 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[0]), (yyvsp[-2]));
	(yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
	}
	-#line 6341 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6329 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 305:
	-#line 2045 "parser.y" /* yacc.c:1646 */
	+#line 2033 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[0]), (yyvsp[-1]));
	(yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
	}
	-#line 6350 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6338 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 308:
	-#line 2060 "parser.y" /* yacc.c:1646 */
	+#line 2048 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_OBJECT_PROPERTY_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -6363,282 +6351,282 @@
	(yyval)->appendChild(*ii);
	}
	}
	-#line 6367 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6355 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 310:
	-#line 2076 "parser.y" /* yacc.c:1646 */
	+#line 2064 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[-1])->appendChild((yyvsp[0]));
	}
	-#line 6375 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6363 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 311:
	-#line 2079 "parser.y" /* yacc.c:1646 */
	+#line 2067 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 6383 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6371 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 312:
	-#line 2085 "parser.y" /* yacc.c:1646 */
	+#line 2073 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[0]);
	}
	-#line 6391 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6379 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 313:
	-#line 2091 "parser.y" /* yacc.c:1646 */
	+#line 2079 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 6399 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6387 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 314:
	-#line 2094 "parser.y" /* yacc.c:1646 */
	+#line 2082 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyvsp[-1]), n_EMPTY, (yyvsp[0]));
	(yyval) = (yyvsp[-1]);
	}
	-#line 6408 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6396 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 315:
	-#line 2098 "parser.y" /* yacc.c:1646 */
	+#line 2086 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyvsp[-2]), n_PARENTHETICAL_EXPRESSION, (yyvsp[0]));
	(yyvsp[-2])->appendChild((yyvsp[-1]));
	(yyval) = (yyvsp[-2]);
	}
	-#line 6418 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6406 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 316:
	-#line 2106 "parser.y" /* yacc.c:1646 */
	+#line 2094 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 6426 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6414 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 317:
	-#line 2109 "parser.y" /* yacc.c:1646 */
	+#line 2097 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
	}
	-#line 6434 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6422 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 318:
	-#line 2115 "parser.y" /* yacc.c:1646 */
	+#line 2103 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_NUMERIC_SCALAR);
	}
	-#line 6442 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6430 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 319:
	-#line 2118 "parser.y" /* yacc.c:1646 */
	+#line 2106 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_NUMERIC_SCALAR);
	}
	-#line 6450 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6438 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 320:
	-#line 2121 "parser.y" /* yacc.c:1646 */
	+#line 2109 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_STRING_SCALAR);
	}
	-#line 6458 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6446 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 321:
	-#line 2124 "parser.y" /* yacc.c:1646 */
	+#line 2112 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
	}
	-#line 6466 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6454 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 322:
	-#line 2127 "parser.y" /* yacc.c:1646 */
	+#line 2115 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
	}
	-#line 6474 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6462 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 323:
	-#line 2130 "parser.y" /* yacc.c:1646 */
	+#line 2118 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
	}
	-#line 6482 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6470 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 324:
	-#line 2133 "parser.y" /* yacc.c:1646 */
	+#line 2121 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
	}
	-#line 6490 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6478 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 325:
	-#line 2136 "parser.y" /* yacc.c:1646 */
	+#line 2124 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
	}
	-#line 6498 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6486 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 326:
	-#line 2139 "parser.y" /* yacc.c:1646 */
	+#line 2127 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
	}
	-#line 6506 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6494 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 327:
	-#line 2142 "parser.y" /* yacc.c:1646 */
	+#line 2130 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
	}
	-#line 6514 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6502 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 328:
	-#line 2145 "parser.y" /* yacc.c:1646 */
	+#line 2133 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
	}
	-#line 6522 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6510 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 329:
	-#line 2148 "parser.y" /* yacc.c:1646 */
	+#line 2136 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_HEREDOC);
	}
	-#line 6530 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6518 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 332:
	-#line 2156 "parser.y" /* yacc.c:1646 */
	+#line 2144 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[0]), (yyvsp[-2]));
	(yyval) = (yyvsp[0]);
	}
	-#line 6539 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6527 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 333:
	-#line 2160 "parser.y" /* yacc.c:1646 */
	+#line 2148 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[0]), (yyvsp[-1]));
	(yyval) = (yyvsp[0]);
	}
	-#line 6548 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6536 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 334:
	-#line 2164 "parser.y" /* yacc.c:1646 */
	+#line 2152 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 6558 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6546 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 335:
	-#line 2169 "parser.y" /* yacc.c:1646 */
	+#line 2157 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 6568 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6556 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 336:
	-#line 2174 "parser.y" /* yacc.c:1646 */
	+#line 2162 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-3]), n_ARRAY_LITERAL);
	(yyvsp[-3])->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
	(yyval) = (yyvsp[-3]);
	}
	-#line 6578 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6566 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 337:
	-#line 2179 "parser.y" /* yacc.c:1646 */
	+#line 2167 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_ARRAY_LITERAL);
	(yyvsp[-2])->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
	(yyval) = (yyvsp[-2]);
	}
	-#line 6588 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6576 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 339:
	-#line 2188 "parser.y" /* yacc.c:1646 */
	+#line 2176 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_STATIC_ACCESS);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[0]), n_STRING));
	}
	-#line 6598 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6586 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 343:
	-#line 2199 "parser.y" /* yacc.c:1646 */
	+#line 2187 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NMORE((yyvsp[0]), (yyvsp[-2]));
	}
	-#line 6606 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6594 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 344:
	-#line 2202 "parser.y" /* yacc.c:1646 */
	+#line 2190 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NMORE((yyvsp[0]), (yyvsp[-1]));
	}
	-#line 6614 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6602 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 346:
	-#line 2209 "parser.y" /* yacc.c:1646 */
	+#line 2197 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE_LIST);
	}
	-#line 6622 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6610 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 347:
	-#line 2212 "parser.y" /* yacc.c:1646 */
	+#line 2200 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NMORE((yyvsp[-1]), (yyvsp[0]));
	}
	-#line 6630 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6618 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 348:
	-#line 2218 "parser.y" /* yacc.c:1646 */
	+#line 2206 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 6638 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6626 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 350:
	-#line 2229 "parser.y" /* yacc.c:1646 */
	+#line 2217 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -6646,11 +6634,11 @@

	(yyval) = (yyvsp[-4])->appendChild((yyval));
	}
	-#line 6650 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6638 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 351:
	-#line 2236 "parser.y" /* yacc.c:1646 */
	+#line 2224 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild(NNEW(n_EMPTY));
	@@ -6658,11 +6646,11 @@

	(yyval) = (yyvsp[-2])->appendChild((yyval));
	}
	-#line 6662 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6650 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 352:
	-#line 2243 "parser.y" /* yacc.c:1646 */
	+#line 2231 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -6670,11 +6658,11 @@

	(yyval) = NNEW(n_ARRAY_VALUE_LIST)->appendChild((yyval));
	}
	-#line 6674 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6662 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 353:
	-#line 2250 "parser.y" /* yacc.c:1646 */
	+#line 2238 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild(NNEW(n_EMPTY));
	@@ -6682,11 +6670,11 @@

	(yyval) = NNEW(n_ARRAY_VALUE_LIST)->appendChild((yyval));
	}
	-#line 6686 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6674 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 359:
	-#line 2280 "parser.y" /* yacc.c:1646 */
	+#line 2268 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_OBJECT_PROPERTY_ACCESS);
	(yyval)->appendChild((yyvsp[-4]));
	@@ -6710,27 +6698,27 @@
	}
	}
	}
	-#line 6714 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6702 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 361:
	-#line 2307 "parser.y" /* yacc.c:1646 */
	+#line 2295 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[-1])->appendChildren((yyvsp[0]));
	}
	-#line 6722 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6710 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 362:
	-#line 2310 "parser.y" /* yacc.c:1646 */
	+#line 2298 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 6730 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6718 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 363:
	-#line 2316 "parser.y" /* yacc.c:1646 */
	+#line 2304 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	(yyval)->appendChild((yyvsp[-1]));
	@@ -6738,49 +6726,49 @@
	(yyval)->appendChild((yyvsp[0]));
	}
	}
	-#line 6742 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6730 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 364:
	-#line 2326 "parser.y" /* yacc.c:1646 */
	+#line 2314 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	(yyval)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 6753 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6741 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 365:
	-#line 2332 "parser.y" /* yacc.c:1646 */
	+#line 2320 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	(yyval)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 6764 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6752 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 366:
	-#line 2341 "parser.y" /* yacc.c:1646 */
	+#line 2329 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
	}
	-#line 6772 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6760 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 369:
	-#line 2349 "parser.y" /* yacc.c:1646 */
	+#line 2337 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 6780 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6768 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 371:
	-#line 2356 "parser.y" /* yacc.c:1646 */
	+#line 2344 "parser.y" /* yacc.c:1646 */
	{
	xhpast::Node *last = (yyvsp[-1]);
	NMORE((yyvsp[-1]), (yyvsp[0]));
	@@ -6793,61 +6781,61 @@

	(yyval) = (yyvsp[-1]);
	}
	-#line 6797 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6785 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 372:
	-#line 2371 "parser.y" /* yacc.c:1646 */
	+#line 2359 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_STATIC_ACCESS);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 6807 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6795 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 373:
	-#line 2376 "parser.y" /* yacc.c:1646 */
	+#line 2364 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_STATIC_ACCESS);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 6817 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6805 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 375:
	-#line 2388 "parser.y" /* yacc.c:1646 */
	+#line 2376 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	(yyval)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 6828 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6816 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 376:
	-#line 2394 "parser.y" /* yacc.c:1646 */
	+#line 2382 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	(yyval)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 6839 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6827 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 381:
	-#line 2410 "parser.y" /* yacc.c:1646 */
	+#line 2398 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
	}
	-#line 6847 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6835 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 382:
	-#line 2413 "parser.y" /* yacc.c:1646 */
	+#line 2401 "parser.y" /* yacc.c:1646 */
	{
	xhpast::Node *last = (yyvsp[-1]);
	NMORE((yyvsp[-1]), (yyvsp[0]));
	@@ -6860,114 +6848,114 @@

	(yyval) = (yyvsp[-1]);
	}
	-#line 6864 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6852 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 384:
	-#line 2429 "parser.y" /* yacc.c:1646 */
	+#line 2417 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	(yyval)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 6875 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6863 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 385:
	-#line 2435 "parser.y" /* yacc.c:1646 */
	+#line 2423 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	(yyval)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 6886 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6874 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 387:
	-#line 2445 "parser.y" /* yacc.c:1646 */
	+#line 2433 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[0]), n_VARIABLE);
	}
	-#line 6894 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6882 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 388:
	-#line 2448 "parser.y" /* yacc.c:1646 */
	+#line 2436 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyvsp[-3]), n_VARIABLE_EXPRESSION, (yyvsp[0]));
	(yyvsp[-3])->appendChild((yyvsp[-1]));
	(yyval) = (yyvsp[-3]);
	}
	-#line 6904 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6892 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 389:
	-#line 2456 "parser.y" /* yacc.c:1646 */
	+#line 2444 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 6912 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6900 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 390:
	-#line 2459 "parser.y" /* yacc.c:1646 */
	+#line 2447 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[0]);
	}
	-#line 6920 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6908 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 393:
	-#line 2470 "parser.y" /* yacc.c:1646 */
	+#line 2458 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	(yyval)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 6931 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6919 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 394:
	-#line 2476 "parser.y" /* yacc.c:1646 */
	+#line 2464 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	(yyval)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 6942 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6930 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 396:
	-#line 2486 "parser.y" /* yacc.c:1646 */
	+#line 2474 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[0]), n_STRING);
	(yyval) = (yyvsp[0]);
	}
	-#line 6951 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6939 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 397:
	-#line 2490 "parser.y" /* yacc.c:1646 */
	+#line 2478 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
	}
	-#line 6959 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6947 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 398:
	-#line 2496 "parser.y" /* yacc.c:1646 */
	+#line 2484 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_VARIABLE_VARIABLE);
	}
	-#line 6967 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6955 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 399:
	-#line 2499 "parser.y" /* yacc.c:1646 */
	+#line 2487 "parser.y" /* yacc.c:1646 */
	{
	(yyvsp[0]) = NTYPE((yyvsp[0]), n_VARIABLE_VARIABLE);

	@@ -6980,61 +6968,61 @@

	(yyval) = (yyvsp[-1]);
	}
	-#line 6984 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6972 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 400:
	-#line 2514 "parser.y" /* yacc.c:1646 */
	+#line 2502 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[-2])->appendChild((yyvsp[0]));
	}
	-#line 6992 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6980 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 401:
	-#line 2517 "parser.y" /* yacc.c:1646 */
	+#line 2505 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ASSIGNMENT_LIST);
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 7001 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6989 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 403:
	-#line 2525 "parser.y" /* yacc.c:1646 */
	+#line 2513 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_LIST);
	(yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
	}
	-#line 7010 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 6998 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 404:
	-#line 2529 "parser.y" /* yacc.c:1646 */
	+#line 2517 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	-#line 7018 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7006 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 405:
	-#line 2535 "parser.y" /* yacc.c:1646 */
	+#line 2523 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE_LIST);
	}
	-#line 7026 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7014 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 406:
	-#line 2538 "parser.y" /* yacc.c:1646 */
	+#line 2526 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NMORE((yyvsp[-1]), (yyvsp[0]));
	}
	-#line 7034 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7022 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 407:
	-#line 2544 "parser.y" /* yacc.c:1646 */
	+#line 2532 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -7042,11 +7030,11 @@

	(yyval) = (yyvsp[-4])->appendChild((yyval));
	}
	-#line 7046 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7034 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 408:
	-#line 2551 "parser.y" /* yacc.c:1646 */
	+#line 2539 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild(NNEW(n_EMPTY));
	@@ -7054,11 +7042,11 @@

	(yyval) = (yyvsp[-2])->appendChild((yyval));
	}
	-#line 7058 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7046 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 409:
	-#line 2558 "parser.y" /* yacc.c:1646 */
	+#line 2546 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -7066,11 +7054,11 @@

	(yyval) = NNEW(n_ARRAY_VALUE_LIST)->appendChild((yyval));
	}
	-#line 7070 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7058 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 410:
	-#line 2565 "parser.y" /* yacc.c:1646 */
	+#line 2553 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild(NNEW(n_EMPTY));
	@@ -7078,11 +7066,11 @@

	(yyval) = NNEW(n_ARRAY_VALUE_LIST)->appendChild((yyval));
	}
	-#line 7082 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7070 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 411:
	-#line 2572 "parser.y" /* yacc.c:1646 */
	+#line 2560 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -7090,11 +7078,11 @@

	(yyval) = (yyvsp[-5])->appendChild((yyval));
	}
	-#line 7094 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7082 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 412:
	-#line 2579 "parser.y" /* yacc.c:1646 */
	+#line 2567 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild(NNEW(n_EMPTY));
	@@ -7102,11 +7090,11 @@

	(yyval) = (yyvsp[-3])->appendChild((yyval));
	}
	-#line 7106 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7094 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 413:
	-#line 2586 "parser.y" /* yacc.c:1646 */
	+#line 2574 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -7114,11 +7102,11 @@

	(yyval) = NNEW(n_ARRAY_VALUE_LIST)->appendChild((yyval));
	}
	-#line 7118 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7106 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 414:
	-#line 2593 "parser.y" /* yacc.c:1646 */
	+#line 2581 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild(NNEW(n_EMPTY));
	@@ -7126,11 +7114,11 @@

	(yyval) = NNEW(n_ARRAY_VALUE_LIST)->appendChild((yyval));
	}
	-#line 7130 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7118 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 415:
	-#line 2603 "parser.y" /* yacc.c:1646 */
	+#line 2591 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-3]), n_SYMBOL_NAME);

	@@ -7141,11 +7129,11 @@
	(yyval)->appendChild((yyvsp[-3]));
	(yyval)->appendChild((yyvsp[-2]));
	}
	-#line 7145 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7133 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 416:
	-#line 2613 "parser.y" /* yacc.c:1646 */
	+#line 2601 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-3]), n_SYMBOL_NAME);

	@@ -7156,27 +7144,27 @@
	(yyval)->appendChild((yyvsp[-3]));
	(yyval)->appendChild((yyvsp[-2]));
	}
	-#line 7160 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7148 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 417:
	-#line 2623 "parser.y" /* yacc.c:1646 */
	+#line 2611 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[-1]), n_INCLUDE_FILE)->appendChild((yyvsp[0]));
	}
	-#line 7168 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7156 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 418:
	-#line 2626 "parser.y" /* yacc.c:1646 */
	+#line 2614 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[-1]), n_INCLUDE_FILE)->appendChild((yyvsp[0]));
	}
	-#line 7176 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7164 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 419:
	-#line 2629 "parser.y" /* yacc.c:1646 */
	+#line 2617 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-3]), n_SYMBOL_NAME);

	@@ -7187,146 +7175,146 @@
	(yyval)->appendChild((yyvsp[-3]));
	(yyval)->appendChild((yyvsp[-2]));
	}
	-#line 7191 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7179 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 420:
	-#line 2639 "parser.y" /* yacc.c:1646 */
	+#line 2627 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[-1]), n_INCLUDE_FILE)->appendChild((yyvsp[0]));
	}
	-#line 7199 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7187 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 421:
	-#line 2642 "parser.y" /* yacc.c:1646 */
	+#line 2630 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[-1]), n_INCLUDE_FILE)->appendChild((yyvsp[0]));
	}
	-#line 7207 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7195 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 422:
	-#line 2648 "parser.y" /* yacc.c:1646 */
	+#line 2636 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	(yyval)->appendChild((yyvsp[0]));
	}
	-#line 7216 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7204 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 423:
	-#line 2652 "parser.y" /* yacc.c:1646 */
	+#line 2640 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[-2])->appendChild((yyvsp[0]));
	}
	-#line 7224 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7212 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 424:
	-#line 2658 "parser.y" /* yacc.c:1646 */
	+#line 2646 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyvsp[-2]), n_PARENTHETICAL_EXPRESSION, (yyvsp[0]));
	(yyvsp[-2])->appendChild((yyvsp[-1]));
	(yyval) = (yyvsp[-2]);
	}
	-#line 7234 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7222 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 425:
	-#line 2663 "parser.y" /* yacc.c:1646 */
	+#line 2651 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
	}
	-#line 7242 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7230 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 426:
	-#line 2669 "parser.y" /* yacc.c:1646 */
	+#line 2657 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	(yyval)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 7253 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7241 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 427:
	-#line 2675 "parser.y" /* yacc.c:1646 */
	+#line 2663 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	(yyval)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 7264 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7252 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 428:
	-#line 2681 "parser.y" /* yacc.c:1646 */
	+#line 2669 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild(NTYPE((yyvsp[-3]), n_STRING_SCALAR));
	(yyval)->appendChild((yyvsp[-1]));
	NMORE((yyval), (yyvsp[0]));
	}
	-#line 7275 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7263 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 429:
	-#line 2690 "parser.y" /* yacc.c:1646 */
	+#line 2678 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-3]), n_ARRAY_LITERAL);
	(yyvsp[-3])->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
	(yyval) = (yyvsp[-3]);
	}
	-#line 7285 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7273 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 430:
	-#line 2695 "parser.y" /* yacc.c:1646 */
	+#line 2683 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_ARRAY_LITERAL);
	(yyvsp[-2])->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
	(yyval) = (yyvsp[-2]);
	}
	-#line 7295 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7283 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 431:
	-#line 2703 "parser.y" /* yacc.c:1646 */
	+#line 2691 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_NEW);
	(yyvsp[-2])->appendChild((yyvsp[-1]));
	(yyvsp[-2])->appendChild((yyvsp[0]));
	(yyval) = (yyvsp[-2]);
	}
	-#line 7306 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7294 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 432:
	-#line 2712 "parser.y" /* yacc.c:1646 */
	+#line 2700 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_STATIC_ACCESS);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[0]), n_STRING));
	}
	-#line 7316 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7304 "parser.yacc.cpp" /* yacc.c:1646 */
	break;

	case 433:
	-#line 2717 "parser.y" /* yacc.c:1646 */
	+#line 2705 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_STATIC_ACCESS);
	(yyval)->appendChild((yyvsp[-2]));
	(yyval)->appendChild(NTYPE((yyvsp[0]), n_STRING));
	}
	-#line 7326 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7314 "parser.yacc.cpp" /* yacc.c:1646 */
	break;


	-#line 7330 "parser.yacc.cpp" /* yacc.c:1646 */
	+#line 7318 "parser.yacc.cpp" /* yacc.c:1646 */
	default: break;
	}
	/* User semantic actions sometimes alter yychar, and that requires
	@@ -7554,7 +7542,7 @@
	#endif
	return yyresult;
	}
	-#line 2724 "parser.y" /* yacc.c:1906 */
	+#line 2712 "parser.y" /* yacc.c:1906 */


	const char* yytokname(int tok) {

File Metadata

Mime Type: text/plain
Expires: Mar 16 2025, 3:50 AM (4 w, 3 d ago)
Storage Engine: amazon-s3
Storage Format: Encrypted (AES-256-CBC)
Storage Handle: phabricator/secure/j3/vi/cqmgcvedt6ak63ps
Default Alt Text: D13976.id33716.diff (128 KB)

D13976.id33716.diffNo OneTemporaryActions

D13976.id33716.diffView Options

File Metadata

Event Timeline

D13976.id33716.diff
No OneTemporary
Actions

D13976.id33716.diff
View Options