Changeset 8a95629

Timestamp:

Jun 10, 2015, 2:26:44 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

b1d6dd5, b5c5684

Parents:

0b2961f

Message:

fix parsing error for syntax error message, work on regression testing

Location:

src

Files:

• Parser/parser.cc (modified) (525 diffs)
• Parser/parser.h (modified) (1 diff)
• Parser/parser.yy (modified) (3 diffs)
• Tests/ResolvExpr/Attributes.c (deleted)
• Tests/ResolvExpr/Forall.c (deleted)
• Tests/SynTree/Forall.c (modified) (1 diff)
• Tests/Syntax/Attributes.c (modified) (1 diff)

src/Parser/parser.cc

@@ -71 +71 @@
 #define YYDEBUG_LEXER_TEXT (yylval)                                             // lexer loads this up each time
 #define YYDEBUG 1                                                                               // get the pretty debugging code to compile
+extern char *yytext;
 
 #undef __GNUC_MINOR__
@@ -88 +89 @@
 
 /* Line 268 of yacc.c  */
-#line 91 "Parser/parser.cc"
+#line 92 "Parser/parser.cc"
 
 /* Enabling traces.  */
@@ -323 +324 @@
 
 /* Line 293 of yacc.c  */
-#line 107 "parser.yy"
+#line 108 "parser.yy"
 
         Token tok;
@@ -338 +339 @@
 
 /* Line 293 of yacc.c  */
-#line 341 "Parser/parser.cc"
+#line 342 "Parser/parser.cc"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
@@ -350 +351 @@
 
 /* Line 343 of yacc.c  */
-#line 353 "Parser/parser.cc"
+#line 354 "Parser/parser.cc"
 
 #ifdef short
@@ -990 +991 @@
 static const yytype_uint16 yyrline[] =
 {
-       0,   281,   281,   287,   297,   298,   299,   303,   304,   305,
-     309,   310,   314,   318,   319,   323,   324,   330,   332,   334,
-     336,   338,   340,   345,   346,   352,   354,   356,   357,   359,
-     360,   362,   365,   370,   371,   377,   378,   379,   384,   386,
-     391,   392,   396,   398,   400,   402,   404,   409,   410,   412,
-     414,   416,   418,   420,   426,   428,   430,   432,   434,   436,
-     438,   440,   445,   446,   447,   448,   452,   453,   455,   460,
-     461,   463,   465,   470,   471,   473,   478,   479,   481,   486,
-     487,   489,   491,   493,   498,   499,   501,   506,   507,   512,
-     513,   518,   519,   524,   525,   530,   531,   536,   537,   539,
-     541,   546,   551,   552,   554,   556,   562,   563,   569,   571,
-     573,   575,   580,   581,   586,   587,   588,   589,   590,   591,
-     592,   593,   594,   595,   599,   600,   606,   607,   613,   614,
-     615,   616,   617,   618,   619,   620,   624,   629,   631,   641,
-     642,   647,   649,   651,   653,   657,   658,   663,   668,   671,
-     673,   675,   681,   683,   691,   692,   694,   698,   699,   704,
-     705,   710,   711,   715,   720,   721,   725,   727,   733,   734,
-     738,   740,   742,   744,   750,   751,   755,   756,   760,   762,
-     764,   769,   771,   776,   778,   782,   786,   790,   794,   798,
-     800,   802,   807,   809,   811,   820,   823,   825,   830,   832,
-     837,   850,   851,   856,   858,   863,   867,   869,   871,   873,
-     877,   879,   883,   884,   888,   892,   893,   899,   901,   905,
-     906,   911,   913,   917,   918,   922,   924,   928,   929,   933,
-     934,   938,   939,   955,   956,   957,   958,   959,   963,   968,
-     975,   985,   990,   995,  1003,  1008,  1013,  1018,  1023,  1031,
-    1036,  1049,  1055,  1062,  1064,  1071,  1076,  1081,  1093,  1098,
-    1103,  1108,  1113,  1121,  1126,  1134,  1135,  1136,  1137,  1143,
-    1148,  1156,  1157,  1158,  1159,  1163,  1164,  1165,  1166,  1171,
-    1172,  1182,  1183,  1188,  1189,  1194,  1196,  1198,  1200,  1202,
-    1205,  1204,  1216,  1217,  1219,  1229,  1230,  1235,  1239,  1241,
-    1243,  1245,  1247,  1250,  1255,  1257,  1259,  1261,  1263,  1265,
-    1267,  1269,  1271,  1273,  1275,  1277,  1283,  1284,  1286,  1288,
-    1290,  1295,  1296,  1302,  1303,  1305,  1307,  1312,  1314,  1316,
-    1318,  1323,  1324,  1326,  1328,  1333,  1334,  1336,  1341,  1342,
-    1344,  1346,  1351,  1353,  1355,  1360,  1361,  1365,  1367,  1369,
-    1371,  1373,  1375,  1377,  1379,  1382,  1387,  1389,  1394,  1396,
-    1401,  1402,  1404,  1405,  1410,  1411,  1413,  1415,  1420,  1422,
-    1428,  1429,  1431,  1434,  1437,  1442,  1443,  1448,  1453,  1457,
-    1459,  1461,  1466,  1468,  1474,  1475,  1483,  1484,  1488,  1489,
-    1490,  1492,  1494,  1502,  1503,  1505,  1507,  1512,  1513,  1519,
-    1520,  1524,  1525,  1530,  1531,  1532,  1534,  1543,  1544,  1546,
-    1549,  1551,  1555,  1556,  1557,  1559,  1561,  1565,  1570,  1578,
-    1579,  1588,  1590,  1595,  1596,  1597,  1601,  1602,  1603,  1607,
-    1608,  1609,  1613,  1614,  1615,  1620,  1621,  1622,  1623,  1629,
-    1630,  1634,  1635,  1639,  1640,  1641,  1642,  1657,  1658,  1663,
-    1664,  1668,  1670,  1674,  1676,  1678,  1702,  1703,  1705,  1707,
-    1712,  1714,  1716,  1721,  1722,  1728,  1727,  1731,  1735,  1737,
-    1739,  1745,  1746,  1751,  1756,  1758,  1763,  1765,  1766,  1768,
-    1773,  1775,  1777,  1782,  1784,  1789,  1794,  1802,  1808,  1807,
-    1821,  1822,  1827,  1828,  1832,  1837,  1842,  1850,  1855,  1866,
-    1867,  1878,  1879,  1885,  1886,  1890,  1891,  1892,  1895,  1894,
-    1905,  1910,  1917,  1923,  1932,  1938,  1944,  1950,  1956,  1964,
-    1970,  1978,  1984,  1993,  1994,  1995,  1999,  2003,  2005,  2008,
-    2010,  2014,  2015,  2019,  2023,  2024,  2027,  2029,  2030,  2034,
-    2035,  2036,  2037,  2072,  2073,  2074,  2075,  2079,  2084,  2089,
-    2091,  2093,  2098,  2100,  2102,  2104,  2109,  2111,  2121,  2122,
-    2123,  2127,  2129,  2131,  2136,  2138,  2140,  2145,  2147,  2149,
-    2158,  2159,  2160,  2164,  2166,  2168,  2173,  2175,  2177,  2182,
-    2184,  2186,  2201,  2202,  2203,  2204,  2208,  2213,  2218,  2220,
-    2222,  2227,  2229,  2231,  2233,  2238,  2240,  2242,  2252,  2253,
-    2254,  2255,  2259,  2261,  2263,  2268,  2270,  2272,  2274,  2279,
-    2281,  2283,  2314,  2315,  2316,  2317,  2321,  2329,  2331,  2333,
-    2338,  2340,  2345,  2347,  2361,  2362,  2363,  2367,  2369,  2371,
-    2373,  2375,  2380,  2381,  2383,  2385,  2390,  2392,  2394,  2400,
-    2402,  2404,  2408,  2410,  2412,  2414,  2428,  2429,  2430,  2434,
-    2436,  2438,  2440,  2442,  2447,  2448,  2450,  2452,  2457,  2459,
-    2461,  2467,  2468,  2470,  2480,  2483,  2485,  2488,  2490,  2492,
-    2505,  2506,  2507,  2511,  2513,  2515,  2517,  2519,  2524,  2525,
-    2527,  2529,  2534,  2536,  2544,  2545,  2546,  2551,  2552,  2556,
-    2558,  2560,  2562,  2564,  2566,  2573,  2575,  2577,  2579,  2581,
-    2583,  2585,  2587,  2589,  2591,  2596,  2598,  2600,  2605,  2631,
-    2632,  2634,  2638,  2639,  2643,  2645,  2647,  2649,  2651,  2653,
-    2660,  2662,  2664,  2666,  2668,  2670,  2675,  2680,  2682,  2684,
-    2704,  2706,  2711,  2712
+       0,   282,   282,   288,   298,   299,   300,   304,   305,   306,
+     310,   311,   315,   319,   320,   324,   325,   331,   333,   335,
+     337,   339,   341,   346,   347,   353,   355,   357,   358,   360,
+     361,   363,   366,   371,   372,   378,   379,   380,   385,   387,
+     392,   393,   397,   399,   401,   403,   405,   410,   411,   413,
+     415,   417,   419,   421,   427,   429,   431,   433,   435,   437,
+     439,   441,   446,   447,   448,   449,   453,   454,   456,   461,
+     462,   464,   466,   471,   472,   474,   479,   480,   482,   487,
+     488,   490,   492,   494,   499,   500,   502,   507,   508,   513,
+     514,   519,   520,   525,   526,   531,   532,   537,   538,   540,
+     542,   547,   552,   553,   555,   557,   563,   564,   570,   572,
+     574,   576,   581,   582,   587,   588,   589,   590,   591,   592,
+     593,   594,   595,   596,   600,   601,   607,   608,   614,   615,
+     616,   617,   618,   619,   620,   621,   625,   630,   632,   642,
+     643,   648,   650,   652,   654,   658,   659,   664,   669,   672,
+     674,   676,   682,   684,   692,   693,   695,   699,   700,   705,
+     706,   711,   712,   716,   721,   722,   726,   728,   734,   735,
+     739,   741,   743,   745,   751,   752,   756,   757,   761,   763,
+     765,   770,   772,   777,   779,   783,   787,   791,   795,   799,
+     801,   803,   808,   810,   812,   821,   824,   826,   831,   833,
+     838,   851,   852,   857,   859,   864,   868,   870,   872,   874,
+     878,   880,   884,   885,   889,   893,   894,   900,   902,   906,
+     907,   912,   914,   918,   919,   923,   925,   929,   930,   934,
+     935,   939,   940,   956,   957,   958,   959,   960,   964,   969,
+     976,   986,   991,   996,  1004,  1009,  1014,  1019,  1024,  1032,
+    1037,  1050,  1056,  1063,  1065,  1072,  1077,  1082,  1094,  1099,
+    1104,  1109,  1114,  1122,  1127,  1135,  1136,  1137,  1138,  1144,
+    1149,  1157,  1158,  1159,  1160,  1164,  1165,  1166,  1167,  1172,
+    1173,  1183,  1184,  1189,  1190,  1195,  1197,  1199,  1201,  1203,
+    1206,  1205,  1217,  1218,  1220,  1230,  1231,  1236,  1240,  1242,
+    1244,  1246,  1248,  1251,  1256,  1258,  1260,  1262,  1264,  1266,
+    1268,  1270,  1272,  1274,  1276,  1278,  1284,  1285,  1287,  1289,
+    1291,  1296,  1297,  1303,  1304,  1306,  1308,  1313,  1315,  1317,
+    1319,  1324,  1325,  1327,  1329,  1334,  1335,  1337,  1342,  1343,
+    1345,  1347,  1352,  1354,  1356,  1361,  1362,  1366,  1368,  1370,
+    1372,  1374,  1376,  1378,  1380,  1383,  1388,  1390,  1395,  1397,
+    1402,  1403,  1405,  1406,  1411,  1412,  1414,  1416,  1421,  1423,
+    1429,  1430,  1432,  1435,  1438,  1443,  1444,  1449,  1454,  1458,
+    1460,  1462,  1467,  1469,  1475,  1476,  1484,  1485,  1489,  1490,
+    1491,  1493,  1495,  1503,  1504,  1506,  1508,  1513,  1514,  1520,
+    1521,  1525,  1526,  1531,  1532,  1533,  1535,  1544,  1545,  1547,
+    1550,  1552,  1556,  1557,  1558,  1560,  1562,  1566,  1571,  1579,
+    1580,  1589,  1591,  1596,  1597,  1598,  1602,  1603,  1604,  1608,
+    1609,  1610,  1614,  1615,  1616,  1621,  1622,  1623,  1624,  1630,
+    1631,  1635,  1636,  1640,  1641,  1642,  1643,  1658,  1659,  1664,
+    1665,  1669,  1671,  1675,  1677,  1679,  1703,  1704,  1706,  1708,
+    1713,  1715,  1717,  1722,  1723,  1729,  1728,  1732,  1736,  1738,
+    1740,  1746,  1747,  1752,  1757,  1759,  1764,  1766,  1767,  1769,
+    1774,  1776,  1778,  1783,  1785,  1790,  1795,  1803,  1809,  1808,
+    1822,  1823,  1828,  1829,  1833,  1838,  1843,  1851,  1856,  1867,
+    1868,  1879,  1880,  1886,  1887,  1891,  1892,  1893,  1896,  1895,
+    1906,  1911,  1918,  1924,  1933,  1939,  1945,  1951,  1957,  1965,
+    1971,  1979,  1985,  1994,  1995,  1996,  2000,  2004,  2006,  2009,
+    2011,  2015,  2016,  2020,  2024,  2025,  2028,  2030,  2031,  2035,
+    2036,  2037,  2038,  2073,  2074,  2075,  2076,  2080,  2085,  2090,
+    2092,  2094,  2099,  2101,  2103,  2105,  2110,  2112,  2122,  2123,
+    2124,  2128,  2130,  2132,  2137,  2139,  2141,  2146,  2148,  2150,
+    2159,  2160,  2161,  2165,  2167,  2169,  2174,  2176,  2178,  2183,
+    2185,  2187,  2202,  2203,  2204,  2205,  2209,  2214,  2219,  2221,
+    2223,  2228,  2230,  2232,  2234,  2239,  2241,  2243,  2253,  2254,
+    2255,  2256,  2260,  2262,  2264,  2269,  2271,  2273,  2275,  2280,
+    2282,  2284,  2315,  2316,  2317,  2318,  2322,  2330,  2332,  2334,
+    2339,  2341,  2346,  2348,  2362,  2363,  2364,  2368,  2370,  2372,
+    2374,  2376,  2381,  2382,  2384,  2386,  2391,  2393,  2395,  2401,
+    2403,  2405,  2409,  2411,  2413,  2415,  2429,  2430,  2431,  2435,
+    2437,  2439,  2441,  2443,  2448,  2449,  2451,  2453,  2458,  2460,
+    2462,  2468,  2469,  2471,  2481,  2484,  2486,  2489,  2491,  2493,
+    2506,  2507,  2508,  2512,  2514,  2516,  2518,  2520,  2525,  2526,
+    2528,  2530,  2535,  2537,  2545,  2546,  2547,  2552,  2553,  2557,
+    2559,  2561,  2563,  2565,  2567,  2574,  2576,  2578,  2580,  2582,
+    2584,  2586,  2588,  2590,  2592,  2597,  2599,  2601,  2606,  2632,
+    2633,  2635,  2639,  2640,  2644,  2646,  2648,  2650,  2652,  2654,
+    2661,  2663,  2665,  2667,  2669,  2671,  2676,  2681,  2683,  2685,
+    2705,  2707,  2712,  2713
 };
 #endif
