Changes in src/Parser/parser.cc [064e3ff:8688ce1]

File:

• src/Parser/parser.cc (modified) (444 diffs)

src/Parser/parser.cc

@@ -354 +354 @@
         LabelNode *label;
         InitializerNode *in;
-        OperatorNode::Type op;
         bool flag;
 
@@ -360 +359 @@
 
 /* Line 293 of yacc.c  */
-#line 363 "Parser/parser.cc"
+#line 362 "Parser/parser.cc"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
@@ -372 +371 @@
 
 /* Line 343 of yacc.c  */
-#line 375 "Parser/parser.cc"
+#line 374 "Parser/parser.cc"
 
 #ifdef short
@@ -1017 +1016 @@
 static const yytype_uint16 yyrline[] =
 {
-       0,   292,   292,   298,   307,   308,   309,   313,   314,   315,
-     319,   320,   324,   325,   329,   330,   334,   335,   341,   343,
-     345,   347,   352,   353,   359,   363,   365,   366,   368,   369,
-     371,   373,   375,   383,   384,   390,   391,   392,   397,   399,
-     404,   405,   409,   413,   415,   417,   419,   424,   427,   429,
-     431,   433,   438,   440,   442,   444,   446,   448,   450,   452,
-     454,   456,   458,   465,   466,   468,   472,   473,   474,   475,
-     479,   480,   482,   487,   488,   490,   492,   497,   498,   500,
-     505,   506,   508,   513,   514,   516,   518,   520,   525,   526,
-     528,   533,   534,   539,   540,   545,   546,   551,   552,   557,
-     558,   563,   564,   566,   568,   573,   578,   579,   581,   583,
-     589,   590,   596,   598,   600,   602,   607,   608,   613,   614,
-     615,   616,   617,   618,   619,   620,   621,   622,   626,   627,
-     633,   634,   640,   641,   642,   643,   644,   645,   646,   647,
-     648,   658,   665,   667,   677,   678,   683,   685,   691,   693,
-     697,   698,   703,   708,   711,   713,   715,   725,   727,   738,
-     739,   741,   745,   747,   751,   752,   757,   758,   762,   767,
-     768,   772,   774,   780,   781,   785,   787,   789,   791,   797,
-     798,   802,   804,   809,   811,   813,   818,   820,   825,   827,
-     831,   834,   838,   841,   845,   847,   851,   853,   860,   862,
-     864,   873,   875,   877,   879,   881,   886,   888,   890,   892,
-     897,   910,   911,   916,   918,   923,   927,   929,   931,   933,
-     935,   941,   942,   948,   949,   953,   954,   959,   961,   967,
-     968,   970,   975,   977,   984,   986,   990,   991,   996,   998,
-    1002,  1003,  1007,  1009,  1013,  1014,  1018,  1019,  1023,  1024,
-    1039,  1040,  1041,  1042,  1043,  1047,  1052,  1059,  1069,  1074,
-    1079,  1087,  1092,  1097,  1102,  1107,  1115,  1137,  1142,  1149,
-    1151,  1158,  1163,  1168,  1179,  1184,  1189,  1194,  1199,  1208,
-    1213,  1221,  1222,  1223,  1224,  1230,  1235,  1243,  1244,  1245,
-    1246,  1250,  1251,  1252,  1253,  1258,  1259,  1268,  1269,  1274,
-    1275,  1280,  1282,  1284,  1286,  1288,  1291,  1290,  1302,  1303,
-    1305,  1315,  1316,  1321,  1325,  1327,  1329,  1331,  1333,  1335,
-    1337,  1339,  1344,  1346,  1348,  1350,  1352,  1354,  1356,  1358,
-    1360,  1362,  1364,  1366,  1368,  1374,  1375,  1377,  1379,  1381,
-    1386,  1387,  1393,  1394,  1396,  1398,  1403,  1405,  1407,  1409,
-    1414,  1415,  1417,  1419,  1424,  1425,  1427,  1432,  1433,  1435,
-    1437,  1442,  1444,  1446,  1451,  1452,  1456,  1458,  1464,  1463,
-    1467,  1469,  1474,  1476,  1482,  1483,  1488,  1489,  1491,  1492,
-    1501,  1502,  1504,  1506,  1511,  1513,  1519,  1520,  1522,  1525,
-    1528,  1533,  1534,  1539,  1544,  1548,  1550,  1556,  1555,  1562,
-    1564,  1570,  1571,  1579,  1580,  1584,  1585,  1586,  1588,  1590,
-    1597,  1598,  1600,  1602,  1607,  1608,  1614,  1615,  1619,  1620,
-    1625,  1626,  1627,  1629,  1637,  1638,  1640,  1643,  1645,  1649,
-    1650,  1651,  1653,  1655,  1659,  1664,  1672,  1673,  1682,  1684,
-    1689,  1690,  1691,  1695,  1696,  1697,  1701,  1702,  1703,  1707,
-    1708,  1709,  1714,  1715,  1716,  1717,  1723,  1724,  1726,  1731,
-    1732,  1737,  1738,  1739,  1740,  1741,  1756,  1757,  1762,  1763,
-    1771,  1773,  1775,  1778,  1780,  1782,  1805,  1806,  1808,  1810,
-    1815,  1816,  1818,  1823,  1828,  1829,  1835,  1834,  1838,  1842,
-    1844,  1846,  1852,  1853,  1858,  1863,  1865,  1870,  1872,  1873,
-    1875,  1880,  1882,  1884,  1889,  1891,  1896,  1901,  1909,  1915,
-    1914,  1928,  1929,  1934,  1935,  1939,  1944,  1949,  1957,  1962,
-    1973,  1974,  1985,  1986,  1992,  1993,  1997,  1998,  1999,  2002,
-    2001,  2012,  2021,  2027,  2033,  2042,  2048,  2054,  2060,  2066,
-    2074,  2080,  2088,  2094,  2103,  2104,  2105,  2109,  2113,  2115,
-    2120,  2121,  2125,  2126,  2131,  2137,  2138,  2141,  2143,  2144,
-    2148,  2149,  2150,  2151,  2185,  2187,  2188,  2190,  2195,  2200,
-    2205,  2207,  2209,  2214,  2216,  2218,  2220,  2225,  2227,  2236,
-    2238,  2239,  2244,  2246,  2248,  2253,  2255,  2257,  2262,  2264,
-    2266,  2275,  2276,  2277,  2281,  2283,  2285,  2290,  2292,  2294,
-    2299,  2301,  2303,  2318,  2320,  2321,  2323,  2328,  2329,  2334,
-    2336,  2338,  2343,  2345,  2347,  2349,  2354,  2356,  2358,  2368,
-    2370,  2371,  2373,  2378,  2380,  2382,  2387,  2389,  2391,  2393,
-    2398,  2400,  2402,  2433,  2435,  2436,  2438,  2443,  2448,  2456,
-    2458,  2460,  2465,  2467,  2472,  2474,  2488,  2489,  2491,  2496,
-    2498,  2500,  2502,  2504,  2509,  2510,  2512,  2514,  2519,  2521,
-    2523,  2529,  2531,  2533,  2537,  2539,  2541,  2543,  2557,  2558,
-    2560,  2565,  2567,  2569,  2571,  2573,  2578,  2579,  2581,  2583,
-    2588,  2590,  2592,  2598,  2599,  2601,  2610,  2613,  2615,  2618,
-    2620,  2622,  2635,  2636,  2638,  2643,  2645,  2647,  2649,  2651,
-    2656,  2657,  2659,  2661,  2666,  2668,  2676,  2677,  2678,  2683,
-    2684,  2688,  2690,  2692,  2694,  2696,  2698,  2705,  2707,  2709,
-    2711,  2713,  2715,  2717,  2719,  2721,  2723,  2728,  2730,  2732,
-    2737,  2763,  2764,  2766,  2770,  2771,  2775,  2777,  2779,  2781,
-    2783,  2785,  2792,  2794,  2796,  2798,  2800,  2802,  2807,  2812,
-    2814,  2816,  2834,  2836,  2841,  2842
+       0,   290,   290,   296,   305,   306,   307,   311,   312,   313,
+     317,   318,   322,   323,   327,   328,   332,   333,   339,   341,
+     343,   345,   350,   351,   357,   361,   363,   364,   366,   367,
+     369,   371,   373,   381,   382,   388,   389,   390,   395,   397,
+     402,   403,   407,   411,   413,   415,   417,   422,   425,   427,
+     429,   431,   436,   438,   440,   442,   444,   446,   448,   450,
+     452,   454,   456,   463,   464,   466,   470,   471,   472,   473,
+     477,   478,   480,   485,   486,   488,   490,   495,   496,   498,
+     503,   504,   506,   511,   512,   514,   516,   518,   523,   524,
+     526,   531,   532,   537,   538,   543,   544,   549,   550,   555,
+     556,   561,   562,   564,   566,   571,   576,   577,   579,   581,
+     587,   588,   594,   596,   598,   600,   605,   606,   611,   612,
+     613,   614,   615,   616,   617,   618,   619,   620,   624,   625,
+     631,   632,   638,   639,   640,   641,   642,   643,   644,   645,
+     646,   656,   663,   665,   675,   676,   681,   683,   689,   691,
+     695,   696,   701,   706,   709,   711,   713,   723,   725,   736,
+     737,   739,   743,   744,   748,   749,   754,   755,   759,   764,
+     765,   769,   771,   777,   778,   782,   784,   786,   788,   794,
+     795,   799,   801,   806,   808,   810,   815,   817,   822,   824,
+     828,   831,   835,   838,   842,   844,   848,   850,   857,   859,
+     861,   870,   872,   874,   876,   878,   883,   885,   887,   889,
+     894,   907,   908,   913,   915,   920,   924,   926,   928,   930,
+     932,   938,   939,   945,   946,   950,   951,   956,   958,   964,
+     965,   967,   972,   974,   981,   983,   987,   988,   993,   995,
+     999,  1000,  1004,  1006,  1010,  1011,  1015,  1016,  1020,  1021,
+    1036,  1037,  1038,  1039,  1040,  1044,  1049,  1056,  1066,  1071,
+    1076,  1084,  1089,  1094,  1099,  1104,  1112,  1134,  1139,  1146,
+    1148,  1155,  1160,  1165,  1176,  1181,  1186,  1191,  1196,  1205,
+    1210,  1218,  1219,  1220,  1221,  1227,  1232,  1240,  1241,  1242,
+    1243,  1247,  1248,  1249,  1250,  1255,  1256,  1265,  1266,  1271,
+    1272,  1277,  1279,  1281,  1283,  1285,  1288,  1287,  1299,  1300,
+    1302,  1312,  1313,  1318,  1322,  1324,  1326,  1328,  1330,  1332,
+    1334,  1336,  1341,  1343,  1345,  1347,  1349,  1351,  1353,  1355,
+    1357,  1359,  1361,  1363,  1365,  1371,  1372,  1374,  1376,  1378,
+    1383,  1384,  1390,  1391,  1393,  1395,  1400,  1402,  1404,  1406,
+    1411,  1412,  1414,  1416,  1421,  1422,  1424,  1429,  1430,  1432,
+    1434,  1439,  1441,  1443,  1448,  1449,  1453,  1455,  1461,  1460,
+    1464,  1466,  1471,  1473,  1479,  1480,  1485,  1486,  1488,  1489,
+    1498,  1499,  1501,  1503,  1508,  1510,  1516,  1517,  1519,  1522,
+    1525,  1530,  1531,  1536,  1541,  1545,  1547,  1553,  1552,  1559,
+    1561,  1567,  1568,  1576,  1577,  1581,  1582,  1583,  1585,  1587,
+    1594,  1595,  1597,  1599,  1604,  1605,  1611,  1612,  1616,  1617,
+    1622,  1623,  1624,  1626,  1634,  1635,  1637,  1640,  1642,  1646,
+    1647,  1648,  1650,  1652,  1656,  1661,  1669,  1670,  1679,  1681,
+    1686,  1687,  1688,  1692,  1693,  1694,  1698,  1699,  1700,  1704,
+    1705,  1706,  1711,  1712,  1713,  1714,  1720,  1721,  1723,  1728,
+    1729,  1734,  1735,  1736,  1737,  1738,  1753,  1754,  1759,  1760,
+    1768,  1770,  1772,  1775,  1777,  1779,  1802,  1803,  1805,  1807,
+    1812,  1813,  1815,  1820,  1825,  1826,  1832,  1831,  1835,  1839,
+    1841,  1843,  1849,  1850,  1855,  1860,  1862,  1867,  1869,  1870,
+    1872,  1877,  1879,  1881,  1886,  1888,  1893,  1898,  1906,  1912,
+    1911,  1925,  1926,  1931,  1932,  1936,  1941,  1946,  1954,  1959,
+    1970,  1971,  1982,  1983,  1989,  1990,  1994,  1995,  1996,  1999,
+    1998,  2009,  2018,  2024,  2030,  2039,  2045,  2051,  2057,  2063,
+    2071,  2077,  2085,  2091,  2100,  2101,  2102,  2106,  2110,  2112,
+    2117,  2118,  2122,  2123,  2128,  2134,  2135,  2138,  2140,  2141,
+    2145,  2146,  2147,  2148,  2182,  2184,  2185,  2187,  2192,  2197,
+    2202,  2204,  2206,  2211,  2213,  2215,  2217,  2222,  2224,  2233,
+    2235,  2236,  2241,  2243,  2245,  2250,  2252,  2254,  2259,  2261,
+    2263,  2272,  2273,  2274,  2278,  2280,  2282,  2287,  2289,  2291,
+    2296,  2298,  2300,  2315,  2317,  2318,  2320,  2325,  2326,  2331,
+    2333,  2335,  2340,  2342,  2344,  2346,  2351,  2353,  2355,  2365,
+    2367,  2368,  2370,  2375,  2377,  2379,  2384,  2386,  2388,  2390,
+    2395,  2397,  2399,  2430,  2432,  2433,  2435,  2440,  2445,  2453,
+    2455,  2457,  2462,  2464,  2469,  2471,  2485,  2486,  2488,  2493,
+    2495,  2497,  2499,  2501,  2506,  2507,  2509,  2511,  2516,  2518,
+    2520,  2526,  2528,  2530,  2534,  2536,  2538,  2540,  2554,  2555,
+    2557,  2562,  2564,  2566,  2568,  2570,  2575,  2576,  2578,  2580,
+    2585,  2587,  2589,  2595,  2596,  2598,  2607,  2610,  2612,  2615,
+    2617,  2619,  2632,  2633,  2635,  2640,  2642,  2644,  2646,  2648,
+    2653,  2654,  2656,  2658,  2663,  2665,  2673,  2674,  2675,  2680,
+    2681,  2685,  2687,  2689,  2691,  2693,  2695,  2702,  2704,  2706,
+    2708,  2710,  2712,  2714,  2716,  2718,  2720,  2725,  2727,  2729,
+    2734,  2760,  2761,  2763,  2767,  2768,  2772,  2774,  2776,  2778,
+    2780,  2782,  2789,  2791,  2793,  2795,  2797,  2799,  2804,  2809,
+    2811,  2813,  2831,  2833,  2838,  2839
 };
 #endif
@@ -5217 +5216 @@
 
 /* Line 1806 of yacc.c  */
