Changes in src/Parser/parser.cc [777bfcf:8cc5cb0]

File:

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

src/Parser/parser.cc

@@ -1020 +1020 @@
 static const yytype_uint16 yyrline[] =
 {
-       0,   298,   298,   304,   313,   314,   315,   319,   320,   321,
-     325,   326,   330,   331,   335,   336,   340,   341,   352,   354,
-     356,   358,   363,   364,   370,   374,   376,   377,   379,   380,
-     382,   384,   386,   395,   396,   402,   403,   407,   408,   412,
-     416,   418,   420,   422,   427,   430,   432,   434,   439,   452,
-     454,   456,   458,   460,   462,   464,   466,   468,   470,   472,
-     479,   480,   486,   487,   488,   489,   493,   494,   496,   501,
-     502,   504,   506,   511,   512,   514,   519,   520,   522,   527,
-     528,   530,   532,   534,   539,   540,   542,   547,   548,   553,
-     554,   559,   560,   565,   566,   571,   572,   577,   578,   581,
-     583,   588,   593,   594,   596,   602,   603,   607,   608,   609,
-     610,   611,   612,   613,   614,   615,   616,   617,   623,   625,
-     627,   629,   634,   635,   640,   641,   647,   648,   654,   655,
-     656,   657,   658,   659,   660,   661,   662,   672,   679,   681,
-     691,   692,   697,   699,   705,   707,   711,   712,   717,   722,
-     725,   727,   729,   739,   741,   752,   753,   755,   759,   761,
-     765,   766,   771,   772,   776,   781,   782,   786,   788,   794,
-     795,   799,   801,   803,   805,   811,   812,   816,   818,   823,
-     825,   827,   832,   834,   839,   841,   845,   848,   852,   855,
-     859,   861,   863,   865,   870,   872,   874,   879,   881,   883,
-     885,   887,   892,   894,   896,   898,   903,   915,   916,   921,
-     923,   928,   932,   934,   936,   938,   940,   946,   947,   953,
-     954,   958,   959,   964,   966,   972,   973,   975,   980,   982,
-     989,   991,   995,   996,  1001,  1003,  1007,  1008,  1012,  1014,
-    1018,  1019,  1023,  1024,  1028,  1029,  1044,  1045,  1046,  1047,
-    1048,  1052,  1057,  1064,  1074,  1079,  1084,  1092,  1097,  1102,
-    1107,  1112,  1120,  1142,  1147,  1154,  1156,  1163,  1168,  1173,
-    1184,  1189,  1194,  1199,  1204,  1213,  1218,  1226,  1227,  1228,
-    1229,  1235,  1240,  1248,  1249,  1250,  1251,  1255,  1256,  1257,
-    1258,  1263,  1264,  1273,  1274,  1279,  1280,  1285,  1287,  1289,
-    1291,  1293,  1296,  1295,  1307,  1308,  1310,  1320,  1321,  1326,
-    1330,  1332,  1334,  1336,  1338,  1340,  1342,  1344,  1349,  1351,
-    1353,  1355,  1357,  1359,  1361,  1363,  1365,  1367,  1369,  1371,
-    1373,  1379,  1380,  1382,  1384,  1386,  1391,  1392,  1398,  1399,
-    1401,  1403,  1408,  1410,  1412,  1414,  1419,  1420,  1422,  1424,
-    1429,  1430,  1432,  1437,  1438,  1440,  1442,  1447,  1449,  1451,
-    1456,  1457,  1461,  1463,  1469,  1468,  1472,  1474,  1479,  1481,
-    1487,  1488,  1493,  1494,  1496,  1497,  1506,  1507,  1509,  1511,
-    1516,  1518,  1524,  1525,  1527,  1530,  1533,  1538,  1539,  1544,
-    1549,  1553,  1555,  1561,  1560,  1567,  1569,  1575,  1576,  1584,
-    1585,  1589,  1590,  1591,  1593,  1595,  1602,  1603,  1605,  1607,
-    1612,  1613,  1619,  1620,  1624,  1625,  1630,  1631,  1632,  1634,
-    1642,  1643,  1645,  1648,  1650,  1654,  1655,  1656,  1658,  1660,
-    1664,  1669,  1677,  1678,  1687,  1689,  1694,  1695,  1696,  1700,
-    1701,  1702,  1706,  1707,  1708,  1712,  1713,  1714,  1719,  1720,
-    1721,  1722,  1728,  1729,  1731,  1736,  1737,  1742,  1743,  1744,
-    1745,  1746,  1761,  1762,  1767,  1768,  1774,  1776,  1779,  1781,
-    1783,  1806,  1807,  1809,  1811,  1816,  1817,  1819,  1824,  1829,
-    1830,  1836,  1835,  1839,  1843,  1845,  1847,  1853,  1854,  1859,
-    1864,  1866,  1871,  1873,  1874,  1876,  1881,  1883,  1885,  1890,
-    1892,  1897,  1902,  1910,  1916,  1915,  1929,  1930,  1935,  1936,
-    1940,  1945,  1950,  1958,  1963,  1974,  1975,  1986,  1987,  1993,
-    1994,  1998,  1999,  2000,  2003,  2002,  2013,  2022,  2028,  2034,
-    2043,  2049,  2055,  2061,  2067,  2075,  2081,  2089,  2095,  2104,
-    2105,  2106,  2110,  2114,  2116,  2121,  2122,  2126,  2127,  2132,
-    2138,  2139,  2142,  2144,  2145,  2149,  2150,  2151,  2152,  2186,
-    2188,  2189,  2191,  2196,  2201,  2206,  2208,  2210,  2215,  2217,
-    2219,  2221,  2226,  2228,  2237,  2239,  2240,  2245,  2247,  2249,
-    2254,  2256,  2258,  2263,  2265,  2267,  2276,  2277,  2278,  2282,
-    2284,  2286,  2291,  2293,  2295,  2300,  2302,  2304,  2319,  2321,
-    2322,  2324,  2329,  2330,  2335,  2337,  2339,  2344,  2346,  2348,
-    2350,  2355,  2357,  2359,  2369,  2371,  2372,  2374,  2379,  2381,
-    2383,  2388,  2390,  2392,  2394,  2399,  2401,  2403,  2434,  2436,
-    2437,  2439,  2444,  2449,  2457,  2459,  2461,  2466,  2468,  2473,
-    2475,  2489,  2490,  2492,  2497,  2499,  2501,  2503,  2505,  2510,
-    2511,  2513,  2515,  2520,  2522,  2524,  2530,  2532,  2534,  2538,
-    2540,  2542,  2544,  2558,  2559,  2561,  2566,  2568,  2570,  2572,
-    2574,  2579,  2580,  2582,  2584,  2589,  2591,  2593,  2599,  2600,
-    2602,  2611,  2614,  2616,  2619,  2621,  2623,  2636,  2637,  2639,
-    2644,  2646,  2648,  2650,  2652,  2657,  2658,  2660,  2662,  2667,
-    2669,  2677,  2678,  2679,  2684,  2685,  2689,  2691,  2693,  2695,
-    2697,  2699,  2706,  2708,  2710,  2712,  2714,  2716,  2718,  2720,
-    2722,  2724,  2729,  2731,  2733,  2738,  2764,  2765,  2767,  2771,
-    2772,  2776,  2778,  2780,  2782,  2784,  2786,  2793,  2795,  2797,
-    2799,  2801,  2803,  2808,  2813,  2815,  2817,  2835,  2837,  2842,
-    2843
+       0,   299,   299,   305,   314,   315,   316,   320,   321,   322,
+     326,   327,   331,   332,   336,   337,   341,   342,   353,   355,
+     357,   359,   364,   365,   371,   375,   377,   378,   380,   381,
+     383,   385,   387,   396,   397,   403,   404,   408,   409,   413,
+     417,   419,   421,   423,   428,   431,   433,   435,   440,   453,
+     455,   457,   459,   461,   463,   465,   467,   469,   471,   473,
+     480,   481,   487,   488,   489,   490,   494,   495,   497,   502,
+     503,   505,   507,   512,   513,   515,   520,   521,   523,   528,
+     529,   531,   533,   535,   540,   541,   543,   548,   549,   554,
+     555,   560,   561,   566,   567,   572,   573,   578,   579,   582,
+     584,   589,   594,   595,   597,   603,   604,   608,   609,   610,
+     611,   612,   613,   614,   615,   616,   617,   618,   624,   626,
+     628,   630,   635,   636,   641,   642,   648,   649,   655,   656,
+     657,   658,   659,   660,   661,   662,   663,   673,   680,   682,
+     692,   693,   698,   700,   706,   708,   712,   713,   718,   723,
+     726,   728,   730,   740,   742,   753,   754,   756,   761,   763,
+     767,   768,   773,   774,   778,   783,   784,   788,   790,   796,
+     797,   801,   803,   805,   807,   813,   814,   818,   820,   825,
+     827,   829,   834,   836,   841,   843,   847,   850,   854,   857,
+     861,   863,   865,   867,   872,   874,   876,   885,   887,   889,
+     891,   893,   898,   900,   902,   904,   909,   922,   923,   928,
+     930,   935,   939,   941,   943,   945,   947,   953,   954,   960,
+     961,   965,   966,   971,   973,   979,   980,   982,   987,   989,
+     996,   998,  1002,  1003,  1008,  1010,  1014,  1015,  1019,  1021,
+    1025,  1026,  1030,  1031,  1035,  1036,  1051,  1052,  1053,  1054,
+    1055,  1059,  1064,  1071,  1081,  1086,  1091,  1099,  1104,  1109,
+    1114,  1119,  1127,  1149,  1154,  1161,  1163,  1170,  1175,  1180,
+    1191,  1196,  1201,  1206,  1211,  1220,  1225,  1233,  1234,  1235,
+    1236,  1242,  1247,  1255,  1256,  1257,  1258,  1262,  1263,  1264,
+    1265,  1270,  1271,  1280,  1281,  1286,  1287,  1292,  1294,  1296,
+    1298,  1300,  1303,  1302,  1314,  1315,  1317,  1327,  1328,  1333,
+    1337,  1339,  1341,  1343,  1345,  1347,  1349,  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,  1993,  1994,  2000,
+    2001,  2005,  2006,  2007,  2010,  2009,  2020,  2029,  2035,  2041,
+    2050,  2056,  2062,  2068,  2074,  2082,  2088,  2096,  2102,  2111,
+    2112,  2113,  2117,  2121,  2123,  2128,  2129,  2133,  2134,  2139,
+    2145,  2146,  2149,  2151,  2152,  2156,  2157,  2158,  2159,  2193,
+    2195,  2196,  2198,  2203,  2208,  2213,  2215,  2217,  2222,  2224,
+    2226,  2228,  2233,  2235,  2244,  2246,  2247,  2252,  2254,  2256,
+    2261,  2263,  2265,  2270,  2272,  2274,  2283,  2284,  2285,  2289,
+    2291,  2293,  2298,  2300,  2302,  2307,  2309,  2311,  2326,  2328,
+    2329,  2331,  2336,  2337,  2342,  2344,  2346,  2351,  2353,  2355,
+    2357,  2362,  2364,  2366,  2376,  2378,  2379,  2381,  2386,  2388,
+    2390,  2395,  2397,  2399,  2401,  2406,  2408,  2410,  2441,  2443,
+    2444,  2446,  2451,  2456,  2464,  2466,  2468,  2473,  2475,  2480,
+    2482,  2496,  2497,  2499,  2504,  2506,  2508,  2510,  2512,  2517,
+    2518,  2520,  2522,  2527,  2529,  2531,  2537,  2539,  2541,  2545,
+    2547,  2549,  2551,  2565,  2566,  2568,  2573,  2575,  2577,  2579,
+    2581,  2586,  2587,  2589,  2591,  2596,  2598,  2600,  2606,  2607,
+    2609,  2618,  2621,  2623,  2626,  2628,  2630,  2643,  2644,  2646,
+    2651,  2653,  2655,  2657,  2659,  2664,  2665,  2667,  2669,  2674,
+    2676,  2684,  2685,  2686,  2691,  2692,  2696,  2698,  2700,  2702,
+    2704,  2706,  2713,  2715,  2717,  2719,  2721,  2723,  2725,  2727,
+    2729,  2731,  2736,  2738,  2740,  2745,  2771,  2772,  2774,  2778,
+    2779,  2783,  2785,  2787,  2789,  2791,  2793,  2800,  2802,  2804,
+    2806,  2808,  2810,  2815,  2820,  2822,  2824,  2842,  2844,  2849,
+    2850
 };
 #endif
@@ -4960 +4960 @@
 
 /* Line 1806 of yacc.c  */
-#line 298 "parser.yy"
+#line 299 "parser.yy"
     {
                         typedefTable.enterScope();
@@ -4969 +4969 @@
 
 /* Line 1806 of yacc.c  */
-#line 304 "parser.yy"
+#line 305 "parser.yy"
     {
                         typedefTable.leaveScope();
@@ -4978 +4978 @@
 
 /* Line 1806 of yacc.c  */
-#line 313 "parser.yy"
+#line 314 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_constantInteger( *(yyvsp[(1) - (1)].tok) ) ); }
     break;
@@ -4985 +4985 @@
 
 /* Line 1806 of yacc.c  */
-#line 314 "parser.yy"
+#line 315 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_constantFloat( *(yyvsp[(1) - (1)].tok) ) ); }
     break;
@@ -4992 +4992 @@
 
 /* Line 1806 of yacc.c  */
-#line 315 "parser.yy"
+#line 316 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_constantChar( *(yyvsp[(1) - (1)].tok) ) ); }
     break;
@@ -4999 +4999 @@
 
 /* Line 1806 of yacc.c  */
-#line 340 "parser.yy"
+#line 341 "parser.yy"
     { (yyval.constant) = build_constantStr( *(yyvsp[(1) - (1)].tok) ); }
     break;
@@ -5006 +5006 @@
 
 /* Line 1806 of yacc.c  */
-#line 342 "parser.yy"
+#line 343 "parser.yy"
     {
                         appendStr( (yyvsp[(1) - (2)].constant)->get_constant()->get_value(), (yyvsp[(2) - (2)].tok) );
@@ -5017 +5017 @@
 
 /* Line 1806 of yacc.c  */
-#line 353 "parser.yy"
+#line 354 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[(1) - (1)].tok) ) ); }
     break;
@@ -5024 +5024 @@
 
 /* Line 1806 of yacc.c  */
-#line 355 "parser.yy"
+#line 356 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[(1) - (1)].tok) ) ); }
     break;
@@ -5031 +5031 @@
 
 /* Line 1806 of yacc.c  */
-#line 357 "parser.yy"
+#line 358 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (3)].en); }
     break;
@@ -5038 +5038 @@
 
 /* Line 1806 of yacc.c  */
-#line 359 "parser.yy"
+#line 360 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_valexpr( (yyvsp[(2) - (3)].sn) ) ); }
     break;
@@ -5045 +5045 @@
 
 /* Line 1806 of yacc.c  */
-#line 369 "parser.yy"
+#line 370 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Index, (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en) ) ); }
     break;
@@ -5052 +5052 @@
 
 /* Line 1806 of yacc.c  */
-#line 371 "parser.yy"
+#line 372 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_func( (yyvsp[(1) - (4)].en), (yyvsp[(3) - (4)].en) ) ); }
     break;
@@ -5059 +5059 @@
 
 /* Line 1806 of yacc.c  */
-#line 375 "parser.yy"
+#line 376 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(1) - (3)].en), build_varref( (yyvsp[(3) - (3)].tok) ) ) ); }
     break;
@@ -5066 +5066 @@
 
 /* Line 1806 of yacc.c  */
-#line 378 "parser.yy"
+#line 379 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(1) - (3)].en), build_varref( (yyvsp[(3) - (3)].tok) ) ) ); }
     break;
@@ -5073 +5073 @@
 
 /* Line 1806 of yacc.c  */
-#line 381 "parser.yy"
+#line 382 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::IncrPost, (yyvsp[(1) - (2)].en) ) ); }
     break;
@@ -5080 +5080 @@
 
 /* Line 1806 of yacc.c  */
-#line 383 "parser.yy"
+#line 384 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::DecrPost, (yyvsp[(1) - (2)].en) ) ); }
     break;
@@ -5087 +5087 @@
 
 /* Line 1806 of yacc.c  */
-#line 385 "parser.yy"
+#line 386 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_compoundLiteral( (yyvsp[(2) - (7)].decl), new InitializerNode( (yyvsp[(5) - (7)].in), true ) ) ); }
     break;
@@ -5094 +5094 @@
 
 /* Line 1806 of yacc.c  */
-#line 387 "parser.yy"
+#line 388 "parser.yy"
     {
                         Token fn;
                         fn.str = new std::string( "?{}" ); // location undefined
-                        (yyval.en) = new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( (yyvsp[(1) - (4)].en) )->set_last( (yyvsp[(3) - (4)].en) ) ) );
+                        (yyval.en) = new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( (yyvsp[(1) - (4)].en) )->set_link( (yyvsp[(3) - (4)].en) ) ) );
                 }
     break;
