Changes in src/Parser/parser.cc [3b58d91:a839867]

File:

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

src/Parser/parser.cc

@@ -1023 +1023 @@
        0,   300,   300,   304,   311,   312,   313,   317,   318,   319,
      323,   324,   328,   329,   333,   334,   338,   342,   343,   354,
-     356,   358,   360,   365,   366,   372,   376,   378,   380,   382,
-     384,   386,   388,   390,   399,   400,   406,   407,   411,   412,
-     416,   420,   422,   424,   426,   431,   434,   436,   438,   443,
-     456,   458,   460,   462,   464,   466,   468,   470,   472,   474,
-     476,   483,   484,   490,   491,   492,   493,   497,   498,   500,
-     505,   506,   508,   510,   515,   516,   518,   523,   524,   526,
-     531,   532,   534,   536,   538,   543,   544,   546,   551,   552,
-     557,   558,   563,   564,   569,   570,   575,   576,   581,   582,
-     585,   587,   592,   597,   598,   600,   606,   607,   611,   612,
-     613,   614,   615,   616,   617,   618,   619,   620,   621,   622,
-     628,   630,   632,   634,   639,   640,   645,   646,   652,   653,
-     659,   660,   661,   662,   663,   664,   665,   666,   667,   677,
-     684,   686,   696,   697,   702,   704,   710,   712,   716,   717,
-     722,   727,   730,   732,   734,   744,   746,   757,   758,   760,
-     764,   766,   770,   771,   776,   777,   781,   786,   787,   791,
-     793,   799,   800,   804,   806,   808,   810,   816,   817,   821,
-     823,   828,   830,   832,   837,   839,   844,   846,   850,   853,
-     857,   860,   864,   866,   868,   870,   875,   877,   879,   884,
-     886,   888,   890,   892,   897,   899,   901,   903,   908,   920,
-     921,   926,   928,   933,   937,   939,   941,   943,   945,   951,
-     952,   958,   959,   963,   964,   969,   971,   977,   978,   980,
-     985,   990,  1000,  1002,  1006,  1007,  1012,  1014,  1018,  1019,
-    1023,  1025,  1029,  1030,  1034,  1035,  1039,  1040,  1055,  1056,
-    1057,  1058,  1059,  1063,  1068,  1075,  1085,  1090,  1095,  1103,
-    1108,  1113,  1118,  1123,  1131,  1153,  1158,  1165,  1167,  1174,
-    1179,  1184,  1195,  1200,  1205,  1210,  1215,  1224,  1229,  1237,
-    1238,  1239,  1240,  1246,  1251,  1259,  1260,  1261,  1262,  1266,
-    1267,  1268,  1269,  1274,  1275,  1284,  1285,  1290,  1291,  1296,
-    1298,  1300,  1302,  1304,  1307,  1306,  1318,  1319,  1321,  1331,
-    1332,  1337,  1339,  1341,  1343,  1345,  1348,  1350,  1353,  1358,
-    1360,  1362,  1364,  1366,  1368,  1370,  1372,  1374,  1376,  1378,
-    1380,  1382,  1388,  1389,  1391,  1393,  1395,  1400,  1401,  1407,
-    1408,  1410,  1412,  1417,  1419,  1421,  1423,  1428,  1429,  1431,
-    1433,  1438,  1439,  1441,  1446,  1447,  1449,  1451,  1456,  1458,
-    1460,  1465,  1466,  1470,  1472,  1478,  1477,  1481,  1483,  1488,
-    1490,  1496,  1497,  1502,  1503,  1505,  1506,  1515,  1516,  1518,
-    1520,  1525,  1527,  1533,  1534,  1536,  1539,  1542,  1547,  1548,
-    1553,  1558,  1562,  1564,  1570,  1569,  1576,  1578,  1584,  1585,
-    1593,  1594,  1598,  1599,  1600,  1602,  1604,  1611,  1612,  1614,
-    1616,  1621,  1622,  1628,  1629,  1633,  1634,  1639,  1640,  1641,
-    1643,  1651,  1652,  1654,  1657,  1659,  1663,  1664,  1665,  1667,
-    1669,  1673,  1678,  1686,  1687,  1696,  1698,  1703,  1704,  1705,
-    1709,  1710,  1711,  1715,  1716,  1717,  1721,  1722,  1723,  1728,
-    1729,  1730,  1731,  1737,  1738,  1740,  1745,  1746,  1751,  1752,
-    1753,  1754,  1755,  1770,  1771,  1776,  1777,  1783,  1785,  1788,
-    1790,  1792,  1815,  1816,  1818,  1820,  1825,  1826,  1828,  1833,
-    1838,  1839,  1845,  1844,  1848,  1852,  1854,  1856,  1862,  1863,
-    1868,  1873,  1875,  1880,  1882,  1883,  1885,  1890,  1892,  1894,
-    1899,  1901,  1906,  1911,  1919,  1925,  1924,  1938,  1939,  1944,
-    1945,  1949,  1954,  1959,  1967,  1972,  1983,  1984,  1989,  1990,
-    1996,  1997,  2001,  2002,  2003,  2006,  2005,  2016,  2025,  2031,
-    2037,  2046,  2052,  2058,  2064,  2070,  2078,  2084,  2092,  2098,
-    2107,  2108,  2109,  2113,  2117,  2119,  2124,  2125,  2129,  2130,
-    2135,  2141,  2142,  2145,  2147,  2148,  2152,  2153,  2154,  2155,
-    2189,  2191,  2192,  2194,  2199,  2204,  2209,  2211,  2213,  2218,
-    2220,  2222,  2224,  2229,  2231,  2240,  2242,  2243,  2248,  2250,
-    2252,  2257,  2259,  2261,  2266,  2268,  2270,  2279,  2280,  2281,
-    2285,  2287,  2289,  2294,  2296,  2298,  2303,  2305,  2307,  2322,
-    2324,  2325,  2327,  2332,  2333,  2338,  2340,  2342,  2347,  2349,
-    2351,  2353,  2358,  2360,  2362,  2372,  2374,  2375,  2377,  2382,
-    2384,  2386,  2391,  2393,  2395,  2397,  2402,  2404,  2406,  2437,
-    2439,  2440,  2442,  2447,  2452,  2460,  2462,  2464,  2469,  2471,
-    2476,  2478,  2492,  2493,  2495,  2500,  2502,  2504,  2506,  2508,
-    2513,  2514,  2516,  2518,  2523,  2525,  2527,  2533,  2535,  2537,
-    2541,  2543,  2545,  2547,  2561,  2562,  2564,  2569,  2571,  2573,
-    2575,  2577,  2582,  2583,  2585,  2587,  2592,  2594,  2596,  2602,
-    2603,  2605,  2614,  2617,  2619,  2622,  2624,  2626,  2639,  2640,
-    2642,  2647,  2649,  2651,  2653,  2655,  2660,  2661,  2663,  2665,
-    2670,  2672,  2680,  2681,  2682,  2687,  2688,  2692,  2694,  2696,
-    2698,  2700,  2702,  2709,  2711,  2713,  2715,  2717,  2719,  2721,
-    2723,  2725,  2727,  2732,  2734,  2736,  2741,  2767,  2768,  2770,
-    2774,  2775,  2779,  2781,  2783,  2785,  2787,  2789,  2796,  2798,
-    2800,  2802,  2804,  2806,  2811,  2816,  2818,  2820,  2838,  2840,
-    2845,  2846
+     356,   358,   360,   365,   366,   372,   376,   378,   379,   381,
+     382,   384,   386,   388,   397,   398,   404,   405,   409,   410,
+     414,   418,   420,   422,   424,   429,   432,   434,   436,   441,
+     454,   456,   458,   460,   462,   464,   466,   468,   470,   472,
+     474,   481,   482,   488,   489,   490,   491,   495,   496,   498,
+     503,   504,   506,   508,   513,   514,   516,   521,   522,   524,
+     529,   530,   532,   534,   536,   541,   542,   544,   549,   550,
+     555,   556,   561,   562,   567,   568,   573,   574,   579,   580,
+     583,   585,   590,   595,   596,   598,   604,   605,   609,   610,
+     611,   612,   613,   614,   615,   616,   617,   618,   619,   620,
+     626,   628,   630,   632,   637,   638,   643,   644,   650,   651,
+     657,   658,   659,   660,   661,   662,   663,   664,   665,   675,
+     682,   684,   694,   695,   700,   702,   708,   710,   714,   715,
+     720,   725,   728,   730,   732,   742,   744,   755,   756,   758,
+     762,   764,   768,   769,   774,   775,   779,   784,   785,   789,
+     791,   797,   798,   802,   804,   806,   808,   814,   815,   819,
+     821,   826,   828,   830,   835,   837,   842,   844,   848,   851,
+     855,   858,   862,   864,   866,   868,   873,   875,   877,   882,
+     884,   886,   888,   890,   895,   897,   899,   901,   906,   918,
+     919,   924,   926,   931,   935,   937,   939,   941,   943,   949,
+     950,   956,   957,   961,   962,   967,   969,   975,   976,   978,
+     983,   988,   998,  1000,  1004,  1005,  1010,  1012,  1016,  1017,
+    1021,  1023,  1027,  1028,  1032,  1033,  1037,  1038,  1053,  1054,
+    1055,  1056,  1057,  1061,  1066,  1073,  1083,  1088,  1093,  1101,
+    1106,  1111,  1116,  1121,  1129,  1151,  1156,  1163,  1165,  1172,
+    1177,  1182,  1193,  1198,  1203,  1208,  1213,  1222,  1227,  1235,
+    1236,  1237,  1238,  1244,  1249,  1257,  1258,  1259,  1260,  1264,
+    1265,  1266,  1267,  1272,  1273,  1282,  1283,  1288,  1289,  1294,
+    1296,  1298,  1300,  1302,  1305,  1304,  1316,  1317,  1319,  1329,
+    1330,  1335,  1337,  1339,  1341,  1343,  1346,  1348,  1351,  1356,
+    1358,  1360,  1362,  1364,  1366,  1368,  1370,  1372,  1374,  1376,
+    1378,  1380,  1386,  1387,  1389,  1391,  1393,  1398,  1399,  1405,
+    1406,  1408,  1410,  1415,  1417,  1419,  1421,  1426,  1427,  1429,
+    1431,  1436,  1437,  1439,  1444,  1445,  1447,  1449,  1454,  1456,
+    1458,  1463,  1464,  1468,  1470,  1476,  1475,  1479,  1481,  1486,
+    1488,  1494,  1495,  1500,  1501,  1503,  1504,  1513,  1514,  1516,
+    1518,  1523,  1525,  1531,  1532,  1534,  1537,  1540,  1545,  1546,
+    1551,  1556,  1560,  1562,  1568,  1567,  1574,  1576,  1582,  1583,
+    1591,  1592,  1596,  1597,  1598,  1600,  1602,  1609,  1610,  1612,
+    1614,  1619,  1620,  1626,  1627,  1631,  1632,  1637,  1638,  1639,
+    1641,  1649,  1650,  1652,  1655,  1657,  1661,  1662,  1663,  1665,
+    1667,  1671,  1676,  1684,  1685,  1694,  1696,  1701,  1702,  1703,
+    1707,  1708,  1709,  1713,  1714,  1715,  1719,  1720,  1721,  1726,
+    1727,  1728,  1729,  1735,  1736,  1738,  1743,  1744,  1749,  1750,
+    1751,  1752,  1753,  1768,  1769,  1774,  1775,  1781,  1783,  1786,
+    1788,  1790,  1813,  1814,  1816,  1818,  1823,  1824,  1826,  1831,
+    1836,  1837,  1843,  1842,  1846,  1850,  1852,  1854,  1860,  1861,
+    1866,  1871,  1873,  1878,  1880,  1881,  1883,  1888,  1890,  1892,
+    1897,  1899,  1904,  1909,  1917,  1923,  1922,  1936,  1937,  1942,
+    1943,  1947,  1952,  1957,  1965,  1970,  1981,  1982,  1987,  1988,
+    1994,  1995,  1999,  2000,  2001,  2004,  2003,  2014,  2023,  2029,
+    2035,  2044,  2050,  2056,  2062,  2068,  2076,  2082,  2090,  2096,
+    2105,  2106,  2107,  2111,  2115,  2117,  2122,  2123,  2127,  2128,
+    2133,  2139,  2140,  2143,  2145,  2146,  2150,  2151,  2152,  2153,
+    2187,  2189,  2190,  2192,  2197,  2202,  2207,  2209,  2211,  2216,
+    2218,  2220,  2222,  2227,  2229,  2238,  2240,  2241,  2246,  2248,
+    2250,  2255,  2257,  2259,  2264,  2266,  2268,  2277,  2278,  2279,
+    2283,  2285,  2287,  2292,  2294,  2296,  2301,  2303,  2305,  2320,
+    2322,  2323,  2325,  2330,  2331,  2336,  2338,  2340,  2345,  2347,
+    2349,  2351,  2356,  2358,  2360,  2370,  2372,  2373,  2375,  2380,
+    2382,  2384,  2389,  2391,  2393,  2395,  2400,  2402,  2404,  2435,
+    2437,  2438,  2440,  2445,  2450,  2458,  2460,  2462,  2467,  2469,
+    2474,  2476,  2490,  2491,  2493,  2498,  2500,  2502,  2504,  2506,
+    2511,  2512,  2514,  2516,  2521,  2523,  2525,  2531,  2533,  2535,
+    2539,  2541,  2543,  2545,  2559,  2560,  2562,  2567,  2569,  2571,
+    2573,  2575,  2580,  2581,  2583,  2585,  2590,  2592,  2594,  2600,
+    2601,  2603,  2612,  2615,  2617,  2620,  2622,  2624,  2637,  2638,
+    2640,  2645,  2647,  2649,  2651,  2653,  2658,  2659,  2661,  2663,
+    2668,  2670,  2678,  2679,  2680,  2685,  2686,  2690,  2692,  2694,
+    2696,  2698,  2700,  2707,  2709,  2711,  2713,  2715,  2717,  2719,
+    2721,  2723,  2725,  2730,  2732,  2734,  2739,  2765,  2766,  2768,
+    2772,  2773,  2777,  2779,  2781,  2783,  2785,  2787,  2794,  2796,
+    2798,  2800,  2802,  2804,  2809,  2814,  2816,  2818,  2836,  2838,
+    2843,  2844
 };
 #endif
@@ -5077 +5077 @@
     break;
 
-  case 27:
-
-/* Line 1806 of yacc.c  */
-#line 379 "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 381 "parser.yy"
+#line 380 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(1) - (3)].en), build_varref( (yyvsp[(3) - (3)].tok) ) ) ); }
     break;
 
-  case 29:
+  case 30:
 
 /* Line 1806 of yacc.c  */
 #line 383 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(1) - (7)].en), build_tuple( (yyvsp[(5) - (7)].en) ) ) ); }
-    break;
-
-  case 30:
+    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::IncrPost, (yyvsp[(1) - (2)].en) ) ); }
+    break;
+
+  case 31:
 
 /* Line 1806 of yacc.c  */
 #line 385 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::IncrPost, (yyvsp[(1) - (2)].en) ) ); }
-    break;
-
-  case 31:
+    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::DecrPost, (yyvsp[(1) - (2)].en) ) ); }
+    break;
+
+  case 32:
 
 /* Line 1806 of yacc.c  */
 #line 387 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::DecrPost, (yyvsp[(1) - (2)].en) ) ); }
-    break;
-
-  case 32:
+    { (yyval.en) = new ExpressionNode( build_compoundLiteral( (yyvsp[(2) - (7)].decl), new InitializerNode( (yyvsp[(5) - (7)].in), true ) ) ); }
+    break;
+
+  case 33:
 
 /* Line 1806 of yacc.c  */
 #line 389 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_compoundLiteral( (yyvsp[(2) - (7)].decl), new InitializerNode( (yyvsp[(5) - (7)].in), true ) ) ); }