@@ -5171 +5172 @@
 
 /* Line 1806 of yacc.c  */
-#line 281 "parser.yy"
+#line 282 "parser.yy"
     {
                         typedefTable.enterScope();
@@ -5180 +5181 @@
 
 /* Line 1806 of yacc.c  */
-#line 287 "parser.yy"
+#line 288 "parser.yy"
     {
                         typedefTable.leaveScope();
@@ -5189 +5190 @@
 
 /* Line 1806 of yacc.c  */
-#line 297 "parser.yy"
+#line 298 "parser.yy"
     { (yyval.constant) = new ConstantNode( ConstantNode::Integer, (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -5196 +5197 @@
 
 /* Line 1806 of yacc.c  */
-#line 298 "parser.yy"
+#line 299 "parser.yy"
     { (yyval.constant) = new ConstantNode( ConstantNode::Float, (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -5203 +5204 @@
 
 /* Line 1806 of yacc.c  */
-#line 299 "parser.yy"
+#line 300 "parser.yy"
     { (yyval.constant) = new ConstantNode( ConstantNode::Character, (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -5210 +5211 @@
 
 /* Line 1806 of yacc.c  */
-#line 323 "parser.yy"
+#line 324 "parser.yy"
     { (yyval.constant) = new ConstantNode( ConstantNode::String, (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -5217 +5218 @@
 
 /* Line 1806 of yacc.c  */
-#line 324 "parser.yy"
+#line 325 "parser.yy"
     { (yyval.constant) = (yyvsp[(1) - (2)].constant)->appendstr( (yyvsp[(2) - (2)].tok) ); }
     break;
@@ -5224 +5225 @@
 
 /* Line 1806 of yacc.c  */
-#line 331 "parser.yy"
+#line 332 "parser.yy"
     { (yyval.en) = new VarRefNode((yyvsp[(1) - (1)].tok)); }
     break;
@@ -5231 +5232 @@
 
 /* Line 1806 of yacc.c  */
-#line 333 "parser.yy"
+#line 334 "parser.yy"
     { (yyval.en) = new VarRefNode((yyvsp[(1) - (1)].tok)); }
     break;
@@ -5238 +5239 @@
 
 /* Line 1806 of yacc.c  */
-#line 335 "parser.yy"
+#line 336 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].constant); }
     break;
@@ -5245 +5246 @@
 
 /* Line 1806 of yacc.c  */
-#line 337 "parser.yy"
+#line 338 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].constant); }
     break;
@@ -5252 +5253 @@
 
 /* Line 1806 of yacc.c  */
-#line 339 "parser.yy"
+#line 340 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (3)].en); }
     break;
@@ -5259 +5260 @@
 
 /* Line 1806 of yacc.c  */
-#line 341 "parser.yy"
+#line 342 "parser.yy"
     { (yyval.en) = new ValofExprNode((yyvsp[(2) - (3)].sn)); }
     break;
@@ -5266 +5267 @@
 
 /* Line 1806 of yacc.c  */
-#line 351 "parser.yy"
+#line 352 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Index), (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en)); }
     break;
@@ -5273 +5274 @@
 
 /* Line 1806 of yacc.c  */
-#line 353 "parser.yy"
+#line 354 "parser.yy"
     { (yyval.en) = new CompositeExprNode((yyvsp[(1) - (4)].en), (yyvsp[(3) - (4)].en)); }
     break;
@@ -5280 +5281 @@
 
 /* Line 1806 of yacc.c  */
-#line 355 "parser.yy"
+#line 356 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::FieldSel), (yyvsp[(1) - (3)].en), new VarRefNode((yyvsp[(3) - (3)].tok))); }
     break;
@@ -5287 +5288 @@
 
 /* Line 1806 of yacc.c  */
-#line 358 "parser.yy"
+#line 359 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::PFieldSel), (yyvsp[(1) - (3)].en), new VarRefNode((yyvsp[(3) - (3)].tok))); }
     break;
@@ -5294 +5295 @@
 
 /* Line 1806 of yacc.c  */
-#line 361 "parser.yy"
+#line 362 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::IncrPost), (yyvsp[(1) - (2)].en)); }
     break;
@@ -5301 +5302 @@
 
 /* Line 1806 of yacc.c  */
-#line 363 "parser.yy"
+#line 364 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::DecrPost), (yyvsp[(1) - (2)].en)); }
     break;
@@ -5308 +5309 @@
 
 /* Line 1806 of yacc.c  */
-#line 366 "parser.yy"
+#line 367 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -5315 +5316 @@
 
 /* Line 1806 of yacc.c  */
-#line 372 "parser.yy"
+#line 373 "parser.yy"
     { (yyval.en) = (ExpressionNode *)((yyvsp[(1) - (3)].en)->set_link((yyvsp[(3) - (3)].en))); }
     break;
@@ -5322 +5323 @@
 
 /* Line 1806 of yacc.c  */
-#line 377 "parser.yy"
+#line 378 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -5329 +5330 @@
 
 /* Line 1806 of yacc.c  */
-#line 380 "parser.yy"
+#line 381 "parser.yy"
     { (yyval.en) = (yyvsp[(3) - (3)].en)->set_asArgName((yyvsp[(1) - (3)].tok)); }
     break;
@@ -5336 +5337 @@
 
 /* Line 1806 of yacc.c  */
-#line 385 "parser.yy"
+#line 386 "parser.yy"
     { (yyval.en) = (yyvsp[(7) - (7)].en)->set_asArgName((yyvsp[(3) - (7)].en)); }
     break;
@@ -5343 +5344 @@
 
 /* Line 1806 of yacc.c  */
-#line 387 "parser.yy"
+#line 388 "parser.yy"
     { (yyval.en) = (yyvsp[(9) - (9)].en)->set_asArgName( new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(yyvsp[(3) - (9)].en)->set_link( flattenCommas( (yyvsp[(5) - (9)].en) )))); }
     break;
@@ -5350 +5351 @@
 
 /* Line 1806 of yacc.c  */
-#line 392 "parser.yy"
+#line 393 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5357 +5358 @@
 
 /* Line 1806 of yacc.c  */
-#line 397 "parser.yy"
+#line 398 "parser.yy"
     { (yyval.en) = new VarRefNode( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -5364 +5365 @@
 
 /* Line 1806 of yacc.c  */
-#line 399 "parser.yy"
+#line 400 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::FieldSel), new VarRefNode( (yyvsp[(1) - (3)].tok) ), (yyvsp[(3) - (3)].en)); }
     break;
@@ -5371 +5372 @@
 
 /* Line 1806 of yacc.c  */
-#line 401 "parser.yy"
+#line 402 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::FieldSel), new VarRefNode( (yyvsp[(1) - (7)].tok) ), (yyvsp[(5) - (7)].en)); }
     break;
@@ -5378 +5379 @@
 
 /* Line 1806 of yacc.c  */
-#line 403 "parser.yy"
+#line 404 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::PFieldSel), new VarRefNode( (yyvsp[(1) - (3)].tok) ), (yyvsp[(3) - (3)].en)); }
     break;
@@ -5385 +5386 @@
 
 /* Line 1806 of yacc.c  */
-#line 405 "parser.yy"
+#line 406 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::PFieldSel), new VarRefNode( (yyvsp[(1) - (7)].tok) ), (yyvsp[(5) - (7)].en)); }
     break;
@@ -5392 +5393 @@
 
 /* Line 1806 of yacc.c  */
-#line 411 "parser.yy"
+#line 412 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Incr), (yyvsp[(2) - (2)].en)); }
     break;
@@ -5399 +5400 @@
 
 /* Line 1806 of yacc.c  */
-#line 413 "parser.yy"
+#line 414 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Decr), (yyvsp[(2) - (2)].en)); }
     break;
@@ -5406 +5407 @@
 
 /* Line 1806 of yacc.c  */
-#line 415 "parser.yy"
+#line 416 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -5413 +5414 @@
 
 /* Line 1806 of yacc.c  */
-#line 417 "parser.yy"
+#line 418 "parser.yy"
     { (yyval.en) = new CompositeExprNode((yyvsp[(1) - (2)].en), (yyvsp[(2) - (2)].en)); }
     break;
@@ -5420 +5421 @@
 
 /* Line 1806 of yacc.c  */
-#line 419 "parser.yy"
+#line 420 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Neg), (yyvsp[(2) - (2)].en)); }
     break;
@@ -5427 +5428 @@
 
 /* Line 1806 of yacc.c  */
-#line 421 "parser.yy"
+#line 422 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::PointTo), (yyvsp[(2) - (2)].en)); }
     break;
@@ -5434 +5435 @@
 
 /* Line 1806 of yacc.c  */
-#line 427 "parser.yy"
+#line 428 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::SizeOf), (yyvsp[(2) - (2)].en)); }
     break;
@@ -5441 +5442 @@
 
 /* Line 1806 of yacc.c  */
-#line 429 "parser.yy"
+#line 430 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::SizeOf), new TypeValueNode((yyvsp[(3) - (4)].decl))); }
     break;
@@ -5448 +5449 @@
 
 /* Line 1806 of yacc.c  */
-#line 431 "parser.yy"
+#line 432 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Attr), new VarRefNode((yyvsp[(1) - (1)].tok))); }
     break;
@@ -5455 +5456 @@
 
 /* Line 1806 of yacc.c  */
-#line 433 "parser.yy"
+#line 434 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Attr), new VarRefNode((yyvsp[(1) - (4)].tok)), new TypeValueNode((yyvsp[(3) - (4)].decl))); }
     break;
@@ -5462 +5463 @@
 
 /* Line 1806 of yacc.c  */
-#line 435 "parser.yy"
+#line 436 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Attr), new VarRefNode((yyvsp[(1) - (4)].tok)), (yyvsp[(3) - (4)].en)); }
     break;
@@ -5469 +5470 @@
 
 /* Line 1806 of yacc.c  */
-#line 437 "parser.yy"
+#line 438 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::AlignOf), (yyvsp[(2) - (2)].en)); }
     break;
@@ -5476 +5477 @@
 
 /* Line 1806 of yacc.c  */
-#line 439 "parser.yy"
+#line 440 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::AlignOf), new TypeValueNode((yyvsp[(3) - (4)].decl))); }
     break;
@@ -5483 +5484 @@
 
 /* Line 1806 of yacc.c  */
-#line 441 "parser.yy"
+#line 442 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::LabelAddress), new VarRefNode((yyvsp[(2) - (2)].tok), true)); }
     break;
@@ -5490 +5491 @@
 
 /* Line 1806 of yacc.c  */
-#line 445 "parser.yy"
+#line 446 "parser.yy"
     { (yyval.en) = new OperatorNode(OperatorNode::AddressOf); }
     break;
@@ -5497 +5498 @@
 
 /* Line 1806 of yacc.c  */
-#line 446 "parser.yy"
+#line 447 "parser.yy"
     { (yyval.en) = new OperatorNode(OperatorNode::UnPlus); }
     break;
@@ -5504 +5505 @@
 
 /* Line 1806 of yacc.c  */
-#line 447 "parser.yy"
+#line 448 "parser.yy"
     { (yyval.en) = new OperatorNode(OperatorNode::UnMinus); }
     break;
@@ -5511 +5512 @@
 
 /* Line 1806 of yacc.c  */
-#line 448 "parser.yy"
+#line 449 "parser.yy"
     { (yyval.en) = new OperatorNode(OperatorNode::BitNeg); }
     break;
@@ -5518 +5519 @@
 
 /* Line 1806 of yacc.c  */
-#line 454 "parser.yy"
+#line 455 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Cast), new TypeValueNode((yyvsp[(2) - (4)].decl)), (yyvsp[(4) - (4)].en)); }
     break;
@@ -5525 +5526 @@
 
 /* Line 1806 of yacc.c  */
-#line 456 "parser.yy"
+#line 457 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Cast), new TypeValueNode((yyvsp[(2) - (4)].decl)), (yyvsp[(4) - (4)].en)); }
     break;
@@ -5532 +5533 @@
 
 /* Line 1806 of yacc.c  */
-#line 462 "parser.yy"
+#line 463 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Mul),(yyvsp[(1) - (3)].en),(yyvsp[(3) - (3)].en)); }
     break;
@@ -5539 +5540 @@
 
 /* Line 1806 of yacc.c  */
-#line 464 "parser.yy"
+#line 465 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Div),(yyvsp[(1) - (3)].en),(yyvsp[(3) - (3)].en)); }
     break;
@@ -5546 +5547 @@
 
 /* Line 1806 of yacc.c  */
-#line 466 "parser.yy"
+#line 467 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Mod),(yyvsp[(1) - (3)].en),(yyvsp[(3) - (3)].en)); }
     break;
@@ -5553 +5554 @@
 
 /* Line 1806 of yacc.c  */
-#line 472 "parser.yy"
+#line 473 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Plus),(yyvsp[(1) - (3)].en),(yyvsp[(3) - (3)].en)); }
     break;
@@ -5560 +5561 @@
 
 /* Line 1806 of yacc.c  */
-#line 474 "parser.yy"
+#line 475 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Minus),(yyvsp[(1) - (3)].en),(yyvsp[(3) - (3)].en)); }
     break;
@@ -5567 +5568 @@
 
 /* Line 1806 of yacc.c  */
-#line 480 "parser.yy"
+#line 481 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::LShift),(yyvsp[(1) - (3)].en),(yyvsp[(3) - (3)].en)); }
     break;
@@ -5574 +5575 @@
 
 /* Line 1806 of yacc.c  */
-#line 482 "parser.yy"
+#line 483 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::RShift),(yyvsp[(1) - (3)].en),(yyvsp[(3) - (3)].en)); }
     break;
@@ -5581 +5582 @@
 
 /* Line 1806 of yacc.c  */
-#line 488 "parser.yy"
+#line 489 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::LThan),(yyvsp[(1) - (3)].en),(yyvsp[(3) - (3)].en)); }
     break;
@@ -5588 +5589 @@
 
 /* Line 1806 of yacc.c  */
-#line 490 "parser.yy"
+#line 491 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::GThan),(yyvsp[(1) - (3)].en),(yyvsp[(3) - (3)].en)); }
     break;
@@ -5595 +5596 @@
 
 /* Line 1806 of yacc.c  */
-#line 492 "parser.yy"
+#line 493 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::LEThan),(yyvsp[(1) - (3)].en),(yyvsp[(3) - (3)].en)); }
     break;
@@ -5602 +5603 @@
 
 /* Line 1806 of yacc.c  */
-#line 494 "parser.yy"
+#line 495 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::GEThan),(yyvsp[(1) - (3)].en),(yyvsp[(3) - (3)].en)); }
     break;
@@ -5609 +5610 @@
 
 /* Line 1806 of yacc.c  */
-#line 500 "parser.yy"
+#line 501 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Eq), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en)); }
     break;
@@ -5616 +5617 @@
 
 /* Line 1806 of yacc.c  */
-#line 502 "parser.yy"
+#line 503 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Neq), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en)); }
     break;
@@ -5623 +5624 @@
 
 /* Line 1806 of yacc.c  */
-#line 508 "parser.yy"
+#line 509 "parser.yy"
     { (yyval.en) =new CompositeExprNode(new OperatorNode(OperatorNode::BitAnd), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en)); }
     break;
@@ -5630 +5631 @@
 
 /* Line 1806 of yacc.c  */
-#line 514 "parser.yy"
+#line 515 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Xor), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en)); }
     break;
@@ -5637 +5638 @@
 
 /* Line 1806 of yacc.c  */
-#line 520 "parser.yy"
+#line 521 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::BitOr), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en)); }
     break;
@@ -5644 +5645 @@
 
 /* Line 1806 of yacc.c  */
-#line 526 "parser.yy"
+#line 527 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::And), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en)); }
     break;
@@ -5651 +5652 @@
 
 /* Line 1806 of yacc.c  */
-#line 532 "parser.yy"
+#line 533 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Or), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en)); }
     break;
@@ -5658 +5659 @@
 
 /* Line 1806 of yacc.c  */
-#line 538 "parser.yy"
+#line 539 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode(OperatorNode::Cond), (ExpressionNode *)mkList( (*(yyvsp[(1) - (5)].en), *(yyvsp[(3) - (5)].en), *(yyvsp[(5) - (5)].en)) ) ); }
     break;
@@ -5665 +5666 @@
 
 /* Line 1806 of yacc.c  */
-#line 540 "parser.yy"
+#line 541 "parser.yy"
     { (yyval.en)=new CompositeExprNode(new OperatorNode(OperatorNode::NCond),(yyvsp[(1) - (4)].en),(yyvsp[(4) - (4)].en)); }
     break;
@@ -5672 +5673 @@
 
 /* Line 1806 of yacc.c  */
-#line 542 "parser.yy"
+#line 543 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode(OperatorNode::Cond), (ExpressionNode *)mkList( (*(yyvsp[(1) - (5)].en), *(yyvsp[(3) - (5)].en), *(yyvsp[(5) - (5)].en)) ) ); }
     break;
@@ -5679 +5680 @@
 
 /* Line 1806 of yacc.c  */
-#line 553 "parser.yy"
+#line 554 "parser.yy"
     { (yyval.en) =new CompositeExprNode(new OperatorNode(OperatorNode::Assign), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en)); }
     break;
@@ -5686 +5687 @@
 
 /* Line 1806 of yacc.c  */
-#line 555 "parser.yy"
+#line 556 "parser.yy"
     { (yyval.en) =new CompositeExprNode((yyvsp[(2) - (3)].en), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en)); }
     break;
@@ -5693 +5694 @@
 
 /* Line 1806 of yacc.c  */
-#line 557 "parser.yy"
+#line 558 "parser.yy"
     { (yyval.en) = ((yyvsp[(2) - (2)].en) == 0) ? (yyvsp[(1) - (2)].en) : new CompositeExprNode( new OperatorNode( OperatorNode::Assign ), (yyvsp[(1) - (2)].en), (yyvsp[(2) - (2)].en) ); }
     break;
@@ -5700 +5701 @@
 
 /* Line 1806 of yacc.c  */
-#line 562 "parser.yy"
+#line 563 "parser.yy"
     { (yyval.en) = new NullExprNode; }
     break;
@@ -5707 +5708 @@
 
 /* Line 1806 of yacc.c  */
-#line 570 "parser.yy"
+#line 571 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ) ); }
     break;
@@ -5714 +5715 @@
 
 /* Line 1806 of yacc.c  */
-#line 572 "parser.yy"
+#line 573 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (yyvsp[(3) - (5)].en) ); }
     break;
@@ -5721 +5722 @@
 
 /* Line 1806 of yacc.c  */
-#line 574 "parser.yy"
+#line 575 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(new NullExprNode)->set_link( (yyvsp[(4) - (6)].en) ) ); }
     break;
@@ -5728 +5729 @@
 
 /* Line 1806 of yacc.c  */
-#line 576 "parser.yy"
+#line 577 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(yyvsp[(3) - (7)].en)->set_link( flattenCommas( (yyvsp[(5) - (7)].en) ) ) ); }
     break;
@@ -5735 +5736 @@
 
 /* Line 1806 of yacc.c  */
-#line 582 "parser.yy"
+#line 583 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5742 +5743 @@
 
 /* Line 1806 of yacc.c  */
-#line 586 "parser.yy"
+#line 587 "parser.yy"
     { (yyval.en) = new OperatorNode(OperatorNode::MulAssn); }
     break;
@@ -5749 +5750 @@
 
 /* Line 1806 of yacc.c  */
-#line 587 "parser.yy"
+#line 588 "parser.yy"
     { (yyval.en) = new OperatorNode(OperatorNode::DivAssn); }
     break;
@@ -5756 +5757 @@
 
 /* Line 1806 of yacc.c  */
-#line 588 "parser.yy"
+#line 589 "parser.yy"
     { (yyval.en) = new OperatorNode(OperatorNode::ModAssn); }
     break;
@@ -5763 +5764 @@
 
 /* Line 1806 of yacc.c  */
-#line 589 "parser.yy"
+#line 590 "parser.yy"
     { (yyval.en) = new OperatorNode(OperatorNode::PlusAssn); }
     break;
@@ -5770 +5771 @@
 
 /* Line 1806 of yacc.c  */
-#line 590 "parser.yy"
+#line 591 "parser.yy"
     { (yyval.en) = new OperatorNode(OperatorNode::MinusAssn); }
     break;
@@ -5777 +5778 @@
 
 /* Line 1806 of yacc.c  */
-#line 591 "parser.yy"
+#line 592 "parser.yy"
     { (yyval.en) = new OperatorNode(OperatorNode::LSAssn); }
     break;
@@ -5784 +5785 @@
 
 /* Line 1806 of yacc.c  */
-#line 592 "parser.yy"
+#line 593 "parser.yy"
     { (yyval.en) = new OperatorNode(OperatorNode::RSAssn); }
     break;
@@ -5791 +5792 @@
 
 /* Line 1806 of yacc.c  */
-#line 593 "parser.yy"
+#line 594 "parser.yy"
     { (yyval.en) = new OperatorNode(OperatorNode::AndAssn); }
     break;
@@ -5798 +5799 @@
 
 /* Line 1806 of yacc.c  */
-#line 594 "parser.yy"
+#line 595 "parser.yy"
     { (yyval.en) = new OperatorNode(OperatorNode::ERAssn); }
     break;
@@ -5805 +5806 @@
 
 /* Line 1806 of yacc.c  */
-#line 595 "parser.yy"
+#line 596 "parser.yy"
     { (yyval.en) = new OperatorNode(OperatorNode::OrAssn); }
     break;
@@ -5812 +5813 @@
 
 /* Line 1806 of yacc.c  */
-#line 601 "parser.yy"
+#line 602 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Comma),(yyvsp[(1) - (3)].en),(yyvsp[(3) - (3)].en)); }
     break;
@@ -5819 +5820 @@
 
 /* Line 1806 of yacc.c  */
-#line 606 "parser.yy"
+#line 607 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -5826 +5827 @@
 
 /* Line 1806 of yacc.c  */
-#line 615 "parser.yy"
+#line 616 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (1)].sn); }
     break;
@@ -5833 +5834 @@
 
 /* Line 1806 of yacc.c  */
-#line 625 "parser.yy"
+#line 626 "parser.yy"
     { (yyval.sn) = (yyvsp[(4) - (4)].sn)->add_label((yyvsp[(1) - (4)].tok));}
     break;
@@ -5840 +5841 @@
 
 /* Line 1806 of yacc.c  */
-#line 630 "parser.yy"
+#line 631 "parser.yy"
     { (yyval.sn) = new CompoundStmtNode( (StatementNode *)0 ); }
     break;
@@ -5847 +5848 @@
 
 /* Line 1806 of yacc.c  */
-#line 637 "parser.yy"
+#line 638 "parser.yy"
     { (yyval.sn) = new CompoundStmtNode( (yyvsp[(5) - (7)].sn) ); }
     break;
@@ -5854 +5855 @@
 
 /* Line 1806 of yacc.c  */
-#line 643 "parser.yy"
+#line 644 "parser.yy"
     { if ((yyvsp[(1) - (3)].sn) != 0) { (yyvsp[(1) - (3)].sn)->set_link((yyvsp[(3) - (3)].sn)); (yyval.sn) = (yyvsp[(1) - (3)].sn); } }
     break;
@@ -5861 +5862 @@
 
 /* Line 1806 of yacc.c  */
-#line 648 "parser.yy"
+#line 649 "parser.yy"
     { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
     break;
@@ -5868 +5869 @@
 
 /* Line 1806 of yacc.c  */
-#line 650 "parser.yy"
+#line 651 "parser.yy"
     { (yyval.sn) = new StatementNode( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -5875 +5876 @@
 
 /* Line 1806 of yacc.c  */
-#line 652 "parser.yy"
+#line 653 "parser.yy"
     { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
     break;
@@ -5882 +5883 @@
 
 /* Line 1806 of yacc.c  */
-#line 659 "parser.yy"
+#line 660 "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;
@@ -5889 +5890 @@
 
 /* Line 1806 of yacc.c  */
-#line 664 "parser.yy"
+#line 665 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Exp, (yyvsp[(1) - (2)].en), 0); }
     break;
@@ -5896 +5897 @@
 
 /* Line 1806 of yacc.c  */
-#line 670 "parser.yy"
+#line 671 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::If, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn)); }
     break;
@@ -5903 +5904 @@
 
 /* Line 1806 of yacc.c  */
-#line 672 "parser.yy"
+#line 673 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::If, (yyvsp[(3) - (7)].en), (StatementNode *)mkList((*(yyvsp[(5) - (7)].sn), *(yyvsp[(7) - (7)].sn))) ); }
     break;
@@ -5910 +5911 @@
 
 /* Line 1806 of yacc.c  */
-#line 674 "parser.yy"
+#line 675 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Switch, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn)); }
     break;
@@ -5917 +5918 @@
 
 /* Line 1806 of yacc.c  */
-#line 676 "parser.yy"
+#line 677 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Switch, (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn)); /* xxx */ }
     break;
@@ -5924 +5925 @@
 
 /* Line 1806 of yacc.c  */
-#line 682 "parser.yy"
+#line 683 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Choose, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn)); }
     break;
@@ -5931 +5932 @@
 
 /* Line 1806 of yacc.c  */
-#line 684 "parser.yy"
+#line 685 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Choose, (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn)); }
     break;
@@ -5938 +5939 @@
 
 /* Line 1806 of yacc.c  */
-#line 691 "parser.yy"
+#line 692 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
@@ -5945 +5946 @@
 
 /* Line 1806 of yacc.c  */
-#line 693 "parser.yy"
+#line 694 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Range),(yyvsp[(1) - (3)].en),(yyvsp[(3) - (3)].en)); }
     break;
@@ -5952 +5953 @@
 
 /* Line 1806 of yacc.c  */
-#line 700 "parser.yy"
+#line 701 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(tupleContents((yyvsp[(1) - (3)].en)))->set_link((yyvsp[(3) - (3)].en)) ); }
     break;
@@ -5959 +5960 @@
 
 /* Line 1806 of yacc.c  */
-#line 704 "parser.yy"
+#line 705 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Case, (yyvsp[(2) - (3)].en), 0); }
     break;
@@ -5966 +5967 @@
 
 /* Line 1806 of yacc.c  */
-#line 705 "parser.yy"
+#line 706 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Default); }
     break;
@@ -5973 +5974 @@
 
 /* Line 1806 of yacc.c  */
-#line 711 "parser.yy"
+#line 712 "parser.yy"
     { (yyval.sn) = (StatementNode *)((yyvsp[(1) - (2)].sn)->set_link((yyvsp[(2) - (2)].sn))); }
     break;
@@ -5980 +5981 @@
 
 /* Line 1806 of yacc.c  */
-#line 715 "parser.yy"
+#line 716 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case((yyvsp[(2) - (2)].sn)); }
     break;
@@ -5987 +5988 @@
 
 /* Line 1806 of yacc.c  */
-#line 720 "parser.yy"
+#line 721 "parser.yy"
     { (yyval.sn) = 0; }
     break;
@@ -5994 +5995 @@
 
 /* Line 1806 of yacc.c  */
-#line 726 "parser.yy"
+#line 727 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case((yyvsp[(2) - (2)].sn)); }
     break;
@@ -6001 +6002 @@
 
 /* Line 1806 of yacc.c  */
-#line 728 "parser.yy"
+#line 729 "parser.yy"
     { (yyval.sn) = (StatementNode *)((yyvsp[(1) - (3)].sn)->set_link((yyvsp[(2) - (3)].sn)->append_last_case((yyvsp[(3) - (3)].sn)))); }
     break;
@@ -6008 +6009 @@
 
 /* Line 1806 of yacc.c  */
-#line 733 "parser.yy"
+#line 734 "parser.yy"
     { (yyval.sn) = 0; }
     break;
@@ -6015 +6016 @@
 
 /* Line 1806 of yacc.c  */
-#line 739 "parser.yy"
+#line 740 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case((yyvsp[(2) - (2)].sn)); }
     break;
@@ -6022 +6023 @@
 
 /* Line 1806 of yacc.c  */
-#line 741 "parser.yy"
+#line 742 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (3)].sn)->append_last_case((StatementNode *)mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].sn)))); }
     break;
@@ -6029 +6030 @@
 
 /* Line 1806 of yacc.c  */
-#line 743 "parser.yy"
+#line 744 "parser.yy"
     { (yyval.sn) = (StatementNode *)((yyvsp[(1) - (3)].sn)->set_link((yyvsp[(2) - (3)].sn)->append_last_case((yyvsp[(3) - (3)].sn)))); }
     break;
@@ -6036 +6037 @@
 
 /* Line 1806 of yacc.c  */
-#line 745 "parser.yy"
+#line 746 "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;
@@ -6043 +6044 @@
 
 /* Line 1806 of yacc.c  */
-#line 750 "parser.yy"
+#line 751 "parser.yy"
     { (yyval.sn) = 0; }
     break;
 
   case 176:
-
-/* Line 1806 of yacc.c  */
-#line 755 "parser.yy"
-    { (yyval.sn) = new StatementNode(StatementNode::Fallthru, 0, 0); }
-    break;
-
-  case 177:
 
 /* Line 1806 of yacc.c  */
@@ -6061 +6055 @@
     break;
 
+  case 177:
+
+/* Line 1806 of yacc.c  */
+#line 757 "parser.yy"
+    { (yyval.sn) = new StatementNode(StatementNode::Fallthru, 0, 0); }
+    break;
+
   case 178:
 
 /* Line 1806 of yacc.c  */
-#line 761 "parser.yy"
+#line 762 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::While, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn)); }
     break;
@@ -6071 +6072 @@
 
 /* Line 1806 of yacc.c  */
-#line 763 "parser.yy"
+#line 764 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Do, (yyvsp[(5) - (7)].en), (yyvsp[(2) - (7)].sn)); }
     break;
@@ -6078 +6079 @@
 
 /* Line 1806 of yacc.c  */
-#line 765 "parser.yy"
+#line 766 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::For, (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].sn)); }
     break;
@@ -6085 +6086 @@
 
 /* Line 1806 of yacc.c  */
-#line 770 "parser.yy"
+#line 771 "parser.yy"
     { (yyval.en) = new ForCtlExprNode((yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].en)); }
     break;
@@ -6092 +6093 @@
 
 /* Line 1806 of yacc.c  */
-#line 772 "parser.yy"
+#line 773 "parser.yy"
     { (yyval.en) = new ForCtlExprNode((yyvsp[(1) - (4)].decl), (yyvsp[(2) - (4)].en), (yyvsp[(4) - (4)].en)); }
     break;
@@ -6099 +6100 @@
 
 /* Line 1806 of yacc.c  */
-#line 777 "parser.yy"
+#line 778 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Goto, (yyvsp[(2) - (3)].tok)); }
     break;
@@ -6106 +6107 @@
 
 /* Line 1806 of yacc.c  */
-#line 781 "parser.yy"
+#line 782 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Goto, (yyvsp[(3) - (4)].en)); }
     break;
@@ -6113 +6114 @@
 
 /* Line 1806 of yacc.c  */
-#line 785 "parser.yy"
+#line 786 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Continue, 0, 0); }
     break;
@@ -6120 +6121 @@
 
 /* Line 1806 of yacc.c  */
-#line 789 "parser.yy"
+#line 790 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Continue, (yyvsp[(2) - (3)].tok)); }
     break;
@@ -6127 +6128 @@
 
 /* Line 1806 of yacc.c  */
-#line 793 "parser.yy"
+#line 794 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Break, 0, 0); }
     break;
@@ -6134 +6135 @@
 
 /* Line 1806 of yacc.c  */
-#line 797 "parser.yy"
+#line 798 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Break, (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -6141 +6142 @@
 
 /* Line 1806 of yacc.c  */
-#line 799 "parser.yy"
+#line 800 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Return, (yyvsp[(2) - (3)].en), 0); }
     break;
@@ -6148 +6149 @@
 
 /* Line 1806 of yacc.c  */
-#line 801 "parser.yy"
+#line 802 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Throw, (yyvsp[(2) - (3)].en), 0); }
     break;
@@ -6155 +6156 @@
 
 /* Line 1806 of yacc.c  */
-#line 803 "parser.yy"
+#line 804 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Throw, 0, 0); }
     break;
@@ -6162 +6163 @@
 
 /* Line 1806 of yacc.c  */
-#line 808 "parser.yy"
+#line 809 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].pn))))); }
     break;
@@ -6169 +6170 @@
 
 /* Line 1806 of yacc.c  */
-#line 810 "parser.yy"
+#line 811 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].pn))))); }
     break;
@@ -6176 +6177 @@
 
 /* Line 1806 of yacc.c  */
-#line 812 "parser.yy"
+#line 813 "parser.yy"
     {
                         (yyvsp[(3) - (4)].pn)->set_link((yyvsp[(4) - (4)].pn));
@@ -6186 +6187 @@
 
 /* Line 1806 of yacc.c  */
-#line 824 "parser.yy"
+#line 825 "parser.yy"
     { (yyval.pn) = StatementNode::newCatchStmt( 0, (yyvsp[(5) - (5)].sn), true ); }
     break;
@@ -6193 +6194 @@
 
 /* Line 1806 of yacc.c  */
-#line 826 "parser.yy"
+#line 827 "parser.yy"
     { (yyval.pn) = (yyvsp[(1) - (6)].pn)->set_link( StatementNode::newCatchStmt( 0, (yyvsp[(6) - (6)].sn), true ) ); }
     break;
@@ -6200 +6201 @@
 
 /* Line 1806 of yacc.c  */
-#line 831 "parser.yy"
+#line 832 "parser.yy"
     { (yyval.pn) = StatementNode::newCatchStmt((yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn)); }
     break;
@@ -6207 +6208 @@
 
 /* Line 1806 of yacc.c  */
-#line 833 "parser.yy"
+#line 834 "parser.yy"
     { (yyval.pn) = (yyvsp[(1) - (10)].pn)->set_link( StatementNode::newCatchStmt((yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn)) ); }
     break;
@@ -6214 +6215 @@
 
 /* Line 1806 of yacc.c  */
-#line 838 "parser.yy"
+#line 839 "parser.yy"
     {
                         (yyval.pn) = new StatementNode(StatementNode::Finally, 0, (yyvsp[(2) - (2)].sn));
@@ -6224 +6225 @@
 
 /* Line 1806 of yacc.c  */
-#line 852 "parser.yy"
+#line 853 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6234 +6235 @@
 
 /* Line 1806 of yacc.c  */
-#line 857 "parser.yy"
+#line 858 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6241 +6242 @@
 
 /* Line 1806 of yacc.c  */
-#line 859 "parser.yy"
+#line 860 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6251 +6252 @@
 
 /* Line 1806 of yacc.c  */
-#line 868 "parser.yy"
+#line 869 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Asm, 0, 0); }
     break;
@@ -6258 +6259 @@
 
 /* Line 1806 of yacc.c  */
-#line 870 "parser.yy"
+#line 871 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Asm, 0, 0); }
     break;
@@ -6265 +6266 @@
 
 /* Line 1806 of yacc.c  */
-#line 872 "parser.yy"
+#line 873 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Asm, 0, 0); }
     break;
@@ -6272 +6273 @@
 
 /* Line 1806 of yacc.c  */
-#line 874 "parser.yy"
+#line 875 "parser.yy"
     { (yyval.sn) = new StatementNode(StatementNode::Asm, 0, 0); }
     break;
@@ -6279 +6280 @@
 
 /* Line 1806 of yacc.c  */
-#line 888 "parser.yy"
+#line 889 "parser.yy"
     {}
     break;
@@ -6286 +6287 @@
 
 /* Line 1806 of yacc.c  */
-#line 892 "parser.yy"
+#line 893 "parser.yy"
     {}
     break;
@@ -6293 +6294 @@
 
 /* Line 1806 of yacc.c  */
-#line 900 "parser.yy"
+#line 901 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6300 +6301 @@
 
 /* Line 1806 of yacc.c  */
-#line 907 "parser.yy"
+#line 908 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6307 +6308 @@
 
 /* Line 1806 of yacc.c  */
-#line 912 "parser.yy"
+#line 913 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6314 +6315 @@
 
 /* Line 1806 of yacc.c  */
-#line 919 "parser.yy"
+#line 920 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
 
   case 229:
-
-/* Line 1806 of yacc.c  */
-#line 933 "parser.yy"
-    {}
-    break;
-
-  case 230:
 
 /* Line 1806 of yacc.c  */
@@ -6332 +6326 @@
     break;
 
+  case 230:
+
+/* Line 1806 of yacc.c  */
+#line 935 "parser.yy"
+    {}
+    break;
+
   case 238:
 
 /* Line 1806 of yacc.c  */
-#line 964 "parser.yy"
+#line 965 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6345 +6346 @@
 
 /* Line 1806 of yacc.c  */
-#line 971 "parser.yy"
+#line 972 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6355 +6356 @@
 
 /* Line 1806 of yacc.c  */
-#line 976 "parser.yy"
+#line 977 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (6)].tok), TypedefTable::ID );
@@ -6365 +6366 @@
 
 /* Line 1806 of yacc.c  */
-#line 986 "parser.yy"
+#line 987 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
@@ -6375 +6376 @@
 
 /* Line 1806 of yacc.c  */
-#line 991 "parser.yy"
+#line 992 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
@@ -6385 +6386 @@
 
 /* Line 1806 of yacc.c  */
-#line 996 "parser.yy"
+#line 997 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(3) - (4)].tok) );
@@ -6395 +6396 @@
 
 /* Line 1806 of yacc.c  */
-#line 1004 "parser.yy"
+#line 1005 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6405 +6406 @@
 
 /* Line 1806 of yacc.c  */
-#line 1009 "parser.yy"
+#line 1010 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6415 +6416 @@
 
 /* Line 1806 of yacc.c  */
-#line 1014 "parser.yy"
+#line 1015 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6425 +6426 @@
 
 /* Line 1806 of yacc.c  */
-#line 1019 "parser.yy"
+#line 1020 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6435 +6436 @@
 
 /* Line 1806 of yacc.c  */
-#line 1024 "parser.yy"
+#line 1025 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
@@ -6445 +6446 @@
 
 /* Line 1806 of yacc.c  */
-#line 1032 "parser.yy"
+#line 1033 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *((yyvsp[(5) - (10)].tok)) );
@@ -6455 +6456 @@
 
 /* Line 1806 of yacc.c  */
-#line 1037 "parser.yy"
+#line 1038 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *((yyvsp[(5) - (10)].tok)) );
@@ -6465 +6466 @@
 
 /* Line 1806 of yacc.c  */
-#line 1052 "parser.yy"
+#line 1053 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
@@ -6474 +6475 @@
 
 /* Line 1806 of yacc.c  */
-#line 1056 "parser.yy"
+#line 1057 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
@@ -6483 +6484 @@
 
 /* Line 1806 of yacc.c  */
-#line 1063 "parser.yy"
+#line 1064 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -6490 +6491 @@
 
 /* Line 1806 of yacc.c  */
-#line 1067 "parser.yy"
+#line 1068 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (9)].decl)->appendList( (yyvsp[(7) - (9)].decl) ) ); }
     break;
@@ -6497 +6498 @@
 
 /* Line 1806 of yacc.c  */
-#line 1072 "parser.yy"
+#line 1073 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD);
@@ -6507 +6508 @@
 
 /* Line 1806 of yacc.c  */
-#line 1077 "parser.yy"
+#line 1078 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD);
@@ -6517 +6518 @@
 
 /* Line 1806 of yacc.c  */
-#line 1082 "parser.yy"
+#line 1083 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::TD);
@@ -6527 +6528 @@
 
 /* Line 1806 of yacc.c  */
-#line 1094 "parser.yy"
+#line 1095 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD);
@@ -6537 +6538 @@
 
 /* Line 1806 of yacc.c  */
-#line 1099 "parser.yy"
+#line 1100 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD);
@@ -6547 +6548 @@
 
 /* Line 1806 of yacc.c  */
-#line 1104 "parser.yy"
+#line 1105 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD);
@@ -6557 +6558 @@
 
 /* Line 1806 of yacc.c  */
-#line 1109 "parser.yy"
+#line 1110 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD);
@@ -6567 +6568 @@
 
 /* Line 1806 of yacc.c  */
-#line 1114 "parser.yy"
+#line 1115 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD);
@@ -6577 +6578 @@
 
 /* Line 1806 of yacc.c  */
-#line 1122 "parser.yy"
+#line 1123 "parser.yy"
     {
                         typedefTable.addToEnclosingScope(*((yyvsp[(2) - (4)].tok)), TypedefTable::TD);
@@ -6587 +6588 @@
 
 /* Line 1806 of yacc.c  */
-#line 1127 "parser.yy"
+#line 1128 "parser.yy"
     {
                         typedefTable.addToEnclosingScope(*((yyvsp[(5) - (7)].tok)), TypedefTable::TD);
@@ -6597 +6598 @@
 
 /* Line 1806 of yacc.c  */
-#line 1144 "parser.yy"
+#line 1145 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6607 +6608 @@
 
 /* Line 1806 of yacc.c  */
-#line 1149 "parser.yy"
+#line 1150 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6617 +6618 @@
 
 /* Line 1806 of yacc.c  */
-#line 1171 "parser.yy"
+#line 1172 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6624 +6625 @@
 
 /* Line 1806 of yacc.c  */
-#line 1184 "parser.yy"
+#line 1185 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6631 +6632 @@
 
 /* Line 1806 of yacc.c  */
-#line 1190 "parser.yy"
+#line 1191 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Attribute ); }
     break;
@@ -6638 +6639 @@
 
 /* Line 1806 of yacc.c  */
-#line 1195 "parser.yy"
+#line 1196 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Const ); }
     break;
@@ -6645 +6646 @@
 
 /* Line 1806 of yacc.c  */
-#line 1197 "parser.yy"
+#line 1198 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Restrict ); }
     break;
@@ -6652 +6653 @@
 
 /* Line 1806 of yacc.c  */
-#line 1199 "parser.yy"
+#line 1200 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Volatile ); }
     break;
@@ -6659 +6660 @@
 
 /* Line 1806 of yacc.c  */
-#line 1201 "parser.yy"
+#line 1202 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Lvalue ); }
     break;
@@ -6666 +6667 @@
 
 /* Line 1806 of yacc.c  */
-#line 1203 "parser.yy"
+#line 1204 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Atomic ); }
     break;
@@ -6673 +6674 @@
 
 /* Line 1806 of yacc.c  */
-#line 1205 "parser.yy"
+#line 1206 "parser.yy"
     {
                         typedefTable.enterScope();
@@ -6682 +6683 @@
 
 /* Line 1806 of yacc.c  */
-#line 1209 "parser.yy"
+#line 1210 "parser.yy"
     {
                         typedefTable.leaveScope();
@@ -6692 +6693 @@
 
 /* Line 1806 of yacc.c  */
-#line 1218 "parser.yy"
+#line 1219 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6699 +6700 @@
 
 /* Line 1806 of yacc.c  */
-#line 1220 "parser.yy"
+#line 1221 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6706 +6707 @@
 
 /* Line 1806 of yacc.c  */
-#line 1231 "parser.yy"
+#line 1232 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6713 +6714 @@
 
 /* Line 1806 of yacc.c  */
-#line 1240 "parser.yy"
+#line 1241 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Extern ); }
     break;
@@ -6720 +6721 @@
 
 /* Line 1806 of yacc.c  */
-#line 1242 "parser.yy"
+#line 1243 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Static ); }
     break;
@@ -6727 +6728 @@
 
 /* Line 1806 of yacc.c  */
-#line 1244 "parser.yy"
+#line 1245 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Auto ); }
     break;
@@ -6734 +6735 @@
 
 /* Line 1806 of yacc.c  */
-#line 1246 "parser.yy"
+#line 1247 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Register ); }
     break;
@@ -6741 +6742 @@
 
 /* Line 1806 of yacc.c  */
-#line 1249 "parser.yy"
+#line 1250 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Inline ); }
     break;
@@ -6748 +6749 @@
 
 /* Line 1806 of yacc.c  */
-#line 1251 "parser.yy"
+#line 1252 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Fortran ); }
     break;
@@ -6755 +6756 @@
 
 /* Line 1806 of yacc.c  */
-#line 1256 "parser.yy"
+#line 1257 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Char ); }
     break;
@@ -6762 +6763 @@
 
 /* Line 1806 of yacc.c  */
-#line 1258 "parser.yy"
+#line 1259 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Double ); }
     break;
@@ -6769 +6770 @@
 
 /* Line 1806 of yacc.c  */
-#line 1260 "parser.yy"
+#line 1261 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Float ); }
     break;
@@ -6776 +6777 @@
 
 /* Line 1806 of yacc.c  */
-#line 1262 "parser.yy"
+#line 1263 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Int ); }
     break;
@@ -6783 +6784 @@
 
 /* Line 1806 of yacc.c  */
-#line 1264 "parser.yy"
+#line 1265 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Long ); }
     break;
@@ -6790 +6791 @@
 
 /* Line 1806 of yacc.c  */
-#line 1266 "parser.yy"
+#line 1267 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Short ); }
     break;
@@ -6797 +6798 @@
 
 /* Line 1806 of yacc.c  */
-#line 1268 "parser.yy"
+#line 1269 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Signed ); }
     break;
@@ -6804 +6805 @@
 
 /* Line 1806 of yacc.c  */
-#line 1270 "parser.yy"
+#line 1271 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Unsigned ); }
     break;
@@ -6811 +6812 @@
 
 /* Line 1806 of yacc.c  */
-#line 1272 "parser.yy"
+#line 1273 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Void ); }
     break;
@@ -6818 +6819 @@
 
 /* Line 1806 of yacc.c  */
-#line 1274 "parser.yy"
+#line 1275 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Bool ); }
     break;
@@ -6825 +6826 @@
 
 /* Line 1806 of yacc.c  */
-#line 1276 "parser.yy"
+#line 1277 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Complex ); }
     break;
@@ -6832 +6833 @@
 
 /* Line 1806 of yacc.c  */
-#line 1278 "parser.yy"
+#line 1279 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Imaginary ); }
     break;
@@ -6839 +6840 @@
 
 /* Line 1806 of yacc.c  */
-#line 1285 "parser.yy"
+#line 1286 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6846 +6847 @@
 
 /* Line 1806 of yacc.c  */
-#line 1287 "parser.yy"
+#line 1288 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6853 +6854 @@
 
 /* Line 1806 of yacc.c  */
-#line 1289 "parser.yy"
+#line 1290 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6860 +6861 @@
 
 /* Line 1806 of yacc.c  */
-#line 1291 "parser.yy"
+#line 1292 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addType( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -6867 +6868 @@
 
 /* Line 1806 of yacc.c  */
-#line 1297 "parser.yy"
+#line 1298 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6874 +6875 @@
 
 /* Line 1806 of yacc.c  */
-#line 1304 "parser.yy"
+#line 1305 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6881 +6882 @@
 
 /* Line 1806 of yacc.c  */
-#line 1306 "parser.yy"
+#line 1307 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6888 +6889 @@
 
 /* Line 1806 of yacc.c  */
-#line 1308 "parser.yy"
+#line 1309 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addType( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6895 +6896 @@
 
 /* Line 1806 of yacc.c  */
-#line 1313 "parser.yy"
+#line 1314 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (4)].decl); }
     break;
@@ -6902 +6903 @@
 
 /* Line 1806 of yacc.c  */
-#line 1315 "parser.yy"
+#line 1316 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTypeof( (yyvsp[(3) - (4)].en) ); }
     break;
@@ -6909 +6910 @@
 
 /* Line 1806 of yacc.c  */
-#line 1317 "parser.yy"
+#line 1318 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -6916 +6917 @@
 
 /* Line 1806 of yacc.c  */
-#line 1319 "parser.yy"
+#line 1320 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -6923 +6924 @@
 
 /* Line 1806 of yacc.c  */
-#line 1325 "parser.yy"
+#line 1326 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6930 +6931 @@
 
 /* Line 1806 of yacc.c  */
-#line 1327 "parser.yy"
+#line 1328 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6937 +6938 @@
 
 /* Line 1806 of yacc.c  */
-#line 1329 "parser.yy"
+#line 1330 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6944 +6945 @@
 
 /* Line 1806 of yacc.c  */
-#line 1335 "parser.yy"
+#line 1336 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6951 +6952 @@
 
 /* Line 1806 of yacc.c  */
-#line 1337 "parser.yy"
+#line 1338 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6958 +6959 @@
 
 /* Line 1806 of yacc.c  */
-#line 1343 "parser.yy"
+#line 1344 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6965 +6966 @@
 
 /* Line 1806 of yacc.c  */
-#line 1345 "parser.yy"
+#line 1346 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6972 +6973 @@
 
 /* Line 1806 of yacc.c  */
-#line 1347 "parser.yy"
+#line 1348 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6979 +6980 @@
 
 /* Line 1806 of yacc.c  */
-#line 1352 "parser.yy"
+#line 1353 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -6986 +6987 @@
 
 /* Line 1806 of yacc.c  */
-#line 1354 "parser.yy"
+#line 1355 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(2) - (2)].tok) )->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6993 +6994 @@
 
 /* Line 1806 of yacc.c  */
-#line 1356 "parser.yy"
+#line 1357 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7000 +7001 @@
 
 /* Line 1806 of yacc.c  */
-#line 1366 "parser.yy"
+#line 1367 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (4)].aggKey), 0, 0, 0, (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -7007 +7008 @@
 
 /* Line 1806 of yacc.c  */
-#line 1368 "parser.yy"
+#line 1369 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (2)].aggKey), (yyvsp[(2) - (2)].tok), 0, 0, 0 ); }
     break;
@@ -7014 +7015 @@
 
 /* Line 1806 of yacc.c  */
-#line 1370 "parser.yy"
+#line 1371 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (5)].aggKey), (yyvsp[(2) - (5)].tok), 0, 0, (yyvsp[(4) - (5)].decl) ); }
     break;
@@ -7021 +7022 @@
 
 /* Line 1806 of yacc.c  */
-#line 1372 "parser.yy"
+#line 1373 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (9)].aggKey), 0, (yyvsp[(4) - (9)].decl), 0, (yyvsp[(8) - (9)].decl) ); }
     break;
@@ -7028 +7029 @@
 
 /* Line 1806 of yacc.c  */
-#line 1374 "parser.yy"
+#line 1375 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (7)].aggKey), (yyvsp[(7) - (7)].tok), (yyvsp[(4) - (7)].decl), 0, 0 ); }
     break;
@@ -7035 +7036 @@
 
 /* Line 1806 of yacc.c  */
-#line 1376 "parser.yy"
+#line 1377 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (10)].aggKey), (yyvsp[(7) - (10)].tok), (yyvsp[(4) - (10)].decl), 0, (yyvsp[(9) - (10)].decl) ); }
     break;
@@ -7042 +7043 @@
 
 /* Line 1806 of yacc.c  */
-#line 1378 "parser.yy"
+#line 1379 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (12)].aggKey), 0, (yyvsp[(4) - (12)].decl), (yyvsp[(8) - (12)].en), (yyvsp[(11) - (12)].decl) ); }
     break;
@@ -7049 +7050 @@
 
 /* Line 1806 of yacc.c  */
-#line 1381 "parser.yy"
+#line 1382 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (7)].aggKey), (yyvsp[(7) - (7)].tok), 0, (yyvsp[(4) - (7)].en), 0 ); }
     break;
@@ -7056 +7057 @@
 
 /* Line 1806 of yacc.c  */
-#line 1383 "parser.yy"
+#line 1384 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (13)].aggKey), (yyvsp[(10) - (13)].tok), (yyvsp[(4) - (13)].decl), (yyvsp[(8) - (13)].en), (yyvsp[(12) - (13)].decl) ); }
     break;
@@ -7063 +7064 @@
 
 /* Line 1806 of yacc.c  */
-#line 1388 "parser.yy"
+#line 1389 "parser.yy"
     { (yyval.aggKey) = DeclarationNode::Struct; }
     break;
@@ -7070 +7071 @@
 
 /* Line 1806 of yacc.c  */
-#line 1390 "parser.yy"
+#line 1391 "parser.yy"
     { (yyval.aggKey) = DeclarationNode::Union; }
     break;
@@ -7077 +7078 @@
 
 /* Line 1806 of yacc.c  */
-#line 1395 "parser.yy"
+#line 1396 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (1)].decl); }
     break;
@@ -7084 +7085 @@
 
 /* Line 1806 of yacc.c  */
-#line 1397 "parser.yy"
+#line 1398 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7091 +7092 @@
 
 /* Line 1806 of yacc.c  */
-#line 1403 "parser.yy"
+#line 1404 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -7098 +7099 @@
 
 /* Line 1806 of yacc.c  */
-#line 1406 "parser.yy"
+#line 1407 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -7105 +7106 @@
 
 /* Line 1806 of yacc.c  */
-#line 1412 "parser.yy"
+#line 1413 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addName( (yyvsp[(2) - (2)].tok) ); }
     break;
@@ -7112 +7113 @@
 
 /* Line 1806 of yacc.c  */
-#line 1414 "parser.yy"
+#line 1415 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(1) - (3)].decl)->cloneType( (yyvsp[(3) - (3)].tok) ) ); }
     break;
@@ -7119 +7120 @@
 
 /* Line 1806 of yacc.c  */
-#line 1416 "parser.yy"
+#line 1417 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(1) - (2)].decl)->cloneType( 0 ) ); }
     break;
@@ -7126 +7127 @@
 
 /* Line 1806 of yacc.c  */
-#line 1421 "parser.yy"
+#line 1422 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7133 +7134 @@
 
 /* Line 1806 of yacc.c  */
-#line 1423 "parser.yy"
+#line 1424 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(1) - (4)].decl)->cloneBaseType( (yyvsp[(4) - (4)].decl) ) ); }
     break;
@@ -7140 +7141 @@
 
 /* Line 1806 of yacc.c  */
-#line 1428 "parser.yy"
+#line 1429 "parser.yy"
     { (yyval.decl) = DeclarationNode::newName( 0 ); /* XXX */ }
     break;
@@ -7147 +7148 @@
 
 /* Line 1806 of yacc.c  */
-#line 1430 "parser.yy"
+#line 1431 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBitfield( (yyvsp[(1) - (1)].en) ); }
     break;
@@ -7154 +7155 @@
 
 /* Line 1806 of yacc.c  */
-#line 1433 "parser.yy"
+#line 1434 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
     break;
@@ -7161 +7162 @@
 
 /* Line 1806 of yacc.c  */
-#line 1436 "parser.yy"
+#line 1437 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
     break;
@@ -7168 +7169 @@
 
 /* Line 1806 of yacc.c  */
-#line 1442 "parser.yy"
+#line 1443 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -7175 +7176 @@
 
 /* Line 1806 of yacc.c  */
-#line 1444 "parser.yy"
+#line 1445 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
@@ -7182 +7183 @@
 
 /* Line 1806 of yacc.c  */
-#line 1449 "parser.yy"
+#line 1450 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -7189 +7190 @@
 
 /* Line 1806 of yacc.c  */
-#line 1458 "parser.yy"
+#line 1459 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( 0, (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -7196 +7197 @@
 
 /* Line 1806 of yacc.c  */
-#line 1460 "parser.yy"
+#line 1461 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( (yyvsp[(2) - (6)].tok), (yyvsp[(4) - (6)].decl) ); }
     break;
@@ -7203 +7204 @@
 
 /* Line 1806 of yacc.c  */
-#line 1462 "parser.yy"
+#line 1463 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( (yyvsp[(2) - (2)].tok), 0 ); }
     break;
@@ -7210 +7211 @@
 
 /* Line 1806 of yacc.c  */
-#line 1467 "parser.yy"
+#line 1468 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnumConstant( (yyvsp[(1) - (2)].tok), (yyvsp[(2) - (2)].en) ); }
     break;
@@ -7217 +7218 @@
 
 /* Line 1806 of yacc.c  */
-#line 1469 "parser.yy"
+#line 1470 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( DeclarationNode::newEnumConstant( (yyvsp[(3) - (4)].tok), (yyvsp[(4) - (4)].en) ) ); }
     break;
@@ -7224 +7225 @@
 
 /* Line 1806 of yacc.c  */
-#line 1474 "parser.yy"
+#line 1475 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -7231 +7232 @@
 
 /* Line 1806 of yacc.c  */
-#line 1476 "parser.yy"
+#line 1477 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -7238 +7239 @@
 
 /* Line 1806 of yacc.c  */
-#line 1483 "parser.yy"
+#line 1484 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7245 +7246 @@
 
 /* Line 1806 of yacc.c  */
-#line 1491 "parser.yy"
+#line 1492 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7252 +7253 @@
 
 /* Line 1806 of yacc.c  */
-#line 1493 "parser.yy"
+#line 1494 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
@@ -7259 +7260 @@
 
 /* Line 1806 of yacc.c  */
-#line 1495 "parser.yy"
+#line 1496 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
@@ -7266 +7267 @@
 
 /* Line 1806 of yacc.c  */
-#line 1504 "parser.yy"
+#line 1505 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7273 +7274 @@
 
 /* Line 1806 of yacc.c  */
-#line 1506 "parser.yy"
+#line 1507 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7280 +7281 @@
 
 /* Line 1806 of yacc.c  */
-#line 1508 "parser.yy"
+#line 1509 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (9)].decl)->appendList( (yyvsp[(5) - (9)].decl) )->appendList( (yyvsp[(9) - (9)].decl) ); }
     break;
@@ -7287 +7288 @@
 
 /* Line 1806 of yacc.c  */
-#line 1514 "parser.yy"
+#line 1515 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7294 +7295 @@
 
 /* Line 1806 of yacc.c  */
-#line 1519 "parser.yy"
+#line 1520 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7301 +7302 @@
 
 /* Line 1806 of yacc.c  */
-#line 1526 "parser.yy"
+#line 1527 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
@@ -7308 +7309 @@
 
 /* Line 1806 of yacc.c  */
-#line 1533 "parser.yy"
+#line 1534 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7315 +7316 @@
 
 /* Line 1806 of yacc.c  */
-#line 1535 "parser.yy"
+#line 1536 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7322 +7323 @@
 
 /* Line 1806 of yacc.c  */
-#line 1545 "parser.yy"
+#line 1546 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -7329 +7330 @@
 
 /* Line 1806 of yacc.c  */
-#line 1548 "parser.yy"
+#line 1549 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -7336 +7337 @@
 
 /* Line 1806 of yacc.c  */
-#line 1550 "parser.yy"
+#line 1551 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addName( (yyvsp[(3) - (4)].tok) )->addQualifiers( (yyvsp[(1) - (4)].decl) ); }
     break;
@@ -7343 +7344 @@
 
 /* Line 1806 of yacc.c  */
-#line 1560 "parser.yy"
+#line 1561 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7350 +7351 @@
 
 /* Line 1806 of yacc.c  */
-#line 1566 "parser.yy"
+#line 1567 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7360 +7361 @@
 
 /* Line 1806 of yacc.c  */
-#line 1571 "parser.yy"
+#line 1572 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7370 +7371 @@
 
 /* Line 1806 of yacc.c  */
-#line 1580 "parser.yy"
+#line 1581 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7377 +7378 @@
 
 /* Line 1806 of yacc.c  */
-#line 1589 "parser.yy"
+#line 1590 "parser.yy"
     { (yyval.decl) = DeclarationNode::newName( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -7384 +7385 @@
 
 /* Line 1806 of yacc.c  */
-#line 1591 "parser.yy"
+#line 1592 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( DeclarationNode::newName( (yyvsp[(3) - (3)].tok) ) ); }
     break;
@@ -7391 +7392 @@
 
 /* Line 1806 of yacc.c  */
-#line 1616 "parser.yy"
+#line 1617 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7398 +7399 @@
 
 /* Line 1806 of yacc.c  */
-#line 1624 "parser.yy"
+#line 1625 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7405 +7406 @@
 
 /* Line 1806 of yacc.c  */
-#line 1629 "parser.yy"
+#line 1630 "parser.yy"
     { (yyval.in) = 0; }
     break;
@@ -7412 +7413 @@
 
 /* Line 1806 of yacc.c  */
-#line 1630 "parser.yy"
+#line 1631 "parser.yy"
     { (yyval.in) = (yyvsp[(2) - (2)].in); }
     break;
@@ -7419 +7420 @@
 
 /* Line 1806 of yacc.c  */
-#line 1634 "parser.yy"
+#line 1635 "parser.yy"
     { (yyval.in) = new InitializerNode((yyvsp[(1) - (1)].en)); }
     break;
@@ -7426 +7427 @@
 
 /* Line 1806 of yacc.c  */
-#line 1635 "parser.yy"
+#line 1636 "parser.yy"
     { (yyval.in) = new InitializerNode((yyvsp[(2) - (4)].in), true); }
     break;
@@ -7433 +7434 @@
 
 /* Line 1806 of yacc.c  */
-#line 1640 "parser.yy"
+#line 1641 "parser.yy"
     { (yyval.in) = (yyvsp[(2) - (2)].in)->set_designators( (yyvsp[(1) - (2)].en) ); }
     break;
@@ -7440 +7441 @@
 
 /* Line 1806 of yacc.c  */
-#line 1641 "parser.yy"
+#line 1642 "parser.yy"
     { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (3)].in)->set_link((yyvsp[(3) - (3)].in)) ); }
     break;
@@ -7447 +7448 @@
 
 /* Line 1806 of yacc.c  */
-#line 1643 "parser.yy"
+#line 1644 "parser.yy"
     { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (4)].in)->set_link( (yyvsp[(4) - (4)].in)->set_designators((yyvsp[(3) - (4)].en)) ) ); }
     break;
@@ -7454 +7455 @@
 
 /* Line 1806 of yacc.c  */
-#line 1659 "parser.yy"
+#line 1660 "parser.yy"
     { (yyval.en) = new VarRefNode( (yyvsp[(1) - (2)].tok) ); }
     break;
@@ -7461 +7462 @@
 
 /* Line 1806 of yacc.c  */
-#line 1664 "parser.yy"
+#line 1665 "parser.yy"
     { (yyval.en) = (ExpressionNode *)((yyvsp[(1) - (2)].en)->set_link( (yyvsp[(2) - (2)].en) )); }
     break;
@@ -7468 +7469 @@
 
 /* Line 1806 of yacc.c  */
-#line 1669 "parser.yy"
+#line 1670 "parser.yy"
     { (yyval.en) = new VarRefNode( (yyvsp[(2) - (2)].tok) ); }
     break;
@@ -7475 +7476 @@
 
 /* Line 1806 of yacc.c  */
-#line 1673 "parser.yy"
+#line 1674 "parser.yy"
     { (yyval.en) = (yyvsp[(3) - (5)].en); }
     break;
@@ -7482 +7483 @@
 
 /* Line 1806 of yacc.c  */
-#line 1675 "parser.yy"
+#line 1676 "parser.yy"
     { (yyval.en) = (yyvsp[(3) - (5)].en); }
     break;
@@ -7489 +7490 @@
 
 /* Line 1806 of yacc.c  */
-#line 1677 "parser.yy"
+#line 1678 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Range), (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].en)); }
     break;
@@ -7496 +7497 @@
 
 /* Line 1806 of yacc.c  */
-#line 1679 "parser.yy"
+#line 1680 "parser.yy"
     { (yyval.en) = (yyvsp[(4) - (6)].en); }
     break;
@@ -7503 +7504 @@
 
 /* Line 1806 of yacc.c  */
-#line 1704 "parser.yy"
+#line 1705 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7510 +7511 @@
 
 /* Line 1806 of yacc.c  */
-#line 1706 "parser.yy"
+#line 1707 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7517 +7518 @@
 
 /* Line 1806 of yacc.c  */
-#line 1708 "parser.yy"
+#line 1709 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7524 +7525 @@
 
 /* Line 1806 of yacc.c  */
-#line 1713 "parser.yy"
+#line 1714 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypeGen( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -7531 +7532 @@
 
 /* Line 1806 of yacc.c  */
-#line 1715 "parser.yy"
+#line 1716 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypeGen( (yyvsp[(2) - (5)].tok), (yyvsp[(4) - (5)].en) )->addQualifiers( (yyvsp[(1) - (5)].decl) ); }
     break;
@@ -7538 +7539 @@
 
 /* Line 1806 of yacc.c  */
-#line 1717 "parser.yy"
+#line 1718 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7545 +7546 @@
 
 /* Line 1806 of yacc.c  */
-#line 1723 "parser.yy"
+#line 1724 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -7552 +7553 @@
 
 /* Line 1806 of yacc.c  */
-#line 1728 "parser.yy"
+#line 1729 "parser.yy"
     { typedefTable.addToEnclosingScope(*((yyvsp[(2) - (2)].tok)), TypedefTable::TD); }
     break;
@@ -7559 +7560 @@
 
 /* Line 1806 of yacc.c  */
-#line 1730 "parser.yy"
+#line 1731 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTypeParam( (yyvsp[(1) - (4)].tclass), (yyvsp[(2) - (4)].tok) )->addAssertions( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -7566 +7567 @@
 
 /* Line 1806 of yacc.c  */
-#line 1736 "parser.yy"
+#line 1737 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Type; }
     break;
@@ -7573 +7574 @@
 
 /* Line 1806 of yacc.c  */
-#line 1738 "parser.yy"
+#line 1739 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Ftype; }
     break;
@@ -7580 +7581 @@
 
 /* Line 1806 of yacc.c  */
-#line 1740 "parser.yy"
+#line 1741 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Dtype; }
     break;
@@ -7587 +7588 @@
 
 /* Line 1806 of yacc.c  */
-#line 1745 "parser.yy"
+#line 1746 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7594 +7595 @@
 
 /* Line 1806 of yacc.c  */
-#line 1747 "parser.yy"
+#line 1748 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl) == 0 ? (yyvsp[(2) - (2)].decl) : (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7601 +7602 @@
 
 /* Line 1806 of yacc.c  */
-#line 1752 "parser.yy"
+#line 1753 "parser.yy"
     {
                         typedefTable.openContext( *((yyvsp[(2) - (5)].tok)) );
@@ -7611 +7612 @@
 
 /* Line 1806 of yacc.c  */
-#line 1757 "parser.yy"
+#line 1758 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (5)].decl); }
     break;
@@ -7618 +7619 @@
 
 /* Line 1806 of yacc.c  */
-#line 1759 "parser.yy"
+#line 1760 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7625 +7626 @@
 
 /* Line 1806 of yacc.c  */
-#line 1764 "parser.yy"
+#line 1765 "parser.yy"
     { (yyval.en) = new TypeValueNode( (yyvsp[(1) - (1)].decl) ); }
     break;
@@ -7632 +7633 @@
 
 /* Line 1806 of yacc.c  */
-#line 1767 "parser.yy"
+#line 1768 "parser.yy"
     { (yyval.en) = (ExpressionNode *)((yyvsp[(1) - (3)].en)->set_link(new TypeValueNode( (yyvsp[(3) - (3)].decl) ))); }
     break;
@@ -7639 +7640 @@
 
 /* Line 1806 of yacc.c  */
-#line 1769 "parser.yy"
+#line 1770 "parser.yy"
     { (yyval.en) = (ExpressionNode *)((yyvsp[(1) - (3)].en)->set_link((yyvsp[(3) - (3)].en))); }
     break;
@@ -7646 +7647 @@
 
 /* Line 1806 of yacc.c  */
-#line 1774 "parser.yy"
+#line 1775 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
     break;
@@ -7653 +7654 @@
 
 /* Line 1806 of yacc.c  */
-#line 1776 "parser.yy"
+#line 1777 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -7660 +7661 @@
 
 /* Line 1806 of yacc.c  */
-#line 1778 "parser.yy"
+#line 1779 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl)->copyStorageClasses( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -7667 +7668 @@
 
 /* Line 1806 of yacc.c  */
-#line 1783 "parser.yy"
+#line 1784 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addAssertions( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7674 +7675 @@
 
 /* Line 1806 of yacc.c  */
-#line 1785 "parser.yy"
+#line 1786 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addAssertions( (yyvsp[(2) - (4)].decl) )->addType( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -7681 +7682 @@
 
 /* Line 1806 of yacc.c  */
-#line 1790 "parser.yy"
+#line 1791 "parser.yy"
     {
                         typedefTable.addToEnclosingScope(*((yyvsp[(1) - (1)].tok)), TypedefTable::TD);
@@ -7691 +7692 @@
 
 /* Line 1806 of yacc.c  */
-#line 1795 "parser.yy"
+#line 1796 "parser.yy"
     {
                         typedefTable.addToEnclosingScope(*((yyvsp[(1) - (6)].tok)), TypedefTable::TG);
@@ -7701 +7702 @@
 
 /* Line 1806 of yacc.c  */
-#line 1803 "parser.yy"
+#line 1804 "parser.yy"
     {
                         typedefTable.addToEnclosingScope(*((yyvsp[(2) - (9)].tok)), TypedefTable::ID );
@@ -7711 +7712 @@
 
 /* Line 1806 of yacc.c  */
-#line 1808 "parser.yy"
+#line 1809 "parser.yy"
     {
                         typedefTable.enterContext( *((yyvsp[(2) - (8)].tok)) );
@@ -7721 +7722 @@
 
 /* Line 1806 of yacc.c  */
-#line 1813 "parser.yy"
+#line 1814 "parser.yy"
     {
                         typedefTable.leaveContext();
@@ -7732 +7733 @@
 
 /* Line 1806 of yacc.c  */
-#line 1823 "parser.yy"
+#line 1824 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7739 +7740 @@
 
 /* Line 1806 of yacc.c  */
-#line 1833 "parser.yy"
+#line 1834 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7749 +7750 @@
 
 /* Line 1806 of yacc.c  */
-#line 1838 "parser.yy"
+#line 1839 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7759 +7760 @@
 
 /* Line 1806 of yacc.c  */
-#line 1843 "parser.yy"
+#line 1844 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( *((yyvsp[(5) - (5)].tok)), TypedefTable::ID );
@@ -7769 +7770 @@
 
 /* Line 1806 of yacc.c  */
-#line 1851 "parser.yy"
+#line 1852 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7779 +7780 @@
 
 /* Line 1806 of yacc.c  */
-#line 1856 "parser.yy"
+#line 1857 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7789 +7790 @@
 
 /* Line 1806 of yacc.c  */
-#line 1866 "parser.yy"
+#line 1867 "parser.yy"
     {}
     break;
@@ -7796 +7797 @@
 
 /* Line 1806 of yacc.c  */
-#line 1868 "parser.yy"
+#line 1869 "parser.yy"
     {
                         if ( theTree ) {
@@ -7809 +7810 @@
 
 /* Line 1806 of yacc.c  */
-#line 1880 "parser.yy"
+#line 1881 "parser.yy"
     { (yyval.decl) = ((yyvsp[(1) - (3)].decl) != NULL ) ? (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ) : (yyvsp[(3) - (3)].decl); }
     break;
@@ -7816 +7817 @@
 
 /* Line 1806 of yacc.c  */
-#line 1885 "parser.yy"
+#line 1886 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7823 +7824 @@
 
 /* Line 1806 of yacc.c  */
-#line 1893 "parser.yy"
+#line 1894 "parser.yy"
     {}
     break;
@@ -7830 +7831 @@
 
 /* Line 1806 of yacc.c  */
-#line 1895 "parser.yy"
+#line 1896 "parser.yy"
     {
                         linkageStack.push( linkage );
@@ -7840 +7841 @@
 
 /* Line 1806 of yacc.c  */
-#line 1900 "parser.yy"
+#line 1901 "parser.yy"
     {
                         linkage = linkageStack.top();
@@ -7851 +7852 @@
 
 /* Line 1806 of yacc.c  */
-#line 1906 "parser.yy"
+#line 1907 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
     break;
@@ -7858 +7859 @@
 
 /* Line 1806 of yacc.c  */
-#line 1918 "parser.yy"
+#line 1919 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7869 +7870 @@
 
 /* Line 1806 of yacc.c  */
-#line 1924 "parser.yy"
+#line 1925 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7880 +7881 @@
 
 /* Line 1806 of yacc.c  */
-#line 1933 "parser.yy"
+#line 1934 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7891 +7892 @@
 
 /* Line 1806 of yacc.c  */
-#line 1939 "parser.yy"
+#line 1940 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7902 +7903 @@
 
 /* Line 1806 of yacc.c  */
-#line 1945 "parser.yy"
+#line 1946 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7913 +7914 @@
 
 /* Line 1806 of yacc.c  */
-#line 1951 "parser.yy"
+#line 1952 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7924 +7925 @@
 
 /* Line 1806 of yacc.c  */
-#line 1957 "parser.yy"
+#line 1958 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7935 +7936 @@
 
 /* Line 1806 of yacc.c  */
-#line 1965 "parser.yy"
+#line 1966 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7946 +7947 @@
 
 /* Line 1806 of yacc.c  */
-#line 1971 "parser.yy"
+#line 1972 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7957 +7958 @@
 
 /* Line 1806 of yacc.c  */
-#line 1979 "parser.yy"
+#line 1980 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7968 +7969 @@
 
 /* Line 1806 of yacc.c  */
-#line 1985 "parser.yy"
+#line 1986 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7979 +7980 @@
 
 /* Line 1806 of yacc.c  */
-#line 2000 "parser.yy"
+#line 2001 "parser.yy"
     { (yyval.en) = new CompositeExprNode(new OperatorNode(OperatorNode::Range), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en)); }
     break;
 
   case 539:
-
-/* Line 1806 of yacc.c  */
-#line 2034 "parser.yy"
-    {}
-    break;
-
-  case 540:
 
 /* Line 1806 of yacc.c  */
@@ -7997 +7991 @@
     break;
 
-  case 541:
+  case 540:
 
 /* Line 1806 of yacc.c  */
@@ -8004 +7998 @@
     break;
 
-  case 542:
+  case 541:
 
 /* Line 1806 of yacc.c  */
@@ -8011 +8005 @@
     break;
 
+  case 542:
+
+/* Line 1806 of yacc.c  */
+#line 2038 "parser.yy"
+    {}
+    break;
+
   case 547:
 
 /* Line 1806 of yacc.c  */
-#line 2080 "parser.yy"
+#line 2081 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *((yyvsp[(1) - (1)].tok)) );
@@ -8024 +8025 @@
 
 /* Line 1806 of yacc.c  */
-#line 2085 "parser.yy"
+#line 2086 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8031 +8032 @@
 
 /* Line 1806 of yacc.c  */
-#line 2090 "parser.yy"
+#line 2091 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8038 +8039 @@
 
 /* Line 1806 of yacc.c  */
-#line 2092 "parser.yy"
+#line 2093 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8045 +8046 @@
 
 /* Line 1806 of yacc.c  */
-#line 2094 "parser.yy"
+#line 2095 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8052 +8053 @@
 
 /* Line 1806 of yacc.c  */
-#line 2099 "parser.yy"
+#line 2100 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8059 +8060 @@
 
 /* Line 1806 of yacc.c  */
-#line 2101 "parser.yy"
+#line 2102 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8066 +8067 @@
 
 /* Line 1806 of yacc.c  */
-#line 2103 "parser.yy"
+#line 2104 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8073 +8074 @@
 
 /* Line 1806 of yacc.c  */
-#line 2105 "parser.yy"
+#line 2106 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8080 +8081 @@
 
 /* Line 1806 of yacc.c  */
-#line 2110 "parser.yy"
+#line 2111 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8087 +8088 @@
 
 /* Line 1806 of yacc.c  */
-#line 2112 "parser.yy"
+#line 2113 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8094 +8095 @@
 
 /* Line 1806 of yacc.c  */
-#line 2128 "parser.yy"
+#line 2129 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
@@ -8101 +8102 @@
 
 /* Line 1806 of yacc.c  */
-#line 2130 "parser.yy"
+#line 2131 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8108 +8109 @@
 
 /* Line 1806 of yacc.c  */
-#line 2132 "parser.yy"
+#line 2133 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8115 +8116 @@
 
 /* Line 1806 of yacc.c  */
-#line 2137 "parser.yy"
+#line 2138 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8122 +8123 @@
 
 /* Line 1806 of yacc.c  */
-#line 2139 "parser.yy"
+#line 2140 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8129 +8130 @@
 
 /* Line 1806 of yacc.c  */
-#line 2141 "parser.yy"
+#line 2142 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8136 +8137 @@
 
 /* Line 1806 of yacc.c  */
-#line 2146 "parser.yy"
+#line 2147 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8143 +8144 @@
 
 /* Line 1806 of yacc.c  */
-#line 2148 "parser.yy"
+#line 2149 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8150 +8151 @@
 
 /* Line 1806 of yacc.c  */
-#line 2150 "parser.yy"
+#line 2151 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8157 +8158 @@
 
 /* Line 1806 of yacc.c  */
-#line 2165 "parser.yy"
+#line 2166 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addIdList( (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -8164 +8165 @@
 
 /* Line 1806 of yacc.c  */
-#line 2167 "parser.yy"
+#line 2168 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (6)].decl)->addIdList( (yyvsp[(5) - (6)].decl) ); }
     break;
@@ -8171 +8172 @@
 
 /* Line 1806 of yacc.c  */
-#line 2169 "parser.yy"
+#line 2170 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8178 +8179 @@
 
 /* Line 1806 of yacc.c  */
-#line 2174 "parser.yy"
+#line 2175 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8185 +8186 @@
 
 /* Line 1806 of yacc.c  */
-#line 2176 "parser.yy"
+#line 2177 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8192 +8193 @@
 
 /* Line 1806 of yacc.c  */
-#line 2178 "parser.yy"
+#line 2179 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8199 +8200 @@
 
 /* Line 1806 of yacc.c  */
-#line 2183 "parser.yy"
+#line 2184 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8206 +8207 @@
 
 /* Line 1806 of yacc.c  */
-#line 2185 "parser.yy"
+#line 2186 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8213 +8214 @@
 
 /* Line 1806 of yacc.c  */
-#line 2187 "parser.yy"
+#line 2188 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8220 +8221 @@
 
 /* Line 1806 of yacc.c  */
-#line 2209 "parser.yy"
+#line 2210 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *((yyvsp[(1) - (1)].tok)) );
@@ -8230 +8231 @@
 
 /* Line 1806 of yacc.c  */
-#line 2214 "parser.yy"
+#line 2215 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8237 +8238 @@
 
 /* Line 1806 of yacc.c  */
-#line 2219 "parser.yy"
+#line 2220 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8244 +8245 @@
 
 /* Line 1806 of yacc.c  */
-#line 2221 "parser.yy"
+#line 2222 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8251 +8252 @@
 
 /* Line 1806 of yacc.c  */
-#line 2223 "parser.yy"
+#line 2224 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8258 +8259 @@
 
 /* Line 1806 of yacc.c  */
-#line 2228 "parser.yy"
+#line 2229 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8265 +8266 @@
 
 /* Line 1806 of yacc.c  */
-#line 2230 "parser.yy"
+#line 2231 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8272 +8273 @@
 
 /* Line 1806 of yacc.c  */
-#line 2232 "parser.yy"
+#line 2233 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8279 +8280 @@
 
 /* Line 1806 of yacc.c  */
-#line 2234 "parser.yy"
+#line 2235 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8286 +8287 @@
 
 /* Line 1806 of yacc.c  */
-#line 2239 "parser.yy"
+#line 2240 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
@@ -8293 +8294 @@
 
 /* Line 1806 of yacc.c  */
-#line 2241 "parser.yy"
+#line 2242 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8300 +8301 @@
 
 /* Line 1806 of yacc.c  */
-#line 2243 "parser.yy"
+#line 2244 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8307 +8308 @@
 
 /* Line 1806 of yacc.c  */
-#line 2260 "parser.yy"
+#line 2261 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8314 +8315 @@
 
 /* Line 1806 of yacc.c  */
-#line 2262 "parser.yy"
+#line 2263 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8321 +8322 @@
 
 /* Line 1806 of yacc.c  */
-#line 2264 "parser.yy"
+#line 2265 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8328 +8329 @@
 
 /* Line 1806 of yacc.c  */
-#line 2269 "parser.yy"
+#line 2270 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8335 +8336 @@
 
 /* Line 1806 of yacc.c  */
-#line 2271 "parser.yy"
+#line 2272 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8342 +8343 @@
 
 /* Line 1806 of yacc.c  */
-#line 2273 "parser.yy"
+#line 2274 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8349 +8350 @@
 
 /* Line 1806 of yacc.c  */
-#line 2275 "parser.yy"
+#line 2276 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8356 +8357 @@
 
 /* Line 1806 of yacc.c  */
-#line 2280 "parser.yy"
+#line 2281 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
@@ -8363 +8364 @@
 
 /* Line 1806 of yacc.c  */
-#line 2282 "parser.yy"
+#line 2283 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8370 +8371 @@
 
 /* Line 1806 of yacc.c  */
-#line 2284 "parser.yy"
+#line 2285 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8377 +8378 @@
 
 /* Line 1806 of yacc.c  */
-#line 2322 "parser.yy"
+#line 2323 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *((yyvsp[(1) - (1)].tok)) );
@@ -8387 +8388 @@
 
 /* Line 1806 of yacc.c  */
-#line 2330 "parser.yy"
+#line 2331 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8394 +8395 @@
 
 /* Line 1806 of yacc.c  */
-#line 2332 "parser.yy"
+#line 2333 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8401 +8402 @@
 
 /* Line 1806 of yacc.c  */
-#line 2334 "parser.yy"
+#line 2335 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8408 +8409 @@
 
 /* Line 1806 of yacc.c  */
-#line 2339 "parser.yy"
+#line 2340 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8415 +8416 @@
 
 /* Line 1806 of yacc.c  */
-#line 2341 "parser.yy"
+#line 2342 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8422 +8423 @@
 
 /* Line 1806 of yacc.c  */
-#line 2346 "parser.yy"
+#line 2347 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
@@ -8429 +8430 @@
 
 /* Line 1806 of yacc.c  */
-#line 2348 "parser.yy"
+#line 2349 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8436 +8437 @@
 
 /* Line 1806 of yacc.c  */
-#line 2368 "parser.yy"
+#line 2369 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
@@ -8443 +8444 @@
 
 /* Line 1806 of yacc.c  */
-#line 2370 "parser.yy"
+#line 2371 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8450 +8451 @@
 
 /* Line 1806 of yacc.c  */
-#line 2372 "parser.yy"
+#line 2373 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8457 +8458 @@
 
 /* Line 1806 of yacc.c  */
-#line 2374 "parser.yy"
+#line 2375 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8464 +8465 @@
 
 /* Line 1806 of yacc.c  */
-#line 2376 "parser.yy"
+#line 2377 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8471 +8472 @@
 
 /* Line 1806 of yacc.c  */
-#line 2382 "parser.yy"
+#line 2383 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8478 +8479 @@
 
 /* Line 1806 of yacc.c  */
-#line 2384 "parser.yy"
+#line 2385 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8485 +8486 @@
 
 /* Line 1806 of yacc.c  */
-#line 2386 "parser.yy"
+#line 2387 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8492 +8493 @@
 
 /* Line 1806 of yacc.c  */
-#line 2391 "parser.yy"
+#line 2392 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
     break;
@@ -8499 +8500 @@
 
 /* Line 1806 of yacc.c  */
-#line 2393 "parser.yy"
+#line 2394 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8506 +8507 @@
 
 /* Line 1806 of yacc.c  */
-#line 2395 "parser.yy"
+#line 2396 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8513 +8514 @@
 
 /* Line 1806 of yacc.c  */
-#line 2401 "parser.yy"
+#line 2402 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
     break;
@@ -8520 +8521 @@
 
 /* Line 1806 of yacc.c  */
-#line 2403 "parser.yy"
+#line 2404 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false )->addArray( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -8527 +8528 @@
 
 /* Line 1806 of yacc.c  */
-#line 2409 "parser.yy"
+#line 2410 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(3) - (5)].en), 0, false ); }
     break;
@@ -8534 +8535 @@
 
 /* Line 1806 of yacc.c  */
-#line 2411 "parser.yy"
+#line 2412 "parser.yy"
     { (yyval.decl) = DeclarationNode::newVarArray( 0 ); }
     break;
@@ -8541 +8542 @@
 
 /* Line 1806 of yacc.c  */
-#line 2413 "parser.yy"
+#line 2414 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newArray( (yyvsp[(4) - (6)].en), 0, false ) ); }
     break;
@@ -8548 +8549 @@
 
 /* Line 1806 of yacc.c  */
-#line 2415 "parser.yy"
+#line 2416 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newVarArray( 0 ) ); }
     break;
@@ -8555 +8556 @@
 
 /* Line 1806 of yacc.c  */
-#line 2435 "parser.yy"
+#line 2436 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
@@ -8562 +8563 @@
 
 /* Line 1806 of yacc.c  */
-#line 2437 "parser.yy"
+#line 2438 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8569 +8570 @@
 
 /* Line 1806 of yacc.c  */
-#line 2439 "parser.yy"
+#line 2440 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8576 +8577 @@
 
 /* Line 1806 of yacc.c  */
-#line 2441 "parser.yy"
+#line 2442 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8583 +8584 @@
 
 /* Line 1806 of yacc.c  */
-#line 2443 "parser.yy"
+#line 2444 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8590 +8591 @@
 
 /* Line 1806 of yacc.c  */
-#line 2449 "parser.yy"
+#line 2450 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8597 +8598 @@
 
 /* Line 1806 of yacc.c  */
-#line 2451 "parser.yy"
+#line 2452 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8604 +8605 @@
 
 /* Line 1806 of yacc.c  */
-#line 2453 "parser.yy"
+#line 2454 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8611 +8612 @@
 
 /* Line 1806 of yacc.c  */
-#line 2458 "parser.yy"
+#line 2459 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
     break;
@@ -8618 +8619 @@
 
 /* Line 1806 of yacc.c  */
-#line 2460 "parser.yy"
+#line 2461 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8625 +8626 @@
 
 /* Line 1806 of yacc.c  */
-#line 2462 "parser.yy"
+#line 2463 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8632 +8633 @@
 
 /* Line 1806 of yacc.c  */
-#line 2469 "parser.yy"
+#line 2470 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8639 +8640 @@
 
 /* Line 1806 of yacc.c  */
-#line 2481 "parser.yy"
+#line 2482 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
     break;
@@ -8646 +8647 @@
 
 /* Line 1806 of yacc.c  */
-#line 2484 "parser.yy"
+#line 2485 "parser.yy"
     { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
     break;
@@ -8653 +8654 @@
 
 /* Line 1806 of yacc.c  */
-#line 2486 "parser.yy"
+#line 2487 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, (yyvsp[(3) - (5)].decl), false ); }
     break;
@@ -8660 +8661 @@
 
 /* Line 1806 of yacc.c  */
-#line 2489 "parser.yy"
+#line 2490 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
     break;
@@ -8667 +8668 @@
 
 /* Line 1806 of yacc.c  */
-#line 2491 "parser.yy"
+#line 2492 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl), true ); }
     break;
@@ -8674 +8675 @@
 
 /* Line 1806 of yacc.c  */
-#line 2493 "parser.yy"
+#line 2494 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(3) - (7)].decl), true ); }
     break;
@@ -8681 +8682 @@
 
 /* Line 1806 of yacc.c  */
-#line 2512 "parser.yy"
+#line 2513 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
@@ -8688 +8689 @@
 
 /* Line 1806 of yacc.c  */
-#line 2514 "parser.yy"
+#line 2515 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8695 +8696 @@
 
 /* Line 1806 of yacc.c  */
-#line 2516 "parser.yy"
+#line 2517 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8702 +8703 @@
 
 /* Line 1806 of yacc.c  */
-#line 2518 "parser.yy"
+#line 2519 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8709 +8710 @@
 
 /* Line 1806 of yacc.c  */
-#line 2520 "parser.yy"
+#line 2521 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8716 +8717 @@
 
 /* Line 1806 of yacc.c  */
-#line 2526 "parser.yy"
+#line 2527 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8723 +8724 @@
 
 /* Line 1806 of yacc.c  */
-#line 2528 "parser.yy"
+#line 2529 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8730 +8731 @@
 
 /* Line 1806 of yacc.c  */
-#line 2530 "parser.yy"
+#line 2531 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8737 +8738 @@
 
 /* Line 1806 of yacc.c  */
-#line 2535 "parser.yy"
+#line 2536 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8744 +8745 @@
 
 /* Line 1806 of yacc.c  */
-#line 2537 "parser.yy"
+#line 2538 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8751 +8752 @@
 
 /* Line 1806 of yacc.c  */
-#line 2547 "parser.yy"
+#line 2548 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -8758 +8759 @@
 
 /* Line 1806 of yacc.c  */
-#line 2557 "parser.yy"
+#line 2558 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8765 +8766 @@
 
 /* Line 1806 of yacc.c  */
-#line 2559 "parser.yy"
+#line 2560 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -8772 +8773 @@
 
 /* Line 1806 of yacc.c  */
-#line 2561 "parser.yy"
+#line 2562 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8779 +8780 @@
 
 /* Line 1806 of yacc.c  */
-#line 2563 "parser.yy"
+#line 2564 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -8786 +8787 @@
 
 /* Line 1806 of yacc.c  */
-#line 2565 "parser.yy"
+#line 2566 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8793 +8794 @@
 
 /* Line 1806 of yacc.c  */
-#line 2567 "parser.yy"
+#line 2568 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -8800 +8801 @@
 
 /* Line 1806 of yacc.c  */
-#line 2574 "parser.yy"
+#line 2575 "parser.yy"
     { (yyval.decl) = (yyvsp[(5) - (5)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -8807 +8808 @@
 
 /* Line 1806 of yacc.c  */
-#line 2576 "parser.yy"
+#line 2577 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -8814 +8815 @@
 
 /* Line 1806 of yacc.c  */
-#line 2578 "parser.yy"
+#line 2579 "parser.yy"
     { (yyval.decl) = (yyvsp[(6) - (6)].decl)->addNewArray( (yyvsp[(5) - (6)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -8821 +8822 @@
 
 /* Line 1806 of yacc.c  */
-#line 2580 "parser.yy"
+#line 2581 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -8828 +8829 @@
 
 /* Line 1806 of yacc.c  */
-#line 2582 "parser.yy"
+#line 2583 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -8835 +8836 @@
 
 /* Line 1806 of yacc.c  */
-#line 2584 "parser.yy"
+#line 2585 "parser.yy"
     { (yyval.decl) = (yyvsp[(5) - (5)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -8842 +8843 @@
 
 /* Line 1806 of yacc.c  */
-#line 2586 "parser.yy"
+#line 2587 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -8849 +8850 @@
 
 /* Line 1806 of yacc.c  */
-#line 2588 "parser.yy"
+#line 2589 "parser.yy"
     { (yyval.decl) = (yyvsp[(6) - (6)].decl)->addNewArray( (yyvsp[(5) - (6)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -8856 +8857 @@
 
 /* Line 1806 of yacc.c  */
-#line 2590 "parser.yy"
+#line 2591 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -8863 +8864 @@
 
 /* Line 1806 of yacc.c  */
-#line 2592 "parser.yy"
+#line 2593 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -8870 +8871 @@
 
 /* Line 1806 of yacc.c  */
-#line 2597 "parser.yy"
+#line 2598 "parser.yy"
     { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
     break;
@@ -8877 +8878 @@
 
 /* Line 1806 of yacc.c  */
-#line 2599 "parser.yy"
+#line 2600 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
     break;
@@ -8884 +8885 @@
 
 /* Line 1806 of yacc.c  */
-#line 2604 "parser.yy"
+#line 2605 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), true ); }
     break;
@@ -8891 +8892 @@
 
 /* Line 1806 of yacc.c  */
-#line 2606 "parser.yy"
+#line 2607 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl)->addQualifiers( (yyvsp[(3) - (7)].decl) ), true ); }
     break;
@@ -8898 +8899 @@
 
 /* Line 1806 of yacc.c  */
-#line 2633 "parser.yy"
+#line 2634 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -8905 +8906 @@
 
 /* Line 1806 of yacc.c  */
-#line 2644 "parser.yy"
+#line 2645 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8912 +8913 @@
 
 /* Line 1806 of yacc.c  */
-#line 2646 "parser.yy"
+#line 2647 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -8919 +8920 @@
 
 /* Line 1806 of yacc.c  */
-#line 2648 "parser.yy"
+#line 2649 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8926 +8927 @@
 
 /* Line 1806 of yacc.c  */
-#line 2650 "parser.yy"
+#line 2651 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -8933 +8934 @@
 
 /* Line 1806 of yacc.c  */
-#line 2652 "parser.yy"
+#line 2653 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8940 +8941 @@
 
 /* Line 1806 of yacc.c  */
-#line 2654 "parser.yy"
+#line 2655 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -8947 +8948 @@
 
 /* Line 1806 of yacc.c  */
-#line 2661 "parser.yy"
+#line 2662 "parser.yy"
     { (yyval.decl) = (yyvsp[(5) - (5)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -8954 +8955 @@
 
 /* Line 1806 of yacc.c  */
-#line 2663 "parser.yy"
+#line 2664 "parser.yy"
     { (yyval.decl) = (yyvsp[(6) - (6)].decl)->addNewArray( (yyvsp[(5) - (6)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -8961 +8962 @@
 
 /* Line 1806 of yacc.c  */
-#line 2665 "parser.yy"
+#line 2666 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -8968 +8969 @@
 
 /* Line 1806 of yacc.c  */
-#line 2667 "parser.yy"
+#line 2668 "parser.yy"
     { (yyval.decl) = (yyvsp[(5) - (5)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -8975 +8976 @@
 
 /* Line 1806 of yacc.c  */
-#line 2669 "parser.yy"
+#line 2670 "parser.yy"
     { (yyval.decl) = (yyvsp[(6) - (6)].decl)->addNewArray( (yyvsp[(5) - (6)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -8982 +8983 @@
 
 /* Line 1806 of yacc.c  */
-#line 2671 "parser.yy"
+#line 2672 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -8989 +8990 @@
 
 /* Line 1806 of yacc.c  */
-#line 2676 "parser.yy"
+#line 2677 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -8996 +8997 @@
 
 /* Line 1806 of yacc.c  */
-#line 2681 "parser.yy"
+#line 2682 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, DeclarationNode::newTuple( 0 ), (yyvsp[(6) - (7)].decl), 0 ); }
     break;
@@ -9003 +9004 @@
 
 /* Line 1806 of yacc.c  */
-#line 2683 "parser.yy"
+#line 2684 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), 0 ); }
     break;
@@ -9010 +9011 @@
 
 /* Line 1806 of yacc.c  */
-#line 2685 "parser.yy"
+#line 2686 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), 0 ); }
     break;
@@ -9017 +9018 @@
 
 /* Line 1806 of yacc.c  */
-#line 2711 "parser.yy"
+#line 2712 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -9024 +9025 @@
 
 /* Line 1806 of yacc.c  */
-#line 2713 "parser.yy"
+#line 2714 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -9031 +9032 @@
 
 /* Line 1806 of yacc.c  */
-#line 9034 "Parser/parser.cc"
+#line 9035 "Parser/parser.cc"
       default: break;
     }
@@ -9262 +9263 @@
 
 /* Line 2067 of yacc.c  */
-#line 2716 "parser.yy"
+#line 2717 "parser.yy"
 
 // ----end of grammar----
@@ -9271 +9272 @@
             std::cout << "in file " << yyfilename << " ";
         } // if
-        std::cout << "at line " << yylineno << " reading token \"" << *(yylval.tok.str) << "\"" << std::endl;
+//      std::cout << "at line " << yylineno << " reading token \"" << *(yylval.tok.str) << "\"" << std::endl;
+        std::cout << "at line " << yylineno << " reading token \"" << yytext << "\"" << std::endl;
 }
 

src/Parser/parser.h

@@ -246 +246 @@
 
 /* Line 2068 of yacc.c  */
-#line 107 "parser.yy"
+#line 108 "parser.yy"
 
         Token tok;

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun  8 20:31:07 2015
-// Update Count     : 1030
+// Last Modified On : Wed Jun 10 14:22:15 2015
+// Update Count     : 1039
 // 
 
@@ -46 +46 @@
 #define YYDEBUG_LEXER_TEXT (yylval)                                             // lexer loads this up each time
 #define YYDEBUG 1                                                                               // get the pretty debugging code to compile
+extern char *yytext;
 
 #undef __GNUC_MINOR__
@@ -2722 +2723 @@
             std::cout << "in file " << yyfilename << " ";
         } // if
-        std::cout << "at line " << yylineno << " reading token \"" << *(yylval.tok.str) << "\"" << std::endl;
+        std::cout << "at line " << yylineno << " reading token \"" << yytext << "\"" << std::endl;
 }
 

src/Tests/SynTree/Forall.c

@@ +1 @@
+int ?=?( int*, int );
+float ?=?( float*, float );
+int * ?=?( int **, int * );
+float * ?=?( float **, float * );
+char ?=?( char*, char );
+void (* ?=?( void (**)(void), void (*)(void) ))(void);
+
+void g1() {
+        forall( type T ) T f( T );
+        void f( int );
+        void h( void (*p)(void) );
+  
+        int x;
+        void (*y)(void);
+        char z;
+        float w;
+  
+        f( x );
+        f( y );
+        f( z );
+        f( w );
+        h( f( y ) );
+}
+
+void g2() {
+        forall( type T ) void f( T, T );
+        forall( type T, type U ) void f( T, U );
+  
+        int x;
+        float y;
+        int *z;
+        float *w;
+  
+        f( x, y );
+        f( z, w );
+        f( x, z );
+}
+
 typedef forall ( type T ) int (*f)( int );
 

src/Tests/Syntax/Attributes.c

@@ -21 +21 @@
     return 7;
 }
+
+int @voon;
+double @voon;
+
+int @bort(int);
+int @bort(double);
+
+void g( int );
+
+void f() {
+        float x;
+        double x;
+        @bort(x);
+        @bort(int);
+        g( @voon );
+}
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //