D13974.diff
No OneTemporary
Actions

Size

84 KB

Referenced Files

None

Subscribers

None

D13974.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
	@@ -64,13 +64,15 @@
	%lex-param { void* yyscanner }
	%error-verbose

	-%left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE
	-%left ','
	+%precedence T_INCLUDE T_INCLUDE_ONCE
	+%token T_EVAL
	+%precedence T_REQUIRE T_REQUIRE_ONCE
	+%token ','
	%left T_LOGICAL_OR
	%left T_LOGICAL_XOR
	%left T_LOGICAL_AND
	-%right T_PRINT
	-%left '=' T_PLUS_EQUAL
	+%precedence T_PRINT
	+%precedence '=' T_PLUS_EQUAL
	T_MINUS_EQUAL
	T_MUL_EQUAL
	T_DIV_EQUAL
	@@ -92,27 +94,22 @@
	%left T_SL T_SR
	%left '+' '-' '.'
	%left '*' '/' '%'
	-%right '!'
	-%nonassoc T_INSTANCEOF
	-%right '~' T_INC
	- T_DEC
	- T_INT_CAST
	- T_DOUBLE_CAST
	- T_STRING_CAST
	- T_UNICODE_CAST
	- T_BINARY_CAST
	- T_ARRAY_CAST
	- T_OBJECT_CAST
	- T_BOOL_CAST
	- T_UNSET_CAST
	- '@'
	-%right '['
	-%nonassoc T_NEW T_CLONE
	+%precedence '!'
	+%precedence T_INSTANCEOF
	+%precedence '~' T_INC
	+%token T_DEC
	+%precedence T_INT_CAST T_DOUBLE_CAST T_STRING_CAST
	+%token T_UNICODE_CAST
	+%token T_BINARY_CAST
	+%precedence T_ARRAY_CAST T_OBJECT_CAST T_BOOL_CAST T_UNSET_CAST '@'
	+%token '['
	+%token T_NEW
	+%precedence T_CLONE
	%token T_EXIT
	%token T_IF
	-%left T_ELSEIF
	-%left T_ELSE
	-%left T_ENDIF
	+%token T_ELSEIF
	+%token T_ELSE
	+%token T_ENDIF

	%token T_LNUMBER
	%token T_DNUMBER
	@@ -153,7 +150,12 @@
	%token T_THROW
	%token T_USE
	%token T_GLOBAL
	-%right T_STATIC T_ABSTRACT T_FINAL T_PRIVATE T_PROTECTED T_PUBLIC
	+%token T_STATIC
	+%token T_ABSTRACT
	+%token T_FINAL
	+%token T_PRIVATE
	+%token T_PROTECTED
	+%token T_PUBLIC
	%token T_VAR
	%token T_UNSET
	%token T_ISSET
	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
	@@ -623,50 +623,50 @@
	/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
	static const yytype_uint16 yyrline[] =
	{
	- 0, 205, 205, 211, 214, 220, 223, 229, 230, 231,
	- 232, 237, 244, 250, 258, 264, 271, 274, 281, 286,
	- 292, 298, 308, 315, 325, 328, 334, 335, 336, 337,
	- 345, 346, 352, 355, 358, 364, 367, 397, 416, 423,
	- 431, 444, 451, 458, 465, 472, 479, 486, 493, 500,
	- 505, 510, 515, 519, 523, 527, 533, 551, 568, 574,
	- 578, 596, 604, 615, 616, 622, 625, 635, 639, 646,
	- 658, 662, 669, 673, 677, 681, 684, 690, 705, 717,
	- 732, 736, 743, 750, 757, 760, 766, 770, 773, 781,
	- 784, 792, 795, 801, 804, 810, 811, 819, 820, 828,
	- 829, 837, 838, 846, 852, 863, 866, 876, 881, 893,
	- 896, 904, 914, 915, 919, 920, 928, 931, 941, 944,
	- 954, 957, 965, 968, 976, 977, 983, 991, 1000, 1009,
	- 1017, 1025, 1034, 1044, 1056, 1059, 1062, 1065, 1071, 1072,
	- 1078, 1081, 1084, 1089, 1092, 1095, 1103, 1107, 1114, 1117,
	- 1121, 1128, 1136, 1144, 1152, 1163, 1166, 1172, 1180, 1184,
	- 1187, 1187, 1204, 1212, 1215, 1221, 1224, 1230, 1233, 1239,
	- 1243, 1250, 1253, 1259, 1267, 1271, 1278, 1282, 1288, 1296,
	- 1302, 1311, 1314, 1322, 1325, 1331, 1332, 1339, 1342, 1349,
	- 1353, 1359, 1360, 1361, 1362, 1363, 1364, 1368, 1375, 1382,
	- 1389, 1399, 1408, 1420, 1423, 1430, 1433, 1438, 1441, 1448,
	- 1456, 1462, 1472, 1486, 1491, 1497, 1503, 1509, 1515, 1521,
	- 1527, 1533, 1539, 1545, 1551, 1557, 1562, 1567, 1572, 1577,
	- 1583, 1589, 1595, 1601, 1607, 1613, 1619, 1625, 1651, 1657,
	- 1663, 1669, 1675, 1681, 1687, 1693, 1698, 1703, 1708, 1713,
	- 1719, 1725, 1731, 1737, 1743, 1749, 1755, 1761, 1767, 1768,
	- 1769, 1777, 1785, 1786, 1791, 1796, 1801, 1806, 1811, 1816,
	- 1821, 1826, 1831, 1835, 1836, 1837, 1838, 1843, 1849, 1863,
	- 1886, 1892, 1898, 1904, 1913, 1917, 1920, 1928, 1931, 1936,
	- 1940, 1949, 1954, 1961, 1967, 1976, 1985, 1994, 2003, 2011,
	- 2014, 2017, 2021, 2028, 2031, 2035, 2042, 2043, 2047, 2062,
	- 2066, 2069, 2075, 2081, 2084, 2088, 2096, 2099, 2105, 2108,
	- 2111, 2114, 2117, 2120, 2123, 2126, 2129, 2132, 2135, 2138,
	- 2144, 2145, 2146, 2150, 2154, 2159, 2164, 2169, 2174, 2178,
	- 2186, 2187, 2188, 2189, 2192, 2195, 2199, 2202, 2208, 2211,
	- 2215, 2226, 2233, 2240, 2250, 2251, 2255, 2259, 2263, 2267,
	- 2293, 2297, 2300, 2306, 2316, 2322, 2331, 2337, 2338, 2339,
	- 2345, 2346, 2361, 2366, 2374, 2378, 2384, 2393, 2394, 2395,
	- 2399, 2400, 2403, 2415, 2419, 2425, 2431, 2435, 2438, 2446,
	- 2449, 2455, 2456, 2460, 2466, 2472, 2476, 2480, 2486, 2489,
	- 2504, 2507, 2514, 2515, 2519, 2525, 2528, 2534, 2541, 2548,
	- 2555, 2562, 2569, 2576, 2583, 2593, 2603, 2613, 2616, 2619,
	- 2629, 2632, 2638, 2642, 2648, 2653, 2659, 2665, 2671, 2680,
	- 2685, 2693, 2702, 2707
	+ 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, 1779, 1787, 1788, 1793, 1798, 1803, 1808, 1813, 1818,
	+ 1823, 1828, 1833, 1837, 1838, 1839, 1840, 1845, 1851, 1865,
	+ 1888, 1894, 1900, 1906, 1915, 1919, 1922, 1930, 1933, 1938,
	+ 1942, 1951, 1956, 1963, 1969, 1978, 1987, 1996, 2005, 2013,
	+ 2016, 2019, 2023, 2030, 2033, 2037, 2044, 2045, 2049, 2064,
	+ 2068, 2071, 2077, 2083, 2086, 2090, 2098, 2101, 2107, 2110,
	+ 2113, 2116, 2119, 2122, 2125, 2128, 2131, 2134, 2137, 2140,
	+ 2146, 2147, 2148, 2152, 2156, 2161, 2166, 2171, 2176, 2180,
	+ 2188, 2189, 2190, 2191, 2194, 2197, 2201, 2204, 2210, 2213,
	+ 2217, 2228, 2235, 2242, 2252, 2253, 2257, 2261, 2265, 2269,
	+ 2295, 2299, 2302, 2308, 2318, 2324, 2333, 2339, 2340, 2341,
	+ 2347, 2348, 2363, 2368, 2376, 2380, 2386, 2395, 2396, 2397,
	+ 2401, 2402, 2405, 2417, 2421, 2427, 2433, 2437, 2440, 2448,
	+ 2451, 2457, 2458, 2462, 2468, 2474, 2478, 2482, 2488, 2491,
	+ 2506, 2509, 2516, 2517, 2521, 2527, 2530, 2536, 2543, 2550,
	+ 2557, 2564, 2571, 2578, 2585, 2595, 2605, 2615, 2618, 2621,
	+ 2631, 2634, 2640, 2644, 2650, 2655, 2661, 2667, 2673, 2682,
	+ 2687, 2695, 2704, 2709
	};
	#endif

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

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

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

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

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

	case 10:
	-#line 232 "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]));
	@@ -3525,7 +3525,7 @@
	break;

	case 11:
	-#line 237 "parser.y" /* yacc.c:1646 */
	+#line 239 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyvsp[-2]), n_NAMESPACE, (yyvsp[-1]));
	(yyvsp[-2])->appendChild((yyvsp[-1]));
	@@ -3537,7 +3537,7 @@
	break;

	case 12:
	-#line 244 "parser.y" /* yacc.c:1646 */
	+#line 246 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyvsp[-4]), n_NAMESPACE, (yyvsp[0]));
	(yyvsp[-4])->appendChild((yyvsp[-3]));
	@@ -3548,7 +3548,7 @@
	break;

	case 13:
	-#line 250 "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));
	@@ -3561,7 +3561,7 @@
	break;

	case 14:
	-#line 258 "parser.y" /* yacc.c:1646 */
	+#line 260 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyvsp[-2]), n_USE, (yyvsp[-1]));
	(yyvsp[-2])->appendChild((yyvsp[-1]));
	@@ -3572,7 +3572,7 @@
	break;

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

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

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

	case 18:
	-#line 281 "parser.y" /* yacc.c:1646 */
	+#line 283 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_USE);
	(yyval)->appendChild((yyvsp[0]));
	@@ -3608,7 +3608,7 @@
	break;

	case 19:
	-#line 286 "parser.y" /* yacc.c:1646 */
	+#line 288 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_USE);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -3619,7 +3619,7 @@
	break;

	case 20:
	-#line 292 "parser.y" /* yacc.c:1646 */
	+#line 294 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_USE);
	NMORE((yyvsp[0]), (yyvsp[-1]));
	@@ -3630,7 +3630,7 @@
	break;

	case 21:
	-#line 298 "parser.y" /* yacc.c:1646 */
	+#line 300 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_USE);
	NMORE((yyvsp[-2]), (yyvsp[-3]));
	@@ -3642,7 +3642,7 @@
	break;

	case 22:
	-#line 308 "parser.y" /* yacc.c:1646 */
	+#line 310 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyval), (yyvsp[0]));
	(yyval)->appendChild(
	@@ -3654,7 +3654,7 @@
	break;

	case 23:
	-#line 315 "parser.y" /* yacc.c:1646 */
	+#line 317 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyval), n_CONSTANT_DECLARATION_LIST, (yyvsp[0]));
	(yyval)->appendChild(
	@@ -3666,7 +3666,7 @@
	break;

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

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

	case 29:
	-#line 337 "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]));
	@@ -3692,7 +3692,7 @@
	break;

	case 31:
	-#line 346 "parser.y" /* yacc.c:1646 */
	+#line 348 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_STRING);
	(yyval) = NNEW(n_LABEL);
	@@ -3703,7 +3703,7 @@
	break;

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

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

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

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

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

	@@ -3770,7 +3770,7 @@
	break;

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

	(yyval) = NNEW(n_CONDITION_LIST);
	@@ -3790,7 +3790,7 @@
	break;

	case 38:
	-#line 416 "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])));
	@@ -3802,7 +3802,7 @@
	break;

	case 39:
	-#line 423 "parser.y" /* yacc.c:1646 */
	+#line 425 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-6]), n_DO_WHILE);
	(yyvsp[-6])->appendChild((yyvsp[-5]));
	@@ -3815,7 +3815,7 @@
	break;

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

	@@ -3833,7 +3833,7 @@
	break;

	case 41:
	-#line 444 "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])));
	@@ -3845,7 +3845,7 @@
	break;

	case 42:
	-#line 451 "parser.y" /* yacc.c:1646 */
	+#line 453 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_BREAK);
	(yyvsp[-1])->appendChild(NNEW(n_EMPTY));
	@@ -3857,7 +3857,7 @@
	break;

	case 43:
	-#line 458 "parser.y" /* yacc.c:1646 */
	+#line 460 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_BREAK);
	(yyvsp[-2])->appendChild((yyvsp[-1]));
	@@ -3869,7 +3869,7 @@
	break;

	case 44:
	-#line 465 "parser.y" /* yacc.c:1646 */
	+#line 467 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_CONTINUE);
	(yyvsp[-1])->appendChild(NNEW(n_EMPTY));
	@@ -3881,7 +3881,7 @@
	break;

	case 45:
	-#line 472 "parser.y" /* yacc.c:1646 */
	+#line 474 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_CONTINUE);
	(yyvsp[-2])->appendChild((yyvsp[-1]));
	@@ -3893,7 +3893,7 @@
	break;

	case 46:
	-#line 479 "parser.y" /* yacc.c:1646 */
	+#line 481 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_RETURN);
	(yyvsp[-1])->appendChild(NNEW(n_EMPTY));
	@@ -3905,7 +3905,7 @@
	break;

	case 47:
	-#line 486 "parser.y" /* yacc.c:1646 */
	+#line 488 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_RETURN);
	(yyvsp[-2])->appendChild((yyvsp[-1]));
	@@ -3917,7 +3917,7 @@
	break;

	case 48:
	-#line 493 "parser.y" /* yacc.c:1646 */
	+#line 495 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_RETURN);
	(yyvsp[-2])->appendChild((yyvsp[-1]));
	@@ -3929,7 +3929,7 @@
	break;

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

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

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

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

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

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

	case 55:
	-#line 527 "parser.y" /* yacc.c:1646 */
	+#line 529 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[-2]), (yyvsp[-1]));
	NMORE((yyvsp[-2]), (yyvsp[-4]));
	@@ -3997,7 +3997,7 @@
	break;

	case 56:
	-#line 534 "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]));
	@@ -4019,7 +4019,7 @@
	break;

	case 57:
	-#line 552 "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]));
	@@ -4040,7 +4040,7 @@
	break;

	case 58:
	-#line 568 "parser.y" /* yacc.c:1646 */
	+#line 570 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-4]), n_DECLARE);
	(yyvsp[-4])->appendChild((yyvsp[-2]));
	@@ -4051,7 +4051,7 @@
	break;

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

	case 60:
	-#line 582 "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])));
	@@ -4079,7 +4079,7 @@
	break;

	case 61:
	-#line 596 "parser.y" /* yacc.c:1646 */
	+#line 598 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_THROW);
	(yyvsp[-2])->appendChild((yyvsp[-1]));
	@@ -4092,7 +4092,7 @@
	break;

	case 62:
	-#line 604 "parser.y" /* yacc.c:1646 */
	+#line 606 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_GOTO);
	NTYPE((yyvsp[-1]), n_STRING);
	@@ -4105,7 +4105,7 @@
	break;

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

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

	case 66:
	-#line 625 "parser.y" /* yacc.c:1646 */
	+#line 627 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-3]), n_FINALLY);
	(yyvsp[-3])->appendChild((yyvsp[-1]));
	@@ -4132,7 +4132,7 @@
	break;

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

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

	case 69:
	-#line 647 "parser.y" /* yacc.c:1646 */
	+#line 649 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-7]), n_CATCH);
	(yyvsp[-7])->appendChild((yyvsp[-5]));
	@@ -4163,7 +4163,7 @@
	break;

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

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

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

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

	case 77:
	-#line 691 "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));
	@@ -4213,7 +4213,7 @@
	break;

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

	case 79:
	-#line 717 "parser.y" /* yacc.c:1646 */
	+#line 719 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INTERFACE_DECLARATION);
	(yyval)->appendChild(NNEW(n_CLASS_ATTRIBUTES));
	@@ -4246,7 +4246,7 @@
	break;

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

	case 81:
	-#line 736 "parser.y" /* yacc.c:1646 */
	+#line 738 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[0]), n_CLASS_ATTRIBUTES);
	NMORE((yyvsp[0]), (yyvsp[-1]));
	@@ -4267,7 +4267,7 @@
	break;

	case 82:
	-#line 743 "parser.y" /* yacc.c:1646 */
	+#line 745 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[0]), n_CLASS_ATTRIBUTES);
	NMORE((yyvsp[0]), (yyvsp[-1]));
	@@ -4279,7 +4279,7 @@
	break;

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

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

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

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

	case 88:
	-#line 773 "parser.y" /* yacc.c:1646 */
	+#line 775 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_EXTENDS_LIST);
	(yyvsp[-1])->appendChildren((yyvsp[0]));
	@@ -4322,7 +4322,7 @@
	break;

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

	case 90:
	-#line 784 "parser.y" /* yacc.c:1646 */
	+#line 786 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_IMPLEMENTS_LIST);
	(yyvsp[-1])->appendChildren((yyvsp[0]));
	@@ -4340,7 +4340,7 @@
	break;

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

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

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

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

	case 96:
	-#line 811 "parser.y" /* yacc.c:1646 */
	+#line 813 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_VARIABLE_REFERENCE);
	(yyvsp[-1])->appendChild((yyvsp[0]));
	@@ -4382,7 +4382,7 @@
	break;

	case 98:
	-#line 820 "parser.y" /* yacc.c:1646 */
	+#line 822 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[-2]), (yyvsp[-3]));
	NMORE((yyvsp[-2]), (yyvsp[0]));
	@@ -4392,7 +4392,7 @@
	break;

	case 100:
	-#line 829 "parser.y" /* yacc.c:1646 */
	+#line 831 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[-2]), (yyvsp[-3]));
	NMORE((yyvsp[-2]), (yyvsp[0]));
	@@ -4402,7 +4402,7 @@
	break;

	case 102:
	-#line 838 "parser.y" /* yacc.c:1646 */
	+#line 840 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[-2]), (yyvsp[-3]));
	NMORE((yyvsp[-2]), (yyvsp[0]));
	@@ -4412,7 +4412,7 @@
	break;

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

	case 104:
	-#line 852 "parser.y" /* yacc.c:1646 */
	+#line 854 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_DECLARE_DECLARATION);
	(yyval)->appendChild(NTYPE((yyvsp[-2]), n_STRING));
	@@ -4436,7 +4436,7 @@
	break;

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

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

	@@ -4459,7 +4459,7 @@
	break;

	case 107:
	-#line 876 "parser.y" /* yacc.c:1646 */
	+#line 878 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[-2]), (yyvsp[0]));
	NMORE((yyvsp[-2]), (yyvsp[-3]));
	@@ -4469,7 +4469,7 @@
	break;

	case 108:
	-#line 881 "parser.y" /* yacc.c:1646 */
	+#line 883 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-3]), n_STATEMENT);
	(yyvsp[-4])->appendChild(NNEW(n_EMPTY));
	@@ -4483,7 +4483,7 @@
	break;

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

	case 110:
	-#line 896 "parser.y" /* yacc.c:1646 */
	+#line 898 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-3]), n_CASE);
	(yyvsp[-3])->appendChild((yyvsp[-2]));
	@@ -4504,7 +4504,7 @@
	break;

	case 111:
	-#line 904 "parser.y" /* yacc.c:1646 */
	+#line 906 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_DEFAULT);
	(yyvsp[-2])->appendChild((yyvsp[0]));
	@@ -4516,7 +4516,7 @@
	break;

	case 115:
	-#line 920 "parser.y" /* yacc.c:1646 */
	+#line 922 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[-2]), (yyvsp[0]));
	NMORE((yyvsp[-2]), (yyvsp[-3]));
	@@ -4526,7 +4526,7 @@
	break;

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

	case 117:
	-#line 931 "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])));
	@@ -4546,7 +4546,7 @@
	break;

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

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

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

	case 121:
	-#line 957 "parser.y" /* yacc.c:1646 */
	+#line 959 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_ELSE);
	(yyvsp[-1])->appendChild((yyvsp[0]));
	@@ -4584,7 +4584,7 @@
	break;

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

	case 123:
	-#line 968 "parser.y" /* yacc.c:1646 */
	+#line 970 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_ELSE);
	(yyvsp[-2])->appendChild((yyvsp[0]));
	@@ -4602,7 +4602,7 @@
	break;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	case 142:
	-#line 1084 "parser.y" /* yacc.c:1646 */
	+#line 1086 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_VARIABLE_REFERENCE);
	(yyvsp[-1])->appendChild((yyvsp[0]));
	@@ -4784,7 +4784,7 @@
	break;

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

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

	case 145:
	-#line 1095 "parser.y" /* yacc.c:1646 */
	+#line 1097 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_VARIABLE_REFERENCE);
	(yyvsp[-1])->appendChild((yyvsp[0]));
	@@ -4810,7 +4810,7 @@
	break;

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

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

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

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

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

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

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

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

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

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

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

	case 157:
	-#line 1172 "parser.y" /* yacc.c:1646 */
	+#line 1174 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_MEMBER_DECLARATION_LIST);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -4935,7 +4935,7 @@
	break;

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

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

	case 160:
	-#line 1187 "parser.y" /* yacc.c:1646 */
	+#line 1189 "parser.y" /* yacc.c:1646 */
	{
	/* empty */
	}
	@@ -4960,7 +4960,7 @@
	break;

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

	case 162:
	-#line 1204 "parser.y" /* yacc.c:1646 */
	+#line 1206 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[-2]), n_TRAIT_USE);
	(yyval)->appendChildren((yyvsp[-1]));
	@@ -4987,7 +4987,7 @@
	break;

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

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

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

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

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

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

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

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

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

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

	case 173:
	-#line 1259 "parser.y" /* yacc.c:1646 */
	+#line 1261 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_TRAIT_INSTEADOF);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5079,7 +5079,7 @@
	break;

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

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

	case 176:
	-#line 1278 "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));
	@@ -5106,7 +5106,7 @@
	break;

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

	case 178:
	-#line 1288 "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));
	@@ -5124,7 +5124,7 @@
	break;

	case 179:
	-#line 1296 "parser.y" /* yacc.c:1646 */
	+#line 1298 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_TRAIT_AS);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -5135,7 +5135,7 @@
	break;

	case 180:
	-#line 1302 "parser.y" /* yacc.c:1646 */
	+#line 1304 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_TRAIT_AS);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5146,7 +5146,7 @@
	break;

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

	case 182:
	-#line 1314 "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));
	@@ -5163,7 +5163,7 @@
	break;

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

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

	case 186:
	-#line 1332 "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));
	@@ -5188,7 +5188,7 @@
	break;

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

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

	case 189:
	-#line 1349 "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));
	@@ -5214,7 +5214,7 @@
	break;

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

	case 197:
	-#line 1368 "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));
	@@ -5234,7 +5234,7 @@
	break;

	case 198:
	-#line 1375 "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));
	@@ -5246,7 +5246,7 @@
	break;

	case 199:
	-#line 1382 "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));
	@@ -5258,7 +5258,7 @@
	break;

	case 200:
	-#line 1389 "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));
	@@ -5270,7 +5270,7 @@
	break;

	case 201:
	-#line 1399 "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));
	@@ -5284,7 +5284,7 @@
	break;

	case 202:
	-#line 1408 "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);
	@@ -5298,7 +5298,7 @@
	break;

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

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

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

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

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

	case 209:
	-#line 1448 "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])));
	@@ -5353,7 +5353,7 @@
	break;

	case 210:
	-#line 1456 "parser.y" /* yacc.c:1646 */
	+#line 1458 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5364,7 +5364,7 @@
	break;

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

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

	case 213:
	-#line 1486 "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));
	@@ -5408,7 +5408,7 @@
	break;

	case 214:
	-#line 1491 "parser.y" /* yacc.c:1646 */
	+#line 1493 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5419,7 +5419,7 @@
	break;

	case 215:
	-#line 1497 "parser.y" /* yacc.c:1646 */
	+#line 1499 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5430,7 +5430,7 @@
	break;

	case 216:
	-#line 1503 "parser.y" /* yacc.c:1646 */
	+#line 1505 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5441,7 +5441,7 @@
	break;

	case 217:
	-#line 1509 "parser.y" /* yacc.c:1646 */
	+#line 1511 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5452,7 +5452,7 @@
	break;

	case 218:
	-#line 1515 "parser.y" /* yacc.c:1646 */
	+#line 1517 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5463,7 +5463,7 @@
	break;

	case 219:
	-#line 1521 "parser.y" /* yacc.c:1646 */
	+#line 1523 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5474,7 +5474,7 @@
	break;

	case 220:
	-#line 1527 "parser.y" /* yacc.c:1646 */
	+#line 1529 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5485,7 +5485,7 @@
	break;

	case 221:
	-#line 1533 "parser.y" /* yacc.c:1646 */
	+#line 1535 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5496,7 +5496,7 @@
	break;

	case 222:
	-#line 1539 "parser.y" /* yacc.c:1646 */
	+#line 1541 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5507,7 +5507,7 @@
	break;

	case 223:
	-#line 1545 "parser.y" /* yacc.c:1646 */
	+#line 1547 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5518,7 +5518,7 @@
	break;

	case 224:
	-#line 1551 "parser.y" /* yacc.c:1646 */
	+#line 1553 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5529,7 +5529,7 @@
	break;

	case 225:
	-#line 1557 "parser.y" /* yacc.c:1646 */
	+#line 1559 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNARY_POSTFIX_EXPRESSION);
	(yyval)->appendChild((yyvsp[-1]));
	@@ -5539,7 +5539,7 @@
	break;

	case 226:
	-#line 1562 "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));
	@@ -5549,7 +5549,7 @@
	break;

	case 227:
	-#line 1567 "parser.y" /* yacc.c:1646 */
	+#line 1569 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNARY_POSTFIX_EXPRESSION);
	(yyval)->appendChild((yyvsp[-1]));
	@@ -5559,7 +5559,7 @@
	break;

	case 228:
	-#line 1572 "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));
	@@ -5569,7 +5569,7 @@
	break;

	case 229:
	-#line 1577 "parser.y" /* yacc.c:1646 */
	+#line 1579 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5580,7 +5580,7 @@
	break;

	case 230:
	-#line 1583 "parser.y" /* yacc.c:1646 */
	+#line 1585 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5591,7 +5591,7 @@
	break;

	case 231:
	-#line 1589 "parser.y" /* yacc.c:1646 */
	+#line 1591 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5602,7 +5602,7 @@
	break;

	case 232:
	-#line 1595 "parser.y" /* yacc.c:1646 */
	+#line 1597 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5613,7 +5613,7 @@
	break;

	case 233:
	-#line 1601 "parser.y" /* yacc.c:1646 */
	+#line 1603 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5624,7 +5624,7 @@
	break;

	case 234:
	-#line 1607 "parser.y" /* yacc.c:1646 */
	+#line 1609 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5635,7 +5635,7 @@
	break;

	case 235:
	-#line 1613 "parser.y" /* yacc.c:1646 */
	+#line 1615 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5646,7 +5646,7 @@
	break;

	case 236:
	-#line 1619 "parser.y" /* yacc.c:1646 */
	+#line 1621 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5657,7 +5657,7 @@
	break;

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

	/* The concatenation operator generates n_CONCATENATION_LIST instead of
	@@ -5688,7 +5688,7 @@
	break;

	case 238:
	-#line 1651 "parser.y" /* yacc.c:1646 */
	+#line 1653 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5699,7 +5699,7 @@
	break;

	case 239:
	-#line 1657 "parser.y" /* yacc.c:1646 */
	+#line 1659 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5710,7 +5710,7 @@
	break;

	case 240:
	-#line 1663 "parser.y" /* yacc.c:1646 */
	+#line 1665 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5721,7 +5721,7 @@
	break;

	case 241:
	-#line 1669 "parser.y" /* yacc.c:1646 */
	+#line 1671 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5732,7 +5732,7 @@
	break;

	case 242:
	-#line 1675 "parser.y" /* yacc.c:1646 */
	+#line 1677 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5743,7 +5743,7 @@
	break;

	case 243:
	-#line 1681 "parser.y" /* yacc.c:1646 */
	+#line 1683 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5754,7 +5754,7 @@
	break;

	case 244:
	-#line 1687 "parser.y" /* yacc.c:1646 */
	+#line 1689 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5765,7 +5765,7 @@
	break;

	case 245:
	-#line 1693 "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));
	@@ -5775,7 +5775,7 @@
	break;

	case 246:
	-#line 1698 "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));
	@@ -5785,7 +5785,7 @@
	break;

	case 247:
	-#line 1703 "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));
	@@ -5795,7 +5795,7 @@
	break;

	case 248:
	-#line 1708 "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));
	@@ -5805,7 +5805,7 @@
	break;

	case 249:
	-#line 1713 "parser.y" /* yacc.c:1646 */
	+#line 1715 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5816,7 +5816,7 @@
	break;

	case 250:
	-#line 1719 "parser.y" /* yacc.c:1646 */
	+#line 1721 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5827,7 +5827,7 @@
	break;

	case 251:
	-#line 1725 "parser.y" /* yacc.c:1646 */
	+#line 1727 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5838,7 +5838,7 @@
	break;

	case 252:
	-#line 1731 "parser.y" /* yacc.c:1646 */
	+#line 1733 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5849,7 +5849,7 @@
	break;

	case 253:
	-#line 1737 "parser.y" /* yacc.c:1646 */
	+#line 1739 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5860,7 +5860,7 @@
	break;

	case 254:
	-#line 1743 "parser.y" /* yacc.c:1646 */
	+#line 1745 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5871,7 +5871,7 @@
	break;

	case 255:
	-#line 1749 "parser.y" /* yacc.c:1646 */
	+#line 1751 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5882,7 +5882,7 @@
	break;

	case 256:
	-#line 1755 "parser.y" /* yacc.c:1646 */
	+#line 1757 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5893,7 +5893,7 @@
	break;

	case 257:
	-#line 1761 "parser.y" /* yacc.c:1646 */
	+#line 1763 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_BINARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -5904,7 +5904,7 @@
	break;

	case 260:
	-#line 1769 "parser.y" /* yacc.c:1646 */
	+#line 1771 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_TERNARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-4]));
	@@ -5917,7 +5917,7 @@
	break;

	case 261:
	-#line 1777 "parser.y" /* yacc.c:1646 */
	+#line 1779 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_TERNARY_EXPRESSION);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -5930,7 +5930,7 @@
	break;

	case 263:
	-#line 1786 "parser.y" /* yacc.c:1646 */
	+#line 1788 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CAST_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
	@@ -5940,7 +5940,7 @@
	break;

	case 264:
	-#line 1791 "parser.y" /* yacc.c:1646 */
	+#line 1793 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CAST_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
	@@ -5950,7 +5950,7 @@
	break;

	case 265:
	-#line 1796 "parser.y" /* yacc.c:1646 */
	+#line 1798 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CAST_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
	@@ -5960,7 +5960,7 @@
	break;

	case 266:
	-#line 1801 "parser.y" /* yacc.c:1646 */
	+#line 1803 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CAST_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
	@@ -5970,7 +5970,7 @@
	break;

	case 267:
	-#line 1806 "parser.y" /* yacc.c:1646 */
	+#line 1808 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CAST_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
	@@ -5980,7 +5980,7 @@
	break;

	case 268:
	-#line 1811 "parser.y" /* yacc.c:1646 */
	+#line 1813 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CAST_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
	@@ -5990,7 +5990,7 @@
	break;

	case 269:
	-#line 1816 "parser.y" /* yacc.c:1646 */
	+#line 1818 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CAST_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_CAST));
	@@ -6000,7 +6000,7 @@
	break;

	case 270:
	-#line 1821 "parser.y" /* yacc.c:1646 */
	+#line 1823 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	@@ -6010,7 +6010,7 @@
	break;

	case 271:
	-#line 1826 "parser.y" /* yacc.c:1646 */
	+#line 1828 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	@@ -6020,7 +6020,7 @@
	break;

	case 272:
	-#line 1831 "parser.y" /* yacc.c:1646 */
	+#line 1833 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[0]), n_BACKTICKS_EXPRESSION);
	(yyval) = (yyvsp[0]);
	@@ -6029,7 +6029,7 @@
	break;

	case 276:
	-#line 1838 "parser.y" /* yacc.c:1646 */
	+#line 1840 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	@@ -6039,7 +6039,7 @@
	break;

	case 277:
	-#line 1843 "parser.y" /* yacc.c:1646 */
	+#line 1845 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[0]), n_YIELD);
	(yyvsp[0])->appendChild(NNEW(n_EMPTY));
	@@ -6050,7 +6050,7 @@
	break;

	case 278:
	-#line 1852 "parser.y" /* yacc.c:1646 */
	+#line 1854 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyvsp[-8]), n_FUNCTION_DECLARATION, (yyvsp[0]));
	(yyvsp[-8])->appendChild(NNEW(n_EMPTY));
	@@ -6066,7 +6066,7 @@
	break;

	case 279:
	-#line 1866 "parser.y" /* yacc.c:1646 */
	+#line 1868 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyvsp[-8]), n_FUNCTION_DECLARATION, (yyvsp[0]));
	NMORE((yyvsp[-8]), (yyvsp[-9]));
	@@ -6088,7 +6088,7 @@
	break;

	case 280:
	-#line 1886 "parser.y" /* yacc.c:1646 */
	+#line 1888 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_YIELD);
	(yyvsp[0])->appendChild(NNEW(n_EMPTY));
	@@ -6099,7 +6099,7 @@
	break;

	case 281:
	-#line 1892 "parser.y" /* yacc.c:1646 */
	+#line 1894 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_YIELD);
	(yyvsp[0])->appendChild(NNEW(n_EMPTY));
	@@ -6110,7 +6110,7 @@
	break;

	case 282:
	-#line 1898 "parser.y" /* yacc.c:1646 */
	+#line 1900 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-3]), n_YIELD);
	(yyvsp[-3])->appendChild((yyvsp[-2]));
	@@ -6121,7 +6121,7 @@
	break;

	case 283:
	-#line 1904 "parser.y" /* yacc.c:1646 */
	+#line 1906 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-3]), n_YIELD);
	(yyvsp[-3])->appendChild((yyvsp[-2]));
	@@ -6132,7 +6132,7 @@
	break;

	case 285:
	-#line 1917 "parser.y" /* yacc.c:1646 */
	+#line 1919 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	@@ -6140,7 +6140,7 @@
	break;

	case 286:
	-#line 1920 "parser.y" /* yacc.c:1646 */
	+#line 1922 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-3]), n_LEXICAL_VARIABLE_LIST);
	(yyvsp[-3])->appendChildren((yyvsp[-1]));
	@@ -6150,7 +6150,7 @@
	break;

	case 287:
	-#line 1928 "parser.y" /* yacc.c:1646 */
	+#line 1930 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[-2])->appendChild(NTYPE((yyvsp[0]), n_VARIABLE));
	}
	@@ -6158,7 +6158,7 @@
	break;

	case 288:
	-#line 1931 "parser.y" /* yacc.c:1646 */
	+#line 1933 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_VARIABLE_REFERENCE);
	(yyvsp[-1])->appendChild(NTYPE((yyvsp[0]), n_VARIABLE));
	@@ -6168,7 +6168,7 @@
	break;

	case 289:
	-#line 1936 "parser.y" /* yacc.c:1646 */
	+#line 1938 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_LEXICAL_VARIABLE_LIST);
	(yyval)->appendChild(NTYPE((yyvsp[0]), n_VARIABLE));
	@@ -6177,7 +6177,7 @@
	break;

	case 290:
	-#line 1940 "parser.y" /* yacc.c:1646 */
	+#line 1942 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-1]), n_VARIABLE_REFERENCE);
	(yyvsp[-1])->appendChild(NTYPE((yyvsp[0]), n_VARIABLE));
	@@ -6188,7 +6188,7 @@
	break;

	case 291:
	-#line 1949 "parser.y" /* yacc.c:1646 */
	+#line 1951 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_FUNCTION_CALL);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -6198,7 +6198,7 @@
	break;

	case 292:
	-#line 1955 "parser.y" /* yacc.c:1646 */
	+#line 1957 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[-3]), (yyvsp[-5]));
	(yyval) = NNEW(n_FUNCTION_CALL);
	@@ -6209,7 +6209,7 @@
	break;

	case 293:
	-#line 1961 "parser.y" /* yacc.c:1646 */
	+#line 1963 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[-3]), (yyvsp[-4]));
	(yyval) = NNEW(n_FUNCTION_CALL);
	@@ -6220,7 +6220,7 @@
	break;

	case 294:
	-#line 1968 "parser.y" /* yacc.c:1646 */
	+#line 1970 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_STATIC_ACCESS);
	(yyval)->appendChild((yyvsp[-5]));
	@@ -6233,7 +6233,7 @@
	break;

	case 295:
	-#line 1977 "parser.y" /* yacc.c:1646 */
	+#line 1979 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_STATIC_ACCESS);
	(yyval)->appendChild((yyvsp[-5]));
	@@ -6246,7 +6246,7 @@
	break;

	case 296:
	-#line 1986 "parser.y" /* yacc.c:1646 */
	+#line 1988 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_STATIC_ACCESS);
	(yyval)->appendChild((yyvsp[-5]));
	@@ -6259,7 +6259,7 @@
	break;

	case 297:
	-#line 1995 "parser.y" /* yacc.c:1646 */
	+#line 1997 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_STATIC_ACCESS);
	(yyval)->appendChild((yyvsp[-5]));
	@@ -6272,7 +6272,7 @@
	break;

	case 298:
	-#line 2003 "parser.y" /* yacc.c:1646 */
	+#line 2005 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_FUNCTION_CALL);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -6282,7 +6282,7 @@
	break;

	case 299:
	-#line 2011 "parser.y" /* yacc.c:1646 */
	+#line 2013 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
	}
	@@ -6290,7 +6290,7 @@
	break;

	case 300:
	-#line 2014 "parser.y" /* yacc.c:1646 */
	+#line 2016 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
	}
	@@ -6298,7 +6298,7 @@
	break;

	case 301:
	-#line 2017 "parser.y" /* yacc.c:1646 */
	+#line 2019 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[0]), (yyvsp[-2]));
	(yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
	@@ -6307,7 +6307,7 @@
	break;

	case 302:
	-#line 2021 "parser.y" /* yacc.c:1646 */
	+#line 2023 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[0]), (yyvsp[-1]));
	(yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
	@@ -6316,7 +6316,7 @@
	break;

	case 303:
	-#line 2028 "parser.y" /* yacc.c:1646 */
	+#line 2030 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
	}
	@@ -6324,7 +6324,7 @@
	break;

	case 304:
	-#line 2031 "parser.y" /* yacc.c:1646 */
	+#line 2033 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[0]), (yyvsp[-2]));
	(yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
	@@ -6333,7 +6333,7 @@
	break;

	case 305:
	-#line 2035 "parser.y" /* yacc.c:1646 */
	+#line 2037 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[0]), (yyvsp[-1]));
	(yyval) = NTYPE((yyvsp[0]), n_CLASS_NAME);
	@@ -6342,7 +6342,7 @@
	break;

	case 308:
	-#line 2050 "parser.y" /* yacc.c:1646 */
	+#line 2052 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_OBJECT_PROPERTY_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -6359,7 +6359,7 @@
	break;

	case 310:
	-#line 2066 "parser.y" /* yacc.c:1646 */
	+#line 2068 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[-1])->appendChild((yyvsp[0]));
	}
	@@ -6367,7 +6367,7 @@
	break;

	case 311:
	-#line 2069 "parser.y" /* yacc.c:1646 */
	+#line 2071 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	@@ -6375,7 +6375,7 @@
	break;

	case 312:
	-#line 2075 "parser.y" /* yacc.c:1646 */
	+#line 2077 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[0]);
	}
	@@ -6383,7 +6383,7 @@
	break;

	case 313:
	-#line 2081 "parser.y" /* yacc.c:1646 */
	+#line 2083 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	@@ -6391,7 +6391,7 @@
	break;

	case 314:
	-#line 2084 "parser.y" /* yacc.c:1646 */
	+#line 2086 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyvsp[-1]), n_EMPTY, (yyvsp[0]));
	(yyval) = (yyvsp[-1]);
	@@ -6400,7 +6400,7 @@
	break;

	case 315:
	-#line 2088 "parser.y" /* yacc.c:1646 */
	+#line 2090 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyvsp[-2]), n_PARENTHETICAL_EXPRESSION, (yyvsp[0]));
	(yyvsp[-2])->appendChild((yyvsp[-1]));
	@@ -6410,7 +6410,7 @@
	break;

	case 316:
	-#line 2096 "parser.y" /* yacc.c:1646 */
	+#line 2098 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	@@ -6418,7 +6418,7 @@
	break;

	case 317:
	-#line 2099 "parser.y" /* yacc.c:1646 */
	+#line 2101 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
	}
	@@ -6426,7 +6426,7 @@
	break;

	case 318:
	-#line 2105 "parser.y" /* yacc.c:1646 */
	+#line 2107 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_NUMERIC_SCALAR);
	}
	@@ -6434,7 +6434,7 @@
	break;

	case 319:
	-#line 2108 "parser.y" /* yacc.c:1646 */
	+#line 2110 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_NUMERIC_SCALAR);
	}
	@@ -6442,7 +6442,7 @@
	break;

	case 320:
	-#line 2111 "parser.y" /* yacc.c:1646 */
	+#line 2113 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_STRING_SCALAR);
	}
	@@ -6450,7 +6450,7 @@
	break;

	case 321:
	-#line 2114 "parser.y" /* yacc.c:1646 */
	+#line 2116 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
	}
	@@ -6458,7 +6458,7 @@
	break;

	case 322:
	-#line 2117 "parser.y" /* yacc.c:1646 */
	+#line 2119 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
	}
	@@ -6466,7 +6466,7 @@
	break;

	case 323:
	-#line 2120 "parser.y" /* yacc.c:1646 */
	+#line 2122 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
	}
	@@ -6474,7 +6474,7 @@
	break;

	case 324:
	-#line 2123 "parser.y" /* yacc.c:1646 */
	+#line 2125 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
	}
	@@ -6482,7 +6482,7 @@
	break;

	case 325:
	-#line 2126 "parser.y" /* yacc.c:1646 */
	+#line 2128 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
	}
	@@ -6490,7 +6490,7 @@
	break;

	case 326:
	-#line 2129 "parser.y" /* yacc.c:1646 */
	+#line 2131 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
	}
	@@ -6498,7 +6498,7 @@
	break;

	case 327:
	-#line 2132 "parser.y" /* yacc.c:1646 */
	+#line 2134 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
	}
	@@ -6506,7 +6506,7 @@
	break;

	case 328:
	-#line 2135 "parser.y" /* yacc.c:1646 */
	+#line 2137 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_MAGIC_SCALAR);
	}
	@@ -6514,7 +6514,7 @@
	break;

	case 329:
	-#line 2138 "parser.y" /* yacc.c:1646 */
	+#line 2140 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_HEREDOC);
	}
	@@ -6522,7 +6522,7 @@
	break;

	case 332:
	-#line 2146 "parser.y" /* yacc.c:1646 */
	+#line 2148 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[0]), (yyvsp[-2]));
	(yyval) = (yyvsp[0]);
	@@ -6531,7 +6531,7 @@
	break;

	case 333:
	-#line 2150 "parser.y" /* yacc.c:1646 */
	+#line 2152 "parser.y" /* yacc.c:1646 */
	{
	NMORE((yyvsp[0]), (yyvsp[-1]));
	(yyval) = (yyvsp[0]);
	@@ -6540,7 +6540,7 @@
	break;

	case 334:
	-#line 2154 "parser.y" /* yacc.c:1646 */
	+#line 2156 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	@@ -6550,7 +6550,7 @@
	break;

	case 335:
	-#line 2159 "parser.y" /* yacc.c:1646 */
	+#line 2161 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_UNARY_PREFIX_EXPRESSION);
	(yyval)->appendChild(NTYPE((yyvsp[-1]), n_OPERATOR));
	@@ -6560,7 +6560,7 @@
	break;

	case 336:
	-#line 2164 "parser.y" /* yacc.c:1646 */
	+#line 2166 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-3]), n_ARRAY_LITERAL);
	(yyvsp[-3])->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
	@@ -6570,7 +6570,7 @@
	break;

	case 337:
	-#line 2169 "parser.y" /* yacc.c:1646 */
	+#line 2171 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_ARRAY_LITERAL);
	(yyvsp[-2])->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
	@@ -6580,7 +6580,7 @@
	break;

	case 339:
	-#line 2178 "parser.y" /* yacc.c:1646 */
	+#line 2180 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_STATIC_ACCESS);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -6590,7 +6590,7 @@
	break;

	case 343:
	-#line 2189 "parser.y" /* yacc.c:1646 */
	+#line 2191 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NMORE((yyvsp[0]), (yyvsp[-2]));
	}
	@@ -6598,7 +6598,7 @@
	break;

	case 344:
	-#line 2192 "parser.y" /* yacc.c:1646 */
	+#line 2194 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NMORE((yyvsp[0]), (yyvsp[-1]));
	}
	@@ -6606,7 +6606,7 @@
	break;

	case 346:
	-#line 2199 "parser.y" /* yacc.c:1646 */
	+#line 2201 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE_LIST);
	}
	@@ -6614,7 +6614,7 @@
	break;

	case 347:
	-#line 2202 "parser.y" /* yacc.c:1646 */
	+#line 2204 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NMORE((yyvsp[-1]), (yyvsp[0]));
	}
	@@ -6622,7 +6622,7 @@
	break;

	case 348:
	-#line 2208 "parser.y" /* yacc.c:1646 */
	+#line 2210 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	@@ -6630,7 +6630,7 @@
	break;

	case 350:
	-#line 2219 "parser.y" /* yacc.c:1646 */
	+#line 2221 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -6642,7 +6642,7 @@
	break;

	case 351:
	-#line 2226 "parser.y" /* yacc.c:1646 */
	+#line 2228 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild(NNEW(n_EMPTY));
	@@ -6654,7 +6654,7 @@
	break;

	case 352:
	-#line 2233 "parser.y" /* yacc.c:1646 */
	+#line 2235 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -6666,7 +6666,7 @@
	break;

	case 353:
	-#line 2240 "parser.y" /* yacc.c:1646 */
	+#line 2242 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild(NNEW(n_EMPTY));
	@@ -6678,7 +6678,7 @@
	break;

	case 359:
	-#line 2270 "parser.y" /* yacc.c:1646 */
	+#line 2272 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_OBJECT_PROPERTY_ACCESS);
	(yyval)->appendChild((yyvsp[-4]));
	@@ -6706,7 +6706,7 @@
	break;

	case 361:
	-#line 2297 "parser.y" /* yacc.c:1646 */
	+#line 2299 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[-1])->appendChildren((yyvsp[0]));
	}
	@@ -6714,7 +6714,7 @@
	break;

	case 362:
	-#line 2300 "parser.y" /* yacc.c:1646 */
	+#line 2302 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	@@ -6722,7 +6722,7 @@
	break;

	case 363:
	-#line 2306 "parser.y" /* yacc.c:1646 */
	+#line 2308 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	(yyval)->appendChild((yyvsp[-1]));
	@@ -6734,7 +6734,7 @@
	break;

	case 364:
	-#line 2316 "parser.y" /* yacc.c:1646 */
	+#line 2318 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -6745,7 +6745,7 @@
	break;

	case 365:
	-#line 2322 "parser.y" /* yacc.c:1646 */
	+#line 2324 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -6756,7 +6756,7 @@
	break;

	case 366:
	-#line 2331 "parser.y" /* yacc.c:1646 */
	+#line 2333 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
	}
	@@ -6764,7 +6764,7 @@
	break;

	case 369:
	-#line 2339 "parser.y" /* yacc.c:1646 */
	+#line 2341 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	@@ -6772,7 +6772,7 @@
	break;

	case 371:
	-#line 2346 "parser.y" /* yacc.c:1646 */
	+#line 2348 "parser.y" /* yacc.c:1646 */
	{
	xhpast::Node *last = (yyvsp[-1]);
	NMORE((yyvsp[-1]), (yyvsp[0]));
	@@ -6789,7 +6789,7 @@
	break;

	case 372:
	-#line 2361 "parser.y" /* yacc.c:1646 */
	+#line 2363 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_STATIC_ACCESS);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -6799,7 +6799,7 @@
	break;

	case 373:
	-#line 2366 "parser.y" /* yacc.c:1646 */
	+#line 2368 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_STATIC_ACCESS);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -6809,7 +6809,7 @@
	break;

	case 375:
	-#line 2378 "parser.y" /* yacc.c:1646 */
	+#line 2380 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -6820,7 +6820,7 @@
	break;

	case 376:
	-#line 2384 "parser.y" /* yacc.c:1646 */
	+#line 2386 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -6831,7 +6831,7 @@
	break;

	case 381:
	-#line 2400 "parser.y" /* yacc.c:1646 */
	+#line 2402 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
	}
	@@ -6839,7 +6839,7 @@
	break;

	case 382:
	-#line 2403 "parser.y" /* yacc.c:1646 */
	+#line 2405 "parser.y" /* yacc.c:1646 */
	{
	xhpast::Node *last = (yyvsp[-1]);
	NMORE((yyvsp[-1]), (yyvsp[0]));
	@@ -6856,7 +6856,7 @@
	break;

	case 384:
	-#line 2419 "parser.y" /* yacc.c:1646 */
	+#line 2421 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -6867,7 +6867,7 @@
	break;

	case 385:
	-#line 2425 "parser.y" /* yacc.c:1646 */
	+#line 2427 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -6878,7 +6878,7 @@
	break;

	case 387:
	-#line 2435 "parser.y" /* yacc.c:1646 */
	+#line 2437 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[0]), n_VARIABLE);
	}
	@@ -6886,7 +6886,7 @@
	break;

	case 388:
	-#line 2438 "parser.y" /* yacc.c:1646 */
	+#line 2440 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyvsp[-3]), n_VARIABLE_EXPRESSION, (yyvsp[0]));
	(yyvsp[-3])->appendChild((yyvsp[-1]));
	@@ -6896,7 +6896,7 @@
	break;

	case 389:
	-#line 2446 "parser.y" /* yacc.c:1646 */
	+#line 2448 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	@@ -6904,7 +6904,7 @@
	break;

	case 390:
	-#line 2449 "parser.y" /* yacc.c:1646 */
	+#line 2451 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[0]);
	}
	@@ -6912,7 +6912,7 @@
	break;

	case 393:
	-#line 2460 "parser.y" /* yacc.c:1646 */
	+#line 2462 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -6923,7 +6923,7 @@
	break;

	case 394:
	-#line 2466 "parser.y" /* yacc.c:1646 */
	+#line 2468 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -6934,7 +6934,7 @@
	break;

	case 396:
	-#line 2476 "parser.y" /* yacc.c:1646 */
	+#line 2478 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[0]), n_STRING);
	(yyval) = (yyvsp[0]);
	@@ -6943,7 +6943,7 @@
	break;

	case 397:
	-#line 2480 "parser.y" /* yacc.c:1646 */
	+#line 2482 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
	}
	@@ -6951,7 +6951,7 @@
	break;

	case 398:
	-#line 2486 "parser.y" /* yacc.c:1646 */
	+#line 2488 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[0]), n_VARIABLE_VARIABLE);
	}
	@@ -6959,7 +6959,7 @@
	break;

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

	@@ -6976,7 +6976,7 @@
	break;

	case 400:
	-#line 2504 "parser.y" /* yacc.c:1646 */
	+#line 2506 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[-2])->appendChild((yyvsp[0]));
	}
	@@ -6984,7 +6984,7 @@
	break;

	case 401:
	-#line 2507 "parser.y" /* yacc.c:1646 */
	+#line 2509 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ASSIGNMENT_LIST);
	(yyval)->appendChild((yyvsp[0]));
	@@ -6993,7 +6993,7 @@
	break;

	case 403:
	-#line 2515 "parser.y" /* yacc.c:1646 */
	+#line 2517 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_LIST);
	(yyval)->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
	@@ -7002,7 +7002,7 @@
	break;

	case 404:
	-#line 2519 "parser.y" /* yacc.c:1646 */
	+#line 2521 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	}
	@@ -7010,7 +7010,7 @@
	break;

	case 405:
	-#line 2525 "parser.y" /* yacc.c:1646 */
	+#line 2527 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE_LIST);
	}
	@@ -7018,7 +7018,7 @@
	break;

	case 406:
	-#line 2528 "parser.y" /* yacc.c:1646 */
	+#line 2530 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NMORE((yyvsp[-1]), (yyvsp[0]));
	}
	@@ -7026,7 +7026,7 @@
	break;

	case 407:
	-#line 2534 "parser.y" /* yacc.c:1646 */
	+#line 2536 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -7038,7 +7038,7 @@
	break;

	case 408:
	-#line 2541 "parser.y" /* yacc.c:1646 */
	+#line 2543 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild(NNEW(n_EMPTY));
	@@ -7050,7 +7050,7 @@
	break;

	case 409:
	-#line 2548 "parser.y" /* yacc.c:1646 */
	+#line 2550 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -7062,7 +7062,7 @@
	break;

	case 410:
	-#line 2555 "parser.y" /* yacc.c:1646 */
	+#line 2557 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild(NNEW(n_EMPTY));
	@@ -7074,7 +7074,7 @@
	break;

	case 411:
	-#line 2562 "parser.y" /* yacc.c:1646 */
	+#line 2564 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -7086,7 +7086,7 @@
	break;

	case 412:
	-#line 2569 "parser.y" /* yacc.c:1646 */
	+#line 2571 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild(NNEW(n_EMPTY));
	@@ -7098,7 +7098,7 @@
	break;

	case 413:
	-#line 2576 "parser.y" /* yacc.c:1646 */
	+#line 2578 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -7110,7 +7110,7 @@
	break;

	case 414:
	-#line 2583 "parser.y" /* yacc.c:1646 */
	+#line 2585 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_ARRAY_VALUE);
	(yyval)->appendChild(NNEW(n_EMPTY));
	@@ -7122,7 +7122,7 @@
	break;

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

	@@ -7137,7 +7137,7 @@
	break;

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

	@@ -7152,7 +7152,7 @@
	break;

	case 417:
	-#line 2613 "parser.y" /* yacc.c:1646 */
	+#line 2615 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[-1]), n_INCLUDE_FILE)->appendChild((yyvsp[0]));
	}
	@@ -7160,7 +7160,7 @@
	break;

	case 418:
	-#line 2616 "parser.y" /* yacc.c:1646 */
	+#line 2618 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[-1]), n_INCLUDE_FILE)->appendChild((yyvsp[0]));
	}
	@@ -7168,7 +7168,7 @@
	break;

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

	@@ -7183,7 +7183,7 @@
	break;

	case 420:
	-#line 2629 "parser.y" /* yacc.c:1646 */
	+#line 2631 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[-1]), n_INCLUDE_FILE)->appendChild((yyvsp[0]));
	}
	@@ -7191,7 +7191,7 @@
	break;

	case 421:
	-#line 2632 "parser.y" /* yacc.c:1646 */
	+#line 2634 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NTYPE((yyvsp[-1]), n_INCLUDE_FILE)->appendChild((yyvsp[0]));
	}
	@@ -7199,7 +7199,7 @@
	break;

	case 422:
	-#line 2638 "parser.y" /* yacc.c:1646 */
	+#line 2640 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_EMPTY);
	(yyval)->appendChild((yyvsp[0]));
	@@ -7208,7 +7208,7 @@
	break;

	case 423:
	-#line 2642 "parser.y" /* yacc.c:1646 */
	+#line 2644 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = (yyvsp[-2])->appendChild((yyvsp[0]));
	}
	@@ -7216,7 +7216,7 @@
	break;

	case 424:
	-#line 2648 "parser.y" /* yacc.c:1646 */
	+#line 2650 "parser.y" /* yacc.c:1646 */
	{
	NSPAN((yyvsp[-2]), n_PARENTHETICAL_EXPRESSION, (yyvsp[0]));
	(yyvsp[-2])->appendChild((yyvsp[-1]));
	@@ -7226,7 +7226,7 @@
	break;

	case 425:
	-#line 2653 "parser.y" /* yacc.c:1646 */
	+#line 2655 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]));
	}
	@@ -7234,7 +7234,7 @@
	break;

	case 426:
	-#line 2659 "parser.y" /* yacc.c:1646 */
	+#line 2661 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -7245,7 +7245,7 @@
	break;

	case 427:
	-#line 2665 "parser.y" /* yacc.c:1646 */
	+#line 2667 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild((yyvsp[-3]));
	@@ -7256,7 +7256,7 @@
	break;

	case 428:
	-#line 2671 "parser.y" /* yacc.c:1646 */
	+#line 2673 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_INDEX_ACCESS);
	(yyval)->appendChild(NTYPE((yyvsp[-3]), n_STRING_SCALAR));
	@@ -7267,7 +7267,7 @@
	break;

	case 429:
	-#line 2680 "parser.y" /* yacc.c:1646 */
	+#line 2682 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-3]), n_ARRAY_LITERAL);
	(yyvsp[-3])->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
	@@ -7277,7 +7277,7 @@
	break;

	case 430:
	-#line 2685 "parser.y" /* yacc.c:1646 */
	+#line 2687 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_ARRAY_LITERAL);
	(yyvsp[-2])->appendChild(NEXPAND((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])));
	@@ -7287,7 +7287,7 @@
	break;

	case 431:
	-#line 2693 "parser.y" /* yacc.c:1646 */
	+#line 2695 "parser.y" /* yacc.c:1646 */
	{
	NTYPE((yyvsp[-2]), n_NEW);
	(yyvsp[-2])->appendChild((yyvsp[-1]));
	@@ -7298,7 +7298,7 @@
	break;

	case 432:
	-#line 2702 "parser.y" /* yacc.c:1646 */
	+#line 2704 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_STATIC_ACCESS);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -7308,7 +7308,7 @@
	break;

	case 433:
	-#line 2707 "parser.y" /* yacc.c:1646 */
	+#line 2709 "parser.y" /* yacc.c:1646 */
	{
	(yyval) = NNEW(n_CLASS_STATIC_ACCESS);
	(yyval)->appendChild((yyvsp[-2]));
	@@ -7546,7 +7546,7 @@
	#endif
	return yyresult;
	}
	-#line 2714 "parser.y" /* yacc.c:1906 */
	+#line 2716 "parser.y" /* yacc.c:1906 */


	const char* yytokname(int tok) {

File Metadata

Mime Type: text/plain
Expires: Nov 1 2025, 8:25 PM (7 w, 2 d ago)
Storage Engine: amazon-s3
Storage Format: Encrypted (AES-256-CBC)
Storage Handle: phabricator/secure/ba/3w/b5iqrw2za6nhhfae
Default Alt Text: D13974.diff (84 KB)

D13974.diffNo OneTemporaryActions

D13974.diffView Options

File Metadata

Event Timeline

D13974.diff
No OneTemporary
Actions

D13974.diff
View Options