-    break;
-
-  case 33:
-
-/* Line 1806 of yacc.c  */
-#line 391 "parser.yy"
     {
                         Token fn;
@@ -5133 +5119 @@
 
 /* Line 1806 of yacc.c  */
-#line 401 "parser.yy"
+#line 399 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) )); }
     break;
@@ -5140 +5126 @@
 
 /* Line 1806 of yacc.c  */
-#line 406 "parser.yy"
+#line 404 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -5147 +5133 @@
 
 /* Line 1806 of yacc.c  */
-#line 412 "parser.yy"
+#line 410 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5154 +5140 @@
 
 /* Line 1806 of yacc.c  */
-#line 417 "parser.yy"
+#line 415 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[(1) - (1)].tok) ) ); }
     break;
@@ -5161 +5147 @@
 
 /* Line 1806 of yacc.c  */
+#line 419 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(3) - (3)].en), build_varref( (yyvsp[(1) - (3)].tok) ) ) ); }
+    break;
+
+  case 42:
+
+/* Line 1806 of yacc.c  */
 #line 421 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(3) - (3)].en), build_varref( (yyvsp[(1) - (3)].tok) ) ) ); }
-    break;
-
-  case 42:
+    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(5) - (7)].en), build_varref( (yyvsp[(1) - (7)].tok) ) ) ); }
+    break;
+
+  case 43:
 
 /* Line 1806 of yacc.c  */
 #line 423 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(5) - (7)].en), build_varref( (yyvsp[(1) - (7)].tok) ) ) ); }
-    break;
-
-  case 43:
+    { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(3) - (3)].en), build_varref( (yyvsp[(1) - (3)].tok) ) ) ); }
+    break;
+
+  case 44:
 
 /* Line 1806 of yacc.c  */
 #line 425 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(3) - (3)].en), build_varref( (yyvsp[(1) - (3)].tok) ) ) ); }
-    break;
-
-  case 44:
-
-/* Line 1806 of yacc.c  */
-#line 427 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(5) - (7)].en), build_varref( (yyvsp[(1) - (7)].tok) ) ) ); }
     break;
@@ -5189 +5175 @@
 
 /* Line 1806 of yacc.c  */
+#line 433 "parser.yy"
+    { (yyval.en) = (yyvsp[(1) - (1)].en); }
+    break;
+
+  case 47:
+
+/* Line 1806 of yacc.c  */
 #line 435 "parser.yy"
-    { (yyval.en) = (yyvsp[(1) - (1)].en); }
-    break;
-
-  case 47:
+    { (yyval.en) = new ExpressionNode( (yyvsp[(1) - (1)].constant) ); }
+    break;
+
+  case 48:
 
 /* Line 1806 of yacc.c  */
 #line 437 "parser.yy"
-    { (yyval.en) = new ExpressionNode( (yyvsp[(1) - (1)].constant) ); }
-    break;
-
-  case 48:
-
-/* Line 1806 of yacc.c  */
-#line 439 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en)->set_extension( true ); }
     break;
@@ -5210 +5196 @@
 
 /* Line 1806 of yacc.c  */
-#line 444 "parser.yy"
+#line 442 "parser.yy"
     {
                         switch ( (yyvsp[(1) - (2)].op) ) {
@@ -5228 +5214 @@
 
 /* Line 1806 of yacc.c  */
+#line 455 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_unary_val( (yyvsp[(1) - (2)].op), (yyvsp[(2) - (2)].en) ) ); }
+    break;
+
+  case 51:
+
+/* Line 1806 of yacc.c  */
 #line 457 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_unary_val( (yyvsp[(1) - (2)].op), (yyvsp[(2) - (2)].en) ) ); }
-    break;
-
-  case 51:
+    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::Incr, (yyvsp[(2) - (2)].en) ) ); }
+    break;
+
+  case 52:
 
 /* Line 1806 of yacc.c  */
 #line 459 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::Incr, (yyvsp[(2) - (2)].en) ) ); }
-    break;
-
-  case 52:
+    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::Decr, (yyvsp[(2) - (2)].en) ) ); }
+    break;
+
+  case 53:
 
 /* Line 1806 of yacc.c  */
 #line 461 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::Decr, (yyvsp[(2) - (2)].en) ) ); }
-    break;
-
-  case 53:
+    { (yyval.en) = new ExpressionNode( build_sizeOfexpr( (yyvsp[(2) - (2)].en) ) ); }
+    break;
+
+  case 54:
 
 /* Line 1806 of yacc.c  */
 #line 463 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_sizeOfexpr( (yyvsp[(2) - (2)].en) ) ); }
-    break;
-
-  case 54:
+    { (yyval.en) = new ExpressionNode( build_sizeOftype( (yyvsp[(3) - (4)].decl) ) ); }
+    break;
+
+  case 55:
 
 /* Line 1806 of yacc.c  */
 #line 465 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_sizeOftype( (yyvsp[(3) - (4)].decl) ) ); }
-    break;
-
-  case 55:
+    { (yyval.en) = new ExpressionNode( build_alignOfexpr( (yyvsp[(2) - (2)].en) ) ); }
+    break;
+
+  case 56:
 
 /* Line 1806 of yacc.c  */
 #line 467 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_alignOfexpr( (yyvsp[(2) - (2)].en) ) ); }
-    break;
-
-  case 56:
+    { (yyval.en) = new ExpressionNode( build_alignOftype( (yyvsp[(3) - (4)].decl) ) ); }
+    break;
+
+  case 57:
 
 /* Line 1806 of yacc.c  */
 #line 469 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_alignOftype( (yyvsp[(3) - (4)].decl) ) ); }
-    break;
-
-  case 57:
+    { (yyval.en) = new ExpressionNode( build_offsetOf( (yyvsp[(3) - (6)].decl), build_varref( (yyvsp[(5) - (6)].tok) ) ) ); }
+    break;
+
+  case 58:
 
 /* Line 1806 of yacc.c  */
 #line 471 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_offsetOf( (yyvsp[(3) - (6)].decl), build_varref( (yyvsp[(5) - (6)].tok) ) ) ); }
-    break;
-
-  case 58:
+    { (yyval.en) = new ExpressionNode( build_attrexpr( build_varref( (yyvsp[(1) - (1)].tok) ), nullptr ) ); }
+    break;
+
+  case 59:
 
 /* Line 1806 of yacc.c  */
 #line 473 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_attrexpr( build_varref( (yyvsp[(1) - (1)].tok) ), nullptr ) ); }
-    break;
-
-  case 59:
+    { (yyval.en) = new ExpressionNode( build_attrexpr( build_varref( (yyvsp[(1) - (4)].tok) ), (yyvsp[(3) - (4)].en) ) ); }
+    break;
+
+  case 60:
 
 /* Line 1806 of yacc.c  */
 #line 475 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_attrexpr( build_varref( (yyvsp[(1) - (4)].tok) ), (yyvsp[(3) - (4)].en) ) ); }
-    break;
-
-  case 60:
-
-/* Line 1806 of yacc.c  */
-#line 477 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_attrtype( build_varref( (yyvsp[(1) - (4)].tok) ), (yyvsp[(3) - (4)].decl) ) ); }
     break;
@@ -5305 +5291 @@
 
 /* Line 1806 of yacc.c  */
-#line 483 "parser.yy"
+#line 481 "parser.yy"
     { (yyval.op) = OperKinds::PointTo; }
     break;
@@ -5312 +5298 @@
 
 /* Line 1806 of yacc.c  */
-#line 484 "parser.yy"
+#line 482 "parser.yy"
     { (yyval.op) = OperKinds::AddressOf; }
     break;
@@ -5319 +5305 @@
 
 /* Line 1806 of yacc.c  */
+#line 488 "parser.yy"
+    { (yyval.op) = OperKinds::UnPlus; }
+    break;
+
+  case 64:
+
+/* Line 1806 of yacc.c  */
+#line 489 "parser.yy"
+    { (yyval.op) = OperKinds::UnMinus; }
+    break;
+
+  case 65:
+
+/* Line 1806 of yacc.c  */
 #line 490 "parser.yy"
-    { (yyval.op) = OperKinds::UnPlus; }
-    break;
-
-  case 64:
+    { (yyval.op) = OperKinds::Neg; }
+    break;
+
+  case 66:
 
 /* Line 1806 of yacc.c  */
 #line 491 "parser.yy"
-    { (yyval.op) = OperKinds::UnMinus; }
-    break;
-
-  case 65:
-
-/* Line 1806 of yacc.c  */
-#line 492 "parser.yy"
-    { (yyval.op) = OperKinds::Neg; }
-    break;
-
-  case 66:
-
-/* Line 1806 of yacc.c  */
-#line 493 "parser.yy"
     { (yyval.op) = OperKinds::BitNeg; }
     break;
 
   case 68:
+
+/* Line 1806 of yacc.c  */
+#line 497 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_cast( (yyvsp[(2) - (4)].decl), (yyvsp[(4) - (4)].en) ) ); }
+    break;
+
+  case 69:
 
 /* Line 1806 of yacc.c  */
@@ -5351 +5344 @@
     break;
 
-  case 69:
-
-/* Line 1806 of yacc.c  */
-#line 501 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_cast( (yyvsp[(2) - (4)].decl), (yyvsp[(4) - (4)].en) ) ); }
-    break;
-
   case 71:
 
 /* Line 1806 of yacc.c  */
+#line 505 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Mul, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+    break;
+
+  case 72:
+
+/* Line 1806 of yacc.c  */
 #line 507 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Mul, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 72:
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Div, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+    break;
+
+  case 73:
 
 /* Line 1806 of yacc.c  */
 #line 509 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Div, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 73:
-
-/* Line 1806 of yacc.c  */
-#line 511 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Mod, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5382 +5368 @@
 
 /* Line 1806 of yacc.c  */
+#line 515 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Plus, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+    break;
+
+  case 76:
+
+/* Line 1806 of yacc.c  */
 #line 517 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Plus, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 76:
-
-/* Line 1806 of yacc.c  */
-#line 519 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Minus, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5396 +5382 @@
 
 /* Line 1806 of yacc.c  */
+#line 523 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LShift, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+    break;
+
+  case 79:
+
+/* Line 1806 of yacc.c  */
 #line 525 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LShift, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 79:
-
-/* Line 1806 of yacc.c  */
-#line 527 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::RShift, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5410 +5396 @@
 
 /* Line 1806 of yacc.c  */
+#line 531 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+    break;
+
+  case 82:
+
+/* Line 1806 of yacc.c  */
 #line 533 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 82:
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::GThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+    break;
+
+  case 83:
 
 /* Line 1806 of yacc.c  */
 #line 535 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::GThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 83:
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LEThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+    break;
+
+  case 84:
 
 /* Line 1806 of yacc.c  */
 #line 537 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LEThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 84:
-
-/* Line 1806 of yacc.c  */
-#line 539 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::GEThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5438 +5424 @@
 
 /* Line 1806 of yacc.c  */
+#line 543 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Eq, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+    break;
+
+  case 87:
+
+/* Line 1806 of yacc.c  */
 #line 545 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Eq, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 87:
-
-/* Line 1806 of yacc.c  */
-#line 547 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Neq, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5452 +5438 @@
 
 /* Line 1806 of yacc.c  */
-#line 553 "parser.yy"
+#line 551 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::BitAnd, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5459 +5445 @@
 
 /* Line 1806 of yacc.c  */
-#line 559 "parser.yy"
+#line 557 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Xor, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5466 +5452 @@
 
 /* Line 1806 of yacc.c  */
-#line 565 "parser.yy"
+#line 563 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::BitOr, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5473 +5459 @@
 
 /* Line 1806 of yacc.c  */
-#line 571 "parser.yy"
+#line 569 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_and_or( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en), true ) ); }
     break;
@@ -5480 +5466 @@
 
 /* Line 1806 of yacc.c  */
-#line 577 "parser.yy"
+#line 575 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_and_or( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en), false ) ); }
     break;
@@ -5487 +5473 @@
 
 /* Line 1806 of yacc.c  */
-#line 583 "parser.yy"
+#line 581 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[(1) - (5)].en), (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].en) ) ); }
     break;
@@ -5494 +5480 @@
 
 /* Line 1806 of yacc.c  */
+#line 584 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[(1) - (4)].en), (yyvsp[(1) - (4)].en), (yyvsp[(4) - (4)].en) ) ); }
+    break;
+
+  case 101:
+
+/* Line 1806 of yacc.c  */
 #line 586 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[(1) - (4)].en), (yyvsp[(1) - (4)].en), (yyvsp[(4) - (4)].en) ) ); }
-    break;
-
-  case 101:
-
-/* Line 1806 of yacc.c  */
-#line 588 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[(1) - (5)].en), (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].en) ) ); }
     break;
@@ -5508 +5494 @@
 
 /* Line 1806 of yacc.c  */
+#line 597 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_binary_ptr( (yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+    break;
+
+  case 105:
+
+/* Line 1806 of yacc.c  */
 #line 599 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_ptr( (yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 105:
-
-/* Line 1806 of yacc.c  */
-#line 601 "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;
@@ -5522 +5508 @@
 
 /* Line 1806 of yacc.c  */
-#line 606 "parser.yy"
+#line 604 "parser.yy"
     { (yyval.en) = nullptr; }
     break;
@@ -5529 +5515 @@
 
 /* Line 1806 of yacc.c  */
+#line 609 "parser.yy"
+    { (yyval.op) = OperKinds::Assign; }
+    break;
+
+  case 109:
+
+/* Line 1806 of yacc.c  */
+#line 610 "parser.yy"
+    { (yyval.op) = OperKinds::AtAssn; }
+    break;
+
+  case 110:
+
+/* Line 1806 of yacc.c  */
 #line 611 "parser.yy"
-    { (yyval.op) = OperKinds::Assign; }
-    break;
-
-  case 109:
+    { (yyval.op) = OperKinds::MulAssn; }
+    break;
+
+  case 111:
 
 /* Line 1806 of yacc.c  */
 #line 612 "parser.yy"
-    { (yyval.op) = OperKinds::AtAssn; }
-    break;
-
-  case 110:
+    { (yyval.op) = OperKinds::DivAssn; }
+    break;
+
+  case 112:
 
 /* Line 1806 of yacc.c  */
 #line 613 "parser.yy"
-    { (yyval.op) = OperKinds::MulAssn; }
-    break;
-
-  case 111:
+    { (yyval.op) = OperKinds::ModAssn; }
+    break;
+
+  case 113:
 
 /* Line 1806 of yacc.c  */
 #line 614 "parser.yy"
-    { (yyval.op) = OperKinds::DivAssn; }
-    break;
-
-  case 112:
+    { (yyval.op) = OperKinds::PlusAssn; }
+    break;
+
+  case 114:
 
 /* Line 1806 of yacc.c  */
 #line 615 "parser.yy"
-    { (yyval.op) = OperKinds::ModAssn; }
-    break;
-
-  case 113:
+    { (yyval.op) = OperKinds::MinusAssn; }
+    break;
+
+  case 115:
 
 /* Line 1806 of yacc.c  */
 #line 616 "parser.yy"
-    { (yyval.op) = OperKinds::PlusAssn; }
-    break;
-
-  case 114:
+    { (yyval.op) = OperKinds::LSAssn; }
+    break;
+
+  case 116:
 
 /* Line 1806 of yacc.c  */
 #line 617 "parser.yy"
-    { (yyval.op) = OperKinds::MinusAssn; }
-    break;
-
-  case 115:
+    { (yyval.op) = OperKinds::RSAssn; }
+    break;
+
+  case 117:
 
 /* Line 1806 of yacc.c  */
 #line 618 "parser.yy"
-    { (yyval.op) = OperKinds::LSAssn; }
-    break;
-
-  case 116:
+    { (yyval.op) = OperKinds::AndAssn; }
+    break;
+
+  case 118:
 
 /* Line 1806 of yacc.c  */
 #line 619 "parser.yy"
-    { (yyval.op) = OperKinds::RSAssn; }
-    break;
-
-  case 117:
+    { (yyval.op) = OperKinds::ERAssn; }
+    break;
+
+  case 119:
 
 /* Line 1806 of yacc.c  */
 #line 620 "parser.yy"