@@ -5105 +5105 @@
 
 /* Line 1806 of yacc.c  */
-#line 397 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) )); }
+#line 398 "parser.yy"
+    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) )); }
     break;
 
@@ -5112 +5112 @@
 
 /* Line 1806 of yacc.c  */
-#line 402 "parser.yy"
+#line 403 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -5119 +5119 @@
 
 /* Line 1806 of yacc.c  */
-#line 408 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) ); }
+#line 409 "parser.yy"
+    { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -5126 +5126 @@
 
 /* Line 1806 of yacc.c  */
-#line 413 "parser.yy"
+#line 414 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[(1) - (1)].tok) ) ); }
     break;
@@ -5133 +5133 @@
 
 /* Line 1806 of yacc.c  */
-#line 417 "parser.yy"
+#line 418 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(3) - (3)].en), build_varref( (yyvsp[(1) - (3)].tok) ) ) ); }
     break;
@@ -5140 +5140 @@
 
 /* Line 1806 of yacc.c  */
-#line 419 "parser.yy"
+#line 420 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(5) - (7)].en), build_varref( (yyvsp[(1) - (7)].tok) ) ) ); }
     break;
@@ -5147 +5147 @@
 
 /* Line 1806 of yacc.c  */
-#line 421 "parser.yy"
+#line 422 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(3) - (3)].en), build_varref( (yyvsp[(1) - (3)].tok) ) ) ); }
     break;
@@ -5154 +5154 @@
 
 /* Line 1806 of yacc.c  */
-#line 423 "parser.yy"
+#line 424 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(5) - (7)].en), build_varref( (yyvsp[(1) - (7)].tok) ) ) ); }
     break;
@@ -5161 +5161 @@
 
 /* Line 1806 of yacc.c  */
-#line 431 "parser.yy"
+#line 432 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
@@ -5168 +5168 @@
 
 /* Line 1806 of yacc.c  */
-#line 433 "parser.yy"
+#line 434 "parser.yy"
     { (yyval.en) = new ExpressionNode( (yyvsp[(1) - (1)].constant) ); }
     break;
@@ -5175 +5175 @@
 
 /* Line 1806 of yacc.c  */
-#line 435 "parser.yy"
+#line 436 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en)->set_extension( true ); }
     break;
@@ -5182 +5182 @@
 
 /* Line 1806 of yacc.c  */
-#line 440 "parser.yy"
+#line 441 "parser.yy"
     {
                         switch ( (yyvsp[(1) - (2)].op) ) {
@@ -5200 +5200 @@
 
 /* Line 1806 of yacc.c  */
-#line 453 "parser.yy"
+#line 454 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_unary_val( (yyvsp[(1) - (2)].op), (yyvsp[(2) - (2)].en) ) ); }
     break;
@@ -5207 +5207 @@
 
 /* Line 1806 of yacc.c  */
-#line 455 "parser.yy"
+#line 456 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::Incr, (yyvsp[(2) - (2)].en) ) ); }
     break;
@@ -5214 +5214 @@
 
 /* Line 1806 of yacc.c  */
-#line 457 "parser.yy"
+#line 458 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::Decr, (yyvsp[(2) - (2)].en) ) ); }
     break;
@@ -5221 +5221 @@
 
 /* Line 1806 of yacc.c  */
-#line 459 "parser.yy"
+#line 460 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_sizeOfexpr( (yyvsp[(2) - (2)].en) ) ); }
     break;
@@ -5228 +5228 @@
 
 /* Line 1806 of yacc.c  */
-#line 461 "parser.yy"
+#line 462 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_sizeOftype( (yyvsp[(3) - (4)].decl) ) ); }
     break;
@@ -5235 +5235 @@
 
 /* Line 1806 of yacc.c  */
-#line 463 "parser.yy"
+#line 464 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_alignOfexpr( (yyvsp[(2) - (2)].en) ) ); }
     break;
@@ -5242 +5242 @@
 
 /* Line 1806 of yacc.c  */
-#line 465 "parser.yy"
+#line 466 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_alignOftype( (yyvsp[(3) - (4)].decl) ) ); }
     break;
@@ -5249 +5249 @@
 
 /* Line 1806 of yacc.c  */
-#line 467 "parser.yy"
+#line 468 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_offsetOf( (yyvsp[(3) - (6)].decl), build_varref( (yyvsp[(5) - (6)].tok) ) ) ); }
     break;
@@ -5256 +5256 @@
 
 /* Line 1806 of yacc.c  */
-#line 469 "parser.yy"
+#line 470 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_attrexpr( build_varref( (yyvsp[(1) - (1)].tok) ), nullptr ) ); }
     break;
@@ -5263 +5263 @@
 
 /* Line 1806 of yacc.c  */
-#line 471 "parser.yy"
+#line 472 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_attrexpr( build_varref( (yyvsp[(1) - (4)].tok) ), (yyvsp[(3) - (4)].en) ) ); }
     break;
@@ -5270 +5270 @@
 
 /* Line 1806 of yacc.c  */
-#line 473 "parser.yy"
+#line 474 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_attrtype( build_varref( (yyvsp[(1) - (4)].tok) ), (yyvsp[(3) - (4)].decl) ) ); }
     break;
@@ -5277 +5277 @@
 
 /* Line 1806 of yacc.c  */
-#line 479 "parser.yy"
+#line 480 "parser.yy"
     { (yyval.op) = OperKinds::PointTo; }
     break;
@@ -5284 +5284 @@
 
 /* Line 1806 of yacc.c  */
-#line 480 "parser.yy"
+#line 481 "parser.yy"
     { (yyval.op) = OperKinds::AddressOf; }
     break;
@@ -5291 +5291 @@
 
 /* Line 1806 of yacc.c  */
-#line 486 "parser.yy"
+#line 487 "parser.yy"
     { (yyval.op) = OperKinds::UnPlus; }
     break;
@@ -5298 +5298 @@
 
 /* Line 1806 of yacc.c  */
-#line 487 "parser.yy"
+#line 488 "parser.yy"
     { (yyval.op) = OperKinds::UnMinus; }
     break;
@@ -5305 +5305 @@
 
 /* Line 1806 of yacc.c  */
-#line 488 "parser.yy"
+#line 489 "parser.yy"
     { (yyval.op) = OperKinds::Neg; }
     break;
@@ -5312 +5312 @@
 
 /* Line 1806 of yacc.c  */
-#line 489 "parser.yy"
+#line 490 "parser.yy"
     { (yyval.op) = OperKinds::BitNeg; }
     break;
@@ -5319 +5319 @@
 
 /* Line 1806 of yacc.c  */
-#line 495 "parser.yy"
+#line 496 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_cast( (yyvsp[(2) - (4)].decl), (yyvsp[(4) - (4)].en) ) ); }
     break;
@@ -5326 +5326 @@
 
 /* Line 1806 of yacc.c  */
-#line 497 "parser.yy"
+#line 498 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_cast( (yyvsp[(2) - (4)].decl), (yyvsp[(4) - (4)].en) ) ); }
     break;
@@ -5333 +5333 @@
 
 /* Line 1806 of yacc.c  */
-#line 503 "parser.yy"
+#line 504 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Mul, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5340 +5340 @@
 
 /* Line 1806 of yacc.c  */
-#line 505 "parser.yy"
+#line 506 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Div, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5347 +5347 @@
 
 /* Line 1806 of yacc.c  */
-#line 507 "parser.yy"
+#line 508 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Mod, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5354 +5354 @@
 
 /* Line 1806 of yacc.c  */
-#line 513 "parser.yy"
+#line 514 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Plus, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5361 +5361 @@
 
 /* Line 1806 of yacc.c  */
-#line 515 "parser.yy"
+#line 516 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Minus, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5368 +5368 @@
 
 /* Line 1806 of yacc.c  */
-#line 521 "parser.yy"
+#line 522 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LShift, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5375 +5375 @@
 
 /* Line 1806 of yacc.c  */
-#line 523 "parser.yy"
+#line 524 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::RShift, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5382 +5382 @@
 
 /* Line 1806 of yacc.c  */
-#line 529 "parser.yy"
+#line 530 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5389 +5389 @@
 
 /* Line 1806 of yacc.c  */
-#line 531 "parser.yy"
+#line 532 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::GThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5396 +5396 @@
 
 /* Line 1806 of yacc.c  */
-#line 533 "parser.yy"
+#line 534 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LEThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5403 +5403 @@
 
 /* Line 1806 of yacc.c  */
-#line 535 "parser.yy"
+#line 536 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::GEThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5410 +5410 @@
 
 /* Line 1806 of yacc.c  */
-#line 541 "parser.yy"
+#line 542 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Eq, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5417 +5417 @@
 
 /* Line 1806 of yacc.c  */
-#line 543 "parser.yy"
+#line 544 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Neq, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5424 +5424 @@
 
 /* Line 1806 of yacc.c  */
-#line 549 "parser.yy"
+#line 550 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::BitAnd, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5431 +5431 @@
 
 /* Line 1806 of yacc.c  */
-#line 555 "parser.yy"
+#line 556 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Xor, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5438 +5438 @@
 
 /* Line 1806 of yacc.c  */
-#line 561 "parser.yy"
+#line 562 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::BitOr, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5445 +5445 @@
 
 /* Line 1806 of yacc.c  */
-#line 567 "parser.yy"
+#line 568 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_and_or( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en), true ) ); }
     break;
@@ -5452 +5452 @@
 
 /* Line 1806 of yacc.c  */
-#line 573 "parser.yy"
+#line 574 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_and_or( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en), false ) ); }
     break;
@@ -5459 +5459 @@
 
 /* Line 1806 of yacc.c  */
-#line 579 "parser.yy"
+#line 580 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[(1) - (5)].en), (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].en) ) ); }
     break;
@@ -5466 +5466 @@
 
 /* Line 1806 of yacc.c  */
-#line 582 "parser.yy"
+#line 583 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[(1) - (4)].en), (yyvsp[(1) - (4)].en), (yyvsp[(4) - (4)].en) ) ); }
     break;
@@ -5473 +5473 @@
 
 /* Line 1806 of yacc.c  */
-#line 584 "parser.yy"
+#line 585 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[(1) - (5)].en), (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].en) ) ); }
     break;
@@ -5480 +5480 @@
 
 /* Line 1806 of yacc.c  */
-#line 595 "parser.yy"
+#line 596 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_ptr( (yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5487 +5487 @@
 
 /* Line 1806 of yacc.c  */
-#line 597 "parser.yy"
+#line 598 "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;
@@ -5494 +5494 @@
 
 /* Line 1806 of yacc.c  */
-#line 602 "parser.yy"
+#line 603 "parser.yy"
     { (yyval.en) = nullptr; }
     break;
@@ -5501 +5501 @@
 
 /* Line 1806 of yacc.c  */
-#line 607 "parser.yy"
+#line 608 "parser.yy"
     { (yyval.op) = OperKinds::Assign; }
     break;
@@ -5508 +5508 @@
 
 /* Line 1806 of yacc.c  */
-#line 608 "parser.yy"
+#line 609 "parser.yy"
     { (yyval.op) = OperKinds::MulAssn; }
     break;
@@ -5515 +5515 @@
 
 /* Line 1806 of yacc.c  */
-#line 609 "parser.yy"
+#line 610 "parser.yy"
     { (yyval.op) = OperKinds::DivAssn; }
     break;
@@ -5522 +5522 @@
 
 /* Line 1806 of yacc.c  */
-#line 610 "parser.yy"
+#line 611 "parser.yy"
     { (yyval.op) = OperKinds::ModAssn; }
     break;
@@ -5529 +5529 @@
 
 /* Line 1806 of yacc.c  */
-#line 611 "parser.yy"
+#line 612 "parser.yy"
     { (yyval.op) = OperKinds::PlusAssn; }
     break;
@@ -5536 +5536 @@
 
 /* Line 1806 of yacc.c  */
-#line 612 "parser.yy"
+#line 613 "parser.yy"
     { (yyval.op) = OperKinds::MinusAssn; }
     break;
@@ -5543 +5543 @@
 
 /* Line 1806 of yacc.c  */
-#line 613 "parser.yy"
+#line 614 "parser.yy"
     { (yyval.op) = OperKinds::LSAssn; }
     break;
@@ -5550 +5550 @@
 
 /* Line 1806 of yacc.c  */
-#line 614 "parser.yy"
+#line 615 "parser.yy"
     { (yyval.op) = OperKinds::RSAssn; }
     break;
@@ -5557 +5557 @@
 
 /* Line 1806 of yacc.c  */
-#line 615 "parser.yy"
+#line 616 "parser.yy"
     { (yyval.op) = OperKinds::AndAssn; }
     break;
@@ -5564 +5564 @@
 
 /* Line 1806 of yacc.c  */
-#line 616 "parser.yy"
+#line 617 "parser.yy"
     { (yyval.op) = OperKinds::ERAssn; }
     break;
@@ -5571 +5571 @@
 
 /* Line 1806 of yacc.c  */
-#line 617 "parser.yy"
+#line 618 "parser.yy"
     { (yyval.op) = OperKinds::OrAssn; }
     break;
@@ -5578 +5578 @@
 
 /* Line 1806 of yacc.c  */
-#line 624 "parser.yy"
+#line 625 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_tuple() ); }
     break;
@@ -5585 +5585 @@
 
 /* Line 1806 of yacc.c  */
-#line 626 "parser.yy"
+#line 627 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_tuple( (yyvsp[(3) - (5)].en) ) ); }
     break;
@@ -5592 +5592 @@
 
 /* Line 1806 of yacc.c  */
-#line 628 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_tuple( (ExpressionNode *)(new ExpressionNode( nullptr ) )->set_last( (yyvsp[(4) - (6)].en) ) ) ); }
+#line 629 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_tuple( (ExpressionNode *)(new ExpressionNode( nullptr ) )->set_link( (yyvsp[(4) - (6)].en) ) ) ); }
     break;
 
@@ -5599 +5599 @@
 
 /* Line 1806 of yacc.c  */
-#line 630 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_tuple( (ExpressionNode *)(yyvsp[(3) - (7)].en)->set_last( (yyvsp[(5) - (7)].en) ) ) ); }
+#line 631 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_tuple( (ExpressionNode *)(yyvsp[(3) - (7)].en)->set_link( (yyvsp[(5) - (7)].en) ) ) ); }
     break;
 
@@ -5606 +5606 @@
 
 /* Line 1806 of yacc.c  */
-#line 636 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) ); }
+#line 637 "parser.yy"
+    { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -5613 +5613 @@
 
 /* Line 1806 of yacc.c  */
-#line 642 "parser.yy"
+#line 643 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_comma( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5620 +5620 @@
 
 /* Line 1806 of yacc.c  */
-#line 647 "parser.yy"
+#line 648 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -5627 +5627 @@
 
 /* Line 1806 of yacc.c  */
-#line 656 "parser.yy"
+#line 657 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (1)].sn); }
     break;
@@ -5634 +5634 @@
 
 /* Line 1806 of yacc.c  */
-#line 663 "parser.yy"
+#line 664 "parser.yy"
     {
                         Token fn;
                         fn.str = new std::string( "^?{}" ); // location undefined
-                        (yyval.sn) = new StatementNode2( build_expr( new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( (yyvsp[(2) - (6)].en) )->set_last( (yyvsp[(4) - (6)].en) ) ) ) ) );
+                        (yyval.sn) = new StatementNode2( build_expr( new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( (yyvsp[(2) - (6)].en) )->set_link( (yyvsp[(4) - (6)].en) ) ) ) ) );
                 }
     break;
