Changes in src/Parser/parser.cc [9059213:bf32bb8]

File:

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

src/Parser/parser.cc

@@ -1023 +1023 @@
 static const yytype_uint16 yyrline[] =
 {
-       0,   302,   302,   306,   313,   314,   315,   319,   320,   321,
-     325,   326,   330,   331,   335,   336,   340,   344,   345,   356,
-     358,   360,   362,   367,   368,   374,   378,   380,   381,   382,
-     384,   385,   387,   389,   391,   400,   401,   407,   408,   412,
-     413,   417,   421,   423,   425,   427,   432,   434,   438,   441,
-     443,   445,   450,   463,   465,   467,   469,   471,   473,   475,
-     477,   479,   481,   483,   490,   491,   497,   498,   499,   500,
-     504,   505,   507,   512,   513,   515,   517,   522,   523,   525,
-     530,   531,   533,   538,   539,   541,   543,   545,   550,   551,
-     553,   558,   559,   564,   565,   570,   571,   576,   577,   582,
-     583,   588,   589,   592,   594,   599,   604,   605,   607,   613,
-     614,   618,   619,   620,   621,   622,   623,   624,   625,   626,
-     627,   628,   629,   635,   637,   639,   641,   646,   647,   652,
-     653,   659,   660,   666,   667,   668,   669,   670,   671,   672,
-     673,   674,   684,   691,   693,   703,   704,   709,   711,   717,
-     719,   723,   724,   729,   734,   737,   739,   741,   751,   753,
-     764,   765,   767,   771,   773,   777,   778,   783,   784,   788,
-     793,   794,   798,   800,   806,   807,   811,   813,   815,   817,
-     823,   824,   828,   830,   835,   837,   839,   844,   846,   851,
-     853,   857,   860,   864,   867,   871,   873,   875,   877,   882,
-     884,   886,   891,   893,   895,   897,   899,   904,   906,   908,
-     910,   915,   927,   928,   933,   935,   940,   944,   946,   948,
-     950,   952,   958,   959,   965,   966,   970,   971,   976,   978,
-     984,   985,   987,   992,   997,  1007,  1009,  1013,  1014,  1019,
-    1021,  1025,  1026,  1030,  1032,  1036,  1037,  1041,  1042,  1046,
-    1047,  1062,  1063,  1064,  1065,  1066,  1070,  1075,  1082,  1092,
-    1097,  1102,  1110,  1115,  1120,  1125,  1130,  1138,  1160,  1165,
-    1172,  1174,  1181,  1186,  1191,  1202,  1207,  1212,  1217,  1222,
-    1231,  1236,  1244,  1245,  1246,  1247,  1253,  1258,  1266,  1267,
-    1268,  1269,  1273,  1274,  1275,  1276,  1281,  1282,  1291,  1292,
-    1297,  1298,  1303,  1305,  1307,  1309,  1311,  1314,  1313,  1325,
-    1326,  1328,  1338,  1339,  1344,  1346,  1348,  1350,  1352,  1355,
-    1357,  1360,  1365,  1367,  1369,  1371,  1373,  1375,  1377,  1379,
-    1381,  1383,  1385,  1387,  1389,  1395,  1396,  1398,  1400,  1402,
-    1407,  1408,  1414,  1415,  1417,  1419,  1424,  1426,  1428,  1430,
-    1435,  1436,  1438,  1440,  1445,  1446,  1448,  1453,  1454,  1456,
-    1458,  1463,  1465,  1467,  1472,  1473,  1477,  1479,  1485,  1484,
-    1488,  1490,  1495,  1497,  1503,  1504,  1509,  1510,  1512,  1513,
-    1522,  1523,  1525,  1527,  1532,  1534,  1540,  1541,  1543,  1546,
-    1549,  1554,  1555,  1560,  1565,  1569,  1571,  1577,  1576,  1583,
-    1585,  1591,  1592,  1600,  1601,  1605,  1606,  1607,  1609,  1611,
-    1618,  1619,  1621,  1623,  1628,  1629,  1635,  1636,  1640,  1641,
-    1646,  1647,  1648,  1650,  1658,  1659,  1661,  1664,  1666,  1670,
-    1671,  1672,  1674,  1676,  1680,  1685,  1693,  1694,  1703,  1705,
-    1710,  1711,  1712,  1716,  1717,  1718,  1722,  1723,  1724,  1728,
-    1729,  1730,  1735,  1736,  1737,  1738,  1744,  1745,  1747,  1752,
-    1753,  1758,  1759,  1760,  1761,  1762,  1777,  1778,  1783,  1784,
-    1790,  1792,  1795,  1797,  1799,  1822,  1823,  1825,  1827,  1832,
-    1833,  1835,  1840,  1845,  1846,  1852,  1851,  1855,  1859,  1861,
-    1863,  1869,  1870,  1875,  1880,  1882,  1887,  1889,  1890,  1892,
-    1897,  1899,  1901,  1906,  1908,  1913,  1918,  1926,  1932,  1931,
-    1945,  1946,  1951,  1952,  1956,  1961,  1966,  1974,  1979,  1990,
-    1991,  1996,  1997,  2003,  2004,  2008,  2009,  2010,  2013,  2012,
-    2023,  2032,  2038,  2044,  2053,  2059,  2065,  2071,  2077,  2085,
-    2091,  2099,  2105,  2114,  2115,  2116,  2120,  2124,  2126,  2131,
-    2132,  2136,  2137,  2142,  2148,  2149,  2152,  2154,  2155,  2159,
-    2160,  2161,  2162,  2196,  2198,  2199,  2201,  2206,  2211,  2216,
-    2218,  2220,  2225,  2227,  2229,  2231,  2236,  2238,  2247,  2249,
-    2250,  2255,  2257,  2259,  2264,  2266,  2268,  2273,  2275,  2277,
-    2286,  2287,  2288,  2292,  2294,  2296,  2301,  2303,  2305,  2310,
-    2312,  2314,  2329,  2331,  2332,  2334,  2339,  2340,  2345,  2347,
-    2349,  2354,  2356,  2358,  2360,  2365,  2367,  2369,  2379,  2381,
-    2382,  2384,  2389,  2391,  2393,  2398,  2400,  2402,  2404,  2409,
-    2411,  2413,  2444,  2446,  2447,  2449,  2454,  2459,  2467,  2469,
-    2471,  2476,  2478,  2483,  2485,  2499,  2500,  2502,  2507,  2509,
-    2511,  2513,  2515,  2520,  2521,  2523,  2525,  2530,  2532,  2534,
-    2540,  2542,  2544,  2548,  2550,  2552,  2554,  2568,  2569,  2571,
-    2576,  2578,  2580,  2582,  2584,  2589,  2590,  2592,  2594,  2599,
-    2601,  2603,  2609,  2610,  2612,  2621,  2624,  2626,  2629,  2631,
-    2633,  2646,  2647,  2649,  2654,  2656,  2658,  2660,  2662,  2667,
-    2668,  2670,  2672,  2677,  2679,  2687,  2688,  2689,  2694,  2695,
-    2699,  2701,  2703,  2705,  2707,  2709,  2716,  2718,  2720,  2722,
-    2724,  2727,  2729,  2731,  2733,  2735,  2740,  2742,  2744,  2749,
-    2775,  2776,  2778,  2782,  2783,  2787,  2789,  2791,  2793,  2795,
-    2797,  2804,  2806,  2808,  2810,  2812,  2814,  2819,  2824,  2826,
-    2828,  2846,  2848,  2853,  2854
+       0,   301,   301,   305,   312,   313,   314,   318,   319,   320,
+     324,   325,   329,   330,   334,   335,   339,   343,   344,   355,
+     357,   359,   361,   366,   367,   373,   377,   379,   381,   383,
+     385,   387,   389,   391,   393,   402,   403,   409,   410,   414,
+     415,   419,   422,   424,   426,   428,   433,   435,   440,   443,
+     445,   447,   452,   465,   467,   469,   471,   473,   475,   477,
+     479,   481,   483,   485,   492,   493,   499,   500,   501,   502,
+     506,   507,   509,   514,   515,   517,   519,   524,   525,   527,
+     532,   533,   535,   540,   541,   543,   545,   547,   552,   553,
+     555,   560,   561,   566,   567,   572,   573,   578,   579,   584,
+     585,   590,   591,   594,   596,   601,   606,   607,   609,   615,
+     616,   620,   621,   622,   623,   624,   625,   626,   627,   628,
+     629,   630,   631,   637,   639,   641,   643,   648,   649,   654,
+     655,   661,   662,   668,   669,   670,   671,   672,   673,   674,
+     675,   676,   686,   693,   695,   705,   706,   711,   713,   719,
+     721,   725,   726,   731,   736,   739,   741,   743,   753,   755,
+     766,   767,   769,   773,   775,   779,   780,   785,   786,   790,
+     795,   796,   800,   802,   808,   809,   813,   815,   817,   819,
+     825,   826,   830,   832,   837,   839,   841,   846,   848,   853,
+     855,   859,   862,   866,   869,   873,   875,   877,   879,   884,
+     886,   888,   893,   895,   897,   899,   901,   906,   908,   910,
+     912,   917,   929,   930,   935,   937,   942,   946,   948,   950,
+     952,   954,   960,   961,   967,   968,   972,   973,   978,   980,
+     986,   987,   989,   994,   999,  1009,  1011,  1015,  1016,  1021,
+    1023,  1027,  1028,  1032,  1034,  1038,  1039,  1043,  1044,  1048,
+    1049,  1064,  1065,  1066,  1067,  1068,  1072,  1077,  1084,  1094,
+    1099,  1104,  1112,  1117,  1122,  1127,  1132,  1140,  1162,  1167,
+    1174,  1176,  1183,  1188,  1193,  1204,  1209,  1214,  1219,  1224,
+    1233,  1238,  1246,  1247,  1248,  1249,  1255,  1260,  1268,  1269,
+    1270,  1271,  1275,  1276,  1277,  1278,  1283,  1284,  1293,  1294,
+    1299,  1300,  1305,  1307,  1309,  1311,  1313,  1316,  1315,  1327,
+    1328,  1330,  1340,  1341,  1346,  1348,  1350,  1352,  1354,  1357,
+    1359,  1362,  1367,  1369,  1371,  1373,  1375,  1377,  1379,  1381,
+    1383,  1385,  1387,  1389,  1391,  1397,  1398,  1400,  1402,  1404,
+    1409,  1410,  1416,  1417,  1419,  1421,  1426,  1428,  1430,  1432,
+    1437,  1438,  1440,  1442,  1447,  1448,  1450,  1455,  1456,  1458,
+    1460,  1465,  1467,  1469,  1474,  1475,  1479,  1481,  1487,  1486,
+    1490,  1492,  1497,  1499,  1505,  1506,  1511,  1512,  1514,  1515,
+    1524,  1525,  1527,  1529,  1534,  1536,  1542,  1543,  1545,  1548,
+    1551,  1556,  1557,  1562,  1567,  1571,  1573,  1579,  1578,  1585,
+    1587,  1593,  1594,  1602,  1603,  1607,  1608,  1609,  1611,  1613,
+    1620,  1621,  1623,  1625,  1630,  1631,  1637,  1638,  1642,  1643,
+    1648,  1649,  1650,  1652,  1660,  1661,  1663,  1666,  1668,  1672,
+    1673,  1674,  1676,  1678,  1682,  1687,  1695,  1696,  1705,  1707,
+    1712,  1713,  1714,  1718,  1719,  1720,  1724,  1725,  1726,  1730,
+    1731,  1732,  1737,  1738,  1739,  1740,  1746,  1747,  1749,  1754,
+    1755,  1760,  1761,  1762,  1763,  1764,  1779,  1780,  1785,  1786,
+    1792,  1794,  1797,  1799,  1801,  1824,  1825,  1827,  1829,  1834,
+    1835,  1837,  1842,  1847,  1848,  1854,  1853,  1857,  1861,  1863,
+    1865,  1871,  1872,  1877,  1882,  1884,  1889,  1891,  1892,  1894,
+    1899,  1901,  1903,  1908,  1910,  1915,  1920,  1928,  1934,  1933,
+    1947,  1948,  1953,  1954,  1958,  1963,  1968,  1976,  1981,  1992,
+    1993,  1998,  1999,  2005,  2006,  2010,  2011,  2012,  2015,  2014,
+    2025,  2034,  2040,  2046,  2055,  2061,  2067,  2073,  2079,  2087,
+    2093,  2101,  2107,  2116,  2117,  2118,  2122,  2126,  2128,  2133,
+    2134,  2138,  2139,  2144,  2150,  2151,  2154,  2156,  2157,  2161,
+    2162,  2163,  2164,  2198,  2200,  2201,  2203,  2208,  2213,  2218,
+    2220,  2222,  2227,  2229,  2231,  2233,  2238,  2240,  2249,  2251,
+    2252,  2257,  2259,  2261,  2266,  2268,  2270,  2275,  2277,  2279,
+    2288,  2289,  2290,  2294,  2296,  2298,  2303,  2305,  2307,  2312,
+    2314,  2316,  2331,  2333,  2334,  2336,  2341,  2342,  2347,  2349,
+    2351,  2356,  2358,  2360,  2362,  2367,  2369,  2371,  2381,  2383,
+    2384,  2386,  2391,  2393,  2395,  2400,  2402,  2404,  2406,  2411,
+    2413,  2415,  2446,  2448,  2449,  2451,  2456,  2461,  2469,  2471,
+    2473,  2478,  2480,  2485,  2487,  2501,  2502,  2504,  2509,  2511,
+    2513,  2515,  2517,  2522,  2523,  2525,  2527,  2532,  2534,  2536,
+    2542,  2544,  2546,  2550,  2552,  2554,  2556,  2570,  2571,  2573,
+    2578,  2580,  2582,  2584,  2586,  2591,  2592,  2594,  2596,  2601,
+    2603,  2605,  2611,  2612,  2614,  2623,  2626,  2628,  2631,  2633,
+    2635,  2648,  2649,  2651,  2656,  2658,  2660,  2662,  2664,  2669,
+    2670,  2672,  2674,  2679,  2681,  2689,  2690,  2691,  2696,  2697,
+    2701,  2703,  2705,  2707,  2709,  2711,  2718,  2720,  2722,  2724,
+    2726,  2728,  2730,  2732,  2734,  2736,  2741,  2743,  2745,  2750,
+    2776,  2777,  2779,  2783,  2784,  2788,  2790,  2792,  2794,  2796,
+    2798,  2805,  2807,  2809,  2811,  2813,  2815,  2820,  2825,  2827,
+    2829,  2847,  2849,  2854,  2855
 };
 #endif
@@ -4977 +4977 @@
 
 /* Line 1806 of yacc.c  */
-#line 302 "parser.yy"
+#line 301 "parser.yy"
     { typedefTable.enterScope(); }
     break;
@@ -4984 +4984 @@
 
 /* Line 1806 of yacc.c  */
-#line 306 "parser.yy"
+#line 305 "parser.yy"
     { typedefTable.leaveScope(); }
     break;