-    { (yyval.op) = OperKinds::AndAssn; }
-    break;
-
-  case 118:
-
-/* Line 1806 of yacc.c  */
-#line 621 "parser.yy"
-    { (yyval.op) = OperKinds::ERAssn; }
-    break;
-
-  case 119:
-
-/* Line 1806 of yacc.c  */
-#line 622 "parser.yy"
     { (yyval.op) = OperKinds::OrAssn; }
     break;
@@ -5613 +5599 @@
 
 /* Line 1806 of yacc.c  */
+#line 627 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_tuple() ); }
+    break;
+
+  case 121:
+
+/* Line 1806 of yacc.c  */
 #line 629 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_tuple() ); }
-    break;
-
-  case 121:
+    { (yyval.en) = new ExpressionNode( build_tuple( (yyvsp[(3) - (5)].en) ) ); }
+    break;
+
+  case 122:
 
 /* Line 1806 of yacc.c  */
 #line 631 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_tuple( (yyvsp[(3) - (5)].en) ) ); }
-    break;
-
-  case 122:
+    { (yyval.en) = new ExpressionNode( build_tuple( (ExpressionNode *)(new ExpressionNode( nullptr ) )->set_last( (yyvsp[(4) - (6)].en) ) ) ); }
+    break;
+
+  case 123:
 
 /* Line 1806 of yacc.c  */
 #line 633 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_tuple( (ExpressionNode *)(new ExpressionNode( nullptr ) )->set_last( (yyvsp[(4) - (6)].en) ) ) ); }
-    break;
-
-  case 123:
-
-/* Line 1806 of yacc.c  */
-#line 635 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_tuple( (ExpressionNode *)(yyvsp[(3) - (7)].en)->set_last( (yyvsp[(5) - (7)].en) ) ) ); }
     break;
@@ -5641 +5627 @@
 
 /* Line 1806 of yacc.c  */
-#line 641 "parser.yy"
+#line 639 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5648 +5634 @@
 
 /* Line 1806 of yacc.c  */
-#line 647 "parser.yy"
+#line 645 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_comma( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5655 +5641 @@
 
 /* Line 1806 of yacc.c  */
-#line 652 "parser.yy"
+#line 650 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -5662 +5648 @@
 
 /* Line 1806 of yacc.c  */
-#line 661 "parser.yy"
+#line 659 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (1)].sn); }
     break;
@@ -5669 +5655 @@
 
 /* Line 1806 of yacc.c  */
-#line 668 "parser.yy"
+#line 666 "parser.yy"
     {
                         Token fn;
@@ -5680 +5666 @@
 
 /* Line 1806 of yacc.c  */
-#line 678 "parser.yy"
+#line 676 "parser.yy"
     {
                         (yyval.sn) = (yyvsp[(4) - (4)].sn)->add_label( (yyvsp[(1) - (4)].tok) );
@@ -5689 +5675 @@
 
 /* Line 1806 of yacc.c  */
-#line 685 "parser.yy"
+#line 683 "parser.yy"
     { (yyval.sn) = new StatementNode( build_compound( (StatementNode *)0 ) ); }
     break;
@@ -5696 +5682 @@
 
 /* Line 1806 of yacc.c  */
-#line 692 "parser.yy"
+#line 690 "parser.yy"
     { (yyval.sn) = new StatementNode( build_compound( (yyvsp[(5) - (7)].sn) ) ); }
     break;
@@ -5703 +5689 @@
 
 /* Line 1806 of yacc.c  */
-#line 698 "parser.yy"
+#line 696 "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;
@@ -5710 +5696 @@
 
 /* Line 1806 of yacc.c  */
+#line 701 "parser.yy"
+    { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
+    break;
+
+  case 145:
+
+/* Line 1806 of yacc.c  */
 #line 703 "parser.yy"
-    { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
-    break;
-
-  case 145:
-
-/* Line 1806 of yacc.c  */
-#line 705 "parser.yy"
     {   // mark all fields in list
                         for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
@@ -5728 +5714 @@
 
 /* Line 1806 of yacc.c  */
-#line 711 "parser.yy"
+#line 709 "parser.yy"
     { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
     break;
@@ -5735 +5721 @@
 
 /* Line 1806 of yacc.c  */
-#line 718 "parser.yy"
+#line 716 "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;
@@ -5742 +5728 @@
 
 /* Line 1806 of yacc.c  */
-#line 723 "parser.yy"
+#line 721 "parser.yy"
     { (yyval.sn) = new StatementNode( build_expr( (yyvsp[(1) - (2)].en) ) ); }
     break;
@@ -5749 +5735 @@
 
 /* Line 1806 of yacc.c  */
+#line 727 "parser.yy"
+    { (yyval.sn) = new StatementNode( build_if( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn), nullptr ) ); }
+    break;
+
+  case 152:
+
+/* Line 1806 of yacc.c  */
 #line 729 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_if( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn), nullptr ) ); }
-    break;
-
-  case 152:
+    { (yyval.sn) = new StatementNode( build_if( (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].sn), (yyvsp[(7) - (7)].sn) ) ); }
+    break;
+
+  case 153:
 
 /* Line 1806 of yacc.c  */
 #line 731 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_if( (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].sn), (yyvsp[(7) - (7)].sn) ) ); }
-    break;
-
-  case 153:
+    { (yyval.sn) = new StatementNode( build_switch( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ) ); }
+    break;
+
+  case 154:
 
 /* Line 1806 of yacc.c  */
 #line 733 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_switch( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ) ); }
-    break;
-
-  case 154:
-
-/* Line 1806 of yacc.c  */
-#line 735 "parser.yy"
     {
                         StatementNode *sw = new StatementNode( build_switch( (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) ) );
@@ -5785 +5771 @@
 
 /* Line 1806 of yacc.c  */
+#line 743 "parser.yy"
+    { (yyval.sn) = new StatementNode( build_switch( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ) ); }
+    break;
+
+  case 156:
+
+/* Line 1806 of yacc.c  */
 #line 745 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_switch( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ) ); }
-    break;
-
-  case 156:
-
-/* Line 1806 of yacc.c  */
-#line 747 "parser.yy"
     {
                         StatementNode *sw = new StatementNode( build_switch( (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) ) );
@@ -5802 +5788 @@
 
 /* Line 1806 of yacc.c  */
+#line 755 "parser.yy"
+    { (yyval.en) = (yyvsp[(1) - (1)].en); }
+    break;
+
+  case 158:
+
+/* Line 1806 of yacc.c  */
 #line 757 "parser.yy"
-    { (yyval.en) = (yyvsp[(1) - (1)].en); }
-    break;
-
-  case 158:
-
-/* Line 1806 of yacc.c  */
-#line 759 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_range( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5816 +5802 @@
 
 /* Line 1806 of yacc.c  */
+#line 762 "parser.yy"
+    { (yyval.sn) = new StatementNode( build_case( (yyvsp[(1) - (1)].en) ) ); }
+    break;
+
+  case 161:
+
+/* Line 1806 of yacc.c  */
 #line 764 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_case( (yyvsp[(1) - (1)].en) ) ); }
-    break;
-
-  case 161:
-
-/* Line 1806 of yacc.c  */
-#line 766 "parser.yy"
     { (yyval.sn) = (StatementNode *)((yyvsp[(1) - (3)].sn)->set_last( new StatementNode( build_case( (yyvsp[(3) - (3)].en) ) ) ) ); }
     break;
@@ -5830 +5816 @@
 
 /* Line 1806 of yacc.c  */
-#line 770 "parser.yy"
+#line 768 "parser.yy"
     { (yyval.sn) = (yyvsp[(2) - (3)].sn); }
     break;
@@ -5837 +5823 @@
 
 /* Line 1806 of yacc.c  */
-#line 771 "parser.yy"
+#line 769 "parser.yy"
     { (yyval.sn) = new StatementNode( build_default() ); }
     break;
@@ -5844 +5830 @@
 
 /* Line 1806 of yacc.c  */
-#line 777 "parser.yy"
+#line 775 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (2)].sn)->set_last( (yyvsp[(2) - (2)].sn) )); }
     break;
@@ -5851 +5837 @@
 
 /* Line 1806 of yacc.c  */
-#line 781 "parser.yy"
+#line 779 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( new StatementNode( build_compound( (yyvsp[(2) - (2)].sn) ) ) ); }
     break;
@@ -5858 +5844 @@
 
 /* Line 1806 of yacc.c  */
-#line 786 "parser.yy"
+#line 784 "parser.yy"
     { (yyval.sn) = 0; }
     break;
@@ -5865 +5851 @@
 
 /* Line 1806 of yacc.c  */
+#line 790 "parser.yy"
+    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( new StatementNode( build_compound( (yyvsp[(2) - (2)].sn) ) ) ); }
+    break;
+
+  case 170:
+
+/* Line 1806 of yacc.c  */
 #line 792 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( new StatementNode( build_compound( (yyvsp[(2) - (2)].sn) ) ) ); }
-    break;
-
-  case 170:
-
-/* Line 1806 of yacc.c  */
-#line 794 "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;
@@ -5879 +5865 @@
 
 /* Line 1806 of yacc.c  */
-#line 799 "parser.yy"
+#line 797 "parser.yy"
     { (yyval.sn) = 0; }
     break;
@@ -5886 +5872 @@
 
 /* Line 1806 of yacc.c  */
+#line 803 "parser.yy"
+    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
+    break;
+
+  case 174:
+
+/* Line 1806 of yacc.c  */
 #line 805 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
-    break;
-
-  case 174:
+    { (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;
+
+  case 175:
 
 /* Line 1806 of yacc.c  */
 #line 807 "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;
-
-  case 175:
+    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_last( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
+    break;
+
+  case 176:
 
 /* Line 1806 of yacc.c  */
 #line 809 "parser.yy"
-    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_last( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
-    break;
-
-  case 176:
-
-/* Line 1806 of yacc.c  */
-#line 811 "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;
@@ -5914 +5900 @@
 
 /* Line 1806 of yacc.c  */
-#line 816 "parser.yy"
+#line 814 "parser.yy"
     { (yyval.sn) = new StatementNode( build_branch( BranchStmt::Break ) ); }
     break;
 
   case 179:
+
+/* Line 1806 of yacc.c  */
+#line 820 "parser.yy"
+    { (yyval.sn) = 0; }
+    break;
+
+  case 180:
 
 /* Line 1806 of yacc.c  */
@@ -5925 +5918 @@
     break;
 
-  case 180:
-
-/* Line 1806 of yacc.c  */
-#line 824 "parser.yy"
-    { (yyval.sn) = 0; }
-    break;
-
   case 181:
 
 /* Line 1806 of yacc.c  */
+#line 827 "parser.yy"
+    { (yyval.sn) = new StatementNode( build_while( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ) ); }
+    break;
+
+  case 182:
+
+/* Line 1806 of yacc.c  */
 #line 829 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_while( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ) ); }
-    break;
-
-  case 182:
+    { (yyval.sn) = new StatementNode( build_while( (yyvsp[(5) - (7)].en), (yyvsp[(2) - (7)].sn) ) ); }
+    break;
+
+  case 183:
 
 /* Line 1806 of yacc.c  */
 #line 831 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_while( (yyvsp[(5) - (7)].en), (yyvsp[(2) - (7)].sn) ) ); }
-    break;
-
-  case 183:
-
-/* Line 1806 of yacc.c  */
-#line 833 "parser.yy"
     { (yyval.sn) = new StatementNode( build_for( (yyvsp[(4) - (6)].fctl), (yyvsp[(6) - (6)].sn) ) ); }
     break;
@@ -5956 +5942 @@
 
 /* Line 1806 of yacc.c  */
+#line 836 "parser.yy"
+    { (yyval.fctl) = new ForCtl( (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].en) ); }
+    break;
+
+  case 185:
+
+/* Line 1806 of yacc.c  */
 #line 838 "parser.yy"
-    { (yyval.fctl) = new ForCtl( (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].en) ); }
-    break;
-
-  case 185:
-
-/* Line 1806 of yacc.c  */
-#line 840 "parser.yy"
     { (yyval.fctl) = new ForCtl( (yyvsp[(1) - (4)].decl), (yyvsp[(2) - (4)].en), (yyvsp[(4) - (4)].en) ); }
     break;
@@ -5970 +5956 @@
 
 /* Line 1806 of yacc.c  */
-#line 845 "parser.yy"
+#line 843 "parser.yy"
     { (yyval.sn) = new StatementNode( build_branch( (yyvsp[(2) - (3)].tok), BranchStmt::Goto ) ); }
     break;
@@ -5977 +5963 @@
 
 /* Line 1806 of yacc.c  */
-#line 849 "parser.yy"
+#line 847 "parser.yy"
     { (yyval.sn) = new StatementNode( build_computedgoto( (yyvsp[(3) - (4)].en) ) ); }
     break;
@@ -5984 +5970 @@
 
 /* Line 1806 of yacc.c  */
-#line 852 "parser.yy"
+#line 850 "parser.yy"
     { (yyval.sn) = new StatementNode( build_branch( BranchStmt::Continue ) ); }
     break;
@@ -5991 +5977 @@
 
 /* Line 1806 of yacc.c  */
-#line 856 "parser.yy"
+#line 854 "parser.yy"
     { (yyval.sn) = new StatementNode( build_branch( (yyvsp[(2) - (3)].tok), BranchStmt::Continue ) ); }
     break;
@@ -5998 +5984 @@
 
 /* Line 1806 of yacc.c  */
-#line 859 "parser.yy"
+#line 857 "parser.yy"
     { (yyval.sn) = new StatementNode( build_branch( BranchStmt::Break ) ); }
     break;
@@ -6005 +5991 @@
 
 /* Line 1806 of yacc.c  */
+#line 861 "parser.yy"
+    { (yyval.sn) = new StatementNode( build_branch( (yyvsp[(2) - (3)].tok), BranchStmt::Break ) ); }
+    break;
+
+  case 192:
+
+/* Line 1806 of yacc.c  */
 #line 863 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_branch( (yyvsp[(2) - (3)].tok), BranchStmt::Break ) ); }
-    break;
-
-  case 192:
+    { (yyval.sn) = new StatementNode( build_return( (yyvsp[(2) - (3)].en) ) ); }
+    break;
+
+  case 193:
 
 /* Line 1806 of yacc.c  */
 #line 865 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_return( (yyvsp[(2) - (3)].en) ) ); }
-    break;
-
-  case 193:
+    { (yyval.sn) = new StatementNode( build_throw( (yyvsp[(2) - (3)].en) ) ); }
+    break;
+
+  case 194:
 
 /* Line 1806 of yacc.c  */
@@ -6023 +6016 @@
     break;
 
-  case 194:
+  case 195:
 
 /* Line 1806 of yacc.c  */
 #line 869 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_throw( (yyvsp[(2) - (3)].en) ) ); }
-    break;
-
-  case 195:
-
-/* Line 1806 of yacc.c  */
-#line 871 "parser.yy"
     { (yyval.sn) = new StatementNode( build_throw( (yyvsp[(2) - (5)].en) ) ); }
     break;
@@ -6040 +6026 @@
 
 /* Line 1806 of yacc.c  */
+#line 874 "parser.yy"
+    { (yyval.sn) = new StatementNode( build_try( (yyvsp[(2) - (3)].sn), (yyvsp[(3) - (3)].sn), 0 ) ); }
+    break;
+
+  case 197:
+
+/* Line 1806 of yacc.c  */
 #line 876 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_try( (yyvsp[(2) - (3)].sn), (yyvsp[(3) - (3)].sn), 0 ) ); }
-    break;
-
-  case 197:
+    { (yyval.sn) = new StatementNode( build_try( (yyvsp[(2) - (3)].sn), 0, (yyvsp[(3) - (3)].sn) ) ); }
+    break;
+
+  case 198:
 
 /* Line 1806 of yacc.c  */
 #line 878 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_try( (yyvsp[(2) - (3)].sn), 0, (yyvsp[(3) - (3)].sn) ) ); }
-    break;
-
-  case 198:
-
-/* Line 1806 of yacc.c  */
-#line 880 "parser.yy"
     { (yyval.sn) = new StatementNode( build_try( (yyvsp[(2) - (4)].sn), (yyvsp[(3) - (4)].sn), (yyvsp[(4) - (4)].sn) ) ); }
     break;
@@ -6061 +6047 @@
 
 /* Line 1806 of yacc.c  */
+#line 885 "parser.yy"
+    { (yyval.sn) = new StatementNode( build_catch( 0, (yyvsp[(5) - (5)].sn), true ) ); }
+    break;
+
+  case 201:
+
+/* Line 1806 of yacc.c  */
 #line 887 "parser.yy"
+    { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (6)].sn)->set_last( new StatementNode( build_catch( 0, (yyvsp[(6) - (6)].sn), true ) ) ); }
+    break;
+
+  case 202:
+
+/* Line 1806 of yacc.c  */
+#line 889 "parser.yy"
     { (yyval.sn) = new StatementNode( build_catch( 0, (yyvsp[(5) - (5)].sn), true ) ); }
     break;
 
-  case 201:
-
-/* Line 1806 of yacc.c  */
-#line 889 "parser.yy"
+  case 203:
+
+/* Line 1806 of yacc.c  */
+#line 891 "parser.yy"
     { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (6)].sn)->set_last( new StatementNode( build_catch( 0, (yyvsp[(6) - (6)].sn), true ) ) ); }
     break;
 
-  case 202:
-
-/* Line 1806 of yacc.c  */
-#line 891 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_catch( 0, (yyvsp[(5) - (5)].sn), true ) ); }
-    break;
-
-  case 203:
-
-/* Line 1806 of yacc.c  */
-#line 893 "parser.yy"
-    { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (6)].sn)->set_last( new StatementNode( build_catch( 0, (yyvsp[(6) - (6)].sn), true ) ) ); }
-    break;
-
   case 204:
 
 /* Line 1806 of yacc.c  */
+#line 896 "parser.yy"
+    { (yyval.sn) = new StatementNode( build_catch( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ) ); }
+    break;
+
+  case 205:
+
+/* Line 1806 of yacc.c  */
 #line 898 "parser.yy"
+    { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (10)].sn)->set_last( new StatementNode( build_catch( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ) ); }
+    break;
+
+  case 206:
+
+/* Line 1806 of yacc.c  */
+#line 900 "parser.yy"
     { (yyval.sn) = new StatementNode( build_catch( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ) ); }
     break;
 