@@ -5645 +5645 @@
 
 /* Line 1806 of yacc.c  */
-#line 673 "parser.yy"
+#line 674 "parser.yy"
     {
                         (yyval.sn) = (yyvsp[(4) - (4)].sn)->add_label( (yyvsp[(1) - (4)].tok) );
@@ -5654 +5654 @@
 
 /* Line 1806 of yacc.c  */
-#line 680 "parser.yy"
+#line 681 "parser.yy"
     { (yyval.sn) = new CompoundStmtNode( (StatementNode *)0 ); }
     break;
@@ -5661 +5661 @@
 
 /* Line 1806 of yacc.c  */
-#line 687 "parser.yy"
+#line 688 "parser.yy"
     { (yyval.sn) = new CompoundStmtNode( (yyvsp[(5) - (7)].sn) ); }
     break;
@@ -5668 +5668 @@
 
 /* Line 1806 of yacc.c  */
-#line 693 "parser.yy"
-    { if ( (yyvsp[(1) - (3)].sn) != 0 ) { (yyvsp[(1) - (3)].sn)->set_last( (yyvsp[(3) - (3)].sn) ); (yyval.sn) = (yyvsp[(1) - (3)].sn); } }
+#line 694 "parser.yy"
+    { if ( (yyvsp[(1) - (3)].sn) != 0 ) { (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(3) - (3)].sn) ); (yyval.sn) = (yyvsp[(1) - (3)].sn); } }
     break;
 
@@ -5675 +5675 @@
 
 /* Line 1806 of yacc.c  */
-#line 698 "parser.yy"
-    { (yyval.sn) = new StatementNode2( (yyvsp[(1) - (1)].decl) ); }
+#line 699 "parser.yy"
+    { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
     break;
 
@@ -5682 +5682 @@
 
 /* Line 1806 of yacc.c  */
-#line 700 "parser.yy"
+#line 701 "parser.yy"
     {   // mark all fields in list
-                        for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_next() )
+                        for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_link() )
                                 iter->set_extension( true );
-                        (yyval.sn) = new StatementNode2( (yyvsp[(2) - (2)].decl) );
+                        (yyval.sn) = new StatementNode( (yyvsp[(2) - (2)].decl) );
                 }
     break;
@@ -5693 +5693 @@
 
 /* Line 1806 of yacc.c  */
-#line 706 "parser.yy"
-    { (yyval.sn) = new StatementNode2( (yyvsp[(1) - (1)].decl) ); }
+#line 707 "parser.yy"
+    { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
     break;
 
@@ -5700 +5700 @@
 
 /* Line 1806 of yacc.c  */
-#line 713 "parser.yy"
-    { if ( (yyvsp[(1) - (2)].sn) != 0 ) { (yyvsp[(1) - (2)].sn)->set_last( (yyvsp[(2) - (2)].sn) ); (yyval.sn) = (yyvsp[(1) - (2)].sn); } }
+#line 714 "parser.yy"
+    { if ( (yyvsp[(1) - (2)].sn) != 0 ) { (yyvsp[(1) - (2)].sn)->set_link( (yyvsp[(2) - (2)].sn) ); (yyval.sn) = (yyvsp[(1) - (2)].sn); } }
     break;
 
@@ -5707 +5707 @@
 
 /* Line 1806 of yacc.c  */
-#line 718 "parser.yy"
+#line 719 "parser.yy"
     { (yyval.sn) = new StatementNode2( build_expr( (yyvsp[(1) - (2)].en) ) ); }
     break;
@@ -5714 +5714 @@
 
 /* Line 1806 of yacc.c  */
-#line 724 "parser.yy"
+#line 725 "parser.yy"
     { (yyval.sn) = new StatementNode2( build_if( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn), nullptr ) ); }
     break;
@@ -5721 +5721 @@
 
 /* Line 1806 of yacc.c  */
-#line 726 "parser.yy"
+#line 727 "parser.yy"
     { (yyval.sn) = new StatementNode2( build_if( (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].sn), (yyvsp[(7) - (7)].sn) ) ); }
     break;
@@ -5728 +5728 @@
 
 /* Line 1806 of yacc.c  */
-#line 728 "parser.yy"
+#line 729 "parser.yy"
     { (yyval.sn) = new StatementNode2( build_switch( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ) ); }
     break;
@@ -5735 +5735 @@
 
 /* Line 1806 of yacc.c  */
-#line 730 "parser.yy"
+#line 731 "parser.yy"
     {
                         StatementNode *sw = new StatementNode2( build_switch( (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) ) );
@@ -5743 +5743 @@
                         // therefore, are removed from the grammar even though C allows it. The change also applies to choose
                         // statement.
-                        (yyval.sn) = (yyvsp[(7) - (9)].decl) != 0 ? new CompoundStmtNode( (StatementNode *)((new StatementNode2( (yyvsp[(7) - (9)].decl) ))->set_last( sw )) ) : sw;
+                        (yyval.sn) = (yyvsp[(7) - (9)].decl) != 0 ? new CompoundStmtNode( (StatementNode *)((new StatementNode( (yyvsp[(7) - (9)].decl) ))->set_link( sw )) ) : sw;
                 }
     break;
@@ -5750 +5750 @@
 
 /* Line 1806 of yacc.c  */
-#line 740 "parser.yy"
+#line 741 "parser.yy"
     { (yyval.sn) = new StatementNode2( build_switch( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ) ); }
     break;
@@ -5757 +5757 @@
 
 /* Line 1806 of yacc.c  */
-#line 742 "parser.yy"
+#line 743 "parser.yy"
     {
                         StatementNode *sw = new StatementNode2( build_switch( (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) ) );
-                        (yyval.sn) = (yyvsp[(7) - (9)].decl) != 0 ? new CompoundStmtNode( (StatementNode *)((new StatementNode2( (yyvsp[(7) - (9)].decl) ))->set_last( sw )) ) : sw;
+                        (yyval.sn) = (yyvsp[(7) - (9)].decl) != 0 ? new CompoundStmtNode( (StatementNode *)((new StatementNode( (yyvsp[(7) - (9)].decl) ))->set_link( sw )) ) : sw;
                 }
     break;
@@ -5767 +5767 @@
 
 /* Line 1806 of yacc.c  */
-#line 752 "parser.yy"
+#line 753 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
@@ -5774 +5774 @@
 
 /* Line 1806 of yacc.c  */
-#line 754 "parser.yy"
+#line 755 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_range( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5781 +5781 @@
 
 /* Line 1806 of yacc.c  */
-#line 759 "parser.yy"
+#line 761 "parser.yy"
     { (yyval.sn) = new StatementNode2( build_case( (yyvsp[(1) - (1)].en) ) ); }
     break;
@@ -5788 +5788 @@
 
 /* Line 1806 of yacc.c  */
-#line 761 "parser.yy"
-    { (yyval.sn) = (StatementNode *)((yyvsp[(1) - (3)].sn)->set_last( new StatementNode2( build_case( (yyvsp[(3) - (3)].en) ) ) ) ); }
+#line 763 "parser.yy"
+    { (yyval.sn) = (StatementNode *)((yyvsp[(1) - (3)].sn)->set_link( new StatementNode2( build_case( (yyvsp[(3) - (3)].en) ) ) ) ); }
     break;
 
@@ -5795 +5795 @@
 
 /* Line 1806 of yacc.c  */
-#line 765 "parser.yy"
+#line 767 "parser.yy"
     { (yyval.sn) = (yyvsp[(2) - (3)].sn); }
     break;
@@ -5802 +5802 @@
 
 /* Line 1806 of yacc.c  */
-#line 766 "parser.yy"
+#line 768 "parser.yy"
     { (yyval.sn) = new StatementNode2( build_default() ); }
     break;
@@ -5809 +5809 @@
 
 /* Line 1806 of yacc.c  */
-#line 772 "parser.yy"
-    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (2)].sn)->set_last( (yyvsp[(2) - (2)].sn) )); }
+#line 774 "parser.yy"
+    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (2)].sn)->set_link( (yyvsp[(2) - (2)].sn) )); }
     break;
 
@@ -5816 +5816 @@
 
 /* Line 1806 of yacc.c  */
-#line 776 "parser.yy"
+#line 778 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( new CompoundStmtNode( (yyvsp[(2) - (2)].sn) ) ); }
     break;
@@ -5823 +5823 @@
 
 /* Line 1806 of yacc.c  */
-#line 781 "parser.yy"
+#line 783 "parser.yy"
     { (yyval.sn) = 0; }
     break;
@@ -5830 +5830 @@
 
 /* Line 1806 of yacc.c  */
-#line 787 "parser.yy"
+#line 789 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( new CompoundStmtNode( (yyvsp[(2) - (2)].sn) ) ); }
     break;
@@ -5837 +5837 @@
 
 /* Line 1806 of yacc.c  */
-#line 789 "parser.yy"
-    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_last( (yyvsp[(2) - (3)].sn)->append_last_case( new CompoundStmtNode( (yyvsp[(3) - (3)].sn) ) ) ) ); }
+#line 791 "parser.yy"
+    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(2) - (3)].sn)->append_last_case( new CompoundStmtNode( (yyvsp[(3) - (3)].sn) ) ) ) ); }
     break;
 
@@ -5844 +5844 @@
 
 /* Line 1806 of yacc.c  */
-#line 794 "parser.yy"
+#line 796 "parser.yy"
     { (yyval.sn) = 0; }
     break;
@@ -5851 +5851 @@
 
 /* Line 1806 of yacc.c  */
-#line 800 "parser.yy"
+#line 802 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
     break;
@@ -5858 +5858 @@
 
 /* Line 1806 of yacc.c  */
-#line 802 "parser.yy"
+#line 804 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (3)].sn)->append_last_case( new CompoundStmtNode( (StatementNode *)mkList( (*(yyvsp[(2) - (3)].sn), *(yyvsp[(3) - (3)].sn) ) ) ) ); }
     break;
@@ -5865 +5865 @@
 
 /* Line 1806 of yacc.c  */
-#line 804 "parser.yy"
-    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_last( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
+#line 806 "parser.yy"
+    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
     break;
 
@@ -5872 +5872 @@
 
 /* Line 1806 of yacc.c  */
-#line 806 "parser.yy"
-    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (4)].sn)->set_last( (yyvsp[(2) - (4)].sn)->append_last_case( new CompoundStmtNode( (StatementNode *)mkList( (*(yyvsp[(3) - (4)].sn), *(yyvsp[(4) - (4)].sn) ) ) ) ) ) ); }
+#line 808 "parser.yy"
+    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (4)].sn)->set_link( (yyvsp[(2) - (4)].sn)->append_last_case( new CompoundStmtNode( (StatementNode *)mkList( (*(yyvsp[(3) - (4)].sn), *(yyvsp[(4) - (4)].sn) ) ) ) ) ) ); }
     break;
 
@@ -5879 +5879 @@
 
 /* Line 1806 of yacc.c  */
-#line 811 "parser.yy"
+#line 813 "parser.yy"
     { (yyval.sn) = new StatementNode2( build_branch( "", BranchStmt::Break ) ); }
     break;
 
   case 177:
-
-/* Line 1806 of yacc.c  */
-#line 817 "parser.yy"
-    { (yyval.sn) = 0; }
-    break;
-
-  case 178:
 
 /* Line 1806 of yacc.c  */
@@ -5897 +5890 @@
     break;
 
+  case 178:
+
+/* Line 1806 of yacc.c  */
+#line 821 "parser.yy"
+    { (yyval.sn) = 0; }
+    break;
+
   case 179:
 
 /* Line 1806 of yacc.c  */
-#line 824 "parser.yy"
+#line 826 "parser.yy"
     { (yyval.sn) = new StatementNode2( build_while( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ) ); }
     break;
@@ -5907 +5907 @@
 
 /* Line 1806 of yacc.c  */
-#line 826 "parser.yy"
+#line 828 "parser.yy"
     { (yyval.sn) = new StatementNode2( build_while( (yyvsp[(5) - (7)].en), (yyvsp[(2) - (7)].sn) ) ); }
     break;
@@ -5914 +5914 @@
 
 /* Line 1806 of yacc.c  */
-#line 828 "parser.yy"
+#line 830 "parser.yy"
     { (yyval.sn) = new StatementNode2( build_for( (yyvsp[(4) - (6)].fctl), (yyvsp[(6) - (6)].sn) ) ); }
     break;
@@ -5921 +5921 @@
 
 /* Line 1806 of yacc.c  */
-#line 833 "parser.yy"
+#line 835 "parser.yy"
     { (yyval.fctl) = new ForCtl( (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].en) ); }
     break;
@@ -5928 +5928 @@
 
 /* Line 1806 of yacc.c  */