-#line 292 "parser.yy"
+#line 290 "parser.yy"
     {
                         typedefTable.enterScope();
@@ -5226 +5225 @@
 
 /* Line 1806 of yacc.c  */
-#line 298 "parser.yy"
+#line 296 "parser.yy"
     {
                         typedefTable.leaveScope();
@@ -5235 +5234 @@
 
 /* Line 1806 of yacc.c  */
+#line 305 "parser.yy"
+    { (yyval.constant) = makeConstantInteger( *(yyvsp[(1) - (1)].tok) ); }
+    break;
+
+  case 5:
+
+/* Line 1806 of yacc.c  */
+#line 306 "parser.yy"
+    { (yyval.constant) = makeConstantFloat( *(yyvsp[(1) - (1)].tok) ); }
+    break;
+
+  case 6:
+
+/* Line 1806 of yacc.c  */
 #line 307 "parser.yy"
-    { (yyval.constant) = makeConstantInteger( *(yyvsp[(1) - (1)].tok) ); }
-    break;
-
-  case 5:
-
-/* Line 1806 of yacc.c  */
-#line 308 "parser.yy"
-    { (yyval.constant) = makeConstantFloat( *(yyvsp[(1) - (1)].tok) ); }
-    break;
-
-  case 6:
-
-/* Line 1806 of yacc.c  */
-#line 309 "parser.yy"
     { (yyval.constant) = makeConstantChar( *(yyvsp[(1) - (1)].tok) ); }
     break;
@@ -5256 +5255 @@
 
 /* Line 1806 of yacc.c  */
-#line 334 "parser.yy"
+#line 332 "parser.yy"
     { (yyval.constant) = makeConstantStr( *(yyvsp[(1) - (1)].tok) ); }
     break;
@@ -5263 +5262 @@
 
 /* Line 1806 of yacc.c  */
-#line 335 "parser.yy"
+#line 333 "parser.yy"
     { (yyval.constant) = (yyvsp[(1) - (2)].constant)->appendstr( (yyvsp[(2) - (2)].tok) ); }
     break;
 
   case 18:
+
+/* Line 1806 of yacc.c  */
+#line 340 "parser.yy"
+    { (yyval.en) = new VarRefNode( (yyvsp[(1) - (1)].tok) ); }
+    break;
+
+  case 19:
 
 /* Line 1806 of yacc.c  */
@@ -5274 +5280 @@
     break;
 
-  case 19:
+  case 20:
 
 /* Line 1806 of yacc.c  */
 #line 344 "parser.yy"
-    { (yyval.en) = new VarRefNode( (yyvsp[(1) - (1)].tok) ); }
-    break;
-
-  case 20:
+    { (yyval.en) = (yyvsp[(2) - (3)].en); }
+    break;
+
+  case 21:
 
 /* Line 1806 of yacc.c  */
 #line 346 "parser.yy"
-    { (yyval.en) = (yyvsp[(2) - (3)].en); }
-    break;
-
-  case 21:
-
-/* Line 1806 of yacc.c  */
-#line 348 "parser.yy"
     { (yyval.en) = new ValofExprNode( (yyvsp[(2) - (3)].sn) ); }
     break;
@@ -5298 +5297 @@
 
 /* Line 1806 of yacc.c  */
+#line 356 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Index ), (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en) ); }
+    break;
+
+  case 24:
+
+/* Line 1806 of yacc.c  */
 #line 358 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Index ), (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en) ); }
-    break;
-
-  case 24:
-
-/* Line 1806 of yacc.c  */
-#line 360 "parser.yy"
     { (yyval.en) = new CompositeExprNode( (yyvsp[(1) - (4)].en), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -5312 +5311 @@
 
 /* Line 1806 of yacc.c  */
-#line 364 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_fieldSel( (yyvsp[(1) - (3)].en), new VarRefNode( (yyvsp[(3) - (3)].tok) ) ) ); }
+#line 362 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::FieldSel ), (yyvsp[(1) - (3)].en), new VarRefNode( (yyvsp[(3) - (3)].tok) )); }
     break;
 
@@ -5319 +5318 @@
 
 /* Line 1806 of yacc.c  */
-#line 367 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_pfieldSel( (yyvsp[(1) - (3)].en), new VarRefNode( (yyvsp[(3) - (3)].tok) ) ) ); }
+#line 365 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::PFieldSel ), (yyvsp[(1) - (3)].en), new VarRefNode( (yyvsp[(3) - (3)].tok) )); }
     break;
 
@@ -5326 +5325 @@
 
 /* Line 1806 of yacc.c  */
+#line 368 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::IncrPost ), (yyvsp[(1) - (2)].en) ); }
+    break;
+
+  case 30:
+
+/* Line 1806 of yacc.c  */
 #line 370 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::IncrPost ), (yyvsp[(1) - (2)].en) ); }
-    break;
-
-  case 30:
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::DecrPost ), (yyvsp[(1) - (2)].en) ); }
+    break;
+
+  case 31:
 
 /* Line 1806 of yacc.c  */
 #line 372 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::DecrPost ), (yyvsp[(1) - (2)].en) ); }
-    break;
-
-  case 31:
+    { (yyval.en) = new CompoundLiteralNode( (yyvsp[(2) - (7)].decl), new InitializerNode( (yyvsp[(5) - (7)].in), true ) ); }
+    break;
+
+  case 32:
 
 /* Line 1806 of yacc.c  */
 #line 374 "parser.yy"
-    { (yyval.en) = new CompoundLiteralNode( (yyvsp[(2) - (7)].decl), new InitializerNode( (yyvsp[(5) - (7)].in), true ) ); }
-    break;
-
-  case 32:
-
-/* Line 1806 of yacc.c  */
-#line 376 "parser.yy"
     {
                         Token fn; fn.str = new std::string( "?{}" ); // location undefined
@@ -5357 +5356 @@
 
 /* Line 1806 of yacc.c  */
-#line 385 "parser.yy"
+#line 383 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) )); }
     break;
@@ -5364 +5363 @@
 
 /* Line 1806 of yacc.c  */
-#line 390 "parser.yy"
+#line 388 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -5371 +5370 @@
 
 /* Line 1806 of yacc.c  */
-#line 393 "parser.yy"
+#line 391 "parser.yy"
     { (yyval.en) = (yyvsp[(3) - (3)].en)->set_argName( (yyvsp[(1) - (3)].tok) ); }
     break;
@@ -5378 +5377 @@
 
 /* Line 1806 of yacc.c  */
+#line 396 "parser.yy"
+    { (yyval.en) = (yyvsp[(7) - (7)].en)->set_argName( (yyvsp[(3) - (7)].en) ); }
+    break;
+
+  case 39:
+
+/* Line 1806 of yacc.c  */
 #line 398 "parser.yy"
-    { (yyval.en) = (yyvsp[(7) - (7)].en)->set_argName( (yyvsp[(3) - (7)].en) ); }
-    break;
-
-  case 39:
-
-/* Line 1806 of yacc.c  */
-#line 400 "parser.yy"
     { (yyval.en) = (yyvsp[(9) - (9)].en)->set_argName( new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(yyvsp[(3) - (9)].en)->set_link( flattenCommas( (yyvsp[(5) - (9)].en) )))); }
     break;
@@ -5392 +5391 @@
 
 /* Line 1806 of yacc.c  */
-#line 405 "parser.yy"
+#line 403 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5399 +5398 @@
 
 /* Line 1806 of yacc.c  */
-#line 410 "parser.yy"
+#line 408 "parser.yy"
     { (yyval.en) = new VarRefNode( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -5406 +5405 @@
 
 /* Line 1806 of yacc.c  */
+#line 412 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::FieldSel ), new VarRefNode( (yyvsp[(1) - (3)].tok) ), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 44:
+
+/* Line 1806 of yacc.c  */
 #line 414 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_fieldSel( (yyvsp[(3) - (3)].en), new VarRefNode( (yyvsp[(1) - (3)].tok) ) ) ); }
-    break;
-
-  case 44:
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::FieldSel ), new VarRefNode( (yyvsp[(1) - (7)].tok) ), (yyvsp[(5) - (7)].en) ); }
+    break;
+
+  case 45:
 
 /* Line 1806 of yacc.c  */
 #line 416 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_fieldSel( (yyvsp[(5) - (7)].en), new VarRefNode( (yyvsp[(1) - (7)].tok) ) ) ); }
-    break;
-
-  case 45:
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::PFieldSel ), new VarRefNode( (yyvsp[(1) - (3)].tok) ), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 46:
 
 /* Line 1806 of yacc.c  */
 #line 418 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_pfieldSel( (yyvsp[(3) - (3)].en), new VarRefNode( (yyvsp[(1) - (3)].tok) ) ) ); }
-    break;
-
-  case 46:
-
-/* Line 1806 of yacc.c  */
-#line 420 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_pfieldSel( (yyvsp[(5) - (7)].en), new VarRefNode( (yyvsp[(1) - (7)].tok) ) ) ); }
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::PFieldSel ), new VarRefNode( (yyvsp[(1) - (7)].tok) ), (yyvsp[(5) - (7)].en) ); }
     break;
 
   case 48:
+
+/* Line 1806 of yacc.c  */
+#line 426 "parser.yy"
+    { (yyval.en) = (yyvsp[(1) - (1)].constant); }
+    break;
+
+  case 49:
 
 /* Line 1806 of yacc.c  */
@@ -5438 +5444 @@
     break;
 
-  case 49:
+  case 50:
 
 /* Line 1806 of yacc.c  */
 #line 430 "parser.yy"
-    { (yyval.en) = (yyvsp[(1) - (1)].constant); }
-    break;
-
-  case 50:
+    { (yyval.en) = (yyvsp[(2) - (2)].en)->set_extension( true ); }
+    break;
+
+  case 51:
 
 /* Line 1806 of yacc.c  */
 #line 432 "parser.yy"
-    { (yyval.en) = (yyvsp[(2) - (2)].en)->set_extension( true ); }
-    break;
-
-  case 51:
-
-/* Line 1806 of yacc.c  */
-#line 434 "parser.yy"
-    { (yyval.en) = (yyvsp[(1) - (2)].op) == OperatorNode::AddressOf ? (ExpressionNode*) new CompositeExprNode2( build_addressOf( (yyvsp[(2) - (2)].en) ) ) : (ExpressionNode*)new CompositeExprNode( new OperatorNode ( (yyvsp[(1) - (2)].op) ), (yyvsp[(2) - (2)].en) ); }
+    { (yyval.en) = new CompositeExprNode( (yyvsp[(1) - (2)].en), (yyvsp[(2) - (2)].en) ); }
     break;
 
@@ -5462 +5461 @@
 
 /* Line 1806 of yacc.c  */
+#line 437 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( (yyvsp[(1) - (2)].en), (yyvsp[(2) - (2)].en) ); }
+    break;
+
+  case 53:
+
+/* Line 1806 of yacc.c  */
 #line 439 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( (yyvsp[(1) - (2)].en), (yyvsp[(2) - (2)].en) ); }
-    break;
-
-  case 53:
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Incr ), (yyvsp[(2) - (2)].en) ); }
+    break;
+
+  case 54:
 
 /* Line 1806 of yacc.c  */
 #line 441 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Incr ), (yyvsp[(2) - (2)].en) ); }
-    break;
-
-  case 54:
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Decr ), (yyvsp[(2) - (2)].en) ); }
+    break;
+
+  case 55:
 
 /* Line 1806 of yacc.c  */
 #line 443 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Decr ), (yyvsp[(2) - (2)].en) ); }
-    break;
-
-  case 55:
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::SizeOf ), (yyvsp[(2) - (2)].en) ); }
+    break;
+
+  case 56:
 
 /* Line 1806 of yacc.c  */
 #line 445 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_sizeOf( (yyvsp[(2) - (2)].en) ) ); }
-    break;
-
-  case 56:
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::SizeOf ), new TypeValueNode( (yyvsp[(3) - (4)].decl) )); }
+    break;
+
+  case 57:
 
 /* Line 1806 of yacc.c  */
 #line 447 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_sizeOf( new TypeValueNode( (yyvsp[(3) - (4)].decl) ) ) ); }
-    break;
-
-  case 57:
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::OffsetOf ), new TypeValueNode( (yyvsp[(3) - (6)].decl) ), new VarRefNode( (yyvsp[(5) - (6)].tok) )); }
+    break;
+
+  case 58:
 
 /* Line 1806 of yacc.c  */
 #line 449 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_offsetOf( new TypeValueNode( (yyvsp[(3) - (6)].decl) ), new VarRefNode( (yyvsp[(5) - (6)].tok) ) ) ); }
-    break;
-
-  case 58:
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( (yyvsp[(1) - (1)].tok) )); }
+    break;
+
+  case 59:
 
 /* Line 1806 of yacc.c  */
 #line 451 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( (yyvsp[(1) - (1)].tok) )); }
-    break;
-
-  case 59:
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( (yyvsp[(1) - (4)].tok) ), new TypeValueNode( (yyvsp[(3) - (4)].decl) )); }
+    break;
+
+  case 60:
 
 /* Line 1806 of yacc.c  */
 #line 453 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( (yyvsp[(1) - (4)].tok) ), new TypeValueNode( (yyvsp[(3) - (4)].decl) )); }
-    break;
-
-  case 60:
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( (yyvsp[(1) - (4)].tok) ), (yyvsp[(3) - (4)].en) ); }
+    break;
+
+  case 61:
 
 /* Line 1806 of yacc.c  */
 #line 455 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( (yyvsp[(1) - (4)].tok) ), (yyvsp[(3) - (4)].en) ); }
-    break;
-
-  case 61:
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::AlignOf ), (yyvsp[(2) - (2)].en) ); }
+    break;
+
+  case 62:
 
 /* Line 1806 of yacc.c  */
 #line 457 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_alignOf( (yyvsp[(2) - (2)].en) ) ); }
-    break;
-
-  case 62:
-
-/* Line 1806 of yacc.c  */
-#line 459 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_alignOf( new TypeValueNode( (yyvsp[(3) - (4)].decl) ) ) ); }
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::AlignOf ), new TypeValueNode( (yyvsp[(3) - (4)].decl) ) ); }
     break;
 
@@ -5539 +5538 @@
 
 /* Line 1806 of yacc.c  */
-#line 465 "parser.yy"
-    { (yyval.op) = OperatorNode::PointTo; }
+#line 463 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::PointTo ); }
     break;
 
@@ -5546 +5545 @@
 
 /* Line 1806 of yacc.c  */
+#line 464 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::AddressOf ); }
+    break;
+
+  case 65:
+
+/* Line 1806 of yacc.c  */
 #line 466 "parser.yy"
-    { (yyval.op) = OperatorNode::AddressOf; }
-    break;
-
-  case 65:
-
-/* Line 1806 of yacc.c  */
-#line 468 "parser.yy"
-    { (yyval.op) = OperatorNode::And; }
+    { (yyval.en) = new OperatorNode( OperatorNode::And ); }
     break;
 
@@ -5560 +5559 @@
 
 /* Line 1806 of yacc.c  */
+#line 470 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::UnPlus ); }
+    break;
+
+  case 67:
+
+/* Line 1806 of yacc.c  */
+#line 471 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::UnMinus ); }
+    break;
+
+  case 68:
+
+/* Line 1806 of yacc.c  */
 #line 472 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::UnPlus ); }
-    break;
-
-  case 67:
+    { (yyval.en) = new OperatorNode( OperatorNode::Neg ); }
+    break;
+
+  case 69:
 
 /* Line 1806 of yacc.c  */
 #line 473 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::UnMinus ); }
-    break;
-
-  case 68:
-
-/* Line 1806 of yacc.c  */
-#line 474 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::Neg ); }
-    break;
-
-  case 69:
-
-/* Line 1806 of yacc.c  */
-#line 475 "parser.yy"
     { (yyval.en) = new OperatorNode( OperatorNode::BitNeg ); }
     break;
@@ -5588 +5587 @@
 
 /* Line 1806 of yacc.c  */