-  case 205:
-
-/* Line 1806 of yacc.c  */
-#line 900 "parser.yy"
+  case 207:
+
+/* Line 1806 of yacc.c  */
+#line 902 "parser.yy"
     { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (10)].sn)->set_last( new StatementNode( build_catch( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ) ); }
     break;
 
-  case 206:
-
-/* Line 1806 of yacc.c  */
-#line 902 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_catch( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ) ); }
-    break;
-
-  case 207:
-
-/* Line 1806 of yacc.c  */
-#line 904 "parser.yy"
-    { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (10)].sn)->set_last( new StatementNode( build_catch( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ) ); }
-    break;
-
   case 208:
 
 /* Line 1806 of yacc.c  */
-#line 909 "parser.yy"
+#line 907 "parser.yy"
     {
                         (yyval.sn) = new StatementNode( build_finally( (yyvsp[(2) - (2)].sn) ) );
@@ -6126 +6112 @@
 
 /* Line 1806 of yacc.c  */
-#line 922 "parser.yy"
+#line 920 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6136 +6122 @@
 
 /* Line 1806 of yacc.c  */
+#line 925 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 212:
+
+/* Line 1806 of yacc.c  */
 #line 927 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 212:
-
-/* Line 1806 of yacc.c  */
-#line 929 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6153 +6139 @@
 
 /* Line 1806 of yacc.c  */
+#line 936 "parser.yy"
+    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (6)].flag), (yyvsp[(4) - (6)].constant), 0 ) ); }
+    break;
+
+  case 215:
+
+/* Line 1806 of yacc.c  */
 #line 938 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (6)].flag), (yyvsp[(4) - (6)].constant), 0 ) ); }
-    break;
-
-  case 215:
+    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (8)].flag), (yyvsp[(4) - (8)].constant), (yyvsp[(6) - (8)].en) ) ); }
+    break;
+
+  case 216:
 
 /* Line 1806 of yacc.c  */
 #line 940 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (8)].flag), (yyvsp[(4) - (8)].constant), (yyvsp[(6) - (8)].en) ) ); }
-    break;
-
-  case 216:
+    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (10)].flag), (yyvsp[(4) - (10)].constant), (yyvsp[(6) - (10)].en), (yyvsp[(8) - (10)].en) ) ); }
+    break;
+
+  case 217:
 
 /* Line 1806 of yacc.c  */
 #line 942 "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;
-
-  case 217:
+    { (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;
+
+  case 218:
 
 /* Line 1806 of yacc.c  */
 #line 944 "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;
-
-  case 218:
-
-/* Line 1806 of yacc.c  */
-#line 946 "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;
@@ -6188 +6174 @@
 
 /* Line 1806 of yacc.c  */
+#line 949 "parser.yy"
+    { (yyval.flag) = false; }
+    break;
+
+  case 220:
+
+/* Line 1806 of yacc.c  */
 #line 951 "parser.yy"
-    { (yyval.flag) = false; }
-    break;
-
-  case 220:
-
-/* Line 1806 of yacc.c  */
-#line 953 "parser.yy"
     { (yyval.flag) = true; }
     break;
@@ -6202 +6188 @@
 
 /* Line 1806 of yacc.c  */
-#line 958 "parser.yy"
+#line 956 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -6209 +6195 @@
 
 /* Line 1806 of yacc.c  */
-#line 965 "parser.yy"
+#line 963 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) ); }
     break;
@@ -6216 +6202 @@
 
 /* Line 1806 of yacc.c  */
+#line 968 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_asmexpr( 0, (yyvsp[(1) - (4)].constant), (yyvsp[(3) - (4)].en) ) ); }
+    break;
+
+  case 226:
+
+/* Line 1806 of yacc.c  */
 #line 970 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_asmexpr( 0, (yyvsp[(1) - (4)].constant), (yyvsp[(3) - (4)].en) ) ); }
-    break;
-
-  case 226:
-
-/* Line 1806 of yacc.c  */
-#line 972 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_asmexpr( (yyvsp[(2) - (7)].en), (yyvsp[(4) - (7)].constant), (yyvsp[(6) - (7)].en) ) ); }
     break;
@@ -6230 +6216 @@
 
 /* Line 1806 of yacc.c  */
+#line 975 "parser.yy"
+    { (yyval.en) = 0; }
+    break;
+
+  case 228:
+
+/* Line 1806 of yacc.c  */
 #line 977 "parser.yy"
-    { (yyval.en) = 0; }
-    break;
-
-  case 228:
+    { (yyval.en) = new ExpressionNode( (yyvsp[(1) - (1)].constant) ); }
+    break;
+
+  case 229:
 
 /* Line 1806 of yacc.c  */
 #line 979 "parser.yy"
-    { (yyval.en) = new ExpressionNode( (yyvsp[(1) - (1)].constant) ); }
-    break;
-
-  case 229:
-
-/* Line 1806 of yacc.c  */
-#line 981 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_last( new ExpressionNode( (yyvsp[(3) - (3)].constant) ) ); }
     break;
@@ -6251 +6237 @@
 
 /* Line 1806 of yacc.c  */
-#line 986 "parser.yy"
+#line 984 "parser.yy"
     {
                         (yyval.label) = new LabelNode(); (yyval.label)->labels.push_back( *(yyvsp[(1) - (1)].tok) );
@@ -6261 +6247 @@
 
 /* Line 1806 of yacc.c  */
-#line 991 "parser.yy"
+#line 989 "parser.yy"
     {
                         (yyval.label) = (yyvsp[(1) - (3)].label); (yyvsp[(1) - (3)].label)->labels.push_back( *(yyvsp[(3) - (3)].tok) );
@@ -6271 +6257 @@
 
 /* Line 1806 of yacc.c  */
-#line 1001 "parser.yy"
+#line 999 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6278 +6264 @@
 
 /* Line 1806 of yacc.c  */
-#line 1008 "parser.yy"
+#line 1006 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6285 +6271 @@
 
 /* Line 1806 of yacc.c  */
-#line 1013 "parser.yy"
+#line 1011 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6292 +6278 @@
 
 /* Line 1806 of yacc.c  */
-#line 1020 "parser.yy"
+#line 1018 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6299 +6285 @@
 
 /* Line 1806 of yacc.c  */
-#line 1034 "parser.yy"
+#line 1032 "parser.yy"
     {}
     break;
@@ -6306 +6292 @@
 
 /* Line 1806 of yacc.c  */
-#line 1035 "parser.yy"
+#line 1033 "parser.yy"
     {}
     break;
@@ -6313 +6299 @@
 
 /* Line 1806 of yacc.c  */
-#line 1064 "parser.yy"
+#line 1062 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6323 +6309 @@
 
 /* Line 1806 of yacc.c  */
-#line 1071 "parser.yy"
+#line 1069 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6333 +6319 @@
 
 /* Line 1806 of yacc.c  */
-#line 1076 "parser.yy"
+#line 1074 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (6)].tok), TypedefTable::ID );
@@ -6343 +6329 @@
 
 /* Line 1806 of yacc.c  */
-#line 1086 "parser.yy"
+#line 1084 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
@@ -6353 +6339 @@
 
 /* Line 1806 of yacc.c  */
-#line 1091 "parser.yy"
+#line 1089 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
@@ -6363 +6349 @@
 
 /* Line 1806 of yacc.c  */
-#line 1096 "parser.yy"
+#line 1094 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(3) - (4)].tok) );
@@ -6373 +6359 @@
 
 /* Line 1806 of yacc.c  */
-#line 1104 "parser.yy"
+#line 1102 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6383 +6369 @@
 
 /* Line 1806 of yacc.c  */
-#line 1109 "parser.yy"
+#line 1107 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6393 +6379 @@
 
 /* Line 1806 of yacc.c  */
-#line 1114 "parser.yy"
+#line 1112 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6403 +6389 @@
 
 /* Line 1806 of yacc.c  */
-#line 1119 "parser.yy"
+#line 1117 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6413 +6399 @@
 
 /* Line 1806 of yacc.c  */
-#line 1124 "parser.yy"
+#line 1122 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
@@ -6423 +6409 @@
 
 /* Line 1806 of yacc.c  */
-#line 1132 "parser.yy"
+#line 1130 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(3) - (8)].tok), DeclarationNode::newTuple( 0 ), (yyvsp[(6) - (8)].decl), 0, true );
@@ -6432 +6418 @@
 
 /* Line 1806 of yacc.c  */
-#line 1155 "parser.yy"
+#line 1153 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
@@ -6441 +6427 @@
 
 /* Line 1806 of yacc.c  */
-#line 1159 "parser.yy"
+#line 1157 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
@@ -6450 +6436 @@
 
 /* Line 1806 of yacc.c  */
-#line 1166 "parser.yy"
+#line 1164 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -6457 +6443 @@
 
 /* Line 1806 of yacc.c  */
-#line 1170 "parser.yy"
+#line 1168 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (9)].decl)->appendList( (yyvsp[(7) - (9)].decl) ) ); }
     break;
@@ -6464 +6450 @@
 
 /* Line 1806 of yacc.c  */
-#line 1175 "parser.yy"
+#line 1173 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6474 +6460 @@
 
 /* Line 1806 of yacc.c  */
-#line 1180 "parser.yy"
+#line 1178 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6484 +6470 @@
 
 /* Line 1806 of yacc.c  */
-#line 1185 "parser.yy"
+#line 1183 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::TD );
@@ -6494 +6480 @@
 
 /* Line 1806 of yacc.c  */
-#line 1196 "parser.yy"
+#line 1194 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6504 +6490 @@
 
 /* Line 1806 of yacc.c  */
-#line 1201 "parser.yy"
+#line 1199 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6514 +6500 @@
 
 /* Line 1806 of yacc.c  */
-#line 1206 "parser.yy"
+#line 1204 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6524 +6510 @@
 
 /* Line 1806 of yacc.c  */
-#line 1211 "parser.yy"
+#line 1209 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6534 +6520 @@
 
 /* Line 1806 of yacc.c  */
-#line 1216 "parser.yy"
+#line 1214 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6544 +6530 @@
 
 /* Line 1806 of yacc.c  */
-#line 1225 "parser.yy"
+#line 1223 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (4)].tok), TypedefTable::TD );
@@ -6554 +6540 @@
 
 /* Line 1806 of yacc.c  */
-#line 1230 "parser.yy"
+#line 1228 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (7)].tok), TypedefTable::TD );
@@ -6564 +6550 @@
 
 /* Line 1806 of yacc.c  */
-#line 1247 "parser.yy"
+#line 1245 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6574 +6560 @@
 
 /* Line 1806 of yacc.c  */
-#line 1252 "parser.yy"
+#line 1250 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6584 +6570 @@
 
 /* Line 1806 of yacc.c  */
-#line 1274 "parser.yy"
+#line 1272 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6591 +6577 @@
 
 /* Line 1806 of yacc.c  */
-#line 1286 "parser.yy"
+#line 1284 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6598 +6584 @@
 
 /* Line 1806 of yacc.c  */
+#line 1295 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Const ); }
+    break;
+
+  case 300:
+
+/* Line 1806 of yacc.c  */
 #line 1297 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Const ); }
-    break;
-
-  case 300:
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Restrict ); }
+    break;
+
+  case 301:
 
 /* Line 1806 of yacc.c  */
 #line 1299 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Restrict ); }
-    break;
-
-  case 301:
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Volatile ); }
+    break;
+
+  case 302:
 
 /* Line 1806 of yacc.c  */
 #line 1301 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Volatile ); }
-    break;
-
-  case 302:
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Lvalue ); }
+    break;
+
+  case 303:
 
 /* Line 1806 of yacc.c  */
 #line 1303 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Lvalue ); }
-    break;
-
-  case 303:
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Atomic ); }
+    break;
+
+  case 304:
 
 /* Line 1806 of yacc.c  */
 #line 1305 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Atomic ); }