@@ -4991 +4991 @@
 
 /* Line 1806 of yacc.c  */
+#line 312 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_constantInteger( *(yyvsp[(1) - (1)].tok) ) ); }
+    break;
+
+  case 5:
+
+/* Line 1806 of yacc.c  */
 #line 313 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_constantInteger( *(yyvsp[(1) - (1)].tok) ) ); }
-    break;
-
-  case 5:
+    { (yyval.en) = new ExpressionNode( build_constantFloat( *(yyvsp[(1) - (1)].tok) ) ); }
+    break;
+
+  case 6:
 
 /* Line 1806 of yacc.c  */
 #line 314 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_constantFloat( *(yyvsp[(1) - (1)].tok) ) ); }
-    break;
-
-  case 6:
-
-/* Line 1806 of yacc.c  */
-#line 315 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_constantChar( *(yyvsp[(1) - (1)].tok) ) ); }
     break;
@@ -5012 +5012 @@
 
 /* Line 1806 of yacc.c  */
-#line 340 "parser.yy"
+#line 339 "parser.yy"
     { (yyval.constant) = build_constantStr( *(yyvsp[(1) - (1)].str) ); }
     break;
@@ -5019 +5019 @@
 
 /* Line 1806 of yacc.c  */
-#line 344 "parser.yy"
+#line 343 "parser.yy"
     { (yyval.str) = (yyvsp[(1) - (1)].tok); }
     break;
@@ -5026 +5026 @@
 
 /* Line 1806 of yacc.c  */
-#line 346 "parser.yy"
+#line 345 "parser.yy"
     {
                         appendStr( (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].tok) );                                            // append 2nd juxtaposed string to 1st
@@ -5037 +5037 @@
 
 /* Line 1806 of yacc.c  */
-#line 357 "parser.yy"
+#line 356 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[(1) - (1)].tok) ) ); }
     break;
@@ -5044 +5044 @@
 
 /* Line 1806 of yacc.c  */
-#line 359 "parser.yy"
+#line 358 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[(1) - (1)].tok) ) ); }
     break;
@@ -5051 +5051 @@
 
 /* Line 1806 of yacc.c  */
-#line 361 "parser.yy"
+#line 360 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (3)].en); }
     break;
@@ -5058 +5058 @@
 
 /* Line 1806 of yacc.c  */
-#line 363 "parser.yy"
+#line 362 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_valexpr( (yyvsp[(2) - (3)].sn) ) ); }
     break;
@@ -5065 +5065 @@
 
 /* Line 1806 of yacc.c  */
-#line 373 "parser.yy"
+#line 372 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Index, (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en) ) ); }
     break;
@@ -5072 +5072 @@
 
 /* Line 1806 of yacc.c  */
-#line 375 "parser.yy"
+#line 374 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_func( (yyvsp[(1) - (4)].en), (yyvsp[(3) - (4)].en) ) ); }
     break;
@@ -5079 +5079 @@
 
 /* Line 1806 of yacc.c  */
-#line 379 "parser.yy"
+#line 378 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(1) - (3)].en), build_varref( (yyvsp[(3) - (3)].tok) ) ) ); }
     break;
 
+  case 27:
+
+/* Line 1806 of yacc.c  */
+#line 380 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(1) - (7)].en), build_tuple( (yyvsp[(5) - (7)].en) ) ) ); }
+    break;
+
+  case 28:
+
+/* Line 1806 of yacc.c  */
+#line 382 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(1) - (3)].en), build_constantInteger( *(yyvsp[(3) - (3)].tok) ) ) ); }
+    break;
+
   case 29:
 
 /* Line 1806 of yacc.c  */
-#line 383 "parser.yy"
+#line 384 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(1) - (3)].en), build_varref( (yyvsp[(3) - (3)].tok) ) ) ); }
     break;
 
+  case 30:
+
+/* Line 1806 of yacc.c  */
+#line 386 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(1) - (7)].en), build_tuple( (yyvsp[(5) - (7)].en) ) ) ); }
+    break;
+
   case 31:
 
 /* Line 1806 of yacc.c  */
-#line 386 "parser.yy"
+#line 388 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::IncrPost, (yyvsp[(1) - (2)].en) ) ); }
     break;
@@ -5100 +5121 @@
 
 /* Line 1806 of yacc.c  */
-#line 388 "parser.yy"
+#line 390 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::DecrPost, (yyvsp[(1) - (2)].en) ) ); }
     break;
@@ -5107 +5128 @@
 
 /* Line 1806 of yacc.c  */
-#line 390 "parser.yy"
+#line 392 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_compoundLiteral( (yyvsp[(2) - (7)].decl), new InitializerNode( (yyvsp[(5) - (7)].in), true ) ) ); }
     break;
@@ -5114 +5135 @@
 
 /* Line 1806 of yacc.c  */
