Changes in src/Parser/parser.cc [8e9cbb2:c6b1105]

File:

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

src/Parser/parser.cc

@@ -1030 +1030 @@
      613,   614,   615,   616,   617,   618,   619,   620,   624,   625,
      631,   632,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   656,   663,   665,   675,   676,   681,   683,   689,   691,
-     695,   696,   701,   706,   709,   711,   713,   718,   720,   728,
-     729,   731,   735,   736,   741,   742,   747,   748,   752,   757,
-     758,   762,   764,   770,   771,   775,   777,   779,   781,   787,
-     788,   792,   793,   797,   799,   801,   806,   808,   813,   815,
-     819,   822,   826,   829,   833,   835,   839,   841,   848,   850,
-     852,   861,   863,   865,   867,   869,   874,   876,   878,   880,
-     885,   898,   899,   904,   906,   911,   915,   917,   919,   921,
-     923,   929,   930,   936,   937,   941,   942,   947,   949,   955,
-     956,   958,   963,   965,   972,   974,   978,   979,   984,   986,
-     990,   991,   995,   997,  1001,  1002,  1006,  1007,  1011,  1012,
-    1027,  1028,  1029,  1030,  1031,  1035,  1040,  1047,  1057,  1062,
-    1067,  1075,  1080,  1085,  1090,  1095,  1103,  1125,  1130,  1137,
-    1139,  1146,  1151,  1156,  1167,  1172,  1177,  1182,  1187,  1196,
-    1201,  1209,  1210,  1211,  1212,  1218,  1223,  1231,  1232,  1233,
-    1234,  1238,  1239,  1240,  1241,  1246,  1247,  1256,  1257,  1262,
-    1263,  1268,  1270,  1272,  1274,  1276,  1279,  1278,  1290,  1291,
-    1293,  1303,  1304,  1309,  1313,  1315,  1317,  1319,  1321,  1323,
-    1325,  1327,  1332,  1334,  1336,  1338,  1340,  1342,  1344,  1346,
-    1348,  1350,  1352,  1354,  1356,  1362,  1363,  1365,  1367,  1369,
-    1374,  1375,  1381,  1382,  1384,  1386,  1391,  1393,  1395,  1397,
-    1402,  1403,  1405,  1407,  1412,  1413,  1415,  1420,  1421,  1423,
-    1425,  1430,  1432,  1434,  1439,  1440,  1444,  1446,  1452,  1451,
-    1455,  1457,  1462,  1464,  1469,  1471,  1476,  1477,  1479,  1480,
-    1489,  1490,  1492,  1494,  1499,  1501,  1507,  1508,  1510,  1513,
-    1516,  1521,  1522,  1527,  1532,  1536,  1538,  1544,  1543,  1550,
-    1552,  1558,  1559,  1567,  1568,  1572,  1573,  1574,  1576,  1578,
-    1585,  1586,  1588,  1590,  1595,  1596,  1602,  1603,  1607,  1608,
-    1613,  1614,  1615,  1617,  1625,  1626,  1628,  1631,  1633,  1637,
-    1638,  1639,  1641,  1643,  1647,  1652,  1660,  1661,  1670,  1672,
-    1677,  1678,  1679,  1683,  1684,  1685,  1689,  1690,  1691,  1695,
-    1696,  1697,  1702,  1703,  1704,  1705,  1711,  1712,  1714,  1719,
-    1720,  1725,  1726,  1727,  1728,  1729,  1744,  1745,  1750,  1751,
-    1759,  1761,  1763,  1766,  1768,  1770,  1793,  1794,  1796,  1798,
-    1803,  1804,  1806,  1811,  1816,  1817,  1823,  1822,  1826,  1830,
-    1832,  1834,  1840,  1841,  1846,  1851,  1853,  1858,  1860,  1861,
-    1863,  1868,  1870,  1872,  1877,  1879,  1884,  1889,  1897,  1903,
-    1902,  1916,  1917,  1922,  1923,  1927,  1932,  1937,  1945,  1950,
-    1961,  1962,  1973,  1974,  1980,  1981,  1985,  1986,  1987,  1990,
-    1989,  2000,  2009,  2015,  2021,  2030,  2036,  2042,  2048,  2054,
-    2062,  2068,  2076,  2082,  2091,  2092,  2093,  2097,  2101,  2103,
-    2108,  2109,  2113,  2114,  2119,  2125,  2126,  2129,  2131,  2132,
-    2136,  2137,  2138,  2139,  2173,  2175,  2176,  2178,  2183,  2188,
-    2193,  2195,  2197,  2202,  2204,  2206,  2208,  2213,  2215,  2224,
-    2226,  2227,  2232,  2234,  2236,  2241,  2243,  2245,  2250,  2252,
-    2254,  2263,  2264,  2265,  2269,  2271,  2273,  2278,  2280,  2282,
-    2287,  2289,  2291,  2306,  2308,  2309,  2311,  2316,  2317,  2322,
-    2324,  2326,  2331,  2333,  2335,  2337,  2342,  2344,  2346,  2356,
-    2358,  2359,  2361,  2366,  2368,  2370,  2375,  2377,  2379,  2381,
-    2386,  2388,  2390,  2421,  2423,  2424,  2426,  2431,  2436,  2444,
-    2446,  2448,  2453,  2455,  2460,  2462,  2476,  2477,  2479,  2484,
-    2486,  2488,  2490,  2492,  2497,  2498,  2500,  2502,  2507,  2509,
-    2511,  2517,  2519,  2521,  2525,  2527,  2529,  2531,  2545,  2546,
-    2548,  2553,  2555,  2557,  2559,  2561,  2566,  2567,  2569,  2571,
-    2576,  2578,  2580,  2586,  2587,  2589,  2598,  2601,  2603,  2606,
-    2608,  2610,  2623,  2624,  2626,  2631,  2633,  2635,  2637,  2639,
-    2644,  2645,  2647,  2649,  2654,  2656,  2664,  2665,  2666,  2671,
-    2672,  2676,  2678,  2680,  2682,  2684,  2686,  2693,  2695,  2697,
-    2699,  2701,  2703,  2705,  2707,  2709,  2711,  2716,  2718,  2720,
-    2725,  2751,  2752,  2754,  2758,  2759,  2763,  2765,  2767,  2769,
-    2771,  2773,  2780,  2782,  2784,  2786,  2788,  2790,  2795,  2800,
-    2802,  2804,  2822,  2824,  2829,  2830
+     646,   656,   663,   665,   675,   676,   681,   683,   685,   687,
+     691,   692,   697,   702,   705,   707,   709,   714,   716,   724,
+     725,   727,   731,   732,   737,   738,   743,   744,   748,   753,
+     754,   758,   760,   766,   767,   771,   773,   775,   777,   783,
+     784,   788,   789,   793,   795,   797,   802,   804,   809,   811,
+     815,   818,   822,   825,   829,   831,   835,   837,   844,   846,
+     848,   857,   859,   861,   863,   865,   870,   872,   874,   876,
+     881,   894,   895,   900,   902,   907,   911,   913,   915,   917,
+     919,   925,   926,   932,   933,   937,   938,   943,   945,   951,
+     952,   954,   959,   961,   968,   970,   974,   975,   980,   982,
+     986,   987,   991,   993,   997,   998,  1002,  1003,  1007,  1008,
+    1023,  1024,  1025,  1026,  1027,  1031,  1036,  1043,  1053,  1058,
+    1063,  1071,  1076,  1081,  1086,  1091,  1099,  1121,  1126,  1133,
+    1135,  1142,  1147,  1152,  1163,  1168,  1173,  1178,  1183,  1192,
+    1197,  1205,  1206,  1207,  1208,  1214,  1219,  1227,  1228,  1229,
+    1230,  1234,  1235,  1236,  1237,  1242,  1243,  1252,  1253,  1258,
+    1259,  1264,  1266,  1268,  1270,  1272,  1275,  1274,  1286,  1287,
+    1289,  1299,  1300,  1305,  1309,  1311,  1313,  1315,  1317,  1319,
+    1321,  1323,  1328,  1330,  1332,  1334,  1336,  1338,  1340,  1342,
+    1344,  1346,  1348,  1350,  1352,  1358,  1359,  1361,  1363,  1365,
+    1370,  1371,  1377,  1378,  1380,  1382,  1387,  1389,  1391,  1393,
+    1398,  1399,  1401,  1403,  1408,  1409,  1411,  1416,  1417,  1419,
+    1421,  1426,  1428,  1430,  1435,  1436,  1440,  1442,  1448,  1447,
+    1451,  1453,  1458,  1460,  1465,  1467,  1472,  1473,  1475,  1476,
+    1481,  1482,  1484,  1486,  1491,  1493,  1499,  1500,  1502,  1505,
+    1508,  1513,  1514,  1519,  1524,  1528,  1530,  1536,  1535,  1542,
+    1544,  1550,  1551,  1559,  1560,  1564,  1565,  1566,  1568,  1570,
+    1577,  1578,  1580,  1582,  1587,  1588,  1594,  1595,  1599,  1600,
+    1605,  1606,  1607,  1609,  1617,  1618,  1620,  1623,  1625,  1629,
+    1630,  1631,  1633,  1635,  1639,  1644,  1652,  1653,  1662,  1664,
+    1669,  1670,  1671,  1675,  1676,  1677,  1681,  1682,  1683,  1687,
+    1688,  1689,  1694,  1695,  1696,  1697,  1703,  1704,  1706,  1711,
+    1712,  1717,  1718,  1719,  1720,  1721,  1736,  1737,  1742,  1743,
+    1751,  1753,  1755,  1758,  1760,  1762,  1785,  1786,  1788,  1790,
+    1795,  1796,  1798,  1803,  1808,  1809,  1815,  1814,  1818,  1822,
+    1824,  1826,  1832,  1833,  1838,  1843,  1845,  1850,  1852,  1853,
+    1855,  1860,  1862,  1864,  1869,  1871,  1876,  1881,  1889,  1895,
+    1894,  1908,  1909,  1914,  1915,  1919,  1924,  1929,  1937,  1942,
+    1953,  1954,  1965,  1966,  1972,  1973,  1977,  1978,  1979,  1982,
+    1981,  1992,  1997,  2003,  2009,  2018,  2024,  2030,  2036,  2042,
+    2050,  2056,  2064,  2070,  2079,  2080,  2081,  2085,  2089,  2091,
+    2096,  2097,  2101,  2102,  2107,  2113,  2114,  2117,  2119,  2120,
+    2124,  2125,  2126,  2127,  2161,  2163,  2164,  2166,  2171,  2176,
+    2181,  2183,  2185,  2190,  2192,  2194,  2196,  2201,  2203,  2212,
+    2214,  2215,  2220,  2222,  2224,  2229,  2231,  2233,  2238,  2240,
+    2242,  2251,  2252,  2253,  2257,  2259,  2261,  2266,  2268,  2270,
+    2275,  2277,  2279,  2294,  2296,  2297,  2299,  2304,  2305,  2310,
+    2312,  2314,  2319,  2321,  2323,  2325,  2330,  2332,  2334,  2344,
+    2346,  2347,  2349,  2354,  2356,  2358,  2363,  2365,  2367,  2369,
+    2374,  2376,  2378,  2409,  2411,  2412,  2414,  2419,  2424,  2432,
+    2434,  2436,  2441,  2443,  2448,  2450,  2464,  2465,  2467,  2472,
+    2474,  2476,  2478,  2480,  2485,  2486,  2488,  2490,  2495,  2497,
+    2499,  2505,  2507,  2509,  2513,  2515,  2517,  2519,  2533,  2534,
+    2536,  2541,  2543,  2545,  2547,  2549,  2554,  2555,  2557,  2559,
+    2564,  2566,  2568,  2574,  2575,  2577,  2586,  2589,  2591,  2594,
+    2596,  2598,  2611,  2612,  2614,  2619,  2621,  2623,  2625,  2627,
+    2632,  2633,  2635,  2637,  2642,  2644,  2652,  2653,  2654,  2659,
+    2660,  2664,  2666,  2668,  2670,  2672,  2674,  2681,  2683,  2685,
+    2687,  2689,  2691,  2693,  2695,  2697,  2699,  2704,  2706,  2708,
+    2713,  2739,  2740,  2742,  2746,  2747,  2751,  2753,  2755,  2757,
+    2759,  2761,  2768,  2770,  2772,  2774,  2776,  2778,  2783,  2788,
+    2790,  2792,  2810,  2812,  2817,  2818
 };
 #endif
@@ -5237 +5237 @@
 /* Line 1806 of yacc.c  */
 #line 305 "parser.yy"
-    { (yyval.constant) = makeConstant( ConstantNode::Integer, (yyvsp[(1) - (1)].tok) ); }
+    { (yyval.constant) = new ConstantNode( ConstantNode::Integer, (yyvsp[(1) - (1)].tok) ); }
     break;
 
@@ -5244 +5244 @@
 /* Line 1806 of yacc.c  */
 #line 306 "parser.yy"
-    { (yyval.constant) = makeConstant( ConstantNode::Float, (yyvsp[(1) - (1)].tok) ); }
+    { (yyval.constant) = new ConstantNode( ConstantNode::Float, (yyvsp[(1) - (1)].tok) ); }
     break;
 
@@ -5251 +5251 @@
 /* Line 1806 of yacc.c  */
 #line 307 "parser.yy"