-    break;
-
-  case 304:
-
-/* Line 1806 of yacc.c  */
-#line 1307 "parser.yy"
     {
                         typedefTable.enterScope();
@@ -6642 +6628 @@
 
 /* Line 1806 of yacc.c  */
-#line 1311 "parser.yy"
+#line 1309 "parser.yy"
     {
                         typedefTable.leaveScope();
@@ -6652 +6638 @@
 
 /* Line 1806 of yacc.c  */
+#line 1318 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 308:
+
+/* Line 1806 of yacc.c  */
 #line 1320 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
+    break;
+
+  case 310:
+
+/* Line 1806 of yacc.c  */
+#line 1331 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 308:
-
-/* Line 1806 of yacc.c  */
-#line 1322 "parser.yy"
+  case 311:
+
+/* Line 1806 of yacc.c  */
+#line 1336 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Extern ); }
+    break;
+
+  case 312:
+
+/* Line 1806 of yacc.c  */
+#line 1338 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Static ); }
+    break;
+
+  case 313:
+
+/* Line 1806 of yacc.c  */
+#line 1340 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Auto ); }
+    break;
+
+  case 314:
+
+/* Line 1806 of yacc.c  */
+#line 1342 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Register ); }
+    break;
+
+  case 315:
+
+/* Line 1806 of yacc.c  */
+#line 1345 "parser.yy"
+    { (yyval.decl) = new DeclarationNode; (yyval.decl)->isInline = true; }
+    break;
+
+  case 316:
+
+/* Line 1806 of yacc.c  */
+#line 1347 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Fortran ); }
+    break;
+
+  case 317:
+
+/* Line 1806 of yacc.c  */
+#line 1350 "parser.yy"
+    { (yyval.decl) = new DeclarationNode; (yyval.decl)->isNoreturn = true; }
+    break;
+
+  case 318:
+
+/* Line 1806 of yacc.c  */
+#line 1352 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Threadlocal ); }
+    break;
+
+  case 319:
+
+/* Line 1806 of yacc.c  */
+#line 1357 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Char ); }
+    break;
+
+  case 320:
+
+/* Line 1806 of yacc.c  */
+#line 1359 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Double ); }
+    break;
+
+  case 321:
+
+/* Line 1806 of yacc.c  */
+#line 1361 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Float ); }
+    break;
+
+  case 322:
+
+/* Line 1806 of yacc.c  */
+#line 1363 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Int ); }
+    break;
+
+  case 323:
+
+/* Line 1806 of yacc.c  */
+#line 1365 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Long ); }
+    break;
+
+  case 324:
+
+/* Line 1806 of yacc.c  */
+#line 1367 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Short ); }
+    break;
+
+  case 325:
+
+/* Line 1806 of yacc.c  */
+#line 1369 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Signed ); }
+    break;
+
+  case 326:
+
+/* Line 1806 of yacc.c  */
+#line 1371 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Unsigned ); }
+    break;
+
+  case 327:
+
+/* Line 1806 of yacc.c  */
+#line 1373 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Void ); }
+    break;
+
+  case 328:
+
+/* Line 1806 of yacc.c  */
+#line 1375 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Bool ); }
+    break;
+
+  case 329:
+
+/* Line 1806 of yacc.c  */
+#line 1377 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Complex ); }
+    break;
+
+  case 330:
+
+/* Line 1806 of yacc.c  */
+#line 1379 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Imaginary ); }
+    break;
+
+  case 331:
+
+/* Line 1806 of yacc.c  */
+#line 1381 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
+    break;
+
+  case 333:
+
+/* Line 1806 of yacc.c  */
+#line 1388 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 334:
+
+/* Line 1806 of yacc.c  */
+#line 1390 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 335:
+
+/* Line 1806 of yacc.c  */
+#line 1392 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
 
-  case 310:
-
-/* Line 1806 of yacc.c  */
-#line 1333 "parser.yy"
+  case 336:
+
+/* Line 1806 of yacc.c  */
+#line 1394 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addType( (yyvsp[(1) - (3)].decl) ); }
+    break;
+
+  case 338:
+
+/* Line 1806 of yacc.c  */
+#line 1400 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
+    break;
+
+  case 340:
+
+/* Line 1806 of yacc.c  */
+#line 1407 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 341:
+
+/* Line 1806 of yacc.c  */
+#line 1409 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 311:
-
-/* Line 1806 of yacc.c  */
-#line 1338 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Extern ); }
-    break;
-
-  case 312:
-
-/* Line 1806 of yacc.c  */
-#line 1340 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Static ); }
-    break;
-
-  case 313:
-
-/* Line 1806 of yacc.c  */
-#line 1342 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Auto ); }
-    break;
-
-  case 314:
-
-/* Line 1806 of yacc.c  */
-#line 1344 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Register ); }
-    break;
-
-  case 315:
-
-/* Line 1806 of yacc.c  */
-#line 1347 "parser.yy"
-    { (yyval.decl) = new DeclarationNode; (yyval.decl)->isInline = true; }
-    break;
-
-  case 316:
-
-/* Line 1806 of yacc.c  */
-#line 1349 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Fortran ); }
-    break;
-
-  case 317:
-
-/* Line 1806 of yacc.c  */
-#line 1352 "parser.yy"
-    { (yyval.decl) = new DeclarationNode; (yyval.decl)->isNoreturn = true; }
-    break;
-
-  case 318:
-
-/* Line 1806 of yacc.c  */
-#line 1354 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Threadlocal ); }
-    break;
-
-  case 319:
-
-/* Line 1806 of yacc.c  */
-#line 1359 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Char ); }
-    break;
-
-  case 320:
-
-/* Line 1806 of yacc.c  */
-#line 1361 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Double ); }
-    break;
-
-  case 321:
-
-/* Line 1806 of yacc.c  */
-#line 1363 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Float ); }
-    break;
-
-  case 322:
-
-/* Line 1806 of yacc.c  */
-#line 1365 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Int ); }
-    break;
-
-  case 323:
-
-/* Line 1806 of yacc.c  */
-#line 1367 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Long ); }
-    break;
-
-  case 324:
-
-/* Line 1806 of yacc.c  */
-#line 1369 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Short ); }
-    break;
-
-  case 325:
-
-/* Line 1806 of yacc.c  */
-#line 1371 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Signed ); }
-    break;
-
-  case 326:
-
-/* Line 1806 of yacc.c  */
-#line 1373 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Unsigned ); }
-    break;
-
-  case 327:
-
-/* Line 1806 of yacc.c  */
-#line 1375 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Void ); }
-    break;
-
-  case 328:
-
-/* Line 1806 of yacc.c  */
-#line 1377 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Bool ); }
-    break;
-
-  case 329:
-
-/* Line 1806 of yacc.c  */
-#line 1379 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Complex ); }
-    break;
-
-  case 330:
-
-/* Line 1806 of yacc.c  */
-#line 1381 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Imaginary ); }
-    break;
-
-  case 331:
-
-/* Line 1806 of yacc.c  */
-#line 1383 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
-    break;
-
-  case 333:
-
-/* Line 1806 of yacc.c  */
-#line 1390 "parser.yy"
+  case 342:
+
+/* Line 1806 of yacc.c  */
+#line 1411 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addType( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 343:
+
+/* Line 1806 of yacc.c  */
+#line 1416 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (4)].decl); }
+    break;
+
+  case 344:
+
+/* Line 1806 of yacc.c  */
+#line 1418 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newTypeof( (yyvsp[(3) - (4)].en) ); }
+    break;
+
+  case 345:
+
+/* Line 1806 of yacc.c  */
+#line 1420 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].decl) ); }
+    break;
+
+  case 346:
+
+/* Line 1806 of yacc.c  */
+#line 1422 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
+    break;
+
+  case 348:
+
+/* Line 1806 of yacc.c  */
+#line 1428 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 334:
-
-/* Line 1806 of yacc.c  */
-#line 1392 "parser.yy"
+  case 349:
+
+/* Line 1806 of yacc.c  */
+#line 1430 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 335:
-
-/* Line 1806 of yacc.c  */
-#line 1394 "parser.yy"
+  case 350:
+
+/* Line 1806 of yacc.c  */
+#line 1432 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
 
-  case 336:
-
-/* Line 1806 of yacc.c  */
-#line 1396 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addType( (yyvsp[(1) - (3)].decl) ); }
-    break;
-
-  case 338:
-
-/* Line 1806 of yacc.c  */
-#line 1402 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 340:
-
-/* Line 1806 of yacc.c  */
-#line 1409 "parser.yy"
+  case 352:
+
+/* Line 1806 of yacc.c  */
+#line 1438 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 341:
-
-/* Line 1806 of yacc.c  */
-#line 1411 "parser.yy"
+  case 353:
+
+/* Line 1806 of yacc.c  */
+#line 1440 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 342:
-
-/* Line 1806 of yacc.c  */
-#line 1413 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addType( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 343:
-
-/* Line 1806 of yacc.c  */
-#line 1418 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (4)].decl); }
-    break;
-
-  case 344:
-
-/* Line 1806 of yacc.c  */
-#line 1420 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newTypeof( (yyvsp[(3) - (4)].en) ); }
-    break;
-
-  case 345:
-
-/* Line 1806 of yacc.c  */
-#line 1422 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].decl) ); }
-    break;
-
-  case 346:
-
-/* Line 1806 of yacc.c  */
-#line 1424 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
-    break;
-
-  case 348:
-
-/* Line 1806 of yacc.c  */
-#line 1430 "parser.yy"
+  case 355:
+
+/* Line 1806 of yacc.c  */
+#line 1446 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 349:
-
-/* Line 1806 of yacc.c  */
-#line 1432 "parser.yy"
+  case 356:
+
+/* Line 1806 of yacc.c  */
+#line 1448 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 350:
-
-/* Line 1806 of yacc.c  */
-#line 1434 "parser.yy"
+  case 357:
+
+/* Line 1806 of yacc.c  */
+#line 1450 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
 
-  case 352:
-
-/* Line 1806 of yacc.c  */
-#line 1440 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 353:
-
-/* Line 1806 of yacc.c  */
-#line 1442 "parser.yy"
+  case 358:
+
+/* Line 1806 of yacc.c  */
+#line 1455 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(1) - (1)].tok) ); }
+    break;
+
+  case 359:
+
+/* Line 1806 of yacc.c  */
+#line 1457 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(2) - (2)].tok) )->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 360:
+
+/* Line 1806 of yacc.c  */
+#line 1459 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 355:
-
-/* Line 1806 of yacc.c  */
-#line 1448 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 356:
-
-/* Line 1806 of yacc.c  */
-#line 1450 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 357:
-
-/* Line 1806 of yacc.c  */
-#line 1452 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 358:
-
-/* Line 1806 of yacc.c  */
-#line 1457 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(1) - (1)].tok) ); }
-    break;
-
-  case 359:
-
-/* Line 1806 of yacc.c  */
-#line 1459 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(2) - (2)].tok) )->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 360:
-
-/* Line 1806 of yacc.c  */
-#line 1461 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 363:
 
 /* Line 1806 of yacc.c  */
+#line 1469 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (4)].aggKey), 0, 0, (yyvsp[(3) - (4)].decl), true ); }
+    break;
+
+  case 364:
+
+/* Line 1806 of yacc.c  */
 #line 1471 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (4)].aggKey), 0, 0, (yyvsp[(3) - (4)].decl), true ); }
-    break;
-
-  case 364:
-
-/* Line 1806 of yacc.c  */
-#line 1473 "parser.yy"
     {
                         typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
@@ -6998 +6984 @@
 
 /* Line 1806 of yacc.c  */
+#line 1476 "parser.yy"
+    { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
+    break;
+
+  case 366:
+
+/* Line 1806 of yacc.c  */
 #line 1478 "parser.yy"
-    { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
-    break;
-
-  case 366:
+    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (6)].aggKey), (yyvsp[(2) - (6)].tok), 0, (yyvsp[(5) - (6)].decl), true ); }
+    break;
+
+  case 367:
 
 /* Line 1806 of yacc.c  */
 #line 1480 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (6)].aggKey), (yyvsp[(2) - (6)].tok), 0, (yyvsp[(5) - (6)].decl), true ); }
-    break;
-
-  case 367:
+    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (7)].aggKey), 0, (yyvsp[(3) - (7)].en), (yyvsp[(6) - (7)].decl), false ); }
+    break;
+
+  case 368:
 
 /* Line 1806 of yacc.c  */
 #line 1482 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (7)].aggKey), 0, (yyvsp[(3) - (7)].en), (yyvsp[(6) - (7)].decl), false ); }
-    break;
-
-  case 368:
-
-/* Line 1806 of yacc.c  */
-#line 1484 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
     break;
@@ -7026 +7012 @@
 
 /* Line 1806 of yacc.c  */
+#line 1487 "parser.yy"
+    { (yyval.aggKey) = DeclarationNode::Struct; }
+    break;
+
+  case 370:
+
+/* Line 1806 of yacc.c  */
 #line 1489 "parser.yy"
-    { (yyval.aggKey) = DeclarationNode::Struct; }
-    break;
-
-  case 370:
-
-/* Line 1806 of yacc.c  */
-#line 1491 "parser.yy"
     { (yyval.aggKey) = DeclarationNode::Union; }
     break;
@@ -7040 +7026 @@
 
 /* Line 1806 of yacc.c  */
+#line 1494 "parser.yy"
+    { (yyval.decl) = 0; }
+    break;
+
+  case 372:
+
+/* Line 1806 of yacc.c  */
 #line 1496 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
-  case 372:
-
-/* Line 1806 of yacc.c  */
-#line 1498 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl) != 0 ? (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ) : (yyvsp[(2) - (2)].decl); }
     break;
@@ -7054 +7040 @@
 
 /* Line 1806 of yacc.c  */
-#line 1504 "parser.yy"
+#line 1502 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl)->set_extension( true ); }
     break;
@@ -7061 +7047 @@
 
 /* Line 1806 of yacc.c  */
-#line 1507 "parser.yy"
+#line 1505 "parser.yy"
     {   // mark all fields in list
                         for ( DeclarationNode *iter = (yyvsp[(2) - (3)].decl); iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
@@ -7072 +7058 @@
 
 /* Line 1806 of yacc.c  */
+#line 1515 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addName( (yyvsp[(2) - (2)].tok) ); }
+    break;
+
+  case 379:
+
+/* Line 1806 of yacc.c  */
 #line 1517 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addName( (yyvsp[(2) - (2)].tok) ); }
-    break;
-
-  case 379:
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(1) - (3)].decl)->cloneType( (yyvsp[(3) - (3)].tok) ) ); }
+    break;
+
+  case 380:
 
 /* Line 1806 of yacc.c  */
 #line 1519 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(1) - (3)].decl)->cloneType( (yyvsp[(3) - (3)].tok) ) ); }
-    break;
-
-  case 380:
-
-/* Line 1806 of yacc.c  */
-#line 1521 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(1) - (2)].decl)->cloneType( 0 ) ); }
     break;
@@ -7093 +7079 @@
 
 /* Line 1806 of yacc.c  */
+#line 1524 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 382:
+
+/* Line 1806 of yacc.c  */
 #line 1526 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 382:
-
-/* Line 1806 of yacc.c  */
-#line 1528 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(1) - (4)].decl)->cloneBaseType( (yyvsp[(4) - (4)].decl) ) ); }
     break;
@@ -7107 +7093 @@
 
 /* Line 1806 of yacc.c  */
+#line 1531 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newName( 0 ); /* XXX */ }
+    break;
+
+  case 384:
+
+/* Line 1806 of yacc.c  */
 #line 1533 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newName( 0 ); /* XXX */ }
-    break;
-
-  case 384:
-
-/* Line 1806 of yacc.c  */
-#line 1535 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBitfield( (yyvsp[(1) - (1)].en) ); }
     break;
@@ -7121 +7107 @@
 
 /* Line 1806 of yacc.c  */
-#line 1538 "parser.yy"
+#line 1536 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
     break;
@@ -7128 +7114 @@
 
 /* Line 1806 of yacc.c  */
-#line 1541 "parser.yy"
+#line 1539 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
     break;
@@ -7135 +7121 @@
 
 /* Line 1806 of yacc.c  */
+#line 1545 "parser.yy"
+    { (yyval.en) = 0; }
+    break;
+
+  case 389:
+
+/* Line 1806 of yacc.c  */
 #line 1547 "parser.yy"
-    { (yyval.en) = 0; }
-    break;
-
-  case 389:
-
-/* Line 1806 of yacc.c  */
-#line 1549 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
@@ -7149 +7135 @@
 
 /* Line 1806 of yacc.c  */
-#line 1554 "parser.yy"
+#line 1552 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -7156 +7142 @@
 
 /* Line 1806 of yacc.c  */
+#line 1561 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newEnum( 0, (yyvsp[(3) - (5)].decl) ); }
+    break;
+
+  case 393:
+
+/* Line 1806 of yacc.c  */
 #line 1563 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newEnum( 0, (yyvsp[(3) - (5)].decl) ); }