-#line 392 "parser.yy"
+#line 394 "parser.yy"
     {
                         Token fn;
@@ -5125 +5146 @@
 
 /* Line 1806 of yacc.c  */
-#line 402 "parser.yy"
+#line 404 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) )); }
     break;
@@ -5132 +5153 @@
 
 /* Line 1806 of yacc.c  */
-#line 407 "parser.yy"
+#line 409 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -5139 +5160 @@
 
 /* Line 1806 of yacc.c  */
-#line 413 "parser.yy"
+#line 415 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) ); }
     break;
 
-  case 41:
-
-/* Line 1806 of yacc.c  */
-#line 420 "parser.yy"
+  case 42:
+
+/* Line 1806 of yacc.c  */
+#line 423 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(1) - (3)].en), maybeMoveBuild<Expression>( (yyvsp[(3) - (3)].en) ) ) ); }
+    break;
+
+  case 43:
+
+/* Line 1806 of yacc.c  */
+#line 425 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(1) - (7)].en), build_tuple( (yyvsp[(5) - (7)].en) ) ) ); }
+    break;
+
+  case 44:
+
+/* Line 1806 of yacc.c  */
+#line 427 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(1) - (3)].en), maybeMoveBuild<Expression>( (yyvsp[(3) - (3)].en) ) ) ); }
+    break;
+
+  case 45:
+
+/* Line 1806 of yacc.c  */
+#line 429 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(1) - (7)].en), build_tuple( (yyvsp[(5) - (7)].en) ) ) ); }
+    break;
+
+  case 46:
+
+/* Line 1806 of yacc.c  */
+#line 434 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[(1) - (1)].tok) ) ); }
     break;
 
-  case 42:
-
-/* Line 1806 of yacc.c  */
-#line 422 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(3) - (3)].en), build_varref( (yyvsp[(1) - (3)].tok) ) ) ); }
-    break;
-
-  case 43:
-
-/* Line 1806 of yacc.c  */
-#line 424 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(5) - (7)].en), build_varref( (yyvsp[(1) - (7)].tok) ) ) ); }
-    break;
-
-  case 44:
-
-/* Line 1806 of yacc.c  */
-#line 426 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(3) - (3)].en), build_varref( (yyvsp[(1) - (3)].tok) ) ) ); }
-    break;
-
-  case 45:
-
-/* Line 1806 of yacc.c  */
-#line 428 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(5) - (7)].en), build_varref( (yyvsp[(1) - (7)].tok) ) ) ); }
+  case 47:
+
+/* Line 1806 of yacc.c  */
+#line 436 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_constantInteger( *(yyvsp[(1) - (1)].tok) ) ); }
     break;
 
@@ -5181 +5209 @@
 
 /* Line 1806 of yacc.c  */
-#line 442 "parser.yy"
+#line 444 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
@@ -5188 +5216 @@
 
 /* Line 1806 of yacc.c  */
-#line 444 "parser.yy"
+#line 446 "parser.yy"
     { (yyval.en) = new ExpressionNode( (yyvsp[(1) - (1)].constant) ); }
     break;
@@ -5195 +5223 @@
 
 /* Line 1806 of yacc.c  */
-#line 446 "parser.yy"
+#line 448 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en)->set_extension( true ); }
     break;
@@ -5202 +5230 @@
 
 /* Line 1806 of yacc.c  */
-#line 451 "parser.yy"
+#line 453 "parser.yy"
     {
                         switch ( (yyvsp[(1) - (2)].op) ) {
@@ -5220 +5248 @@
 
 /* Line 1806 of yacc.c  */
-#line 464 "parser.yy"
+#line 466 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_unary_val( (yyvsp[(1) - (2)].op), (yyvsp[(2) - (2)].en) ) ); }
     break;
@@ -5227 +5255 @@
 
 /* Line 1806 of yacc.c  */
-#line 466 "parser.yy"
+#line 468 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::Incr, (yyvsp[(2) - (2)].en) ) ); }
     break;
@@ -5234 +5262 @@
 
 /* Line 1806 of yacc.c  */
-#line 468 "parser.yy"
+#line 470 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::Decr, (yyvsp[(2) - (2)].en) ) ); }
     break;
@@ -5241 +5269 @@
 
 /* Line 1806 of yacc.c  */
-#line 470 "parser.yy"
+#line 472 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_sizeOfexpr( (yyvsp[(2) - (2)].en) ) ); }
     break;
@@ -5248 +5276 @@
 
 /* Line 1806 of yacc.c  */
-#line 472 "parser.yy"
+#line 474 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_sizeOftype( (yyvsp[(3) - (4)].decl) ) ); }
     break;
@@ -5255 +5283 @@
 
 /* Line 1806 of yacc.c  */
-#line 474 "parser.yy"
+#line 476 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_alignOfexpr( (yyvsp[(2) - (2)].en) ) ); }
     break;
@@ -5262 +5290 @@
 
 /* Line 1806 of yacc.c  */
-#line 476 "parser.yy"
+#line 478 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_alignOftype( (yyvsp[(3) - (4)].decl) ) ); }
     break;
@@ -5269 +5297 @@
 
 /* Line 1806 of yacc.c  */
-#line 478 "parser.yy"
+#line 480 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_offsetOf( (yyvsp[(3) - (6)].decl), build_varref( (yyvsp[(5) - (6)].tok) ) ) ); }
     break;
@@ -5276 +5304 @@
 
 /* Line 1806 of yacc.c  */
-#line 480 "parser.yy"
+#line 482 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_attrexpr( build_varref( (yyvsp[(1) - (1)].tok) ), nullptr ) ); }
     break;
@@ -5283 +5311 @@
 
 /* Line 1806 of yacc.c  */
-#line 482 "parser.yy"
+#line 484 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_attrexpr( build_varref( (yyvsp[(1) - (4)].tok) ), (yyvsp[(3) - (4)].en) ) ); }
     break;
@@ -5290 +5318 @@
 
 /* Line 1806 of yacc.c  */
-#line 484 "parser.yy"
+#line 486 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_attrtype( build_varref( (yyvsp[(1) - (4)].tok) ), (yyvsp[(3) - (4)].decl) ) ); }
     break;
@@ -5297 +5325 @@
 
 /* Line 1806 of yacc.c  */
-#line 490 "parser.yy"
+#line 492 "parser.yy"
     { (yyval.op) = OperKinds::PointTo; }
     break;
@@ -5304 +5332 @@
 
 /* Line 1806 of yacc.c  */
-#line 491 "parser.yy"
+#line 493 "parser.yy"
     { (yyval.op) = OperKinds::AddressOf; }
     break;
@@ -5311 +5339 @@
 
 /* Line 1806 of yacc.c  */
-#line 497 "parser.yy"
+#line 499 "parser.yy"
     { (yyval.op) = OperKinds::UnPlus; }
     break;
@@ -5318 +5346 @@
 
 /* Line 1806 of yacc.c  */
-#line 498 "parser.yy"
+#line 500 "parser.yy"
     { (yyval.op) = OperKinds::UnMinus; }
     break;
@@ -5325 +5353 @@
 
 /* Line 1806 of yacc.c  */
-#line 499 "parser.yy"
+#line 501 "parser.yy"
     { (yyval.op) = OperKinds::Neg; }
     break;
@@ -5332 +5360 @@
 
 /* Line 1806 of yacc.c  */
-#line 500 "parser.yy"
+#line 502 "parser.yy"
     { (yyval.op) = OperKinds::BitNeg; }
     break;
 
   case 71:
-
-/* Line 1806 of yacc.c  */
-#line 506 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_cast( (yyvsp[(2) - (4)].decl), (yyvsp[(4) - (4)].en) ) ); }
-    break;
-
-  case 72:
 
 /* Line 1806 of yacc.c  */
@@ -5350 +5371 @@
     break;
 
+  case 72:
+
+/* Line 1806 of yacc.c  */
+#line 510 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_cast( (yyvsp[(2) - (4)].decl), (yyvsp[(4) - (4)].en) ) ); }
+    break;
+
   case 74:
 
 /* Line 1806 of yacc.c  */
-#line 514 "parser.yy"
+#line 516 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Mul, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5360 +5388 @@
 
 /* Line 1806 of yacc.c  */
-#line 516 "parser.yy"
+#line 518 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Div, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5367 +5395 @@
 
 /* Line 1806 of yacc.c  */
-#line 518 "parser.yy"
+#line 520 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Mod, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5374 +5402 @@
 
 /* Line 1806 of yacc.c  */
-#line 524 "parser.yy"
+#line 526 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Plus, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5381 +5409 @@
 
 /* Line 1806 of yacc.c  */
-#line 526 "parser.yy"
+#line 528 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Minus, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5388 +5416 @@
 
 /* Line 1806 of yacc.c  */
-#line 532 "parser.yy"
+#line 534 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LShift, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5395 +5423 @@
 
 /* Line 1806 of yacc.c  */
-#line 534 "parser.yy"
+#line 536 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::RShift, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5402 +5430 @@
 
 /* Line 1806 of yacc.c  */
-#line 540 "parser.yy"
+#line 542 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5409 +5437 @@
 
 /* Line 1806 of yacc.c  */
-#line 542 "parser.yy"
+#line 544 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::GThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5416 +5444 @@
 
 /* Line 1806 of yacc.c  */
-#line 544 "parser.yy"
+#line 546 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LEThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5423 +5451 @@
 
 /* Line 1806 of yacc.c  */
-#line 546 "parser.yy"
+#line 548 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::GEThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5430 +5458 @@
 
 /* Line 1806 of yacc.c  */
-#line 552 "parser.yy"
+#line 554 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Eq, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5437 +5465 @@
 
 /* Line 1806 of yacc.c  */
-#line 554 "parser.yy"
+#line 556 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Neq, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5444 +5472 @@
 
 /* Line 1806 of yacc.c  */
-#line 560 "parser.yy"
+#line 562 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::BitAnd, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5451 +5479 @@
 
 /* Line 1806 of yacc.c  */
-#line 566 "parser.yy"
+#line 568 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Xor, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5458 +5486 @@
 
 /* Line 1806 of yacc.c  */
-#line 572 "parser.yy"
+#line 574 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::BitOr, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5465 +5493 @@
 
 /* Line 1806 of yacc.c  */
-#line 578 "parser.yy"
+#line 580 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_and_or( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en), true ) ); }
     break;
@@ -5472 +5500 @@
 
 /* Line 1806 of yacc.c  */
-#line 584 "parser.yy"
+#line 586 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_and_or( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en), false ) ); }
     break;
@@ -5479 +5507 @@
 
 /* Line 1806 of yacc.c  */
-#line 590 "parser.yy"
+#line 592 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[(1) - (5)].en), (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].en) ) ); }
     break;
@@ -5486 +5514 @@
 
 /* Line 1806 of yacc.c  */
-#line 593 "parser.yy"
+#line 595 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[(1) - (4)].en), (yyvsp[(1) - (4)].en), (yyvsp[(4) - (4)].en) ) ); }
     break;
@@ -5493 +5521 @@
 
 /* Line 1806 of yacc.c  */
-#line 595 "parser.yy"
+#line 597 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[(1) - (5)].en), (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].en) ) ); }
     break;
@@ -5500 +5528 @@
 
 /* Line 1806 of yacc.c  */
-#line 606 "parser.yy"
+#line 608 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_ptr( (yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5507 +5535 @@
 
 /* Line 1806 of yacc.c  */
-#line 608 "parser.yy"
+#line 610 "parser.yy"
     { (yyval.en) = ( (yyvsp[(2) - (2)].en) == 0 ) ? (yyvsp[(1) - (2)].en) : new ExpressionNode( build_binary_ptr( OperKinds::Assign, (yyvsp[(1) - (2)].en), (yyvsp[(2) - (2)].en) ) ); }
     break;
@@ -5514 +5542 @@
 
 /* Line 1806 of yacc.c  */
-#line 613 "parser.yy"
+#line 615 "parser.yy"
     { (yyval.en) = nullptr; }
     break;
@@ -5521 +5549 @@
 
 /* Line 1806 of yacc.c  */
-#line 618 "parser.yy"
+#line 620 "parser.yy"
     { (yyval.op) = OperKinds::Assign; }
     break;
@@ -5528 +5556 @@
 
 /* Line 1806 of yacc.c  */
-#line 619 "parser.yy"
+#line 621 "parser.yy"
     { (yyval.op) = OperKinds::AtAssn; }
     break;
@@ -5535 +5563 @@
 
 /* Line 1806 of yacc.c  */
-#line 620 "parser.yy"
+#line 622 "parser.yy"
     { (yyval.op) = OperKinds::MulAssn; }
     break;
@@ -5542 +5570 @@
 
 /* Line 1806 of yacc.c  */
-#line 621 "parser.yy"
+#line 623 "parser.yy"
     { (yyval.op) = OperKinds::DivAssn; }
     break;
@@ -5549 +5577 @@
 
 /* Line 1806 of yacc.c  */
-#line 622 "parser.yy"
+#line 624 "parser.yy"
     { (yyval.op) = OperKinds::ModAssn; }
     break;
@@ -5556 +5584 @@
 
 /* Line 1806 of yacc.c  */
-#line 623 "parser.yy"
+#line 625 "parser.yy"
     { (yyval.op) = OperKinds::PlusAssn; }
     break;
@@ -5563 +5591 @@
 
 /* Line 1806 of yacc.c  */
-#line 624 "parser.yy"
+#line 626 "parser.yy"
     { (yyval.op) = OperKinds::MinusAssn; }
     break;
@@ -5570 +5598 @@
 
 /* Line 1806 of yacc.c  */
-#line 625 "parser.yy"
+#line 627 "parser.yy"
     { (yyval.op) = OperKinds::LSAssn; }
     break;
@@ -5577 +5605 @@
 
 /* Line 1806 of yacc.c  */
-#line 626 "parser.yy"
+#line 628 "parser.yy"
     { (yyval.op) = OperKinds::RSAssn; }
     break;
@@ -5584 +5612 @@
 
 /* Line 1806 of yacc.c  */
-#line 627 "parser.yy"
+#line 629 "parser.yy"
     { (yyval.op) = OperKinds::AndAssn; }
     break;
@@ -5591 +5619 @@
 
 /* Line 1806 of yacc.c  */
-#line 628 "parser.yy"
+#line 630 "parser.yy"
     { (yyval.op) = OperKinds::ERAssn; }
     break;
@@ -5598 +5626 @@
 
 /* Line 1806 of yacc.c  */
-#line 629 "parser.yy"
+#line 631 "parser.yy"
     { (yyval.op) = OperKinds::OrAssn; }
     break;
@@ -5605 +5633 @@
 
 /* Line 1806 of yacc.c  */
-#line 636 "parser.yy"
+#line 638 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_tuple() ); }
     break;
@@ -5612 +5640 @@
 
 /* Line 1806 of yacc.c  */
-#line 638 "parser.yy"
+#line 640 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_tuple( (yyvsp[(3) - (5)].en) ) ); }
     break;
@@ -5619 +5647 @@
 
 /* Line 1806 of yacc.c  */
-#line 640 "parser.yy"
+#line 642 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_tuple( (ExpressionNode *)(new ExpressionNode( nullptr ) )->set_last( (yyvsp[(4) - (6)].en) ) ) ); }
     break;
@@ -5626 +5654 @@
 
 /* Line 1806 of yacc.c  */
-#line 642 "parser.yy"
+#line 644 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_tuple( (ExpressionNode *)(yyvsp[(3) - (7)].en)->set_last( (yyvsp[(5) - (7)].en) ) ) ); }
     break;
@@ -5633 +5661 @@
 
 /* Line 1806 of yacc.c  */
-#line 648 "parser.yy"
+#line 650 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5640 +5668 @@
 
 /* Line 1806 of yacc.c  */
-#line 654 "parser.yy"
+#line 656 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_comma( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5647 +5675 @@
 
 /* Line 1806 of yacc.c  */
-#line 659 "parser.yy"
+#line 661 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -5654 +5682 @@
 
 /* Line 1806 of yacc.c  */
-#line 668 "parser.yy"
+#line 670 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (1)].sn); }
     break;
@@ -5661 +5689 @@
 
 /* Line 1806 of yacc.c  */
-#line 675 "parser.yy"
+#line 677 "parser.yy"
     {
                         Token fn;
@@ -5672 +5700 @@
 
 /* Line 1806 of yacc.c  */
-#line 685 "parser.yy"
+#line 687 "parser.yy"
     {
                         (yyval.sn) = (yyvsp[(4) - (4)].sn)->add_label( (yyvsp[(1) - (4)].tok) );
@@ -5681 +5709 @@
 
 /* Line 1806 of yacc.c  */
-#line 692 "parser.yy"
+#line 694 "parser.yy"
     { (yyval.sn) = new StatementNode( build_compound( (StatementNode *)0 ) ); }
     break;
@@ -5688 +5716 @@
 
 /* Line 1806 of yacc.c  */
-#line 699 "parser.yy"
+#line 701 "parser.yy"
     { (yyval.sn) = new StatementNode( build_compound( (yyvsp[(5) - (7)].sn) ) ); }
     break;
@@ -5695 +5723 @@
 
 /* Line 1806 of yacc.c  */
-#line 705 "parser.yy"
+#line 707 "parser.yy"
     { if ( (yyvsp[(1) - (3)].sn) != 0 ) { (yyvsp[(1) - (3)].sn)->set_last( (yyvsp[(3) - (3)].sn) ); (yyval.sn) = (yyvsp[(1) - (3)].sn); } }
     break;
@@ -5702 +5730 @@
 
 /* Line 1806 of yacc.c  */
-#line 710 "parser.yy"
+#line 712 "parser.yy"
     { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
     break;
@@ -5709 +5737 @@
 
 /* Line 1806 of yacc.c  */
-#line 712 "parser.yy"
+#line 714 "parser.yy"
     {   // mark all fields in list
                         for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
@@ -5720 +5748 @@
 
 /* Line 1806 of yacc.c  */
-#line 718 "parser.yy"
+#line 720 "parser.yy"
     { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
     break;
@@ -5727 +5755 @@
 
 /* Line 1806 of yacc.c  */
-#line 725 "parser.yy"
+#line 727 "parser.yy"
     { if ( (yyvsp[(1) - (2)].sn) != 0 ) { (yyvsp[(1) - (2)].sn)->set_last( (yyvsp[(2) - (2)].sn) ); (yyval.sn) = (yyvsp[(1) - (2)].sn); } }
     break;
@@ -5734 +5762 @@
 
 /* Line 1806 of yacc.c  */
-#line 730 "parser.yy"
+#line 732 "parser.yy"
     { (yyval.sn) = new StatementNode( build_expr( (yyvsp[(1) - (2)].en) ) ); }
     break;
@@ -5741 +5769 @@
 
 /* Line 1806 of yacc.c  */
-#line 736 "parser.yy"
+#line 738 "parser.yy"
     { (yyval.sn) = new StatementNode( build_if( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn), nullptr ) ); }
     break;
@@ -5748 +5776 @@
 
 /* Line 1806 of yacc.c  */
-#line 738 "parser.yy"
+#line 740 "parser.yy"
     { (yyval.sn) = new StatementNode( build_if( (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].sn), (yyvsp[(7) - (7)].sn) ) ); }
     break;
@@ -5755 +5783 @@
 
 /* Line 1806 of yacc.c  */
-#line 740 "parser.yy"
+#line 742 "parser.yy"
     { (yyval.sn) = new StatementNode( build_switch( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ) ); }
     break;
@@ -5762 +5790 @@
 
 /* Line 1806 of yacc.c  */
-#line 742 "parser.yy"
+#line 744 "parser.yy"
     {
                         StatementNode *sw = new StatementNode( build_switch( (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) ) );
@@ -5777 +5805 @@
 
 /* Line 1806 of yacc.c  */
-#line 752 "parser.yy"
+#line 754 "parser.yy"
     { (yyval.sn) = new StatementNode( build_switch( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ) ); }
     break;
@@ -5784 +5812 @@
 
 /* Line 1806 of yacc.c  */
-#line 754 "parser.yy"
+#line 756 "parser.yy"
     {
                         StatementNode *sw = new StatementNode( build_switch( (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) ) );
@@ -5794 +5822 @@
 
 /* Line 1806 of yacc.c  */
-#line 764 "parser.yy"
+#line 766 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
@@ -5801 +5829 @@
 
 /* Line 1806 of yacc.c  */
-#line 766 "parser.yy"
+#line 768 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_range( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5808 +5836 @@
 
 /* Line 1806 of yacc.c  */
-#line 771 "parser.yy"
+#line 773 "parser.yy"
     { (yyval.sn) = new StatementNode( build_case( (yyvsp[(1) - (1)].en) ) ); }
     break;
@@ -5815 +5843 @@
 
 /* Line 1806 of yacc.c  */
-#line 773 "parser.yy"
+#line 775 "parser.yy"
     { (yyval.sn) = (StatementNode *)((yyvsp[(1) - (3)].sn)->set_last( new StatementNode( build_case( (yyvsp[(3) - (3)].en) ) ) ) ); }
     break;
@@ -5822 +5850 @@
 
 /* Line 1806 of yacc.c  */
-#line 777 "parser.yy"
+#line 779 "parser.yy"
     { (yyval.sn) = (yyvsp[(2) - (3)].sn); }
     break;
@@ -5829 +5857 @@
 
 /* Line 1806 of yacc.c  */
-#line 778 "parser.yy"
+#line 780 "parser.yy"
     { (yyval.sn) = new StatementNode( build_default() ); }
     break;
@@ -5836 +5864 @@
 
 /* Line 1806 of yacc.c  */
-#line 784 "parser.yy"
+#line 786 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (2)].sn)->set_last( (yyvsp[(2) - (2)].sn) )); }
     break;
@@ -5843 +5871 @@
 
 /* Line 1806 of yacc.c  */
-#line 788 "parser.yy"
+#line 790 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( new StatementNode( build_compound( (yyvsp[(2) - (2)].sn) ) ) ); }
     break;
@@ -5850 +5878 @@
 
 /* Line 1806 of yacc.c  */
-#line 793 "parser.yy"
+#line 795 "parser.yy"
     { (yyval.sn) = 0; }
     break;
@@ -5857 +5885 @@
 
 /* Line 1806 of yacc.c  */
-#line 799 "parser.yy"
+#line 801 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( new StatementNode( build_compound( (yyvsp[(2) - (2)].sn) ) ) ); }
     break;
@@ -5864 +5892 @@
 
 /* Line 1806 of yacc.c  */
-#line 801 "parser.yy"
+#line 803 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_last( (yyvsp[(2) - (3)].sn)->append_last_case( new StatementNode( build_compound( (yyvsp[(3) - (3)].sn) ) ) ) ) ); }
     break;
@@ -5871 +5899 @@
 
 /* Line 1806 of yacc.c  */
-#line 806 "parser.yy"
+#line 808 "parser.yy"
     { (yyval.sn) = 0; }
     break;
@@ -5878 +5906 @@
 
 /* Line 1806 of yacc.c  */
-#line 812 "parser.yy"
+#line 814 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
     break;
@@ -5885 +5913 @@
 
 /* Line 1806 of yacc.c  */
-#line 814 "parser.yy"
+#line 816 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (3)].sn)->append_last_case( new StatementNode( build_compound( (StatementNode *)(yyvsp[(2) - (3)].sn)->set_last( (yyvsp[(3) - (3)].sn) ) ) ) ); }
     break;
@@ -5892 +5920 @@
 
 /* Line 1806 of yacc.c  */
-#line 816 "parser.yy"
+#line 818 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_last( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
     break;
@@ -5899 +5927 @@
 
 /* Line 1806 of yacc.c  */
-#line 818 "parser.yy"
+#line 820 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (4)].sn)->set_last( (yyvsp[(2) - (4)].sn)->append_last_case( new StatementNode( build_compound( (StatementNode *)(yyvsp[(3) - (4)].sn)->set_last( (yyvsp[(4) - (4)].sn) ) ) ) ) ) ); }
     break;
@@ -5906 +5934 @@
 
 /* Line 1806 of yacc.c  */
-#line 823 "parser.yy"
+#line 825 "parser.yy"
     { (yyval.sn) = new StatementNode( build_branch( BranchStmt::Break ) ); }
     break;
 
   case 182:
-
-/* Line 1806 of yacc.c  */
-#line 829 "parser.yy"
-    { (yyval.sn) = 0; }
-    break;
-
-  case 183:
 
 /* Line 1806 of yacc.c  */
@@ -5924 +5945 @@
     break;
 
+  case 183:
+
+/* Line 1806 of yacc.c  */
+#line 833 "parser.yy"
+    { (yyval.sn) = 0; }
+    break;
+
   case 184:
 
 /* Line 1806 of yacc.c  */
-#line 836 "parser.yy"
+#line 838 "parser.yy"
     { (yyval.sn) = new StatementNode( build_while( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ) ); }
     break;
@@ -5934 +5962 @@
 
 /* Line 1806 of yacc.c  */
-#line 838 "parser.yy"
+#line 840 "parser.yy"
     { (yyval.sn) = new StatementNode( build_while( (yyvsp[(5) - (7)].en), (yyvsp[(2) - (7)].sn), true ) ); }
     break;
@@ -5941 +5969 @@
 
 /* Line 1806 of yacc.c  */
-#line 840 "parser.yy"
+#line 842 "parser.yy"
     { (yyval.sn) = new StatementNode( build_for( (yyvsp[(4) - (6)].fctl), (yyvsp[(6) - (6)].sn) ) ); }
     break;
@@ -5948 +5976 @@
 
 /* Line 1806 of yacc.c  */
-#line 845 "parser.yy"
+#line 847 "parser.yy"
     { (yyval.fctl) = new ForCtl( (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].en) ); }
     break;
@@ -5955 +5983 @@
 
 /* Line 1806 of yacc.c  */
-#line 847 "parser.yy"
+#line 849 "parser.yy"
     { (yyval.fctl) = new ForCtl( (yyvsp[(1) - (4)].decl), (yyvsp[(2) - (4)].en), (yyvsp[(4) - (4)].en) ); }
     break;
@@ -5962 +5990 @@
 
 /* Line 1806 of yacc.c  */
-#line 852 "parser.yy"
+#line 854 "parser.yy"
     { (yyval.sn) = new StatementNode( build_branch( (yyvsp[(2) - (3)].tok), BranchStmt::Goto ) ); }
     break;
@@ -5969 +5997 @@
 
 /* Line 1806 of yacc.c  */
-#line 856 "parser.yy"
+#line 858 "parser.yy"
     { (yyval.sn) = new StatementNode( build_computedgoto( (yyvsp[(3) - (4)].en) ) ); }
     break;
@@ -5976 +6004 @@
 
 /* Line 1806 of yacc.c  */
-#line 859 "parser.yy"
+#line 861 "parser.yy"
     { (yyval.sn) = new StatementNode( build_branch( BranchStmt::Continue ) ); }
     break;
@@ -5983 +6011 @@
 
 /* Line 1806 of yacc.c  */
-#line 863 "parser.yy"
+#line 865 "parser.yy"
     { (yyval.sn) = new StatementNode( build_branch( (yyvsp[(2) - (3)].tok), BranchStmt::Continue ) ); }
     break;
@@ -5990 +6018 @@
 
 /* Line 1806 of yacc.c  */
-#line 866 "parser.yy"
+#line 868 "parser.yy"
     { (yyval.sn) = new StatementNode( build_branch( BranchStmt::Break ) ); }
     break;
@@ -5997 +6025 @@
 
 /* Line 1806 of yacc.c  */
-#line 870 "parser.yy"
+#line 872 "parser.yy"
     { (yyval.sn) = new StatementNode( build_branch( (yyvsp[(2) - (3)].tok), BranchStmt::Break ) ); }
     break;
@@ -6004 +6032 @@
 
 /* Line 1806 of yacc.c  */
-#line 872 "parser.yy"
+#line 874 "parser.yy"
     { (yyval.sn) = new StatementNode( build_return( (yyvsp[(2) - (3)].en) ) ); }
     break;
 
   case 196:
-
-/* Line 1806 of yacc.c  */
-#line 874 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_throw( (yyvsp[(2) - (3)].en) ) ); }
-    break;
-
-  case 197:
 
 /* Line 1806 of yacc.c  */
@@ -6022 +6043 @@
     break;
 
+  case 197:
+
+/* Line 1806 of yacc.c  */
+#line 878 "parser.yy"
+    { (yyval.sn) = new StatementNode( build_throw( (yyvsp[(2) - (3)].en) ) ); }
+    break;
+
   case 198:
 
 /* Line 1806 of yacc.c  */
-#line 878 "parser.yy"
+#line 880 "parser.yy"
     { (yyval.sn) = new StatementNode( build_throw( (yyvsp[(2) - (5)].en) ) ); }
     break;
@@ -6032 +6060 @@
 
 /* Line 1806 of yacc.c  */
-#line 883 "parser.yy"
+#line 885 "parser.yy"
     { (yyval.sn) = new StatementNode( build_try( (yyvsp[(2) - (3)].sn), (yyvsp[(3) - (3)].sn), 0 ) ); }
     break;
@@ -6039 +6067 @@
 
 /* Line 1806 of yacc.c  */
-#line 885 "parser.yy"
+#line 887 "parser.yy"
     { (yyval.sn) = new StatementNode( build_try( (yyvsp[(2) - (3)].sn), 0, (yyvsp[(3) - (3)].sn) ) ); }
     break;
@@ -6046 +6074 @@
 
 /* Line 1806 of yacc.c  */
-#line 887 "parser.yy"
+#line 889 "parser.yy"
     { (yyval.sn) = new StatementNode( build_try( (yyvsp[(2) - (4)].sn), (yyvsp[(3) - (4)].sn), (yyvsp[(4) - (4)].sn) ) ); }
     break;
@@ -6053 +6081 @@
 
 /* Line 1806 of yacc.c  */
-#line 894 "parser.yy"
+#line 896 "parser.yy"
     { (yyval.sn) = new StatementNode( build_catch( 0, (yyvsp[(5) - (5)].sn), true ) ); }
     break;
@@ -6060 +6088 @@
 
 /* Line 1806 of yacc.c  */
-#line 896 "parser.yy"
+#line 898 "parser.yy"
     { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (6)].sn)->set_last( new StatementNode( build_catch( 0, (yyvsp[(6) - (6)].sn), true ) ) ); }
     break;
@@ -6067 +6095 @@
 
 /* Line 1806 of yacc.c  */
-#line 898 "parser.yy"
+#line 900 "parser.yy"
     { (yyval.sn) = new StatementNode( build_catch( 0, (yyvsp[(5) - (5)].sn), true ) ); }
     break;
@@ -6074 +6102 @@
 
 /* Line 1806 of yacc.c  */
-#line 900 "parser.yy"
+#line 902 "parser.yy"
     { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (6)].sn)->set_last( new StatementNode( build_catch( 0, (yyvsp[(6) - (6)].sn), true ) ) ); }
     break;
@@ -6081 +6109 @@
 
 /* Line 1806 of yacc.c  */
-#line 905 "parser.yy"
+#line 907 "parser.yy"
     { (yyval.sn) = new StatementNode( build_catch( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ) ); }
     break;
@@ -6088 +6116 @@
 
 /* Line 1806 of yacc.c  */
-#line 907 "parser.yy"
+#line 909 "parser.yy"
     { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (10)].sn)->set_last( new StatementNode( build_catch( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ) ); }
     break;
@@ -6095 +6123 @@
 
 /* Line 1806 of yacc.c  */
-#line 909 "parser.yy"
+#line 911 "parser.yy"
     { (yyval.sn) = new StatementNode( build_catch( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ) ); }
     break;
@@ -6102 +6130 @@
 
 /* Line 1806 of yacc.c  */
-#line 911 "parser.yy"
+#line 913 "parser.yy"
     { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (10)].sn)->set_last( new StatementNode( build_catch( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ) ); }
     break;
@@ -6109 +6137 @@
 
 /* Line 1806 of yacc.c  */
-#line 916 "parser.yy"
+#line 918 "parser.yy"
     {
                         (yyval.sn) = new StatementNode( build_finally( (yyvsp[(2) - (2)].sn) ) );
@@ -6118 +6146 @@
 
 /* Line 1806 of yacc.c  */
-#line 929 "parser.yy"
+#line 931 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6128 +6156 @@
 
 /* Line 1806 of yacc.c  */
-#line 934 "parser.yy"
+#line 936 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6135 +6163 @@
 
 /* Line 1806 of yacc.c  */
-#line 936 "parser.yy"
+#line 938 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6145 +6173 @@
 
 /* Line 1806 of yacc.c  */
-#line 945 "parser.yy"
+#line 947 "parser.yy"
     { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (6)].flag), (yyvsp[(4) - (6)].constant), 0 ) ); }
     break;