-#line 835 "parser.yy"
+#line 837 "parser.yy"
     { (yyval.fctl) = new ForCtl( (yyvsp[(1) - (4)].decl), (yyvsp[(2) - (4)].en), (yyvsp[(4) - (4)].en) ); }
     break;
@@ -5935 +5935 @@
 
 /* Line 1806 of yacc.c  */
-#line 840 "parser.yy"
+#line 842 "parser.yy"
     { (yyval.sn) = new StatementNode2( build_branch( *(yyvsp[(2) - (3)].tok), BranchStmt::Goto ) ); }
     break;
@@ -5942 +5942 @@
 
 /* Line 1806 of yacc.c  */
-#line 844 "parser.yy"
+#line 846 "parser.yy"
     { (yyval.sn) = new StatementNode2( build_computedgoto( (yyvsp[(3) - (4)].en) ) ); }
     break;
@@ -5949 +5949 @@
 
 /* Line 1806 of yacc.c  */
-#line 847 "parser.yy"
+#line 849 "parser.yy"
     { (yyval.sn) = new StatementNode2( build_branch( "", BranchStmt::Continue ) ); }
     break;
@@ -5956 +5956 @@
 
 /* Line 1806 of yacc.c  */
-#line 851 "parser.yy"
+#line 853 "parser.yy"
     { (yyval.sn) = new StatementNode2( build_branch( *(yyvsp[(2) - (3)].tok), BranchStmt::Continue ) ); delete (yyvsp[(2) - (3)].tok); }
     break;
@@ -5963 +5963 @@
 
 /* Line 1806 of yacc.c  */
-#line 854 "parser.yy"
+#line 856 "parser.yy"
     { (yyval.sn) = new StatementNode2( build_branch( "", BranchStmt::Break ) ); }
     break;
@@ -5970 +5970 @@
 
 /* Line 1806 of yacc.c  */
-#line 858 "parser.yy"
+#line 860 "parser.yy"
     { (yyval.sn) = new StatementNode2( build_branch( *(yyvsp[(2) - (3)].tok), BranchStmt::Break ) ); delete (yyvsp[(2) - (3)].tok); }
     break;
@@ -5977 +5977 @@
 
 /* Line 1806 of yacc.c  */
-#line 860 "parser.yy"
+#line 862 "parser.yy"
     { (yyval.sn) = new StatementNode2( build_return( (yyvsp[(2) - (3)].en) ) ); }
     break;
 
   case 191:
-
-/* Line 1806 of yacc.c  */
-#line 862 "parser.yy"
-    { (yyval.sn) = new StatementNode2( build_throw( (yyvsp[(2) - (3)].en) ) ); }
-    break;
-
-  case 192:
 
 /* Line 1806 of yacc.c  */
@@ -5995 +5988 @@
     break;
 
+  case 192:
+
+/* Line 1806 of yacc.c  */
+#line 866 "parser.yy"
+    { (yyval.sn) = new StatementNode2( build_throw( (yyvsp[(2) - (3)].en) ) ); }
+    break;
+
   case 193:
 
 /* Line 1806 of yacc.c  */
-#line 866 "parser.yy"
+#line 868 "parser.yy"
     { (yyval.sn) = new StatementNode2( build_throw( (yyvsp[(2) - (5)].en) ) ); }
     break;
@@ -6005 +6005 @@
 
 /* Line 1806 of yacc.c  */
-#line 871 "parser.yy"
-    { (yyval.sn) = new StatementNode2( build_try( (yyvsp[(2) - (3)].sn), (yyvsp[(3) - (3)].sn), 0 ) ); }
+#line 873 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].pn) )))); }
     break;
 
@@ -6012 +6012 @@
 
 /* Line 1806 of yacc.c  */
-#line 873 "parser.yy"
-    { (yyval.sn) = new StatementNode2( build_try( (yyvsp[(2) - (3)].sn), 0, (yyvsp[(3) - (3)].sn) ) ); }
+#line 875 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].pn) )))); }
     break;
 
@@ -6019 +6019 @@
 
 /* Line 1806 of yacc.c  */
-#line 875 "parser.yy"
-    { (yyval.sn) = new StatementNode2( build_try( (yyvsp[(2) - (4)].sn), (yyvsp[(3) - (4)].sn), (yyvsp[(4) - (4)].sn) ) ); }
+#line 877 "parser.yy"
+    {
+                        (yyvsp[(3) - (4)].pn)->set_link( (yyvsp[(4) - (4)].pn) );
+                        (yyval.sn) = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (4)].sn),*(yyvsp[(3) - (4)].pn) ))));
+                }
     break;
 
@@ -6026 +6029 @@
 
 /* Line 1806 of yacc.c  */
-#line 882 "parser.yy"
-    { (yyval.sn) = new StatementNode2( build_catch( 0, (yyvsp[(5) - (5)].sn), true ) ); }
+#line 888 "parser.yy"
+    { (yyval.pn) = StatementNode::newCatchStmt( 0, (yyvsp[(5) - (5)].sn), true ); }
     break;
 
@@ -6033 +6036 @@
 
 /* Line 1806 of yacc.c  */
-#line 884 "parser.yy"
-    { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (6)].sn)->set_last( new StatementNode2( build_catch( 0, (yyvsp[(6) - (6)].sn), true ) ) ); }
+#line 890 "parser.yy"
+    { (yyval.pn) = (yyvsp[(1) - (6)].pn)->set_link( StatementNode::newCatchStmt( 0, (yyvsp[(6) - (6)].sn), true ) ); }
     break;
 
@@ -6040 +6043 @@
 
 /* Line 1806 of yacc.c  */
-#line 886 "parser.yy"
-    { (yyval.sn) = new StatementNode2( build_catch( 0, (yyvsp[(5) - (5)].sn), true ) ); }
+#line 892 "parser.yy"
+    { (yyval.pn) = StatementNode::newCatchStmt( 0, (yyvsp[(5) - (5)].sn), true ); }
     break;
 
@@ -6047 +6050 @@
 
 /* Line 1806 of yacc.c  */
-#line 888 "parser.yy"
-    { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (6)].sn)->set_last( new StatementNode2( build_catch( 0, (yyvsp[(6) - (6)].sn), true ) ) ); }
+#line 894 "parser.yy"
+    { (yyval.pn) = (yyvsp[(1) - (6)].pn)->set_link( StatementNode::newCatchStmt( 0, (yyvsp[(6) - (6)].sn), true ) ); }
     break;
 
@@ -6054 +6057 @@
 
 /* Line 1806 of yacc.c  */
-#line 893 "parser.yy"
-    { (yyval.sn) = new StatementNode2( build_catch( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ) ); }
+#line 899 "parser.yy"
+    { (yyval.pn) = StatementNode::newCatchStmt( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ); }
     break;
 
@@ -6061 +6064 @@
 
 /* Line 1806 of yacc.c  */
-#line 895 "parser.yy"
-    { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (10)].sn)->set_last( new StatementNode2( build_catch( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ) ); }
+#line 901 "parser.yy"
+    { (yyval.pn) = (yyvsp[(1) - (10)].pn)->set_link( StatementNode::newCatchStmt( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ); }
     break;
 
@@ -6068 +6071 @@
 
 /* Line 1806 of yacc.c  */
-#line 897 "parser.yy"
-    { (yyval.sn) = new StatementNode2( build_catch( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ) ); }
+#line 903 "parser.yy"
+    { (yyval.pn) = StatementNode::newCatchStmt( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ); }
     break;
 
@@ -6075 +6078 @@
 
 /* Line 1806 of yacc.c  */
-#line 899 "parser.yy"
-    { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (10)].sn)->set_last( new StatementNode2( build_catch( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ) ); }
+#line 905 "parser.yy"
+    { (yyval.pn) = (yyvsp[(1) - (10)].pn)->set_link( StatementNode::newCatchStmt( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ); }
     break;
 
@@ -6082 +6085 @@
 
 /* Line 1806 of yacc.c  */
-#line 904 "parser.yy"
+#line 910 "parser.yy"
     {
-                        (yyval.sn) = new StatementNode2( build_finally( (yyvsp[(2) - (2)].sn) ) );
+                        (yyval.pn) = new StatementNode( StatementNode::Finally, 0, (yyvsp[(2) - (2)].sn) );
+                        std::cout << "Just created a finally node" << std::endl;
                 }
     break;
@@ -6091 +6095 @@
 
 /* Line 1806 of yacc.c  */
-#line 917 "parser.yy"
+#line 924 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6101 +6105 @@
 
 /* Line 1806 of yacc.c  */
-#line 922 "parser.yy"
+#line 929 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6108 +6112 @@
 
 /* Line 1806 of yacc.c  */
-#line 924 "parser.yy"
+#line 931 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6118 +6122 @@
 
 /* Line 1806 of yacc.c  */
-#line 933 "parser.yy"
-    { (yyval.sn) = new AsmStmtNode( (yyvsp[(2) - (6)].flag), (yyvsp[(4) - (6)].constant), 0 ); }
+#line 940 "parser.yy"
+    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (6)].flag), (yyvsp[(4) - (6)].constant), 0 ); }
     break;
 
@@ -6125 +6129 @@
 
 /* Line 1806 of yacc.c  */
-#line 935 "parser.yy"
-    { (yyval.sn) = new AsmStmtNode( (yyvsp[(2) - (8)].flag), (yyvsp[(4) - (8)].constant), (yyvsp[(6) - (8)].en) ); }
+#line 942 "parser.yy"
+    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (8)].flag), (yyvsp[(4) - (8)].constant), (yyvsp[(6) - (8)].en) ); }
     break;
 
@@ -6132 +6136 @@
 
 /* Line 1806 of yacc.c  */
-#line 937 "parser.yy"
-    { (yyval.sn) = new AsmStmtNode( (yyvsp[(2) - (10)].flag), (yyvsp[(4) - (10)].constant), (yyvsp[(6) - (10)].en), (yyvsp[(8) - (10)].en) ); }
+#line 944 "parser.yy"
+    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (10)].flag), (yyvsp[(4) - (10)].constant), (yyvsp[(6) - (10)].en), (yyvsp[(8) - (10)].en) ); }
     break;
 
@@ -6139 +6143 @@
 
 /* Line 1806 of yacc.c  */
-#line 939 "parser.yy"
-    { (yyval.sn) = new AsmStmtNode( (yyvsp[(2) - (12)].flag), (yyvsp[(4) - (12)].constant), (yyvsp[(6) - (12)].en), (yyvsp[(8) - (12)].en), (yyvsp[(10) - (12)].en) ); }
+#line 946 "parser.yy"
+    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (12)].flag), (yyvsp[(4) - (12)].constant), (yyvsp[(6) - (12)].en), (yyvsp[(8) - (12)].en), (yyvsp[(10) - (12)].en) ); }
     break;
 
@@ -6146 +6150 @@
 
 /* Line 1806 of yacc.c  */
-#line 941 "parser.yy"
-    { (yyval.sn) = new AsmStmtNode( (yyvsp[(2) - (14)].flag), (yyvsp[(5) - (14)].constant), 0, (yyvsp[(8) - (14)].en), (yyvsp[(10) - (14)].en), (yyvsp[(12) - (14)].label) ); }
+#line 948 "parser.yy"
+    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (14)].flag), (yyvsp[(5) - (14)].constant), 0, (yyvsp[(8) - (14)].en), (yyvsp[(10) - (14)].en), (yyvsp[(12) - (14)].label) ); }
     break;
 
@@ -6153 +6157 @@
 
 /* Line 1806 of yacc.c  */
-#line 946 "parser.yy"
+#line 953 "parser.yy"
     { (yyval.flag) = false; }
     break;
@@ -6160 +6164 @@
 
 /* Line 1806 of yacc.c  */
-#line 948 "parser.yy"
+#line 955 "parser.yy"
     { (yyval.flag) = true; }
     break;
@@ -6167 +6171 @@
 
 /* Line 1806 of yacc.c  */
-#line 953 "parser.yy"
+#line 960 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -6174 +6178 @@
 
 /* Line 1806 of yacc.c  */