-    { (yyval.constant) = makeConstant( ConstantNode::Character, (yyvsp[(1) - (1)].tok) ); }
+    { (yyval.constant) = new ConstantNode( ConstantNode::Character, (yyvsp[(1) - (1)].tok) ); }
     break;
 
@@ -5258 +5258 @@
 /* Line 1806 of yacc.c  */
 #line 332 "parser.yy"
-    { (yyval.constant) = makeConstantStr( ConstantNode::String, (yyvsp[(1) - (1)].tok) ); }
+    { (yyval.constant) = new ConstantNode( ConstantNode::String, (yyvsp[(1) - (1)].tok) ); }
     break;
 
@@ -5953 +5953 @@
 /* Line 1806 of yacc.c  */
 #line 684 "parser.yy"
-    {   // mark all fields in list
-                        for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_link() )
-                                iter->set_extension( true );
-                        (yyval.sn) = new StatementNode( (yyvsp[(2) - (2)].decl) );
-                }
+    { (yyval.sn) = new StatementNode( (yyvsp[(2) - (2)].decl) )/*->set_extension( true )*/; }
     break;
 
@@ -5963 +5959 @@
 
 /* Line 1806 of yacc.c  */
-#line 690 "parser.yy"
+#line 686 "parser.yy"
     { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
     break;
@@ -5970 +5966 @@
 
 /* Line 1806 of yacc.c  */
-#line 697 "parser.yy"
+#line 693 "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;
@@ -5977 +5973 @@
 
 /* Line 1806 of yacc.c  */
-#line 702 "parser.yy"
+#line 698 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Exp, (yyvsp[(1) - (2)].en), 0 ); }
     break;
@@ -5984 +5980 @@
 
 /* Line 1806 of yacc.c  */
+#line 704 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::If, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
+    break;
+
+  case 154:
+
+/* Line 1806 of yacc.c  */
+#line 706 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::If, (yyvsp[(3) - (7)].en), (StatementNode *)mkList((*(yyvsp[(5) - (7)].sn), *(yyvsp[(7) - (7)].sn) )) ); }
+    break;
+
+  case 155:
+
+/* Line 1806 of yacc.c  */
 #line 708 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::If, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
-    break;
-
-  case 154:
+    { (yyval.sn) = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
+    break;
+
+  case 156:
 
 /* Line 1806 of yacc.c  */
 #line 710 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::If, (yyvsp[(3) - (7)].en), (StatementNode *)mkList((*(yyvsp[(5) - (7)].sn), *(yyvsp[(7) - (7)].sn) )) ); }
-    break;
-
-  case 155:
-
-/* Line 1806 of yacc.c  */
-#line 712 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
-    break;
-
-  case 156:
-
-/* Line 1806 of yacc.c  */
-#line 714 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) ); /* xxx */ }
     break;
@@ -6012 +6008 @@
 
 /* Line 1806 of yacc.c  */
-#line 719 "parser.yy"
+#line 715 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Choose, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
     break;
@@ -6019 +6015 @@
 
 /* Line 1806 of yacc.c  */
-#line 721 "parser.yy"
+#line 717 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Choose, (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) ); }
     break;
@@ -6026 +6022 @@
 
 /* Line 1806 of yacc.c  */
-#line 728 "parser.yy"
+#line 724 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
@@ -6033 +6029 @@
 
 /* Line 1806 of yacc.c  */
-#line 730 "parser.yy"
+#line 726 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Range ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
@@ -6040 +6036 @@
 
 /* Line 1806 of yacc.c  */
+#line 733 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(tupleContents( (yyvsp[(1) - (3)].en) ))->set_link( (yyvsp[(3) - (3)].en) ) ); }
+    break;
+
+  case 164:
+
+/* Line 1806 of yacc.c  */
 #line 737 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(tupleContents( (yyvsp[(1) - (3)].en) ))->set_link( (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 164:
-
-/* Line 1806 of yacc.c  */
-#line 741 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Case, (yyvsp[(2) - (3)].en), 0 ); }
     break;
@@ -6054 +6050 @@
 
 /* Line 1806 of yacc.c  */
-#line 742 "parser.yy"
+#line 738 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Default ); }
     break;
@@ -6061 +6057 @@
 
 /* Line 1806 of yacc.c  */
+#line 744 "parser.yy"
+    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (2)].sn)->set_link( (yyvsp[(2) - (2)].sn) )); }
+    break;
+
+  case 168:
+
+/* Line 1806 of yacc.c  */
 #line 748 "parser.yy"
-    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (2)].sn)->set_link( (yyvsp[(2) - (2)].sn) )); }
-    break;
-
-  case 168:
-
-/* Line 1806 of yacc.c  */
-#line 752 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
     break;
@@ -6075 +6071 @@
 
 /* Line 1806 of yacc.c  */
-#line 757 "parser.yy"
+#line 753 "parser.yy"
     { (yyval.sn) = 0; }
     break;
@@ -6082 +6078 @@
 
 /* Line 1806 of yacc.c  */
-#line 763 "parser.yy"
+#line 759 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
     break;
@@ -6089 +6085 @@
 
 /* Line 1806 of yacc.c  */
-#line 765 "parser.yy"
+#line 761 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
     break;
@@ -6096 +6092 @@
 
 /* Line 1806 of yacc.c  */
-#line 770 "parser.yy"
+#line 766 "parser.yy"
     { (yyval.sn) = 0; }
     break;
@@ -6103 +6099 @@
 
 /* Line 1806 of yacc.c  */
+#line 772 "parser.yy"
+    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
+    break;
+
+  case 176:
+
+/* Line 1806 of yacc.c  */
+#line 774 "parser.yy"
+    { (yyval.sn) = (yyvsp[(1) - (3)].sn)->append_last_case((StatementNode *)mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].sn) ))); }
+    break;
+
+  case 177:
+
+/* Line 1806 of yacc.c  */
 #line 776 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
-    break;
-
-  case 176:
+    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
+    break;
+
+  case 178:
 
 /* Line 1806 of yacc.c  */
 #line 778 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (3)].sn)->append_last_case((StatementNode *)mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].sn) ))); }
-    break;
-
-  case 177:
-
-/* Line 1806 of yacc.c  */
-#line 780 "parser.yy"
-    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
-    break;
-
-  case 178:
-
-/* Line 1806 of yacc.c  */
-#line 782 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (4)].sn)->set_link( (yyvsp[(2) - (4)].sn)->append_last_case((StatementNode *)mkList((*(yyvsp[(3) - (4)].sn),*(yyvsp[(4) - (4)].sn) ))))); }
     break;
@@ -6131 +6127 @@
 
 /* Line 1806 of yacc.c  */
-#line 787 "parser.yy"
+#line 783 "parser.yy"
     { (yyval.sn) = 0; }
     break;
@@ -6138 +6134 @@
 
 /* Line 1806 of yacc.c  */
-#line 792 "parser.yy"
+#line 788 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Fallthru ); }
     break;
@@ -6145 +6141 @@
 
 /* Line 1806 of yacc.c  */
-#line 793 "parser.yy"
+#line 789 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Fallthru ); }
     break;
@@ -6152 +6148 @@
 
 /* Line 1806 of yacc.c  */
+#line 794 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::While, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
+    break;
+
+  case 184:
+
+/* Line 1806 of yacc.c  */
+#line 796 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Do, (yyvsp[(5) - (7)].en), (yyvsp[(2) - (7)].sn) ); }
+    break;
+
+  case 185:
+
+/* Line 1806 of yacc.c  */
 #line 798 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::While, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
-    break;
-
-  case 184:
-
-/* Line 1806 of yacc.c  */
-#line 800 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Do, (yyvsp[(5) - (7)].en), (yyvsp[(2) - (7)].sn) ); }
-    break;
-
-  case 185:
-
-/* Line 1806 of yacc.c  */
-#line 802 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::For, (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].sn) ); }
     break;
@@ -6173 +6169 @@
 
 /* Line 1806 of yacc.c  */
-#line 807 "parser.yy"
+#line 803 "parser.yy"
     { (yyval.en) = new ForCtlExprNode( (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].en) ); }
     break;
@@ -6180 +6176 @@
 
 /* Line 1806 of yacc.c  */
-#line 809 "parser.yy"
+#line 805 "parser.yy"
     { (yyval.en) = new ForCtlExprNode( (yyvsp[(1) - (4)].decl), (yyvsp[(2) - (4)].en), (yyvsp[(4) - (4)].en) ); }
     break;
@@ -6187 +6183 @@
 
 /* Line 1806 of yacc.c  */
+#line 810 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Goto, (yyvsp[(2) - (3)].tok) ); }
+    break;
+
+  case 189:
+
+/* Line 1806 of yacc.c  */
 #line 814 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Goto, (yyvsp[(2) - (3)].tok) ); }
-    break;
-
-  case 189:
-
-/* Line 1806 of yacc.c  */
-#line 818 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Goto, (yyvsp[(3) - (4)].en) ); }
     break;
@@ -6201 +6197 @@
 
 /* Line 1806 of yacc.c  */
+#line 817 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Continue ); }
+    break;
+
+  case 191:
+
+/* Line 1806 of yacc.c  */
 #line 821 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Continue ); }
-    break;
-
-  case 191:
-
-/* Line 1806 of yacc.c  */
-#line 825 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Continue, (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -6215 +6211 @@
 
 /* Line 1806 of yacc.c  */
+#line 824 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Break ); }
+    break;
+
+  case 193:
+
+/* Line 1806 of yacc.c  */
 #line 828 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Break ); }
-    break;
-
-  case 193:
+    { (yyval.sn) = new StatementNode( StatementNode::Break, (yyvsp[(2) - (3)].tok) ); }
+    break;
+
+  case 194:
+
+/* Line 1806 of yacc.c  */
+#line 830 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Return, (yyvsp[(2) - (3)].en), 0 ); }
+    break;
+
+  case 195:
 
 /* Line 1806 of yacc.c  */
 #line 832 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Break, (yyvsp[(2) - (3)].tok) ); }
-    break;
-
-  case 194:
-
-/* Line 1806 of yacc.c  */
-#line 834 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Return, (yyvsp[(2) - (3)].en), 0 ); }
-    break;
-
-  case 195:
+    { (yyval.sn) = new StatementNode( StatementNode::Throw, (yyvsp[(2) - (3)].en), 0 ); }
+    break;
+
+  case 196:
 
 /* Line 1806 of yacc.c  */
@@ -6240 +6243 @@
     break;
 
-  case 196:
-
-/* Line 1806 of yacc.c  */
-#line 840 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Throw, (yyvsp[(2) - (3)].en), 0 ); }
-    break;
-
   case 197:
 
 /* Line 1806 of yacc.c  */
-#line 842 "parser.yy"
+#line 838 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Throw, (yyvsp[(2) - (5)].en), 0 ); }
     break;
@@ -6257 +6253 @@
 
 /* Line 1806 of yacc.c  */
+#line 845 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].pn) )))); }
+    break;
+
+  case 199:
+
+/* Line 1806 of yacc.c  */
+#line 847 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].pn) )))); }
+    break;
+
+  case 200:
+
+/* Line 1806 of yacc.c  */
 #line 849 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].pn) )))); }
-    break;
-
-  case 199:
-
-/* Line 1806 of yacc.c  */
-#line 851 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].pn) )))); }
-    break;
-
-  case 200:
-
-/* Line 1806 of yacc.c  */
-#line 853 "parser.yy"
     {
                         (yyvsp[(3) - (4)].pn)->set_link( (yyvsp[(4) - (4)].pn) );
@@ -6281 +6277 @@
 
 /* Line 1806 of yacc.c  */
+#line 860 "parser.yy"
+    { (yyval.pn) = StatementNode::newCatchStmt( 0, (yyvsp[(5) - (5)].sn), true ); }
+    break;
+
+  case 203:
+
+/* Line 1806 of yacc.c  */
+#line 862 "parser.yy"
+    { (yyval.pn) = (yyvsp[(1) - (6)].pn)->set_link( StatementNode::newCatchStmt( 0, (yyvsp[(6) - (6)].sn), true ) ); }
+    break;
+
+  case 204:
+
+/* Line 1806 of yacc.c  */
 #line 864 "parser.yy"
     { (yyval.pn) = StatementNode::newCatchStmt( 0, (yyvsp[(5) - (5)].sn), true ); }
     break;
 
-  case 203:
+  case 205:
 
 /* Line 1806 of yacc.c  */
@@ -6292 +6302 @@
     break;
 
-  case 204:
-
-/* Line 1806 of yacc.c  */
-#line 868 "parser.yy"
-    { (yyval.pn) = StatementNode::newCatchStmt( 0, (yyvsp[(5) - (5)].sn), true ); }
-    break;
-
-  case 205:
-
-/* Line 1806 of yacc.c  */
-#line 870 "parser.yy"
-    { (yyval.pn) = (yyvsp[(1) - (6)].pn)->set_link( StatementNode::newCatchStmt( 0, (yyvsp[(6) - (6)].sn), true ) ); }
-    break;
-
   case 206:
+
+/* Line 1806 of yacc.c  */
+#line 871 "parser.yy"
+    { (yyval.pn) = StatementNode::newCatchStmt( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ); }
+    break;
+
+  case 207:
+
+/* Line 1806 of yacc.c  */
+#line 873 "parser.yy"
+    { (yyval.pn) = (yyvsp[(1) - (10)].pn)->set_link( StatementNode::newCatchStmt( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ); }
+    break;
+
+  case 208:
 
 /* Line 1806 of yacc.c  */
@@ -6313 +6323 @@
     break;
 
-  case 207:
+  case 209:
 
 /* Line 1806 of yacc.c  */
@@ -6320 +6330 @@
     break;
 
-  case 208:
-
-/* Line 1806 of yacc.c  */
-#line 879 "parser.yy"
-    { (yyval.pn) = StatementNode::newCatchStmt( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ); }
-    break;
-
-  case 209:
-
-/* Line 1806 of yacc.c  */
-#line 881 "parser.yy"
-    { (yyval.pn) = (yyvsp[(1) - (10)].pn)->set_link( StatementNode::newCatchStmt( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ); }
-    break;
-
   case 210:
 
 /* Line 1806 of yacc.c  */
-#line 886 "parser.yy"
+#line 882 "parser.yy"
     {
                         (yyval.pn) = new StatementNode( StatementNode::Finally, 0, (yyvsp[(2) - (2)].sn) );
@@ -6347 +6343 @@
 
 /* Line 1806 of yacc.c  */
-#line 900 "parser.yy"
+#line 896 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6357 +6353 @@
 
 /* Line 1806 of yacc.c  */
-#line 905 "parser.yy"
+#line 901 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6364 +6360 @@
 
 /* Line 1806 of yacc.c  */
-#line 907 "parser.yy"
+#line 903 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6374 +6370 @@
 
 /* Line 1806 of yacc.c  */
+#line 912 "parser.yy"
+    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (6)].flag), (yyvsp[(4) - (6)].constant), 0 ); }
+    break;
+
+  case 217:
+
+/* Line 1806 of yacc.c  */
+#line 914 "parser.yy"
+    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (8)].flag), (yyvsp[(4) - (8)].constant), (yyvsp[(6) - (8)].en) ); }
+    break;
+
+  case 218:
+
+/* Line 1806 of yacc.c  */
 #line 916 "parser.yy"