-    break;
-
-  case 393:
-
-/* Line 1806 of yacc.c  */
-#line 1565 "parser.yy"
     {
                         typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
@@ -7173 +7159 @@
 
 /* Line 1806 of yacc.c  */
+#line 1568 "parser.yy"
+    { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
+    break;
+
+  case 395:
+
+/* Line 1806 of yacc.c  */
 #line 1570 "parser.yy"
-    { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
-    break;
-
-  case 395:
-
-/* Line 1806 of yacc.c  */
-#line 1572 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( (yyvsp[(2) - (7)].tok), (yyvsp[(5) - (7)].decl) ); }
     break;
@@ -7187 +7173 @@
 
 /* Line 1806 of yacc.c  */
+#line 1575 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newEnumConstant( (yyvsp[(1) - (2)].tok), (yyvsp[(2) - (2)].en) ); }
+    break;
+
+  case 397:
+
+/* Line 1806 of yacc.c  */
 #line 1577 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newEnumConstant( (yyvsp[(1) - (2)].tok), (yyvsp[(2) - (2)].en) ); }
-    break;
-
-  case 397:
-
-/* Line 1806 of yacc.c  */
-#line 1579 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( DeclarationNode::newEnumConstant( (yyvsp[(3) - (4)].tok), (yyvsp[(4) - (4)].en) ) ); }
     break;
@@ -7201 +7187 @@
 
 /* Line 1806 of yacc.c  */
+#line 1582 "parser.yy"
+    { (yyval.en) = 0; }
+    break;
+
+  case 399:
+
+/* Line 1806 of yacc.c  */
 #line 1584 "parser.yy"
-    { (yyval.en) = 0; }
-    break;
-
-  case 399:
-
-/* Line 1806 of yacc.c  */
-#line 1586 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -7215 +7201 @@
 
 /* Line 1806 of yacc.c  */
-#line 1593 "parser.yy"
+#line 1591 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7222 +7208 @@
 
 /* Line 1806 of yacc.c  */
+#line 1599 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
+    break;
+
+  case 405:
+
+/* Line 1806 of yacc.c  */
 #line 1601 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
-    break;
-
-  case 405:
+    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
+    break;
+
+  case 406:
 
 /* Line 1806 of yacc.c  */
@@ -7233 +7226 @@
     break;
 
-  case 406:
-
-/* Line 1806 of yacc.c  */
-#line 1605 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
-    break;
-
   case 408:
+
+/* Line 1806 of yacc.c  */
+#line 1611 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
+    break;
+
+  case 409:
 
 /* Line 1806 of yacc.c  */
@@ -7247 +7240 @@
     break;
 
-  case 409:
+  case 410:
 
 /* Line 1806 of yacc.c  */
 #line 1615 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (9)].decl)->appendList( (yyvsp[(5) - (9)].decl) )->appendList( (yyvsp[(9) - (9)].decl) ); }
+    break;
+
+  case 412:
+
+/* Line 1806 of yacc.c  */
+#line 1621 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
 
-  case 410:
-
-/* Line 1806 of yacc.c  */
-#line 1617 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (9)].decl)->appendList( (yyvsp[(5) - (9)].decl) )->appendList( (yyvsp[(9) - (9)].decl) ); }
-    break;
-
-  case 412:
-
-/* Line 1806 of yacc.c  */
-#line 1623 "parser.yy"
+  case 413:
+
+/* Line 1806 of yacc.c  */
+#line 1626 "parser.yy"
+    { (yyval.decl) = 0; }
+    break;
+
+  case 416:
+
+/* Line 1806 of yacc.c  */
+#line 1633 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
+    break;
+
+  case 419:
+
+/* Line 1806 of yacc.c  */
+#line 1640 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
 
-  case 413:
-
-/* Line 1806 of yacc.c  */
-#line 1628 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
-  case 416:
-
-/* Line 1806 of yacc.c  */
-#line 1635 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
-    break;
-
-  case 419:
+  case 420:
 
 /* Line 1806 of yacc.c  */
@@ -7289 +7282 @@
     break;
 
-  case 420:
-
-/* Line 1806 of yacc.c  */
-#line 1644 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
-    break;
-
   case 422:
 
 /* Line 1806 of yacc.c  */
-#line 1653 "parser.yy"
+#line 1651 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -7306 +7292 @@
 
 /* Line 1806 of yacc.c  */
+#line 1654 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
+    break;
+
+  case 424:
+
+/* Line 1806 of yacc.c  */
 #line 1656 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
-    break;
-
-  case 424:
-
-/* Line 1806 of yacc.c  */
-#line 1658 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addName( (yyvsp[(3) - (4)].tok) )->addQualifiers( (yyvsp[(1) - (4)].decl) ); }
     break;
@@ -7320 +7306 @@
 
 /* Line 1806 of yacc.c  */
-#line 1668 "parser.yy"
+#line 1666 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7327 +7313 @@
 
 /* Line 1806 of yacc.c  */
-#line 1674 "parser.yy"
+#line 1672 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7337 +7323 @@
 
 /* Line 1806 of yacc.c  */
-#line 1679 "parser.yy"
+#line 1677 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7347 +7333 @@
 
 /* Line 1806 of yacc.c  */
-#line 1688 "parser.yy"
+#line 1686 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7354 +7340 @@
 
 /* Line 1806 of yacc.c  */
+#line 1695 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newName( (yyvsp[(1) - (1)].tok) ); }
+    break;
+
+  case 436:
+
+/* Line 1806 of yacc.c  */
 #line 1697 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newName( (yyvsp[(1) - (1)].tok) ); }
-    break;
-
-  case 436:
-
-/* Line 1806 of yacc.c  */
-#line 1699 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( DeclarationNode::newName( (yyvsp[(3) - (3)].tok) ) ); }
     break;
@@ -7368 +7354 @@
 
 /* Line 1806 of yacc.c  */
-#line 1724 "parser.yy"
+#line 1722 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7375 +7361 @@
 
 /* Line 1806 of yacc.c  */
-#line 1732 "parser.yy"
+#line 1730 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7382 +7368 @@
 
 /* Line 1806 of yacc.c  */
+#line 1735 "parser.yy"
+    { (yyval.in) = 0; }
+    break;
+
+  case 454:
+
+/* Line 1806 of yacc.c  */
 #line 1737 "parser.yy"
+    { (yyval.in) = (yyvsp[(2) - (2)].in); }
+    break;
+
+  case 455:
+
+/* Line 1806 of yacc.c  */
+#line 1739 "parser.yy"
+    { (yyval.in) = (yyvsp[(2) - (2)].in)->set_maybeConstructed( false ); }
+    break;
+
+  case 456:
+
+/* Line 1806 of yacc.c  */
+#line 1743 "parser.yy"
+    { (yyval.in) = new InitializerNode( (yyvsp[(1) - (1)].en) ); }
+    break;
+
+  case 457:
+
+/* Line 1806 of yacc.c  */
+#line 1744 "parser.yy"
+    { (yyval.in) = new InitializerNode( (yyvsp[(2) - (4)].in), true ); }
+    break;
+
+  case 458:
+
+/* Line 1806 of yacc.c  */
+#line 1749 "parser.yy"
     { (yyval.in) = 0; }
     break;
 
-  case 454:
-
-/* Line 1806 of yacc.c  */
-#line 1739 "parser.yy"
-    { (yyval.in) = (yyvsp[(2) - (2)].in); }
-    break;
-
-  case 455:
-
-/* Line 1806 of yacc.c  */
-#line 1741 "parser.yy"
-    { (yyval.in) = (yyvsp[(2) - (2)].in)->set_maybeConstructed( false ); }
-    break;
-
-  case 456:
-
-/* Line 1806 of yacc.c  */
-#line 1745 "parser.yy"
-    { (yyval.in) = new InitializerNode( (yyvsp[(1) - (1)].en) ); }
-    break;
-
-  case 457:
-
-/* Line 1806 of yacc.c  */
-#line 1746 "parser.yy"
-    { (yyval.in) = new InitializerNode( (yyvsp[(2) - (4)].in), true ); }
-    break;
-
-  case 458:
+  case 460:
 
 /* Line 1806 of yacc.c  */
 #line 1751 "parser.yy"
-    { (yyval.in) = 0; }
-    break;
-
-  case 460:
-
-/* Line 1806 of yacc.c  */
-#line 1753 "parser.yy"
     { (yyval.in) = (yyvsp[(2) - (2)].in)->set_designators( (yyvsp[(1) - (2)].en) ); }
     break;
@@ -7431 +7417 @@
 
 /* Line 1806 of yacc.c  */
+#line 1752 "parser.yy"
+    { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (3)].in)->set_last( (yyvsp[(3) - (3)].in) ) ); }
+    break;
+
+  case 462:
+
+/* Line 1806 of yacc.c  */
 #line 1754 "parser.yy"
-    { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (3)].in)->set_last( (yyvsp[(3) - (3)].in) ) ); }
-    break;
-
-  case 462:
-
-/* Line 1806 of yacc.c  */
-#line 1756 "parser.yy"
     { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (4)].in)->set_last( (yyvsp[(4) - (4)].in)->set_designators( (yyvsp[(3) - (4)].en) ) ) ); }
     break;
@@ -7445 +7431 @@
 
 /* Line 1806 of yacc.c  */
-#line 1772 "parser.yy"
+#line 1770 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[(1) - (2)].tok) ) ); }
     break;
@@ -7452 +7438 @@
 
 /* Line 1806 of yacc.c  */
-#line 1778 "parser.yy"
+#line 1776 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (2)].en)->set_last( (yyvsp[(2) - (2)].en) ) ); }
     break;
@@ -7459 +7445 @@
 
 /* Line 1806 of yacc.c  */
-#line 1784 "parser.yy"
+#line 1782 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[(2) - (2)].tok) ) ); }
     break;
 
   case 468:
+
+/* Line 1806 of yacc.c  */
+#line 1785 "parser.yy"
+    { (yyval.en) = (yyvsp[(3) - (5)].en); }
+    break;
+
+  case 469:
 
 /* Line 1806 of yacc.c  */
@@ -7470 +7463 @@
     break;
 
-  case 469:
+  case 470:
 
 /* Line 1806 of yacc.c  */
 #line 1789 "parser.yy"
-    { (yyval.en) = (yyvsp[(3) - (5)].en); }
-    break;
-
-  case 470:
+    { (yyval.en) = new ExpressionNode( build_range( (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].en) ) ); }
+    break;
+
+  case 471:
 
 /* Line 1806 of yacc.c  */
 #line 1791 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_range( (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].en) ) ); }
-    break;
-
-  case 471:
-
-/* Line 1806 of yacc.c  */
-#line 1793 "parser.yy"
     { (yyval.en) = (yyvsp[(4) - (6)].en); }
     break;
@@ -7494 +7480 @@
 
 /* Line 1806 of yacc.c  */
+#line 1815 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 474:
+
+/* Line 1806 of yacc.c  */
 #line 1817 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 475:
+
+/* Line 1806 of yacc.c  */
+#line 1819 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
+    break;
+
+  case 477:
+
+/* Line 1806 of yacc.c  */
+#line 1825 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 474:
-
-/* Line 1806 of yacc.c  */
-#line 1819 "parser.yy"
+  case 478:
+
+/* Line 1806 of yacc.c  */
+#line 1827 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 475:
-
-/* Line 1806 of yacc.c  */
-#line 1821 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 477:
-
-/* Line 1806 of yacc.c  */
-#line 1827 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 478:
-
-/* Line 1806 of yacc.c  */
-#line 1829 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 479:
 
 /* Line 1806 of yacc.c  */
-#line 1834 "parser.yy"
+#line 1832 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypeGen( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -7536 +7522 @@
 
 /* Line 1806 of yacc.c  */
-#line 1840 "parser.yy"
+#line 1838 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -7543 +7529 @@
 
 /* Line 1806 of yacc.c  */
+#line 1843 "parser.yy"
+    { typedefTable.addToEnclosingScope( *(yyvsp[(2) - (2)].tok), TypedefTable::TD ); }
+    break;
+
+  case 483:
+
+/* Line 1806 of yacc.c  */
 #line 1845 "parser.yy"
-    { typedefTable.addToEnclosingScope( *(yyvsp[(2) - (2)].tok), TypedefTable::TD ); }
-    break;
-
-  case 483:
-
-/* Line 1806 of yacc.c  */
-#line 1847 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTypeParam( (yyvsp[(1) - (4)].tclass), (yyvsp[(2) - (4)].tok) )->addAssertions( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -7557 +7543 @@
 
 /* Line 1806 of yacc.c  */
+#line 1851 "parser.yy"
+    { (yyval.tclass) = DeclarationNode::Type; }
+    break;
+
+  case 486:
+
+/* Line 1806 of yacc.c  */
 #line 1853 "parser.yy"
-    { (yyval.tclass) = DeclarationNode::Type; }
-    break;
-
-  case 486:
+    { (yyval.tclass) = DeclarationNode::Ftype; }
+    break;
+
+  case 487:
 
 /* Line 1806 of yacc.c  */
 #line 1855 "parser.yy"
-    { (yyval.tclass) = DeclarationNode::Ftype; }
-    break;
-
-  case 487:
-
-/* Line 1806 of yacc.c  */
-#line 1857 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Dtype; }
     break;
@@ -7578 +7564 @@
 
 /* Line 1806 of yacc.c  */
+#line 1860 "parser.yy"
+    { (yyval.decl) = 0; }
+    break;
+
+  case 489:
+
+/* Line 1806 of yacc.c  */
 #line 1862 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
-  case 489:
-
-/* Line 1806 of yacc.c  */
-#line 1864 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl) != 0 ? (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ) : (yyvsp[(2) - (2)].decl); }
     break;
@@ -7592 +7578 @@
 
 /* Line 1806 of yacc.c  */
-#line 1869 "parser.yy"
+#line 1867 "parser.yy"
     {
                         typedefTable.openTrait( *(yyvsp[(2) - (5)].tok) );
@@ -7602 +7588 @@
 
 /* Line 1806 of yacc.c  */
+#line 1872 "parser.yy"
+    { (yyval.decl) = (yyvsp[(4) - (5)].decl); }
+    break;
+
+  case 492:
+
+/* Line 1806 of yacc.c  */
 #line 1874 "parser.yy"
-    { (yyval.decl) = (yyvsp[(4) - (5)].decl); }
-    break;
-
-  case 492:
-
-/* Line 1806 of yacc.c  */
-#line 1876 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7616 +7602 @@
 
 /* Line 1806 of yacc.c  */
-#line 1881 "parser.yy"
+#line 1879 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_typevalue( (yyvsp[(1) - (1)].decl) ) ); }
     break;
@@ -7623 +7609 @@
 
 /* Line 1806 of yacc.c  */
+#line 1882 "parser.yy"
+    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_last( new ExpressionNode( build_typevalue( (yyvsp[(3) - (3)].decl) ) ) ) ); }
+    break;
+
+  case 496:
+
+/* Line 1806 of yacc.c  */
 #line 1884 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_last( new ExpressionNode( build_typevalue( (yyvsp[(3) - (3)].decl) ) ) ) ); }
-    break;
-
-  case 496:
-
-/* Line 1806 of yacc.c  */
-#line 1886 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) )); }
     break;
@@ -7637 +7623 @@
 
 /* Line 1806 of yacc.c  */
+#line 1889 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
+    break;
+
+  case 498:
+
+/* Line 1806 of yacc.c  */
 #line 1891 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
-    break;
-
-  case 498:
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) ); }
+    break;
+
+  case 499:
 
 /* Line 1806 of yacc.c  */
 #line 1893 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) ); }
-    break;
-
-  case 499:
-
-/* Line 1806 of yacc.c  */
-#line 1895 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl)->copyStorageClasses( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -7658 +7644 @@
 
 /* Line 1806 of yacc.c  */
+#line 1898 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addAssertions( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 501:
+
+/* Line 1806 of yacc.c  */
 #line 1900 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addAssertions( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 501:
-
-/* Line 1806 of yacc.c  */
-#line 1902 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addAssertions( (yyvsp[(2) - (4)].decl) )->addType( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -7672 +7658 @@
 
 /* Line 1806 of yacc.c  */
-#line 1907 "parser.yy"
+#line 1905 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (1)].tok), TypedefTable::TD );
@@ -7682 +7668 @@
 
 /* Line 1806 of yacc.c  */
-#line 1912 "parser.yy"
+#line 1910 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (6)].tok), TypedefTable::TG );
@@ -7692 +7678 @@
 
 /* Line 1806 of yacc.c  */
-#line 1920 "parser.yy"
+#line 1918 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (9)].tok), TypedefTable::ID );
@@ -7702 +7688 @@
 
 /* Line 1806 of yacc.c  */