-#line 960 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) ); }
+#line 967 "parser.yy"
+    { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -6181 +6185 @@
 
 /* Line 1806 of yacc.c  */
-#line 965 "parser.yy"
+#line 972 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_asm( 0, (yyvsp[(1) - (4)].constant), (yyvsp[(3) - (4)].en) ) ); }
     break;
@@ -6188 +6192 @@
 
 /* Line 1806 of yacc.c  */
-#line 967 "parser.yy"
+#line 974 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_asm( (yyvsp[(2) - (7)].en), (yyvsp[(4) - (7)].constant), (yyvsp[(6) - (7)].en) ) ); }
     break;
@@ -6195 +6199 @@
 
 /* Line 1806 of yacc.c  */
-#line 972 "parser.yy"
+#line 979 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -6202 +6206 @@
 
 /* Line 1806 of yacc.c  */
-#line 974 "parser.yy"
+#line 981 "parser.yy"
     { (yyval.en) = new ExpressionNode( (yyvsp[(1) - (1)].constant) ); }
     break;
@@ -6209 +6213 @@
 
 /* Line 1806 of yacc.c  */
-#line 976 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_last( new ExpressionNode( (yyvsp[(3) - (3)].constant) ) ); }
+#line 983 "parser.yy"
+    { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( new ExpressionNode( (yyvsp[(3) - (3)].constant) ) ); }
     break;
 
@@ -6216 +6220 @@
 
 /* Line 1806 of yacc.c  */
-#line 981 "parser.yy"
+#line 988 "parser.yy"
     { (yyval.label) = new LabelNode(); (yyval.label)->append_label( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -6223 +6227 @@
 
 /* Line 1806 of yacc.c  */
-#line 983 "parser.yy"
+#line 990 "parser.yy"
     { (yyval.label) = (yyvsp[(1) - (3)].label); (yyvsp[(1) - (3)].label)->append_label( (yyvsp[(3) - (3)].tok) ); }
     break;
@@ -6230 +6234 @@
 
 /* Line 1806 of yacc.c  */
-#line 990 "parser.yy"
+#line 997 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6237 +6241 @@
 
 /* Line 1806 of yacc.c  */
-#line 997 "parser.yy"
+#line 1004 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6244 +6248 @@
 
 /* Line 1806 of yacc.c  */
-#line 1002 "parser.yy"
+#line 1009 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6251 +6255 @@
 
 /* Line 1806 of yacc.c  */
-#line 1009 "parser.yy"
+#line 1016 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6258 +6262 @@
 
 /* Line 1806 of yacc.c  */
-#line 1023 "parser.yy"
+#line 1030 "parser.yy"
     {}
     break;
@@ -6265 +6269 @@
 
 /* Line 1806 of yacc.c  */
-#line 1024 "parser.yy"
+#line 1031 "parser.yy"
     {}
     break;
@@ -6272 +6276 @@
 
 /* Line 1806 of yacc.c  */
-#line 1053 "parser.yy"
+#line 1060 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6282 +6286 @@
 
 /* Line 1806 of yacc.c  */
-#line 1060 "parser.yy"
+#line 1067 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6292 +6296 @@
 
 /* Line 1806 of yacc.c  */
-#line 1065 "parser.yy"
+#line 1072 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (6)].tok), TypedefTable::ID );
@@ -6302 +6306 @@
 
 /* Line 1806 of yacc.c  */
-#line 1075 "parser.yy"
+#line 1082 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
@@ -6312 +6316 @@
 
 /* Line 1806 of yacc.c  */
-#line 1080 "parser.yy"
+#line 1087 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
@@ -6322 +6326 @@
 
 /* Line 1806 of yacc.c  */
-#line 1085 "parser.yy"
+#line 1092 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(3) - (4)].tok) );
@@ -6332 +6336 @@
 
 /* Line 1806 of yacc.c  */
-#line 1093 "parser.yy"
+#line 1100 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6342 +6346 @@
 
 /* Line 1806 of yacc.c  */
-#line 1098 "parser.yy"
+#line 1105 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6352 +6356 @@
 
 /* Line 1806 of yacc.c  */
-#line 1103 "parser.yy"
+#line 1110 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6362 +6366 @@
 
 /* Line 1806 of yacc.c  */
-#line 1108 "parser.yy"
+#line 1115 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6372 +6376 @@
 
 /* Line 1806 of yacc.c  */
-#line 1113 "parser.yy"
+#line 1120 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
@@ -6382 +6386 @@
 
 /* Line 1806 of yacc.c  */
-#line 1121 "parser.yy"
+#line 1128 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(3) - (8)].tok), DeclarationNode::newTuple( 0 ), (yyvsp[(6) - (8)].decl), 0, true );
@@ -6391 +6395 @@
 
 /* Line 1806 of yacc.c  */
-#line 1144 "parser.yy"
+#line 1151 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
@@ -6400 +6404 @@
 
 /* Line 1806 of yacc.c  */
-#line 1148 "parser.yy"
+#line 1155 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
@@ -6409 +6413 @@
 
 /* Line 1806 of yacc.c  */
-#line 1155 "parser.yy"
+#line 1162 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -6416 +6420 @@
 
 /* Line 1806 of yacc.c  */
-#line 1159 "parser.yy"
+#line 1166 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (9)].decl)->appendList( (yyvsp[(7) - (9)].decl) ) ); }
     break;
@@ -6423 +6427 @@
 
 /* Line 1806 of yacc.c  */
-#line 1164 "parser.yy"
+#line 1171 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6433 +6437 @@
 
 /* Line 1806 of yacc.c  */
-#line 1169 "parser.yy"
+#line 1176 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6443 +6447 @@
 
 /* Line 1806 of yacc.c  */
-#line 1174 "parser.yy"
+#line 1181 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::TD );
@@ -6453 +6457 @@
 
 /* Line 1806 of yacc.c  */
-#line 1185 "parser.yy"
+#line 1192 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6463 +6467 @@
 
 /* Line 1806 of yacc.c  */
-#line 1190 "parser.yy"
+#line 1197 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6473 +6477 @@
 
 /* Line 1806 of yacc.c  */
-#line 1195 "parser.yy"
+#line 1202 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6483 +6487 @@
 
 /* Line 1806 of yacc.c  */
-#line 1200 "parser.yy"
+#line 1207 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6493 +6497 @@
 
 /* Line 1806 of yacc.c  */
-#line 1205 "parser.yy"
+#line 1212 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6503 +6507 @@
 
 /* Line 1806 of yacc.c  */
-#line 1214 "parser.yy"
+#line 1221 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (4)].tok), TypedefTable::TD );
@@ -6513 +6517 @@
 
 /* Line 1806 of yacc.c  */
-#line 1219 "parser.yy"
+#line 1226 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (7)].tok), TypedefTable::TD );
@@ -6523 +6527 @@
 
 /* Line 1806 of yacc.c  */
-#line 1236 "parser.yy"
+#line 1243 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6533 +6537 @@
 
 /* Line 1806 of yacc.c  */
-#line 1241 "parser.yy"
+#line 1248 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6543 +6547 @@
 
 /* Line 1806 of yacc.c  */
-#line 1263 "parser.yy"
+#line 1270 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6550 +6554 @@
 
 /* Line 1806 of yacc.c  */
-#line 1275 "parser.yy"
+#line 1282 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6557 +6561 @@
 
 /* Line 1806 of yacc.c  */
-#line 1286 "parser.yy"
+#line 1293 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Const ); }
     break;
@@ -6564 +6568 @@
 
 /* Line 1806 of yacc.c  */
-#line 1288 "parser.yy"
+#line 1295 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Restrict ); }
     break;
@@ -6571 +6575 @@
 
 /* Line 1806 of yacc.c  */
-#line 1290 "parser.yy"
+#line 1297 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Volatile ); }
     break;
@@ -6578 +6582 @@
 
 /* Line 1806 of yacc.c  */
-#line 1292 "parser.yy"
+#line 1299 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Lvalue ); }
     break;
@@ -6585 +6589 @@
 
 /* Line 1806 of yacc.c  */
-#line 1294 "parser.yy"
+#line 1301 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Atomic ); }
     break;
@@ -6592 +6596 @@
 
 /* Line 1806 of yacc.c  */
-#line 1296 "parser.yy"
+#line 1303 "parser.yy"
     {
                         typedefTable.enterScope();
@@ -6601 +6605 @@
 
 /* Line 1806 of yacc.c  */
-#line 1300 "parser.yy"
+#line 1307 "parser.yy"
     {
                         typedefTable.leaveScope();
@@ -6611 +6615 @@
 
 /* Line 1806 of yacc.c  */
-#line 1309 "parser.yy"
+#line 1316 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6618 +6622 @@
 
 /* Line 1806 of yacc.c  */
-#line 1311 "parser.yy"
+#line 1318 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6625 +6629 @@
 
 /* Line 1806 of yacc.c  */
-#line 1322 "parser.yy"
+#line 1329 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6632 +6636 @@
 
 /* Line 1806 of yacc.c  */
-#line 1331 "parser.yy"
+#line 1338 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Extern ); }
     break;
@@ -6639 +6643 @@
 
 /* Line 1806 of yacc.c  */
-#line 1333 "parser.yy"
+#line 1340 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Static ); }
     break;
@@ -6646 +6650 @@
 
 /* Line 1806 of yacc.c  */
-#line 1335 "parser.yy"
+#line 1342 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Auto ); }
     break;
@@ -6653 +6657 @@
 
 /* Line 1806 of yacc.c  */
-#line 1337 "parser.yy"
+#line 1344 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Register ); }
     break;
@@ -6660 +6664 @@
 
 /* Line 1806 of yacc.c  */
-#line 1339 "parser.yy"
+#line 1346 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Inline ); }
     break;
@@ -6667 +6671 @@
 
 /* Line 1806 of yacc.c  */
-#line 1341 "parser.yy"
+#line 1348 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Fortran ); }
     break;
@@ -6674 +6678 @@
 
 /* Line 1806 of yacc.c  */
-#line 1343 "parser.yy"
+#line 1350 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Noreturn ); }
     break;
@@ -6681 +6685 @@
 
 /* Line 1806 of yacc.c  */
-#line 1345 "parser.yy"
+#line 1352 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Threadlocal ); }
     break;
@@ -6688 +6692 @@
 
 /* Line 1806 of yacc.c  */
-#line 1350 "parser.yy"
+#line 1357 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Char ); }
     break;
@@ -6695 +6699 @@
 
 /* Line 1806 of yacc.c  */
-#line 1352 "parser.yy"
+#line 1359 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Double ); }
     break;
@@ -6702 +6706 @@
 
 /* Line 1806 of yacc.c  */
-#line 1354 "parser.yy"
+#line 1361 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Float ); }
     break;
@@ -6709 +6713 @@
 
 /* Line 1806 of yacc.c  */
-#line 1356 "parser.yy"
+#line 1363 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Int ); }
     break;
@@ -6716 +6720 @@
 
 /* Line 1806 of yacc.c  */
-#line 1358 "parser.yy"
+#line 1365 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Long ); }
     break;
@@ -6723 +6727 @@
 
 /* Line 1806 of yacc.c  */
-#line 1360 "parser.yy"
+#line 1367 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Short ); }
     break;
@@ -6730 +6734 @@
 
 /* Line 1806 of yacc.c  */
-#line 1362 "parser.yy"
+#line 1369 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Signed ); }
     break;
@@ -6737 +6741 @@
 
 /* Line 1806 of yacc.c  */
-#line 1364 "parser.yy"
+#line 1371 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Unsigned ); }
     break;
@@ -6744 +6748 @@
 
 /* Line 1806 of yacc.c  */
-#line 1366 "parser.yy"
+#line 1373 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Void ); }
     break;
@@ -6751 +6755 @@
 
 /* Line 1806 of yacc.c  */
-#line 1368 "parser.yy"
+#line 1375 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Bool ); }
     break;
@@ -6758 +6762 @@
 
 /* Line 1806 of yacc.c  */
-#line 1370 "parser.yy"
+#line 1377 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Complex ); }
     break;
@@ -6765 +6769 @@
 
 /* Line 1806 of yacc.c  */
-#line 1372 "parser.yy"
+#line 1379 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Imaginary ); }
     break;
@@ -6772 +6776 @@
 
 /* Line 1806 of yacc.c  */
-#line 1374 "parser.yy"
+#line 1381 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
     break;
@@ -6779 +6783 @@
 
 /* Line 1806 of yacc.c  */
-#line 1381 "parser.yy"
+#line 1388 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6786 +6790 @@
 
 /* Line 1806 of yacc.c  */
-#line 1383 "parser.yy"
+#line 1390 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6793 +6797 @@
 
 /* Line 1806 of yacc.c  */
-#line 1385 "parser.yy"
+#line 1392 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6800 +6804 @@
 
 /* Line 1806 of yacc.c  */
-#line 1387 "parser.yy"
+#line 1394 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addType( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -6807 +6811 @@
 
 /* Line 1806 of yacc.c  */
-#line 1393 "parser.yy"
+#line 1400 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6814 +6818 @@
 
 /* Line 1806 of yacc.c  */
-#line 1400 "parser.yy"
+#line 1407 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6821 +6825 @@
 
 /* Line 1806 of yacc.c  */
-#line 1402 "parser.yy"
+#line 1409 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6828 +6832 @@
 
 /* Line 1806 of yacc.c  */
-#line 1404 "parser.yy"
+#line 1411 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addType( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6835 +6839 @@
 
 /* Line 1806 of yacc.c  */
-#line 1409 "parser.yy"
+#line 1416 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (4)].decl); }
     break;
@@ -6842 +6846 @@
 
 /* Line 1806 of yacc.c  */
-#line 1411 "parser.yy"
+#line 1418 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTypeof( (yyvsp[(3) - (4)].en) ); }
     break;
@@ -6849 +6853 @@
 
 /* Line 1806 of yacc.c  */
-#line 1413 "parser.yy"
+#line 1420 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -6856 +6860 @@
 
 /* Line 1806 of yacc.c  */
-#line 1415 "parser.yy"
+#line 1422 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -6863 +6867 @@
 
 /* Line 1806 of yacc.c  */
-#line 1421 "parser.yy"
+#line 1428 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6870 +6874 @@
 
 /* Line 1806 of yacc.c  */
-#line 1423 "parser.yy"
+#line 1430 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6877 +6881 @@
 
 /* Line 1806 of yacc.c  */
-#line 1425 "parser.yy"
+#line 1432 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6884 +6888 @@
 
 /* Line 1806 of yacc.c  */
-#line 1431 "parser.yy"
+#line 1438 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6891 +6895 @@
 
 /* Line 1806 of yacc.c  */
-#line 1433 "parser.yy"
+#line 1440 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6898 +6902 @@
 
 /* Line 1806 of yacc.c  */
-#line 1439 "parser.yy"
+#line 1446 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6905 +6909 @@
 
 /* Line 1806 of yacc.c  */
-#line 1441 "parser.yy"
+#line 1448 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6912 +6916 @@
 
 /* Line 1806 of yacc.c  */
-#line 1443 "parser.yy"
+#line 1450 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6919 +6923 @@
 
 /* Line 1806 of yacc.c  */
-#line 1448 "parser.yy"
+#line 1455 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -6926 +6930 @@
 
 /* Line 1806 of yacc.c  */
-#line 1450 "parser.yy"
+#line 1457 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(2) - (2)].tok) )->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6933 +6937 @@
 
 /* Line 1806 of yacc.c  */
-#line 1452 "parser.yy"
+#line 1459 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6940 +6944 @@
 
 /* Line 1806 of yacc.c  */
-#line 1462 "parser.yy"
+#line 1469 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (4)].aggKey), 0, 0, (yyvsp[(3) - (4)].decl), true ); }
     break;
@@ -6947 +6951 @@
 
 /* Line 1806 of yacc.c  */
-#line 1464 "parser.yy"
+#line 1471 "parser.yy"
     {
                         typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
@@ -6957 +6961 @@
 
 /* Line 1806 of yacc.c  */
-#line 1469 "parser.yy"
+#line 1476 "parser.yy"
     { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
     break;
@@ -6964 +6968 @@
 
 /* Line 1806 of yacc.c  */
-#line 1471 "parser.yy"
+#line 1478 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (6)].aggKey), (yyvsp[(2) - (6)].tok), 0, (yyvsp[(5) - (6)].decl), true ); }
     break;
@@ -6971 +6975 @@
 
 /* Line 1806 of yacc.c  */
-#line 1473 "parser.yy"
+#line 1480 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (7)].aggKey), 0, (yyvsp[(3) - (7)].en), (yyvsp[(6) - (7)].decl), false ); }
     break;
@@ -6978 +6982 @@
 
 /* Line 1806 of yacc.c  */
-#line 1475 "parser.yy"
+#line 1482 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
     break;
@@ -6985 +6989 @@
 
 /* Line 1806 of yacc.c  */
-#line 1480 "parser.yy"
+#line 1487 "parser.yy"
     { (yyval.aggKey) = DeclarationNode::Struct; }
     break;
@@ -6992 +6996 @@
 
 /* Line 1806 of yacc.c  */
-#line 1482 "parser.yy"
+#line 1489 "parser.yy"
     { (yyval.aggKey) = DeclarationNode::Union; }
     break;
@@ -6999 +7003 @@
 
 /* Line 1806 of yacc.c  */
-#line 1487 "parser.yy"
+#line 1494 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7006 +7010 @@
 
 /* Line 1806 of yacc.c  */
-#line 1489 "parser.yy"
+#line 1496 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl) != 0 ? (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ) : (yyvsp[(2) - (2)].decl); }
     break;
@@ -7013 +7017 @@
 
 /* Line 1806 of yacc.c  */
-#line 1495 "parser.yy"
+#line 1502 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl)->set_extension( true ); }
     break;
@@ -7020 +7024 @@
 
 /* Line 1806 of yacc.c  */
-#line 1498 "parser.yy"
+#line 1505 "parser.yy"
     {   // mark all fields in list
-                        for ( DeclarationNode *iter = (yyvsp[(2) - (3)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_next() )
+                        for ( DeclarationNode *iter = (yyvsp[(2) - (3)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_link() )
                                 iter->set_extension( true );
                         (yyval.decl) = (yyvsp[(2) - (3)].decl);
@@ -7031 +7035 @@
 
 /* Line 1806 of yacc.c  */
-#line 1508 "parser.yy"
+#line 1515 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addName( (yyvsp[(2) - (2)].tok) ); }
     break;
@@ -7038 +7042 @@
 
 /* Line 1806 of yacc.c  */
-#line 1510 "parser.yy"
+#line 1517 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(1) - (3)].decl)->cloneType( (yyvsp[(3) - (3)].tok) ) ); }
     break;
@@ -7045 +7049 @@
 
 /* Line 1806 of yacc.c  */
-#line 1512 "parser.yy"
+#line 1519 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(1) - (2)].decl)->cloneType( 0 ) ); }
     break;
@@ -7052 +7056 @@
 
 /* Line 1806 of yacc.c  */
-#line 1517 "parser.yy"
+#line 1524 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7059 +7063 @@
 
 /* Line 1806 of yacc.c  */
-#line 1519 "parser.yy"
+#line 1526 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(1) - (4)].decl)->cloneBaseType( (yyvsp[(4) - (4)].decl) ) ); }
     break;
@@ -7066 +7070 @@
 
 /* Line 1806 of yacc.c  */
-#line 1524 "parser.yy"
+#line 1531 "parser.yy"
     { (yyval.decl) = DeclarationNode::newName( 0 ); /* XXX */ }
     break;
@@ -7073 +7077 @@
 
 /* Line 1806 of yacc.c  */
-#line 1526 "parser.yy"
+#line 1533 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBitfield( (yyvsp[(1) - (1)].en) ); }
     break;
@@ -7080 +7084 @@
 
 /* Line 1806 of yacc.c  */
-#line 1529 "parser.yy"
+#line 1536 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
     break;
@@ -7087 +7091 @@
 
 /* Line 1806 of yacc.c  */
-#line 1532 "parser.yy"
+#line 1539 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
     break;
@@ -7094 +7098 @@
 
 /* Line 1806 of yacc.c  */
-#line 1538 "parser.yy"
+#line 1545 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -7101 +7105 @@
 
 /* Line 1806 of yacc.c  */
-#line 1540 "parser.yy"
+#line 1547 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
@@ -7108 +7112 @@
 
 /* Line 1806 of yacc.c  */
-#line 1545 "parser.yy"
+#line 1552 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -7115 +7119 @@
 
 /* Line 1806 of yacc.c  */
-#line 1554 "parser.yy"
+#line 1561 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( 0, (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -7122 +7126 @@
 
 /* Line 1806 of yacc.c  */
-#line 1556 "parser.yy"
+#line 1563 "parser.yy"
     {
                         typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
@@ -7132 +7136 @@
 
 /* Line 1806 of yacc.c  */
-#line 1561 "parser.yy"
+#line 1568 "parser.yy"
     { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
     break;
@@ -7139 +7143 @@
 
 /* Line 1806 of yacc.c  */
-#line 1563 "parser.yy"
+#line 1570 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( (yyvsp[(2) - (7)].tok), (yyvsp[(5) - (7)].decl) ); }
     break;
@@ -7146 +7150 @@
 
 /* Line 1806 of yacc.c  */
-#line 1568 "parser.yy"
+#line 1575 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnumConstant( (yyvsp[(1) - (2)].tok), (yyvsp[(2) - (2)].en) ); }
     break;
@@ -7153 +7157 @@
 
 /* Line 1806 of yacc.c  */
-#line 1570 "parser.yy"
+#line 1577 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( DeclarationNode::newEnumConstant( (yyvsp[(3) - (4)].tok), (yyvsp[(4) - (4)].en) ) ); }
     break;
@@ -7160 +7164 @@
 
 /* Line 1806 of yacc.c  */
-#line 1575 "parser.yy"
+#line 1582 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -7167 +7171 @@
 
 /* Line 1806 of yacc.c  */
-#line 1577 "parser.yy"
+#line 1584 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -7174 +7178 @@
 
 /* Line 1806 of yacc.c  */
-#line 1584 "parser.yy"
+#line 1591 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7181 +7185 @@
 
 /* Line 1806 of yacc.c  */
-#line 1592 "parser.yy"
+#line 1599 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7188 +7192 @@
 
 /* Line 1806 of yacc.c  */
-#line 1594 "parser.yy"
+#line 1601 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
@@ -7195 +7199 @@
 
 /* Line 1806 of yacc.c  */
-#line 1596 "parser.yy"
+#line 1603 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
@@ -7202 +7206 @@
 
 /* Line 1806 of yacc.c  */
-#line 1604 "parser.yy"
+#line 1611 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7209 +7213 @@
 
 /* Line 1806 of yacc.c  */
-#line 1606 "parser.yy"
+#line 1613 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7216 +7220 @@
 
 /* Line 1806 of yacc.c  */
-#line 1608 "parser.yy"
+#line 1615 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (9)].decl)->appendList( (yyvsp[(5) - (9)].decl) )->appendList( (yyvsp[(9) - (9)].decl) ); }
     break;
@@ -7223 +7227 @@
 
 /* Line 1806 of yacc.c  */
-#line 1614 "parser.yy"
+#line 1621 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7230 +7234 @@
 
 /* Line 1806 of yacc.c  */
-#line 1619 "parser.yy"
+#line 1626 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7237 +7241 @@
 
 /* Line 1806 of yacc.c  */
-#line 1626 "parser.yy"
+#line 1633 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
@@ -7244 +7248 @@
 
 /* Line 1806 of yacc.c  */
-#line 1633 "parser.yy"
+#line 1640 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7251 +7255 @@
 
 /* Line 1806 of yacc.c  */
-#line 1635 "parser.yy"
+#line 1642 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7258 +7262 @@
 
 /* Line 1806 of yacc.c  */
-#line 1644 "parser.yy"
+#line 1651 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -7265 +7269 @@
 
 /* Line 1806 of yacc.c  */
-#line 1647 "parser.yy"
+#line 1654 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -7272 +7276 @@
 
 /* Line 1806 of yacc.c  */
-#line 1649 "parser.yy"
+#line 1656 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addName( (yyvsp[(3) - (4)].tok) )->addQualifiers( (yyvsp[(1) - (4)].decl) ); }
     break;
@@ -7279 +7283 @@
 
 /* Line 1806 of yacc.c  */
-#line 1659 "parser.yy"
+#line 1666 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7286 +7290 @@
 
 /* Line 1806 of yacc.c  */
-#line 1665 "parser.yy"
+#line 1672 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7296 +7300 @@
 
 /* Line 1806 of yacc.c  */
-#line 1670 "parser.yy"
+#line 1677 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7306 +7310 @@
 
 /* Line 1806 of yacc.c  */
-#line 1679 "parser.yy"
+#line 1686 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7313 +7317 @@
 
 /* Line 1806 of yacc.c  */
-#line 1688 "parser.yy"
+#line 1695 "parser.yy"
     { (yyval.decl) = DeclarationNode::newName( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -7320 +7324 @@
 
 /* Line 1806 of yacc.c  */
-#line 1690 "parser.yy"
+#line 1697 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( DeclarationNode::newName( (yyvsp[(3) - (3)].tok) ) ); }
     break;
@@ -7327 +7331 @@
 
 /* Line 1806 of yacc.c  */
-#line 1715 "parser.yy"
+#line 1722 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7334 +7338 @@
 
 /* Line 1806 of yacc.c  */
-#line 1723 "parser.yy"
+#line 1730 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7341 +7345 @@
 
 /* Line 1806 of yacc.c  */
-#line 1728 "parser.yy"
+#line 1735 "parser.yy"
     { (yyval.in) = 0; }
     break;
@@ -7348 +7352 @@
 
 /* Line 1806 of yacc.c  */
-#line 1730 "parser.yy"
+#line 1737 "parser.yy"
     { (yyval.in) = (yyvsp[(2) - (2)].in); }
     break;
@@ -7355 +7359 @@
 
 /* Line 1806 of yacc.c  */
-#line 1732 "parser.yy"
+#line 1739 "parser.yy"
     { (yyval.in) = (yyvsp[(2) - (2)].in)->set_maybeConstructed( false ); }
     break;
@@ -7362 +7366 @@
 
 /* Line 1806 of yacc.c  */
-#line 1736 "parser.yy"
+#line 1743 "parser.yy"
     { (yyval.in) = new InitializerNode( (yyvsp[(1) - (1)].en) ); }
     break;
@@ -7369 +7373 @@
 
 /* Line 1806 of yacc.c  */
-#line 1737 "parser.yy"
+#line 1744 "parser.yy"
     { (yyval.in) = new InitializerNode( (yyvsp[(2) - (4)].in), true ); }
     break;
@@ -7376 +7380 @@
 
 /* Line 1806 of yacc.c  */
-#line 1742 "parser.yy"
+#line 1749 "parser.yy"
     { (yyval.in) = 0; }
     break;
@@ -7383 +7387 @@
 
 /* Line 1806 of yacc.c  */
-#line 1744 "parser.yy"
+#line 1751 "parser.yy"
     { (yyval.in) = (yyvsp[(2) - (2)].in)->set_designators( (yyvsp[(1) - (2)].en) ); }
     break;
@@ -7390 +7394 @@
 
 /* Line 1806 of yacc.c  */
-#line 1745 "parser.yy"
-    { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (3)].in)->set_last( (yyvsp[(3) - (3)].in) ) ); }
+#line 1752 "parser.yy"
+    { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (3)].in)->set_link( (yyvsp[(3) - (3)].in) ) ); }
     break;
 
@@ -7397 +7401 @@
 
 /* Line 1806 of yacc.c  */
-#line 1747 "parser.yy"
-    { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (4)].in)->set_last( (yyvsp[(4) - (4)].in)->set_designators( (yyvsp[(3) - (4)].en) ) ) ); }
+#line 1754 "parser.yy"
+    { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (4)].in)->set_link( (yyvsp[(4) - (4)].in)->set_designators( (yyvsp[(3) - (4)].en) ) ) ); }
     break;
 
@@ -7404 +7408 @@
 
 /* Line 1806 of yacc.c  */
-#line 1763 "parser.yy"
+#line 1770 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[(1) - (2)].tok) ) ); }
     break;
@@ -7411 +7415 @@
 
 /* Line 1806 of yacc.c  */
-#line 1769 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (2)].en)->set_last( (yyvsp[(2) - (2)].en) ) ); }
+#line 1776 "parser.yy"
+    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (2)].en)->set_link( (yyvsp[(2) - (2)].en) ) ); }
     break;
 