-    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (6)].flag), (yyvsp[(4) - (6)].constant), 0 ); }
-    break;
-
-  case 217:
+    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (10)].flag), (yyvsp[(4) - (10)].constant), (yyvsp[(6) - (10)].en), (yyvsp[(8) - (10)].en) ); }
+    break;
+
+  case 219:
 
 /* Line 1806 of yacc.c  */
 #line 918 "parser.yy"
-    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (8)].flag), (yyvsp[(4) - (8)].constant), (yyvsp[(6) - (8)].en) ); }
-    break;
-
-  case 218:
+    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (12)].flag), (yyvsp[(4) - (12)].constant), (yyvsp[(6) - (12)].en), (yyvsp[(8) - (12)].en), (yyvsp[(10) - (12)].constant) ); }
+    break;
+
+  case 220:
 
 /* Line 1806 of yacc.c  */
 #line 920 "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;
-
-  case 219:
-
-/* Line 1806 of yacc.c  */
-#line 922 "parser.yy"
-    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (12)].flag), (yyvsp[(4) - (12)].constant), (yyvsp[(6) - (12)].en), (yyvsp[(8) - (12)].en), (yyvsp[(10) - (12)].constant) ); }
-    break;
-
-  case 220:
-
-/* Line 1806 of yacc.c  */
-#line 924 "parser.yy"
     { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (14)].flag), (yyvsp[(5) - (14)].constant), 0, (yyvsp[(8) - (14)].en), (yyvsp[(10) - (14)].constant), (yyvsp[(12) - (14)].label) ); }
     break;
@@ -6409 +6405 @@
 
 /* Line 1806 of yacc.c  */
-#line 929 "parser.yy"
+#line 925 "parser.yy"
     { (yyval.flag) = false; }
     break;
@@ -6416 +6412 @@
 
 /* Line 1806 of yacc.c  */
-#line 931 "parser.yy"
+#line 927 "parser.yy"
     { (yyval.flag) = true; }
     break;
@@ -6423 +6419 @@
 
 /* Line 1806 of yacc.c  */
-#line 936 "parser.yy"
+#line 932 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -6430 +6426 @@
 
 /* Line 1806 of yacc.c  */
-#line 943 "parser.yy"
+#line 939 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
     break;
@@ -6437 +6433 @@
 
 /* Line 1806 of yacc.c  */
-#line 948 "parser.yy"
+#line 944 "parser.yy"
     { (yyval.en) = new AsmExprNode( 0, (yyvsp[(1) - (4)].constant), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -6444 +6440 @@
 
 /* Line 1806 of yacc.c  */
-#line 950 "parser.yy"
+#line 946 "parser.yy"
     { (yyval.en) = new AsmExprNode( (yyvsp[(2) - (7)].en), (yyvsp[(4) - (7)].constant), (yyvsp[(6) - (7)].en) ); }
     break;
@@ -6451 +6447 @@
 
 /* Line 1806 of yacc.c  */
+#line 951 "parser.yy"
+    { (yyval.constant) = 0; }
+    break;
+
+  case 230:
+
+/* Line 1806 of yacc.c  */
+#line 953 "parser.yy"
+    { (yyval.constant) = (yyvsp[(1) - (1)].constant); }
+    break;
+
+  case 231:
+
+/* Line 1806 of yacc.c  */
 #line 955 "parser.yy"
-    { (yyval.constant) = 0; }
-    break;
-
-  case 230:
-
-/* Line 1806 of yacc.c  */
-#line 957 "parser.yy"
-    { (yyval.constant) = (yyvsp[(1) - (1)].constant); }
-    break;
-
-  case 231:
-
-/* Line 1806 of yacc.c  */
-#line 959 "parser.yy"
     { (yyval.constant) = (ConstantNode *)(yyvsp[(1) - (3)].constant)->set_link( (yyvsp[(3) - (3)].constant) ); }
     break;
@@ -6472 +6468 @@
 
 /* Line 1806 of yacc.c  */
-#line 964 "parser.yy"
+#line 960 "parser.yy"
     { (yyval.label) = new LabelNode(); (yyval.label)->append_label( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -6479 +6475 @@
 
 /* Line 1806 of yacc.c  */
-#line 966 "parser.yy"
+#line 962 "parser.yy"
     { (yyval.label) = (yyvsp[(1) - (3)].label); (yyvsp[(1) - (3)].label)->append_label( (yyvsp[(3) - (3)].tok) ); }
     break;
@@ -6486 +6482 @@
 
 /* Line 1806 of yacc.c  */
-#line 973 "parser.yy"
+#line 969 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6493 +6489 @@
 
 /* Line 1806 of yacc.c  */
-#line 980 "parser.yy"
+#line 976 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6500 +6496 @@
 
 /* Line 1806 of yacc.c  */
-#line 985 "parser.yy"
+#line 981 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6507 +6503 @@
 
 /* Line 1806 of yacc.c  */
-#line 992 "parser.yy"
+#line 988 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6514 +6510 @@
 
 /* Line 1806 of yacc.c  */
-#line 1006 "parser.yy"
+#line 1002 "parser.yy"
     {}
     break;
@@ -6521 +6517 @@
 
 /* Line 1806 of yacc.c  */
-#line 1007 "parser.yy"
+#line 1003 "parser.yy"
     {}
     break;
@@ -6528 +6524 @@
 
 /* Line 1806 of yacc.c  */
-#line 1036 "parser.yy"
+#line 1032 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6538 +6534 @@
 
 /* Line 1806 of yacc.c  */
-#line 1043 "parser.yy"
+#line 1039 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6548 +6544 @@
 
 /* Line 1806 of yacc.c  */
-#line 1048 "parser.yy"
+#line 1044 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (6)].tok), TypedefTable::ID );
@@ -6558 +6554 @@
 
 /* Line 1806 of yacc.c  */
-#line 1058 "parser.yy"
+#line 1054 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
@@ -6568 +6564 @@
 
 /* Line 1806 of yacc.c  */
-#line 1063 "parser.yy"
+#line 1059 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
@@ -6578 +6574 @@
 
 /* Line 1806 of yacc.c  */
-#line 1068 "parser.yy"
+#line 1064 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(3) - (4)].tok) );
@@ -6588 +6584 @@
 
 /* Line 1806 of yacc.c  */
-#line 1076 "parser.yy"
+#line 1072 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6598 +6594 @@
 
 /* Line 1806 of yacc.c  */
-#line 1081 "parser.yy"
+#line 1077 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6608 +6604 @@
 
 /* Line 1806 of yacc.c  */
-#line 1086 "parser.yy"
+#line 1082 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6618 +6614 @@
 
 /* Line 1806 of yacc.c  */
-#line 1091 "parser.yy"
+#line 1087 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6628 +6624 @@
 
 /* Line 1806 of yacc.c  */
-#line 1096 "parser.yy"
+#line 1092 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
@@ -6638 +6634 @@
 
 /* Line 1806 of yacc.c  */
-#line 1104 "parser.yy"
+#line 1100 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(3) - (8)].tok), DeclarationNode::newTuple( 0 ), (yyvsp[(6) - (8)].decl), 0, true );
@@ -6645 +6641 @@
 
   case 267:
+
+/* Line 1806 of yacc.c  */
+#line 1123 "parser.yy"
+    {
+                        (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
+                }
+    break;
+
+  case 268:
 
 /* Line 1806 of yacc.c  */
@@ -6653 +6658 @@
     break;
 
-  case 268:
-
-/* Line 1806 of yacc.c  */
-#line 1131 "parser.yy"
-    {
-                        (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
-                }
-    break;
-
   case 269:
 
 /* Line 1806 of yacc.c  */
+#line 1134 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
+    break;
+
+  case 270:
+
+/* Line 1806 of yacc.c  */
 #line 1138 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
-    break;
-
-  case 270:
-
-/* Line 1806 of yacc.c  */
-#line 1142 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (9)].decl)->appendList( (yyvsp[(7) - (9)].decl) ) ); }
     break;
@@ -6679 +6675 @@
 
 /* Line 1806 of yacc.c  */
-#line 1147 "parser.yy"
+#line 1143 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6689 +6685 @@
 
 /* Line 1806 of yacc.c  */
-#line 1152 "parser.yy"
+#line 1148 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6699 +6695 @@
 
 /* Line 1806 of yacc.c  */
-#line 1157 "parser.yy"
+#line 1153 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::TD );
@@ -6709 +6705 @@
 
 /* Line 1806 of yacc.c  */
-#line 1168 "parser.yy"
+#line 1164 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6719 +6715 @@
 
 /* Line 1806 of yacc.c  */
-#line 1173 "parser.yy"
+#line 1169 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6729 +6725 @@
 
 /* Line 1806 of yacc.c  */
-#line 1178 "parser.yy"
+#line 1174 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6739 +6735 @@
 
 /* Line 1806 of yacc.c  */
-#line 1183 "parser.yy"
+#line 1179 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6749 +6745 @@
 
 /* Line 1806 of yacc.c  */
-#line 1188 "parser.yy"
+#line 1184 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6759 +6755 @@
 
 /* Line 1806 of yacc.c  */
-#line 1197 "parser.yy"
+#line 1193 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (4)].tok), TypedefTable::TD );
@@ -6769 +6765 @@
 
 /* Line 1806 of yacc.c  */
-#line 1202 "parser.yy"
+#line 1198 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (7)].tok), TypedefTable::TD );
@@ -6779 +6775 @@
 
 /* Line 1806 of yacc.c  */
-#line 1219 "parser.yy"
+#line 1215 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6789 +6785 @@
 
 /* Line 1806 of yacc.c  */
-#line 1224 "parser.yy"
+#line 1220 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6799 +6795 @@
 
 /* Line 1806 of yacc.c  */
-#line 1246 "parser.yy"
+#line 1242 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6806 +6802 @@
 
 /* Line 1806 of yacc.c  */
-#line 1258 "parser.yy"
+#line 1254 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6813 +6809 @@
 
 /* Line 1806 of yacc.c  */
+#line 1265 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Const ); }
+    break;
+
+  case 302:
+
+/* Line 1806 of yacc.c  */
+#line 1267 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Restrict ); }
+    break;
+
+  case 303:
+
+/* Line 1806 of yacc.c  */
 #line 1269 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Const ); }
-    break;
-
-  case 302:
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Volatile ); }
+    break;
+
+  case 304:
 
 /* Line 1806 of yacc.c  */
 #line 1271 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Restrict ); }
-    break;
-
-  case 303:
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Lvalue ); }
+    break;
+
+  case 305:
 
 /* Line 1806 of yacc.c  */
 #line 1273 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Volatile ); }
-    break;
-
-  case 304:
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Atomic ); }
+    break;
+
+  case 306:
 
 /* Line 1806 of yacc.c  */
 #line 1275 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Lvalue ); }