-#line 1925 "parser.yy"
+#line 1923 "parser.yy"
     {
                         typedefTable.enterTrait( *(yyvsp[(2) - (8)].tok) );
@@ -7712 +7698 @@
 
 /* Line 1806 of yacc.c  */
-#line 1930 "parser.yy"
+#line 1928 "parser.yy"
     {
                         typedefTable.leaveTrait();
@@ -7723 +7709 @@
 
 /* Line 1806 of yacc.c  */
-#line 1940 "parser.yy"
+#line 1938 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7730 +7716 @@
 
 /* Line 1806 of yacc.c  */
-#line 1950 "parser.yy"
+#line 1948 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7740 +7726 @@
 
 /* Line 1806 of yacc.c  */
-#line 1955 "parser.yy"
+#line 1953 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7750 +7736 @@
 
 /* Line 1806 of yacc.c  */
-#line 1960 "parser.yy"
+#line 1958 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
@@ -7760 +7746 @@
 
 /* Line 1806 of yacc.c  */
-#line 1968 "parser.yy"
+#line 1966 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7770 +7756 @@
 
 /* Line 1806 of yacc.c  */
-#line 1973 "parser.yy"
+#line 1971 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7780 +7766 @@
 
 /* Line 1806 of yacc.c  */
+#line 1981 "parser.yy"
+    {}
+    break;
+
+  case 517:
+
+/* Line 1806 of yacc.c  */
 #line 1983 "parser.yy"
+    { parseTree = parseTree != nullptr ? parseTree->appendList( (yyvsp[(1) - (1)].decl) ) : (yyvsp[(1) - (1)].decl);    }
+    break;
+
+  case 519:
+
+/* Line 1806 of yacc.c  */
+#line 1989 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl) != nullptr ? (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ) : (yyvsp[(3) - (3)].decl); }
+    break;
+
+  case 520:
+
+/* Line 1806 of yacc.c  */
+#line 1994 "parser.yy"
+    { (yyval.decl) = 0; }
+    break;
+
+  case 524:
+
+/* Line 1806 of yacc.c  */
+#line 2002 "parser.yy"
     {}
     break;
 
-  case 517:
-
-/* Line 1806 of yacc.c  */
-#line 1985 "parser.yy"
-    { parseTree = parseTree != nullptr ? parseTree->appendList( (yyvsp[(1) - (1)].decl) ) : (yyvsp[(1) - (1)].decl);    }
-    break;
-
-  case 519:
-
-/* Line 1806 of yacc.c  */
-#line 1991 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl) != nullptr ? (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ) : (yyvsp[(3) - (3)].decl); }
-    break;
-
-  case 520:
-
-/* Line 1806 of yacc.c  */
-#line 1996 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
-  case 524:
+  case 525:
 
 /* Line 1806 of yacc.c  */
 #line 2004 "parser.yy"
-    {}
-    break;
-
-  case 525:
-
-/* Line 1806 of yacc.c  */
-#line 2006 "parser.yy"
     {
                         linkageStack.push( linkage );                           // handle nested extern "C"/"Cforall"
@@ -7825 +7811 @@
 
 /* Line 1806 of yacc.c  */
-#line 2011 "parser.yy"
+#line 2009 "parser.yy"
     {
                         linkage = linkageStack.top();
@@ -7836 +7822 @@
 
 /* Line 1806 of yacc.c  */
-#line 2017 "parser.yy"
+#line 2015 "parser.yy"
     {   // mark all fields in list
                         for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
@@ -7847 +7833 @@
 
 /* Line 1806 of yacc.c  */
-#line 2032 "parser.yy"
+#line 2030 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7858 +7844 @@
 
 /* Line 1806 of yacc.c  */
-#line 2038 "parser.yy"
+#line 2036 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7869 +7855 @@
 
 /* Line 1806 of yacc.c  */
-#line 2047 "parser.yy"
+#line 2045 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7880 +7866 @@
 
 /* Line 1806 of yacc.c  */
-#line 2053 "parser.yy"
+#line 2051 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7891 +7877 @@
 
 /* Line 1806 of yacc.c  */
-#line 2059 "parser.yy"
+#line 2057 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7902 +7888 @@
 
 /* Line 1806 of yacc.c  */
-#line 2065 "parser.yy"
+#line 2063 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7913 +7899 @@
 
 /* Line 1806 of yacc.c  */
-#line 2071 "parser.yy"
+#line 2069 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7924 +7910 @@
 
 /* Line 1806 of yacc.c  */
-#line 2079 "parser.yy"
+#line 2077 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7935 +7921 @@
 
 /* Line 1806 of yacc.c  */
-#line 2085 "parser.yy"
+#line 2083 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7946 +7932 @@
 
 /* Line 1806 of yacc.c  */
-#line 2093 "parser.yy"
+#line 2091 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7957 +7943 @@
 
 /* Line 1806 of yacc.c  */
-#line 2099 "parser.yy"
+#line 2097 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7968 +7954 @@
 
 /* Line 1806 of yacc.c  */
-#line 2114 "parser.yy"
+#line 2112 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_range( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -7975 +7961 @@
 
 /* Line 1806 of yacc.c  */
-#line 2119 "parser.yy"
+#line 2117 "parser.yy"
     { delete (yyvsp[(3) - (5)].str); }
     break;
@@ -7982 +7968 @@
 
 /* Line 1806 of yacc.c  */
-#line 2124 "parser.yy"
+#line 2122 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7989 +7975 @@
 
 /* Line 1806 of yacc.c  */
-#line 2131 "parser.yy"
+#line 2129 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7996 +7982 @@
 
 /* Line 1806 of yacc.c  */
-#line 2137 "parser.yy"
+#line 2135 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -8003 +7989 @@
 
 /* Line 1806 of yacc.c  */
-#line 2148 "parser.yy"
+#line 2146 "parser.yy"
     { delete (yyvsp[(3) - (4)].en); }
     break;
@@ -8010 +7996 @@
 
 /* Line 1806 of yacc.c  */
+#line 2150 "parser.yy"
+    { delete (yyvsp[(1) - (1)].tok); }
+    break;
+
+  case 557:
+
+/* Line 1806 of yacc.c  */
+#line 2151 "parser.yy"
+    { delete (yyvsp[(1) - (1)].decl); }
+    break;
+
+  case 558:
+
+/* Line 1806 of yacc.c  */
 #line 2152 "parser.yy"
-    { delete (yyvsp[(1) - (1)].tok); }
-    break;
-
-  case 557:
+    { delete (yyvsp[(1) - (1)].decl); }
+    break;
+
+  case 559:
 
 /* Line 1806 of yacc.c  */
@@ -8021 +8021 @@
     break;
 
-  case 558:
-
-/* Line 1806 of yacc.c  */
-#line 2154 "parser.yy"
-    { delete (yyvsp[(1) - (1)].decl); }
-    break;
-
-  case 559:
-
-/* Line 1806 of yacc.c  */
-#line 2155 "parser.yy"
-    { delete (yyvsp[(1) - (1)].decl); }
-    break;
-
   case 560:
 
 /* Line 1806 of yacc.c  */
-#line 2190 "parser.yy"
+#line 2188 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
   case 562:
+
+/* Line 1806 of yacc.c  */
+#line 2191 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 563:
 
 /* Line 1806 of yacc.c  */
@@ -8049 +8042 @@
     break;
 
-  case 563:
-
-/* Line 1806 of yacc.c  */
-#line 2195 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 564:
 
 /* Line 1806 of yacc.c  */
-#line 2200 "parser.yy"
+#line 2198 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8069 +8055 @@
 
 /* Line 1806 of yacc.c  */
-#line 2205 "parser.yy"
+#line 2203 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8076 +8062 @@
 
 /* Line 1806 of yacc.c  */
+#line 2208 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 567:
+
+/* Line 1806 of yacc.c  */
 #line 2210 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 567:
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 568:
 
 /* Line 1806 of yacc.c  */
 #line 2212 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 568:
-
-/* Line 1806 of yacc.c  */
-#line 2214 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8097 +8083 @@
 
 /* Line 1806 of yacc.c  */
+#line 2217 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 570:
+
+/* Line 1806 of yacc.c  */
 #line 2219 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 570:
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 571:
 
 /* Line 1806 of yacc.c  */
@@ -8108 +8101 @@
     break;
 
-  case 571:
+  case 572:
 
 /* Line 1806 of yacc.c  */
 #line 2223 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 573:
+
+/* Line 1806 of yacc.c  */
+#line 2228 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 574:
+
+/* Line 1806 of yacc.c  */
+#line 2230 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 575:
+
+/* Line 1806 of yacc.c  */
+#line 2239 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 577:
+
+/* Line 1806 of yacc.c  */
+#line 2242 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 578:
+
+/* Line 1806 of yacc.c  */
+#line 2247 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
+    break;
+
+  case 579:
+
+/* Line 1806 of yacc.c  */
+#line 2249 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 580:
+
+/* Line 1806 of yacc.c  */
+#line 2251 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 581:
+
+/* Line 1806 of yacc.c  */
+#line 2256 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 582:
+
+/* Line 1806 of yacc.c  */
+#line 2258 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 583:
+
+/* Line 1806 of yacc.c  */
+#line 2260 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 584:
+
+/* Line 1806 of yacc.c  */
+#line 2265 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 
-  case 572:
-
-/* Line 1806 of yacc.c  */
-#line 2225 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 573:
-
-/* Line 1806 of yacc.c  */
-#line 2230 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 574:
-
-/* Line 1806 of yacc.c  */
-#line 2232 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 575:
-
-/* Line 1806 of yacc.c  */
-#line 2241 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 577:
-
-/* Line 1806 of yacc.c  */
-#line 2244 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 578:
-
-/* Line 1806 of yacc.c  */
-#line 2249 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-
-  case 579:
-
-/* Line 1806 of yacc.c  */
-#line 2251 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 580:
-
-/* Line 1806 of yacc.c  */
-#line 2253 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 581:
-
-/* Line 1806 of yacc.c  */
-#line 2258 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 582:
-
-/* Line 1806 of yacc.c  */
-#line 2260 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 583:
-
-/* Line 1806 of yacc.c  */
-#line 2262 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 584:
+  case 585:
 
 /* Line 1806 of yacc.c  */
@@ -8199 +8192 @@
     break;
 
-  case 585:
+  case 586:
 
 /* Line 1806 of yacc.c  */
 #line 2269 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 590:
+
+/* Line 1806 of yacc.c  */
+#line 2284 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addIdList( (yyvsp[(3) - (4)].decl) ); }
+    break;
+
+  case 591:
+
+/* Line 1806 of yacc.c  */
+#line 2286 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (6)].decl)->addIdList( (yyvsp[(5) - (6)].decl) ); }
+    break;
+
+  case 592:
+
+/* Line 1806 of yacc.c  */
+#line 2288 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 593:
+
+/* Line 1806 of yacc.c  */
+#line 2293 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 594:
+
+/* Line 1806 of yacc.c  */
+#line 2295 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 595:
+
+/* Line 1806 of yacc.c  */
+#line 2297 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 596:
+
+/* Line 1806 of yacc.c  */
+#line 2302 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 
-  case 586:
-
-/* Line 1806 of yacc.c  */
-#line 2271 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 590:
-
-/* Line 1806 of yacc.c  */
-#line 2286 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addIdList( (yyvsp[(3) - (4)].decl) ); }
-    break;
-
-  case 591:
-
-/* Line 1806 of yacc.c  */
-#line 2288 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (6)].decl)->addIdList( (yyvsp[(5) - (6)].decl) ); }
-    break;
-
-  case 592:
-
-/* Line 1806 of yacc.c  */
-#line 2290 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 593:
-
-/* Line 1806 of yacc.c  */
-#line 2295 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 594:
-
-/* Line 1806 of yacc.c  */
-#line 2297 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 595:
-
-/* Line 1806 of yacc.c  */
-#line 2299 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 596:
+  case 597:
 
 /* Line 1806 of yacc.c  */
@@ -8262 +8255 @@
     break;
 
-  case 597:
+  case 598:
 
 /* Line 1806 of yacc.c  */
 #line 2306 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 598:
-
-/* Line 1806 of yacc.c  */
-#line 2308 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8279 +8265 @@
 
 /* Line 1806 of yacc.c  */
-#line 2323 "parser.yy"
+#line 2321 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
   case 601:
+
+/* Line 1806 of yacc.c  */
+#line 2324 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 602:
 
 /* Line 1806 of yacc.c  */
@@ -8290 +8283 @@
     break;
 
-  case 602:
-
-/* Line 1806 of yacc.c  */
-#line 2328 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 604:
 
 /* Line 1806 of yacc.c  */
-#line 2334 "parser.yy"
+#line 2332 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8307 +8293 @@
 
 /* Line 1806 of yacc.c  */
+#line 2337 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 606:
+
+/* Line 1806 of yacc.c  */
 #line 2339 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 606:
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 607:
 
 /* Line 1806 of yacc.c  */
 #line 2341 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 607:
-
-/* Line 1806 of yacc.c  */
-#line 2343 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8328 +8314 @@
 
 /* Line 1806 of yacc.c  */
+#line 2346 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 609:
+
+/* Line 1806 of yacc.c  */
 #line 2348 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 609:
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 610:
 
 /* Line 1806 of yacc.c  */
@@ -8339 +8332 @@
     break;
 
-  case 610:
+  case 611:
 
 /* Line 1806 of yacc.c  */
 #line 2352 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 611:
-
-/* Line 1806 of yacc.c  */
-#line 2354 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8356 +8342 @@
 
 /* Line 1806 of yacc.c  */
+#line 2357 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
+    break;
+
+  case 613:
+
+/* Line 1806 of yacc.c  */
 #line 2359 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-
-  case 613:
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 614:
 
 /* Line 1806 of yacc.c  */
 #line 2361 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 614:
-
-/* Line 1806 of yacc.c  */
-#line 2363 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8377 +8363 @@
 
 /* Line 1806 of yacc.c  */
-#line 2373 "parser.yy"
+#line 2371 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
   case 617:
+
+/* Line 1806 of yacc.c  */
+#line 2374 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 618:
 
 /* Line 1806 of yacc.c  */
@@ -8388 +8381 @@
     break;
 
-  case 618:
-
-/* Line 1806 of yacc.c  */
-#line 2378 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 619:
 
 /* Line 1806 of yacc.c  */
+#line 2381 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 620:
+
+/* Line 1806 of yacc.c  */
 #line 2383 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 620:
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 621:
 
 /* Line 1806 of yacc.c  */
 #line 2385 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 621:
-
-/* Line 1806 of yacc.c  */
-#line 2387 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8419 +8405 @@
 
 /* Line 1806 of yacc.c  */
+#line 2390 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 623:
+
+/* Line 1806 of yacc.c  */
 #line 2392 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 623:
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 624:
 
 /* Line 1806 of yacc.c  */
@@ -8430 +8423 @@
     break;
 
-  case 624:
+  case 625:
 
 /* Line 1806 of yacc.c  */
 #line 2396 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 625:
-
-/* Line 1806 of yacc.c  */
-#line 2398 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8447 +8433 @@
 
 /* Line 1806 of yacc.c  */
+#line 2401 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
+    break;
+
+  case 627:
+
+/* Line 1806 of yacc.c  */
 #line 2403 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-
-  case 627:
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 628:
 
 /* Line 1806 of yacc.c  */
 #line 2405 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 628:
-
-/* Line 1806 of yacc.c  */
-#line 2407 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8468 +8454 @@
 
 /* Line 1806 of yacc.c  */
-#line 2438 "parser.yy"
+#line 2436 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
   case 631:
+
+/* Line 1806 of yacc.c  */
+#line 2439 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 632:
 
 /* Line 1806 of yacc.c  */
@@ -8479 +8472 @@
     break;
 
-  case 632:
-
-/* Line 1806 of yacc.c  */
-#line 2443 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 633:
 
 /* Line 1806 of yacc.c  */
-#line 2448 "parser.yy"
+#line 2446 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8499 +8485 @@
 
 /* Line 1806 of yacc.c  */
-#line 2453 "parser.yy"
+#line 2451 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8509 +8495 @@
 
 /* Line 1806 of yacc.c  */
+#line 2459 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 636:
+
+/* Line 1806 of yacc.c  */
 #line 2461 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 636:
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 637:
 
 /* Line 1806 of yacc.c  */
 #line 2463 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 637:
-
-/* Line 1806 of yacc.c  */
-#line 2465 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8530 +8516 @@
 
 /* Line 1806 of yacc.c  */
+#line 2468 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 639:
+
+/* Line 1806 of yacc.c  */
 #line 2470 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 639:
-
-/* Line 1806 of yacc.c  */
-#line 2472 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8544 +8530 @@
 
 /* Line 1806 of yacc.c  */
+#line 2475 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
+    break;
+
+  case 641:
+
+/* Line 1806 of yacc.c  */
 #line 2477 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-
-  case 641:
-
-/* Line 1806 of yacc.c  */
-#line 2479 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
 
   case 643:
+
+/* Line 1806 of yacc.c  */
+#line 2492 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 644:
 
 /* Line 1806 of yacc.c  */
@@ -8562 +8555 @@
     break;
 
-  case 644:
-
-/* Line 1806 of yacc.c  */
-#line 2496 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 645:
 
 /* Line 1806 of yacc.c  */
+#line 2499 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
+    break;
+
+  case 646:
+
+/* Line 1806 of yacc.c  */
 #line 2501 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
-    break;
-
-  case 646:
+    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 647:
 
 /* Line 1806 of yacc.c  */
 #line 2503 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 647:
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 648:
 
 /* Line 1806 of yacc.c  */
 #line 2505 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 648:
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 649:
 
 /* Line 1806 of yacc.c  */
 #line 2507 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 649:
-
-/* Line 1806 of yacc.c  */
-#line 2509 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
   case 651:
+
+/* Line 1806 of yacc.c  */
+#line 2513 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 652:
 
 /* Line 1806 of yacc.c  */
@@ -8611 +8604 @@
     break;
 
-  case 652:
+  case 653:
 
 /* Line 1806 of yacc.c  */
 #line 2517 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 653:
-
-/* Line 1806 of yacc.c  */
-#line 2519 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8628 +8614 @@
 
 /* Line 1806 of yacc.c  */
+#line 2522 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
+    break;
+
+  case 655:
+
+/* Line 1806 of yacc.c  */
 #line 2524 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
-    break;
-
-  case 655:
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 656:
 
 /* Line 1806 of yacc.c  */
 #line 2526 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 656:
-
-/* Line 1806 of yacc.c  */
-#line 2528 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8649 +8635 @@
 
 /* Line 1806 of yacc.c  */
+#line 2532 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
+    break;
+
+  case 658:
+
+/* Line 1806 of yacc.c  */
 #line 2534 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
-    break;
-
-  case 658:
-
-/* Line 1806 of yacc.c  */
-#line 2536 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false )->addArray( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -8663 +8649 @@
 
 /* Line 1806 of yacc.c  */
+#line 2540 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(3) - (5)].en), 0, false ); }
+    break;
+
+  case 661:
+
+/* Line 1806 of yacc.c  */
 #line 2542 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(3) - (5)].en), 0, false ); }
-    break;
-
-  case 661:
+    { (yyval.decl) = DeclarationNode::newVarArray( 0 ); }
+    break;
+
+  case 662:
 
 /* Line 1806 of yacc.c  */
 #line 2544 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newVarArray( 0 ); }
-    break;
-
-  case 662:
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newArray( (yyvsp[(4) - (6)].en), 0, false ) ); }
+    break;
+
+  case 663:
 
 /* Line 1806 of yacc.c  */
 #line 2546 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newArray( (yyvsp[(4) - (6)].en), 0, false ) ); }
-    break;
-
-  case 663:
-
-/* Line 1806 of yacc.c  */
-#line 2548 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newVarArray( 0 ) ); }
     break;
 
   case 665:
+
+/* Line 1806 of yacc.c  */
+#line 2561 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 666:
 
 /* Line 1806 of yacc.c  */
@@ -8695 +8688 @@
     break;
 
-  case 666:
-
-/* Line 1806 of yacc.c  */
-#line 2565 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 667:
 
 /* Line 1806 of yacc.c  */
+#line 2568 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
+    break;
+
+  case 668:
+
+/* Line 1806 of yacc.c  */
 #line 2570 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
-    break;
-
-  case 668:
+    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 669:
 
 /* Line 1806 of yacc.c  */
 #line 2572 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 669:
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 670:
 
 /* Line 1806 of yacc.c  */
 #line 2574 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 670:
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 671:
 
 /* Line 1806 of yacc.c  */
 #line 2576 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 671:
-
-/* Line 1806 of yacc.c  */
-#line 2578 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
   case 673:
+
+/* Line 1806 of yacc.c  */
+#line 2582 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 674:
 
 /* Line 1806 of yacc.c  */
@@ -8744 +8737 @@
     break;
 
-  case 674:
+  case 675:
 
 /* Line 1806 of yacc.c  */
 #line 2586 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 675:
-
-/* Line 1806 of yacc.c  */
-#line 2588 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8761 +8747 @@
 
 /* Line 1806 of yacc.c  */
+#line 2591 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
+    break;
+
+  case 677:
+
+/* Line 1806 of yacc.c  */
 #line 2593 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
-    break;
-
-  case 677:
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 678:
 
 /* Line 1806 of yacc.c  */
 #line 2595 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 678:
-
-/* Line 1806 of yacc.c  */
-#line 2597 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8782 +8768 @@
 
 /* Line 1806 of yacc.c  */
-#line 2604 "parser.yy"
+#line 2602 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8789 +8775 @@
 
 /* Line 1806 of yacc.c  */
-#line 2615 "parser.yy"
+#line 2613 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
     break;
@@ -8796 +8782 @@
 
 /* Line 1806 of yacc.c  */
+#line 2616 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
+    break;
+
+  case 684:
+
+/* Line 1806 of yacc.c  */
 #line 2618 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
-    break;
-
-  case 684:
-
-/* Line 1806 of yacc.c  */
-#line 2620 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, (yyvsp[(3) - (5)].decl), false ); }
     break;
@@ -8810 +8796 @@
 
 /* Line 1806 of yacc.c  */
+#line 2621 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
+    break;
+
+  case 686:
+
+/* Line 1806 of yacc.c  */
 #line 2623 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
-    break;
-
-  case 686:
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl), true ); }
+    break;
+
+  case 687:
 
 /* Line 1806 of yacc.c  */
 #line 2625 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl), true ); }