@@ -7418 +7422 @@
 
 /* Line 1806 of yacc.c  */
-#line 1775 "parser.yy"
+#line 1782 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[(2) - (2)].tok) ) ); }
     break;
@@ -7425 +7429 @@
 
 /* Line 1806 of yacc.c  */
-#line 1778 "parser.yy"
+#line 1785 "parser.yy"
     { (yyval.en) = (yyvsp[(3) - (5)].en); }
     break;
@@ -7432 +7436 @@
 
 /* Line 1806 of yacc.c  */
-#line 1780 "parser.yy"
+#line 1787 "parser.yy"
     { (yyval.en) = (yyvsp[(3) - (5)].en); }
     break;
@@ -7439 +7443 @@
 
 /* Line 1806 of yacc.c  */
-#line 1782 "parser.yy"
+#line 1789 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_range( (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].en) ) ); }
     break;
@@ -7446 +7450 @@
 
 /* Line 1806 of yacc.c  */
-#line 1784 "parser.yy"
+#line 1791 "parser.yy"
     { (yyval.en) = (yyvsp[(4) - (6)].en); }
     break;
@@ -7453 +7457 @@
 
 /* Line 1806 of yacc.c  */
-#line 1808 "parser.yy"
+#line 1815 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7460 +7464 @@
 
 /* Line 1806 of yacc.c  */
-#line 1810 "parser.yy"
+#line 1817 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7467 +7471 @@
 
 /* Line 1806 of yacc.c  */
-#line 1812 "parser.yy"
+#line 1819 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7474 +7478 @@
 
 /* Line 1806 of yacc.c  */
-#line 1818 "parser.yy"
+#line 1825 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7481 +7485 @@
 
 /* Line 1806 of yacc.c  */
-#line 1820 "parser.yy"
+#line 1827 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7488 +7492 @@
 
 /* Line 1806 of yacc.c  */
-#line 1825 "parser.yy"
+#line 1832 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypeGen( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -7495 +7499 @@
 
 /* Line 1806 of yacc.c  */
-#line 1831 "parser.yy"
+#line 1838 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -7502 +7506 @@
 
 /* Line 1806 of yacc.c  */
-#line 1836 "parser.yy"
+#line 1843 "parser.yy"
     { typedefTable.addToEnclosingScope( *(yyvsp[(2) - (2)].tok), TypedefTable::TD ); }
     break;
@@ -7509 +7513 @@
 
 /* Line 1806 of yacc.c  */
-#line 1838 "parser.yy"
+#line 1845 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTypeParam( (yyvsp[(1) - (4)].tclass), (yyvsp[(2) - (4)].tok) )->addAssertions( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -7516 +7520 @@
 
 /* Line 1806 of yacc.c  */
-#line 1844 "parser.yy"
+#line 1851 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Type; }
     break;
@@ -7523 +7527 @@
 
 /* Line 1806 of yacc.c  */
-#line 1846 "parser.yy"
+#line 1853 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Ftype; }
     break;
@@ -7530 +7534 @@
 
 /* Line 1806 of yacc.c  */
-#line 1848 "parser.yy"
+#line 1855 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Dtype; }
     break;
@@ -7537 +7541 @@
 
 /* Line 1806 of yacc.c  */
-#line 1853 "parser.yy"
+#line 1860 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7544 +7548 @@
 
 /* Line 1806 of yacc.c  */
-#line 1855 "parser.yy"
+#line 1862 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl) != 0 ? (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ) : (yyvsp[(2) - (2)].decl); }
     break;
@@ -7551 +7555 @@
 
 /* Line 1806 of yacc.c  */
-#line 1860 "parser.yy"
+#line 1867 "parser.yy"
     {
                         typedefTable.openTrait( *(yyvsp[(2) - (5)].tok) );
@@ -7561 +7565 @@
 
 /* Line 1806 of yacc.c  */
-#line 1865 "parser.yy"
+#line 1872 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (5)].decl); }
     break;
@@ -7568 +7572 @@
 
 /* Line 1806 of yacc.c  */
-#line 1867 "parser.yy"
+#line 1874 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7575 +7579 @@
 
 /* Line 1806 of yacc.c  */
-#line 1872 "parser.yy"
+#line 1879 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_typevalue( (yyvsp[(1) - (1)].decl) ) ); }
     break;
@@ -7582 +7586 @@
 
 /* Line 1806 of yacc.c  */
-#line 1875 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_last( new ExpressionNode( build_typevalue( (yyvsp[(3) - (3)].decl) ) ) ) ); }
+#line 1882 "parser.yy"
+    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( new ExpressionNode( build_typevalue( (yyvsp[(3) - (3)].decl) ) ) ) ); }
     break;
 
@@ -7589 +7593 @@
 
 /* Line 1806 of yacc.c  */