-    break;
-
-  case 305:
-
-/* Line 1806 of yacc.c  */
-#line 1277 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Atomic ); }
-    break;
-
-  case 306:
-
-/* Line 1806 of yacc.c  */
-#line 1279 "parser.yy"
     {
                         typedefTable.enterScope();
@@ -6857 +6853 @@
 
 /* Line 1806 of yacc.c  */
-#line 1283 "parser.yy"
+#line 1279 "parser.yy"
     {
                         typedefTable.leaveScope();
@@ -6867 +6863 @@
 
 /* Line 1806 of yacc.c  */
-#line 1292 "parser.yy"
+#line 1288 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6874 +6870 @@
 
 /* Line 1806 of yacc.c  */
-#line 1294 "parser.yy"
+#line 1290 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6881 +6877 @@
 
 /* Line 1806 of yacc.c  */
-#line 1305 "parser.yy"
+#line 1301 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6888 +6884 @@
 
 /* Line 1806 of yacc.c  */
+#line 1310 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Extern ); }
+    break;
+
+  case 315:
+
+/* Line 1806 of yacc.c  */
+#line 1312 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Static ); }
+    break;
+
+  case 316:
+
+/* Line 1806 of yacc.c  */
 #line 1314 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Extern ); }
-    break;
-
-  case 315:
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Auto ); }
+    break;
+
+  case 317:
 
 /* Line 1806 of yacc.c  */
 #line 1316 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Static ); }
-    break;
-
-  case 316:
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Register ); }
+    break;
+
+  case 318:
 
 /* Line 1806 of yacc.c  */
 #line 1318 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Auto ); }
-    break;
-
-  case 317:
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Inline ); }
+    break;
+
+  case 319:
 
 /* Line 1806 of yacc.c  */
 #line 1320 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Register ); }
-    break;
-
-  case 318:
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Fortran ); }
+    break;
+
+  case 320:
 
 /* Line 1806 of yacc.c  */
 #line 1322 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Inline ); }
-    break;
-
-  case 319:
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Noreturn ); }
+    break;
+
+  case 321:
 
 /* Line 1806 of yacc.c  */
 #line 1324 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Fortran ); }
-    break;
-
-  case 320:
-
-/* Line 1806 of yacc.c  */
-#line 1326 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Noreturn ); }
-    break;
-
-  case 321:
-
-/* Line 1806 of yacc.c  */
-#line 1328 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Threadlocal ); }
     break;
@@ -6944 +6940 @@
 
 /* Line 1806 of yacc.c  */
+#line 1329 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Char ); }
+    break;
+
+  case 323:
+
+/* Line 1806 of yacc.c  */
+#line 1331 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Double ); }
+    break;
+
+  case 324:
+
+/* Line 1806 of yacc.c  */
 #line 1333 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Char ); }
-    break;
-
-  case 323:
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Float ); }
+    break;
+
+  case 325:
 
 /* Line 1806 of yacc.c  */
 #line 1335 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Double ); }
-    break;
-
-  case 324:
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Int ); }
+    break;
+
+  case 326:
 
 /* Line 1806 of yacc.c  */
 #line 1337 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Float ); }
-    break;
-
-  case 325:
+    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Long ); }
+    break;
+
+  case 327:
 
 /* Line 1806 of yacc.c  */
 #line 1339 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Int ); }
-    break;
-
-  case 326:
+    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Short ); }
+    break;
+
+  case 328:
 
 /* Line 1806 of yacc.c  */
 #line 1341 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Long ); }
-    break;
-
-  case 327:
+    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Signed ); }
+    break;
+
+  case 329:
 
 /* Line 1806 of yacc.c  */
 #line 1343 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Short ); }
-    break;
-
-  case 328:
+    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Unsigned ); }
+    break;
+
+  case 330:
 
 /* Line 1806 of yacc.c  */
 #line 1345 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Signed ); }
-    break;
-
-  case 329:
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Void ); }
+    break;
+
+  case 331:
 
 /* Line 1806 of yacc.c  */
 #line 1347 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Unsigned ); }
-    break;
-
-  case 330:
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Bool ); }
+    break;
+
+  case 332:
 
 /* Line 1806 of yacc.c  */
 #line 1349 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Void ); }
-    break;
-
-  case 331:
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Complex ); }
+    break;
+
+  case 333:
 
 /* Line 1806 of yacc.c  */
 #line 1351 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Bool ); }
-    break;
-
-  case 332:
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Imaginary ); }
+    break;
+
+  case 334:
 
 /* Line 1806 of yacc.c  */
 #line 1353 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Complex ); }
-    break;
-
-  case 333:
-
-/* Line 1806 of yacc.c  */
-#line 1355 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Imaginary ); }
-    break;
-
-  case 334:
-
-/* Line 1806 of yacc.c  */
-#line 1357 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
     break;
@@ -7035 +7031 @@
 
 /* Line 1806 of yacc.c  */
+#line 1360 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 337:
+
+/* Line 1806 of yacc.c  */
+#line 1362 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 338:
+
+/* Line 1806 of yacc.c  */
 #line 1364 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
+    break;
+
+  case 339:
+
+/* Line 1806 of yacc.c  */
+#line 1366 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addType( (yyvsp[(1) - (3)].decl) ); }
+    break;
+
+  case 341:
+
+/* Line 1806 of yacc.c  */
+#line 1372 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
+    break;
+
+  case 343:
+
+/* Line 1806 of yacc.c  */
+#line 1379 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 337:
-
-/* Line 1806 of yacc.c  */
-#line 1366 "parser.yy"
+  case 344:
+
+/* Line 1806 of yacc.c  */
+#line 1381 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 338:
-
-/* Line 1806 of yacc.c  */
-#line 1368 "parser.yy"
+  case 345:
+
+/* Line 1806 of yacc.c  */
+#line 1383 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addType( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 346:
+
+/* Line 1806 of yacc.c  */
+#line 1388 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (4)].decl); }
+    break;
+
+  case 347:
+
+/* Line 1806 of yacc.c  */
+#line 1390 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newTypeof( (yyvsp[(3) - (4)].en) ); }
+    break;
+
+  case 348:
+
+/* Line 1806 of yacc.c  */
+#line 1392 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].decl) ); }
+    break;
+
+  case 349:
+
+/* Line 1806 of yacc.c  */
+#line 1394 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
+    break;
+
+  case 351:
+
+/* Line 1806 of yacc.c  */
+#line 1400 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 352:
+
+/* Line 1806 of yacc.c  */
+#line 1402 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 353:
+
+/* Line 1806 of yacc.c  */
+#line 1404 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
 
-  case 339:
-
-/* Line 1806 of yacc.c  */
-#line 1370 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addType( (yyvsp[(1) - (3)].decl) ); }
-    break;
-
-  case 341:
-
-/* Line 1806 of yacc.c  */
-#line 1376 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 343:
-
-/* Line 1806 of yacc.c  */
-#line 1383 "parser.yy"
+  case 355:
+
+/* Line 1806 of yacc.c  */
+#line 1410 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 344:
-
-/* Line 1806 of yacc.c  */
-#line 1385 "parser.yy"
+  case 356:
+
+/* Line 1806 of yacc.c  */
+#line 1412 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 345:
-
-/* Line 1806 of yacc.c  */
-#line 1387 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addType( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 346:
-
-/* Line 1806 of yacc.c  */
-#line 1392 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (4)].decl); }
-    break;
-
-  case 347:
-
-/* Line 1806 of yacc.c  */
-#line 1394 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newTypeof( (yyvsp[(3) - (4)].en) ); }
-    break;
-
-  case 348:
-
-/* Line 1806 of yacc.c  */
-#line 1396 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].decl) ); }
-    break;
-
-  case 349:
-
-/* Line 1806 of yacc.c  */
-#line 1398 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
-    break;
-
-  case 351:
-
-/* Line 1806 of yacc.c  */
-#line 1404 "parser.yy"
+  case 358:
+
+/* Line 1806 of yacc.c  */
+#line 1418 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 352:
-
-/* Line 1806 of yacc.c  */
-#line 1406 "parser.yy"
+  case 359:
+
+/* Line 1806 of yacc.c  */
+#line 1420 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 353:
-
-/* Line 1806 of yacc.c  */
-#line 1408 "parser.yy"
+  case 360:
+
+/* Line 1806 of yacc.c  */
+#line 1422 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
 
-  case 355:
-
-/* Line 1806 of yacc.c  */
-#line 1414 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 356:
-
-/* Line 1806 of yacc.c  */
-#line 1416 "parser.yy"
+  case 361:
+
+/* Line 1806 of yacc.c  */
+#line 1427 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(1) - (1)].tok) ); }
+    break;
+
+  case 362:
+
+/* Line 1806 of yacc.c  */
+#line 1429 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(2) - (2)].tok) )->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 363:
+
+/* Line 1806 of yacc.c  */
+#line 1431 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 358:
-
-/* Line 1806 of yacc.c  */
-#line 1422 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 359:
-
-/* Line 1806 of yacc.c  */
-#line 1424 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 360:
-
-/* Line 1806 of yacc.c  */
-#line 1426 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 361:
-
-/* Line 1806 of yacc.c  */
-#line 1431 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(1) - (1)].tok) ); }
-    break;
-
-  case 362:
-
-/* Line 1806 of yacc.c  */
-#line 1433 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(2) - (2)].tok) )->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 363:
-
-/* Line 1806 of yacc.c  */
-#line 1435 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 366:
 
 /* Line 1806 of yacc.c  */
-#line 1445 "parser.yy"
+#line 1441 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (4)].aggKey), 0, 0, (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -7203 +7199 @@
 
 /* Line 1806 of yacc.c  */
-#line 1447 "parser.yy"
+#line 1443 "parser.yy"
     {
                         typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
@@ -7213 +7209 @@
 
 /* Line 1806 of yacc.c  */
+#line 1448 "parser.yy"
+    { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
+    break;
+
+  case 369:
+
+/* Line 1806 of yacc.c  */
+#line 1450 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (6)].aggKey), (yyvsp[(2) - (6)].tok), 0, (yyvsp[(5) - (6)].decl)); }
+    break;
+
+  case 370:
+
+/* Line 1806 of yacc.c  */
 #line 1452 "parser.yy"
-    { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
-    break;
-
-  case 369:
+    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (7)].aggKey), 0, (yyvsp[(3) - (7)].en), (yyvsp[(6) - (7)].decl) ); }
+    break;
+
+  case 371:
 
 /* Line 1806 of yacc.c  */
 #line 1454 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (6)].aggKey), (yyvsp[(2) - (6)].tok), 0, (yyvsp[(5) - (6)].decl)); }
-    break;
-
-  case 370:
-
-/* Line 1806 of yacc.c  */
-#line 1456 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (7)].aggKey), 0, (yyvsp[(3) - (7)].en), (yyvsp[(6) - (7)].decl) ); }
-    break;
-
-  case 371:
-
-/* Line 1806 of yacc.c  */
-#line 1458 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
     break;
@@ -7241 +7237 @@
 
 /* Line 1806 of yacc.c  */
-#line 1463 "parser.yy"
+#line 1459 "parser.yy"
     { (yyval.aggKey) = DeclarationNode::Struct; }
     break;
@@ -7248 +7244 @@
 
 /* Line 1806 of yacc.c  */
-#line 1465 "parser.yy"
+#line 1461 "parser.yy"
     { (yyval.aggKey) = DeclarationNode::Union; }
     break;
@@ -7255 +7251 @@
 
 /* Line 1806 of yacc.c  */
-#line 1470 "parser.yy"
+#line 1466 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (1)].decl); }
     break;
@@ -7262 +7258 @@
 
 /* Line 1806 of yacc.c  */
-#line 1472 "parser.yy"
+#line 1468 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7269 +7265 @@
 
 /* Line 1806 of yacc.c  */
-#line 1478 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl)->set_extension( true ); }
+#line 1474 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl)/*->set_extension( true )*/; }
     break;
 
@@ -7276 +7272 @@
 
 /* Line 1806 of yacc.c  */