+#line 479 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Cast ), new TypeValueNode( (yyvsp[(2) - (4)].decl) ), (yyvsp[(4) - (4)].en) ); }
+    break;
+
+  case 72:
+
+/* Line 1806 of yacc.c  */
 #line 481 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_cast( new TypeValueNode( (yyvsp[(2) - (4)].decl) ), (yyvsp[(4) - (4)].en) ) ); }
-    break;
-
-  case 72:
-
-/* Line 1806 of yacc.c  */
-#line 483 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_cast( new TypeValueNode( (yyvsp[(2) - (4)].decl) ), (yyvsp[(4) - (4)].en) ) ); }
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Cast ), new TypeValueNode( (yyvsp[(2) - (4)].decl) ), (yyvsp[(4) - (4)].en) ); }
     break;
 
@@ -5602 +5601 @@
 
 /* Line 1806 of yacc.c  */
+#line 487 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Mul ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 75:
+
+/* Line 1806 of yacc.c  */
 #line 489 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Mul ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 75:
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Div ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 76:
 
 /* Line 1806 of yacc.c  */
 #line 491 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Div ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 76:
-
-/* Line 1806 of yacc.c  */
-#line 493 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Mod ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5623 +5622 @@
 
 /* Line 1806 of yacc.c  */
+#line 497 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Plus ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 79:
+
+/* Line 1806 of yacc.c  */
 #line 499 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Plus ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 79:
-
-/* Line 1806 of yacc.c  */
-#line 501 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Minus ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5637 +5636 @@
 
 /* Line 1806 of yacc.c  */
+#line 505 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::LShift ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 82:
+
+/* Line 1806 of yacc.c  */
 #line 507 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::LShift ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 82:
-
-/* Line 1806 of yacc.c  */
-#line 509 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::RShift ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5651 +5650 @@
 
 /* Line 1806 of yacc.c  */
+#line 513 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::LThan ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 85:
+
+/* Line 1806 of yacc.c  */
 #line 515 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::LThan ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 85:
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::GThan ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 86:
 
 /* Line 1806 of yacc.c  */
 #line 517 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::GThan ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 86:
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::LEThan ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 87:
 
 /* Line 1806 of yacc.c  */
 #line 519 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::LEThan ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 87:
-
-/* Line 1806 of yacc.c  */
-#line 521 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::GEThan ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5679 +5678 @@
 
 /* Line 1806 of yacc.c  */
+#line 525 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Eq ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 90:
+
+/* Line 1806 of yacc.c  */
 #line 527 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Eq ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 90:
-
-/* Line 1806 of yacc.c  */
-#line 529 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Neq ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5693 +5692 @@
 
 /* Line 1806 of yacc.c  */
-#line 535 "parser.yy"
+#line 533 "parser.yy"
     { (yyval.en) =new CompositeExprNode( new OperatorNode( OperatorNode::BitAnd ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5700 +5699 @@
 
 /* Line 1806 of yacc.c  */
-#line 541 "parser.yy"
+#line 539 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Xor ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5707 +5706 @@
 
 /* Line 1806 of yacc.c  */
-#line 547 "parser.yy"
+#line 545 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::BitOr ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5714 +5713 @@
 
 /* Line 1806 of yacc.c  */
-#line 553 "parser.yy"
+#line 551 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::And ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5721 +5720 @@
 
 /* Line 1806 of yacc.c  */
-#line 559 "parser.yy"
+#line 557 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Or ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5728 +5727 @@
 
 /* Line 1806 of yacc.c  */
+#line 563 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Cond ), (ExpressionNode *)mkList( (*(yyvsp[(1) - (5)].en), *(yyvsp[(3) - (5)].en), *(yyvsp[(5) - (5)].en) ) ) ); }
+    break;
+
+  case 103:
+
+/* Line 1806 of yacc.c  */
 #line 565 "parser.yy"
+    { (yyval.en)=new CompositeExprNode( new OperatorNode( OperatorNode::NCond ), (yyvsp[(1) - (4)].en), (yyvsp[(4) - (4)].en) ); }
+    break;
+
+  case 104:
+
+/* Line 1806 of yacc.c  */
+#line 567 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Cond ), (ExpressionNode *)mkList( (*(yyvsp[(1) - (5)].en), *(yyvsp[(3) - (5)].en), *(yyvsp[(5) - (5)].en) ) ) ); }
     break;
 
-  case 103:
-
-/* Line 1806 of yacc.c  */
-#line 567 "parser.yy"
-    { (yyval.en)=new CompositeExprNode( new OperatorNode( OperatorNode::NCond ), (yyvsp[(1) - (4)].en), (yyvsp[(4) - (4)].en) ); }
-    break;
-
-  case 104:
-
-/* Line 1806 of yacc.c  */
-#line 569 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Cond ), (ExpressionNode *)mkList( (*(yyvsp[(1) - (5)].en), *(yyvsp[(3) - (5)].en), *(yyvsp[(5) - (5)].en) ) ) ); }
-    break;
-
   case 107:
 
 /* Line 1806 of yacc.c  */
+#line 578 "parser.yy"
+    { (yyval.en) =new CompositeExprNode( new OperatorNode( OperatorNode::Assign ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 108:
+
+/* Line 1806 of yacc.c  */
 #line 580 "parser.yy"
-    { (yyval.en) =new CompositeExprNode( new OperatorNode( OperatorNode::Assign ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 108:
+    { (yyval.en) =new CompositeExprNode( (yyvsp[(2) - (3)].en), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 109:
 
 /* Line 1806 of yacc.c  */
 #line 582 "parser.yy"
-    { (yyval.en) =new CompositeExprNode( (yyvsp[(2) - (3)].en), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 109:
-
-/* Line 1806 of yacc.c  */
-#line 584 "parser.yy"
     { (yyval.en) = ( (yyvsp[(2) - (2)].en) == 0 ) ? (yyvsp[(1) - (2)].en) : new CompositeExprNode( new OperatorNode( OperatorNode::Assign ), (yyvsp[(1) - (2)].en), (yyvsp[(2) - (2)].en) ); }
     break;
@@ -5770 +5769 @@
 
 /* Line 1806 of yacc.c  */
-#line 589 "parser.yy"
+#line 587 "parser.yy"
     { (yyval.en) = new NullExprNode; }
     break;
@@ -5777 +5776 @@
 
 /* Line 1806 of yacc.c  */
+#line 595 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ) ); }
+    break;
+
+  case 113:
+
+/* Line 1806 of yacc.c  */
 #line 597 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ) ); }
-    break;
-
-  case 113:
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (yyvsp[(3) - (5)].en) ); }
+    break;
+
+  case 114:
 
 /* Line 1806 of yacc.c  */
 #line 599 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (yyvsp[(3) - (5)].en) ); }
-    break;
-
-  case 114:
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(new NullExprNode)->set_link( (yyvsp[(4) - (6)].en) ) ); }
+    break;
+
+  case 115:
 
 /* Line 1806 of yacc.c  */
 #line 601 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(new NullExprNode)->set_link( (yyvsp[(4) - (6)].en) ) ); }
-    break;
-
-  case 115:
-
-/* Line 1806 of yacc.c  */
-#line 603 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(yyvsp[(3) - (7)].en)->set_link( flattenCommas( (yyvsp[(5) - (7)].en) ) ) ); }
     break;
@@ -5805 +5804 @@
 
 /* Line 1806 of yacc.c  */
-#line 609 "parser.yy"
+#line 607 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5812 +5811 @@
 
 /* Line 1806 of yacc.c  */
+#line 611 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::MulAssn ); }
+    break;
+
+  case 119:
+
+/* Line 1806 of yacc.c  */
+#line 612 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::DivAssn ); }
+    break;
+
+  case 120:
+
+/* Line 1806 of yacc.c  */
 #line 613 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::MulAssn ); }
-    break;
-
-  case 119:
+    { (yyval.en) = new OperatorNode( OperatorNode::ModAssn ); }
+    break;
+
+  case 121:
 
 /* Line 1806 of yacc.c  */
 #line 614 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::DivAssn ); }
-    break;
-
-  case 120:
+    { (yyval.en) = new OperatorNode( OperatorNode::PlusAssn ); }
+    break;
+
+  case 122:
 
 /* Line 1806 of yacc.c  */
 #line 615 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::ModAssn ); }
-    break;
-
-  case 121:
+    { (yyval.en) = new OperatorNode( OperatorNode::MinusAssn ); }
+    break;
+
+  case 123:
 
 /* Line 1806 of yacc.c  */
 #line 616 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::PlusAssn ); }
-    break;
-
-  case 122:
+    { (yyval.en) = new OperatorNode( OperatorNode::LSAssn ); }
+    break;
+
+  case 124:
 
 /* Line 1806 of yacc.c  */
 #line 617 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::MinusAssn ); }
-    break;
-
-  case 123:
+    { (yyval.en) = new OperatorNode( OperatorNode::RSAssn ); }
+    break;
+
+  case 125:
 
 /* Line 1806 of yacc.c  */
 #line 618 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::LSAssn ); }
-    break;
-
-  case 124:
+    { (yyval.en) = new OperatorNode( OperatorNode::AndAssn ); }
+    break;
+
+  case 126:
 
 /* Line 1806 of yacc.c  */
 #line 619 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::RSAssn ); }
-    break;
-
-  case 125:
+    { (yyval.en) = new OperatorNode( OperatorNode::ERAssn ); }
+    break;
+
+  case 127:
 
 /* Line 1806 of yacc.c  */
 #line 620 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::AndAssn ); }
-    break;
-
-  case 126:
-
-/* Line 1806 of yacc.c  */
-#line 621 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::ERAssn ); }
-    break;
-
-  case 127:
-
-/* Line 1806 of yacc.c  */
-#line 622 "parser.yy"
     { (yyval.en) = new OperatorNode( OperatorNode::OrAssn ); }
     break;
@@ -5882 +5881 @@
 
 /* Line 1806 of yacc.c  */
-#line 628 "parser.yy"
+#line 626 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Comma ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5889 +5888 @@
 
 /* Line 1806 of yacc.c  */
-#line 633 "parser.yy"
+#line 631 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -5896 +5895 @@
 
 /* Line 1806 of yacc.c  */
-#line 642 "parser.yy"
+#line 640 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (1)].sn); }
     break;
@@ -5903 +5902 @@
 
 /* Line 1806 of yacc.c  */
-#line 649 "parser.yy"
+#line 647 "parser.yy"
     {
                         Token fn; fn.str = new std::string( "^?{}" ); // location undefined
@@ -5914 +5913 @@
 
 /* Line 1806 of yacc.c  */
-#line 659 "parser.yy"
+#line 657 "parser.yy"
     {
                         (yyval.sn) = (yyvsp[(4) - (4)].sn)->add_label( (yyvsp[(1) - (4)].tok) );
@@ -5923 +5922 @@
 
 /* Line 1806 of yacc.c  */
-#line 666 "parser.yy"
+#line 664 "parser.yy"
     { (yyval.sn) = new CompoundStmtNode( (StatementNode *)0 ); }
     break;
@@ -5930 +5929 @@
 
 /* Line 1806 of yacc.c  */
-#line 673 "parser.yy"
+#line 671 "parser.yy"
     { (yyval.sn) = new CompoundStmtNode( (yyvsp[(5) - (7)].sn) ); }
     break;
@@ -5937 +5936 @@
 
 /* Line 1806 of yacc.c  */
-#line 679 "parser.yy"
+#line 677 "parser.yy"
     { if ( (yyvsp[(1) - (3)].sn) != 0 ) { (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(3) - (3)].sn) ); (yyval.sn) = (yyvsp[(1) - (3)].sn); } }
     break;
@@ -5944 +5943 @@
 
 /* Line 1806 of yacc.c  */
+#line 682 "parser.yy"
+    { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
+    break;
+
+  case 147:
+
+/* Line 1806 of yacc.c  */
 #line 684 "parser.yy"
-    { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
-    break;
-
-  case 147:
-
-/* Line 1806 of yacc.c  */
-#line 686 "parser.yy"
     {   // mark all fields in list
                         for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_link() )
@@ -5962 +5961 @@
 
 /* Line 1806 of yacc.c  */
-#line 692 "parser.yy"
+#line 690 "parser.yy"
     { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
     break;
@@ -5969 +5968 @@
 
 /* Line 1806 of yacc.c  */
-#line 699 "parser.yy"
+#line 697 "parser.yy"
     { if ( (yyvsp[(1) - (2)].sn) != 0 ) { (yyvsp[(1) - (2)].sn)->set_link( (yyvsp[(2) - (2)].sn) ); (yyval.sn) = (yyvsp[(1) - (2)].sn); } }
     break;
@@ -5976 +5975 @@
 
 /* Line 1806 of yacc.c  */
-#line 704 "parser.yy"
+#line 702 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Exp, (yyvsp[(1) - (2)].en), 0 ); }
     break;
@@ -5983 +5982 @@
 
 /* Line 1806 of yacc.c  */
+#line 708 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::If, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
+    break;
+
+  case 154:
+
+/* Line 1806 of yacc.c  */
 #line 710 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::If, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
-    break;
-
-  case 154:
+    { (yyval.sn) = new StatementNode( StatementNode::If, (yyvsp[(3) - (7)].en), (StatementNode *)mkList((*(yyvsp[(5) - (7)].sn), *(yyvsp[(7) - (7)].sn) )) ); }
+    break;
+
+  case 155:
 
 /* Line 1806 of yacc.c  */
 #line 712 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::If, (yyvsp[(3) - (7)].en), (StatementNode *)mkList((*(yyvsp[(5) - (7)].sn), *(yyvsp[(7) - (7)].sn) )) ); }
-    break;
-
-  case 155:
+    { (yyval.sn) = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
+    break;
+
+  case 156:
 
 /* Line 1806 of yacc.c  */
 #line 714 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
-    break;
-
-  case 156:
-
-/* Line 1806 of yacc.c  */
-#line 716 "parser.yy"
     {
                         StatementNode *sw = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) );
@@ -6019 +6018 @@
 
 /* Line 1806 of yacc.c  */
+#line 724 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
+    break;
+
+  case 158:
+
+/* Line 1806 of yacc.c  */
 #line 726 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
-    break;
-
-  case 158:
-
-/* Line 1806 of yacc.c  */
-#line 728 "parser.yy"
     {
                         StatementNode *sw = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) );
@@ -6036 +6035 @@
 
 /* Line 1806 of yacc.c  */
+#line 736 "parser.yy"
+    { (yyval.en) = (yyvsp[(1) - (1)].en); }
+    break;
+
+  case 160:
+
+/* Line 1806 of yacc.c  */
 #line 738 "parser.yy"
-    { (yyval.en) = (yyvsp[(1) - (1)].en); }
-    break;
-
-  case 160:
-
-/* Line 1806 of yacc.c  */
-#line 740 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Range ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
@@ -6050 +6049 @@
 
 /* Line 1806 of yacc.c  */
-#line 745 "parser.yy"
+#line 743 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Case, (yyvsp[(1) - (1)].en), 0 ); }
     break;
@@ -6057 +6056 @@
 
 /* Line 1806 of yacc.c  */
-#line 747 "parser.yy"
+#line 744 "parser.yy"
     { (yyval.sn) = (StatementNode *)((yyvsp[(1) - (3)].sn)->set_link( new StatementNode( StatementNode::Case, (yyvsp[(3) - (3)].en), 0 ) ) ); }
     break;
@@ -6064 +6063 @@
 
 /* Line 1806 of yacc.c  */
-#line 751 "parser.yy"
+#line 748 "parser.yy"
     { (yyval.sn) = (yyvsp[(2) - (3)].sn); }
     break;
@@ -6071 +6070 @@
 
 /* Line 1806 of yacc.c  */
-#line 752 "parser.yy"
+#line 749 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Default ); }
     break;
@@ -6078 +6077 @@
 
 /* Line 1806 of yacc.c  */
-#line 758 "parser.yy"
+#line 755 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (2)].sn)->set_link( (yyvsp[(2) - (2)].sn) )); }
     break;
@@ -6085 +6084 @@
 
 /* Line 1806 of yacc.c  */
-#line 762 "parser.yy"
+#line 759 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( new CompoundStmtNode( (yyvsp[(2) - (2)].sn) ) ); }
     break;
@@ -6092 +6091 @@
 
 /* Line 1806 of yacc.c  */
-#line 767 "parser.yy"
+#line 764 "parser.yy"
     { (yyval.sn) = 0; }
     break;
@@ -6099 +6098 @@
 
 /* Line 1806 of yacc.c  */
-#line 773 "parser.yy"
+#line 770 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( new CompoundStmtNode( (yyvsp[(2) - (2)].sn) ) ); }
     break;
@@ -6106 +6105 @@
 
 /* Line 1806 of yacc.c  */
-#line 775 "parser.yy"
+#line 772 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(2) - (3)].sn)->append_last_case( new CompoundStmtNode( (yyvsp[(3) - (3)].sn) ) ) ) ); }
     break;
@@ -6113 +6112 @@
 
 /* Line 1806 of yacc.c  */
-#line 780 "parser.yy"
+#line 777 "parser.yy"
     { (yyval.sn) = 0; }
     break;
@@ -6120 +6119 @@
 
 /* Line 1806 of yacc.c  */
-#line 786 "parser.yy"
+#line 783 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
     break;
@@ -6127 +6126 @@
 
 /* Line 1806 of yacc.c  */
-#line 788 "parser.yy"
+#line 785 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (3)].sn)->append_last_case( new CompoundStmtNode( (StatementNode *)mkList( (*(yyvsp[(2) - (3)].sn), *(yyvsp[(3) - (3)].sn) ) ) ) ); }
     break;
@@ -6134 +6133 @@
 
 /* Line 1806 of yacc.c  */
-#line 790 "parser.yy"
+#line 787 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
     break;
@@ -6141 +6140 @@
 
 /* Line 1806 of yacc.c  */
-#line 792 "parser.yy"
+#line 789 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (4)].sn)->set_link( (yyvsp[(2) - (4)].sn)->append_last_case( new CompoundStmtNode( (StatementNode *)mkList( (*(yyvsp[(3) - (4)].sn), *(yyvsp[(4) - (4)].sn) ) ) ) ) ) ); }
     break;
@@ -6148 +6147 @@
 
 /* Line 1806 of yacc.c  */
-#line 797 "parser.yy"
+#line 794 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Break ); }
     break;
@@ -6155 +6154 @@
 
 /* Line 1806 of yacc.c  */
-#line 803 "parser.yy"
+#line 800 "parser.yy"
     { (yyval.sn) = 0; }
     break;
@@ -6162 +6161 @@
 
 /* Line 1806 of yacc.c  */
-#line 805 "parser.yy"
+#line 802 "parser.yy"
     { (yyval.sn) = 0; }
     break;
@@ -6169 +6168 @@
 
 /* Line 1806 of yacc.c  */
-#line 810 "parser.yy"
+#line 807 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::While, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
     break;
@@ -6176 +6175 @@
 
 /* Line 1806 of yacc.c  */
-#line 812 "parser.yy"
+#line 809 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Do, (yyvsp[(5) - (7)].en), (yyvsp[(2) - (7)].sn) ); }
     break;
@@ -6183 +6182 @@
 
 /* Line 1806 of yacc.c  */
-#line 814 "parser.yy"
+#line 811 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::For, (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].sn) ); }
     break;
@@ -6190 +6189 @@
 
 /* Line 1806 of yacc.c  */
-#line 819 "parser.yy"
+#line 816 "parser.yy"
     { (yyval.en) = new ForCtlExprNode( (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].en) ); }
     break;
@@ -6197 +6196 @@
 
 /* Line 1806 of yacc.c  */
-#line 821 "parser.yy"
+#line 818 "parser.yy"
     { (yyval.en) = new ForCtlExprNode( (yyvsp[(1) - (4)].decl), (yyvsp[(2) - (4)].en), (yyvsp[(4) - (4)].en) ); }
     break;
@@ -6204 +6203 @@
 
 /* Line 1806 of yacc.c  */
-#line 826 "parser.yy"
+#line 823 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Goto, (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -6211 +6210 @@
 
 /* Line 1806 of yacc.c  */
+#line 827 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Goto, (yyvsp[(3) - (4)].en) ); }
+    break;
+
+  case 190:
+
+/* Line 1806 of yacc.c  */
 #line 830 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Goto, (yyvsp[(3) - (4)].en) ); }
-    break;
-
-  case 190:
-
-/* Line 1806 of yacc.c  */
-#line 833 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Continue ); }
     break;
@@ -6225 +6224 @@
 
 /* Line 1806 of yacc.c  */
+#line 834 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Continue, (yyvsp[(2) - (3)].tok) ); }
+    break;
+
+  case 192:
+
+/* Line 1806 of yacc.c  */
 #line 837 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Continue, (yyvsp[(2) - (3)].tok) ); }
-    break;
-
-  case 192:
-
-/* Line 1806 of yacc.c  */
-#line 840 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Break ); }
     break;
@@ -6239 +6238 @@
 
 /* Line 1806 of yacc.c  */
-#line 844 "parser.yy"
+#line 841 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Break, (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -6246 +6245 @@
 
 /* Line 1806 of yacc.c  */
-#line 846 "parser.yy"
+#line 843 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Return, (yyvsp[(2) - (3)].en), 0 ); }
     break;
@@ -6253 +6252 @@
 
 /* Line 1806 of yacc.c  */
-#line 848 "parser.yy"
+#line 845 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Throw, (yyvsp[(2) - (3)].en), 0 ); }
     break;
@@ -6260 +6259 @@
 
 /* Line 1806 of yacc.c  */
-#line 852 "parser.yy"
+#line 849 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Throw, (yyvsp[(2) - (3)].en), 0 ); }
     break;
@@ -6267 +6266 @@
 
 /* Line 1806 of yacc.c  */
-#line 854 "parser.yy"
+#line 851 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Throw, (yyvsp[(2) - (5)].en), 0 ); }
     break;
@@ -6274 +6273 @@
 
 /* Line 1806 of yacc.c  */
-#line 861 "parser.yy"
+#line 858 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].pn) )))); }
     break;
@@ -6281 +6280 @@
 
 /* Line 1806 of yacc.c  */
-#line 863 "parser.yy"
+#line 860 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].pn) )))); }
     break;
@@ -6288 +6287 @@
 
 /* Line 1806 of yacc.c  */
-#line 865 "parser.yy"
+#line 862 "parser.yy"
     {
                         (yyvsp[(3) - (4)].pn)->set_link( (yyvsp[(4) - (4)].pn) );
@@ -6298 +6297 @@
 
 /* Line 1806 of yacc.c  */
-#line 876 "parser.yy"
+#line 873 "parser.yy"
     { (yyval.pn) = StatementNode::newCatchStmt( 0, (yyvsp[(5) - (5)].sn), true ); }
     break;
@@ -6305 +6304 @@
 
 /* Line 1806 of yacc.c  */
-#line 878 "parser.yy"
+#line 875 "parser.yy"
     { (yyval.pn) = (yyvsp[(1) - (6)].pn)->set_link( StatementNode::newCatchStmt( 0, (yyvsp[(6) - (6)].sn), true ) ); }
     break;
@@ -6312 +6311 @@
 
 /* Line 1806 of yacc.c  */
-#line 880 "parser.yy"
+#line 877 "parser.yy"
     { (yyval.pn) = StatementNode::newCatchStmt( 0, (yyvsp[(5) - (5)].sn), true ); }
     break;
@@ -6319 +6318 @@
 
 /* Line 1806 of yacc.c  */
-#line 882 "parser.yy"
+#line 879 "parser.yy"
     { (yyval.pn) = (yyvsp[(1) - (6)].pn)->set_link( StatementNode::newCatchStmt( 0, (yyvsp[(6) - (6)].sn), true ) ); }
     break;
@@ -6326 +6325 @@
 
 /* Line 1806 of yacc.c  */
-#line 887 "parser.yy"
+#line 884 "parser.yy"
     { (yyval.pn) = StatementNode::newCatchStmt( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ); }
     break;
@@ -6333 +6332 @@
 
 /* Line 1806 of yacc.c  */
-#line 889 "parser.yy"
+#line 886 "parser.yy"
     { (yyval.pn) = (yyvsp[(1) - (10)].pn)->set_link( StatementNode::newCatchStmt( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ); }
     break;
@@ -6340 +6339 @@
 
 /* Line 1806 of yacc.c  */
-#line 891 "parser.yy"
+#line 888 "parser.yy"
     { (yyval.pn) = StatementNode::newCatchStmt( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ); }
     break;
@@ -6347 +6346 @@
 
 /* Line 1806 of yacc.c  */
-#line 893 "parser.yy"
+#line 890 "parser.yy"
     { (yyval.pn) = (yyvsp[(1) - (10)].pn)->set_link( StatementNode::newCatchStmt( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ); }
     break;
@@ -6354 +6353 @@
 
 /* Line 1806 of yacc.c  */
-#line 898 "parser.yy"
+#line 895 "parser.yy"
     {
                         (yyval.pn) = new StatementNode( StatementNode::Finally, 0, (yyvsp[(2) - (2)].sn) );
@@ -6364 +6363 @@
 
 /* Line 1806 of yacc.c  */
-#line 912 "parser.yy"
+#line 909 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6374 +6373 @@
 
 /* Line 1806 of yacc.c  */
-#line 917 "parser.yy"
+#line 914 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6381 +6380 @@
 
 /* Line 1806 of yacc.c  */
-#line 919 "parser.yy"
+#line 916 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6391 +6390 @@
 
 /* Line 1806 of yacc.c  */
-#line 928 "parser.yy"
+#line 925 "parser.yy"
     { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (6)].flag), (yyvsp[(4) - (6)].constant), 0 ); }
     break;
@@ -6398 +6397 @@
 
 /* Line 1806 of yacc.c  */
-#line 930 "parser.yy"
+#line 927 "parser.yy"
     { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (8)].flag), (yyvsp[(4) - (8)].constant), (yyvsp[(6) - (8)].en) ); }
     break;
@@ -6405 +6404 @@
 
 /* Line 1806 of yacc.c  */
-#line 932 "parser.yy"
+#line 929 "parser.yy"
     { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (10)].flag), (yyvsp[(4) - (10)].constant), (yyvsp[(6) - (10)].en), (yyvsp[(8) - (10)].en) ); }
     break;
@@ -6412 +6411 @@
 
 /* Line 1806 of yacc.c  */
-#line 934 "parser.yy"
+#line 931 "parser.yy"
     { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (12)].flag), (yyvsp[(4) - (12)].constant), (yyvsp[(6) - (12)].en), (yyvsp[(8) - (12)].en), (yyvsp[(10) - (12)].constant) ); }
     break;
@@ -6419 +6418 @@
 
 /* Line 1806 of yacc.c  */
-#line 936 "parser.yy"
+#line 933 "parser.yy"
     { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (14)].flag), (yyvsp[(5) - (14)].constant), 0, (yyvsp[(8) - (14)].en), (yyvsp[(10) - (14)].constant), (yyvsp[(12) - (14)].label) ); }
     break;