-#line 1877 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) )); }
+#line 1884 "parser.yy"
+    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) )); }
     break;
 
@@ -7596 +7600 @@
 
 /* Line 1806 of yacc.c  */
-#line 1882 "parser.yy"
+#line 1889 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
     break;
@@ -7603 +7607 @@
 
 /* Line 1806 of yacc.c  */
-#line 1884 "parser.yy"
+#line 1891 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -7610 +7614 @@
 
 /* Line 1806 of yacc.c  */
-#line 1886 "parser.yy"
+#line 1893 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl)->copyStorageClasses( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -7617 +7621 @@
 
 /* Line 1806 of yacc.c  */
-#line 1891 "parser.yy"
+#line 1898 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addAssertions( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7624 +7628 @@
 
 /* Line 1806 of yacc.c  */
-#line 1893 "parser.yy"
+#line 1900 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addAssertions( (yyvsp[(2) - (4)].decl) )->addType( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -7631 +7635 @@
 
 /* Line 1806 of yacc.c  */
-#line 1898 "parser.yy"
+#line 1905 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (1)].tok), TypedefTable::TD );
@@ -7641 +7645 @@
 
 /* Line 1806 of yacc.c  */
-#line 1903 "parser.yy"
+#line 1910 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (6)].tok), TypedefTable::TG );
@@ -7651 +7655 @@
 
 /* Line 1806 of yacc.c  */
-#line 1911 "parser.yy"
+#line 1918 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (9)].tok), TypedefTable::ID );
@@ -7661 +7665 @@
 
 /* Line 1806 of yacc.c  */