-#line 1481 "parser.yy"
-    {   // mark all fields in list
-                        for ( DeclarationNode *iter = (yyvsp[(2) - (3)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_link() )
-                                iter->set_extension( true );
-                        (yyval.decl) = (yyvsp[(2) - (3)].decl);
-                }
+#line 1477 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl)/*->set_extension( true )*/; }
     break;
 
@@ -7287 +7279 @@
 
 /* Line 1806 of yacc.c  */
-#line 1491 "parser.yy"
+#line 1483 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addName( (yyvsp[(2) - (2)].tok) ); }
     break;
@@ -7294 +7286 @@
 
 /* Line 1806 of yacc.c  */
-#line 1493 "parser.yy"
+#line 1485 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(1) - (3)].decl)->cloneType( (yyvsp[(3) - (3)].tok) ) ); }
     break;
@@ -7301 +7293 @@
 
 /* Line 1806 of yacc.c  */
-#line 1495 "parser.yy"
+#line 1487 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(1) - (2)].decl)->cloneType( 0 ) ); }
     break;
@@ -7308 +7300 @@
 
 /* Line 1806 of yacc.c  */
-#line 1500 "parser.yy"
+#line 1492 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7315 +7307 @@
 
 /* Line 1806 of yacc.c  */
-#line 1502 "parser.yy"
+#line 1494 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(1) - (4)].decl)->cloneBaseType( (yyvsp[(4) - (4)].decl) ) ); }
     break;
@@ -7322 +7314 @@
 
 /* Line 1806 of yacc.c  */
+#line 1499 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newName( 0 ); /* XXX */ }
+    break;
+
+  case 387:
+
+/* Line 1806 of yacc.c  */
+#line 1501 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBitfield( (yyvsp[(1) - (1)].en) ); }
+    break;
+
+  case 388:
+
+/* Line 1806 of yacc.c  */
+#line 1504 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
+    break;
+
+  case 389:
+
+/* Line 1806 of yacc.c  */
 #line 1507 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newName( 0 ); /* XXX */ }
-    break;
-
-  case 387:
-
-/* Line 1806 of yacc.c  */
-#line 1509 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBitfield( (yyvsp[(1) - (1)].en) ); }
-    break;
-
-  case 388:
-
-/* Line 1806 of yacc.c  */
-#line 1512 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
     break;
 
-  case 389:
+  case 391:
+
+/* Line 1806 of yacc.c  */
+#line 1513 "parser.yy"
+    { (yyval.en) = 0; }
+    break;
+
+  case 392:
 
 /* Line 1806 of yacc.c  */
 #line 1515 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
-    break;
-
-  case 391:
-
-/* Line 1806 of yacc.c  */
-#line 1521 "parser.yy"
-    { (yyval.en) = 0; }
-    break;
-
-  case 392:
-
-/* Line 1806 of yacc.c  */
-#line 1523 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
@@ -7364 +7356 @@
 
 /* Line 1806 of yacc.c  */
-#line 1528 "parser.yy"
+#line 1520 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -7371 +7363 @@
 
 /* Line 1806 of yacc.c  */
-#line 1537 "parser.yy"
+#line 1529 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( 0, (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -7378 +7370 @@
 
 /* Line 1806 of yacc.c  */
-#line 1539 "parser.yy"
+#line 1531 "parser.yy"
     {
                         typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
@@ -7388 +7380 @@
 
 /* Line 1806 of yacc.c  */
-#line 1544 "parser.yy"
+#line 1536 "parser.yy"
     { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
     break;
@@ -7395 +7387 @@
 
 /* Line 1806 of yacc.c  */
-#line 1546 "parser.yy"
+#line 1538 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( (yyvsp[(2) - (7)].tok), (yyvsp[(5) - (7)].decl) ); }
     break;
@@ -7402 +7394 @@
 
 /* Line 1806 of yacc.c  */
-#line 1551 "parser.yy"
+#line 1543 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnumConstant( (yyvsp[(1) - (2)].tok), (yyvsp[(2) - (2)].en) ); }
     break;
@@ -7409 +7401 @@
 
 /* Line 1806 of yacc.c  */
-#line 1553 "parser.yy"
+#line 1545 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( DeclarationNode::newEnumConstant( (yyvsp[(3) - (4)].tok), (yyvsp[(4) - (4)].en) ) ); }
     break;
@@ -7416 +7408 @@
 
 /* Line 1806 of yacc.c  */
-#line 1558 "parser.yy"
+#line 1550 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -7423 +7415 @@
 
 /* Line 1806 of yacc.c  */
-#line 1560 "parser.yy"
+#line 1552 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -7430 +7422 @@
 
 /* Line 1806 of yacc.c  */
+#line 1559 "parser.yy"
+    { (yyval.decl) = 0; }
+    break;
+
+  case 407:
+
+/* Line 1806 of yacc.c  */
 #line 1567 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
-  case 407:
-
-/* Line 1806 of yacc.c  */
-#line 1575 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7444 +7436 @@
 
 /* Line 1806 of yacc.c  */
-#line 1577 "parser.yy"
+#line 1569 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
@@ -7451 +7443 @@
 
 /* Line 1806 of yacc.c  */
+#line 1571 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
+    break;
+
+  case 411:
+
+/* Line 1806 of yacc.c  */
 #line 1579 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
-    break;
-
-  case 411:
-
-/* Line 1806 of yacc.c  */
-#line 1587 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
 
   case 412:
+
+/* Line 1806 of yacc.c  */
+#line 1581 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
+    break;
+
+  case 413:
+
+/* Line 1806 of yacc.c  */
+#line 1583 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (9)].decl)->appendList( (yyvsp[(5) - (9)].decl) )->appendList( (yyvsp[(9) - (9)].decl) ); }
+    break;
+
+  case 415:
 
 /* Line 1806 of yacc.c  */
@@ -7469 +7475 @@
     break;
 
-  case 413:
-
-/* Line 1806 of yacc.c  */
-#line 1591 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (9)].decl)->appendList( (yyvsp[(5) - (9)].decl) )->appendList( (yyvsp[(9) - (9)].decl) ); }
-    break;
-
-  case 415:
-
-/* Line 1806 of yacc.c  */
-#line 1597 "parser.yy"
+  case 416:
+
+/* Line 1806 of yacc.c  */
+#line 1594 "parser.yy"
+    { (yyval.decl) = 0; }
+    break;
+
+  case 419:
+
+/* Line 1806 of yacc.c  */
+#line 1601 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
+    break;
+
+  case 422:
+
+/* Line 1806 of yacc.c  */
+#line 1608 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
 
-  case 416:
-
-/* Line 1806 of yacc.c  */
-#line 1602 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
-  case 419:
-
-/* Line 1806 of yacc.c  */
-#line 1609 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
-    break;
-
-  case 422:
-
-/* Line 1806 of yacc.c  */
-#line 1616 "parser.yy"
+  case 423:
+
+/* Line 1806 of yacc.c  */
+#line 1610 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
 
-  case 423:
-
-/* Line 1806 of yacc.c  */
-#line 1618 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
-    break;
-
   case 425:
 
 /* Line 1806 of yacc.c  */
-#line 1627 "parser.yy"
+#line 1619 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -7521 +7513 @@
 
 /* Line 1806 of yacc.c  */
-#line 1630 "parser.yy"
+#line 1622 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -7528 +7520 @@
 
 /* Line 1806 of yacc.c  */
-#line 1632 "parser.yy"
+#line 1624 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addName( (yyvsp[(3) - (4)].tok) )->addQualifiers( (yyvsp[(1) - (4)].decl) ); }
     break;
@@ -7535 +7527 @@
 
 /* Line 1806 of yacc.c  */
-#line 1642 "parser.yy"
+#line 1634 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7542 +7534 @@
 
 /* Line 1806 of yacc.c  */
-#line 1648 "parser.yy"
+#line 1640 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7552 +7544 @@
 
 /* Line 1806 of yacc.c  */
-#line 1653 "parser.yy"
+#line 1645 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7562 +7554 @@
 
 /* Line 1806 of yacc.c  */
-#line 1662 "parser.yy"
+#line 1654 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7569 +7561 @@
 
 /* Line 1806 of yacc.c  */
-#line 1671 "parser.yy"
+#line 1663 "parser.yy"
     { (yyval.decl) = DeclarationNode::newName( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -7576 +7568 @@
 
 /* Line 1806 of yacc.c  */
-#line 1673 "parser.yy"
+#line 1665 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( DeclarationNode::newName( (yyvsp[(3) - (3)].tok) ) ); }
     break;
 
   case 451:
+
+/* Line 1806 of yacc.c  */
+#line 1690 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 455:
 
 /* Line 1806 of yacc.c  */
@@ -7587 +7586 @@
     break;
 
-  case 455:
-
-/* Line 1806 of yacc.c  */
-#line 1706 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
   case 456:
 
 /* Line 1806 of yacc.c  */
+#line 1703 "parser.yy"
+    { (yyval.in) = 0; }
+    break;
+
+  case 457:
+
+/* Line 1806 of yacc.c  */
+#line 1705 "parser.yy"
+    { (yyval.in) = (yyvsp[(2) - (2)].in); }
+    break;
+
+  case 458:
+
+/* Line 1806 of yacc.c  */
+#line 1707 "parser.yy"
+    { (yyval.in) = (yyvsp[(2) - (2)].in)->set_maybeConstructed( false ); }
+    break;
+
+  case 459:
+
+/* Line 1806 of yacc.c  */
 #line 1711 "parser.yy"
+    { (yyval.in) = new InitializerNode( (yyvsp[(1) - (1)].en) ); }
+    break;
+
+  case 460:
+
+/* Line 1806 of yacc.c  */
+#line 1712 "parser.yy"
+    { (yyval.in) = new InitializerNode( (yyvsp[(2) - (4)].in), true ); }
+    break;
+
+  case 461:
+
+/* Line 1806 of yacc.c  */
+#line 1717 "parser.yy"
     { (yyval.in) = 0; }
     break;
 
-  case 457:
-
-/* Line 1806 of yacc.c  */
-#line 1713 "parser.yy"
-    { (yyval.in) = (yyvsp[(2) - (2)].in); }
-    break;
-
-  case 458:
-
-/* Line 1806 of yacc.c  */
-#line 1715 "parser.yy"
-    { (yyval.in) = (yyvsp[(2) - (2)].in)->set_maybeConstructed( false ); }
-    break;
-
-  case 459:
+  case 463:
 
 /* Line 1806 of yacc.c  */
 #line 1719 "parser.yy"
-    { (yyval.in) = new InitializerNode( (yyvsp[(1) - (1)].en) ); }
-    break;
-
-  case 460:
+    { (yyval.in) = (yyvsp[(2) - (2)].in)->set_designators( (yyvsp[(1) - (2)].en) ); }
+    break;
+
+  case 464:
 
 /* Line 1806 of yacc.c  */
 #line 1720 "parser.yy"
-    { (yyval.in) = new InitializerNode( (yyvsp[(2) - (4)].in), true ); }
-    break;
-
-  case 461:
-
-/* Line 1806 of yacc.c  */
-#line 1725 "parser.yy"
-    { (yyval.in) = 0; }
-    break;
-
-  case 463:
-
-/* Line 1806 of yacc.c  */
-#line 1727 "parser.yy"
-    { (yyval.in) = (yyvsp[(2) - (2)].in)->set_designators( (yyvsp[(1) - (2)].en) ); }
-    break;
-
-  case 464:
-
-/* Line 1806 of yacc.c  */
-#line 1728 "parser.yy"
     { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (3)].in)->set_link( (yyvsp[(3) - (3)].in) ) ); }
     break;
@@ -7653 +7645 @@
 
 /* Line 1806 of yacc.c  */
-#line 1730 "parser.yy"
+#line 1722 "parser.yy"
     { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (4)].in)->set_link( (yyvsp[(4) - (4)].in)->set_designators( (yyvsp[(3) - (4)].en) ) ) ); }
     break;
@@ -7660 +7652 @@
 
 /* Line 1806 of yacc.c  */
-#line 1746 "parser.yy"
+#line 1738 "parser.yy"
     { (yyval.en) = new VarRefNode( (yyvsp[(1) - (2)].tok) ); }
     break;
@@ -7667 +7659 @@
 
 /* Line 1806 of yacc.c  */
+#line 1744 "parser.yy"
+    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (2)].en)->set_link( (yyvsp[(2) - (2)].en) )); }
+    break;
+
+  case 470:
+
+/* Line 1806 of yacc.c  */
 #line 1752 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (2)].en)->set_link( (yyvsp[(2) - (2)].en) )); }
-    break;
-
-  case 470:
-
-/* Line 1806 of yacc.c  */
-#line 1760 "parser.yy"
     { (yyval.en) = new DesignatorNode( new VarRefNode( (yyvsp[(1) - (1)].tok) ) ); }
     break;
@@ -7681 +7673 @@
 
 /* Line 1806 of yacc.c  */
-#line 1762 "parser.yy"
+#line 1754 "parser.yy"
     { (yyval.en) = new DesignatorNode( new VarRefNode( (yyvsp[(2) - (2)].tok) ) ); }
     break;
@@ -7688 +7680 @@
 
 /* Line 1806 of yacc.c  */
-#line 1765 "parser.yy"
+#line 1757 "parser.yy"
     { (yyval.en) = new DesignatorNode( (yyvsp[(3) - (5)].en), true ); }
     break;
@@ -7695 +7687 @@
 
 /* Line 1806 of yacc.c  */
-#line 1767 "parser.yy"
+#line 1759 "parser.yy"
     { (yyval.en) = new DesignatorNode( (yyvsp[(3) - (5)].en), true ); }
     break;
@@ -7702 +7694 @@
 
 /* Line 1806 of yacc.c  */
-#line 1769 "parser.yy"
+#line 1761 "parser.yy"
     { (yyval.en) = new DesignatorNode( new CompositeExprNode( new OperatorNode( OperatorNode::Range ), (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].en) ), true ); }
     break;
@@ -7709 +7701 @@
 
 /* Line 1806 of yacc.c  */
-#line 1771 "parser.yy"
+#line 1763 "parser.yy"
     { (yyval.en) = new DesignatorNode( (yyvsp[(4) - (6)].en) ); }
     break;
@@ -7716 +7708 @@
 
 /* Line 1806 of yacc.c  */
-#line 1795 "parser.yy"
+#line 1787 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7723 +7715 @@
 
 /* Line 1806 of yacc.c  */
+#line 1789 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 479:
+
+/* Line 1806 of yacc.c  */
+#line 1791 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
+    break;
+
+  case 481:
+
+/* Line 1806 of yacc.c  */
 #line 1797 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 482:
+
+/* Line 1806 of yacc.c  */
+#line 1799 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 479:
-
-/* Line 1806 of yacc.c  */
-#line 1799 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 481:
-
-/* Line 1806 of yacc.c  */
-#line 1805 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 482:
-
-/* Line 1806 of yacc.c  */
-#line 1807 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 483:
 
 /* Line 1806 of yacc.c  */
-#line 1812 "parser.yy"
+#line 1804 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypeGen( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -7758 +7750 @@
 
 /* Line 1806 of yacc.c  */
-#line 1818 "parser.yy"
+#line 1810 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -7765 +7757 @@
 
 /* Line 1806 of yacc.c  */