@@ -6426 +6425 @@
 
 /* Line 1806 of yacc.c  */
-#line 941 "parser.yy"
+#line 938 "parser.yy"
     { (yyval.flag) = false; }
     break;
@@ -6433 +6432 @@
 
 /* Line 1806 of yacc.c  */
-#line 943 "parser.yy"
+#line 940 "parser.yy"
     { (yyval.flag) = true; }
     break;
@@ -6440 +6439 @@
 
 /* Line 1806 of yacc.c  */
-#line 948 "parser.yy"
+#line 945 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -6447 +6446 @@
 
 /* Line 1806 of yacc.c  */
-#line 955 "parser.yy"
+#line 952 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
     break;
@@ -6454 +6453 @@
 
 /* Line 1806 of yacc.c  */
-#line 960 "parser.yy"
+#line 957 "parser.yy"
     { (yyval.en) = new AsmExprNode( 0, (yyvsp[(1) - (4)].constant), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -6461 +6460 @@
 
 /* Line 1806 of yacc.c  */
-#line 962 "parser.yy"
+#line 959 "parser.yy"
     { (yyval.en) = new AsmExprNode( (yyvsp[(2) - (7)].en), (yyvsp[(4) - (7)].constant), (yyvsp[(6) - (7)].en) ); }
     break;
@@ -6468 +6467 @@
 
 /* Line 1806 of yacc.c  */
-#line 967 "parser.yy"
+#line 964 "parser.yy"
     { (yyval.constant) = 0; }
     break;
@@ -6475 +6474 @@
 
 /* Line 1806 of yacc.c  */
-#line 969 "parser.yy"
+#line 966 "parser.yy"
     { (yyval.constant) = (yyvsp[(1) - (1)].constant); }
     break;
@@ -6482 +6481 @@
 
 /* Line 1806 of yacc.c  */
-#line 971 "parser.yy"
+#line 968 "parser.yy"
     { (yyval.constant) = (ConstantNode *)(yyvsp[(1) - (3)].constant)->set_link( (yyvsp[(3) - (3)].constant) ); }
     break;
@@ -6489 +6488 @@
 
 /* Line 1806 of yacc.c  */
-#line 976 "parser.yy"
+#line 973 "parser.yy"
     { (yyval.label) = new LabelNode(); (yyval.label)->append_label( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -6496 +6495 @@
 
 /* Line 1806 of yacc.c  */
-#line 978 "parser.yy"
+#line 975 "parser.yy"
     { (yyval.label) = (yyvsp[(1) - (3)].label); (yyvsp[(1) - (3)].label)->append_label( (yyvsp[(3) - (3)].tok) ); }
     break;
@@ -6503 +6502 @@
 
 /* Line 1806 of yacc.c  */
-#line 985 "parser.yy"
+#line 982 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6510 +6509 @@
 
 /* Line 1806 of yacc.c  */
-#line 992 "parser.yy"
+#line 989 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6517 +6516 @@
 
 /* Line 1806 of yacc.c  */
-#line 997 "parser.yy"
+#line 994 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6524 +6523 @@
 
 /* Line 1806 of yacc.c  */
-#line 1004 "parser.yy"
+#line 1001 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6531 +6530 @@
 
 /* Line 1806 of yacc.c  */
-#line 1018 "parser.yy"
+#line 1015 "parser.yy"
     {}
     break;
@@ -6538 +6537 @@
 
 /* Line 1806 of yacc.c  */
-#line 1019 "parser.yy"
+#line 1016 "parser.yy"
     {}
     break;
@@ -6545 +6544 @@
 
 /* Line 1806 of yacc.c  */
-#line 1048 "parser.yy"
+#line 1045 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6555 +6554 @@
 
 /* Line 1806 of yacc.c  */
-#line 1055 "parser.yy"
+#line 1052 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6565 +6564 @@
 
 /* Line 1806 of yacc.c  */
-#line 1060 "parser.yy"
+#line 1057 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (6)].tok), TypedefTable::ID );
@@ -6575 +6574 @@
 
 /* Line 1806 of yacc.c  */
-#line 1070 "parser.yy"
+#line 1067 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
@@ -6585 +6584 @@
 
 /* Line 1806 of yacc.c  */
-#line 1075 "parser.yy"
+#line 1072 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
@@ -6595 +6594 @@
 
 /* Line 1806 of yacc.c  */
-#line 1080 "parser.yy"
+#line 1077 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(3) - (4)].tok) );
@@ -6605 +6604 @@
 
 /* Line 1806 of yacc.c  */
-#line 1088 "parser.yy"
+#line 1085 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6615 +6614 @@
 
 /* Line 1806 of yacc.c  */
-#line 1093 "parser.yy"
+#line 1090 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6625 +6624 @@
 
 /* Line 1806 of yacc.c  */
-#line 1098 "parser.yy"
+#line 1095 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6635 +6634 @@
 
 /* Line 1806 of yacc.c  */
-#line 1103 "parser.yy"
+#line 1100 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6645 +6644 @@
 
 /* Line 1806 of yacc.c  */
-#line 1108 "parser.yy"
+#line 1105 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
@@ -6655 +6654 @@
 
 /* Line 1806 of yacc.c  */
-#line 1116 "parser.yy"
+#line 1113 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(3) - (8)].tok), DeclarationNode::newTuple( 0 ), (yyvsp[(6) - (8)].decl), 0, true );
@@ -6664 +6663 @@
 
 /* Line 1806 of yacc.c  */
-#line 1139 "parser.yy"
+#line 1136 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
@@ -6673 +6672 @@
 
 /* Line 1806 of yacc.c  */
-#line 1143 "parser.yy"
+#line 1140 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
@@ -6682 +6681 @@
 
 /* Line 1806 of yacc.c  */
-#line 1150 "parser.yy"
+#line 1147 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -6689 +6688 @@
 
 /* Line 1806 of yacc.c  */
-#line 1154 "parser.yy"
+#line 1151 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (9)].decl)->appendList( (yyvsp[(7) - (9)].decl) ) ); }
     break;
@@ -6696 +6695 @@
 
 /* Line 1806 of yacc.c  */
-#line 1159 "parser.yy"
+#line 1156 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6706 +6705 @@
 
 /* Line 1806 of yacc.c  */
-#line 1164 "parser.yy"
+#line 1161 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6716 +6715 @@
 
 /* Line 1806 of yacc.c  */
-#line 1169 "parser.yy"
+#line 1166 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::TD );
@@ -6726 +6725 @@
 
 /* Line 1806 of yacc.c  */
-#line 1180 "parser.yy"
+#line 1177 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6736 +6735 @@
 
 /* Line 1806 of yacc.c  */
-#line 1185 "parser.yy"
+#line 1182 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6746 +6745 @@
 
 /* Line 1806 of yacc.c  */
-#line 1190 "parser.yy"
+#line 1187 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6756 +6755 @@
 
 /* Line 1806 of yacc.c  */
-#line 1195 "parser.yy"
+#line 1192 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6766 +6765 @@
 
 /* Line 1806 of yacc.c  */
-#line 1200 "parser.yy"
+#line 1197 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6776 +6775 @@
 
 /* Line 1806 of yacc.c  */
-#line 1209 "parser.yy"
+#line 1206 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (4)].tok), TypedefTable::TD );
@@ -6786 +6785 @@
 
 /* Line 1806 of yacc.c  */
-#line 1214 "parser.yy"
+#line 1211 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (7)].tok), TypedefTable::TD );
@@ -6796 +6795 @@
 
 /* Line 1806 of yacc.c  */
-#line 1231 "parser.yy"
+#line 1228 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6806 +6805 @@
 
 /* Line 1806 of yacc.c  */
-#line 1236 "parser.yy"
+#line 1233 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6816 +6815 @@
 
 /* Line 1806 of yacc.c  */
-#line 1258 "parser.yy"
+#line 1255 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6823 +6822 @@
 
 /* Line 1806 of yacc.c  */
-#line 1270 "parser.yy"
+#line 1267 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6830 +6829 @@
 
 /* Line 1806 of yacc.c  */
-#line 1281 "parser.yy"
+#line 1278 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Const ); }
     break;
@@ -6837 +6836 @@
 
 /* Line 1806 of yacc.c  */
-#line 1283 "parser.yy"
+#line 1280 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Restrict ); }
     break;
@@ -6844 +6843 @@
 
 /* Line 1806 of yacc.c  */
-#line 1285 "parser.yy"
+#line 1282 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Volatile ); }
     break;
@@ -6851 +6850 @@
 
 /* Line 1806 of yacc.c  */
-#line 1287 "parser.yy"
+#line 1284 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Lvalue ); }
     break;
@@ -6858 +6857 @@
 
 /* Line 1806 of yacc.c  */
-#line 1289 "parser.yy"
+#line 1286 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Atomic ); }
     break;
@@ -6865 +6864 @@
 
 /* Line 1806 of yacc.c  */
-#line 1291 "parser.yy"
+#line 1288 "parser.yy"
     {
                         typedefTable.enterScope();
@@ -6874 +6873 @@
 
 /* Line 1806 of yacc.c  */
-#line 1295 "parser.yy"
+#line 1292 "parser.yy"
     {
                         typedefTable.leaveScope();
@@ -6884 +6883 @@
 
 /* Line 1806 of yacc.c  */
-#line 1304 "parser.yy"
+#line 1301 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6891 +6890 @@
 
 /* Line 1806 of yacc.c  */
-#line 1306 "parser.yy"
+#line 1303 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6898 +6897 @@
 
 /* Line 1806 of yacc.c  */
-#line 1317 "parser.yy"
+#line 1314 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6905 +6904 @@
 
 /* Line 1806 of yacc.c  */
-#line 1326 "parser.yy"
+#line 1323 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Extern ); }
     break;
@@ -6912 +6911 @@
 
 /* Line 1806 of yacc.c  */
-#line 1328 "parser.yy"
+#line 1325 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Static ); }
     break;
@@ -6919 +6918 @@
 
 /* Line 1806 of yacc.c  */
-#line 1330 "parser.yy"
+#line 1327 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Auto ); }
     break;
@@ -6926 +6925 @@
 
 /* Line 1806 of yacc.c  */
-#line 1332 "parser.yy"
+#line 1329 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Register ); }
     break;
@@ -6933 +6932 @@
 
 /* Line 1806 of yacc.c  */
-#line 1334 "parser.yy"
+#line 1331 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Inline ); }
     break;
@@ -6940 +6939 @@
 
 /* Line 1806 of yacc.c  */
-#line 1336 "parser.yy"
+#line 1333 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Fortran ); }
     break;
@@ -6947 +6946 @@
 
 /* Line 1806 of yacc.c  */
-#line 1338 "parser.yy"
+#line 1335 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Noreturn ); }
     break;
@@ -6954 +6953 @@
 
 /* Line 1806 of yacc.c  */
-#line 1340 "parser.yy"
+#line 1337 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Threadlocal ); }
     break;
@@ -6961 +6960 @@
 
 /* Line 1806 of yacc.c  */
-#line 1345 "parser.yy"
+#line 1342 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Char ); }
     break;
@@ -6968 +6967 @@
 
 /* Line 1806 of yacc.c  */
-#line 1347 "parser.yy"
+#line 1344 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Double ); }
     break;
@@ -6975 +6974 @@
 
 /* Line 1806 of yacc.c  */
-#line 1349 "parser.yy"
+#line 1346 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Float ); }
     break;
@@ -6982 +6981 @@
 
 /* Line 1806 of yacc.c  */
-#line 1351 "parser.yy"
+#line 1348 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Int ); }
     break;
@@ -6989 +6988 @@
 
 /* Line 1806 of yacc.c  */
-#line 1353 "parser.yy"
+#line 1350 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Long ); }
     break;
@@ -6996 +6995 @@
 
 /* Line 1806 of yacc.c  */
-#line 1355 "parser.yy"
+#line 1352 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Short ); }
     break;
@@ -7003 +7002 @@
 
 /* Line 1806 of yacc.c  */
-#line 1357 "parser.yy"
+#line 1354 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Signed ); }
     break;
@@ -7010 +7009 @@
 
 /* Line 1806 of yacc.c  */
-#line 1359 "parser.yy"
+#line 1356 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Unsigned ); }
     break;
@@ -7017 +7016 @@
 
 /* Line 1806 of yacc.c  */
-#line 1361 "parser.yy"
+#line 1358 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Void ); }
     break;
@@ -7024 +7023 @@
 
 /* Line 1806 of yacc.c  */
-#line 1363 "parser.yy"
+#line 1360 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Bool ); }
     break;
@@ -7031 +7030 @@
 
 /* Line 1806 of yacc.c  */
-#line 1365 "parser.yy"
+#line 1362 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Complex ); }
     break;
@@ -7038 +7037 @@
 
 /* Line 1806 of yacc.c  */
-#line 1367 "parser.yy"
+#line 1364 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Imaginary ); }
     break;
@@ -7045 +7044 @@
 
 /* Line 1806 of yacc.c  */
-#line 1369 "parser.yy"
+#line 1366 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
     break;
@@ -7052 +7051 @@
 
 /* Line 1806 of yacc.c  */
-#line 1376 "parser.yy"
+#line 1373 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7059 +7058 @@
 
 /* Line 1806 of yacc.c  */
-#line 1378 "parser.yy"
+#line 1375 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7066 +7065 @@
 
 /* Line 1806 of yacc.c  */
-#line 1380 "parser.yy"
+#line 1377 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7073 +7072 @@
 
 /* Line 1806 of yacc.c  */
-#line 1382 "parser.yy"
+#line 1379 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addType( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -7080 +7079 @@
 
 /* Line 1806 of yacc.c  */
-#line 1388 "parser.yy"
+#line 1385 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7087 +7086 @@
 
 /* Line 1806 of yacc.c  */
-#line 1395 "parser.yy"
+#line 1392 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7094 +7093 @@
 
 /* Line 1806 of yacc.c  */
-#line 1397 "parser.yy"
+#line 1394 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7101 +7100 @@
 
 /* Line 1806 of yacc.c  */
-#line 1399 "parser.yy"
+#line 1396 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addType( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7108 +7107 @@
 
 /* Line 1806 of yacc.c  */
-#line 1404 "parser.yy"
+#line 1401 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (4)].decl); }
     break;
@@ -7115 +7114 @@
 
 /* Line 1806 of yacc.c  */
-#line 1406 "parser.yy"
+#line 1403 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTypeof( (yyvsp[(3) - (4)].en) ); }
     break;
@@ -7122 +7121 @@
 
 /* Line 1806 of yacc.c  */
-#line 1408 "parser.yy"
+#line 1405 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -7129 +7128 @@
 
 /* Line 1806 of yacc.c  */
-#line 1410 "parser.yy"
+#line 1407 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -7136 +7135 @@
 
 /* Line 1806 of yacc.c  */
-#line 1416 "parser.yy"
+#line 1413 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7143 +7142 @@
 
 /* Line 1806 of yacc.c  */
-#line 1418 "parser.yy"
+#line 1415 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7150 +7149 @@
 
 /* Line 1806 of yacc.c  */
-#line 1420 "parser.yy"
+#line 1417 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7157 +7156 @@
 
 /* Line 1806 of yacc.c  */
-#line 1426 "parser.yy"
+#line 1423 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7164 +7163 @@
 
 /* Line 1806 of yacc.c  */
-#line 1428 "parser.yy"
+#line 1425 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7171 +7170 @@
 
 /* Line 1806 of yacc.c  */
-#line 1434 "parser.yy"
+#line 1431 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7178 +7177 @@
 
 /* Line 1806 of yacc.c  */
-#line 1436 "parser.yy"
+#line 1433 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7185 +7184 @@
 
 /* Line 1806 of yacc.c  */
-#line 1438 "parser.yy"
+#line 1435 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7192 +7191 @@
 
 /* Line 1806 of yacc.c  */
-#line 1443 "parser.yy"
+#line 1440 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -7199 +7198 @@
 
 /* Line 1806 of yacc.c  */
-#line 1445 "parser.yy"
+#line 1442 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(2) - (2)].tok) )->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7206 +7205 @@
 
 /* Line 1806 of yacc.c  */
-#line 1447 "parser.yy"
+#line 1444 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7213 +7212 @@
 
 /* Line 1806 of yacc.c  */
-#line 1457 "parser.yy"
+#line 1454 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (4)].aggKey), 0, 0, (yyvsp[(3) - (4)].decl), true ); }
     break;
@@ -7220 +7219 @@
 
 /* Line 1806 of yacc.c  */
-#line 1459 "parser.yy"
+#line 1456 "parser.yy"
     {
                         typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
@@ -7230 +7229 @@
 
 /* Line 1806 of yacc.c  */
-#line 1464 "parser.yy"
+#line 1461 "parser.yy"
     { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
     break;
@@ -7237 +7236 @@
 
 /* Line 1806 of yacc.c  */
-#line 1466 "parser.yy"
+#line 1463 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (6)].aggKey), (yyvsp[(2) - (6)].tok), 0, (yyvsp[(5) - (6)].decl), true ); }
     break;
@@ -7244 +7243 @@
 
 /* Line 1806 of yacc.c  */
-#line 1468 "parser.yy"
+#line 1465 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (7)].aggKey), 0, (yyvsp[(3) - (7)].en), (yyvsp[(6) - (7)].decl), false ); }
     break;
@@ -7251 +7250 @@
 
 /* Line 1806 of yacc.c  */
-#line 1470 "parser.yy"
+#line 1467 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
     break;
@@ -7258 +7257 @@
 
 /* Line 1806 of yacc.c  */
-#line 1475 "parser.yy"
+#line 1472 "parser.yy"
     { (yyval.aggKey) = DeclarationNode::Struct; }
     break;
@@ -7265 +7264 @@
 
 /* Line 1806 of yacc.c  */
-#line 1477 "parser.yy"
+#line 1474 "parser.yy"
     { (yyval.aggKey) = DeclarationNode::Union; }
     break;
@@ -7272 +7271 @@
 
 /* Line 1806 of yacc.c  */
-#line 1482 "parser.yy"
+#line 1479 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7279 +7278 @@
 
 /* Line 1806 of yacc.c  */
-#line 1484 "parser.yy"
+#line 1481 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl) != 0 ? (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ) : (yyvsp[(2) - (2)].decl); }
     break;
@@ -7286 +7285 @@
 
 /* Line 1806 of yacc.c  */
+#line 1487 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl)->set_extension( true ); }
+    break;
+
+  case 379:
+
+/* Line 1806 of yacc.c  */
 #line 1490 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl)->set_extension( true ); }
-    break;
-
-  case 379:
-
-/* Line 1806 of yacc.c  */
-#line 1493 "parser.yy"
     {   // mark all fields in list
                         for ( DeclarationNode *iter = (yyvsp[(2) - (3)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_link() )
@@ -7304 +7303 @@
 
 /* Line 1806 of yacc.c  */
-#line 1503 "parser.yy"
+#line 1500 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addName( (yyvsp[(2) - (2)].tok) ); }
     break;
@@ -7311 +7310 @@
 
 /* Line 1806 of yacc.c  */
-#line 1505 "parser.yy"
+#line 1502 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(1) - (3)].decl)->cloneType( (yyvsp[(3) - (3)].tok) ) ); }
     break;
@@ -7318 +7317 @@
 
 /* Line 1806 of yacc.c  */
-#line 1507 "parser.yy"
+#line 1504 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(1) - (2)].decl)->cloneType( 0 ) ); }
     break;
@@ -7325 +7324 @@
 
 /* Line 1806 of yacc.c  */
-#line 1512 "parser.yy"
+#line 1509 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7332 +7331 @@
 
 /* Line 1806 of yacc.c  */
-#line 1514 "parser.yy"
+#line 1511 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(1) - (4)].decl)->cloneBaseType( (yyvsp[(4) - (4)].decl) ) ); }
     break;
@@ -7339 +7338 @@
 
 /* Line 1806 of yacc.c  */
-#line 1519 "parser.yy"
+#line 1516 "parser.yy"
     { (yyval.decl) = DeclarationNode::newName( 0 ); /* XXX */ }
     break;
@@ -7346 +7345 @@
 
 /* Line 1806 of yacc.c  */
+#line 1518 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBitfield( (yyvsp[(1) - (1)].en) ); }
+    break;
+
+  case 388:
+
+/* Line 1806 of yacc.c  */
 #line 1521 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBitfield( (yyvsp[(1) - (1)].en) ); }
-    break;
-
-  case 388:
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
+    break;
+
+  case 389:
 
 /* Line 1806 of yacc.c  */
@@ -7357 +7363 @@
     break;
 
-  case 389:
-
-/* Line 1806 of yacc.c  */
-#line 1527 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
-    break;
-
   case 391:
 
 /* Line 1806 of yacc.c  */
-#line 1533 "parser.yy"
+#line 1530 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -7374 +7373 @@
 
 /* Line 1806 of yacc.c  */
-#line 1535 "parser.yy"
+#line 1532 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
@@ -7381 +7380 @@
 
 /* Line 1806 of yacc.c  */
-#line 1540 "parser.yy"
+#line 1537 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -7388 +7387 @@
 
 /* Line 1806 of yacc.c  */
-#line 1549 "parser.yy"
+#line 1546 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( 0, (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -7395 +7394 @@
 
 /* Line 1806 of yacc.c  */
-#line 1551 "parser.yy"
+#line 1548 "parser.yy"
     {
                         typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
@@ -7405 +7404 @@
 
 /* Line 1806 of yacc.c  */
-#line 1556 "parser.yy"
+#line 1553 "parser.yy"
     { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
     break;
@@ -7412 +7411 @@
 
 /* Line 1806 of yacc.c  */
-#line 1558 "parser.yy"
+#line 1555 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( (yyvsp[(2) - (7)].tok), (yyvsp[(5) - (7)].decl) ); }
     break;
@@ -7419 +7418 @@
 
 /* Line 1806 of yacc.c  */
-#line 1563 "parser.yy"
+#line 1560 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnumConstant( (yyvsp[(1) - (2)].tok), (yyvsp[(2) - (2)].en) ); }
     break;
@@ -7426 +7425 @@
 
 /* Line 1806 of yacc.c  */
-#line 1565 "parser.yy"
+#line 1562 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( DeclarationNode::newEnumConstant( (yyvsp[(3) - (4)].tok), (yyvsp[(4) - (4)].en) ) ); }
     break;
@@ -7433 +7432 @@
 
 /* Line 1806 of yacc.c  */
-#line 1570 "parser.yy"
+#line 1567 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -7440 +7439 @@
 
 /* Line 1806 of yacc.c  */
-#line 1572 "parser.yy"
+#line 1569 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -7447 +7446 @@
 
 /* Line 1806 of yacc.c  */
-#line 1579 "parser.yy"
+#line 1576 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7454 +7453 @@
 
 /* Line 1806 of yacc.c  */
-#line 1587 "parser.yy"
+#line 1584 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7461 +7460 @@
 
 /* Line 1806 of yacc.c  */
-#line 1589 "parser.yy"
+#line 1586 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
@@ -7468 +7467 @@
 
 /* Line 1806 of yacc.c  */
-#line 1591 "parser.yy"
+#line 1588 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
@@ -7475 +7474 @@
 
 /* Line 1806 of yacc.c  */
-#line 1599 "parser.yy"
+#line 1596 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7482 +7481 @@
 
 /* Line 1806 of yacc.c  */
-#line 1601 "parser.yy"
+#line 1598 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7489 +7488 @@
 
 /* Line 1806 of yacc.c  */
-#line 1603 "parser.yy"
+#line 1600 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (9)].decl)->appendList( (yyvsp[(5) - (9)].decl) )->appendList( (yyvsp[(9) - (9)].decl) ); }
     break;
@@ -7496 +7495 @@
 
 /* Line 1806 of yacc.c  */
-#line 1609 "parser.yy"
+#line 1606 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7503 +7502 @@
 
 /* Line 1806 of yacc.c  */
-#line 1614 "parser.yy"
+#line 1611 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7510 +7509 @@
 
 /* Line 1806 of yacc.c  */
-#line 1621 "parser.yy"
+#line 1618 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
@@ -7517 +7516 @@
 
 /* Line 1806 of yacc.c  */
-#line 1628 "parser.yy"
+#line 1625 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7524 +7523 @@
 
 /* Line 1806 of yacc.c  */
-#line 1630 "parser.yy"
+#line 1627 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
 
   case 425:
+
+/* Line 1806 of yacc.c  */
+#line 1636 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
+    break;
+
+  case 426:
 
 /* Line 1806 of yacc.c  */
@@ -7535 +7541 @@
     break;
 
-  case 426:
-
-/* Line 1806 of yacc.c  */
-#line 1642 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
-    break;
-
   case 427:
 
 /* Line 1806 of yacc.c  */
-#line 1644 "parser.yy"
+#line 1641 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addName( (yyvsp[(3) - (4)].tok) )->addQualifiers( (yyvsp[(1) - (4)].decl) ); }
     break;
@@ -7552 +7551 @@
 
 /* Line 1806 of yacc.c  */
-#line 1654 "parser.yy"
+#line 1651 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7559 +7558 @@
 
 /* Line 1806 of yacc.c  */
-#line 1660 "parser.yy"
+#line 1657 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7569 +7568 @@
 
 /* Line 1806 of yacc.c  */
-#line 1665 "parser.yy"
+#line 1662 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7579 +7578 @@
 
 /* Line 1806 of yacc.c  */
-#line 1674 "parser.yy"
+#line 1671 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7586 +7585 @@
 
 /* Line 1806 of yacc.c  */
-#line 1683 "parser.yy"
+#line 1680 "parser.yy"
     { (yyval.decl) = DeclarationNode::newName( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -7593 +7592 @@
 
 /* Line 1806 of yacc.c  */
-#line 1685 "parser.yy"
+#line 1682 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( DeclarationNode::newName( (yyvsp[(3) - (3)].tok) ) ); }
     break;
@@ -7600 +7599 @@
 
 /* Line 1806 of yacc.c  */
-#line 1710 "parser.yy"
+#line 1707 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7607 +7606 @@
 
 /* Line 1806 of yacc.c  */
-#line 1718 "parser.yy"
+#line 1715 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7614 +7613 @@
 
 /* Line 1806 of yacc.c  */
-#line 1723 "parser.yy"
+#line 1720 "parser.yy"
     { (yyval.in) = 0; }
     break;
@@ -7621 +7620 @@
 
 /* Line 1806 of yacc.c  */
-#line 1725 "parser.yy"
+#line 1722 "parser.yy"
     { (yyval.in) = (yyvsp[(2) - (2)].in); }
     break;
@@ -7628 +7627 @@
 
 /* Line 1806 of yacc.c  */
-#line 1727 "parser.yy"
+#line 1724 "parser.yy"
     { (yyval.in) = (yyvsp[(2) - (2)].in)->set_maybeConstructed( false ); }
     break;
@@ -7635 +7634 @@
 
 /* Line 1806 of yacc.c  */
-#line 1731 "parser.yy"
+#line 1728 "parser.yy"
     { (yyval.in) = new InitializerNode( (yyvsp[(1) - (1)].en) ); }
     break;
@@ -7642 +7641 @@
 
 /* Line 1806 of yacc.c  */
-#line 1732 "parser.yy"
+#line 1729 "parser.yy"
     { (yyval.in) = new InitializerNode( (yyvsp[(2) - (4)].in), true ); }
     break;
@@ -7649 +7648 @@
 
 /* Line 1806 of yacc.c  */
+#line 1734 "parser.yy"
+    { (yyval.in) = 0; }
+    break;
+
+  case 463:
+
+/* Line 1806 of yacc.c  */
+#line 1736 "parser.yy"
+    { (yyval.in) = (yyvsp[(2) - (2)].in)->set_designators( (yyvsp[(1) - (2)].en) ); }
+    break;
+
+  case 464:
+
+/* Line 1806 of yacc.c  */
 #line 1737 "parser.yy"
-    { (yyval.in) = 0; }
-    break;
-
-  case 463:
+    { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (3)].in)->set_link( (yyvsp[(3) - (3)].in) ) ); }
+    break;
+
+  case 465:
 
 /* Line 1806 of yacc.c  */
 #line 1739 "parser.yy"
-    { (yyval.in) = (yyvsp[(2) - (2)].in)->set_designators( (yyvsp[(1) - (2)].en) ); }
-    break;
-
-  case 464:
-
-/* Line 1806 of yacc.c  */
-#line 1740 "parser.yy"
-    { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (3)].in)->set_link( (yyvsp[(3) - (3)].in) ) ); }
-    break;
-
-  case 465:
-
-/* Line 1806 of yacc.c  */
-#line 1742 "parser.yy"
     { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (4)].in)->set_link( (yyvsp[(4) - (4)].in)->set_designators( (yyvsp[(3) - (4)].en) ) ) ); }
     break;
@@ -7677 +7676 @@
 
 /* Line 1806 of yacc.c  */
-#line 1758 "parser.yy"
+#line 1755 "parser.yy"
     { (yyval.en) = new VarRefNode( (yyvsp[(1) - (2)].tok) ); }
     break;
@@ -7684 +7683 @@
 
 /* Line 1806 of yacc.c  */
-#line 1764 "parser.yy"
+#line 1761 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (2)].en)->set_link( (yyvsp[(2) - (2)].en) )); }
     break;
@@ -7691 +7690 @@
 
 /* Line 1806 of yacc.c  */
-#line 1772 "parser.yy"
+#line 1769 "parser.yy"
     { (yyval.en) = new DesignatorNode( new VarRefNode( (yyvsp[(1) - (1)].tok) ) ); }
     break;
@@ -7698 +7697 @@
 
 /* Line 1806 of yacc.c  */
+#line 1771 "parser.yy"
+    { (yyval.en) = new DesignatorNode( new VarRefNode( (yyvsp[(2) - (2)].tok) ) ); }
+    break;
+
+  case 472:
+
+/* Line 1806 of yacc.c  */
 #line 1774 "parser.yy"
-    { (yyval.en) = new DesignatorNode( new VarRefNode( (yyvsp[(2) - (2)].tok) ) ); }
-    break;
-
-  case 472:
-
-/* Line 1806 of yacc.c  */
-#line 1777 "parser.yy"
     { (yyval.en) = new DesignatorNode( (yyvsp[(3) - (5)].en), true ); }
     break;
@@ -7712 +7711 @@
 
 /* Line 1806 of yacc.c  */
-#line 1779 "parser.yy"
+#line 1776 "parser.yy"
     { (yyval.en) = new DesignatorNode( (yyvsp[(3) - (5)].en), true ); }
     break;
@@ -7719 +7718 @@
 
 /* Line 1806 of yacc.c  */
-#line 1781 "parser.yy"
+#line 1778 "parser.yy"
     { (yyval.en) = new DesignatorNode( new CompositeExprNode( new OperatorNode( OperatorNode::Range ), (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].en) ), true ); }
     break;
@@ -7726 +7725 @@
 
 /* Line 1806 of yacc.c  */
-#line 1783 "parser.yy"
+#line 1780 "parser.yy"
     { (yyval.en) = new DesignatorNode( (yyvsp[(4) - (6)].en) ); }
     break;
@@ -7733 +7732 @@
 
 /* Line 1806 of yacc.c  */
-#line 1807 "parser.yy"
+#line 1804 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7740 +7739 @@
 
 /* Line 1806 of yacc.c  */
-#line 1809 "parser.yy"
+#line 1806 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7747 +7746 @@
 
 /* Line 1806 of yacc.c  */
-#line 1811 "parser.yy"
+#line 1808 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7754 +7753 @@
 
 /* Line 1806 of yacc.c  */
-#line 1817 "parser.yy"
+#line 1814 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7761 +7760 @@
 
 /* Line 1806 of yacc.c  */
-#line 1819 "parser.yy"
+#line 1816 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7768 +7767 @@
 
 /* Line 1806 of yacc.c  */
-#line 1824 "parser.yy"
+#line 1821 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypeGen( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -7775 +7774 @@
 
 /* Line 1806 of yacc.c  */
-#line 1830 "parser.yy"
+#line 1827 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -7782 +7781 @@
 
 /* Line 1806 of yacc.c  */
-#line 1835 "parser.yy"
+#line 1832 "parser.yy"
     { typedefTable.addToEnclosingScope( *(yyvsp[(2) - (2)].tok), TypedefTable::TD ); }
     break;
@@ -7789 +7788 @@
 
 /* Line 1806 of yacc.c  */
-#line 1837 "parser.yy"
+#line 1834 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTypeParam( (yyvsp[(1) - (4)].tclass), (yyvsp[(2) - (4)].tok) )->addAssertions( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -7796 +7795 @@
 
 /* Line 1806 of yacc.c  */
-#line 1843 "parser.yy"
+#line 1840 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Type; }
     break;
@@ -7803 +7802 @@
 
 /* Line 1806 of yacc.c  */
-#line 1845 "parser.yy"
+#line 1842 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Ftype; }
     break;
@@ -7810 +7809 @@
 
 /* Line 1806 of yacc.c  */
-#line 1847 "parser.yy"
+#line 1844 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Dtype; }
     break;
@@ -7817 +7816 @@
 
 /* Line 1806 of yacc.c  */
-#line 1852 "parser.yy"
+#line 1849 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7824 +7823 @@
 
 /* Line 1806 of yacc.c  */
-#line 1854 "parser.yy"
+#line 1851 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl) != 0 ? (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ) : (yyvsp[(2) - (2)].decl); }
     break;
@@ -7831 +7830 @@
 
 /* Line 1806 of yacc.c  */
-#line 1859 "parser.yy"
+#line 1856 "parser.yy"
     {
                         typedefTable.openTrait( *(yyvsp[(2) - (5)].tok) );
@@ -7841 +7840 @@
 
 /* Line 1806 of yacc.c  */
-#line 1864 "parser.yy"
+#line 1861 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (5)].decl); }
     break;
@@ -7848 +7847 @@
 
 /* Line 1806 of yacc.c  */
-#line 1866 "parser.yy"
+#line 1863 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7855 +7854 @@
 
 /* Line 1806 of yacc.c  */
+#line 1868 "parser.yy"
+    { (yyval.en) = new TypeValueNode( (yyvsp[(1) - (1)].decl) ); }
+    break;
+
+  case 499:
+
+/* Line 1806 of yacc.c  */
 #line 1871 "parser.yy"
-    { (yyval.en) = new TypeValueNode( (yyvsp[(1) - (1)].decl) ); }
-    break;
-
-  case 499:
-
-/* Line 1806 of yacc.c  */
-#line 1874 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( new TypeValueNode( (yyvsp[(3) - (3)].decl) ))); }
     break;
@@ -7869 +7868 @@
 
 /* Line 1806 of yacc.c  */
-#line 1876 "parser.yy"
+#line 1873 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) )); }
     break;
@@ -7876 +7875 @@
 
 /* Line 1806 of yacc.c  */
-#line 1881 "parser.yy"
+#line 1878 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
     break;
@@ -7883 +7882 @@
 
 /* Line 1806 of yacc.c  */
-#line 1883 "parser.yy"
+#line 1880 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -7890 +7889 @@
 
 /* Line 1806 of yacc.c  */
-#line 1885 "parser.yy"
+#line 1882 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl)->copyStorageClasses( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -7897 +7896 @@
 
 /* Line 1806 of yacc.c  */
-#line 1890 "parser.yy"
+#line 1887 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addAssertions( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7904 +7903 @@
 
 /* Line 1806 of yacc.c  */
-#line 1892 "parser.yy"
+#line 1889 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addAssertions( (yyvsp[(2) - (4)].decl) )->addType( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -7911 +7910 @@
 
 /* Line 1806 of yacc.c  */
-#line 1897 "parser.yy"
+#line 1894 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (1)].tok), TypedefTable::TD );
@@ -7921 +7920 @@
 
 /* Line 1806 of yacc.c  */
-#line 1902 "parser.yy"
+#line 1899 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (6)].tok), TypedefTable::TG );
@@ -7931 +7930 @@
 
 /* Line 1806 of yacc.c  */
-#line 1910 "parser.yy"
+#line 1907 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (9)].tok), TypedefTable::ID );
@@ -7941 +7940 @@
 
 /* Line 1806 of yacc.c  */
-#line 1915 "parser.yy"
+#line 1912 "parser.yy"
     {
                         typedefTable.enterTrait( *(yyvsp[(2) - (8)].tok) );
@@ -7951 +7950 @@
 
 /* Line 1806 of yacc.c  */
-#line 1920 "parser.yy"
+#line 1917 "parser.yy"
     {
                         typedefTable.leaveTrait();
@@ -7962 +7961 @@
 
 /* Line 1806 of yacc.c  */
-#line 1930 "parser.yy"
+#line 1927 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7969 +7968 @@
 
 /* Line 1806 of yacc.c  */
-#line 1940 "parser.yy"
+#line 1937 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7979 +7978 @@
 
 /* Line 1806 of yacc.c  */
-#line 1945 "parser.yy"
+#line 1942 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7989 +7988 @@
 
 /* Line 1806 of yacc.c  */
-#line 1950 "parser.yy"
+#line 1947 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
@@ -7999 +7998 @@
 
 /* Line 1806 of yacc.c  */
-#line 1958 "parser.yy"
+#line 1955 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -8009 +8008 @@
 
 /* Line 1806 of yacc.c  */
-#line 1963 "parser.yy"
+#line 1960 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -8019 +8018 @@
 
 /* Line 1806 of yacc.c  */
-#line 1973 "parser.yy"
+#line 1970 "parser.yy"
     {}
     break;
@@ -8026 +8025 @@
 
 /* Line 1806 of yacc.c  */
-#line 1975 "parser.yy"
+#line 1972 "parser.yy"
     {
                         if ( theTree ) {
@@ -8039 +8038 @@
 
 /* Line 1806 of yacc.c  */
-#line 1987 "parser.yy"
+#line 1984 "parser.yy"
     { (yyval.decl) = ( (yyvsp[(1) - (3)].decl) != NULL ) ? (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ) : (yyvsp[(3) - (3)].decl); }
     break;
@@ -8046 +8045 @@
 
 /* Line 1806 of yacc.c  */
-#line 1992 "parser.yy"
+#line 1989 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -8053 +8052 @@
 
 /* Line 1806 of yacc.c  */
-#line 2000 "parser.yy"
+#line 1997 "parser.yy"
     {}
     break;
@@ -8060 +8059 @@
 
 /* Line 1806 of yacc.c  */
-#line 2002 "parser.yy"
+#line 1999 "parser.yy"
     {
                         linkageStack.push( linkage );
@@ -8070 +8069 @@
 
 /* Line 1806 of yacc.c  */
-#line 2007 "parser.yy"
+#line 2004 "parser.yy"
     {
                         linkage = linkageStack.top();
@@ -8081 +8080 @@
 
 /* Line 1806 of yacc.c  */
-#line 2013 "parser.yy"
+#line 2010 "parser.yy"
     {   // mark all fields in list
                         for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_link() )
@@ -8092 +8091 @@
 
 /* Line 1806 of yacc.c  */
-#line 2028 "parser.yy"
+#line 2025 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8103 +8102 @@
 
 /* Line 1806 of yacc.c  */
-#line 2034 "parser.yy"
+#line 2031 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8114 +8113 @@
 
 /* Line 1806 of yacc.c  */
-#line 2043 "parser.yy"
+#line 2040 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8125 +8124 @@
 
 /* Line 1806 of yacc.c  */
-#line 2049 "parser.yy"
+#line 2046 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8136 +8135 @@
 
 /* Line 1806 of yacc.c  */
-#line 2055 "parser.yy"
+#line 2052 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8147 +8146 @@
 
 /* Line 1806 of yacc.c  */
-#line 2061 "parser.yy"
+#line 2058 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8158 +8157 @@
 
 /* Line 1806 of yacc.c  */
-#line 2067 "parser.yy"
+#line 2064 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8169 +8168 @@
 
 /* Line 1806 of yacc.c  */
-#line 2075 "parser.yy"
+#line 2072 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8180 +8179 @@
 
 /* Line 1806 of yacc.c  */
-#line 2081 "parser.yy"
+#line 2078 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8191 +8190 @@
 
 /* Line 1806 of yacc.c  */
-#line 2089 "parser.yy"
+#line 2086 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8202 +8201 @@
 
 /* Line 1806 of yacc.c  */
-#line 2095 "parser.yy"
+#line 2092 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8213 +8212 @@
 
 /* Line 1806 of yacc.c  */
-#line 2110 "parser.yy"
+#line 2107 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Range ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
@@ -8220 +8219 @@
 
 /* Line 1806 of yacc.c  */
-#line 2120 "parser.yy"
+#line 2117 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -8227 +8226 @@
 
 /* Line 1806 of yacc.c  */
-#line 2127 "parser.yy"
+#line 2124 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -8234 +8233 @@
 
 /* Line 1806 of yacc.c  */
-#line 2133 "parser.yy"
+#line 2130 "parser.yy"
     { (yyval.decl) = 0; }
     break;
 
   case 560:
+
+/* Line 1806 of yacc.c  */
+#line 2145 "parser.yy"
+    {}
+    break;
+
+  case 561:
+
+/* Line 1806 of yacc.c  */
+#line 2146 "parser.yy"
+    {}
+    break;
+
+  case 562:
+
+/* Line 1806 of yacc.c  */
+#line 2147 "parser.yy"
+    {}
+    break;
+
+  case 563:
 
 /* Line 1806 of yacc.c  */
@@ -8245 +8265 @@
     break;
 
-  case 561:
-
-/* Line 1806 of yacc.c  */
-#line 2149 "parser.yy"
-    {}
-    break;
-
-  case 562:
-
-/* Line 1806 of yacc.c  */
-#line 2150 "parser.yy"
-    {}
-    break;
-
-  case 563:
-
-/* Line 1806 of yacc.c  */
-#line 2151 "parser.yy"
-    {}
-    break;
-
   case 564:
+
+/* Line 1806 of yacc.c  */
+#line 2183 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 566:
 
 /* Line 1806 of yacc.c  */
@@ -8273 +8279 @@
     break;
 
-  case 566:
-
-/* Line 1806 of yacc.c  */
-#line 2189 "parser.yy"
+  case 567:
+
+/* Line 1806 of yacc.c  */
+#line 2188 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 567:
-
-/* Line 1806 of yacc.c  */
-#line 2191 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 568:
 
 /* Line 1806 of yacc.c  */
-#line 2196 "parser.yy"
+#line 2193 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8300 +8299 @@
 
 /* Line 1806 of yacc.c  */
-#line 2201 "parser.yy"
+#line 2198 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8307 +8306 @@
 
 /* Line 1806 of yacc.c  */
-#line 2206 "parser.yy"
+#line 2203 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8314 +8313 @@
 
 /* Line 1806 of yacc.c  */
-#line 2208 "parser.yy"
+#line 2205 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8321 +8320 @@
 
 /* Line 1806 of yacc.c  */
-#line 2210 "parser.yy"
+#line 2207 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8328 +8327 @@
 
 /* Line 1806 of yacc.c  */
-#line 2215 "parser.yy"
+#line 2212 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8335 +8334 @@
 
 /* Line 1806 of yacc.c  */
-#line 2217 "parser.yy"
+#line 2214 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8342 +8341 @@
 
 /* Line 1806 of yacc.c  */
-#line 2219 "parser.yy"
+#line 2216 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8349 +8348 @@
 
 /* Line 1806 of yacc.c  */
-#line 2221 "parser.yy"
+#line 2218 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8356 +8355 @@
 
 /* Line 1806 of yacc.c  */
-#line 2226 "parser.yy"
+#line 2223 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8363 +8362 @@
 
 /* Line 1806 of yacc.c  */
-#line 2228 "parser.yy"
+#line 2225 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
   case 579:
+
+/* Line 1806 of yacc.c  */
+#line 2234 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 581:
 
 /* Line 1806 of yacc.c  */
@@ -8374 +8380 @@
     break;
 
-  case 581:
-
-/* Line 1806 of yacc.c  */
-#line 2240 "parser.yy"
+  case 582:
+
+/* Line 1806 of yacc.c  */
+#line 2242 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
+    break;
+
+  case 583:
+
+/* Line 1806 of yacc.c  */
+#line 2244 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 584:
+
+/* Line 1806 of yacc.c  */
+#line 2246 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 585:
+
+/* Line 1806 of yacc.c  */
+#line 2251 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 586:
+
+/* Line 1806 of yacc.c  */
+#line 2253 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 587:
+
+/* Line 1806 of yacc.c  */
+#line 2255 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 588:
+
+/* Line 1806 of yacc.c  */
+#line 2260 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 589:
+
+/* Line 1806 of yacc.c  */
+#line 2262 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 590:
+
+/* Line 1806 of yacc.c  */
+#line 2264 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 594:
+
+/* Line 1806 of yacc.c  */
+#line 2279 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addIdList( (yyvsp[(3) - (4)].decl) ); }
+    break;
+
+  case 595:
+
+/* Line 1806 of yacc.c  */
+#line 2281 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (6)].decl)->addIdList( (yyvsp[(5) - (6)].decl) ); }
+    break;
+
+  case 596:
+
+/* Line 1806 of yacc.c  */
+#line 2283 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 597:
+
+/* Line 1806 of yacc.c  */
+#line 2288 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 598:
+
+/* Line 1806 of yacc.c  */
+#line 2290 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 599:
+
+/* Line 1806 of yacc.c  */
+#line 2292 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 600:
+
+/* Line 1806 of yacc.c  */
+#line 2297 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 601:
+
+/* Line 1806 of yacc.c  */
+#line 2299 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 602:
+
+/* Line 1806 of yacc.c  */
+#line 2301 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 603:
+
+/* Line 1806 of yacc.c  */
+#line 2316 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 582:
-
-/* Line 1806 of yacc.c  */
-#line 2245 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-
-  case 583:
-
-/* Line 1806 of yacc.c  */
-#line 2247 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 584:
-
-/* Line 1806 of yacc.c  */
-#line 2249 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 585:
-
-/* Line 1806 of yacc.c  */
-#line 2254 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 586:
-
-/* Line 1806 of yacc.c  */
-#line 2256 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 587:
-
-/* Line 1806 of yacc.c  */
-#line 2258 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 588:
-
-/* Line 1806 of yacc.c  */
-#line 2263 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 589:
-
-/* Line 1806 of yacc.c  */
-#line 2265 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 590:
-
-/* Line 1806 of yacc.c  */
-#line 2267 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 594:
-
-/* Line 1806 of yacc.c  */
-#line 2282 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addIdList( (yyvsp[(3) - (4)].decl) ); }
-    break;
-
-  case 595:
-
-/* Line 1806 of yacc.c  */
-#line 2284 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (6)].decl)->addIdList( (yyvsp[(5) - (6)].decl) ); }
-    break;
-
-  case 596:
-
-/* Line 1806 of yacc.c  */
-#line 2286 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 597:
-
-/* Line 1806 of yacc.c  */
-#line 2291 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 598:
-
-/* Line 1806 of yacc.c  */
-#line 2293 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 599:
-
-/* Line 1806 of yacc.c  */
-#line 2295 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 600:
-
-/* Line 1806 of yacc.c  */
-#line 2300 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 601:
-
-/* Line 1806 of yacc.c  */
-#line 2302 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 602:
-
-/* Line 1806 of yacc.c  */
-#line 2304 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 603:
+  case 605:
 
 /* Line 1806 of yacc.c  */
@@ -8514 +8520 @@
     break;
 
-  case 605:
-
-/* Line 1806 of yacc.c  */
-#line 2322 "parser.yy"
+  case 606:
+
+/* Line 1806 of yacc.c  */
+#line 2321 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 606:
-
-/* Line 1806 of yacc.c  */
-#line 2324 "parser.yy"
+  case 608:
+
+/* Line 1806 of yacc.c  */
+#line 2327 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 609:
+
+/* Line 1806 of yacc.c  */
+#line 2332 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 610:
+
+/* Line 1806 of yacc.c  */
+#line 2334 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 611:
+
+/* Line 1806 of yacc.c  */
+#line 2336 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 612:
+
+/* Line 1806 of yacc.c  */
+#line 2341 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 613:
+
+/* Line 1806 of yacc.c  */
+#line 2343 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 614:
+
+/* Line 1806 of yacc.c  */
+#line 2345 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 615:
+
+/* Line 1806 of yacc.c  */
+#line 2347 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 616:
+
+/* Line 1806 of yacc.c  */
+#line 2352 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
+    break;
+
+  case 617:
+
+/* Line 1806 of yacc.c  */
+#line 2354 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 618:
+
+/* Line 1806 of yacc.c  */
+#line 2356 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 619:
+
+/* Line 1806 of yacc.c  */
+#line 2366 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 608:
-
-/* Line 1806 of yacc.c  */
-#line 2330 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 609:
-
-/* Line 1806 of yacc.c  */
-#line 2335 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 610:
-
-/* Line 1806 of yacc.c  */
-#line 2337 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 611:
-
-/* Line 1806 of yacc.c  */
-#line 2339 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 612:
-
-/* Line 1806 of yacc.c  */
-#line 2344 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 613:
-
-/* Line 1806 of yacc.c  */
-#line 2346 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 614:
-
-/* Line 1806 of yacc.c  */
-#line 2348 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 615:
-
-/* Line 1806 of yacc.c  */
-#line 2350 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 616:
-
-/* Line 1806 of yacc.c  */
-#line 2355 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-
-  case 617:
-
-/* Line 1806 of yacc.c  */
-#line 2357 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 618:
-
-/* Line 1806 of yacc.c  */
-#line 2359 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 619:
+  case 621:
 
 /* Line 1806 of yacc.c  */
@@ -8612 +8618 @@
     break;
 
-  case 621:
-
-/* Line 1806 of yacc.c  */
-#line 2372 "parser.yy"
+  case 622:
+
+/* Line 1806 of yacc.c  */
+#line 2371 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 622:
-
-/* Line 1806 of yacc.c  */
-#line 2374 "parser.yy"
+  case 623:
+
+/* Line 1806 of yacc.c  */
+#line 2376 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 624:
+
+/* Line 1806 of yacc.c  */
+#line 2378 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 625:
+
+/* Line 1806 of yacc.c  */
+#line 2380 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 626:
+
+/* Line 1806 of yacc.c  */
+#line 2385 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 627:
+
+/* Line 1806 of yacc.c  */
+#line 2387 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 628:
+
+/* Line 1806 of yacc.c  */
+#line 2389 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 629:
+
+/* Line 1806 of yacc.c  */
+#line 2391 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 630:
+
+/* Line 1806 of yacc.c  */
+#line 2396 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
+    break;
+
+  case 631:
+
+/* Line 1806 of yacc.c  */
+#line 2398 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 632:
+
+/* Line 1806 of yacc.c  */
+#line 2400 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 633:
+
+/* Line 1806 of yacc.c  */
+#line 2431 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 623:
-
-/* Line 1806 of yacc.c  */
-#line 2379 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 624:
-
-/* Line 1806 of yacc.c  */
-#line 2381 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 625:
-
-/* Line 1806 of yacc.c  */
-#line 2383 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 626:
-
-/* Line 1806 of yacc.c  */
-#line 2388 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 627:
-
-/* Line 1806 of yacc.c  */
-#line 2390 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 628:
-
-/* Line 1806 of yacc.c  */
-#line 2392 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 629:
-
-/* Line 1806 of yacc.c  */
-#line 2394 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 630:
-
-/* Line 1806 of yacc.c  */
-#line 2399 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-
-  case 631:
-
-/* Line 1806 of yacc.c  */
-#line 2401 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 632:
-
-/* Line 1806 of yacc.c  */
-#line 2403 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 633:
+  case 635:
 
 /* Line 1806 of yacc.c  */
@@ -8703 +8709 @@
     break;
 
-  case 635:
-
-/* Line 1806 of yacc.c  */
-#line 2437 "parser.yy"
+  case 636:
+
+/* Line 1806 of yacc.c  */
+#line 2436 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 636:
-
-/* Line 1806 of yacc.c  */
-#line 2439 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 637:
 
 /* Line 1806 of yacc.c  */
-#line 2444 "parser.yy"
+#line 2441 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8730 +8729 @@
 
 /* Line 1806 of yacc.c  */
-#line 2449 "parser.yy"
+#line 2446 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8740 +8739 @@
 
 /* Line 1806 of yacc.c  */
-#line 2457 "parser.yy"
+#line 2454 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8747 +8746 @@
 
 /* Line 1806 of yacc.c  */
-#line 2459 "parser.yy"
+#line 2456 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8754 +8753 @@
 
 /* Line 1806 of yacc.c  */
-#line 2461 "parser.yy"
+#line 2458 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8761 +8760 @@
 
 /* Line 1806 of yacc.c  */
-#line 2466 "parser.yy"
+#line 2463 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8768 +8767 @@
 
 /* Line 1806 of yacc.c  */
-#line 2468 "parser.yy"
+#line 2465 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8775 +8774 @@
 
 /* Line 1806 of yacc.c  */
-#line 2473 "parser.yy"
+#line 2470 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
@@ -8782 +8781 @@
 
 /* Line 1806 of yacc.c  */
-#line 2475 "parser.yy"
+#line 2472 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8789 +8788 @@
 
 /* Line 1806 of yacc.c  */
-#line 2490 "parser.yy"
+#line 2487 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8796 +8795 @@
 
 /* Line 1806 of yacc.c  */
-#line 2492 "parser.yy"
+#line 2489 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8803 +8802 @@
 
 /* Line 1806 of yacc.c  */
-#line 2497 "parser.yy"
+#line 2494 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
@@ -8810 +8809 @@
 
 /* Line 1806 of yacc.c  */
-#line 2499 "parser.yy"
+#line 2496 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8817 +8816 @@
 
 /* Line 1806 of yacc.c  */
-#line 2501 "parser.yy"
+#line 2498 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8824 +8823 @@
 
 /* Line 1806 of yacc.c  */
-#line 2503 "parser.yy"
+#line 2500 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8831 +8830 @@
 
 /* Line 1806 of yacc.c  */
-#line 2505 "parser.yy"
+#line 2502 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8838 +8837 @@
 
 /* Line 1806 of yacc.c  */
-#line 2511 "parser.yy"
+#line 2508 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8845 +8844 @@
 
 /* Line 1806 of yacc.c  */
-#line 2513 "parser.yy"
+#line 2510 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8852 +8851 @@
 
 /* Line 1806 of yacc.c  */
-#line 2515 "parser.yy"
+#line 2512 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8859 +8858 @@
 
 /* Line 1806 of yacc.c  */
-#line 2520 "parser.yy"
+#line 2517 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
     break;
@@ -8866 +8865 @@
 
 /* Line 1806 of yacc.c  */
-#line 2522 "parser.yy"
+#line 2519 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8873 +8872 @@
 
 /* Line 1806 of yacc.c  */
-#line 2524 "parser.yy"
+#line 2521 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8880 +8879 @@
 
 /* Line 1806 of yacc.c  */
-#line 2530 "parser.yy"
+#line 2527 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
     break;
@@ -8887 +8886 @@
 
 /* Line 1806 of yacc.c  */
-#line 2532 "parser.yy"
+#line 2529 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false )->addArray( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -8894 +8893 @@
 
 /* Line 1806 of yacc.c  */
-#line 2538 "parser.yy"
+#line 2535 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(3) - (5)].en), 0, false ); }
     break;
@@ -8901 +8900 @@
 
 /* Line 1806 of yacc.c  */
-#line 2540 "parser.yy"
+#line 2537 "parser.yy"
     { (yyval.decl) = DeclarationNode::newVarArray( 0 ); }
     break;
@@ -8908 +8907 @@
 
 /* Line 1806 of yacc.c  */
-#line 2542 "parser.yy"
+#line 2539 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newArray( (yyvsp[(4) - (6)].en), 0, false ) ); }
     break;
@@ -8915 +8914 @@
 
 /* Line 1806 of yacc.c  */
-#line 2544 "parser.yy"
+#line 2541 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newVarArray( 0 ) ); }
     break;
@@ -8922 +8921 @@
 
 /* Line 1806 of yacc.c  */
-#line 2559 "parser.yy"
+#line 2556 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8929 +8928 @@
 
 /* Line 1806 of yacc.c  */
-#line 2561 "parser.yy"
+#line 2558 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8936 +8935 @@
 
 /* Line 1806 of yacc.c  */
-#line 2566 "parser.yy"
+#line 2563 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
@@ -8943 +8942 @@
 
 /* Line 1806 of yacc.c  */
-#line 2568 "parser.yy"
+#line 2565 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8950 +8949 @@
 
 /* Line 1806 of yacc.c  */
-#line 2570 "parser.yy"
+#line 2567 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8957 +8956 @@
 
 /* Line 1806 of yacc.c  */
-#line 2572 "parser.yy"
+#line 2569 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8964 +8963 @@
 
 /* Line 1806 of yacc.c  */
-#line 2574 "parser.yy"
+#line 2571 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8971 +8970 @@
 
 /* Line 1806 of yacc.c  */
-#line 2580 "parser.yy"
+#line 2577 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8978 +8977 @@
 
 /* Line 1806 of yacc.c  */
-#line 2582 "parser.yy"
+#line 2579 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8985 +8984 @@
 
 /* Line 1806 of yacc.c  */
-#line 2584 "parser.yy"
+#line 2581 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8992 +8991 @@
 
 /* Line 1806 of yacc.c  */
-#line 2589 "parser.yy"
+#line 2586 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
     break;
@@ -8999 +8998 @@
 
 /* Line 1806 of yacc.c  */
-#line 2591 "parser.yy"
+#line 2588 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -9006 +9005 @@
 
 /* Line 1806 of yacc.c  */
-#line 2593 "parser.yy"
+#line 2590 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -9013 +9012 @@
 
 /* Line 1806 of yacc.c  */
-#line 2600 "parser.yy"
+#line 2597 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -9020 +9019 @@
 
 /* Line 1806 of yacc.c  */
+#line 2608 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
+    break;
+
+  case 687:
+
+/* Line 1806 of yacc.c  */
 #line 2611 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
-    break;
-
-  case 687:
-
-/* Line 1806 of yacc.c  */
-#line 2614 "parser.yy"
     { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
     break;
@@ -9034 +9033 @@
 
 /* Line 1806 of yacc.c  */
+#line 2613 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( 0, (yyvsp[(3) - (5)].decl), false ); }
+    break;
+
+  case 689:
+
+/* Line 1806 of yacc.c  */
 #line 2616 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( 0, (yyvsp[(3) - (5)].decl), false ); }
-    break;
-
-  case 689:
-
-/* Line 1806 of yacc.c  */
-#line 2619 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
     break;
@@ -9048 +9047 @@
 
 /* Line 1806 of yacc.c  */
-#line 2621 "parser.yy"
+#line 2618 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl), true ); }
     break;
@@ -9055 +9054 @@
 
 /* Line 1806 of yacc.c  */
-#line 2623 "parser.yy"
+#line 2620 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(3) - (7)].decl), true ); }
     break;
@@ -9062 +9061 @@
 
 /* Line 1806 of yacc.c  */
-#line 2637 "parser.yy"
+#line 2634 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -9069 +9068 @@
 
 /* Line 1806 of yacc.c  */
-#line 2639 "parser.yy"
+#line 2636 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -9076 +9075 @@
 
 /* Line 1806 of yacc.c  */
-#line 2644 "parser.yy"
+#line 2641 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
@@ -9083 +9082 @@
 
 /* Line 1806 of yacc.c  */
-#line 2646 "parser.yy"
+#line 2643 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -9090 +9089 @@
 
 /* Line 1806 of yacc.c  */
-#line 2648 "parser.yy"
+#line 2645 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -9097 +9096 @@
 
 /* Line 1806 of yacc.c  */
-#line 2650 "parser.yy"
+#line 2647 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -9104 +9103 @@
 
 /* Line 1806 of yacc.c  */
-#line 2652 "parser.yy"
+#line 2649 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -9111 +9110 @@
 
 /* Line 1806 of yacc.c  */
-#line 2658 "parser.yy"
+#line 2655 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -9118 +9117 @@
 
 /* Line 1806 of yacc.c  */
-#line 2660 "parser.yy"
+#line 2657 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -9125 +9124 @@
 
 /* Line 1806 of yacc.c  */
-#line 2662 "parser.yy"
+#line 2659 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -9132 +9131 @@
 
 /* Line 1806 of yacc.c  */
-#line 2667 "parser.yy"
+#line 2664 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -9139 +9138 @@
 
 /* Line 1806 of yacc.c  */
-#line 2669 "parser.yy"
+#line 2666 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -9146 +9145 @@
 
 /* Line 1806 of yacc.c  */
-#line 2679 "parser.yy"
+#line 2676 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9153 +9152 @@
 
 /* Line 1806 of yacc.c  */
-#line 2689 "parser.yy"
+#line 2686 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -9160 +9159 @@
 
 /* Line 1806 of yacc.c  */
-#line 2691 "parser.yy"
+#line 2688 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -9167 +9166 @@
 
 /* Line 1806 of yacc.c  */
-#line 2693 "parser.yy"
+#line 2690 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -9174 +9173 @@
 
 /* Line 1806 of yacc.c  */
-#line 2695 "parser.yy"
+#line 2692 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -9181 +9180 @@
 
 /* Line 1806 of yacc.c  */
-#line 2697 "parser.yy"
+#line 2694 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -9188 +9187 @@
 
 /* Line 1806 of yacc.c  */
-#line 2699 "parser.yy"
+#line 2696 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -9195 +9194 @@
 
 /* Line 1806 of yacc.c  */
-#line 2706 "parser.yy"
+#line 2703 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -9202 +9201 @@
 
 /* Line 1806 of yacc.c  */
-#line 2708 "parser.yy"
+#line 2705 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9209 +9208 @@
 
 /* Line 1806 of yacc.c  */
-#line 2710 "parser.yy"
+#line 2707 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -9216 +9215 @@
 
 /* Line 1806 of yacc.c  */
-#line 2712 "parser.yy"
+#line 2709 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -9223 +9222 @@
 
 /* Line 1806 of yacc.c  */
-#line 2714 "parser.yy"
+#line 2711 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9230 +9229 @@
 
 /* Line 1806 of yacc.c  */
-#line 2716 "parser.yy"
+#line 2713 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -9237 +9236 @@
 
 /* Line 1806 of yacc.c  */
-#line 2718 "parser.yy"
+#line 2715 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9244 +9243 @@
 
 /* Line 1806 of yacc.c  */
-#line 2720 "parser.yy"
+#line 2717 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -9251 +9250 @@
 
 /* Line 1806 of yacc.c  */
-#line 2722 "parser.yy"
+#line 2719 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -9258 +9257 @@
 
 /* Line 1806 of yacc.c  */
-#line 2724 "parser.yy"
+#line 2721 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9265 +9264 @@
 
 /* Line 1806 of yacc.c  */
-#line 2729 "parser.yy"
+#line 2726 "parser.yy"
     { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
     break;
@@ -9272 +9271 @@
 
 /* Line 1806 of yacc.c  */
-#line 2731 "parser.yy"
+#line 2728 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
     break;
@@ -9279 +9278 @@
 
 /* Line 1806 of yacc.c  */
-#line 2736 "parser.yy"
+#line 2733 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), true ); }
     break;
@@ -9286 +9285 @@
 
 /* Line 1806 of yacc.c  */
-#line 2738 "parser.yy"
+#line 2735 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl)->addQualifiers( (yyvsp[(3) - (7)].decl) ), true ); }
     break;
@@ -9293 +9292 @@
 
 /* Line 1806 of yacc.c  */
-#line 2765 "parser.yy"
+#line 2762 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9300 +9299 @@
 
 /* Line 1806 of yacc.c  */
-#line 2776 "parser.yy"
+#line 2773 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -9307 +9306 @@
 
 /* Line 1806 of yacc.c  */
-#line 2778 "parser.yy"
+#line 2775 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -9314 +9313 @@
 
 /* Line 1806 of yacc.c  */
-#line 2780 "parser.yy"
+#line 2777 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -9321 +9320 @@
 
 /* Line 1806 of yacc.c  */
-#line 2782 "parser.yy"
+#line 2779 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -9328 +9327 @@
 
 /* Line 1806 of yacc.c  */
-#line 2784 "parser.yy"
+#line 2781 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -9335 +9334 @@
 
 /* Line 1806 of yacc.c  */
-#line 2786 "parser.yy"
+#line 2783 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -9342 +9341 @@
 
 /* Line 1806 of yacc.c  */
-#line 2793 "parser.yy"
+#line 2790 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -9349 +9348 @@
 
 /* Line 1806 of yacc.c  */
-#line 2795 "parser.yy"
+#line 2792 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -9356 +9355 @@
 
 /* Line 1806 of yacc.c  */
-#line 2797 "parser.yy"
+#line 2794 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9363 +9362 @@
 
 /* Line 1806 of yacc.c  */
-#line 2799 "parser.yy"
+#line 2796 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -9370 +9369 @@
 
 /* Line 1806 of yacc.c  */
-#line 2801 "parser.yy"
+#line 2798 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -9377 +9376 @@
 
 /* Line 1806 of yacc.c  */
-#line 2803 "parser.yy"
+#line 2800 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9384 +9383 @@
 
 /* Line 1806 of yacc.c  */
-#line 2808 "parser.yy"
+#line 2805 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -9391 +9390 @@
 
 /* Line 1806 of yacc.c  */
-#line 2813 "parser.yy"
+#line 2810 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, DeclarationNode::newTuple( 0 ), (yyvsp[(4) - (5)].decl), 0 ); }
     break;
@@ -9398 +9397 @@
 
 /* Line 1806 of yacc.c  */
-#line 2815 "parser.yy"
+#line 2812 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), 0 ); }
     break;
@@ -9405 +9404 @@
 
 /* Line 1806 of yacc.c  */
-#line 2817 "parser.yy"
+#line 2814 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), 0 ); }
     break;
@@ -9412 +9411 @@
 
 /* Line 1806 of yacc.c  */
-#line 2841 "parser.yy"
+#line 2838 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -9419 +9418 @@
 
 /* Line 1806 of yacc.c  */
-#line 2843 "parser.yy"
+#line 2840 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -9426 +9425 @@
 
 /* Line 1806 of yacc.c  */
-#line 9429 "Parser/parser.cc"
+#line 9428 "Parser/parser.cc"
       default: break;
     }
@@ -9657 +9656 @@
 
 /* Line 2067 of yacc.c  */
-#line 2846 "parser.yy"
+#line 2843 "parser.yy"
 
 // ----end of grammar----