-#line 1916 "parser.yy"
+#line 1923 "parser.yy"
     {
                         typedefTable.enterTrait( *(yyvsp[(2) - (8)].tok) );
@@ -7671 +7675 @@
 
 /* Line 1806 of yacc.c  */
-#line 1921 "parser.yy"
+#line 1928 "parser.yy"
     {
                         typedefTable.leaveTrait();
@@ -7682 +7686 @@
 
 /* Line 1806 of yacc.c  */
-#line 1931 "parser.yy"
+#line 1938 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7689 +7693 @@
 
 /* Line 1806 of yacc.c  */
-#line 1941 "parser.yy"
+#line 1948 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7699 +7703 @@
 
 /* Line 1806 of yacc.c  */
-#line 1946 "parser.yy"
+#line 1953 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7709 +7713 @@
 
 /* Line 1806 of yacc.c  */
-#line 1951 "parser.yy"
+#line 1958 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
@@ -7719 +7723 @@
 
 /* Line 1806 of yacc.c  */
-#line 1959 "parser.yy"
+#line 1966 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7729 +7733 @@
 
 /* Line 1806 of yacc.c  */
-#line 1964 "parser.yy"
+#line 1971 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7739 +7743 @@
 
 /* Line 1806 of yacc.c  */
-#line 1974 "parser.yy"
+#line 1981 "parser.yy"
     {}
     break;
@@ -7746 +7750 @@
 
 /* Line 1806 of yacc.c  */
-#line 1976 "parser.yy"
+#line 1983 "parser.yy"
     {
                         if ( theTree ) {
@@ -7759 +7763 @@
 
 /* Line 1806 of yacc.c  */
-#line 1988 "parser.yy"
+#line 1995 "parser.yy"
     { (yyval.decl) = ( (yyvsp[(1) - (3)].decl) != NULL ) ? (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ) : (yyvsp[(3) - (3)].decl); }
     break;
@@ -7766 +7770 @@
 
 /* Line 1806 of yacc.c  */
-#line 1993 "parser.yy"
+#line 2000 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7773 +7777 @@
 
 /* Line 1806 of yacc.c  */
-#line 2001 "parser.yy"
+#line 2008 "parser.yy"
     {}
     break;
@@ -7780 +7784 @@
 
 /* Line 1806 of yacc.c  */
-#line 2003 "parser.yy"
+#line 2010 "parser.yy"
     {
                         linkageStack.push( linkage );
@@ -7790 +7794 @@
 
 /* Line 1806 of yacc.c  */
-#line 2008 "parser.yy"
+#line 2015 "parser.yy"
     {
                         linkage = linkageStack.top();
@@ -7801 +7805 @@
 
 /* Line 1806 of yacc.c  */
-#line 2014 "parser.yy"
+#line 2021 "parser.yy"
     {   // mark all fields in list
-                        for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_next() )
+                        for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_link() )
                                 iter->set_extension( true );
                         (yyval.decl) = (yyvsp[(2) - (2)].decl);
@@ -7812 +7816 @@
 
 /* Line 1806 of yacc.c  */
-#line 2029 "parser.yy"
+#line 2036 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7823 +7827 @@
 
 /* Line 1806 of yacc.c  */
-#line 2035 "parser.yy"
+#line 2042 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7834 +7838 @@
 
 /* Line 1806 of yacc.c  */
-#line 2044 "parser.yy"
+#line 2051 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7845 +7849 @@
 
 /* Line 1806 of yacc.c  */
-#line 2050 "parser.yy"
+#line 2057 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7856 +7860 @@
 
 /* Line 1806 of yacc.c  */
-#line 2056 "parser.yy"
+#line 2063 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7867 +7871 @@
 
 /* Line 1806 of yacc.c  */
-#line 2062 "parser.yy"
+#line 2069 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7878 +7882 @@
 
 /* Line 1806 of yacc.c  */
-#line 2068 "parser.yy"
+#line 2075 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7889 +7893 @@
 
 /* Line 1806 of yacc.c  */
-#line 2076 "parser.yy"
+#line 2083 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7900 +7904 @@
 
 /* Line 1806 of yacc.c  */
-#line 2082 "parser.yy"
+#line 2089 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7911 +7915 @@
 
 /* Line 1806 of yacc.c  */
-#line 2090 "parser.yy"
+#line 2097 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7922 +7926 @@
 
 /* Line 1806 of yacc.c  */
-#line 2096 "parser.yy"
+#line 2103 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7933 +7937 @@
 
 /* Line 1806 of yacc.c  */
-#line 2111 "parser.yy"
+#line 2118 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_range( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -7940 +7944 @@
 
 /* Line 1806 of yacc.c  */
-#line 2121 "parser.yy"
+#line 2128 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7947 +7951 @@
 
 /* Line 1806 of yacc.c  */
-#line 2128 "parser.yy"
+#line 2135 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7954 +7958 @@
 
 /* Line 1806 of yacc.c  */
-#line 2134 "parser.yy"
+#line 2141 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7961 +7965 @@
 
 /* Line 1806 of yacc.c  */
-#line 2149 "parser.yy"
+#line 2156 "parser.yy"
     {}
     break;
@@ -7968 +7972 @@
 
 /* Line 1806 of yacc.c  */
-#line 2150 "parser.yy"
+#line 2157 "parser.yy"
     {}
     break;
@@ -7975 +7979 @@
 
 /* Line 1806 of yacc.c  */
-#line 2151 "parser.yy"
+#line 2158 "parser.yy"
     {}
     break;
@@ -7982 +7986 @@
 
 /* Line 1806 of yacc.c  */
-#line 2152 "parser.yy"
+#line 2159 "parser.yy"
     {}
     break;
@@ -7989 +7993 @@
 
 /* Line 1806 of yacc.c  */
-#line 2187 "parser.yy"
+#line 2194 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7996 +8000 @@
 
 /* Line 1806 of yacc.c  */
-#line 2190 "parser.yy"
+#line 2197 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8003 +8007 @@
 
 /* Line 1806 of yacc.c  */
-#line 2192 "parser.yy"
+#line 2199 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8010 +8014 @@
 
 /* Line 1806 of yacc.c  */
-#line 2197 "parser.yy"
+#line 2204 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8020 +8024 @@
 
 /* Line 1806 of yacc.c  */
-#line 2202 "parser.yy"
+#line 2209 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8027 +8031 @@
 
 /* Line 1806 of yacc.c  */
-#line 2207 "parser.yy"
+#line 2214 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8034 +8038 @@
 
 /* Line 1806 of yacc.c  */
-#line 2209 "parser.yy"
+#line 2216 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8041 +8045 @@
 
 /* Line 1806 of yacc.c  */
-#line 2211 "parser.yy"
+#line 2218 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8048 +8052 @@
 
 /* Line 1806 of yacc.c  */
-#line 2216 "parser.yy"
+#line 2223 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8055 +8059 @@
 
 /* Line 1806 of yacc.c  */
-#line 2218 "parser.yy"
+#line 2225 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8062 +8066 @@
 
 /* Line 1806 of yacc.c  */
-#line 2220 "parser.yy"
+#line 2227 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 
   case 571:
-
-/* Line 1806 of yacc.c  */
-#line 2222 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 572:
-
-/* Line 1806 of yacc.c  */
-#line 2227 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 573:
 
 /* Line 1806 of yacc.c  */
@@ -8087 +8077 @@
     break;
 
+  case 572:
+
+/* Line 1806 of yacc.c  */
+#line 2234 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 573:
+
+/* Line 1806 of yacc.c  */
+#line 2236 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
   case 574:
 
 /* Line 1806 of yacc.c  */
-#line 2238 "parser.yy"
+#line 2245 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8097 +8101 @@
 
 /* Line 1806 of yacc.c  */
-#line 2241 "parser.yy"
+#line 2248 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8104 +8108 @@
 
 /* Line 1806 of yacc.c  */
-#line 2246 "parser.yy"
+#line 2253 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
@@ -8111 +8115 @@
 
 /* Line 1806 of yacc.c  */
-#line 2248 "parser.yy"
+#line 2255 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8118 +8122 @@
 
 /* Line 1806 of yacc.c  */
-#line 2250 "parser.yy"
+#line 2257 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8125 +8129 @@
 
 /* Line 1806 of yacc.c  */
-#line 2255 "parser.yy"
+#line 2262 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8132 +8136 @@
 
 /* Line 1806 of yacc.c  */
-#line 2257 "parser.yy"
+#line 2264 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8139 +8143 @@
 
 /* Line 1806 of yacc.c  */
-#line 2259 "parser.yy"
+#line 2266 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8146 +8150 @@
 
 /* Line 1806 of yacc.c  */
-#line 2264 "parser.yy"
+#line 2271 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8153 +8157 @@
 
 /* Line 1806 of yacc.c  */
-#line 2266 "parser.yy"
+#line 2273 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8160 +8164 @@
 
 /* Line 1806 of yacc.c  */
-#line 2268 "parser.yy"
+#line 2275 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8167 +8171 @@
 
 /* Line 1806 of yacc.c  */
-#line 2283 "parser.yy"
+#line 2290 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addIdList( (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -8174 +8178 @@
 
 /* Line 1806 of yacc.c  */
-#line 2285 "parser.yy"
+#line 2292 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (6)].decl)->addIdList( (yyvsp[(5) - (6)].decl) ); }
     break;
@@ -8181 +8185 @@
 
 /* Line 1806 of yacc.c  */
-#line 2287 "parser.yy"
+#line 2294 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8188 +8192 @@
 
 /* Line 1806 of yacc.c  */
-#line 2292 "parser.yy"
+#line 2299 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8195 +8199 @@
 
 /* Line 1806 of yacc.c  */
-#line 2294 "parser.yy"
+#line 2301 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8202 +8206 @@
 
 /* Line 1806 of yacc.c  */
-#line 2296 "parser.yy"
+#line 2303 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8209 +8213 @@
 
 /* Line 1806 of yacc.c  */
-#line 2301 "parser.yy"
+#line 2308 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8216 +8220 @@
 
 /* Line 1806 of yacc.c  */
-#line 2303 "parser.yy"
+#line 2310 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8223 +8227 @@
 
 /* Line 1806 of yacc.c  */
-#line 2305 "parser.yy"
+#line 2312 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8230 +8234 @@
 
 /* Line 1806 of yacc.c  */
-#line 2320 "parser.yy"
+#line 2327 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8237 +8241 @@
 
 /* Line 1806 of yacc.c  */
-#line 2323 "parser.yy"
+#line 2330 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8244 +8248 @@
 
 /* Line 1806 of yacc.c  */
-#line 2325 "parser.yy"
+#line 2332 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8251 +8255 @@
 
 /* Line 1806 of yacc.c  */
-#line 2331 "parser.yy"
+#line 2338 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8258 +8262 @@
 
 /* Line 1806 of yacc.c  */
-#line 2336 "parser.yy"
+#line 2343 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8265 +8269 @@
 
 /* Line 1806 of yacc.c  */
-#line 2338 "parser.yy"
+#line 2345 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8272 +8276 @@
 
 /* Line 1806 of yacc.c  */
-#line 2340 "parser.yy"
+#line 2347 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8279 +8283 @@
 
 /* Line 1806 of yacc.c  */
-#line 2345 "parser.yy"
+#line 2352 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8286 +8290 @@
 
 /* Line 1806 of yacc.c  */
-#line 2347 "parser.yy"
+#line 2354 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8293 +8297 @@
 
 /* Line 1806 of yacc.c  */
-#line 2349 "parser.yy"
+#line 2356 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8300 +8304 @@
 
 /* Line 1806 of yacc.c  */
-#line 2351 "parser.yy"
+#line 2358 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8307 +8311 @@
 
 /* Line 1806 of yacc.c  */
-#line 2356 "parser.yy"
+#line 2363 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
@@ -8314 +8318 @@
 
 /* Line 1806 of yacc.c  */
-#line 2358 "parser.yy"
+#line 2365 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8321 +8325 @@
 
 /* Line 1806 of yacc.c  */
-#line 2360 "parser.yy"
+#line 2367 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8328 +8332 @@
 
 /* Line 1806 of yacc.c  */
-#line 2370 "parser.yy"
+#line 2377 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8335 +8339 @@
 
 /* Line 1806 of yacc.c  */
-#line 2373 "parser.yy"
+#line 2380 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8342 +8346 @@
 
 /* Line 1806 of yacc.c  */
-#line 2375 "parser.yy"
+#line 2382 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8349 +8353 @@
 
 /* Line 1806 of yacc.c  */
-#line 2380 "parser.yy"
+#line 2387 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8356 +8360 @@
 
 /* Line 1806 of yacc.c  */
-#line 2382 "parser.yy"
+#line 2389 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8363 +8367 @@
 
 /* Line 1806 of yacc.c  */
-#line 2384 "parser.yy"
+#line 2391 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8370 +8374 @@
 
 /* Line 1806 of yacc.c  */
-#line 2389 "parser.yy"
+#line 2396 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8377 +8381 @@
 
 /* Line 1806 of yacc.c  */
-#line 2391 "parser.yy"
+#line 2398 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8384 +8388 @@
 
 /* Line 1806 of yacc.c  */
-#line 2393 "parser.yy"
+#line 2400 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8391 +8395 @@
 
 /* Line 1806 of yacc.c  */
-#line 2395 "parser.yy"
+#line 2402 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8398 +8402 @@
 
 /* Line 1806 of yacc.c  */
-#line 2400 "parser.yy"
+#line 2407 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
@@ -8405 +8409 @@
 
 /* Line 1806 of yacc.c  */
-#line 2402 "parser.yy"
+#line 2409 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8412 +8416 @@
 
 /* Line 1806 of yacc.c  */
-#line 2404 "parser.yy"
+#line 2411 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8419 +8423 @@
 
 /* Line 1806 of yacc.c  */
-#line 2435 "parser.yy"
+#line 2442 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8426 +8430 @@
 
 /* Line 1806 of yacc.c  */
-#line 2438 "parser.yy"
+#line 2445 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8433 +8437 @@
 
 /* Line 1806 of yacc.c  */
-#line 2440 "parser.yy"
+#line 2447 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8440 +8444 @@
 
 /* Line 1806 of yacc.c  */
-#line 2445 "parser.yy"
+#line 2452 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8450 +8454 @@
 
 /* Line 1806 of yacc.c  */
-#line 2450 "parser.yy"
+#line 2457 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8460 +8464 @@
 
 /* Line 1806 of yacc.c  */
-#line 2458 "parser.yy"
+#line 2465 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8467 +8471 @@
 
 /* Line 1806 of yacc.c  */
-#line 2460 "parser.yy"
+#line 2467 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8474 +8478 @@
 
 /* Line 1806 of yacc.c  */
-#line 2462 "parser.yy"
+#line 2469 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8481 +8485 @@
 
 /* Line 1806 of yacc.c  */
-#line 2467 "parser.yy"
+#line 2474 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8488 +8492 @@
 
 /* Line 1806 of yacc.c  */
-#line 2469 "parser.yy"
+#line 2476 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8495 +8499 @@
 
 /* Line 1806 of yacc.c  */
-#line 2474 "parser.yy"
+#line 2481 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
@@ -8502 +8506 @@
 
 /* Line 1806 of yacc.c  */
-#line 2476 "parser.yy"
+#line 2483 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8509 +8513 @@
 
 /* Line 1806 of yacc.c  */
-#line 2491 "parser.yy"
+#line 2498 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8516 +8520 @@
 
 /* Line 1806 of yacc.c  */
-#line 2493 "parser.yy"
+#line 2500 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8523 +8527 @@
 
 /* Line 1806 of yacc.c  */
-#line 2498 "parser.yy"
+#line 2505 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
@@ -8530 +8534 @@
 
 /* Line 1806 of yacc.c  */
-#line 2500 "parser.yy"
+#line 2507 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8537 +8541 @@
 
 /* Line 1806 of yacc.c  */
-#line 2502 "parser.yy"
+#line 2509 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8544 +8548 @@
 
 /* Line 1806 of yacc.c  */
-#line 2504 "parser.yy"
+#line 2511 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8551 +8555 @@
 
 /* Line 1806 of yacc.c  */
-#line 2506 "parser.yy"
+#line 2513 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8558 +8562 @@
 
 /* Line 1806 of yacc.c  */
-#line 2512 "parser.yy"
+#line 2519 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8565 +8569 @@
 
 /* Line 1806 of yacc.c  */
-#line 2514 "parser.yy"
+#line 2521 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8572 +8576 @@
 
 /* Line 1806 of yacc.c  */
-#line 2516 "parser.yy"
+#line 2523 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8579 +8583 @@
 
 /* Line 1806 of yacc.c  */
-#line 2521 "parser.yy"
+#line 2528 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
     break;
@@ -8586 +8590 @@
 
 /* Line 1806 of yacc.c  */
-#line 2523 "parser.yy"
+#line 2530 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8593 +8597 @@
 
 /* Line 1806 of yacc.c  */
-#line 2525 "parser.yy"
+#line 2532 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8600 +8604 @@
 
 /* Line 1806 of yacc.c  */
-#line 2531 "parser.yy"
+#line 2538 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
     break;
@@ -8607 +8611 @@
 
 /* Line 1806 of yacc.c  */
-#line 2533 "parser.yy"
+#line 2540 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false )->addArray( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -8614 +8618 @@
 
 /* Line 1806 of yacc.c  */
-#line 2539 "parser.yy"
+#line 2546 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(3) - (5)].en), 0, false ); }
     break;
@@ -8621 +8625 @@
 
 /* Line 1806 of yacc.c  */
-#line 2541 "parser.yy"
+#line 2548 "parser.yy"
     { (yyval.decl) = DeclarationNode::newVarArray( 0 ); }
     break;
@@ -8628 +8632 @@
 
 /* Line 1806 of yacc.c  */
-#line 2543 "parser.yy"
+#line 2550 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newArray( (yyvsp[(4) - (6)].en), 0, false ) ); }
     break;
@@ -8635 +8639 @@
 
 /* Line 1806 of yacc.c  */
-#line 2545 "parser.yy"
+#line 2552 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newVarArray( 0 ) ); }
     break;
@@ -8642 +8646 @@
 
 /* Line 1806 of yacc.c  */
-#line 2560 "parser.yy"
+#line 2567 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8649 +8653 @@
 
 /* Line 1806 of yacc.c  */
-#line 2562 "parser.yy"
+#line 2569 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8656 +8660 @@
 
 /* Line 1806 of yacc.c  */
-#line 2567 "parser.yy"
+#line 2574 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
@@ -8663 +8667 @@
 
 /* Line 1806 of yacc.c  */
-#line 2569 "parser.yy"
+#line 2576 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8670 +8674 @@
 
 /* Line 1806 of yacc.c  */
-#line 2571 "parser.yy"
+#line 2578 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8677 +8681 @@
 
 /* Line 1806 of yacc.c  */
-#line 2573 "parser.yy"
+#line 2580 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8684 +8688 @@
 
 /* Line 1806 of yacc.c  */
-#line 2575 "parser.yy"
+#line 2582 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8691 +8695 @@
 
 /* Line 1806 of yacc.c  */
-#line 2581 "parser.yy"
+#line 2588 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8698 +8702 @@
 
 /* Line 1806 of yacc.c  */
-#line 2583 "parser.yy"
+#line 2590 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8705 +8709 @@
 
 /* Line 1806 of yacc.c  */
-#line 2585 "parser.yy"
+#line 2592 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8712 +8716 @@
 
 /* Line 1806 of yacc.c  */
-#line 2590 "parser.yy"
+#line 2597 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
     break;
@@ -8719 +8723 @@
 
 /* Line 1806 of yacc.c  */
-#line 2592 "parser.yy"
+#line 2599 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8726 +8730 @@
 
 /* Line 1806 of yacc.c  */
-#line 2594 "parser.yy"
+#line 2601 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8733 +8737 @@
 
 /* Line 1806 of yacc.c  */
-#line 2601 "parser.yy"
+#line 2608 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8740 +8744 @@
 
 /* Line 1806 of yacc.c  */
-#line 2612 "parser.yy"
+#line 2619 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
     break;
@@ -8747 +8751 @@
 
 /* Line 1806 of yacc.c  */
-#line 2615 "parser.yy"
+#line 2622 "parser.yy"
     { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
     break;
@@ -8754 +8758 @@
 
 /* Line 1806 of yacc.c  */
-#line 2617 "parser.yy"
+#line 2624 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, (yyvsp[(3) - (5)].decl), false ); }
     break;
@@ -8761 +8765 @@
 
 /* Line 1806 of yacc.c  */
-#line 2620 "parser.yy"
+#line 2627 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
     break;
@@ -8768 +8772 @@
 
 /* Line 1806 of yacc.c  */
-#line 2622 "parser.yy"
+#line 2629 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl), true ); }
     break;
@@ -8775 +8779 @@
 
 /* Line 1806 of yacc.c  */
-#line 2624 "parser.yy"
+#line 2631 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(3) - (7)].decl), true ); }
     break;
@@ -8782 +8786 @@
 
 /* Line 1806 of yacc.c  */
-#line 2638 "parser.yy"
+#line 2645 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8789 +8793 @@
 
 /* Line 1806 of yacc.c  */
-#line 2640 "parser.yy"
+#line 2647 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8796 +8800 @@
 
 /* Line 1806 of yacc.c  */
-#line 2645 "parser.yy"
+#line 2652 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
@@ -8803 +8807 @@
 
 /* Line 1806 of yacc.c  */
-#line 2647 "parser.yy"
+#line 2654 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8810 +8814 @@
 
 /* Line 1806 of yacc.c  */
-#line 2649 "parser.yy"
+#line 2656 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8817 +8821 @@
 
 /* Line 1806 of yacc.c  */
-#line 2651 "parser.yy"
+#line 2658 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8824 +8828 @@
 
 /* Line 1806 of yacc.c  */
-#line 2653 "parser.yy"
+#line 2660 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8831 +8835 @@
 
 /* Line 1806 of yacc.c  */
-#line 2659 "parser.yy"
+#line 2666 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8838 +8842 @@
 
 /* Line 1806 of yacc.c  */
-#line 2661 "parser.yy"
+#line 2668 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 
   case 698:
-
-/* Line 1806 of yacc.c  */
-#line 2663 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 699:
-
-/* Line 1806 of yacc.c  */
-#line 2668 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 700:
 
 /* Line 1806 of yacc.c  */
@@ -8863 +8853 @@
     break;
 
+  case 699:
+
+/* Line 1806 of yacc.c  */
+#line 2675 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 700:
+
+/* Line 1806 of yacc.c  */
+#line 2677 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
   case 703:
 
 /* Line 1806 of yacc.c  */
-#line 2680 "parser.yy"
+#line 2687 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -8873 +8877 @@
 
 /* Line 1806 of yacc.c  */
-#line 2690 "parser.yy"
+#line 2697 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8880 +8884 @@
 
 /* Line 1806 of yacc.c  */
-#line 2692 "parser.yy"
+#line 2699 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -8887 +8891 @@
 
 /* Line 1806 of yacc.c  */
-#line 2694 "parser.yy"
+#line 2701 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8894 +8898 @@
 
 /* Line 1806 of yacc.c  */
-#line 2696 "parser.yy"
+#line 2703 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -8901 +8905 @@
 
 /* Line 1806 of yacc.c  */
-#line 2698 "parser.yy"
+#line 2705 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8908 +8912 @@
 
 /* Line 1806 of yacc.c  */
-#line 2700 "parser.yy"
+#line 2707 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -8915 +8919 @@
 
 /* Line 1806 of yacc.c  */
-#line 2707 "parser.yy"
+#line 2714 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -8922 +8926 @@
 
 /* Line 1806 of yacc.c  */
-#line 2709 "parser.yy"
+#line 2716 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -8929 +8933 @@
 
 /* Line 1806 of yacc.c  */
-#line 2711 "parser.yy"
+#line 2718 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -8936 +8940 @@
 
 /* Line 1806 of yacc.c  */
-#line 2713 "parser.yy"
+#line 2720 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -8943 +8947 @@
 
 /* Line 1806 of yacc.c  */
-#line 2715 "parser.yy"
+#line 2722 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -8950 +8954 @@
 
 /* Line 1806 of yacc.c  */
-#line 2717 "parser.yy"
+#line 2724 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -8957 +8961 @@
 
 /* Line 1806 of yacc.c  */
-#line 2719 "parser.yy"
+#line 2726 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -8964 +8968 @@
 
 /* Line 1806 of yacc.c  */
-#line 2721 "parser.yy"
+#line 2728 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -8971 +8975 @@
 
 /* Line 1806 of yacc.c  */
-#line 2723 "parser.yy"
+#line 2730 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -8978 +8982 @@
 
 /* Line 1806 of yacc.c  */
-#line 2725 "parser.yy"
+#line 2732 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -8985 +8989 @@
 
 /* Line 1806 of yacc.c  */
-#line 2730 "parser.yy"
+#line 2737 "parser.yy"
     { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
     break;
@@ -8992 +8996 @@
 
 /* Line 1806 of yacc.c  */
-#line 2732 "parser.yy"
+#line 2739 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
     break;
@@ -8999 +9003 @@
 
 /* Line 1806 of yacc.c  */
-#line 2737 "parser.yy"
+#line 2744 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), true ); }
     break;
@@ -9006 +9010 @@
 
 /* Line 1806 of yacc.c  */
-#line 2739 "parser.yy"
+#line 2746 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl)->addQualifiers( (yyvsp[(3) - (7)].decl) ), true ); }
     break;
@@ -9013 +9017 @@
 
 /* Line 1806 of yacc.c  */
-#line 2766 "parser.yy"
+#line 2773 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9020 +9024 @@
 
 /* Line 1806 of yacc.c  */
-#line 2777 "parser.yy"
+#line 2784 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -9027 +9031 @@
 
 /* Line 1806 of yacc.c  */
-#line 2779 "parser.yy"
+#line 2786 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -9034 +9038 @@
 
 /* Line 1806 of yacc.c  */
-#line 2781 "parser.yy"
+#line 2788 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -9041 +9045 @@
 
 /* Line 1806 of yacc.c  */
-#line 2783 "parser.yy"
+#line 2790 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -9048 +9052 @@
 
 /* Line 1806 of yacc.c  */
-#line 2785 "parser.yy"
+#line 2792 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -9055 +9059 @@
 
 /* Line 1806 of yacc.c  */
-#line 2787 "parser.yy"
+#line 2794 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -9062 +9066 @@
 
 /* Line 1806 of yacc.c  */
-#line 2794 "parser.yy"
+#line 2801 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -9069 +9073 @@
 
 /* Line 1806 of yacc.c  */
-#line 2796 "parser.yy"
+#line 2803 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -9076 +9080 @@
 
 /* Line 1806 of yacc.c  */
-#line 2798 "parser.yy"
+#line 2805 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9083 +9087 @@
 
 /* Line 1806 of yacc.c  */
-#line 2800 "parser.yy"
+#line 2807 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -9090 +9094 @@
 
 /* Line 1806 of yacc.c  */
-#line 2802 "parser.yy"
+#line 2809 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -9097 +9101 @@
 
 /* Line 1806 of yacc.c  */
-#line 2804 "parser.yy"
+#line 2811 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9104 +9108 @@
 
 /* Line 1806 of yacc.c  */
-#line 2809 "parser.yy"
+#line 2816 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -9111 +9115 @@
 
 /* Line 1806 of yacc.c  */
-#line 2814 "parser.yy"
+#line 2821 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, DeclarationNode::newTuple( 0 ), (yyvsp[(4) - (5)].decl), 0 ); }
     break;
@@ -9118 +9122 @@
 
 /* Line 1806 of yacc.c  */
-#line 2816 "parser.yy"
+#line 2823 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), 0 ); }
     break;
@@ -9125 +9129 @@
 
 /* Line 1806 of yacc.c  */
-#line 2818 "parser.yy"
+#line 2825 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), 0 ); }
     break;
@@ -9132 +9136 @@
 
 /* Line 1806 of yacc.c  */
-#line 2842 "parser.yy"
+#line 2849 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -9139 +9143 @@
 
 /* Line 1806 of yacc.c  */
-#line 2844 "parser.yy"
+#line 2851 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -9146 +9150 @@
 
 /* Line 1806 of yacc.c  */
-#line 9149 "Parser/parser.cc"
+#line 9153 "Parser/parser.cc"
       default: break;
     }
@@ -9377 +9381 @@
 
 /* Line 2067 of yacc.c  */
-#line 2847 "parser.yy"
+#line 2854 "parser.yy"
 
 // ----end of grammar----