+#line 1815 "parser.yy"
+    { typedefTable.addToEnclosingScope( *(yyvsp[(2) - (2)].tok), TypedefTable::TD ); }
+    break;
+
+  case 487:
+
+/* Line 1806 of yacc.c  */
+#line 1817 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newTypeParam( (yyvsp[(1) - (4)].tclass), (yyvsp[(2) - (4)].tok) )->addAssertions( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 489:
+
+/* Line 1806 of yacc.c  */
 #line 1823 "parser.yy"
-    { typedefTable.addToEnclosingScope( *(yyvsp[(2) - (2)].tok), TypedefTable::TD ); }
-    break;
-
-  case 487:
+    { (yyval.tclass) = DeclarationNode::Type; }
+    break;
+
+  case 490:
 
 /* Line 1806 of yacc.c  */
 #line 1825 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newTypeParam( (yyvsp[(1) - (4)].tclass), (yyvsp[(2) - (4)].tok) )->addAssertions( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 489:
-
-/* Line 1806 of yacc.c  */
-#line 1831 "parser.yy"
-    { (yyval.tclass) = DeclarationNode::Type; }
-    break;
-
-  case 490:
-
-/* Line 1806 of yacc.c  */
-#line 1833 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Ftype; }
     break;
@@ -7793 +7785 @@
 
 /* Line 1806 of yacc.c  */
-#line 1835 "parser.yy"
+#line 1827 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Dtype; }
     break;
@@ -7800 +7792 @@
 
 /* Line 1806 of yacc.c  */
-#line 1840 "parser.yy"
+#line 1832 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7807 +7799 @@
 
 /* Line 1806 of yacc.c  */
-#line 1842 "parser.yy"
+#line 1834 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl) == 0 ? (yyvsp[(2) - (2)].decl) : (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7814 +7806 @@
 
 /* Line 1806 of yacc.c  */