@@ -6152 +6180 @@
 
 /* Line 1806 of yacc.c  */
-#line 947 "parser.yy"
+#line 949 "parser.yy"
     { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (8)].flag), (yyvsp[(4) - (8)].constant), (yyvsp[(6) - (8)].en) ) ); }
     break;
@@ -6159 +6187 @@
 
 /* Line 1806 of yacc.c  */
-#line 949 "parser.yy"
+#line 951 "parser.yy"
     { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (10)].flag), (yyvsp[(4) - (10)].constant), (yyvsp[(6) - (10)].en), (yyvsp[(8) - (10)].en) ) ); }
     break;
@@ -6166 +6194 @@
 
 /* Line 1806 of yacc.c  */
-#line 951 "parser.yy"
+#line 953 "parser.yy"
     { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (12)].flag), (yyvsp[(4) - (12)].constant), (yyvsp[(6) - (12)].en), (yyvsp[(8) - (12)].en), (yyvsp[(10) - (12)].en) ) ); }
     break;
@@ -6173 +6201 @@
 
 /* Line 1806 of yacc.c  */
-#line 953 "parser.yy"
+#line 955 "parser.yy"
     { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (14)].flag), (yyvsp[(5) - (14)].constant), 0, (yyvsp[(8) - (14)].en), (yyvsp[(10) - (14)].en), (yyvsp[(12) - (14)].label) ) ); }
     break;
@@ -6180 +6208 @@
 
 /* Line 1806 of yacc.c  */
-#line 958 "parser.yy"
+#line 960 "parser.yy"
     { (yyval.flag) = false; }
     break;
@@ -6187 +6215 @@
 
 /* Line 1806 of yacc.c  */
-#line 960 "parser.yy"
+#line 962 "parser.yy"
     { (yyval.flag) = true; }
     break;
@@ -6194 +6222 @@
 
 /* Line 1806 of yacc.c  */
-#line 965 "parser.yy"
+#line 967 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -6201 +6229 @@
 
 /* Line 1806 of yacc.c  */
-#line 972 "parser.yy"
+#line 974 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) ); }
     break;
@@ -6208 +6236 @@
 
 /* Line 1806 of yacc.c  */
-#line 977 "parser.yy"
+#line 979 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_asmexpr( 0, (yyvsp[(1) - (4)].constant), (yyvsp[(3) - (4)].en) ) ); }
     break;
@@ -6215 +6243 @@
 
 /* Line 1806 of yacc.c  */
-#line 979 "parser.yy"
+#line 981 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_asmexpr( (yyvsp[(2) - (7)].en), (yyvsp[(4) - (7)].constant), (yyvsp[(6) - (7)].en) ) ); }
     break;
@@ -6222 +6250 @@
 
 /* Line 1806 of yacc.c  */
-#line 984 "parser.yy"
+#line 986 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -6229 +6257 @@
 
 /* Line 1806 of yacc.c  */
-#line 986 "parser.yy"
+#line 988 "parser.yy"
     { (yyval.en) = new ExpressionNode( (yyvsp[(1) - (1)].constant) ); }
     break;
@@ -6236 +6264 @@
 
 /* Line 1806 of yacc.c  */
-#line 988 "parser.yy"
+#line 990 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_last( new ExpressionNode( (yyvsp[(3) - (3)].constant) ) ); }
     break;
@@ -6243 +6271 @@
 
 /* Line 1806 of yacc.c  */