-    break;
-
-  case 687:
-
-/* Line 1806 of yacc.c  */
-#line 2627 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(3) - (7)].decl), true ); }
     break;
 
   case 689:
+
+/* Line 1806 of yacc.c  */
+#line 2639 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 690:
 
 /* Line 1806 of yacc.c  */
@@ -8835 +8828 @@
     break;
 
-  case 690:
-
-/* Line 1806 of yacc.c  */
-#line 2643 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 691:
 
 /* Line 1806 of yacc.c  */
+#line 2646 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
+    break;
+
+  case 692:
+
+/* Line 1806 of yacc.c  */
 #line 2648 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
-    break;
-
-  case 692:
+    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 693:
 
 /* Line 1806 of yacc.c  */
 #line 2650 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 693:
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 694:
 
 /* Line 1806 of yacc.c  */
 #line 2652 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 694:
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 695:
 
 /* Line 1806 of yacc.c  */
 #line 2654 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 695:
-
-/* Line 1806 of yacc.c  */
-#line 2656 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
   case 697:
+
+/* Line 1806 of yacc.c  */
+#line 2660 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 698:
 
 /* Line 1806 of yacc.c  */
@@ -8884 +8877 @@
     break;
 
-  case 698:
+  case 699:
 
 /* Line 1806 of yacc.c  */
 #line 2664 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 699:
-
-/* Line 1806 of yacc.c  */
-#line 2666 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8901 +8887 @@
 
 /* Line 1806 of yacc.c  */
+#line 2669 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 701:
+
+/* Line 1806 of yacc.c  */
 #line 2671 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 701:
-
-/* Line 1806 of yacc.c  */
-#line 2673 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8915 +8901 @@
 
 /* Line 1806 of yacc.c  */
-#line 2683 "parser.yy"
+#line 2681 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -8922 +8908 @@
 
 /* Line 1806 of yacc.c  */
+#line 2691 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 708:
+
+/* Line 1806 of yacc.c  */
 #line 2693 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+    break;
+
+  case 709:
+
+/* Line 1806 of yacc.c  */
+#line 2695 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 
-  case 708:
-
-/* Line 1806 of yacc.c  */
-#line 2695 "parser.yy"
+  case 710:
+
+/* Line 1806 of yacc.c  */
+#line 2697 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
 
-  case 709:
-
-/* Line 1806 of yacc.c  */
-#line 2697 "parser.yy"
+  case 711:
+
+/* Line 1806 of yacc.c  */
+#line 2699 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 
-  case 710:
-
-/* Line 1806 of yacc.c  */
-#line 2699 "parser.yy"
+  case 712:
+
+/* Line 1806 of yacc.c  */
+#line 2701 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
 
-  case 711:
-
-/* Line 1806 of yacc.c  */
-#line 2701 "parser.yy"
+  case 713:
+
+/* Line 1806 of yacc.c  */
+#line 2708 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 714:
+
+/* Line 1806 of yacc.c  */
+#line 2710 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 715:
+
+/* Line 1806 of yacc.c  */
+#line 2712 "parser.yy"
+    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 716:
+
+/* Line 1806 of yacc.c  */
+#line 2714 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
+    break;
+
+  case 717:
+
+/* Line 1806 of yacc.c  */
+#line 2716 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 718:
+
+/* Line 1806 of yacc.c  */
+#line 2718 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 719:
+
+/* Line 1806 of yacc.c  */
+#line 2720 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 720:
+
+/* Line 1806 of yacc.c  */
+#line 2722 "parser.yy"
+    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 721:
+
+/* Line 1806 of yacc.c  */
+#line 2724 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
+    break;
+
+  case 722:
+
+/* Line 1806 of yacc.c  */
+#line 2726 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 723:
+
+/* Line 1806 of yacc.c  */
+#line 2731 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
+    break;
+
+  case 724:
+
+/* Line 1806 of yacc.c  */
+#line 2733 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
+    break;
+
+  case 725:
+
+/* Line 1806 of yacc.c  */
+#line 2738 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), true ); }
+    break;
+
+  case 726:
+
+/* Line 1806 of yacc.c  */
+#line 2740 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl)->addQualifiers( (yyvsp[(3) - (7)].decl) ), true ); }
+    break;
+
+  case 728:
+
+/* Line 1806 of yacc.c  */
+#line 2767 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 732:
+
+/* Line 1806 of yacc.c  */
+#line 2778 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 
-  case 712:
-
-/* Line 1806 of yacc.c  */
-#line 2703 "parser.yy"
+  case 733:
+
+/* Line 1806 of yacc.c  */
+#line 2780 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
 
-  case 713:
-
-/* Line 1806 of yacc.c  */
-#line 2710 "parser.yy"
+  case 734:
+
+/* Line 1806 of yacc.c  */
+#line 2782 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 735:
+
+/* Line 1806 of yacc.c  */
+#line 2784 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+    break;
+
+  case 736:
+
+/* Line 1806 of yacc.c  */
+#line 2786 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 737:
+
+/* Line 1806 of yacc.c  */
+#line 2788 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+    break;
+
+  case 738:
+
+/* Line 1806 of yacc.c  */
+#line 2795 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
 
-  case 714:
-
-/* Line 1806 of yacc.c  */
-#line 2712 "parser.yy"
+  case 739:
+
+/* Line 1806 of yacc.c  */
+#line 2797 "parser.yy"
+    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 740:
+
+/* Line 1806 of yacc.c  */
+#line 2799 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 715:
-
-/* Line 1806 of yacc.c  */
-#line 2714 "parser.yy"
+  case 741:
+
+/* Line 1806 of yacc.c  */
+#line 2801 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 742:
+
+/* Line 1806 of yacc.c  */
+#line 2803 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
 
-  case 716:
-
-/* Line 1806 of yacc.c  */
-#line 2716 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
-    break;
-
-  case 717:
-
-/* Line 1806 of yacc.c  */
-#line 2718 "parser.yy"
+  case 743:
+
+/* Line 1806 of yacc.c  */
+#line 2805 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 718:
-
-/* Line 1806 of yacc.c  */
-#line 2720 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 719:
-
-/* Line 1806 of yacc.c  */
-#line 2722 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 720:
-
-/* Line 1806 of yacc.c  */
-#line 2724 "parser.yy"
-    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 721:
-
-/* Line 1806 of yacc.c  */
-#line 2726 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
-    break;
-
-  case 722:
-
-/* Line 1806 of yacc.c  */
-#line 2728 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 723:
-
-/* Line 1806 of yacc.c  */
-#line 2733 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
-    break;
-
-  case 724:
-
-/* Line 1806 of yacc.c  */
-#line 2735 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
-    break;
-
-  case 725:
-
-/* Line 1806 of yacc.c  */
-#line 2740 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), true ); }
-    break;
-
-  case 726:
-
-/* Line 1806 of yacc.c  */
-#line 2742 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl)->addQualifiers( (yyvsp[(3) - (7)].decl) ), true ); }
-    break;
-
-  case 728:
-
-/* Line 1806 of yacc.c  */
-#line 2769 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 732:
-
-/* Line 1806 of yacc.c  */
-#line 2780 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 733:
-
-/* Line 1806 of yacc.c  */
-#line 2782 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
-    break;
-
-  case 734:
-
-/* Line 1806 of yacc.c  */
-#line 2784 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 735:
-
-/* Line 1806 of yacc.c  */
-#line 2786 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
-    break;
-
-  case 736:
-
-/* Line 1806 of yacc.c  */
-#line 2788 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 737:
-
-/* Line 1806 of yacc.c  */
-#line 2790 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
-    break;
-
-  case 738:
-
-/* Line 1806 of yacc.c  */
-#line 2797 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 739:
-
-/* Line 1806 of yacc.c  */
-#line 2799 "parser.yy"
-    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 740:
-
-/* Line 1806 of yacc.c  */
-#line 2801 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 741:
-
-/* Line 1806 of yacc.c  */
-#line 2803 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 742:
-
-/* Line 1806 of yacc.c  */
-#line 2805 "parser.yy"
-    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 743:
-
-/* Line 1806 of yacc.c  */
-#line 2807 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
   case 744:
 
 /* Line 1806 of yacc.c  */
-#line 2812 "parser.yy"
+#line 2810 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -9160 +9146 @@
 
 /* Line 1806 of yacc.c  */
+#line 2815 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newFunction( 0, DeclarationNode::newTuple( 0 ), (yyvsp[(4) - (5)].decl), 0 ); }
+    break;
+
+  case 746:
+
+/* Line 1806 of yacc.c  */
 #line 2817 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFunction( 0, DeclarationNode::newTuple( 0 ), (yyvsp[(4) - (5)].decl), 0 ); }
-    break;
-
-  case 746:
+    { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), 0 ); }
+    break;
+
+  case 747:
 
 /* Line 1806 of yacc.c  */
@@ -9171 +9164 @@
     break;
 
-  case 747:
-
-/* Line 1806 of yacc.c  */
-#line 2821 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), 0 ); }
-    break;
-
   case 750:
 
 /* Line 1806 of yacc.c  */
+#line 2843 "parser.yy"
+    { (yyval.en) = 0; }
+    break;
+
+  case 751:
+
+/* Line 1806 of yacc.c  */
 #line 2845 "parser.yy"
-    { (yyval.en) = 0; }
-    break;
-
-  case 751:
-
-/* Line 1806 of yacc.c  */
-#line 2847 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -9195 +9181 @@
 
 /* Line 1806 of yacc.c  */
-#line 9198 "Parser/parser.cc"
+#line 9184 "Parser/parser.cc"
       default: break;
     }
@@ -9426 +9412 @@
 
 /* Line 2067 of yacc.c  */
-#line 2850 "parser.yy"
+#line 2848 "parser.yy"
 
 // ----end of grammar----