-#line 1847 "parser.yy"
+#line 1839 "parser.yy"
     {
                         typedefTable.openTrait( *(yyvsp[(2) - (5)].tok) );
@@ -7824 +7816 @@
 
 /* Line 1806 of yacc.c  */
-#line 1852 "parser.yy"
+#line 1844 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (5)].decl); }
     break;
@@ -7831 +7823 @@
 
 /* Line 1806 of yacc.c  */
+#line 1846 "parser.yy"
+    { (yyval.decl) = 0; }
+    break;
+
+  case 497:
+
+/* Line 1806 of yacc.c  */
+#line 1851 "parser.yy"
+    { (yyval.en) = new TypeValueNode( (yyvsp[(1) - (1)].decl) ); }
+    break;
+
+  case 499:
+
+/* Line 1806 of yacc.c  */
 #line 1854 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
-  case 497:
-
-/* Line 1806 of yacc.c  */
-#line 1859 "parser.yy"
-    { (yyval.en) = new TypeValueNode( (yyvsp[(1) - (1)].decl) ); }
-    break;
-
-  case 499:
-
-/* Line 1806 of yacc.c  */
-#line 1862 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( new TypeValueNode( (yyvsp[(3) - (3)].decl) ))); }
     break;
@@ -7852 +7844 @@
 
 /* Line 1806 of yacc.c  */
-#line 1864 "parser.yy"
+#line 1856 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) )); }
     break;
@@ -7859 +7851 @@
 
 /* Line 1806 of yacc.c  */
-#line 1869 "parser.yy"
+#line 1861 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
     break;
@@ -7866 +7858 @@
 
 /* Line 1806 of yacc.c  */
-#line 1871 "parser.yy"
+#line 1863 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -7873 +7865 @@
 
 /* Line 1806 of yacc.c  */
-#line 1873 "parser.yy"
+#line 1865 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl)->copyStorageClasses( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -7880 +7872 @@
 
 /* Line 1806 of yacc.c  */
-#line 1878 "parser.yy"
+#line 1870 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addAssertions( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7887 +7879 @@
 
 /* Line 1806 of yacc.c  */
-#line 1880 "parser.yy"
+#line 1872 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addAssertions( (yyvsp[(2) - (4)].decl) )->addType( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -7894 +7886 @@
 
 /* Line 1806 of yacc.c  */
-#line 1885 "parser.yy"
+#line 1877 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (1)].tok), TypedefTable::TD );
@@ -7904 +7896 @@
 
 /* Line 1806 of yacc.c  */
-#line 1890 "parser.yy"
+#line 1882 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (6)].tok), TypedefTable::TG );
@@ -7914 +7906 @@
 
 /* Line 1806 of yacc.c  */
-#line 1898 "parser.yy"
+#line 1890 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (9)].tok), TypedefTable::ID );
@@ -7924 +7916 @@
 
 /* Line 1806 of yacc.c  */
-#line 1903 "parser.yy"
+#line 1895 "parser.yy"
     {
                         typedefTable.enterTrait( *(yyvsp[(2) - (8)].tok) );
@@ -7934 +7926 @@
 
 /* Line 1806 of yacc.c  */
-#line 1908 "parser.yy"
+#line 1900 "parser.yy"
     {
                         typedefTable.leaveTrait();
@@ -7945 +7937 @@
 
 /* Line 1806 of yacc.c  */
-#line 1918 "parser.yy"
+#line 1910 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7952 +7944 @@
 
 /* Line 1806 of yacc.c  */
-#line 1928 "parser.yy"
+#line 1920 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7962 +7954 @@
 
 /* Line 1806 of yacc.c  */
-#line 1933 "parser.yy"
+#line 1925 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7972 +7964 @@
 
 /* Line 1806 of yacc.c  */
-#line 1938 "parser.yy"
+#line 1930 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
@@ -7982 +7974 @@
 
 /* Line 1806 of yacc.c  */
-#line 1946 "parser.yy"
+#line 1938 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7992 +7984 @@
 
 /* Line 1806 of yacc.c  */
-#line 1951 "parser.yy"
+#line 1943 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -8002 +7994 @@
 
 /* Line 1806 of yacc.c  */
-#line 1961 "parser.yy"
+#line 1953 "parser.yy"
     {}
     break;
@@ -8009 +8001 @@
 
 /* Line 1806 of yacc.c  */
-#line 1963 "parser.yy"
+#line 1955 "parser.yy"
     {
                         if ( theTree ) {
@@ -8022 +8014 @@
 
 /* Line 1806 of yacc.c  */
-#line 1975 "parser.yy"
+#line 1967 "parser.yy"
     { (yyval.decl) = ( (yyvsp[(1) - (3)].decl) != NULL ) ? (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ) : (yyvsp[(3) - (3)].decl); }
     break;
@@ -8029 +8021 @@
 
 /* Line 1806 of yacc.c  */
+#line 1972 "parser.yy"
+    { (yyval.decl) = 0; }
+    break;
+
+  case 528:
+
+/* Line 1806 of yacc.c  */
 #line 1980 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
-  case 528:
-
-/* Line 1806 of yacc.c  */
-#line 1988 "parser.yy"
     {}
     break;
@@ -8043 +8035 @@
 
 /* Line 1806 of yacc.c  */
-#line 1990 "parser.yy"
+#line 1982 "parser.yy"
     {
                         linkageStack.push( linkage );
@@ -8053 +8045 @@
 
 /* Line 1806 of yacc.c  */
-#line 1995 "parser.yy"
+#line 1987 "parser.yy"
     {
                         linkage = linkageStack.top();
@@ -8064 +8056 @@
 
 /* Line 1806 of yacc.c  */
-#line 2001 "parser.yy"
-    {   // mark all fields in list
-                        for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_link() )
-                                iter->set_extension( true );
-                        (yyval.decl) = (yyvsp[(2) - (2)].decl);
-                }
+#line 1993 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)/*->set_extension( true )*/; }
     break;
 
@@ -8075 +8063 @@
 
 /* Line 1806 of yacc.c  */
-#line 2016 "parser.yy"
+#line 2004 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8086 +8074 @@
 
 /* Line 1806 of yacc.c  */
-#line 2022 "parser.yy"
+#line 2010 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8097 +8085 @@
 
 /* Line 1806 of yacc.c  */
-#line 2031 "parser.yy"
+#line 2019 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8108 +8096 @@
 
 /* Line 1806 of yacc.c  */
-#line 2037 "parser.yy"
+#line 2025 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8119 +8107 @@
 
 /* Line 1806 of yacc.c  */
-#line 2043 "parser.yy"
+#line 2031 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8130 +8118 @@
 
 /* Line 1806 of yacc.c  */
-#line 2049 "parser.yy"
+#line 2037 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8141 +8129 @@
 
 /* Line 1806 of yacc.c  */
-#line 2055 "parser.yy"
+#line 2043 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8152 +8140 @@
 
 /* Line 1806 of yacc.c  */
-#line 2063 "parser.yy"
+#line 2051 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8163 +8151 @@
 
 /* Line 1806 of yacc.c  */
-#line 2069 "parser.yy"
+#line 2057 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8174 +8162 @@
 
 /* Line 1806 of yacc.c  */
-#line 2077 "parser.yy"
+#line 2065 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8185 +8173 @@
 
 /* Line 1806 of yacc.c  */
-#line 2083 "parser.yy"
+#line 2071 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8196 +8184 @@
 
 /* Line 1806 of yacc.c  */
-#line 2098 "parser.yy"
+#line 2086 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Range ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
@@ -8203 +8191 @@
 
 /* Line 1806 of yacc.c  */
-#line 2108 "parser.yy"
+#line 2096 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -8210 +8198 @@
 
 /* Line 1806 of yacc.c  */
-#line 2115 "parser.yy"
+#line 2103 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -8217 +8205 @@
 
 /* Line 1806 of yacc.c  */
-#line 2121 "parser.yy"
+#line 2109 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -8224 +8212 @@
 
 /* Line 1806 of yacc.c  */
-#line 2136 "parser.yy"
+#line 2124 "parser.yy"
     {}
     break;
@@ -8231 +8219 @@
 
 /* Line 1806 of yacc.c  */
-#line 2137 "parser.yy"
+#line 2125 "parser.yy"
     {}
     break;
@@ -8238 +8226 @@
 
 /* Line 1806 of yacc.c  */
-#line 2138 "parser.yy"
+#line 2126 "parser.yy"
     {}
     break;
@@ -8245 +8233 @@
 
 /* Line 1806 of yacc.c  */
-#line 2139 "parser.yy"
+#line 2127 "parser.yy"
     {}
     break;
@@ -8252 +8240 @@
 
 /* Line 1806 of yacc.c  */
-#line 2174 "parser.yy"
+#line 2162 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8259 +8247 @@
 
 /* Line 1806 of yacc.c  */
-#line 2177 "parser.yy"
+#line 2165 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8266 +8254 @@
 
 /* Line 1806 of yacc.c  */
-#line 2179 "parser.yy"
+#line 2167 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8273 +8261 @@
 
 /* Line 1806 of yacc.c  */
-#line 2184 "parser.yy"
+#line 2172 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8283 +8271 @@
 
 /* Line 1806 of yacc.c  */
-#line 2189 "parser.yy"
+#line 2177 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8290 +8278 @@
 
 /* Line 1806 of yacc.c  */
-#line 2194 "parser.yy"
+#line 2182 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8297 +8285 @@
 
 /* Line 1806 of yacc.c  */
-#line 2196 "parser.yy"
+#line 2184 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8304 +8292 @@
 
 /* Line 1806 of yacc.c  */
-#line 2198 "parser.yy"
+#line 2186 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8311 +8299 @@
 
 /* Line 1806 of yacc.c  */
-#line 2203 "parser.yy"
+#line 2191 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8318 +8306 @@
 
 /* Line 1806 of yacc.c  */
-#line 2205 "parser.yy"
+#line 2193 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8325 +8313 @@
 
 /* Line 1806 of yacc.c  */
-#line 2207 "parser.yy"
+#line 2195 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8332 +8320 @@
 
 /* Line 1806 of yacc.c  */
-#line 2209 "parser.yy"
+#line 2197 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8339 +8327 @@
 
 /* Line 1806 of yacc.c  */
-#line 2214 "parser.yy"
+#line 2202 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8346 +8334 @@
 
 /* Line 1806 of yacc.c  */
+#line 2204 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 579:
+
+/* Line 1806 of yacc.c  */
+#line 2213 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 581:
+
+/* Line 1806 of yacc.c  */
 #line 2216 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 582:
+
+/* Line 1806 of yacc.c  */
+#line 2221 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
+    break;
+
+  case 583:
+
+/* Line 1806 of yacc.c  */
+#line 2223 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 584:
+
+/* Line 1806 of yacc.c  */
+#line 2225 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 579:
-
-/* Line 1806 of yacc.c  */
-#line 2225 "parser.yy"
+  case 585:
+
+/* Line 1806 of yacc.c  */
+#line 2230 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 586:
+
+/* Line 1806 of yacc.c  */
+#line 2232 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 587:
+
+/* Line 1806 of yacc.c  */
+#line 2234 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 588:
+
+/* Line 1806 of yacc.c  */
+#line 2239 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 589:
+
+/* Line 1806 of yacc.c  */
+#line 2241 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 590:
+
+/* Line 1806 of yacc.c  */
+#line 2243 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 594:
+
+/* Line 1806 of yacc.c  */
+#line 2258 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addIdList( (yyvsp[(3) - (4)].decl) ); }
+    break;
+
+  case 595:
+
+/* Line 1806 of yacc.c  */
+#line 2260 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (6)].decl)->addIdList( (yyvsp[(5) - (6)].decl) ); }
+    break;
+
+  case 596:
+
+/* Line 1806 of yacc.c  */
+#line 2262 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 597:
+
+/* Line 1806 of yacc.c  */
+#line 2267 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 598:
+
+/* Line 1806 of yacc.c  */
+#line 2269 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 599:
+
+/* Line 1806 of yacc.c  */
+#line 2271 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 600:
+
+/* Line 1806 of yacc.c  */
+#line 2276 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 601:
+
+/* Line 1806 of yacc.c  */
+#line 2278 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 602:
+
+/* Line 1806 of yacc.c  */
+#line 2280 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 603:
+
+/* Line 1806 of yacc.c  */
+#line 2295 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 581:
-
-/* Line 1806 of yacc.c  */
-#line 2228 "parser.yy"
+  case 605:
+
+/* Line 1806 of yacc.c  */
+#line 2298 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 582:
-
-/* Line 1806 of yacc.c  */
-#line 2233 "parser.yy"
+  case 606:
+
+/* Line 1806 of yacc.c  */
+#line 2300 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 608:
+
+/* Line 1806 of yacc.c  */
+#line 2306 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 609:
+
+/* Line 1806 of yacc.c  */
+#line 2311 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 610:
+
+/* Line 1806 of yacc.c  */
+#line 2313 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 611:
+
+/* Line 1806 of yacc.c  */
+#line 2315 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 612:
+
+/* Line 1806 of yacc.c  */
+#line 2320 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 613:
+
+/* Line 1806 of yacc.c  */
+#line 2322 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 614:
+
+/* Line 1806 of yacc.c  */
+#line 2324 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 615:
+
+/* Line 1806 of yacc.c  */
+#line 2326 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 616:
+
+/* Line 1806 of yacc.c  */
+#line 2331 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
 
-  case 583:
-
-/* Line 1806 of yacc.c  */
-#line 2235 "parser.yy"
+  case 617:
+
+/* Line 1806 of yacc.c  */
+#line 2333 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
 
-  case 584:
-
-/* Line 1806 of yacc.c  */
-#line 2237 "parser.yy"
+  case 618:
+
+/* Line 1806 of yacc.c  */
+#line 2335 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 585:
-
-/* Line 1806 of yacc.c  */
-#line 2242 "parser.yy"
+  case 619:
+
+/* Line 1806 of yacc.c  */
+#line 2345 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 621:
+
+/* Line 1806 of yacc.c  */
+#line 2348 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 622:
+
+/* Line 1806 of yacc.c  */
+#line 2350 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 623:
+
+/* Line 1806 of yacc.c  */
+#line 2355 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 
-  case 586:
-
-/* Line 1806 of yacc.c  */
-#line 2244 "parser.yy"
+  case 624:
+
+/* Line 1806 of yacc.c  */
+#line 2357 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
 
-  case 587:
-
-/* Line 1806 of yacc.c  */
-#line 2246 "parser.yy"
+  case 625:
+
+/* Line 1806 of yacc.c  */
+#line 2359 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 588:
-
-/* Line 1806 of yacc.c  */
-#line 2251 "parser.yy"
+  case 626:
+
+/* Line 1806 of yacc.c  */
+#line 2364 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 627:
+
+/* Line 1806 of yacc.c  */
+#line 2366 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 
-  case 589:
-
-/* Line 1806 of yacc.c  */
-#line 2253 "parser.yy"
+  case 628:
+
+/* Line 1806 of yacc.c  */
+#line 2368 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 
-  case 590:
-
-/* Line 1806 of yacc.c  */
-#line 2255 "parser.yy"
+  case 629:
+
+/* Line 1806 of yacc.c  */
+#line 2370 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 594:
-
-/* Line 1806 of yacc.c  */
-#line 2270 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addIdList( (yyvsp[(3) - (4)].decl) ); }
-    break;
-
-  case 595:
-
-/* Line 1806 of yacc.c  */
-#line 2272 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (6)].decl)->addIdList( (yyvsp[(5) - (6)].decl) ); }
-    break;
-
-  case 596:
-
-/* Line 1806 of yacc.c  */
-#line 2274 "parser.yy"
+  case 630:
+
+/* Line 1806 of yacc.c  */
+#line 2375 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
+    break;
+
+  case 631:
+
+/* Line 1806 of yacc.c  */
+#line 2377 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 632:
+
+/* Line 1806 of yacc.c  */
+#line 2379 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 597:
-
-/* Line 1806 of yacc.c  */
-#line 2279 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 598:
-
-/* Line 1806 of yacc.c  */
-#line 2281 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 599:
-
-/* Line 1806 of yacc.c  */
-#line 2283 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 600:
-
-/* Line 1806 of yacc.c  */
-#line 2288 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 601:
-
-/* Line 1806 of yacc.c  */
-#line 2290 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 602:
-
-/* Line 1806 of yacc.c  */
-#line 2292 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 603:
-
-/* Line 1806 of yacc.c  */
-#line 2307 "parser.yy"
+  case 633:
+
+/* Line 1806 of yacc.c  */
+#line 2410 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 605:
-
-/* Line 1806 of yacc.c  */
-#line 2310 "parser.yy"
+  case 635:
+
+/* Line 1806 of yacc.c  */
+#line 2413 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 606:
-
-/* Line 1806 of yacc.c  */
-#line 2312 "parser.yy"
+  case 636:
+
+/* Line 1806 of yacc.c  */
+#line 2415 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 608:
-
-/* Line 1806 of yacc.c  */
-#line 2318 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 609:
-
-/* Line 1806 of yacc.c  */
-#line 2323 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 610:
-
-/* Line 1806 of yacc.c  */
-#line 2325 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 611:
-
-/* Line 1806 of yacc.c  */
-#line 2327 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 612:
-
-/* Line 1806 of yacc.c  */
-#line 2332 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 613:
-
-/* Line 1806 of yacc.c  */
-#line 2334 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 614:
-
-/* Line 1806 of yacc.c  */
-#line 2336 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 615:
-
-/* Line 1806 of yacc.c  */
-#line 2338 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 616:
-
-/* Line 1806 of yacc.c  */
-#line 2343 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-
-  case 617:
-
-/* Line 1806 of yacc.c  */
-#line 2345 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 618:
-
-/* Line 1806 of yacc.c  */
-#line 2347 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 619:
-
-/* Line 1806 of yacc.c  */
-#line 2357 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 621:
-
-/* Line 1806 of yacc.c  */
-#line 2360 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 622:
-
-/* Line 1806 of yacc.c  */
-#line 2362 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 623:
-
-/* Line 1806 of yacc.c  */
-#line 2367 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 624:
-
-/* Line 1806 of yacc.c  */
-#line 2369 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 625:
-
-/* Line 1806 of yacc.c  */
-#line 2371 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 626:
-
-/* Line 1806 of yacc.c  */
-#line 2376 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 627:
-
-/* Line 1806 of yacc.c  */
-#line 2378 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 628:
-
-/* Line 1806 of yacc.c  */
-#line 2380 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 629:
-
-/* Line 1806 of yacc.c  */
-#line 2382 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 630:
-
-/* Line 1806 of yacc.c  */
-#line 2387 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-
-  case 631:
-
-/* Line 1806 of yacc.c  */
-#line 2389 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 632:
-
-/* Line 1806 of yacc.c  */
-#line 2391 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 633:
-
-/* Line 1806 of yacc.c  */
-#line 2422 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 635:
-
-/* Line 1806 of yacc.c  */
-#line 2425 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 636:
-
-/* Line 1806 of yacc.c  */
-#line 2427 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 637:
 
 /* Line 1806 of yacc.c  */
-#line 2432 "parser.yy"
+#line 2420 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8713 +8701 @@
 
 /* Line 1806 of yacc.c  */
-#line 2437 "parser.yy"
+#line 2425 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8723 +8711 @@
 
 /* Line 1806 of yacc.c  */
-#line 2445 "parser.yy"
+#line 2433 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8730 +8718 @@
 
 /* Line 1806 of yacc.c  */
-#line 2447 "parser.yy"
+#line 2435 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8737 +8725 @@
 
 /* Line 1806 of yacc.c  */
+#line 2437 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 642:
+
+/* Line 1806 of yacc.c  */
+#line 2442 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 643:
+
+/* Line 1806 of yacc.c  */
+#line 2444 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 644:
+
+/* Line 1806 of yacc.c  */
 #line 2449 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
+    break;
+
+  case 645:
+
+/* Line 1806 of yacc.c  */
+#line 2451 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 647:
+
+/* Line 1806 of yacc.c  */
+#line 2466 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 648:
+
+/* Line 1806 of yacc.c  */
+#line 2468 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 649:
+
+/* Line 1806 of yacc.c  */
+#line 2473 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
+    break;
+
+  case 650:
+
+/* Line 1806 of yacc.c  */
+#line 2475 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 651:
+
+/* Line 1806 of yacc.c  */
+#line 2477 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 652:
+
+/* Line 1806 of yacc.c  */
+#line 2479 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 653:
+
+/* Line 1806 of yacc.c  */
+#line 2481 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 642:
-
-/* Line 1806 of yacc.c  */
-#line 2454 "parser.yy"
+  case 655:
+
+/* Line 1806 of yacc.c  */
+#line 2487 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 656:
+
+/* Line 1806 of yacc.c  */
+#line 2489 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 657:
+
+/* Line 1806 of yacc.c  */
+#line 2491 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 658:
+
+/* Line 1806 of yacc.c  */
+#line 2496 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
+    break;
+
+  case 659:
+
+/* Line 1806 of yacc.c  */
+#line 2498 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 660:
+
+/* Line 1806 of yacc.c  */
+#line 2500 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 661:
+
+/* Line 1806 of yacc.c  */
+#line 2506 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
+    break;
+
+  case 662:
+
+/* Line 1806 of yacc.c  */
+#line 2508 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false )->addArray( (yyvsp[(3) - (3)].decl) ); }
+    break;
+
+  case 664:
+
+/* Line 1806 of yacc.c  */
+#line 2514 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(3) - (5)].en), 0, false ); }
+    break;
+
+  case 665:
+
+/* Line 1806 of yacc.c  */
+#line 2516 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newVarArray( 0 ); }
+    break;
+
+  case 666:
+
+/* Line 1806 of yacc.c  */
+#line 2518 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newArray( (yyvsp[(4) - (6)].en), 0, false ) ); }
+    break;
+
+  case 667:
+
+/* Line 1806 of yacc.c  */
+#line 2520 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newVarArray( 0 ) ); }
+    break;
+
+  case 669:
+
+/* Line 1806 of yacc.c  */
+#line 2535 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 670:
+
+/* Line 1806 of yacc.c  */
+#line 2537 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 671:
+
+/* Line 1806 of yacc.c  */
+#line 2542 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
+    break;
+
+  case 672:
+
+/* Line 1806 of yacc.c  */
+#line 2544 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 673:
+
+/* Line 1806 of yacc.c  */
+#line 2546 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 674:
+
+/* Line 1806 of yacc.c  */
+#line 2548 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 675:
+
+/* Line 1806 of yacc.c  */
+#line 2550 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 677:
+
+/* Line 1806 of yacc.c  */
+#line 2556 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 678:
+
+/* Line 1806 of yacc.c  */
+#line 2558 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 679:
+
+/* Line 1806 of yacc.c  */
+#line 2560 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 680:
+
+/* Line 1806 of yacc.c  */
+#line 2565 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
+    break;
+
+  case 681:
+
+/* Line 1806 of yacc.c  */
+#line 2567 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 682:
+
+/* Line 1806 of yacc.c  */
+#line 2569 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 684:
+
+/* Line 1806 of yacc.c  */
+#line 2576 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 643:
-
-/* Line 1806 of yacc.c  */
-#line 2456 "parser.yy"
+  case 686:
+
+/* Line 1806 of yacc.c  */
+#line 2587 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
+    break;
+
+  case 687:
+
+/* Line 1806 of yacc.c  */
+#line 2590 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
+    break;
+
+  case 688:
+
+/* Line 1806 of yacc.c  */
+#line 2592 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( 0, (yyvsp[(3) - (5)].decl), false ); }
+    break;
+
+  case 689:
+
+/* Line 1806 of yacc.c  */
+#line 2595 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
+    break;
+
+  case 690:
+
+/* Line 1806 of yacc.c  */
+#line 2597 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl), true ); }
+    break;
+
+  case 691:
+
+/* Line 1806 of yacc.c  */
+#line 2599 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(3) - (7)].decl), true ); }
+    break;
+
+  case 693:
+
+/* Line 1806 of yacc.c  */
+#line 2613 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 694:
+
+/* Line 1806 of yacc.c  */
+#line 2615 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 695:
+
+/* Line 1806 of yacc.c  */
+#line 2620 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
+    break;
+
+  case 696:
+
+/* Line 1806 of yacc.c  */
+#line 2622 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 697:
+
+/* Line 1806 of yacc.c  */
+#line 2624 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 698:
+
+/* Line 1806 of yacc.c  */
+#line 2626 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 699:
+
+/* Line 1806 of yacc.c  */
+#line 2628 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 701:
+
+/* Line 1806 of yacc.c  */
+#line 2634 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 
-  case 644:
-
-/* Line 1806 of yacc.c  */
-#line 2461 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-
-  case 645:
-
-/* Line 1806 of yacc.c  */
-#line 2463 "parser.yy"
+  case 702:
+
+/* Line 1806 of yacc.c  */
+#line 2636 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 703:
+
+/* Line 1806 of yacc.c  */
+#line 2638 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 704:
+
+/* Line 1806 of yacc.c  */
+#line 2643 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
 
-  case 647:
-
-/* Line 1806 of yacc.c  */
-#line 2478 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 648:
-
-/* Line 1806 of yacc.c  */
-#line 2480 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 649:
-
-/* Line 1806 of yacc.c  */
-#line 2485 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
-    break;
-
-  case 650:
-
-/* Line 1806 of yacc.c  */
-#line 2487 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 651:
-
-/* Line 1806 of yacc.c  */
-#line 2489 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 652:
-
-/* Line 1806 of yacc.c  */
-#line 2491 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 653:
-
-/* Line 1806 of yacc.c  */
-#line 2493 "parser.yy"
+  case 705:
+
+/* Line 1806 of yacc.c  */
+#line 2645 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 655:
-
-/* Line 1806 of yacc.c  */
-#line 2499 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 656:
-
-/* Line 1806 of yacc.c  */
-#line 2501 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 657:
-
-/* Line 1806 of yacc.c  */
-#line 2503 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 658:
-
-/* Line 1806 of yacc.c  */
-#line 2508 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
-    break;
-
-  case 659:
-
-/* Line 1806 of yacc.c  */
-#line 2510 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 660:
-
-/* Line 1806 of yacc.c  */
-#line 2512 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 661:
-
-/* Line 1806 of yacc.c  */
-#line 2518 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
-    break;
-
-  case 662:
-
-/* Line 1806 of yacc.c  */
-#line 2520 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false )->addArray( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 664:
-
-/* Line 1806 of yacc.c  */
-#line 2526 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(3) - (5)].en), 0, false ); }
-    break;
-
-  case 665:
-
-/* Line 1806 of yacc.c  */
-#line 2528 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newVarArray( 0 ); }
-    break;
-
-  case 666:
-
-/* Line 1806 of yacc.c  */
-#line 2530 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newArray( (yyvsp[(4) - (6)].en), 0, false ) ); }
-    break;
-
-  case 667:
-
-/* Line 1806 of yacc.c  */
-#line 2532 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newVarArray( 0 ) ); }
-    break;
-
-  case 669:
-
-/* Line 1806 of yacc.c  */
-#line 2547 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 670:
-
-/* Line 1806 of yacc.c  */
-#line 2549 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 671:
-
-/* Line 1806 of yacc.c  */
-#line 2554 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
-    break;
-
-  case 672:
-
-/* Line 1806 of yacc.c  */
-#line 2556 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 673:
-
-/* Line 1806 of yacc.c  */
-#line 2558 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 674:
-
-/* Line 1806 of yacc.c  */
-#line 2560 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 675:
-
-/* Line 1806 of yacc.c  */
-#line 2562 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 677:
-
-/* Line 1806 of yacc.c  */
-#line 2568 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 678:
-
-/* Line 1806 of yacc.c  */
-#line 2570 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 679:
-
-/* Line 1806 of yacc.c  */
-#line 2572 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 680:
-
-/* Line 1806 of yacc.c  */
-#line 2577 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
-    break;
-
-  case 681:
-
-/* Line 1806 of yacc.c  */
-#line 2579 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 682:
-
-/* Line 1806 of yacc.c  */
-#line 2581 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 684:
-
-/* Line 1806 of yacc.c  */
-#line 2588 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 686:
-
-/* Line 1806 of yacc.c  */
-#line 2599 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
-    break;
-
-  case 687:
-
-/* Line 1806 of yacc.c  */
-#line 2602 "parser.yy"
+  case 708:
+
+/* Line 1806 of yacc.c  */
+#line 2655 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 711:
+
+/* Line 1806 of yacc.c  */
+#line 2665 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 712:
+
+/* Line 1806 of yacc.c  */
+#line 2667 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+    break;
+
+  case 713:
+
+/* Line 1806 of yacc.c  */
+#line 2669 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 714:
+
+/* Line 1806 of yacc.c  */
+#line 2671 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+    break;
+
+  case 715:
+
+/* Line 1806 of yacc.c  */
+#line 2673 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 716:
+
+/* Line 1806 of yacc.c  */
+#line 2675 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+    break;
+
+  case 717:
+
+/* Line 1806 of yacc.c  */
+#line 2682 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 718:
+
+/* Line 1806 of yacc.c  */
+#line 2684 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 719:
+
+/* Line 1806 of yacc.c  */
+#line 2686 "parser.yy"
+    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 720:
+
+/* Line 1806 of yacc.c  */
+#line 2688 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
+    break;
+
+  case 721:
+
+/* Line 1806 of yacc.c  */
+#line 2690 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 722:
+
+/* Line 1806 of yacc.c  */
+#line 2692 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 723:
+
+/* Line 1806 of yacc.c  */
+#line 2694 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 724:
+
+/* Line 1806 of yacc.c  */
+#line 2696 "parser.yy"
+    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 725:
+
+/* Line 1806 of yacc.c  */
+#line 2698 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
+    break;
+
+  case 726:
+
+/* Line 1806 of yacc.c  */
+#line 2700 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 727:
+
+/* Line 1806 of yacc.c  */
+#line 2705 "parser.yy"
     { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
     break;
 
-  case 688:
-
-/* Line 1806 of yacc.c  */
-#line 2604 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( 0, (yyvsp[(3) - (5)].decl), false ); }
-    break;
-
-  case 689:
-
-/* Line 1806 of yacc.c  */
-#line 2607 "parser.yy"
+  case 728:
+
+/* Line 1806 of yacc.c  */
+#line 2707 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
     break;
 
-  case 690:
-
-/* Line 1806 of yacc.c  */
-#line 2609 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl), true ); }
-    break;
-
-  case 691:
-
-/* Line 1806 of yacc.c  */
-#line 2611 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(3) - (7)].decl), true ); }
-    break;
-
-  case 693:
-
-/* Line 1806 of yacc.c  */
-#line 2625 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 694:
-
-/* Line 1806 of yacc.c  */
-#line 2627 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 695:
-
-/* Line 1806 of yacc.c  */
-#line 2632 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
-    break;
-
-  case 696:
-
-/* Line 1806 of yacc.c  */
-#line 2634 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 697:
-
-/* Line 1806 of yacc.c  */
-#line 2636 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 698:
-
-/* Line 1806 of yacc.c  */
-#line 2638 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 699:
-
-/* Line 1806 of yacc.c  */
-#line 2640 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 701:
-
-/* Line 1806 of yacc.c  */
-#line 2646 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 702:
-
-/* Line 1806 of yacc.c  */
-#line 2648 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 703:
-
-/* Line 1806 of yacc.c  */
-#line 2650 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 704:
-
-/* Line 1806 of yacc.c  */
-#line 2655 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 705:
-
-/* Line 1806 of yacc.c  */
-#line 2657 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 708:
-
-/* Line 1806 of yacc.c  */
-#line 2667 "parser.yy"
+  case 729:
+
+/* Line 1806 of yacc.c  */
+#line 2712 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), true ); }
+    break;
+
+  case 730:
+
+/* Line 1806 of yacc.c  */
+#line 2714 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl)->addQualifiers( (yyvsp[(3) - (7)].decl) ), true ); }
+    break;
+
+  case 732:
+
+/* Line 1806 of yacc.c  */
+#line 2741 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 711:
-
-/* Line 1806 of yacc.c  */
-#line 2677 "parser.yy"
+  case 736:
+
+/* Line 1806 of yacc.c  */
+#line 2752 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 
-  case 712:
-
-/* Line 1806 of yacc.c  */
-#line 2679 "parser.yy"
+  case 737:
+
+/* Line 1806 of yacc.c  */
+#line 2754 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
 
-  case 713:
-
-/* Line 1806 of yacc.c  */
-#line 2681 "parser.yy"
+  case 738:
+
+/* Line 1806 of yacc.c  */
+#line 2756 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 
-  case 714:
-
-/* Line 1806 of yacc.c  */
-#line 2683 "parser.yy"
+  case 739:
+
+/* Line 1806 of yacc.c  */
+#line 2758 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
 
-  case 715:
-
-/* Line 1806 of yacc.c  */
-#line 2685 "parser.yy"
+  case 740:
+
+/* Line 1806 of yacc.c  */
+#line 2760 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 
-  case 716:
-
-/* Line 1806 of yacc.c  */
-#line 2687 "parser.yy"
+  case 741:
+
+/* Line 1806 of yacc.c  */
+#line 2762 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
 
-  case 717:
-
-/* Line 1806 of yacc.c  */
-#line 2694 "parser.yy"
+  case 742:
+
+/* Line 1806 of yacc.c  */
+#line 2769 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
 
-  case 718:
-
-/* Line 1806 of yacc.c  */
-#line 2696 "parser.yy"
+  case 743:
+
+/* Line 1806 of yacc.c  */
+#line 2771 "parser.yy"
+    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 744:
+
+/* Line 1806 of yacc.c  */
+#line 2773 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 719:
-
-/* Line 1806 of yacc.c  */
-#line 2698 "parser.yy"
+  case 745:
+
+/* Line 1806 of yacc.c  */
+#line 2775 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 746:
+
+/* Line 1806 of yacc.c  */
+#line 2777 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
 
-  case 720:
-
-/* Line 1806 of yacc.c  */
-#line 2700 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
-    break;
-
-  case 721:
-
-/* Line 1806 of yacc.c  */
-#line 2702 "parser.yy"
+  case 747:
+
+/* Line 1806 of yacc.c  */
+#line 2779 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 722:
-
-/* Line 1806 of yacc.c  */
-#line 2704 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 723:
-
-/* Line 1806 of yacc.c  */
-#line 2706 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 724:
-
-/* Line 1806 of yacc.c  */
-#line 2708 "parser.yy"
-    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 725:
-
-/* Line 1806 of yacc.c  */
-#line 2710 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
-    break;
-
-  case 726:
-
-/* Line 1806 of yacc.c  */
-#line 2712 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 727:
-
-/* Line 1806 of yacc.c  */
-#line 2717 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
-    break;
-
-  case 728:
-
-/* Line 1806 of yacc.c  */
-#line 2719 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
-    break;
-
-  case 729:
-
-/* Line 1806 of yacc.c  */
-#line 2724 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), true ); }
-    break;
-
-  case 730:
-
-/* Line 1806 of yacc.c  */
-#line 2726 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl)->addQualifiers( (yyvsp[(3) - (7)].decl) ), true ); }
-    break;
-
-  case 732:
-
-/* Line 1806 of yacc.c  */
-#line 2753 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 736:
-
-/* Line 1806 of yacc.c  */
-#line 2764 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 737:
-
-/* Line 1806 of yacc.c  */
-#line 2766 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
-    break;
-
-  case 738:
-
-/* Line 1806 of yacc.c  */
-#line 2768 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 739:
-
-/* Line 1806 of yacc.c  */
-#line 2770 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
-    break;
-
-  case 740:
-
-/* Line 1806 of yacc.c  */
-#line 2772 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 741:
-
-/* Line 1806 of yacc.c  */
-#line 2774 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
-    break;
-
-  case 742:
-
-/* Line 1806 of yacc.c  */
-#line 2781 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 743:
-
-/* Line 1806 of yacc.c  */
-#line 2783 "parser.yy"
-    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 744:
-
-/* Line 1806 of yacc.c  */
-#line 2785 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 745:
-
-/* Line 1806 of yacc.c  */
-#line 2787 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 746:
+  case 748:
+
+/* Line 1806 of yacc.c  */
+#line 2784 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
+    break;
+
+  case 749:
 
 /* Line 1806 of yacc.c  */
 #line 2789 "parser.yy"
-    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 747:
+    { (yyval.decl) = DeclarationNode::newFunction( 0, DeclarationNode::newTuple( 0 ), (yyvsp[(4) - (5)].decl), 0 ); }
+    break;
+
+  case 750:
 
 /* Line 1806 of yacc.c  */
 #line 2791 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 748:
-
-/* Line 1806 of yacc.c  */
-#line 2796 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
-    break;
-
-  case 749:
-
-/* Line 1806 of yacc.c  */
-#line 2801 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFunction( 0, DeclarationNode::newTuple( 0 ), (yyvsp[(4) - (5)].decl), 0 ); }
-    break;
-
-  case 750:
-
-/* Line 1806 of yacc.c  */
-#line 2803 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), 0 ); }
     break;
@@ -9388 +9376 @@
 
 /* Line 1806 of yacc.c  */
-#line 2805 "parser.yy"
+#line 2793 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), 0 ); }
     break;
@@ -9395 +9383 @@
 
 /* Line 1806 of yacc.c  */
-#line 2829 "parser.yy"
+#line 2817 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -9402 +9390 @@
 
 /* Line 1806 of yacc.c  */
-#line 2831 "parser.yy"
+#line 2819 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -9409 +9397 @@
 
 /* Line 1806 of yacc.c  */
-#line 9412 "Parser/parser.cc"
+#line 9400 "Parser/parser.cc"
       default: break;
     }
@@ -9640 +9628 @@
 
 /* Line 2067 of yacc.c  */
-#line 2834 "parser.yy"
+#line 2822 "parser.yy"
 
 // ----end of grammar----