-#line 993 "parser.yy"
+#line 995 "parser.yy"
     {
                         (yyval.label) = new LabelNode(); (yyval.label)->labels.push_back( *(yyvsp[(1) - (1)].tok) );
@@ -6253 +6281 @@
 
 /* Line 1806 of yacc.c  */
-#line 998 "parser.yy"
+#line 1000 "parser.yy"
     {
                         (yyval.label) = (yyvsp[(1) - (3)].label); (yyvsp[(1) - (3)].label)->labels.push_back( *(yyvsp[(3) - (3)].tok) );
@@ -6263 +6291 @@
 
 /* Line 1806 of yacc.c  */
-#line 1008 "parser.yy"
+#line 1010 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6270 +6298 @@
 
 /* Line 1806 of yacc.c  */
-#line 1015 "parser.yy"
+#line 1017 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6277 +6305 @@
 
 /* Line 1806 of yacc.c  */
-#line 1020 "parser.yy"
+#line 1022 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6284 +6312 @@
 
 /* Line 1806 of yacc.c  */
-#line 1027 "parser.yy"
+#line 1029 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6291 +6319 @@
 
 /* Line 1806 of yacc.c  */
-#line 1041 "parser.yy"
+#line 1043 "parser.yy"
     {}
     break;
@@ -6298 +6326 @@
 
 /* Line 1806 of yacc.c  */
-#line 1042 "parser.yy"
+#line 1044 "parser.yy"
     {}
     break;
@@ -6305 +6333 @@
 
 /* Line 1806 of yacc.c  */
-#line 1071 "parser.yy"
+#line 1073 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6315 +6343 @@
 
 /* Line 1806 of yacc.c  */
-#line 1078 "parser.yy"
+#line 1080 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6325 +6353 @@
 
 /* Line 1806 of yacc.c  */
-#line 1083 "parser.yy"
+#line 1085 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (6)].tok), TypedefTable::ID );
@@ -6335 +6363 @@
 
 /* Line 1806 of yacc.c  */
-#line 1093 "parser.yy"
+#line 1095 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
@@ -6345 +6373 @@
 
 /* Line 1806 of yacc.c  */
-#line 1098 "parser.yy"
+#line 1100 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
@@ -6355 +6383 @@
 
 /* Line 1806 of yacc.c  */
-#line 1103 "parser.yy"
+#line 1105 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(3) - (4)].tok) );
@@ -6365 +6393 @@
 
 /* Line 1806 of yacc.c  */
-#line 1111 "parser.yy"
+#line 1113 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6375 +6403 @@
 
 /* Line 1806 of yacc.c  */
-#line 1116 "parser.yy"
+#line 1118 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6385 +6413 @@
 
 /* Line 1806 of yacc.c  */
-#line 1121 "parser.yy"
+#line 1123 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6395 +6423 @@
 
 /* Line 1806 of yacc.c  */
-#line 1126 "parser.yy"
+#line 1128 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6405 +6433 @@
 
 /* Line 1806 of yacc.c  */
-#line 1131 "parser.yy"
+#line 1133 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
@@ -6415 +6443 @@
 
 /* Line 1806 of yacc.c  */
-#line 1139 "parser.yy"
+#line 1141 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(3) - (8)].tok), DeclarationNode::newTuple( 0 ), (yyvsp[(6) - (8)].decl), 0, true );
@@ -6424 +6452 @@
 
 /* Line 1806 of yacc.c  */
-#line 1162 "parser.yy"
+#line 1164 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
@@ -6433 +6461 @@
 
 /* Line 1806 of yacc.c  */
-#line 1166 "parser.yy"
+#line 1168 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
@@ -6442 +6470 @@
 
 /* Line 1806 of yacc.c  */
-#line 1173 "parser.yy"
+#line 1175 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -6449 +6477 @@
 
 /* Line 1806 of yacc.c  */
-#line 1177 "parser.yy"
+#line 1179 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (9)].decl)->appendList( (yyvsp[(7) - (9)].decl) ) ); }
     break;
@@ -6456 +6484 @@
 
 /* Line 1806 of yacc.c  */
-#line 1182 "parser.yy"
+#line 1184 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6466 +6494 @@
 
 /* Line 1806 of yacc.c  */
-#line 1187 "parser.yy"
+#line 1189 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6476 +6504 @@
 
 /* Line 1806 of yacc.c  */
-#line 1192 "parser.yy"
+#line 1194 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::TD );
@@ -6486 +6514 @@
 
 /* Line 1806 of yacc.c  */
-#line 1203 "parser.yy"
+#line 1205 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6496 +6524 @@
 
 /* Line 1806 of yacc.c  */
-#line 1208 "parser.yy"
+#line 1210 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6506 +6534 @@
 
 /* Line 1806 of yacc.c  */
-#line 1213 "parser.yy"
+#line 1215 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6516 +6544 @@
 
 /* Line 1806 of yacc.c  */
-#line 1218 "parser.yy"
+#line 1220 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6526 +6554 @@
 
 /* Line 1806 of yacc.c  */
-#line 1223 "parser.yy"
+#line 1225 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6536 +6564 @@
 
 /* Line 1806 of yacc.c  */
-#line 1232 "parser.yy"
+#line 1234 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (4)].tok), TypedefTable::TD );
@@ -6546 +6574 @@
 
 /* Line 1806 of yacc.c  */
-#line 1237 "parser.yy"
+#line 1239 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (7)].tok), TypedefTable::TD );
@@ -6556 +6584 @@
 
 /* Line 1806 of yacc.c  */
-#line 1254 "parser.yy"
+#line 1256 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6566 +6594 @@
 
 /* Line 1806 of yacc.c  */
-#line 1259 "parser.yy"
+#line 1261 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6576 +6604 @@
 
 /* Line 1806 of yacc.c  */
-#line 1281 "parser.yy"
+#line 1283 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6583 +6611 @@
 
 /* Line 1806 of yacc.c  */
-#line 1293 "parser.yy"
+#line 1295 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6590 +6618 @@
 
 /* Line 1806 of yacc.c  */
-#line 1304 "parser.yy"
+#line 1306 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Const ); }
     break;
@@ -6597 +6625 @@
 
 /* Line 1806 of yacc.c  */
-#line 1306 "parser.yy"
+#line 1308 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Restrict ); }
     break;
@@ -6604 +6632 @@
 
 /* Line 1806 of yacc.c  */
-#line 1308 "parser.yy"
+#line 1310 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Volatile ); }
     break;
@@ -6611 +6639 @@
 
 /* Line 1806 of yacc.c  */
-#line 1310 "parser.yy"
+#line 1312 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Lvalue ); }
     break;
@@ -6618 +6646 @@
 
 /* Line 1806 of yacc.c  */
-#line 1312 "parser.yy"
+#line 1314 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Atomic ); }
     break;
@@ -6625 +6653 @@
 
 /* Line 1806 of yacc.c  */
-#line 1314 "parser.yy"
+#line 1316 "parser.yy"
     {
                         typedefTable.enterScope();
@@ -6634 +6662 @@
 
 /* Line 1806 of yacc.c  */
-#line 1318 "parser.yy"
+#line 1320 "parser.yy"
     {
                         typedefTable.leaveScope();
@@ -6644 +6672 @@
 
 /* Line 1806 of yacc.c  */
-#line 1327 "parser.yy"
+#line 1329 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6651 +6679 @@
 
 /* Line 1806 of yacc.c  */
-#line 1329 "parser.yy"
+#line 1331 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6658 +6686 @@
 
 /* Line 1806 of yacc.c  */
-#line 1340 "parser.yy"
+#line 1342 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6665 +6693 @@
 
 /* Line 1806 of yacc.c  */
-#line 1345 "parser.yy"
+#line 1347 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Extern ); }
     break;
@@ -6672 +6700 @@
 
 /* Line 1806 of yacc.c  */
-#line 1347 "parser.yy"
+#line 1349 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Static ); }
     break;
@@ -6679 +6707 @@
 
 /* Line 1806 of yacc.c  */
-#line 1349 "parser.yy"
+#line 1351 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Auto ); }
     break;
@@ -6686 +6714 @@
 
 /* Line 1806 of yacc.c  */
-#line 1351 "parser.yy"
+#line 1353 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Register ); }
     break;
@@ -6693 +6721 @@
 
 /* Line 1806 of yacc.c  */
-#line 1354 "parser.yy"
+#line 1356 "parser.yy"
     { (yyval.decl) = new DeclarationNode; (yyval.decl)->isInline = true; }
     break;
@@ -6700 +6728 @@
 
 /* Line 1806 of yacc.c  */
-#line 1356 "parser.yy"
+#line 1358 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Fortran ); }
     break;
@@ -6707 +6735 @@
 
 /* Line 1806 of yacc.c  */
-#line 1359 "parser.yy"
+#line 1361 "parser.yy"
     { (yyval.decl) = new DeclarationNode; (yyval.decl)->isNoreturn = true; }
     break;
@@ -6714 +6742 @@
 
 /* Line 1806 of yacc.c  */
-#line 1361 "parser.yy"
+#line 1363 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Threadlocal ); }
     break;
@@ -6721 +6749 @@
 
 /* Line 1806 of yacc.c  */
-#line 1366 "parser.yy"
+#line 1368 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Char ); }
     break;
@@ -6728 +6756 @@
 
 /* Line 1806 of yacc.c  */
-#line 1368 "parser.yy"
+#line 1370 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Double ); }
     break;
@@ -6735 +6763 @@
 
 /* Line 1806 of yacc.c  */
-#line 1370 "parser.yy"
+#line 1372 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Float ); }
     break;
@@ -6742 +6770 @@
 
 /* Line 1806 of yacc.c  */
-#line 1372 "parser.yy"
+#line 1374 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Int ); }
     break;
@@ -6749 +6777 @@
 
 /* Line 1806 of yacc.c  */
-#line 1374 "parser.yy"
+#line 1376 "parser.yy"
     { (yyval.decl) = DeclarationNode::newLength( DeclarationNode::Long ); }
     break;
@@ -6756 +6784 @@
 
 /* Line 1806 of yacc.c  */
-#line 1376 "parser.yy"
+#line 1378 "parser.yy"
     { (yyval.decl) = DeclarationNode::newLength( DeclarationNode::Short ); }
     break;
@@ -6763 +6791 @@
 
 /* Line 1806 of yacc.c  */
-#line 1378 "parser.yy"
+#line 1380 "parser.yy"
     { (yyval.decl) = DeclarationNode::newSignedNess( DeclarationNode::Signed ); }
     break;
@@ -6770 +6798 @@
 
 /* Line 1806 of yacc.c  */
-#line 1380 "parser.yy"
+#line 1382 "parser.yy"
     { (yyval.decl) = DeclarationNode::newSignedNess( DeclarationNode::Unsigned ); }
     break;
@@ -6777 +6805 @@
 
 /* Line 1806 of yacc.c  */
-#line 1382 "parser.yy"
+#line 1384 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Void ); }
     break;
@@ -6784 +6812 @@
 
 /* Line 1806 of yacc.c  */
-#line 1384 "parser.yy"
+#line 1386 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Bool ); }
     break;
@@ -6791 +6819 @@
 
 /* Line 1806 of yacc.c  */
-#line 1386 "parser.yy"
+#line 1388 "parser.yy"
     { (yyval.decl) = DeclarationNode::newComplexType( DeclarationNode::Complex ); }
     break;
@@ -6798 +6826 @@
 
 /* Line 1806 of yacc.c  */
-#line 1388 "parser.yy"
+#line 1390 "parser.yy"
     { (yyval.decl) = DeclarationNode::newComplexType( DeclarationNode::Imaginary ); }
     break;
@@ -6805 +6833 @@
 
 /* Line 1806 of yacc.c  */
-#line 1390 "parser.yy"
+#line 1392 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
     break;
@@ -6812 +6840 @@
 
 /* Line 1806 of yacc.c  */
-#line 1397 "parser.yy"
+#line 1399 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6819 +6847 @@
 
 /* Line 1806 of yacc.c  */
-#line 1399 "parser.yy"
+#line 1401 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6826 +6854 @@
 
 /* Line 1806 of yacc.c  */
-#line 1401 "parser.yy"
+#line 1403 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6833 +6861 @@
 
 /* Line 1806 of yacc.c  */
-#line 1403 "parser.yy"
+#line 1405 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addType( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -6840 +6868 @@
 
 /* Line 1806 of yacc.c  */
-#line 1409 "parser.yy"
+#line 1411 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6847 +6875 @@
 
 /* Line 1806 of yacc.c  */
-#line 1416 "parser.yy"
+#line 1418 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6854 +6882 @@
 
 /* Line 1806 of yacc.c  */
-#line 1418 "parser.yy"
+#line 1420 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6861 +6889 @@
 
 /* Line 1806 of yacc.c  */
-#line 1420 "parser.yy"
+#line 1422 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addType( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6868 +6896 @@
 
 /* Line 1806 of yacc.c  */
-#line 1425 "parser.yy"
+#line 1427 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (4)].decl); }
     break;
@@ -6875 +6903 @@
 
 /* Line 1806 of yacc.c  */
-#line 1427 "parser.yy"
+#line 1429 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTypeof( (yyvsp[(3) - (4)].en) ); }
     break;
@@ -6882 +6910 @@
 
 /* Line 1806 of yacc.c  */
-#line 1429 "parser.yy"
+#line 1431 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -6889 +6917 @@
 
 /* Line 1806 of yacc.c  */
-#line 1431 "parser.yy"
+#line 1433 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -6896 +6924 @@
 
 /* Line 1806 of yacc.c  */
-#line 1437 "parser.yy"
+#line 1439 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6903 +6931 @@
 
 /* Line 1806 of yacc.c  */
-#line 1439 "parser.yy"
+#line 1441 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6910 +6938 @@
 
 /* Line 1806 of yacc.c  */
-#line 1441 "parser.yy"
+#line 1443 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6917 +6945 @@
 
 /* Line 1806 of yacc.c  */
-#line 1447 "parser.yy"
+#line 1449 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6924 +6952 @@
 
 /* Line 1806 of yacc.c  */
-#line 1449 "parser.yy"
+#line 1451 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6931 +6959 @@
 
 /* Line 1806 of yacc.c  */
-#line 1455 "parser.yy"
+#line 1457 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6938 +6966 @@
 
 /* Line 1806 of yacc.c  */
-#line 1457 "parser.yy"
+#line 1459 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6945 +6973 @@
 
 /* Line 1806 of yacc.c  */
-#line 1459 "parser.yy"
+#line 1461 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6952 +6980 @@
 
 /* Line 1806 of yacc.c  */
-#line 1464 "parser.yy"
+#line 1466 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -6959 +6987 @@
 
 /* Line 1806 of yacc.c  */
-#line 1466 "parser.yy"
+#line 1468 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(2) - (2)].tok) )->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6966 +6994 @@
 
 /* Line 1806 of yacc.c  */
-#line 1468 "parser.yy"
+#line 1470 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6973 +7001 @@
 
 /* Line 1806 of yacc.c  */
-#line 1478 "parser.yy"
+#line 1480 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (4)].aggKey), nullptr, nullptr, (yyvsp[(3) - (4)].decl), true ); }
     break;
@@ -6980 +7008 @@
 
 /* Line 1806 of yacc.c  */
-#line 1480 "parser.yy"
+#line 1482 "parser.yy"
     {
                         typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
@@ -6990 +7018 @@
 
 /* Line 1806 of yacc.c  */
-#line 1485 "parser.yy"
+#line 1487 "parser.yy"
     { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
     break;
@@ -6997 +7025 @@
 
 /* Line 1806 of yacc.c  */
-#line 1487 "parser.yy"
+#line 1489 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (6)].aggKey), (yyvsp[(2) - (6)].tok), nullptr, (yyvsp[(5) - (6)].decl), true ); }
     break;
@@ -7004 +7032 @@
 
 /* Line 1806 of yacc.c  */
-#line 1489 "parser.yy"
+#line 1491 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (7)].aggKey), nullptr, (yyvsp[(3) - (7)].en), (yyvsp[(6) - (7)].decl), false ); }
     break;
@@ -7011 +7039 @@
 
 /* Line 1806 of yacc.c  */
-#line 1491 "parser.yy"
+#line 1493 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
     break;
@@ -7018 +7046 @@
 
 /* Line 1806 of yacc.c  */
-#line 1496 "parser.yy"
+#line 1498 "parser.yy"
     { (yyval.aggKey) = DeclarationNode::Struct; }
     break;
@@ -7025 +7053 @@
 
 /* Line 1806 of yacc.c  */
-#line 1498 "parser.yy"
+#line 1500 "parser.yy"
     { (yyval.aggKey) = DeclarationNode::Union; }
     break;
@@ -7032 +7060 @@
 
 /* Line 1806 of yacc.c  */
-#line 1503 "parser.yy"
+#line 1505 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7039 +7067 @@
 
 /* Line 1806 of yacc.c  */
-#line 1505 "parser.yy"
+#line 1507 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl) != 0 ? (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ) : (yyvsp[(2) - (2)].decl); }
     break;
@@ -7046 +7074 @@
 
 /* Line 1806 of yacc.c  */
-#line 1511 "parser.yy"
+#line 1513 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl)->set_extension( true ); }
     break;
@@ -7053 +7081 @@
 
 /* Line 1806 of yacc.c  */
-#line 1514 "parser.yy"
+#line 1516 "parser.yy"
     {   // mark all fields in list
                         for ( DeclarationNode *iter = (yyvsp[(2) - (3)].decl); iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
@@ -7064 +7092 @@
 
 /* Line 1806 of yacc.c  */
-#line 1524 "parser.yy"
+#line 1526 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addName( (yyvsp[(2) - (2)].tok) ); }
     break;
@@ -7071 +7099 @@
 
 /* Line 1806 of yacc.c  */
-#line 1526 "parser.yy"
+#line 1528 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(1) - (3)].decl)->cloneType( (yyvsp[(3) - (3)].tok) ) ); }
     break;
@@ -7078 +7106 @@
 
 /* Line 1806 of yacc.c  */
-#line 1528 "parser.yy"
+#line 1530 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(1) - (2)].decl)->cloneType( 0 ) ); }
     break;
@@ -7085 +7113 @@
 
 /* Line 1806 of yacc.c  */
-#line 1533 "parser.yy"
+#line 1535 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7092 +7120 @@
 
 /* Line 1806 of yacc.c  */
-#line 1535 "parser.yy"
+#line 1537 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(1) - (4)].decl)->cloneBaseType( (yyvsp[(4) - (4)].decl) ) ); }
     break;
@@ -7099 +7127 @@
 
 /* Line 1806 of yacc.c  */
-#line 1540 "parser.yy"
+#line 1542 "parser.yy"
     { (yyval.decl) = DeclarationNode::newName( 0 ); /* XXX */ }
     break;
@@ -7106 +7134 @@
 
 /* Line 1806 of yacc.c  */
-#line 1542 "parser.yy"
+#line 1544 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBitfield( (yyvsp[(1) - (1)].en) ); }
     break;
@@ -7113 +7141 @@
 
 /* Line 1806 of yacc.c  */
-#line 1545 "parser.yy"
+#line 1547 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
     break;
@@ -7120 +7148 @@
 
 /* Line 1806 of yacc.c  */
-#line 1548 "parser.yy"
+#line 1550 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
     break;
@@ -7127 +7155 @@
 
 /* Line 1806 of yacc.c  */
-#line 1554 "parser.yy"
+#line 1556 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -7134 +7162 @@
 
 /* Line 1806 of yacc.c  */
-#line 1556 "parser.yy"
+#line 1558 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
@@ -7141 +7169 @@
 
 /* Line 1806 of yacc.c  */
-#line 1561 "parser.yy"
+#line 1563 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -7148 +7176 @@
 
 /* Line 1806 of yacc.c  */
-#line 1570 "parser.yy"
+#line 1572 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( nullptr, (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -7155 +7183 @@
 
 /* Line 1806 of yacc.c  */
-#line 1572 "parser.yy"
+#line 1574 "parser.yy"
     {
                         typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
@@ -7165 +7193 @@
 
 /* Line 1806 of yacc.c  */
-#line 1577 "parser.yy"
+#line 1579 "parser.yy"
     { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
     break;
@@ -7172 +7200 @@
 
 /* Line 1806 of yacc.c  */
-#line 1579 "parser.yy"
+#line 1581 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( (yyvsp[(2) - (7)].tok), (yyvsp[(5) - (7)].decl) ); }
     break;
@@ -7179 +7207 @@
 
 /* Line 1806 of yacc.c  */
-#line 1584 "parser.yy"
+#line 1586 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnumConstant( (yyvsp[(1) - (2)].tok), (yyvsp[(2) - (2)].en) ); }
     break;
@@ -7186 +7214 @@
 
 /* Line 1806 of yacc.c  */
-#line 1586 "parser.yy"
+#line 1588 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( DeclarationNode::newEnumConstant( (yyvsp[(3) - (4)].tok), (yyvsp[(4) - (4)].en) ) ); }
     break;
@@ -7193 +7221 @@
 
 /* Line 1806 of yacc.c  */
-#line 1591 "parser.yy"
+#line 1593 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -7200 +7228 @@
 
 /* Line 1806 of yacc.c  */
-#line 1593 "parser.yy"
+#line 1595 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -7207 +7235 @@
 
 /* Line 1806 of yacc.c  */
-#line 1600 "parser.yy"
+#line 1602 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7214 +7242 @@
 
 /* Line 1806 of yacc.c  */
-#line 1608 "parser.yy"
+#line 1610 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
 
   case 408:
-
-/* Line 1806 of yacc.c  */
-#line 1610 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
-    break;
-
-  case 409:
 
 /* Line 1806 of yacc.c  */
@@ -7232 +7253 @@
     break;
 
+  case 409:
+
+/* Line 1806 of yacc.c  */
+#line 1614 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
+    break;
+
   case 411:
-
-/* Line 1806 of yacc.c  */
-#line 1620 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
-    break;
-
-  case 412:
 
 /* Line 1806 of yacc.c  */
@@ -7246 +7267 @@
     break;
 
+  case 412:
+
+/* Line 1806 of yacc.c  */
+#line 1624 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
+    break;
+
   case 413:
 
 /* Line 1806 of yacc.c  */
-#line 1624 "parser.yy"
+#line 1626 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (9)].decl)->appendList( (yyvsp[(5) - (9)].decl) )->appendList( (yyvsp[(9) - (9)].decl) ); }
     break;
@@ -7256 +7284 @@
 
 /* Line 1806 of yacc.c  */
-#line 1630 "parser.yy"
+#line 1632 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7263 +7291 @@
 
 /* Line 1806 of yacc.c  */
-#line 1635 "parser.yy"
+#line 1637 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7270 +7298 @@
 
 /* Line 1806 of yacc.c  */
-#line 1642 "parser.yy"
+#line 1644 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
 
   case 422:
-
-/* Line 1806 of yacc.c  */
-#line 1649 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
-    break;
-
-  case 423:
 
 /* Line 1806 of yacc.c  */
@@ -7288 +7309 @@
     break;
 
+  case 423:
+
+/* Line 1806 of yacc.c  */
+#line 1653 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
+    break;
+
   case 425:
 
 /* Line 1806 of yacc.c  */
-#line 1660 "parser.yy"
+#line 1662 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -7298 +7326 @@
 
 /* Line 1806 of yacc.c  */
-#line 1663 "parser.yy"
+#line 1665 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -7305 +7333 @@
 
 /* Line 1806 of yacc.c  */
-#line 1665 "parser.yy"
+#line 1667 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addName( (yyvsp[(3) - (4)].tok) )->addQualifiers( (yyvsp[(1) - (4)].decl) ); }
     break;
@@ -7312 +7340 @@
 
 /* Line 1806 of yacc.c  */
-#line 1675 "parser.yy"
+#line 1677 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7319 +7347 @@
 
 /* Line 1806 of yacc.c  */
-#line 1681 "parser.yy"
+#line 1683 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7329 +7357 @@
 
 /* Line 1806 of yacc.c  */
-#line 1686 "parser.yy"
+#line 1688 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7339 +7367 @@
 
 /* Line 1806 of yacc.c  */
-#line 1695 "parser.yy"
+#line 1697 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7346 +7374 @@
 
 /* Line 1806 of yacc.c  */
-#line 1704 "parser.yy"
+#line 1706 "parser.yy"
     { (yyval.decl) = DeclarationNode::newName( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -7353 +7381 @@
 
 /* Line 1806 of yacc.c  */
-#line 1706 "parser.yy"
+#line 1708 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( DeclarationNode::newName( (yyvsp[(3) - (3)].tok) ) ); }
     break;
@@ -7360 +7388 @@
 
 /* Line 1806 of yacc.c  */
-#line 1731 "parser.yy"
+#line 1733 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7367 +7395 @@
 
 /* Line 1806 of yacc.c  */
-#line 1739 "parser.yy"
+#line 1741 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7374 +7402 @@
 
 /* Line 1806 of yacc.c  */
-#line 1744 "parser.yy"
+#line 1746 "parser.yy"
     { (yyval.in) = 0; }
     break;
@@ -7381 +7409 @@
 
 /* Line 1806 of yacc.c  */
-#line 1746 "parser.yy"
+#line 1748 "parser.yy"
     { (yyval.in) = (yyvsp[(2) - (2)].in); }
     break;
@@ -7388 +7416 @@
 
 /* Line 1806 of yacc.c  */
-#line 1748 "parser.yy"
+#line 1750 "parser.yy"
     { (yyval.in) = (yyvsp[(2) - (2)].in)->set_maybeConstructed( false ); }
     break;
@@ -7395 +7423 @@
 
 /* Line 1806 of yacc.c  */
-#line 1752 "parser.yy"
+#line 1754 "parser.yy"
     { (yyval.in) = new InitializerNode( (yyvsp[(1) - (1)].en) ); }
     break;
@@ -7402 +7430 @@
 
 /* Line 1806 of yacc.c  */
-#line 1753 "parser.yy"
+#line 1755 "parser.yy"
     { (yyval.in) = new InitializerNode( (yyvsp[(2) - (4)].in), true ); }
     break;
@@ -7409 +7437 @@
 
 /* Line 1806 of yacc.c  */
-#line 1758 "parser.yy"
+#line 1760 "parser.yy"
     { (yyval.in) = 0; }
     break;
@@ -7416 +7444 @@
 
 /* Line 1806 of yacc.c  */
-#line 1760 "parser.yy"
+#line 1762 "parser.yy"
     { (yyval.in) = (yyvsp[(2) - (2)].in)->set_designators( (yyvsp[(1) - (2)].en) ); }
     break;
@@ -7423 +7451 @@
 
 /* Line 1806 of yacc.c  */
-#line 1761 "parser.yy"
+#line 1763 "parser.yy"
     { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (3)].in)->set_last( (yyvsp[(3) - (3)].in) ) ); }
     break;
@@ -7430 +7458 @@
 
 /* Line 1806 of yacc.c  */
-#line 1763 "parser.yy"
+#line 1765 "parser.yy"
     { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (4)].in)->set_last( (yyvsp[(4) - (4)].in)->set_designators( (yyvsp[(3) - (4)].en) ) ) ); }
     break;
@@ -7437 +7465 @@
 
 /* Line 1806 of yacc.c  */
-#line 1779 "parser.yy"
+#line 1781 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[(1) - (2)].tok) ) ); }
     break;
@@ -7444 +7472 @@
 
 /* Line 1806 of yacc.c  */
-#line 1785 "parser.yy"
+#line 1787 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (2)].en)->set_last( (yyvsp[(2) - (2)].en) ) ); }
     break;
@@ -7451 +7479 @@
 
 /* Line 1806 of yacc.c  */
-#line 1791 "parser.yy"
+#line 1793 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[(2) - (2)].tok) ) ); }
     break;
 
   case 471:
-
-/* Line 1806 of yacc.c  */
-#line 1794 "parser.yy"
-    { (yyval.en) = (yyvsp[(3) - (5)].en); }
-    break;
-
-  case 472:
 
 /* Line 1806 of yacc.c  */
@@ -7469 +7490 @@
     break;
 
+  case 472:
+
+/* Line 1806 of yacc.c  */
+#line 1798 "parser.yy"
+    { (yyval.en) = (yyvsp[(3) - (5)].en); }
+    break;
+
   case 473:
 
 /* Line 1806 of yacc.c  */
-#line 1798 "parser.yy"
+#line 1800 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_range( (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].en) ) ); }
     break;
@@ -7479 +7507 @@
 
 /* Line 1806 of yacc.c  */
-#line 1800 "parser.yy"
+#line 1802 "parser.yy"
     { (yyval.en) = (yyvsp[(4) - (6)].en); }
     break;
@@ -7486 +7514 @@
 
 /* Line 1806 of yacc.c  */
-#line 1824 "parser.yy"
+#line 1826 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7493 +7521 @@
 
 /* Line 1806 of yacc.c  */
-#line 1826 "parser.yy"
+#line 1828 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7500 +7528 @@
 
 /* Line 1806 of yacc.c  */
-#line 1828 "parser.yy"
+#line 1830 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7507 +7535 @@
 
 /* Line 1806 of yacc.c  */
-#line 1834 "parser.yy"
+#line 1836 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7514 +7542 @@
 
 /* Line 1806 of yacc.c  */
-#line 1836 "parser.yy"
+#line 1838 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7521 +7549 @@
 
 /* Line 1806 of yacc.c  */
-#line 1841 "parser.yy"
+#line 1843 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypeGen( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -7528 +7556 @@
 
 /* Line 1806 of yacc.c  */
-#line 1847 "parser.yy"
+#line 1849 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -7535 +7563 @@
 
 /* Line 1806 of yacc.c  */
-#line 1852 "parser.yy"
+#line 1854 "parser.yy"
     { typedefTable.addToEnclosingScope( *(yyvsp[(2) - (2)].tok), TypedefTable::TD ); }
     break;
@@ -7542 +7570 @@
 
 /* Line 1806 of yacc.c  */
-#line 1854 "parser.yy"
+#line 1856 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTypeParam( (yyvsp[(1) - (4)].tclass), (yyvsp[(2) - (4)].tok) )->addAssertions( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -7549 +7577 @@
 
 /* Line 1806 of yacc.c  */
-#line 1860 "parser.yy"
+#line 1862 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Otype; }
     break;
@@ -7556 +7584 @@
 
 /* Line 1806 of yacc.c  */
-#line 1862 "parser.yy"
+#line 1864 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Ftype; }
     break;
@@ -7563 +7591 @@
 
 /* Line 1806 of yacc.c  */
-#line 1864 "parser.yy"
+#line 1866 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Dtype; }
     break;
@@ -7570 +7598 @@
 
 /* Line 1806 of yacc.c  */
-#line 1869 "parser.yy"
+#line 1871 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7577 +7605 @@
 
 /* Line 1806 of yacc.c  */
-#line 1871 "parser.yy"
+#line 1873 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl) != 0 ? (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ) : (yyvsp[(2) - (2)].decl); }
     break;
@@ -7584 +7612 @@
 
 /* Line 1806 of yacc.c  */
-#line 1876 "parser.yy"
+#line 1878 "parser.yy"
     {
                         typedefTable.openTrait( *(yyvsp[(2) - (5)].tok) );
@@ -7594 +7622 @@
 
 /* Line 1806 of yacc.c  */
-#line 1881 "parser.yy"
+#line 1883 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (5)].decl); }
     break;
@@ -7601 +7629 @@
 
 /* Line 1806 of yacc.c  */
-#line 1883 "parser.yy"
+#line 1885 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7608 +7636 @@
 
 /* Line 1806 of yacc.c  */
-#line 1888 "parser.yy"
+#line 1890 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_typevalue( (yyvsp[(1) - (1)].decl) ) ); }
     break;
@@ -7615 +7643 @@
 
 /* Line 1806 of yacc.c  */
-#line 1891 "parser.yy"
+#line 1893 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_last( new ExpressionNode( build_typevalue( (yyvsp[(3) - (3)].decl) ) ) ) ); }
     break;
@@ -7622 +7650 @@
 
 /* Line 1806 of yacc.c  */
-#line 1893 "parser.yy"
+#line 1895 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) )); }
     break;
@@ -7629 +7657 @@
 
 /* Line 1806 of yacc.c  */
-#line 1898 "parser.yy"
+#line 1900 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
     break;
@@ -7636 +7664 @@
 
 /* Line 1806 of yacc.c  */
-#line 1900 "parser.yy"
+#line 1902 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -7643 +7671 @@
 
 /* Line 1806 of yacc.c  */
-#line 1902 "parser.yy"
+#line 1904 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl)->copyStorageClasses( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -7650 +7678 @@
 
 /* Line 1806 of yacc.c  */
-#line 1907 "parser.yy"
+#line 1909 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addAssertions( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7657 +7685 @@
 
 /* Line 1806 of yacc.c  */
-#line 1909 "parser.yy"
+#line 1911 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addAssertions( (yyvsp[(2) - (4)].decl) )->addType( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -7664 +7692 @@
 
 /* Line 1806 of yacc.c  */
-#line 1914 "parser.yy"
+#line 1916 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (1)].tok), TypedefTable::TD );
@@ -7674 +7702 @@
 
 /* Line 1806 of yacc.c  */
-#line 1919 "parser.yy"
+#line 1921 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (6)].tok), TypedefTable::TG );
@@ -7684 +7712 @@
 
 /* Line 1806 of yacc.c  */
-#line 1927 "parser.yy"
+#line 1929 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (9)].tok), TypedefTable::ID );
@@ -7694 +7722 @@
 
 /* Line 1806 of yacc.c  */
-#line 1932 "parser.yy"
+#line 1934 "parser.yy"
     {
                         typedefTable.enterTrait( *(yyvsp[(2) - (8)].tok) );
@@ -7704 +7732 @@
 
 /* Line 1806 of yacc.c  */
-#line 1937 "parser.yy"
+#line 1939 "parser.yy"
     {
                         typedefTable.leaveTrait();
@@ -7715 +7743 @@
 
 /* Line 1806 of yacc.c  */
-#line 1947 "parser.yy"
+#line 1949 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7722 +7750 @@
 
 /* Line 1806 of yacc.c  */
-#line 1957 "parser.yy"
+#line 1959 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7732 +7760 @@
 
 /* Line 1806 of yacc.c  */
-#line 1962 "parser.yy"
+#line 1964 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7742 +7770 @@
 
 /* Line 1806 of yacc.c  */
-#line 1967 "parser.yy"
+#line 1969 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
@@ -7752 +7780 @@
 
 /* Line 1806 of yacc.c  */
-#line 1975 "parser.yy"
+#line 1977 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7762 +7790 @@
 
 /* Line 1806 of yacc.c  */
-#line 1980 "parser.yy"
+#line 1982 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7772 +7800 @@
 
 /* Line 1806 of yacc.c  */
-#line 1990 "parser.yy"
+#line 1992 "parser.yy"
     {}
     break;
@@ -7779 +7807 @@
 
 /* Line 1806 of yacc.c  */
-#line 1992 "parser.yy"
+#line 1994 "parser.yy"
     { parseTree = parseTree != nullptr ? parseTree->appendList( (yyvsp[(1) - (1)].decl) ) : (yyvsp[(1) - (1)].decl);    }
     break;
@@ -7786 +7814 @@
 
 /* Line 1806 of yacc.c  */
-#line 1998 "parser.yy"
+#line 2000 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl) != nullptr ? (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ) : (yyvsp[(3) - (3)].decl); }
     break;
@@ -7793 +7821 @@
 
 /* Line 1806 of yacc.c  */
-#line 2003 "parser.yy"
+#line 2005 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7800 +7828 @@
 
 /* Line 1806 of yacc.c  */
-#line 2011 "parser.yy"
+#line 2013 "parser.yy"
     {}
     break;
@@ -7807 +7835 @@
 
 /* Line 1806 of yacc.c  */
-#line 2013 "parser.yy"
+#line 2015 "parser.yy"
     {
                         linkageStack.push( linkage );                           // handle nested extern "C"/"Cforall"
@@ -7817 +7845 @@
 
 /* Line 1806 of yacc.c  */
-#line 2018 "parser.yy"
+#line 2020 "parser.yy"
     {
                         linkage = linkageStack.top();
@@ -7828 +7856 @@
 
 /* Line 1806 of yacc.c  */
-#line 2024 "parser.yy"
+#line 2026 "parser.yy"
     {   // mark all fields in list
                         for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
@@ -7839 +7867 @@
 
 /* Line 1806 of yacc.c  */
-#line 2039 "parser.yy"
+#line 2041 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7850 +7878 @@
 
 /* Line 1806 of yacc.c  */
-#line 2045 "parser.yy"
+#line 2047 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7861 +7889 @@
 
 /* Line 1806 of yacc.c  */
-#line 2054 "parser.yy"
+#line 2056 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7872 +7900 @@
 
 /* Line 1806 of yacc.c  */
-#line 2060 "parser.yy"
+#line 2062 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7883 +7911 @@
 
 /* Line 1806 of yacc.c  */
-#line 2066 "parser.yy"
+#line 2068 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7894 +7922 @@
 
 /* Line 1806 of yacc.c  */
-#line 2072 "parser.yy"
+#line 2074 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7905 +7933 @@
 
 /* Line 1806 of yacc.c  */
-#line 2078 "parser.yy"
+#line 2080 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7916 +7944 @@
 
 /* Line 1806 of yacc.c  */
-#line 2086 "parser.yy"
+#line 2088 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7927 +7955 @@
 
 /* Line 1806 of yacc.c  */
-#line 2092 "parser.yy"
+#line 2094 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7938 +7966 @@
 
 /* Line 1806 of yacc.c  */
-#line 2100 "parser.yy"
+#line 2102 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7949 +7977 @@
 
 /* Line 1806 of yacc.c  */
-#line 2106 "parser.yy"
+#line 2108 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7960 +7988 @@
 
 /* Line 1806 of yacc.c  */
-#line 2121 "parser.yy"
+#line 2123 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_range( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -7967 +7995 @@
 
 /* Line 1806 of yacc.c  */
-#line 2126 "parser.yy"
+#line 2128 "parser.yy"
     { delete (yyvsp[(3) - (5)].str); }
     break;
@@ -7974 +8002 @@
 
 /* Line 1806 of yacc.c  */
-#line 2131 "parser.yy"
+#line 2133 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7981 +8009 @@
 
 /* Line 1806 of yacc.c  */
-#line 2138 "parser.yy"
+#line 2140 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7988 +8016 @@
 
 /* Line 1806 of yacc.c  */
-#line 2144 "parser.yy"
+#line 2146 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7995 +8023 @@
 
 /* Line 1806 of yacc.c  */
-#line 2155 "parser.yy"
+#line 2157 "parser.yy"
     { delete (yyvsp[(3) - (4)].en); }
     break;
@@ -8002 +8030 @@
 
 /* Line 1806 of yacc.c  */
-#line 2159 "parser.yy"
+#line 2161 "parser.yy"
     { delete (yyvsp[(1) - (1)].tok); }
     break;
 
   case 560:
-
-/* Line 1806 of yacc.c  */
-#line 2160 "parser.yy"
-    { delete (yyvsp[(1) - (1)].decl); }
-    break;
-
-  case 561:
-
-/* Line 1806 of yacc.c  */
-#line 2161 "parser.yy"
-    { delete (yyvsp[(1) - (1)].decl); }
-    break;
-
-  case 562:
 
 /* Line 1806 of yacc.c  */
@@ -8027 +8041 @@
     break;
 
+  case 561:
+
+/* Line 1806 of yacc.c  */
+#line 2163 "parser.yy"
+    { delete (yyvsp[(1) - (1)].decl); }
+    break;
+
+  case 562:
+
+/* Line 1806 of yacc.c  */
+#line 2164 "parser.yy"
+    { delete (yyvsp[(1) - (1)].decl); }
+    break;
+
   case 563:
 
 /* Line 1806 of yacc.c  */
-#line 2197 "parser.yy"
+#line 2199 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
   case 565:
-
-/* Line 1806 of yacc.c  */
-#line 2200 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 566:
 
 /* Line 1806 of yacc.c  */
@@ -8048 +8069 @@
     break;
 
+  case 566:
+
+/* Line 1806 of yacc.c  */
+#line 2204 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
   case 567:
 
 /* Line 1806 of yacc.c  */
-#line 2207 "parser.yy"
+#line 2209 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8061 +8089 @@
 
 /* Line 1806 of yacc.c  */
-#line 2212 "parser.yy"
+#line 2214 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8068 +8096 @@
 
 /* Line 1806 of yacc.c  */
-#line 2217 "parser.yy"
+#line 2219 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8075 +8103 @@
 
 /* Line 1806 of yacc.c  */
-#line 2219 "parser.yy"
+#line 2221 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8082 +8110 @@
 
 /* Line 1806 of yacc.c  */
-#line 2221 "parser.yy"
+#line 2223 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8089 +8117 @@
 
 /* Line 1806 of yacc.c  */
-#line 2226 "parser.yy"
+#line 2228 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
 
   case 573:
-
-/* Line 1806 of yacc.c  */
-#line 2228 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 574:
 
 /* Line 1806 of yacc.c  */
@@ -8107 +8128 @@
     break;
 
+  case 574:
+
+/* Line 1806 of yacc.c  */
+#line 2232 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
   case 575:
 
 /* Line 1806 of yacc.c  */
-#line 2232 "parser.yy"
+#line 2234 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8117 +8145 @@
 
 /* Line 1806 of yacc.c  */
-#line 2237 "parser.yy"
+#line 2239 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8124 +8152 @@
 
 /* Line 1806 of yacc.c  */
-#line 2239 "parser.yy"
+#line 2241 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8131 +8159 @@
 
 /* Line 1806 of yacc.c  */
-#line 2248 "parser.yy"
+#line 2250 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8138 +8166 @@
 
 /* Line 1806 of yacc.c  */
-#line 2251 "parser.yy"
+#line 2253 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8145 +8173 @@
 
 /* Line 1806 of yacc.c  */
-#line 2256 "parser.yy"
+#line 2258 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
@@ -8152 +8180 @@
 
 /* Line 1806 of yacc.c  */
-#line 2258 "parser.yy"
+#line 2260 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8159 +8187 @@
 
 /* Line 1806 of yacc.c  */
-#line 2260 "parser.yy"
+#line 2262 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8166 +8194 @@
 
 /* Line 1806 of yacc.c  */
-#line 2265 "parser.yy"
+#line 2267 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8173 +8201 @@
 
 /* Line 1806 of yacc.c  */
-#line 2267 "parser.yy"
+#line 2269 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8180 +8208 @@
 
 /* Line 1806 of yacc.c  */
-#line 2269 "parser.yy"
+#line 2271 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
   case 587:
-
-/* Line 1806 of yacc.c  */
-#line 2274 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 588:
 
 /* Line 1806 of yacc.c  */
@@ -8198 +8219 @@
     break;
 
+  case 588:
+
+/* Line 1806 of yacc.c  */
+#line 2278 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
   case 589:
 
 /* Line 1806 of yacc.c  */
-#line 2278 "parser.yy"
+#line 2280 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8208 +8236 @@
 
 /* Line 1806 of yacc.c  */
-#line 2293 "parser.yy"
+#line 2295 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addIdList( (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -8215 +8243 @@
 
 /* Line 1806 of yacc.c  */
-#line 2295 "parser.yy"
+#line 2297 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (6)].decl)->addIdList( (yyvsp[(5) - (6)].decl) ); }
     break;
@@ -8222 +8250 @@
 
 /* Line 1806 of yacc.c  */
-#line 2297 "parser.yy"
+#line 2299 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8229 +8257 @@
 
 /* Line 1806 of yacc.c  */
-#line 2302 "parser.yy"
+#line 2304 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8236 +8264 @@
 
 /* Line 1806 of yacc.c  */
-#line 2304 "parser.yy"
+#line 2306 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8243 +8271 @@
 
 /* Line 1806 of yacc.c  */
-#line 2306 "parser.yy"
+#line 2308 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
   case 599:
-
-/* Line 1806 of yacc.c  */
-#line 2311 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 600:
 
 /* Line 1806 of yacc.c  */
@@ -8261 +8282 @@
     break;
 
+  case 600:
+
+/* Line 1806 of yacc.c  */
+#line 2315 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
   case 601:
 
 /* Line 1806 of yacc.c  */
-#line 2315 "parser.yy"
+#line 2317 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8271 +8299 @@
 
 /* Line 1806 of yacc.c  */
-#line 2330 "parser.yy"
+#line 2332 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
   case 604:
-
-/* Line 1806 of yacc.c  */
-#line 2333 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 605:
 
 /* Line 1806 of yacc.c  */
@@ -8289 +8310 @@
     break;
 
+  case 605:
+
+/* Line 1806 of yacc.c  */
+#line 2337 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
   case 607:
 
 /* Line 1806 of yacc.c  */
-#line 2341 "parser.yy"
+#line 2343 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8299 +8327 @@
 
 /* Line 1806 of yacc.c  */
-#line 2346 "parser.yy"
+#line 2348 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8306 +8334 @@
 
 /* Line 1806 of yacc.c  */
-#line 2348 "parser.yy"
+#line 2350 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8313 +8341 @@
 
 /* Line 1806 of yacc.c  */
-#line 2350 "parser.yy"
+#line 2352 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8320 +8348 @@
 
 /* Line 1806 of yacc.c  */
-#line 2355 "parser.yy"
+#line 2357 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
 
   case 612:
-
-/* Line 1806 of yacc.c  */
-#line 2357 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 613:
 
 /* Line 1806 of yacc.c  */
@@ -8338 +8359 @@
     break;
 
+  case 613:
+
+/* Line 1806 of yacc.c  */
+#line 2361 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
   case 614:
 
 /* Line 1806 of yacc.c  */
-#line 2361 "parser.yy"
+#line 2363 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8348 +8376 @@
 
 /* Line 1806 of yacc.c  */
-#line 2366 "parser.yy"
+#line 2368 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
@@ -8355 +8383 @@
 
 /* Line 1806 of yacc.c  */
-#line 2368 "parser.yy"
+#line 2370 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8362 +8390 @@
 
 /* Line 1806 of yacc.c  */
-#line 2370 "parser.yy"
+#line 2372 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8369 +8397 @@
 
 /* Line 1806 of yacc.c  */
-#line 2380 "parser.yy"
+#line 2382 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
   case 620:
-
-/* Line 1806 of yacc.c  */
-#line 2383 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 621:
 
 /* Line 1806 of yacc.c  */
@@ -8387 +8408 @@
     break;
 
+  case 621:
+
+/* Line 1806 of yacc.c  */
+#line 2387 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
   case 622:
 
 /* Line 1806 of yacc.c  */
-#line 2390 "parser.yy"
+#line 2392 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8397 +8425 @@
 
 /* Line 1806 of yacc.c  */
-#line 2392 "parser.yy"
+#line 2394 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8404 +8432 @@
 
 /* Line 1806 of yacc.c  */
-#line 2394 "parser.yy"
+#line 2396 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8411 +8439 @@
 
 /* Line 1806 of yacc.c  */
-#line 2399 "parser.yy"
+#line 2401 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
 
   case 626:
-
-/* Line 1806 of yacc.c  */
-#line 2401 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 627:
 
 /* Line 1806 of yacc.c  */
@@ -8429 +8450 @@
     break;
 
+  case 627:
+
+/* Line 1806 of yacc.c  */
+#line 2405 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
   case 628:
 
 /* Line 1806 of yacc.c  */
-#line 2405 "parser.yy"
+#line 2407 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8439 +8467 @@
 
 /* Line 1806 of yacc.c  */
-#line 2410 "parser.yy"
+#line 2412 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
@@ -8446 +8474 @@
 
 /* Line 1806 of yacc.c  */
-#line 2412 "parser.yy"
+#line 2414 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8453 +8481 @@
 
 /* Line 1806 of yacc.c  */
-#line 2414 "parser.yy"
+#line 2416 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8460 +8488 @@
 
 /* Line 1806 of yacc.c  */
-#line 2445 "parser.yy"
+#line 2447 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
   case 634:
-
-/* Line 1806 of yacc.c  */
-#line 2448 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 635:
 
 /* Line 1806 of yacc.c  */
@@ -8478 +8499 @@
     break;
 
+  case 635:
+
+/* Line 1806 of yacc.c  */
+#line 2452 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
   case 636:
 
 /* Line 1806 of yacc.c  */
-#line 2455 "parser.yy"
+#line 2457 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8491 +8519 @@
 
 /* Line 1806 of yacc.c  */
-#line 2460 "parser.yy"
+#line 2462 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8501 +8529 @@
 
 /* Line 1806 of yacc.c  */
-#line 2468 "parser.yy"
+#line 2470 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8508 +8536 @@
 
 /* Line 1806 of yacc.c  */
-#line 2470 "parser.yy"
+#line 2472 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8515 +8543 @@
 
 /* Line 1806 of yacc.c  */
-#line 2472 "parser.yy"
+#line 2474 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8522 +8550 @@
 
 /* Line 1806 of yacc.c  */
-#line 2477 "parser.yy"
+#line 2479 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8529 +8557 @@
 
 /* Line 1806 of yacc.c  */
-#line 2479 "parser.yy"
+#line 2481 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8536 +8564 @@
 
 /* Line 1806 of yacc.c  */
-#line 2484 "parser.yy"
+#line 2486 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
@@ -8543 +8571 @@
 
 /* Line 1806 of yacc.c  */
-#line 2486 "parser.yy"
+#line 2488 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
 
   case 646:
-
-/* Line 1806 of yacc.c  */
-#line 2501 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 647:
 
 /* Line 1806 of yacc.c  */
@@ -8561 +8582 @@
     break;
 
+  case 647:
+
+/* Line 1806 of yacc.c  */
+#line 2505 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
   case 648:
 
 /* Line 1806 of yacc.c  */
-#line 2508 "parser.yy"
+#line 2510 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
@@ -8571 +8599 @@
 
 /* Line 1806 of yacc.c  */
-#line 2510 "parser.yy"
+#line 2512 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8578 +8606 @@
 
 /* Line 1806 of yacc.c  */
-#line 2512 "parser.yy"
+#line 2514 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8585 +8613 @@
 
 /* Line 1806 of yacc.c  */
-#line 2514 "parser.yy"
+#line 2516 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8592 +8620 @@
 
 /* Line 1806 of yacc.c  */
-#line 2516 "parser.yy"
+#line 2518 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
   case 654:
-
-/* Line 1806 of yacc.c  */
-#line 2522 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 655:
 
 /* Line 1806 of yacc.c  */
@@ -8610 +8631 @@
     break;
 
+  case 655:
+
+/* Line 1806 of yacc.c  */
+#line 2526 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
   case 656:
 
 /* Line 1806 of yacc.c  */
-#line 2526 "parser.yy"
+#line 2528 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8620 +8648 @@
 
 /* Line 1806 of yacc.c  */
-#line 2531 "parser.yy"
+#line 2533 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( nullptr, nullptr, (yyvsp[(3) - (5)].decl), nullptr ); }
     break;
@@ -8627 +8655 @@
 
 /* Line 1806 of yacc.c  */
-#line 2533 "parser.yy"
+#line 2535 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8634 +8662 @@
 
 /* Line 1806 of yacc.c  */
-#line 2535 "parser.yy"
+#line 2537 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8641 +8669 @@
 
 /* Line 1806 of yacc.c  */
-#line 2541 "parser.yy"
+#line 2543 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
     break;
@@ -8648 +8676 @@
 
 /* Line 1806 of yacc.c  */
-#line 2543 "parser.yy"
+#line 2545 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false )->addArray( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -8655 +8683 @@
 
 /* Line 1806 of yacc.c  */
-#line 2549 "parser.yy"
+#line 2551 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(3) - (5)].en), 0, false ); }
     break;
@@ -8662 +8690 @@
 
 /* Line 1806 of yacc.c  */
-#line 2551 "parser.yy"
+#line 2553 "parser.yy"
     { (yyval.decl) = DeclarationNode::newVarArray( 0 ); }
     break;
@@ -8669 +8697 @@
 
 /* Line 1806 of yacc.c  */
-#line 2553 "parser.yy"
+#line 2555 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newArray( (yyvsp[(4) - (6)].en), 0, false ) ); }
     break;
@@ -8676 +8704 @@
 
 /* Line 1806 of yacc.c  */
-#line 2555 "parser.yy"
+#line 2557 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newVarArray( 0 ) ); }
     break;
 
   case 668:
-
-/* Line 1806 of yacc.c  */
-#line 2570 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 669:
 
 /* Line 1806 of yacc.c  */
@@ -8694 +8715 @@
     break;
 
+  case 669:
+
+/* Line 1806 of yacc.c  */
+#line 2574 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
   case 670:
 
 /* Line 1806 of yacc.c  */
-#line 2577 "parser.yy"
+#line 2579 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
@@ -8704 +8732 @@
 
 /* Line 1806 of yacc.c  */
-#line 2579 "parser.yy"
+#line 2581 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8711 +8739 @@
 
 /* Line 1806 of yacc.c  */
-#line 2581 "parser.yy"
+#line 2583 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8718 +8746 @@
 
 /* Line 1806 of yacc.c  */
-#line 2583 "parser.yy"
+#line 2585 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8725 +8753 @@
 
 /* Line 1806 of yacc.c  */
-#line 2585 "parser.yy"
+#line 2587 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
   case 676:
-
-/* Line 1806 of yacc.c  */
-#line 2591 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 677:
 
 /* Line 1806 of yacc.c  */
@@ -8743 +8764 @@
     break;
 
+  case 677:
+
+/* Line 1806 of yacc.c  */
+#line 2595 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
   case 678:
 
 /* Line 1806 of yacc.c  */
-#line 2595 "parser.yy"
+#line 2597 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8753 +8781 @@
 
 /* Line 1806 of yacc.c  */
-#line 2600 "parser.yy"
+#line 2602 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( nullptr, nullptr, (yyvsp[(3) - (5)].decl), nullptr ); }
     break;
@@ -8760 +8788 @@
 
 /* Line 1806 of yacc.c  */
-#line 2602 "parser.yy"
+#line 2604 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8767 +8795 @@
 
 /* Line 1806 of yacc.c  */
-#line 2604 "parser.yy"
+#line 2606 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8774 +8802 @@
 
 /* Line 1806 of yacc.c  */
-#line 2611 "parser.yy"
+#line 2613 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8781 +8809 @@
 
 /* Line 1806 of yacc.c  */
-#line 2622 "parser.yy"
+#line 2624 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
     break;
@@ -8788 +8816 @@
 
 /* Line 1806 of yacc.c  */
-#line 2625 "parser.yy"
+#line 2627 "parser.yy"
     { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
     break;
@@ -8795 +8823 @@
 
 /* Line 1806 of yacc.c  */
-#line 2627 "parser.yy"
+#line 2629 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, (yyvsp[(3) - (5)].decl), false ); }
     break;
@@ -8802 +8830 @@
 
 /* Line 1806 of yacc.c  */
-#line 2630 "parser.yy"
+#line 2632 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
     break;
@@ -8809 +8837 @@
 
 /* Line 1806 of yacc.c  */
-#line 2632 "parser.yy"
+#line 2634 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl), true ); }
     break;
@@ -8816 +8844 @@
 
 /* Line 1806 of yacc.c  */
-#line 2634 "parser.yy"
+#line 2636 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(3) - (7)].decl), true ); }
     break;
 
   case 692:
-
-/* Line 1806 of yacc.c  */
-#line 2648 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 693:
 
 /* Line 1806 of yacc.c  */
@@ -8834 +8855 @@
     break;
 
+  case 693:
+
+/* Line 1806 of yacc.c  */
+#line 2652 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
   case 694:
 
 /* Line 1806 of yacc.c  */
-#line 2655 "parser.yy"
+#line 2657 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
@@ -8844 +8872 @@
 
 /* Line 1806 of yacc.c  */
-#line 2657 "parser.yy"
+#line 2659 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8851 +8879 @@
 
 /* Line 1806 of yacc.c  */
-#line 2659 "parser.yy"
+#line 2661 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8858 +8886 @@
 
 /* Line 1806 of yacc.c  */
-#line 2661 "parser.yy"
+#line 2663 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8865 +8893 @@
 
 /* Line 1806 of yacc.c  */
-#line 2663 "parser.yy"
+#line 2665 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
   case 700:
-
-/* Line 1806 of yacc.c  */
-#line 2669 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 701:
 
 /* Line 1806 of yacc.c  */
@@ -8883 +8904 @@
     break;
 
+  case 701:
+
+/* Line 1806 of yacc.c  */
+#line 2673 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
   case 702:
 
 /* Line 1806 of yacc.c  */
-#line 2673 "parser.yy"
+#line 2675 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8893 +8921 @@
 
 /* Line 1806 of yacc.c  */
-#line 2678 "parser.yy"
+#line 2680 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8900 +8928 @@
 
 /* Line 1806 of yacc.c  */
-#line 2680 "parser.yy"
+#line 2682 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8907 +8935 @@
 
 /* Line 1806 of yacc.c  */
-#line 2690 "parser.yy"
+#line 2692 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -8914 +8942 @@
 
 /* Line 1806 of yacc.c  */
-#line 2700 "parser.yy"
+#line 2702 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8921 +8949 @@
 
 /* Line 1806 of yacc.c  */
-#line 2702 "parser.yy"
+#line 2704 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -8928 +8956 @@
 
 /* Line 1806 of yacc.c  */
-#line 2704 "parser.yy"
+#line 2706 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8935 +8963 @@
 
 /* Line 1806 of yacc.c  */
-#line 2706 "parser.yy"
+#line 2708 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -8942 +8970 @@
 
 /* Line 1806 of yacc.c  */
-#line 2708 "parser.yy"
+#line 2710 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8949 +8977 @@
 
 /* Line 1806 of yacc.c  */
-#line 2710 "parser.yy"
+#line 2712 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -8956 +8984 @@
 
 /* Line 1806 of yacc.c  */
-#line 2717 "parser.yy"
+#line 2719 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -8963 +8991 @@
 
 /* Line 1806 of yacc.c  */
-#line 2719 "parser.yy"
+#line 2721 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -8970 +8998 @@
 
 /* Line 1806 of yacc.c  */
-#line 2721 "parser.yy"
+#line 2723 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -8977 +9005 @@
 
 /* Line 1806 of yacc.c  */
-#line 2723 "parser.yy"
+#line 2725 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -8984 +9012 @@
 
 /* Line 1806 of yacc.c  */
-#line 2725 "parser.yy"
+#line 2727 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -8991 +9019 @@
 
 /* Line 1806 of yacc.c  */
-#line 2728 "parser.yy"
+#line 2729 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -8998 +9026 @@
 
 /* Line 1806 of yacc.c  */
-#line 2730 "parser.yy"
+#line 2731 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9005 +9033 @@
 
 /* Line 1806 of yacc.c  */
-#line 2732 "parser.yy"
+#line 2733 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -9012 +9040 @@
 
 /* Line 1806 of yacc.c  */
-#line 2734 "parser.yy"
+#line 2735 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -9019 +9047 @@
 
 /* Line 1806 of yacc.c  */
-#line 2736 "parser.yy"
+#line 2737 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9026 +9054 @@
 
 /* Line 1806 of yacc.c  */
-#line 2741 "parser.yy"
+#line 2742 "parser.yy"
     { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
     break;
@@ -9033 +9061 @@
 
 /* Line 1806 of yacc.c  */
-#line 2743 "parser.yy"
+#line 2744 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
     break;
@@ -9040 +9068 @@
 
 /* Line 1806 of yacc.c  */
-#line 2748 "parser.yy"
+#line 2749 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), true ); }
     break;
@@ -9047 +9075 @@
 
 /* Line 1806 of yacc.c  */
-#line 2750 "parser.yy"
+#line 2751 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl)->addQualifiers( (yyvsp[(3) - (7)].decl) ), true ); }
     break;
@@ -9054 +9082 @@
 
 /* Line 1806 of yacc.c  */
-#line 2777 "parser.yy"
+#line 2778 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9061 +9089 @@
 
 /* Line 1806 of yacc.c  */
-#line 2788 "parser.yy"
+#line 2789 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -9068 +9096 @@
 
 /* Line 1806 of yacc.c  */
-#line 2790 "parser.yy"
+#line 2791 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -9075 +9103 @@
 
 /* Line 1806 of yacc.c  */
-#line 2792 "parser.yy"
+#line 2793 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -9082 +9110 @@
 
 /* Line 1806 of yacc.c  */
-#line 2794 "parser.yy"
+#line 2795 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -9089 +9117 @@
 
 /* Line 1806 of yacc.c  */
-#line 2796 "parser.yy"
+#line 2797 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -9096 +9124 @@
 
 /* Line 1806 of yacc.c  */
-#line 2798 "parser.yy"
+#line 2799 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -9103 +9131 @@
 
 /* Line 1806 of yacc.c  */
-#line 2805 "parser.yy"
+#line 2806 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( nullptr, nullptr, false ) ); }
     break;
@@ -9110 +9138 @@
 
 /* Line 1806 of yacc.c  */
-#line 2807 "parser.yy"
+#line 2808 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( nullptr, nullptr, false ) ); }
     break;
@@ -9117 +9145 @@
 
 /* Line 1806 of yacc.c  */
-#line 2809 "parser.yy"
+#line 2810 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9124 +9152 @@
 
 /* Line 1806 of yacc.c  */
-#line 2811 "parser.yy"
+#line 2812 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( nullptr, nullptr, false ) ); }
     break;
@@ -9131 +9159 @@
 
 /* Line 1806 of yacc.c  */
-#line 2813 "parser.yy"
+#line 2814 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( nullptr, nullptr, false ) ); }
     break;
@@ -9138 +9166 @@
 
 /* Line 1806 of yacc.c  */
-#line 2815 "parser.yy"
+#line 2816 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9145 +9173 @@
 
 /* Line 1806 of yacc.c  */
-#line 2820 "parser.yy"
+#line 2821 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -9152 +9180 @@
 
 /* Line 1806 of yacc.c  */
-#line 2825 "parser.yy"
+#line 2826 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( nullptr, DeclarationNode::newTuple( nullptr ), (yyvsp[(4) - (5)].decl), nullptr ); }
     break;
@@ -9159 +9187 @@
 
 /* Line 1806 of yacc.c  */
-#line 2827 "parser.yy"
+#line 2828 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( nullptr, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), nullptr ); }
     break;
@@ -9166 +9194 @@
 
 /* Line 1806 of yacc.c  */
-#line 2829 "parser.yy"
+#line 2830 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( nullptr, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), nullptr ); }
     break;
@@ -9173 +9201 @@
 
 /* Line 1806 of yacc.c  */
-#line 2853 "parser.yy"
+#line 2854 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -9180 +9208 @@
 
 /* Line 1806 of yacc.c  */
-#line 2855 "parser.yy"
+#line 2856 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -9187 +9215 @@
 
 /* Line 1806 of yacc.c  */
-#line 9190 "Parser/parser.cc"
+#line 9218 "Parser/parser.cc"
       default: break;
     }
@@ -9418 +9446 @@
 
 /* Line 2067 of yacc.c  */
-#line 2858 "parser.yy"
+#line 2859 "parser.yy"
 
 // ----end of grammar----