Changes in / [b29f8f3:1e8f143]

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (3 diffs)
• CodeGen/GenType.cc (modified) (3 diffs)
• ControlStruct/ForExprMutator.cc (modified) (2 diffs)
• ControlStruct/MLEMutator.cc (modified) (1 diff)
• ControlStruct/Mutate.cc (modified) (3 diffs)
• GenPoly/PolyMutator.cc (modified) (2 diffs)
• Parser/DeclarationNode.cc (modified) (2 diffs)
• Parser/ParseNode.h (modified) (6 diffs)
• Parser/StatementNode.cc (modified) (8 diffs)
• Parser/TypeData.cc (modified) (4 diffs)
• Parser/parser.cc (modified) (258 diffs)
• Parser/parser.h (modified) (1 diff)
• Parser/parser.yy (modified) (15 diffs)
• ResolvExpr/Resolver.cc (modified) (2 diffs)
• SymTab/AddVisit.h (modified) (2 diffs)
• SymTab/TypeEquality.cc (modified) (2 diffs)
• SymTab/Validate.cc (modified) (9 diffs)
• SynTree/Declaration.cc (modified) (2 diffs)
• SynTree/Declaration.h (modified) (7 diffs)
• SynTree/FunctionDecl.cc (modified) (5 diffs)
• SynTree/Mutator.cc (modified) (3 diffs)
• SynTree/Mutator.h (modified) (2 diffs)
• SynTree/ObjectDecl.cc (modified) (2 diffs)
• SynTree/Statement.cc (modified) (3 diffs)
• SynTree/Statement.h (modified) (3 diffs)
• SynTree/Type.cc (modified) (2 diffs)
• SynTree/Type.h (modified) (2 diffs)
• SynTree/Visitor.cc (modified) (2 diffs)
• driver/cc1.cc (modified) (2 diffs)
• driver/cfa.cc (modified) (3 diffs)
• main.cc (modified) (14 diffs)

src/CodeGen/CodeGenerator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jul 15 14:47:42 2015
-// Update Count     : 177
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jun 26 16:52:58 2015
+// Update Count     : 144
 //
 
@@ -38 +38 @@
         int CodeGenerator::tabsize = 4;
 
-        // the kinds of statements that would ideally be followed by whitespace
+        // the kinds of statements that would ideally be separated by more whitespace
         bool wantSpacing( Statement * stmt) {
                 return dynamic_cast< IfStmt * >( stmt ) || dynamic_cast< CompoundStmt * >( stmt ) ||
@@ -588 +588 @@
 
         void CodeGenerator::visit( ForStmt *forStmt ) {
-                // initialization is always hoisted, so don't 
-                // bother doing anything with that 
-                output << "for (;";
-
+                output << "for (";
+
+                if ( forStmt->get_initialization() != 0 )
+                        forStmt->get_initialization()->accept( *this );
+                else
+                        output << ";";
+                
                 if ( forStmt->get_condition() != 0 )
                         forStmt->get_condition()->accept( *this );

src/CodeGen/GenType.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul  9 16:43:52 2015
-// Update Count     : 13
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jul 08 16:08:24 2015
+// Update Count     : 10
 //
 
@@ -93 +93 @@
                         os << "_Atomic ";
                 } // if
-                if ( qualifiers.isAttribute ) {
-                        os << "__attribute(( )) ";
-                } // if
                 if ( dimension != 0 ) {
                         CodeGenerator cg( os );
                         dimension->accept( cg );
                 } else if ( isVarLen ) {
-                        // no dimension expression on a VLA means it came in with the * token
+                        // no dimension expression on a VLA
+                        // means it came in with the * token
                         os << "*";
                 } // if
@@ -204 +202 @@
                         typeString = "_Atomic " + typeString;
                 } // if
-                if ( type->get_isAttribute() ) {
-                        typeString = "__attribute(( )) " + typeString;
-                } // if
         }
 } // namespace CodeGen

src/ControlStruct/ForExprMutator.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jul 14 12:14:44 2015
-// Update Count     : 10
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue May 19 15:31:47 2015
+// Update Count     : 2
 //
 
@@ -22 +22 @@
                 // recurse down all nest for loops to hoist any initializer declarations to make them C89 (rather than C99)
                 forStmt->set_body( forStmt->get_body()->acceptMutator( *this ) );
+                if ( DeclStmt *decl = dynamic_cast< DeclStmt * > ( forStmt->get_initialization() ) ) {
+                        // create compound statement, move initializer declaration outside, leave _for_ as-is
+                        CompoundStmt *block = new CompoundStmt( std::list< Label >() );
+                        std::list<Statement *> &stmts = block->get_kids();
 
-                std::list<Statement *> &init = forStmt->get_initialization(); 
-                if ( init.size() == 0 ) {
-                        return forStmt;
+                        stmts.push_back( decl );
+                        forStmt->set_initialization( 0 );
+                        stmts.push_back( forStmt );
+
+                        return block;
                 } // if
-
-                // create compound statement, move initializers outside, leave _for_ as-is
-                CompoundStmt *block = new CompoundStmt( std::list< Label >() );
-                std::list<Statement *> &stmts = block->get_kids();
-                for ( std::list<Statement *>::iterator it = init.begin(); it != init.end(); ++it ) {
-                        stmts.push_back( *it );
-                }       // for
-
-                // add for to the new block
-                stmts.push_back( forStmt );
-                forStmt->set_initialization( std::list<Statement *>() );
-                return block;
 
                 return forStmt;

src/ControlStruct/MLEMutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Mon Jul 20 13:58:35 2015
-// Update Count     : 176
-//
-
-// NOTE: There are two known subtle differences from the code that uC++ 
-// generates for the same input
-// -CFA puts the break label inside at the end of a switch, uC++ puts it after
-// -CFA puts the break label after a block, uC++ puts it inside at the end
-// we don't yet know if these differences are important, but if they are then
-// the fix would go in this file, since this is where these labels are generated.
+// Last Modified On : Sat Jun 27 10:56:14 2015
+// Update Count     : 174
+//
 
 #include <cassert>

src/ControlStruct/Mutate.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jul 15 14:50:04 2015
-// Update Count     : 7
+// Last Modified On : Wed Jun 03 23:08:43 2015
+// Update Count     : 5
 //
 
@@ -36 +36 @@
 namespace ControlStruct {
         void mutate( std::list< Declaration * > translationUnit ) {
-                // hoist initialization out of for statements
-                ForExprMutator formut;
+                // ForExprMutator formut;
 
                 // normalizes label definitions and generates multi-level
@@ -52 +51 @@
                 // LabelTypeChecker lbl;
 
-                mutateAll( translationUnit, formut );
+                // mutateAll( translationUnit, formut );
                 acceptAll( translationUnit, lfix );
                 mutateAll( translationUnit, chmut );

src/GenPoly/PolyMutator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jul 15 14:50:58 2015
-// Update Count     : 3
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue May 19 07:45:50 2015
+// Update Count     : 1
 //
 
@@ -92 +92 @@
         Statement * PolyMutator::mutate(ForStmt *forStmt) {
                 forStmt->set_body(  mutateStatement( forStmt->get_body() ) );
-                mutateAll( forStmt->get_initialization(), *this );
+                forStmt->set_initialization(  maybeMutate( forStmt->get_initialization(), *this ) );
                 forStmt->set_condition(  mutateExpression( forStmt->get_condition() ) );
                 forStmt->set_increment(  mutateExpression( forStmt->get_increment() ) );

src/Parser/DeclarationNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 12:34:05 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 14 14:46:32 2015
-// Update Count     : 126
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jul 08 16:40:37 2015
+// Update Count     : 121
 //
 
@@ -472 +472 @@
                 if ( o->get_link() ) {
                         set_link( o->get_link()->clone() );
-                } // if
+                }
+
         } // if
         delete o;

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 14 14:58:25 2015
-// Update Count     : 91
+// Last Modified On : Thu Jul  2 17:57:05 2015
+// Update Count     : 84
 //
 
@@ -265 +265 @@
 class DeclarationNode : public ParseNode {
   public:
-        enum Qualifier { Const, Restrict, Volatile, Lvalue, Atomic };
+        enum Qualifier { Const, Restrict, Volatile, Lvalue, Atomic, Attribute };
         enum StorageClass { Extern, Static, Auto, Register, Inline, Fortran, Noreturn, Threadlocal, NoStorageClass, };
         enum BasicType { Char, Int, Float, Double, Void, Bool, Complex, Imaginary };
@@ -352 +352 @@
         std::string name;
         std::list< StorageClass > storageClasses;
-        std::list< std::string > attributes;
         ExpressionNode *bitfieldWidth;
         InitializerNode *initializer;
@@ -359 +358 @@
 
         static UniqueName anonymous;
-}; // DeclarationNode
+};
 
 class StatementNode : public ParseNode {
@@ -381 +380 @@
         static StatementNode *newCatchStmt( DeclarationNode *d = 0, StatementNode *s = 0, bool catchRestP = false );
 
-        StatementNode *set_block( StatementNode *b ) {  block = b; return this; }
-        StatementNode *get_block() const { return block; }
-
-        void set_control( ExpressionNode *c ) { control = c; }
-        ExpressionNode *get_control() const { return control; }
-
-        StatementNode::Type get_type() const { return type; }
+        void set_control( ExpressionNode * );
+        StatementNode * set_block( StatementNode * );
+
+        ExpressionNode *get_control() const ;
+        StatementNode *get_block() const;
+        StatementNode::Type get_type() const;
 
         StatementNode *add_label( const std::string * );
-        const std::list<std::string> &get_labels() const { return labels; }
+        std::list<std::string> *get_labels() const;
 
         void addDeclaration( DeclarationNode *newDecl ) { decl = newDecl; }
@@ -411 +409 @@
         ExpressionNode *control;
         StatementNode *block;
-        std::list<std::string> labels;
+        std::list<std::string> *labels;
         std::string *target;                            // target label for jump statements
         DeclarationNode *decl;
 
         bool isCatchRest;
-}; // StatementNode
+};
 
 class CompoundStmtNode : public StatementNode {

src/Parser/StatementNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 16 16:20:24 2015
-// Update Count     : 30
+// Last Modified On : Sat Jun  6 23:25:41 2015
+// Update Count     : 19
 //
 
@@ -72 +72 @@
         delete control;
         delete block;
+        delete labels;
         delete target;
         delete decl;
@@ -102 +103 @@
 }
 
+void StatementNode::set_control( ExpressionNode *c ) {
+        control = c;
+}
+
+StatementNode * StatementNode::set_block( StatementNode *b ) {
+        block = b;
+
+        return this;
+}
+
+ExpressionNode *StatementNode::get_control() const {
+        return control;
+}
+
+StatementNode *StatementNode::get_block() const {
+        return block;
+}
+
+StatementNode::Type StatementNode::get_type() const {
+        return type;
+}
+
 StatementNode *StatementNode::add_label( const std::string *l ) {
         if ( l != 0 ) {
-                labels.push_front( *l ); 
+                if ( labels == 0 )
+                        labels = new std::list<std::string>();
+
+                labels->push_front(*l ); 
                 delete l;
         } // if
         return this;
 }
+
+std::list<std::string> *StatementNode::get_labels() const { return labels; }
 
 StatementNode *StatementNode::add_controlexp( ExpressionNode *e ) {
@@ -142 +170 @@
 
 void StatementNode::print( std::ostream &os, int indent ) const {
-        if ( ! labels.empty()) {
-                std::list<std::string>::const_iterator i;
-
-                os << string( indent, ' ' );
-                for ( i = labels.begin(); i != labels.end(); i++ )
-                        os << *i << ":";
-                os << endl;
+        if ( labels != 0 ) {
+                if ( ! labels->empty()) {
+                        std::list<std::string>::const_iterator i;
+
+                        os << string( indent, ' ' );
+                        for ( i = labels->begin(); i != labels->end(); i++ )
+                                os << *i << ":";
+                        os << endl;
+                } // if
         } // if
 
@@ -195 +225 @@
         std::list<Label> labs;
 
-        if ( ! labels.empty() ) {
+        if ( labels != 0 ) {
                 std::back_insert_iterator< std::list<Label> > lab_it( labs );
-                copy( labels.begin(), labels.end(), lab_it );
+                copy( labels->begin(), labels->end(), lab_it );
         } // if
 
@@ -241 +271 @@
                         assert( ctl != 0 );
 
-                        std::list<Statement *> init;
-                        if ( ctl->get_init() != 0 ) {
-                                buildList( ctl->get_init(), init );
-                        } // if
+                        Statement *stmt = 0;
+                        if ( ctl->get_init() != 0 )
+                                stmt = ctl->get_init()->build();
 
                         Expression *cond = 0;
@@ -254 +283 @@
                                 incr = ctl->get_change()->build();
 
-                        return new ForStmt( labs, init, cond, incr, branches.front() );
+                        return new ForStmt( labs, stmt, cond, incr, branches.front() );
                 }
           case Switch:
@@ -348 +377 @@
 Statement *CompoundStmtNode::build() const {
         std::list<Label> labs;
-        const std::list<std::string> &labels = get_labels();
-
-        if ( ! labels.empty() ) {
+        std::list<std::string> *labels = get_labels();
+
+        if ( labels != 0 ) {
                 std::back_insert_iterator< std::list<Label> > lab_it( labs );
-                copy( labels.begin(), labels.end(), lab_it );
+                copy( labels->begin(), labels->end(), lab_it );
         } // if
 

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 14 14:57:23 2015
-// Update Count     : 32
+// Last Modified On : Fri Jun 26 07:30:06 2015
+// Update Count     : 26
 //
 
@@ -397 +397 @@
                 } // if
                 break;
-          default:
-                os << "internal error: TypeData::print " << kind  << endl;
-                assert( false );
         } // switch
 }
@@ -477 +474 @@
                 return buildVariable();
         } else {
-                return new ObjectDecl( name, sc, linkage, bitfieldWidth, build(), init, isInline, isNoreturn );
+                if ( isInline || isNoreturn ) {
+                        throw SemanticError( "invalid inline or _Noreturn specification in declaration of ", this );
+                } else {
+                        return new ObjectDecl( name, sc, linkage, bitfieldWidth, build(), init );
+                } // if
         } // if
         return 0;
@@ -535 +536 @@
                   case DeclarationNode::Atomic:
                         q.isAtomic = true;
+                        break;
+                  case DeclarationNode::Attribute:
+                        q.isAttribute = true;
                         break;
                 } // switch

src/Parser/parser.cc

@@ -80 +80 @@
 #include "lex.h"
 #include "ParseNode.h"
-#include "TypeData.h"
 #include "LinkageSpec.h"
 
@@ -90 +89 @@
 
 /* Line 268 of yacc.c  */
-#line 93 "Parser/parser.cc"
+#line 92 "Parser/parser.cc"
 
 /* Enabling traces.  */
@@ -325 +324 @@
 
 /* Line 293 of yacc.c  */
-#line 108 "parser.yy"
+#line 107 "parser.yy"
 
         Token tok;
@@ -340 +339 @@
 
 /* Line 293 of yacc.c  */
-#line 343 "Parser/parser.cc"
+#line 342 "Parser/parser.cc"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
@@ -352 +351 @@
 
 /* Line 343 of yacc.c  */
-#line 355 "Parser/parser.cc"
+#line 354 "Parser/parser.cc"
 
 #ifdef short
@@ -983 +982 @@
 static const yytype_uint16 yyrline[] =
 {
-       0,   282,   282,   288,   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,   631,   633,   643,
-     644,   649,   651,   653,   655,   659,   660,   665,   670,   673,
-     675,   677,   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,   786,   790,   793,   797,
-     799,   801,   806,   808,   810,   819,   821,   823,   828,   830,
-     835,   848,   849,   854,   856,   861,   865,   867,   869,   871,
-     875,   877,   881,   882,   886,   890,   891,   897,   899,   903,
-     904,   909,   911,   915,   916,   920,   922,   926,   927,   931,
-     932,   936,   937,   952,   953,   954,   955,   956,   960,   965,
-     972,   982,   987,   992,  1000,  1005,  1010,  1015,  1020,  1028,
-    1050,  1055,  1062,  1064,  1071,  1076,  1081,  1092,  1097,  1102,
-    1107,  1112,  1121,  1126,  1134,  1135,  1136,  1137,  1143,  1148,
-    1156,  1157,  1158,  1159,  1163,  1164,  1165,  1166,  1171,  1172,
-    1181,  1182,  1187,  1188,  1193,  1195,  1197,  1199,  1201,  1204,
-    1203,  1215,  1216,  1218,  1228,  1229,  1234,  1238,  1240,  1242,
-    1244,  1246,  1248,  1250,  1252,  1257,  1259,  1261,  1263,  1265,
-    1267,  1269,  1271,  1273,  1275,  1277,  1279,  1285,  1286,  1288,
-    1290,  1292,  1297,  1298,  1304,  1305,  1307,  1309,  1314,  1316,
-    1318,  1320,  1325,  1326,  1328,  1330,  1335,  1336,  1338,  1343,
-    1344,  1346,  1348,  1353,  1355,  1357,  1362,  1363,  1367,  1369,
-    1371,  1373,  1375,  1380,  1382,  1387,  1389,  1394,  1395,  1397,
-    1398,  1403,  1404,  1406,  1408,  1413,  1415,  1421,  1422,  1424,
-    1427,  1430,  1435,  1436,  1441,  1446,  1450,  1452,  1454,  1459,
-    1461,  1467,  1468,  1476,  1477,  1481,  1482,  1483,  1485,  1487,
-    1494,  1495,  1497,  1499,  1504,  1505,  1511,  1512,  1516,  1517,
-    1522,  1523,  1524,  1526,  1534,  1535,  1537,  1540,  1542,  1546,
-    1547,  1548,  1550,  1552,  1556,  1561,  1569,  1570,  1579,  1581,
-    1586,  1587,  1588,  1592,  1593,  1594,  1598,  1599,  1600,  1604,
-    1605,  1606,  1611,  1612,  1613,  1614,  1620,  1621,  1626,  1627,
-    1631,  1632,  1633,  1634,  1649,  1650,  1655,  1656,  1662,  1664,
-    1667,  1669,  1671,  1694,  1695,  1697,  1699,  1704,  1705,  1707,
-    1712,  1717,  1718,  1724,  1723,  1727,  1731,  1733,  1735,  1741,
-    1742,  1747,  1752,  1754,  1759,  1761,  1762,  1764,  1769,  1771,
-    1773,  1778,  1780,  1785,  1790,  1798,  1804,  1803,  1817,  1818,
-    1823,  1824,  1828,  1833,  1838,  1846,  1851,  1862,  1863,  1874,
-    1875,  1881,  1882,  1886,  1887,  1888,  1891,  1890,  1901,  1906,
-    1911,  1917,  1926,  1932,  1938,  1944,  1950,  1958,  1964,  1972,
-    1978,  1987,  1988,  1989,  1993,  1997,  1999,  2004,  2005,  2009,
-    2010,  2015,  2021,  2022,  2025,  2027,  2028,  2032,  2033,  2034,
-    2035,  2069,  2071,  2072,  2074,  2079,  2084,  2089,  2091,  2093,
-    2098,  2100,  2102,  2104,  2109,  2111,  2121,  2123,  2124,  2129,
-    2131,  2133,  2138,  2140,  2142,  2147,  2149,  2151,  2160,  2161,
-    2162,  2166,  2168,  2170,  2175,  2177,  2179,  2184,  2186,  2188,
-    2203,  2205,  2206,  2208,  2213,  2214,  2219,  2221,  2223,  2228,
-    2230,  2232,  2234,  2239,  2241,  2243,  2253,  2255,  2256,  2258,
-    2263,  2265,  2267,  2272,  2274,  2276,  2278,  2283,  2285,  2287,
-    2318,  2320,  2321,  2323,  2328,  2333,  2341,  2343,  2345,  2350,
-    2352,  2357,  2359,  2373,  2374,  2376,  2381,  2383,  2385,  2387,
-    2389,  2394,  2395,  2397,  2399,  2404,  2406,  2408,  2414,  2416,
-    2418,  2422,  2424,  2426,  2428,  2442,  2443,  2445,  2450,  2452,
-    2454,  2456,  2458,  2463,  2464,  2466,  2468,  2473,  2475,  2477,
-    2483,  2484,  2486,  2495,  2498,  2500,  2503,  2505,  2507,  2520,
-    2521,  2523,  2528,  2530,  2532,  2534,  2536,  2541,  2542,  2544,
-    2546,  2551,  2553,  2561,  2562,  2563,  2568,  2569,  2573,  2575,
-    2577,  2579,  2581,  2583,  2590,  2592,  2594,  2596,  2598,  2600,
-    2602,  2604,  2606,  2608,  2613,  2615,  2617,  2622,  2648,  2649,
-    2651,  2655,  2656,  2660,  2662,  2664,  2666,  2668,  2670,  2677,
-    2679,  2681,  2683,  2685,  2687,  2692,  2697,  2699,  2701,  2719,
-    2721,  2726,  2727
+       0,   279,   279,   285,   294,   295,   296,   300,   301,   302,
+     306,   307,   311,   315,   316,   320,   321,   327,   329,   331,
+     333,   335,   337,   342,   343,   349,   351,   353,   354,   356,
+     357,   359,   362,   367,   368,   374,   375,   376,   381,   383,
+     388,   389,   393,   395,   397,   399,   401,   406,   407,   409,
+     411,   413,   415,   417,   423,   425,   427,   429,   431,   433,
+     435,   437,   442,   443,   444,   445,   449,   450,   452,   457,
+     458,   460,   462,   467,   468,   470,   475,   476,   478,   483,
+     484,   486,   488,   490,   495,   496,   498,   503,   504,   509,
+     510,   515,   516,   521,   522,   527,   528,   533,   534,   536,
+     538,   543,   548,   549,   551,   553,   559,   560,   566,   568,
+     570,   572,   577,   578,   583,   584,   585,   586,   587,   588,
+     589,   590,   591,   592,   596,   597,   603,   604,   610,   611,
+     612,   613,   614,   615,   616,   617,   621,   626,   628,   638,
+     639,   644,   646,   648,   650,   654,   655,   660,   665,   668,
+     670,   672,   677,   679,   687,   688,   690,   694,   695,   700,
+     701,   706,   707,   711,   716,   717,   721,   723,   729,   730,
+     734,   736,   738,   740,   746,   747,   751,   752,   756,   758,
+     760,   765,   767,   772,   774,   778,   781,   785,   788,   792,
+     794,   796,   801,   803,   805,   814,   816,   818,   823,   825,
+     830,   843,   844,   849,   851,   856,   860,   862,   864,   866,
+     870,   872,   876,   877,   881,   885,   886,   892,   894,   898,
+     899,   904,   906,   910,   911,   915,   917,   921,   922,   926,
+     927,   931,   932,   947,   948,   949,   950,   951,   955,   960,
+     967,   977,   982,   987,   995,  1000,  1005,  1010,  1015,  1023,
+    1045,  1050,  1057,  1059,  1066,  1071,  1076,  1087,  1092,  1097,
+    1102,  1107,  1116,  1121,  1129,  1130,  1131,  1132,  1138,  1143,
+    1151,  1152,  1153,  1154,  1158,  1159,  1160,  1161,  1166,  1167,
+    1176,  1177,  1182,  1183,  1188,  1190,  1192,  1194,  1196,  1199,
+    1198,  1210,  1211,  1213,  1223,  1224,  1229,  1233,  1235,  1237,
+    1239,  1241,  1243,  1245,  1247,  1252,  1254,  1256,  1258,  1260,
+    1262,  1264,  1266,  1268,  1270,  1272,  1274,  1280,  1281,  1283,
+    1285,  1287,  1292,  1293,  1299,  1300,  1302,  1304,  1309,  1311,
+    1313,  1315,  1320,  1321,  1323,  1325,  1330,  1331,  1333,  1338,
+    1339,  1341,  1343,  1348,  1350,  1352,  1357,  1358,  1362,  1364,
+    1366,  1368,  1370,  1375,  1377,  1382,  1384,  1389,  1390,  1392,
+    1393,  1398,  1399,  1401,  1403,  1408,  1410,  1416,  1417,  1419,
+    1422,  1425,  1430,  1431,  1436,  1441,  1445,  1447,  1449,  1454,
+    1456,  1462,  1463,  1471,  1472,  1476,  1477,  1478,  1480,  1482,
+    1489,  1490,  1492,  1494,  1499,  1500,  1506,  1507,  1511,  1512,
+    1517,  1518,  1519,  1521,  1529,  1530,  1532,  1535,  1537,  1541,
+    1542,  1543,  1545,  1547,  1551,  1556,  1564,  1565,  1574,  1576,
+    1581,  1582,  1583,  1587,  1588,  1589,  1593,  1594,  1595,  1599,
+    1600,  1601,  1606,  1607,  1608,  1609,  1615,  1616,  1621,  1622,
+    1626,  1627,  1628,  1629,  1644,  1645,  1650,  1651,  1657,  1659,
+    1662,  1664,  1666,  1689,  1690,  1692,  1694,  1699,  1700,  1702,
+    1707,  1712,  1713,  1719,  1718,  1722,  1726,  1728,  1730,  1736,
+    1737,  1742,  1747,  1749,  1754,  1756,  1757,  1759,  1764,  1766,
+    1768,  1773,  1775,  1780,  1785,  1793,  1799,  1798,  1812,  1813,
+    1818,  1819,  1823,  1828,  1833,  1841,  1846,  1857,  1858,  1869,
+    1870,  1876,  1877,  1881,  1882,  1883,  1886,  1885,  1896,  1901,
+    1906,  1912,  1921,  1927,  1933,  1939,  1945,  1953,  1959,  1967,
+    1973,  1982,  1983,  1984,  1988,  1992,  1994,  1997,  1999,  2003,
+    2004,  2008,  2012,  2013,  2016,  2018,  2019,  2023,  2024,  2025,
+    2026,  2060,  2061,  2062,  2063,  2067,  2072,  2077,  2079,  2081,
+    2086,  2088,  2090,  2092,  2097,  2099,  2109,  2110,  2111,  2115,
+    2117,  2119,  2124,  2126,  2128,  2133,  2135,  2137,  2146,  2147,
+    2148,  2152,  2154,  2156,  2161,  2163,  2165,  2170,  2172,  2174,
+    2189,  2190,  2191,  2192,  2196,  2197,  2202,  2204,  2206,  2211,
+    2213,  2215,  2217,  2222,  2224,  2226,  2236,  2237,  2238,  2239,
+    2243,  2245,  2247,  2252,  2254,  2256,  2258,  2263,  2265,  2267,
+    2298,  2299,  2300,  2301,  2305,  2310,  2318,  2320,  2322,  2327,
+    2329,  2334,  2336,  2350,  2351,  2352,  2356,  2358,  2360,  2362,
+    2364,  2369,  2370,  2372,  2374,  2379,  2381,  2383,  2389,  2391,
+    2393,  2397,  2399,  2401,  2403,  2417,  2418,  2419,  2423,  2425,
+    2427,  2429,  2431,  2436,  2437,  2439,  2441,  2446,  2448,  2450,
+    2456,  2457,  2459,  2468,  2471,  2473,  2476,  2478,  2480,  2493,
+    2494,  2495,  2499,  2501,  2503,  2505,  2507,  2512,  2513,  2515,
+    2517,  2522,  2524,  2532,  2533,  2534,  2539,  2540,  2544,  2546,
+    2548,  2550,  2552,  2554,  2561,  2563,  2565,  2567,  2569,  2571,
+    2573,  2575,  2577,  2579,  2584,  2586,  2588,  2593,  2619,  2620,
+    2622,  2626,  2627,  2631,  2633,  2635,  2637,  2639,  2641,  2648,
+    2650,  2652,  2654,  2656,  2658,  2663,  2668,  2670,  2672,  2690,
+    2692,  2697,  2698
 };
 #endif
@@ -5008 +5007 @@
 
 /* Line 1806 of yacc.c  */
-#line 282 "parser.yy"
+#line 279 "parser.yy"
     {
                         typedefTable.enterScope();
@@ -5017 +5016 @@
 
 /* Line 1806 of yacc.c  */
-#line 288 "parser.yy"
+#line 285 "parser.yy"
     {
                         typedefTable.leaveScope();
@@ -5026 +5025 @@
 
 /* Line 1806 of yacc.c  */
-#line 297 "parser.yy"
+#line 294 "parser.yy"
     { (yyval.constant) = new ConstantNode( ConstantNode::Integer, (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -5033 +5032 @@
 
 /* Line 1806 of yacc.c  */
-#line 298 "parser.yy"
+#line 295 "parser.yy"
     { (yyval.constant) = new ConstantNode( ConstantNode::Float, (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -5040 +5039 @@
 
 /* Line 1806 of yacc.c  */
-#line 299 "parser.yy"
+#line 296 "parser.yy"
     { (yyval.constant) = new ConstantNode( ConstantNode::Character, (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -5047 +5046 @@
 
 /* Line 1806 of yacc.c  */
-#line 323 "parser.yy"
+#line 320 "parser.yy"
     { (yyval.constant) = new ConstantNode( ConstantNode::String, (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -5054 +5053 @@
 
 /* Line 1806 of yacc.c  */
-#line 324 "parser.yy"
+#line 321 "parser.yy"
     { (yyval.constant) = (yyvsp[(1) - (2)].constant)->appendstr( (yyvsp[(2) - (2)].tok) ); }
     break;
@@ -5061 +5060 @@
 
 /* Line 1806 of yacc.c  */
-#line 331 "parser.yy"
+#line 328 "parser.yy"
     { (yyval.en) = new VarRefNode( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -5068 +5067 @@
 
 /* Line 1806 of yacc.c  */
-#line 333 "parser.yy"
+#line 330 "parser.yy"
     { (yyval.en) = new VarRefNode( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -5075 +5074 @@
 
 /* Line 1806 of yacc.c  */
-#line 335 "parser.yy"
+#line 332 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].constant); }
     break;
@@ -5082 +5081 @@
 
 /* Line 1806 of yacc.c  */
-#line 337 "parser.yy"
+#line 334 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].constant); }
     break;
@@ -5089 +5088 @@
 
 /* Line 1806 of yacc.c  */
-#line 339 "parser.yy"
+#line 336 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (3)].en); }
     break;
@@ -5096 +5095 @@
 
 /* Line 1806 of yacc.c  */
-#line 341 "parser.yy"
+#line 338 "parser.yy"
     { (yyval.en) = new ValofExprNode( (yyvsp[(2) - (3)].sn) ); }
     break;
@@ -5103 +5102 @@
 
 /* Line 1806 of yacc.c  */
-#line 351 "parser.yy"
+#line 348 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Index ), (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en) ); }
     break;
@@ -5110 +5109 @@
 
 /* Line 1806 of yacc.c  */
-#line 353 "parser.yy"
+#line 350 "parser.yy"
     { (yyval.en) = new CompositeExprNode( (yyvsp[(1) - (4)].en), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -5117 +5116 @@
 
 /* Line 1806 of yacc.c  */
+#line 352 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::FieldSel ), (yyvsp[(1) - (3)].en), new VarRefNode( (yyvsp[(3) - (3)].tok) )); }
+    break;
+
+  case 28:
+
+/* Line 1806 of yacc.c  */
 #line 355 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::FieldSel ), (yyvsp[(1) - (3)].en), new VarRefNode( (yyvsp[(3) - (3)].tok) )); }
-    break;
-
-  case 28:
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::PFieldSel ), (yyvsp[(1) - (3)].en), new VarRefNode( (yyvsp[(3) - (3)].tok) )); }
+    break;
+
+  case 30:
 
 /* Line 1806 of yacc.c  */
 #line 358 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::PFieldSel ), (yyvsp[(1) - (3)].en), new VarRefNode( (yyvsp[(3) - (3)].tok) )); }
-    break;
-
-  case 30:
-
-/* Line 1806 of yacc.c  */
-#line 361 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::IncrPost ), (yyvsp[(1) - (2)].en) ); }
     break;
@@ -5138 +5137 @@
 
 /* Line 1806 of yacc.c  */
+#line 360 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::DecrPost ), (yyvsp[(1) - (2)].en) ); }
+    break;
+
+  case 32:
+
+/* Line 1806 of yacc.c  */
 #line 363 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::DecrPost ), (yyvsp[(1) - (2)].en) ); }
-    break;
-
-  case 32:
-
-/* Line 1806 of yacc.c  */
-#line 366 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -5152 +5151 @@
 
 /* Line 1806 of yacc.c  */
-#line 372 "parser.yy"
+#line 369 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) )); }
     break;
@@ -5159 +5158 @@
 
 /* Line 1806 of yacc.c  */
+#line 374 "parser.yy"
+    { (yyval.en) = 0; }
+    break;
+
+  case 37:
+
+/* Line 1806 of yacc.c  */
 #line 377 "parser.yy"
+    { (yyval.en) = (yyvsp[(3) - (3)].en)->set_asArgName( (yyvsp[(1) - (3)].tok) ); }
+    break;
+
+  case 38:
+
+/* Line 1806 of yacc.c  */
+#line 382 "parser.yy"
+    { (yyval.en) = (yyvsp[(7) - (7)].en)->set_asArgName( (yyvsp[(3) - (7)].en) ); }
+    break;
+
+  case 39:
+
+/* Line 1806 of yacc.c  */
+#line 384 "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;
+
+  case 41:
+
+/* Line 1806 of yacc.c  */
+#line 389 "parser.yy"
+    { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 42:
+
+/* Line 1806 of yacc.c  */
+#line 394 "parser.yy"
+    { (yyval.en) = new VarRefNode( (yyvsp[(1) - (1)].tok) ); }
+    break;
+
+  case 43:
+
+/* Line 1806 of yacc.c  */
+#line 396 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::FieldSel ), new VarRefNode( (yyvsp[(1) - (3)].tok) ), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 44:
+
+/* Line 1806 of yacc.c  */
+#line 398 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::FieldSel ), new VarRefNode( (yyvsp[(1) - (7)].tok) ), (yyvsp[(5) - (7)].en) ); }
+    break;
+
+  case 45:
+
+/* Line 1806 of yacc.c  */
+#line 400 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::PFieldSel ), new VarRefNode( (yyvsp[(1) - (3)].tok) ), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 46:
+
+/* Line 1806 of yacc.c  */
+#line 402 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::PFieldSel ), new VarRefNode( (yyvsp[(1) - (7)].tok) ), (yyvsp[(5) - (7)].en) ); }
+    break;
+
+  case 48:
+
+/* Line 1806 of yacc.c  */
+#line 408 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Incr ), (yyvsp[(2) - (2)].en) ); }
+    break;
+
+  case 49:
+
+/* Line 1806 of yacc.c  */
+#line 410 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Decr ), (yyvsp[(2) - (2)].en) ); }
+    break;
+
+  case 50:
+
+/* Line 1806 of yacc.c  */
+#line 412 "parser.yy"
+    { (yyval.en) = (yyvsp[(2) - (2)].en); }
+    break;
+
+  case 51:
+
+/* Line 1806 of yacc.c  */
+#line 414 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( (yyvsp[(1) - (2)].en), (yyvsp[(2) - (2)].en) ); }
+    break;
+
+  case 52:
+
+/* Line 1806 of yacc.c  */
+#line 416 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Neg ), (yyvsp[(2) - (2)].en) ); }
+    break;
+
+  case 53:
+
+/* Line 1806 of yacc.c  */
+#line 418 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::PointTo ), (yyvsp[(2) - (2)].en) ); }
+    break;
+
+  case 54:
+
+/* Line 1806 of yacc.c  */
+#line 424 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::SizeOf ), (yyvsp[(2) - (2)].en) ); }
+    break;
+
+  case 55:
+
+/* Line 1806 of yacc.c  */
+#line 426 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::SizeOf ), new TypeValueNode( (yyvsp[(3) - (4)].decl) )); }
+    break;
+
+  case 56:
+
+/* Line 1806 of yacc.c  */
+#line 428 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( (yyvsp[(1) - (1)].tok) )); }
+    break;
+
+  case 57:
+
+/* Line 1806 of yacc.c  */
+#line 430 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( (yyvsp[(1) - (4)].tok) ), new TypeValueNode( (yyvsp[(3) - (4)].decl) )); }
+    break;
+
+  case 58:
+
+/* Line 1806 of yacc.c  */
+#line 432 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( (yyvsp[(1) - (4)].tok) ), (yyvsp[(3) - (4)].en) ); }
+    break;
+
+  case 59:
+
+/* Line 1806 of yacc.c  */
+#line 434 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::AlignOf ), (yyvsp[(2) - (2)].en) ); }
+    break;
+
+  case 60:
+
+/* Line 1806 of yacc.c  */
+#line 436 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::AlignOf ), new TypeValueNode( (yyvsp[(3) - (4)].decl) )); }
+    break;
+
+  case 61:
+
+/* Line 1806 of yacc.c  */
+#line 438 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::LabelAddress ), new VarRefNode( (yyvsp[(2) - (2)].tok), true )); }
+    break;
+
+  case 62:
+
+/* Line 1806 of yacc.c  */
+#line 442 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::AddressOf ); }
+    break;
+
+  case 63:
+
+/* Line 1806 of yacc.c  */
+#line 443 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::UnPlus ); }
+    break;
+
+  case 64:
+
+/* Line 1806 of yacc.c  */
+#line 444 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::UnMinus ); }
+    break;
+
+  case 65:
+
+/* Line 1806 of yacc.c  */
+#line 445 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::BitNeg ); }
+    break;
+
+  case 67:
+
+/* Line 1806 of yacc.c  */
+#line 451 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Cast ), new TypeValueNode( (yyvsp[(2) - (4)].decl) ), (yyvsp[(4) - (4)].en) ); }
+    break;
+
+  case 68:
+
+/* Line 1806 of yacc.c  */
+#line 453 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Cast ), new TypeValueNode( (yyvsp[(2) - (4)].decl) ), (yyvsp[(4) - (4)].en) ); }
+    break;
+
+  case 70:
+
+/* Line 1806 of yacc.c  */
+#line 459 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Mul ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 71:
+
+/* Line 1806 of yacc.c  */
+#line 461 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Div ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 72:
+
+/* Line 1806 of yacc.c  */
+#line 463 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Mod ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 74:
+
+/* Line 1806 of yacc.c  */
+#line 469 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Plus ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 75:
+
+/* Line 1806 of yacc.c  */
+#line 471 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Minus ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 77:
+
+/* Line 1806 of yacc.c  */
+#line 477 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::LShift ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 78:
+
+/* Line 1806 of yacc.c  */
+#line 479 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::RShift ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 80:
+
+/* Line 1806 of yacc.c  */
+#line 485 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::LThan ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 81:
+
+/* Line 1806 of yacc.c  */
+#line 487 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::GThan ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 82:
+
+/* Line 1806 of yacc.c  */
+#line 489 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::LEThan ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 83:
+
+/* Line 1806 of yacc.c  */
+#line 491 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::GEThan ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 85:
+
+/* Line 1806 of yacc.c  */
+#line 497 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Eq ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 86:
+
+/* Line 1806 of yacc.c  */
+#line 499 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Neq ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 88:
+
+/* Line 1806 of yacc.c  */
+#line 505 "parser.yy"
+    { (yyval.en) =new CompositeExprNode( new OperatorNode( OperatorNode::BitAnd ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 90:
+
+/* Line 1806 of yacc.c  */
+#line 511 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Xor ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 92:
+
+/* Line 1806 of yacc.c  */
+#line 517 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::BitOr ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 94:
+
+/* Line 1806 of yacc.c  */
+#line 523 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::And ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 96:
+
+/* Line 1806 of yacc.c  */
+#line 529 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Or ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 98:
+
+/* Line 1806 of yacc.c  */
+#line 535 "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;
+
+  case 99:
+
+/* Line 1806 of yacc.c  */
+#line 537 "parser.yy"
+    { (yyval.en)=new CompositeExprNode( new OperatorNode( OperatorNode::NCond ), (yyvsp[(1) - (4)].en), (yyvsp[(4) - (4)].en) ); }
+    break;
+
+  case 100:
+
+/* Line 1806 of yacc.c  */
+#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;
+
+  case 103:
+
+/* Line 1806 of yacc.c  */
+#line 550 "parser.yy"
+    { (yyval.en) =new CompositeExprNode( new OperatorNode( OperatorNode::Assign ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 104:
+
+/* Line 1806 of yacc.c  */
+#line 552 "parser.yy"
+    { (yyval.en) =new CompositeExprNode( (yyvsp[(2) - (3)].en), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 105:
+
+/* Line 1806 of yacc.c  */
+#line 554 "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;
+
+  case 106:
+
+/* Line 1806 of yacc.c  */
+#line 559 "parser.yy"
+    { (yyval.en) = new NullExprNode; }
+    break;
+
+  case 108:
+
+/* Line 1806 of yacc.c  */
+#line 567 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ) ); }
+    break;
+
+  case 109:
+
+/* Line 1806 of yacc.c  */
+#line 569 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (yyvsp[(3) - (5)].en) ); }
+    break;
+
+  case 110:
+
+/* Line 1806 of yacc.c  */
+#line 571 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(new NullExprNode)->set_link( (yyvsp[(4) - (6)].en) ) ); }
+    break;
+
+  case 111:
+
+/* Line 1806 of yacc.c  */
+#line 573 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(yyvsp[(3) - (7)].en)->set_link( flattenCommas( (yyvsp[(5) - (7)].en) ) ) ); }
+    break;
+
+  case 113:
+
+/* Line 1806 of yacc.c  */
+#line 579 "parser.yy"
+    { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 114:
+
+/* Line 1806 of yacc.c  */
+#line 583 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::MulAssn ); }
+    break;
+
+  case 115:
+
+/* Line 1806 of yacc.c  */
+#line 584 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::DivAssn ); }
+    break;
+
+  case 116:
+
+/* Line 1806 of yacc.c  */
+#line 585 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::ModAssn ); }
+    break;
+
+  case 117:
+
+/* Line 1806 of yacc.c  */
+#line 586 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::PlusAssn ); }
+    break;
+
+  case 118:
+
+/* Line 1806 of yacc.c  */
+#line 587 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::MinusAssn ); }
+    break;
+
+  case 119:
+
+/* Line 1806 of yacc.c  */
+#line 588 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::LSAssn ); }
+    break;
+
+  case 120:
+
+/* Line 1806 of yacc.c  */
+#line 589 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::RSAssn ); }
+    break;
+
+  case 121:
+
+/* Line 1806 of yacc.c  */
+#line 590 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::AndAssn ); }
+    break;
+
+  case 122:
+
+/* Line 1806 of yacc.c  */
+#line 591 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::ERAssn ); }
+    break;
+
+  case 123:
+
+/* Line 1806 of yacc.c  */
+#line 592 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::OrAssn ); }
+    break;
+
+  case 125:
+
+/* Line 1806 of yacc.c  */
+#line 598 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Comma ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 126:
+
+/* Line 1806 of yacc.c  */
+#line 603 "parser.yy"
     { (yyval.en) = 0; }
     break;
 
-  case 37:
-
-/* Line 1806 of yacc.c  */
-#line 380 "parser.yy"
-    { (yyval.en) = (yyvsp[(3) - (3)].en)->set_asArgName( (yyvsp[(1) - (3)].tok) ); }
-    break;
-
-  case 38:
-
-/* Line 1806 of yacc.c  */
-#line 385 "parser.yy"
-    { (yyval.en) = (yyvsp[(7) - (7)].en)->set_asArgName( (yyvsp[(3) - (7)].en) ); }
-    break;
-
-  case 39:
-
-/* Line 1806 of yacc.c  */
-#line 387 "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;
-
-  case 41:
-
-/* Line 1806 of yacc.c  */
-#line 392 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 42:
-
-/* Line 1806 of yacc.c  */
-#line 397 "parser.yy"
-    { (yyval.en) = new VarRefNode( (yyvsp[(1) - (1)].tok) ); }
-    break;
-
-  case 43:
-
-/* Line 1806 of yacc.c  */
-#line 399 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::FieldSel ), new VarRefNode( (yyvsp[(1) - (3)].tok) ), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 44:
-
-/* Line 1806 of yacc.c  */
-#line 401 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::FieldSel ), new VarRefNode( (yyvsp[(1) - (7)].tok) ), (yyvsp[(5) - (7)].en) ); }
-    break;
-
-  case 45:
-
-/* Line 1806 of yacc.c  */
-#line 403 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::PFieldSel ), new VarRefNode( (yyvsp[(1) - (3)].tok) ), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 46:
-
-/* Line 1806 of yacc.c  */
-#line 405 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::PFieldSel ), new VarRefNode( (yyvsp[(1) - (7)].tok) ), (yyvsp[(5) - (7)].en) ); }
-    break;
-
-  case 48:
-
-/* Line 1806 of yacc.c  */
-#line 411 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Incr ), (yyvsp[(2) - (2)].en) ); }
-    break;
-
-  case 49:
-
-/* Line 1806 of yacc.c  */
-#line 413 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Decr ), (yyvsp[(2) - (2)].en) ); }
-    break;
-
-  case 50:
-
-/* Line 1806 of yacc.c  */
-#line 415 "parser.yy"
-    { (yyval.en) = (yyvsp[(2) - (2)].en); }
-    break;
-
-  case 51:
-
-/* Line 1806 of yacc.c  */
-#line 417 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( (yyvsp[(1) - (2)].en), (yyvsp[(2) - (2)].en) ); }
-    break;
-
-  case 52:
-
-/* Line 1806 of yacc.c  */
-#line 419 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Neg ), (yyvsp[(2) - (2)].en) ); }
-    break;
-
-  case 53:
-
-/* Line 1806 of yacc.c  */
-#line 421 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::PointTo ), (yyvsp[(2) - (2)].en) ); }
-    break;
-
-  case 54:
-
-/* Line 1806 of yacc.c  */
-#line 427 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::SizeOf ), (yyvsp[(2) - (2)].en) ); }
-    break;
-
-  case 55:
-
-/* Line 1806 of yacc.c  */
-#line 429 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::SizeOf ), new TypeValueNode( (yyvsp[(3) - (4)].decl) )); }
-    break;
-
-  case 56:
-
-/* Line 1806 of yacc.c  */
-#line 431 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( (yyvsp[(1) - (1)].tok) )); }
-    break;
-
-  case 57:
-
-/* Line 1806 of yacc.c  */
-#line 433 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( (yyvsp[(1) - (4)].tok) ), new TypeValueNode( (yyvsp[(3) - (4)].decl) )); }
-    break;
-
-  case 58:
-
-/* Line 1806 of yacc.c  */
-#line 435 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( (yyvsp[(1) - (4)].tok) ), (yyvsp[(3) - (4)].en) ); }
-    break;
-
-  case 59:
-
-/* Line 1806 of yacc.c  */
-#line 437 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::AlignOf ), (yyvsp[(2) - (2)].en) ); }
-    break;
-
-  case 60:
-
-/* Line 1806 of yacc.c  */
-#line 439 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::AlignOf ), new TypeValueNode( (yyvsp[(3) - (4)].decl) )); }
-    break;
-
-  case 61:
-
-/* Line 1806 of yacc.c  */
-#line 441 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::LabelAddress ), new VarRefNode( (yyvsp[(2) - (2)].tok), true )); }
-    break;
-
-  case 62:
-
-/* Line 1806 of yacc.c  */
-#line 445 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::AddressOf ); }
-    break;
-
-  case 63:
-
-/* Line 1806 of yacc.c  */
-#line 446 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::UnPlus ); }
-    break;
-
-  case 64:
-
-/* Line 1806 of yacc.c  */
-#line 447 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::UnMinus ); }
-    break;
-
-  case 65:
-
-/* Line 1806 of yacc.c  */
-#line 448 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::BitNeg ); }
-    break;
-
-  case 67:
-
-/* Line 1806 of yacc.c  */
-#line 454 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Cast ), new TypeValueNode( (yyvsp[(2) - (4)].decl) ), (yyvsp[(4) - (4)].en) ); }
-    break;
-
-  case 68:
-
-/* Line 1806 of yacc.c  */
-#line 456 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Cast ), new TypeValueNode( (yyvsp[(2) - (4)].decl) ), (yyvsp[(4) - (4)].en) ); }
-    break;
-
-  case 70:
-
-/* Line 1806 of yacc.c  */
-#line 462 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Mul ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 71:
-
-/* Line 1806 of yacc.c  */
-#line 464 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Div ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 72:
-
-/* Line 1806 of yacc.c  */
-#line 466 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Mod ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 74:
-
-/* Line 1806 of yacc.c  */
-#line 472 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Plus ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 75:
-
-/* Line 1806 of yacc.c  */
-#line 474 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Minus ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 77:
-
-/* Line 1806 of yacc.c  */
-#line 480 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::LShift ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 78:
-
-/* Line 1806 of yacc.c  */
-#line 482 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::RShift ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 80:
-
-/* Line 1806 of yacc.c  */
-#line 488 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::LThan ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 81:
-
-/* Line 1806 of yacc.c  */
-#line 490 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::GThan ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 82:
-
-/* Line 1806 of yacc.c  */
-#line 492 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::LEThan ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 83:
-
-/* Line 1806 of yacc.c  */
-#line 494 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::GEThan ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 85:
-
-/* Line 1806 of yacc.c  */
-#line 500 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Eq ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 86:
-
-/* Line 1806 of yacc.c  */
-#line 502 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Neq ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 88:
-
-/* Line 1806 of yacc.c  */
-#line 508 "parser.yy"
-    { (yyval.en) =new CompositeExprNode( new OperatorNode( OperatorNode::BitAnd ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 90:
-
-/* Line 1806 of yacc.c  */
-#line 514 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Xor ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 92:
-
-/* Line 1806 of yacc.c  */
-#line 520 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::BitOr ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 94:
-
-/* Line 1806 of yacc.c  */
-#line 526 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::And ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 96:
-
-/* Line 1806 of yacc.c  */
-#line 532 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Or ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 98:
-
-/* Line 1806 of yacc.c  */
-#line 538 "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;
-
-  case 99:
-
-/* Line 1806 of yacc.c  */
-#line 540 "parser.yy"
-    { (yyval.en)=new CompositeExprNode( new OperatorNode( OperatorNode::NCond ), (yyvsp[(1) - (4)].en), (yyvsp[(4) - (4)].en) ); }
-    break;
-
-  case 100:
-
-/* Line 1806 of yacc.c  */
-#line 542 "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;
-
-  case 103:
-
-/* Line 1806 of yacc.c  */
-#line 553 "parser.yy"
-    { (yyval.en) =new CompositeExprNode( new OperatorNode( OperatorNode::Assign ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 104:
-
-/* Line 1806 of yacc.c  */
-#line 555 "parser.yy"
-    { (yyval.en) =new CompositeExprNode( (yyvsp[(2) - (3)].en), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 105:
-
-/* Line 1806 of yacc.c  */
-#line 557 "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;
-
-  case 106:
-
-/* Line 1806 of yacc.c  */
-#line 562 "parser.yy"
-    { (yyval.en) = new NullExprNode; }
-    break;
-
-  case 108:
-
-/* Line 1806 of yacc.c  */
-#line 570 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ) ); }
-    break;
-
-  case 109:
-
-/* Line 1806 of yacc.c  */
-#line 572 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (yyvsp[(3) - (5)].en) ); }
-    break;
-
-  case 110:
-
-/* Line 1806 of yacc.c  */
-#line 574 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(new NullExprNode)->set_link( (yyvsp[(4) - (6)].en) ) ); }
-    break;
-
-  case 111:
-
-/* Line 1806 of yacc.c  */
-#line 576 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(yyvsp[(3) - (7)].en)->set_link( flattenCommas( (yyvsp[(5) - (7)].en) ) ) ); }
-    break;
-
-  case 113:
-
-/* Line 1806 of yacc.c  */
-#line 582 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 114:
-
-/* Line 1806 of yacc.c  */
-#line 586 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::MulAssn ); }
-    break;
-
-  case 115:
-
-/* Line 1806 of yacc.c  */
-#line 587 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::DivAssn ); }
-    break;
-
-  case 116:
-
-/* Line 1806 of yacc.c  */
-#line 588 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::ModAssn ); }
-    break;
-
-  case 117:
-
-/* Line 1806 of yacc.c  */
-#line 589 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::PlusAssn ); }
-    break;
-
-  case 118:
-
-/* Line 1806 of yacc.c  */
-#line 590 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::MinusAssn ); }
-    break;
-
-  case 119:
-
-/* Line 1806 of yacc.c  */
-#line 591 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::LSAssn ); }
-    break;
-
-  case 120:
-
-/* Line 1806 of yacc.c  */
-#line 592 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::RSAssn ); }
-    break;
-
-  case 121:
-
-/* Line 1806 of yacc.c  */
-#line 593 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::AndAssn ); }
-    break;
-
-  case 122:
-
-/* Line 1806 of yacc.c  */
-#line 594 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::ERAssn ); }
-    break;
-
-  case 123:
-
-/* Line 1806 of yacc.c  */
-#line 595 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::OrAssn ); }
-    break;
-
-  case 125:
-
-/* Line 1806 of yacc.c  */
-#line 601 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Comma ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 126:
-
-/* Line 1806 of yacc.c  */
-#line 606 "parser.yy"
-    { (yyval.en) = 0; }
-    break;
-
   case 130:
 
 /* Line 1806 of yacc.c  */
-#line 615 "parser.yy"
+#line 612 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (1)].sn); }
     break;
@@ -5670 +5669 @@
 
 /* Line 1806 of yacc.c  */
-#line 625 "parser.yy"
-    {
-                        (yyval.sn) = (yyvsp[(4) - (4)].sn)->add_label( (yyvsp[(1) - (4)].tok) );
-                }
+#line 622 "parser.yy"
+    { (yyval.sn) = (yyvsp[(4) - (4)].sn)->add_label( (yyvsp[(1) - (4)].tok) );}
     break;
 
@@ -5679 +5676 @@
 
 /* Line 1806 of yacc.c  */
-#line 632 "parser.yy"
+#line 627 "parser.yy"
     { (yyval.sn) = new CompoundStmtNode( (StatementNode *)0 ); }
     break;
@@ -5686 +5683 @@
 
 /* Line 1806 of yacc.c  */
-#line 639 "parser.yy"
+#line 634 "parser.yy"
     { (yyval.sn) = new CompoundStmtNode( (yyvsp[(5) - (7)].sn) ); }
     break;
@@ -5693 +5690 @@
 
 /* Line 1806 of yacc.c  */
+#line 640 "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;
+
+  case 141:
+
+/* Line 1806 of yacc.c  */
 #line 645 "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;
-
-  case 141:
-
-/* Line 1806 of yacc.c  */
-#line 650 "parser.yy"
     { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
     break;
@@ -5707 +5704 @@
 
 /* Line 1806 of yacc.c  */
-#line 652 "parser.yy"
+#line 647 "parser.yy"
     { (yyval.sn) = new StatementNode( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -5714 +5711 @@
 
 /* Line 1806 of yacc.c  */
-#line 654 "parser.yy"
+#line 649 "parser.yy"
     { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
     break;
@@ -5721 +5718 @@
 
 /* Line 1806 of yacc.c  */
+#line 656 "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;
+
+  case 147:
+
+/* Line 1806 of yacc.c  */
 #line 661 "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;
-
-  case 147:
-
-/* Line 1806 of yacc.c  */
-#line 666 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Exp, (yyvsp[(1) - (2)].en), 0 ); }
     break;
@@ -5735 +5732 @@
 
 /* Line 1806 of yacc.c  */
-#line 672 "parser.yy"
+#line 667 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::If, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
     break;
@@ -5742 +5739 @@
 
 /* Line 1806 of yacc.c  */
-#line 674 "parser.yy"
+#line 669 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::If, (yyvsp[(3) - (7)].en), (StatementNode *)mkList((*(yyvsp[(5) - (7)].sn), *(yyvsp[(7) - (7)].sn) )) ); }
     break;
@@ -5749 +5746 @@
 
 /* Line 1806 of yacc.c  */
-#line 676 "parser.yy"
+#line 671 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
     break;
@@ -5756 +5753 @@
 
 /* Line 1806 of yacc.c  */
+#line 673 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) ); /* xxx */ }
+    break;
+
+  case 152:
+
+/* Line 1806 of yacc.c  */
 #line 678 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) ); /* xxx */ }
-    break;
-
-  case 152:
-
-/* Line 1806 of yacc.c  */
-#line 683 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Choose, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
     break;
@@ -5770 +5767 @@
 
 /* Line 1806 of yacc.c  */
-#line 685 "parser.yy"
+#line 680 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Choose, (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) ); }
     break;
@@ -5777 +5774 @@
 
 /* Line 1806 of yacc.c  */
-#line 692 "parser.yy"
+#line 687 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
@@ -5784 +5781 @@
 
 /* Line 1806 of yacc.c  */
-#line 694 "parser.yy"
+#line 689 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Range ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5791 +5788 @@
 
 /* Line 1806 of yacc.c  */
+#line 696 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(tupleContents( (yyvsp[(1) - (3)].en) ))->set_link( (yyvsp[(3) - (3)].en) ) ); }
+    break;
+
+  case 159:
+
+/* Line 1806 of yacc.c  */
+#line 700 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Case, (yyvsp[(2) - (3)].en), 0 ); }
+    break;
+
+  case 160:
+
+/* Line 1806 of yacc.c  */
 #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;
-
-  case 159:
-
-/* Line 1806 of yacc.c  */
-#line 705 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Case, (yyvsp[(2) - (3)].en), 0 ); }
-    break;
-
-  case 160:
-
-/* Line 1806 of yacc.c  */
-#line 706 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Default ); }
     break;
@@ -5812 +5809 @@
 
 /* Line 1806 of yacc.c  */
-#line 712 "parser.yy"
+#line 707 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (2)].sn)->set_link( (yyvsp[(2) - (2)].sn) )); }
     break;
@@ -5819 +5816 @@
 
 /* Line 1806 of yacc.c  */
+#line 711 "parser.yy"
+    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
+    break;
+
+  case 164:
+
+/* Line 1806 of yacc.c  */
 #line 716 "parser.yy"
+    { (yyval.sn) = 0; }
+    break;
+
+  case 166:
+
+/* Line 1806 of yacc.c  */
+#line 722 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
     break;
 
-  case 164:
-
-/* Line 1806 of yacc.c  */
-#line 721 "parser.yy"
+  case 167:
+
+/* Line 1806 of yacc.c  */
+#line 724 "parser.yy"
+    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
+    break;
+
+  case 168:
+
+/* Line 1806 of yacc.c  */
+#line 729 "parser.yy"
     { (yyval.sn) = 0; }
     break;
 
-  case 166:
-
-/* Line 1806 of yacc.c  */
-#line 727 "parser.yy"
+  case 170:
+
+/* Line 1806 of yacc.c  */
+#line 735 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
     break;
 
-  case 167:
-
-/* Line 1806 of yacc.c  */
-#line 729 "parser.yy"
+  case 171:
+
+/* Line 1806 of yacc.c  */
+#line 737 "parser.yy"
+    { (yyval.sn) = (yyvsp[(1) - (3)].sn)->append_last_case((StatementNode *)mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].sn) ))); }
+    break;
+
+  case 172:
+
+/* Line 1806 of yacc.c  */
+#line 739 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
     break;
 
-  case 168:
-
-/* Line 1806 of yacc.c  */
-#line 734 "parser.yy"
+  case 173:
+
+/* Line 1806 of yacc.c  */
+#line 741 "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;
+
+  case 174:
+
+/* Line 1806 of yacc.c  */
+#line 746 "parser.yy"
     { (yyval.sn) = 0; }
     break;
 
-  case 170:
-
-/* Line 1806 of yacc.c  */
-#line 740 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
-    break;
-
-  case 171:
-
-/* Line 1806 of yacc.c  */
-#line 742 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (3)].sn)->append_last_case((StatementNode *)mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].sn) ))); }
-    break;
-
-  case 172:
-
-/* Line 1806 of yacc.c  */
-#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;
-
-  case 173:
-
-/* Line 1806 of yacc.c  */
-#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;
-
-  case 174:
+  case 176:
 
 /* Line 1806 of yacc.c  */
 #line 751 "parser.yy"
-    { (yyval.sn) = 0; }
-    break;
-
-  case 176:
-
-/* Line 1806 of yacc.c  */
-#line 756 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Fallthru, 0, 0 ); }
     break;
@@ -5896 +5893 @@
 
 /* Line 1806 of yacc.c  */
+#line 752 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Fallthru, 0, 0 ); }
+    break;
+
+  case 178:
+
+/* 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 762 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::While, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
     break;
@@ -5910 +5907 @@
 
 /* Line 1806 of yacc.c  */
-#line 764 "parser.yy"
+#line 759 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Do, (yyvsp[(5) - (7)].en), (yyvsp[(2) - (7)].sn) ); }
     break;
@@ -5917 +5914 @@
 
 /* Line 1806 of yacc.c  */
+#line 761 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::For, (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].sn) ); }
+    break;
+
+  case 181:
+
+/* Line 1806 of yacc.c  */
 #line 766 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::For, (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].sn) ); }
-    break;
-
-  case 181:
-
-/* Line 1806 of yacc.c  */
-#line 771 "parser.yy"
     { (yyval.en) = new ForCtlExprNode( (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].en) ); }
     break;
@@ -5931 +5928 @@
 
 /* Line 1806 of yacc.c  */
+#line 768 "parser.yy"
+    { (yyval.en) = new ForCtlExprNode( (yyvsp[(1) - (4)].decl), (yyvsp[(2) - (4)].en), (yyvsp[(4) - (4)].en) ); }
+    break;
+
+  case 183:
+
+/* Line 1806 of yacc.c  */
 #line 773 "parser.yy"
-    { (yyval.en) = new ForCtlExprNode( (yyvsp[(1) - (4)].decl), (yyvsp[(2) - (4)].en), (yyvsp[(4) - (4)].en) ); }
-    break;
-
-  case 183:
-
-/* Line 1806 of yacc.c  */
-#line 778 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Goto, (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -5945 +5942 @@
 
 /* Line 1806 of yacc.c  */
-#line 782 "parser.yy"
+#line 777 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Goto, (yyvsp[(3) - (4)].en) ); }
     break;
@@ -5952 +5949 @@
 
 /* Line 1806 of yacc.c  */
-#line 785 "parser.yy"
+#line 780 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Continue, 0, 0 ); }
     break;
@@ -5959 +5956 @@
 
 /* Line 1806 of yacc.c  */
-#line 789 "parser.yy"
+#line 784 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Continue, (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -5966 +5963 @@
 
 /* Line 1806 of yacc.c  */
-#line 792 "parser.yy"
+#line 787 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Break, 0, 0 ); }
     break;
@@ -5973 +5970 @@
 
 /* Line 1806 of yacc.c  */
-#line 796 "parser.yy"
+#line 791 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Break, (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -5980 +5977 @@
 
 /* Line 1806 of yacc.c  */
-#line 798 "parser.yy"
+#line 793 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Return, (yyvsp[(2) - (3)].en), 0 ); }
     break;
@@ -5987 +5984 @@
 
 /* Line 1806 of yacc.c  */
-#line 800 "parser.yy"
+#line 795 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Throw, (yyvsp[(2) - (3)].en), 0 ); }
     break;
@@ -5994 +5991 @@
 
 /* Line 1806 of yacc.c  */
+#line 797 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Throw, 0, 0 ); }
+    break;
+
+  case 192:
+
+/* Line 1806 of yacc.c  */
 #line 802 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Throw, 0, 0 ); }
-    break;
-
-  case 192:
-
-/* Line 1806 of yacc.c  */
-#line 807 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].pn) )))); }
     break;
@@ -6008 +6005 @@
 
 /* Line 1806 of yacc.c  */
-#line 809 "parser.yy"
+#line 804 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].pn) )))); }
     break;
@@ -6015 +6012 @@
 
 /* Line 1806 of yacc.c  */
-#line 811 "parser.yy"
+#line 806 "parser.yy"
     {
                         (yyvsp[(3) - (4)].pn)->set_link( (yyvsp[(4) - (4)].pn) );
@@ -6025 +6022 @@
 
 /* Line 1806 of yacc.c  */
-#line 822 "parser.yy"
+#line 817 "parser.yy"
     { (yyval.pn) = StatementNode::newCatchStmt( 0, (yyvsp[(5) - (5)].sn), true ); }
     break;
@@ -6032 +6029 @@
 
 /* Line 1806 of yacc.c  */
+#line 819 "parser.yy"
+    { (yyval.pn) = (yyvsp[(1) - (6)].pn)->set_link( StatementNode::newCatchStmt( 0, (yyvsp[(6) - (6)].sn), true ) ); }
+    break;
+
+  case 198:
+
+/* Line 1806 of yacc.c  */
 #line 824 "parser.yy"
-    { (yyval.pn) = (yyvsp[(1) - (6)].pn)->set_link( StatementNode::newCatchStmt( 0, (yyvsp[(6) - (6)].sn), true ) ); }
-    break;
-
-  case 198:
-
-/* Line 1806 of yacc.c  */
-#line 829 "parser.yy"
     { (yyval.pn) = StatementNode::newCatchStmt( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ); }
     break;
@@ -6046 +6043 @@
 
 /* Line 1806 of yacc.c  */
+#line 826 "parser.yy"
+    { (yyval.pn) = (yyvsp[(1) - (10)].pn)->set_link( StatementNode::newCatchStmt( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ); }
+    break;
+
+  case 200:
+
+/* Line 1806 of yacc.c  */
 #line 831 "parser.yy"
-    { (yyval.pn) = (yyvsp[(1) - (10)].pn)->set_link( StatementNode::newCatchStmt( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ); }
-    break;
-
-  case 200:
-
-/* Line 1806 of yacc.c  */
-#line 836 "parser.yy"
     {
                         (yyval.pn) = new StatementNode( StatementNode::Finally, 0, (yyvsp[(2) - (2)].sn) );
@@ -6063 +6060 @@
 
 /* Line 1806 of yacc.c  */
-#line 850 "parser.yy"
+#line 845 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6073 +6070 @@
 
 /* Line 1806 of yacc.c  */
-#line 855 "parser.yy"
+#line 850 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6080 +6077 @@
 
 /* Line 1806 of yacc.c  */
-#line 857 "parser.yy"
+#line 852 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6090 +6087 @@
 
 /* Line 1806 of yacc.c  */
-#line 866 "parser.yy"
+#line 861 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Asm, 0, 0 ); }
     break;
@@ -6097 +6094 @@
 
 /* Line 1806 of yacc.c  */
-#line 868 "parser.yy"
+#line 863 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Asm, 0, 0 ); }
     break;
@@ -6104 +6101 @@
 
 /* Line 1806 of yacc.c  */
-#line 870 "parser.yy"
+#line 865 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Asm, 0, 0 ); }
     break;
@@ -6111 +6108 @@
 
 /* Line 1806 of yacc.c  */
-#line 872 "parser.yy"
+#line 867 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Asm, 0, 0 ); }
     break;
@@ -6118 +6115 @@
 
 /* Line 1806 of yacc.c  */
-#line 886 "parser.yy"
+#line 881 "parser.yy"
     {}
     break;
@@ -6125 +6122 @@
 
 /* Line 1806 of yacc.c  */
-#line 890 "parser.yy"
+#line 885 "parser.yy"
     {}
     break;
@@ -6132 +6129 @@
 
 /* Line 1806 of yacc.c  */
-#line 898 "parser.yy"
+#line 893 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6139 +6136 @@
 
 /* Line 1806 of yacc.c  */
+#line 900 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
+    break;
+
+  case 221:
+
+/* Line 1806 of yacc.c  */
 #line 905 "parser.yy"
+    { (yyval.decl) = 0; }
+    break;
+
+  case 224:
+
+/* Line 1806 of yacc.c  */
+#line 912 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
 
-  case 221:
-
-/* Line 1806 of yacc.c  */
-#line 910 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
-  case 224:
-
-/* Line 1806 of yacc.c  */
-#line 917 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
   case 229:
 
 /* Line 1806 of yacc.c  */
-#line 931 "parser.yy"
+#line 926 "parser.yy"
     {}
     break;
@@ -6167 +6164 @@
 
 /* Line 1806 of yacc.c  */
-#line 932 "parser.yy"
+#line 927 "parser.yy"
     {}
     break;
@@ -6174 +6171 @@
 
 /* Line 1806 of yacc.c  */
-#line 961 "parser.yy"
+#line 956 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6184 +6181 @@
 
 /* Line 1806 of yacc.c  */
-#line 968 "parser.yy"
+#line 963 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6194 +6191 @@
 
 /* Line 1806 of yacc.c  */
-#line 973 "parser.yy"
+#line 968 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (6)].tok), TypedefTable::ID );
@@ -6202 +6199 @@
 
   case 241:
+
+/* Line 1806 of yacc.c  */
+#line 978 "parser.yy"
+    {
+                        typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
+                        (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) );
+                }
+    break;
+
+  case 242:
 
 /* Line 1806 of yacc.c  */
@@ -6211 +6218 @@
     break;
 
-  case 242:
+  case 243:
 
 /* Line 1806 of yacc.c  */
 #line 988 "parser.yy"
-    {
-                        typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
-                        (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) );
-                }
-    break;
-
-  case 243:
-
-/* Line 1806 of yacc.c  */
-#line 993 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(3) - (4)].tok) );
@@ -6234 +6231 @@
 
 /* Line 1806 of yacc.c  */
-#line 1001 "parser.yy"
+#line 996 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6242 +6239 @@
 
   case 245:
+
+/* Line 1806 of yacc.c  */
+#line 1001 "parser.yy"
+    {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) );
+                }
+    break;
+
+  case 246:
 
 /* Line 1806 of yacc.c  */
@@ -6251 +6258 @@
     break;
 
-  case 246:
+  case 247:
 
 /* Line 1806 of yacc.c  */
 #line 1011 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) );
-                }
-    break;
-
-  case 247:
-
-/* Line 1806 of yacc.c  */
-#line 1016 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6274 +6271 @@
 
 /* Line 1806 of yacc.c  */
-#line 1021 "parser.yy"
+#line 1016 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
@@ -6284 +6281 @@
 
 /* Line 1806 of yacc.c  */
-#line 1029 "parser.yy"
+#line 1024 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(3) - (8)].tok), DeclarationNode::newTuple( 0 ), (yyvsp[(6) - (8)].decl), 0, true );
@@ -6293 +6290 @@
 
 /* Line 1806 of yacc.c  */
-#line 1052 "parser.yy"
+#line 1047 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
@@ -6302 +6299 @@
 
 /* Line 1806 of yacc.c  */
-#line 1056 "parser.yy"
+#line 1051 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
@@ -6311 +6308 @@
 
 /* Line 1806 of yacc.c  */
-#line 1063 "parser.yy"
+#line 1058 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -6318 +6315 @@
 
 /* Line 1806 of yacc.c  */
+#line 1062 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (9)].decl)->appendList( (yyvsp[(7) - (9)].decl) ) ); }
+    break;
+
+  case 254:
+
+/* Line 1806 of yacc.c  */
 #line 1067 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (9)].decl)->appendList( (yyvsp[(7) - (9)].decl) ) ); }
-    break;
-
-  case 254:
+    {
+                        typedefTable.addToEnclosingScope( TypedefTable::TD );
+                        (yyval.decl) = (yyvsp[(2) - (2)].decl)->addTypedef();
+                }
+    break;
+
+  case 255:
 
 /* Line 1806 of yacc.c  */
@@ -6332 +6339 @@
     break;
 
-  case 255:
+  case 256:
 
 /* Line 1806 of yacc.c  */
 #line 1077 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( TypedefTable::TD );
-                        (yyval.decl) = (yyvsp[(2) - (2)].decl)->addTypedef();
-                }
-    break;
-
-  case 256:
-
-/* Line 1806 of yacc.c  */
-#line 1082 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::TD );
@@ -6355 +6352 @@
 
 /* Line 1806 of yacc.c  */
-#line 1093 "parser.yy"
+#line 1088 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6365 +6362 @@
 
 /* Line 1806 of yacc.c  */
-#line 1098 "parser.yy"
+#line 1093 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6375 +6372 @@
 
 /* Line 1806 of yacc.c  */
-#line 1103 "parser.yy"
+#line 1098 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6385 +6382 @@
 
 /* Line 1806 of yacc.c  */
-#line 1108 "parser.yy"
+#line 1103 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6395 +6392 @@
 
 /* Line 1806 of yacc.c  */
-#line 1113 "parser.yy"
+#line 1108 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6405 +6402 @@
 
 /* Line 1806 of yacc.c  */
-#line 1122 "parser.yy"
+#line 1117 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (4)].tok), TypedefTable::TD );
@@ -6415 +6412 @@
 
 /* Line 1806 of yacc.c  */
-#line 1127 "parser.yy"
+#line 1122 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (7)].tok), TypedefTable::TD );
@@ -6425 +6422 @@
 
 /* Line 1806 of yacc.c  */
-#line 1144 "parser.yy"
+#line 1139 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6435 +6432 @@
 
 /* Line 1806 of yacc.c  */
-#line 1149 "parser.yy"
+#line 1144 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6445 +6442 @@
 
 /* Line 1806 of yacc.c  */
-#line 1171 "parser.yy"
+#line 1166 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6452 +6449 @@
 
 /* Line 1806 of yacc.c  */
-#line 1183 "parser.yy"
+#line 1178 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
+  case 283:
+
+/* Line 1806 of yacc.c  */
+#line 1184 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Attribute ); }
+    break;
+
   case 284:
 
 /* Line 1806 of yacc.c  */
-#line 1194 "parser.yy"
+#line 1189 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Const ); }
     break;
@@ -6466 +6470 @@
 
 /* Line 1806 of yacc.c  */
-#line 1196 "parser.yy"
+#line 1191 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Restrict ); }
     break;
@@ -6473 +6477 @@
 
 /* Line 1806 of yacc.c  */
-#line 1198 "parser.yy"
+#line 1193 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Volatile ); }
     break;
@@ -6480 +6484 @@
 
 /* Line 1806 of yacc.c  */
-#line 1200 "parser.yy"
+#line 1195 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Lvalue ); }
     break;
@@ -6487 +6491 @@
 
 /* Line 1806 of yacc.c  */
-#line 1202 "parser.yy"
+#line 1197 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Atomic ); }
     break;
@@ -6494 +6498 @@
 
 /* Line 1806 of yacc.c  */
-#line 1204 "parser.yy"
+#line 1199 "parser.yy"
     {
                         typedefTable.enterScope();
@@ -6503 +6507 @@
 
 /* Line 1806 of yacc.c  */
-#line 1208 "parser.yy"
+#line 1203 "parser.yy"
     {
                         typedefTable.leaveScope();
@@ -6513 +6517 @@
 
 /* Line 1806 of yacc.c  */
-#line 1217 "parser.yy"
+#line 1212 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6520 +6524 @@
 
 /* Line 1806 of yacc.c  */
-#line 1219 "parser.yy"
+#line 1214 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6527 +6531 @@
 
 /* Line 1806 of yacc.c  */
-#line 1230 "parser.yy"
+#line 1225 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6534 +6538 @@
 
 /* Line 1806 of yacc.c  */
-#line 1239 "parser.yy"
+#line 1234 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Extern ); }
     break;
@@ -6541 +6545 @@
 
 /* Line 1806 of yacc.c  */
-#line 1241 "parser.yy"
+#line 1236 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Static ); }
     break;
@@ -6548 +6552 @@
 
 /* Line 1806 of yacc.c  */
-#line 1243 "parser.yy"
+#line 1238 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Auto ); }
     break;
@@ -6555 +6559 @@
 
 /* Line 1806 of yacc.c  */
-#line 1245 "parser.yy"
+#line 1240 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Register ); }
     break;
@@ -6562 +6566 @@
 
 /* Line 1806 of yacc.c  */
-#line 1247 "parser.yy"
+#line 1242 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Inline ); }
     break;
@@ -6569 +6573 @@
 
 /* Line 1806 of yacc.c  */
-#line 1249 "parser.yy"
+#line 1244 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Fortran ); }
     break;
@@ -6576 +6580 @@
 
 /* Line 1806 of yacc.c  */
-#line 1251 "parser.yy"
+#line 1246 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Noreturn ); }
     break;
@@ -6583 +6587 @@
 
 /* Line 1806 of yacc.c  */
+#line 1248 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Threadlocal ); }
+    break;
+
+  case 305:
+
+/* Line 1806 of yacc.c  */
 #line 1253 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Threadlocal ); }
-    break;
-
-  case 305:
-
-/* Line 1806 of yacc.c  */
-#line 1258 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Char ); }
     break;
@@ -6597 +6601 @@
 
 /* Line 1806 of yacc.c  */
-#line 1260 "parser.yy"
+#line 1255 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Double ); }
     break;
@@ -6604 +6608 @@
 
 /* Line 1806 of yacc.c  */
-#line 1262 "parser.yy"
+#line 1257 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Float ); }
     break;
@@ -6611 +6615 @@
 
 /* Line 1806 of yacc.c  */
-#line 1264 "parser.yy"
+#line 1259 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Int ); }
     break;
@@ -6618 +6622 @@
 
 /* Line 1806 of yacc.c  */
-#line 1266 "parser.yy"
+#line 1261 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Long ); }
     break;
@@ -6625 +6629 @@
 
 /* Line 1806 of yacc.c  */
-#line 1268 "parser.yy"
+#line 1263 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Short ); }
     break;
@@ -6632 +6636 @@
 
 /* Line 1806 of yacc.c  */
-#line 1270 "parser.yy"
+#line 1265 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Signed ); }
     break;
@@ -6639 +6643 @@
 
 /* Line 1806 of yacc.c  */
-#line 1272 "parser.yy"
+#line 1267 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Unsigned ); }
     break;
@@ -6646 +6650 @@
 
 /* Line 1806 of yacc.c  */
-#line 1274 "parser.yy"
+#line 1269 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Void ); }
     break;
@@ -6653 +6657 @@
 
 /* Line 1806 of yacc.c  */
-#line 1276 "parser.yy"
+#line 1271 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Bool ); }
     break;
@@ -6660 +6664 @@
 
 /* Line 1806 of yacc.c  */
-#line 1278 "parser.yy"
+#line 1273 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Complex ); }
     break;
@@ -6667 +6671 @@
 
 /* Line 1806 of yacc.c  */
-#line 1280 "parser.yy"
+#line 1275 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Imaginary ); }
     break;
@@ -6674 +6678 @@
 
 /* Line 1806 of yacc.c  */
-#line 1287 "parser.yy"
+#line 1282 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6681 +6685 @@
 
 /* Line 1806 of yacc.c  */
-#line 1289 "parser.yy"
+#line 1284 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6688 +6692 @@
 
 /* Line 1806 of yacc.c  */
-#line 1291 "parser.yy"
+#line 1286 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6695 +6699 @@
 
 /* Line 1806 of yacc.c  */
-#line 1293 "parser.yy"
+#line 1288 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addType( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -6702 +6706 @@
 
 /* Line 1806 of yacc.c  */
-#line 1299 "parser.yy"
+#line 1294 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6709 +6713 @@
 
 /* Line 1806 of yacc.c  */
-#line 1306 "parser.yy"
+#line 1301 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6716 +6720 @@
 
 /* Line 1806 of yacc.c  */
-#line 1308 "parser.yy"
+#line 1303 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6723 +6727 @@
 
 /* Line 1806 of yacc.c  */
+#line 1305 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addType( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 328:
+
+/* Line 1806 of yacc.c  */
 #line 1310 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addType( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 328:
-
-/* Line 1806 of yacc.c  */
-#line 1315 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (4)].decl); }
     break;
@@ -6737 +6741 @@
 
 /* Line 1806 of yacc.c  */
-#line 1317 "parser.yy"
+#line 1312 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTypeof( (yyvsp[(3) - (4)].en) ); }
     break;
@@ -6744 +6748 @@
 
 /* Line 1806 of yacc.c  */
-#line 1319 "parser.yy"
+#line 1314 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -6751 +6755 @@
 
 /* Line 1806 of yacc.c  */
-#line 1321 "parser.yy"
+#line 1316 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -6758 +6762 @@
 
 /* Line 1806 of yacc.c  */
-#line 1327 "parser.yy"
+#line 1322 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6765 +6769 @@
 
 /* Line 1806 of yacc.c  */
-#line 1329 "parser.yy"
+#line 1324 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6772 +6776 @@
 
 /* Line 1806 of yacc.c  */
-#line 1331 "parser.yy"
+#line 1326 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6779 +6783 @@
 
 /* Line 1806 of yacc.c  */
-#line 1337 "parser.yy"
+#line 1332 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6786 +6790 @@
 
 /* Line 1806 of yacc.c  */
-#line 1339 "parser.yy"
+#line 1334 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6793 +6797 @@
 
 /* Line 1806 of yacc.c  */
-#line 1345 "parser.yy"
+#line 1340 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6800 +6804 @@
 
 /* Line 1806 of yacc.c  */
-#line 1347 "parser.yy"
+#line 1342 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6807 +6811 @@
 
 /* Line 1806 of yacc.c  */
+#line 1344 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
+    break;
+
+  case 343:
+
+/* Line 1806 of yacc.c  */
 #line 1349 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 343:
-
-/* Line 1806 of yacc.c  */
-#line 1354 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -6821 +6825 @@
 
 /* Line 1806 of yacc.c  */
-#line 1356 "parser.yy"
+#line 1351 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(2) - (2)].tok) )->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6828 +6832 @@
 
 /* Line 1806 of yacc.c  */
-#line 1358 "parser.yy"
+#line 1353 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6835 +6839 @@
 
 /* Line 1806 of yacc.c  */
-#line 1368 "parser.yy"
+#line 1363 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (4)].aggKey), 0, 0, (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -6842 +6846 @@
 
 /* Line 1806 of yacc.c  */
-#line 1370 "parser.yy"
+#line 1365 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (2)].aggKey), (yyvsp[(2) - (2)].tok), 0, 0 ); }
     break;
@@ -6849 +6853 @@
 
 /* Line 1806 of yacc.c  */
-#line 1372 "parser.yy"
+#line 1367 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (5)].aggKey), (yyvsp[(2) - (5)].tok), 0, (yyvsp[(4) - (5)].decl) ); }
     break;
@@ -6856 +6860 @@
 
 /* Line 1806 of yacc.c  */
-#line 1374 "parser.yy"
+#line 1369 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (7)].aggKey), 0, (yyvsp[(3) - (7)].en), (yyvsp[(6) - (7)].decl) ); }
     break;
@@ -6863 +6867 @@
 
 /* Line 1806 of yacc.c  */
+#line 1371 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
+    break;
+
+  case 353:
+
+/* Line 1806 of yacc.c  */
 #line 1376 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
-    break;
-
-  case 353:
-
-/* Line 1806 of yacc.c  */
-#line 1381 "parser.yy"
     { (yyval.aggKey) = DeclarationNode::Struct; }
     break;
@@ -6877 +6881 @@
 
 /* Line 1806 of yacc.c  */
+#line 1378 "parser.yy"
+    { (yyval.aggKey) = DeclarationNode::Union; }
+    break;
+
+  case 355:
+
+/* Line 1806 of yacc.c  */
 #line 1383 "parser.yy"
-    { (yyval.aggKey) = DeclarationNode::Union; }
-    break;
-
-  case 355:
-
-/* Line 1806 of yacc.c  */
-#line 1388 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (1)].decl); }
     break;
@@ -6891 +6895 @@
 
 /* Line 1806 of yacc.c  */
-#line 1390 "parser.yy"
+#line 1385 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6898 +6902 @@
 
 /* Line 1806 of yacc.c  */
-#line 1396 "parser.yy"
+#line 1391 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -6905 +6909 @@
 
 /* Line 1806 of yacc.c  */
-#line 1399 "parser.yy"
+#line 1394 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -6912 +6916 @@
 
 /* Line 1806 of yacc.c  */
-#line 1405 "parser.yy"
+#line 1400 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addName( (yyvsp[(2) - (2)].tok) ); }
     break;
@@ -6919 +6923 @@
 
 /* Line 1806 of yacc.c  */
-#line 1407 "parser.yy"
+#line 1402 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(1) - (3)].decl)->cloneType( (yyvsp[(3) - (3)].tok) ) ); }
     break;
@@ -6926 +6930 @@
 
 /* Line 1806 of yacc.c  */
+#line 1404 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(1) - (2)].decl)->cloneType( 0 ) ); }
+    break;
+
+  case 365:
+
+/* Line 1806 of yacc.c  */
 #line 1409 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(1) - (2)].decl)->cloneType( 0 ) ); }
-    break;
-
-  case 365:
-
-/* Line 1806 of yacc.c  */
-#line 1414 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6940 +6944 @@
 
 /* Line 1806 of yacc.c  */
+#line 1411 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(1) - (4)].decl)->cloneBaseType( (yyvsp[(4) - (4)].decl) ) ); }
+    break;
+
+  case 367:
+
+/* Line 1806 of yacc.c  */
 #line 1416 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(1) - (4)].decl)->cloneBaseType( (yyvsp[(4) - (4)].decl) ) ); }
-    break;
-
-  case 367:
+    { (yyval.decl) = DeclarationNode::newName( 0 ); /* XXX */ }
+    break;
+
+  case 368:
+
+/* Line 1806 of yacc.c  */
+#line 1418 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBitfield( (yyvsp[(1) - (1)].en) ); }
+    break;
+
+  case 369:
 
 /* Line 1806 of yacc.c  */
 #line 1421 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newName( 0 ); /* XXX */ }
-    break;
-
-  case 368:
-
-/* Line 1806 of yacc.c  */
-#line 1423 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBitfield( (yyvsp[(1) - (1)].en) ); }
-    break;
-
-  case 369:
-
-/* Line 1806 of yacc.c  */
-#line 1426 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
     break;
@@ -6968 +6972 @@
 
 /* Line 1806 of yacc.c  */
-#line 1429 "parser.yy"
+#line 1424 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
     break;
@@ -6975 +6979 @@
 
 /* Line 1806 of yacc.c  */
-#line 1435 "parser.yy"
+#line 1430 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -6982 +6986 @@
 
 /* Line 1806 of yacc.c  */
+#line 1432 "parser.yy"
+    { (yyval.en) = (yyvsp[(1) - (1)].en); }
+    break;
+
+  case 374:
+
+/* Line 1806 of yacc.c  */
 #line 1437 "parser.yy"
-    { (yyval.en) = (yyvsp[(1) - (1)].en); }
-    break;
-
-  case 374:
-
-/* Line 1806 of yacc.c  */
-#line 1442 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -6996 +7000 @@
 
 /* Line 1806 of yacc.c  */
-#line 1451 "parser.yy"
+#line 1446 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( 0, (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -7003 +7007 @@
 
 /* Line 1806 of yacc.c  */
-#line 1453 "parser.yy"
+#line 1448 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( (yyvsp[(2) - (6)].tok), (yyvsp[(4) - (6)].decl) ); }
     break;
@@ -7010 +7014 @@
 
 /* Line 1806 of yacc.c  */
+#line 1450 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newEnum( (yyvsp[(2) - (2)].tok), 0 ); }
+    break;
+
+  case 379:
+
+/* Line 1806 of yacc.c  */
 #line 1455 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newEnum( (yyvsp[(2) - (2)].tok), 0 ); }
-    break;
-
-  case 379:
-
-/* Line 1806 of yacc.c  */
-#line 1460 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnumConstant( (yyvsp[(1) - (2)].tok), (yyvsp[(2) - (2)].en) ); }
     break;
@@ -7024 +7028 @@
 
 /* Line 1806 of yacc.c  */
+#line 1457 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( DeclarationNode::newEnumConstant( (yyvsp[(3) - (4)].tok), (yyvsp[(4) - (4)].en) ) ); }
+    break;
+
+  case 381:
+
+/* Line 1806 of yacc.c  */
 #line 1462 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( DeclarationNode::newEnumConstant( (yyvsp[(3) - (4)].tok), (yyvsp[(4) - (4)].en) ) ); }
-    break;
-
-  case 381:
-
-/* Line 1806 of yacc.c  */
-#line 1467 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -7038 +7042 @@
 
 /* Line 1806 of yacc.c  */
-#line 1469 "parser.yy"
+#line 1464 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -7045 +7049 @@
 
 /* Line 1806 of yacc.c  */
-#line 1476 "parser.yy"
+#line 1471 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7052 +7056 @@
 
 /* Line 1806 of yacc.c  */
-#line 1484 "parser.yy"
+#line 1479 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7059 +7063 @@
 
 /* Line 1806 of yacc.c  */
-#line 1486 "parser.yy"
+#line 1481 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
@@ -7066 +7070 @@
 
 /* Line 1806 of yacc.c  */
-#line 1488 "parser.yy"
+#line 1483 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
@@ -7073 +7077 @@
 
 /* Line 1806 of yacc.c  */
-#line 1496 "parser.yy"
+#line 1491 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7080 +7084 @@
 
 /* Line 1806 of yacc.c  */
-#line 1498 "parser.yy"
+#line 1493 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7087 +7091 @@
 
 /* Line 1806 of yacc.c  */
-#line 1500 "parser.yy"
+#line 1495 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (9)].decl)->appendList( (yyvsp[(5) - (9)].decl) )->appendList( (yyvsp[(9) - (9)].decl) ); }
     break;
@@ -7094 +7098 @@
 
 /* Line 1806 of yacc.c  */
+#line 1501 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
+    break;
+
+  case 396:
+
+/* Line 1806 of yacc.c  */
 #line 1506 "parser.yy"
+    { (yyval.decl) = 0; }
+    break;
+
+  case 399:
+
+/* Line 1806 of yacc.c  */
+#line 1513 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
+    break;
+
+  case 402:
+
+/* Line 1806 of yacc.c  */
+#line 1520 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
 
-  case 396:
-
-/* Line 1806 of yacc.c  */
-#line 1511 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
-  case 399:
-
-/* Line 1806 of yacc.c  */
-#line 1518 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
-    break;
-
-  case 402:
-
-/* Line 1806 of yacc.c  */
-#line 1525 "parser.yy"
+  case 403:
+
+/* Line 1806 of yacc.c  */
+#line 1522 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
 
-  case 403:
-
-/* Line 1806 of yacc.c  */
-#line 1527 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
-    break;
-
   case 405:
 
 /* Line 1806 of yacc.c  */
+#line 1531 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
+    break;
+
+  case 406:
+
+/* Line 1806 of yacc.c  */
+#line 1534 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
+    break;
+
+  case 407:
+
+/* Line 1806 of yacc.c  */
 #line 1536 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
-    break;
-
-  case 406:
-
-/* Line 1806 of yacc.c  */
-#line 1539 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
-    break;
-
-  case 407:
-
-/* Line 1806 of yacc.c  */
-#line 1541 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addName( (yyvsp[(3) - (4)].tok) )->addQualifiers( (yyvsp[(1) - (4)].decl) ); }
     break;
@@ -7150 +7154 @@
 
 /* Line 1806 of yacc.c  */
-#line 1551 "parser.yy"
+#line 1546 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 
   case 414:
+
+/* Line 1806 of yacc.c  */
+#line 1552 "parser.yy"
+    {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        (yyval.decl) = (yyvsp[(2) - (3)].decl)->addType( (yyvsp[(1) - (3)].decl) )->addInitializer( new InitializerNode( (yyvsp[(3) - (3)].en) ) );
+                }
+    break;
+
+  case 415:
 
 /* Line 1806 of yacc.c  */
@@ -7164 +7178 @@
     break;
 
-  case 415:
-
-/* Line 1806 of yacc.c  */
-#line 1562 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(2) - (3)].decl)->addType( (yyvsp[(1) - (3)].decl) )->addInitializer( new InitializerNode( (yyvsp[(3) - (3)].en) ) );
-                }
-    break;
-
   case 417:
 
 /* Line 1806 of yacc.c  */
-#line 1571 "parser.yy"
+#line 1566 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7184 +7188 @@
 
 /* Line 1806 of yacc.c  */
-#line 1580 "parser.yy"
+#line 1575 "parser.yy"
     { (yyval.decl) = DeclarationNode::newName( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -7191 +7195 @@
 
 /* Line 1806 of yacc.c  */
-#line 1582 "parser.yy"
+#line 1577 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( DeclarationNode::newName( (yyvsp[(3) - (3)].tok) ) ); }
     break;
@@ -7198 +7202 @@
 
 /* Line 1806 of yacc.c  */
-#line 1607 "parser.yy"
+#line 1602 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7205 +7209 @@
 
 /* Line 1806 of yacc.c  */
+#line 1610 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 436:
+
+/* Line 1806 of yacc.c  */
 #line 1615 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 436:
-
-/* Line 1806 of yacc.c  */
-#line 1620 "parser.yy"
     { (yyval.in) = 0; }
     break;
@@ -7219 +7223 @@
 
 /* Line 1806 of yacc.c  */
+#line 1617 "parser.yy"
+    { (yyval.in) = (yyvsp[(2) - (2)].in); }
+    break;
+
+  case 438:
+
+/* Line 1806 of yacc.c  */
+#line 1621 "parser.yy"
+    { (yyval.in) = new InitializerNode( (yyvsp[(1) - (1)].en) ); }
+    break;
+
+  case 439:
+
+/* Line 1806 of yacc.c  */
 #line 1622 "parser.yy"
-    { (yyval.in) = (yyvsp[(2) - (2)].in); }
-    break;
-
-  case 438:
-
-/* Line 1806 of yacc.c  */
-#line 1626 "parser.yy"
-    { (yyval.in) = new InitializerNode( (yyvsp[(1) - (1)].en) ); }
-    break;
-
-  case 439:
+    { (yyval.in) = new InitializerNode( (yyvsp[(2) - (4)].in), true ); }
+    break;
+
+  case 441:
 
 /* Line 1806 of yacc.c  */
 #line 1627 "parser.yy"
-    { (yyval.in) = new InitializerNode( (yyvsp[(2) - (4)].in), true ); }
-    break;
-
-  case 441:
-
-/* Line 1806 of yacc.c  */
-#line 1632 "parser.yy"
     { (yyval.in) = (yyvsp[(2) - (2)].in)->set_designators( (yyvsp[(1) - (2)].en) ); }
     break;
@@ -7247 +7251 @@
 
 /* Line 1806 of yacc.c  */
-#line 1633 "parser.yy"
+#line 1628 "parser.yy"
     { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (3)].in)->set_link( (yyvsp[(3) - (3)].in) ) ); }
     break;
@@ -7254 +7258 @@
 
 /* Line 1806 of yacc.c  */
-#line 1635 "parser.yy"
+#line 1630 "parser.yy"
     { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (4)].in)->set_link( (yyvsp[(4) - (4)].in)->set_designators( (yyvsp[(3) - (4)].en) ) ) ); }
     break;
@@ -7261 +7265 @@
 
 /* Line 1806 of yacc.c  */
-#line 1651 "parser.yy"
+#line 1646 "parser.yy"
     { (yyval.en) = new VarRefNode( (yyvsp[(1) - (2)].tok) ); }
     break;
@@ -7268 +7272 @@
 
 /* Line 1806 of yacc.c  */
-#line 1657 "parser.yy"
+#line 1652 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (2)].en)->set_link( (yyvsp[(2) - (2)].en) )); }
     break;
@@ -7275 +7279 @@
 
 /* Line 1806 of yacc.c  */
+#line 1658 "parser.yy"
+    { (yyval.en) = new VarRefNode( (yyvsp[(2) - (2)].tok) ); }
+    break;
+
+  case 449:
+
+/* Line 1806 of yacc.c  */
+#line 1661 "parser.yy"
+    { (yyval.en) = (yyvsp[(3) - (5)].en); }
+    break;
+
+  case 450:
+
+/* Line 1806 of yacc.c  */
 #line 1663 "parser.yy"
-    { (yyval.en) = new VarRefNode( (yyvsp[(2) - (2)].tok) ); }
-    break;
-
-  case 449:
-
-/* Line 1806 of yacc.c  */
-#line 1666 "parser.yy"
     { (yyval.en) = (yyvsp[(3) - (5)].en); }
     break;
 
-  case 450:
-
-/* Line 1806 of yacc.c  */
-#line 1668 "parser.yy"
-    { (yyval.en) = (yyvsp[(3) - (5)].en); }
-    break;
-
   case 451:
 
 /* Line 1806 of yacc.c  */
-#line 1670 "parser.yy"
+#line 1665 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Range ), (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].en) ); }
     break;
@@ -7303 +7307 @@
 
 /* Line 1806 of yacc.c  */
-#line 1672 "parser.yy"
+#line 1667 "parser.yy"
     { (yyval.en) = (yyvsp[(4) - (6)].en); }
     break;
@@ -7310 +7314 @@
 
 /* Line 1806 of yacc.c  */
-#line 1696 "parser.yy"
+#line 1691 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7317 +7321 @@
 
 /* Line 1806 of yacc.c  */
-#line 1698 "parser.yy"
+#line 1693 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7324 +7328 @@
 
 /* Line 1806 of yacc.c  */
-#line 1700 "parser.yy"
+#line 1695 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7331 +7335 @@
 
 /* Line 1806 of yacc.c  */
-#line 1706 "parser.yy"
+#line 1701 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7338 +7342 @@
 
 /* Line 1806 of yacc.c  */
+#line 1703 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 460:
+
+/* Line 1806 of yacc.c  */
 #line 1708 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 460:
-
-/* Line 1806 of yacc.c  */
-#line 1713 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypeGen( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -7352 +7356 @@
 
 /* Line 1806 of yacc.c  */
+#line 1714 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(3) - (4)].decl) ); }
+    break;
+
+  case 463:
+
+/* Line 1806 of yacc.c  */
 #line 1719 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(3) - (4)].decl) ); }
-    break;
-
-  case 463:
-
-/* Line 1806 of yacc.c  */
-#line 1724 "parser.yy"
     { typedefTable.addToEnclosingScope( *(yyvsp[(2) - (2)].tok), TypedefTable::TD ); }
     break;
@@ -7366 +7370 @@
 
 /* Line 1806 of yacc.c  */
-#line 1726 "parser.yy"
+#line 1721 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTypeParam( (yyvsp[(1) - (4)].tclass), (yyvsp[(2) - (4)].tok) )->addAssertions( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -7373 +7377 @@
 
 /* Line 1806 of yacc.c  */
-#line 1732 "parser.yy"
+#line 1727 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Type; }
     break;
@@ -7380 +7384 @@
 
 /* Line 1806 of yacc.c  */
-#line 1734 "parser.yy"
+#line 1729 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Ftype; }
     break;
@@ -7387 +7391 @@
 
 /* Line 1806 of yacc.c  */
+#line 1731 "parser.yy"
+    { (yyval.tclass) = DeclarationNode::Dtype; }
+    break;
+
+  case 469:
+
+/* Line 1806 of yacc.c  */
 #line 1736 "parser.yy"
-    { (yyval.tclass) = DeclarationNode::Dtype; }
-    break;
-
-  case 469:
-
-/* Line 1806 of yacc.c  */
-#line 1741 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7401 +7405 @@
 
 /* Line 1806 of yacc.c  */
+#line 1738 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl) == 0 ? (yyvsp[(2) - (2)].decl) : (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 471:
+
+/* Line 1806 of yacc.c  */
 #line 1743 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl) == 0 ? (yyvsp[(2) - (2)].decl) : (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 471:
-
-/* Line 1806 of yacc.c  */
-#line 1748 "parser.yy"
     {
                         typedefTable.openContext( *(yyvsp[(2) - (5)].tok) );
@@ -7418 +7422 @@
 
 /* Line 1806 of yacc.c  */
-#line 1753 "parser.yy"
+#line 1748 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (5)].decl); }
     break;
@@ -7425 +7429 @@
 
 /* Line 1806 of yacc.c  */
+#line 1750 "parser.yy"
+    { (yyval.decl) = 0; }
+    break;
+
+  case 474:
+
+/* Line 1806 of yacc.c  */
 #line 1755 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
-  case 474:
+    { (yyval.en) = new TypeValueNode( (yyvsp[(1) - (1)].decl) ); }
+    break;
+
+  case 476:
+
+/* Line 1806 of yacc.c  */
+#line 1758 "parser.yy"
+    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( new TypeValueNode( (yyvsp[(3) - (3)].decl) ))); }
+    break;
+
+  case 477:
 
 /* Line 1806 of yacc.c  */
 #line 1760 "parser.yy"
-    { (yyval.en) = new TypeValueNode( (yyvsp[(1) - (1)].decl) ); }
-    break;
-
-  case 476:
-
-/* Line 1806 of yacc.c  */
-#line 1763 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( new TypeValueNode( (yyvsp[(3) - (3)].decl) ))); }
-    break;
-
-  case 477:
+    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) )); }
+    break;
+
+  case 478:
 
 /* Line 1806 of yacc.c  */
 #line 1765 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) )); }
-    break;
-
-  case 478:
-
-/* Line 1806 of yacc.c  */
-#line 1770 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
     break;
@@ -7460 +7464 @@
 
 /* Line 1806 of yacc.c  */
-#line 1772 "parser.yy"
+#line 1767 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -7467 +7471 @@
 
 /* Line 1806 of yacc.c  */
+#line 1769 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl)->copyStorageClasses( (yyvsp[(1) - (3)].decl) ) ); }
+    break;
+
+  case 481:
+
+/* Line 1806 of yacc.c  */
 #line 1774 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl)->copyStorageClasses( (yyvsp[(1) - (3)].decl) ) ); }
-    break;
-
-  case 481:
-
-/* Line 1806 of yacc.c  */
-#line 1779 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addAssertions( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7481 +7485 @@
 
 /* Line 1806 of yacc.c  */
+#line 1776 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addAssertions( (yyvsp[(2) - (4)].decl) )->addType( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 483:
+
+/* Line 1806 of yacc.c  */
 #line 1781 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addAssertions( (yyvsp[(2) - (4)].decl) )->addType( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 483:
-
-/* Line 1806 of yacc.c  */
-#line 1786 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (1)].tok), TypedefTable::TD );
@@ -7498 +7502 @@
 
 /* Line 1806 of yacc.c  */
-#line 1791 "parser.yy"
+#line 1786 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (6)].tok), TypedefTable::TG );
@@ -7508 +7512 @@
 
 /* Line 1806 of yacc.c  */
-#line 1799 "parser.yy"
+#line 1794 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (9)].tok), TypedefTable::ID );
@@ -7518 +7522 @@
 
 /* Line 1806 of yacc.c  */
-#line 1804 "parser.yy"
+#line 1799 "parser.yy"
     {
                         typedefTable.enterContext( *(yyvsp[(2) - (8)].tok) );
@@ -7528 +7532 @@
 
 /* Line 1806 of yacc.c  */
-#line 1809 "parser.yy"
+#line 1804 "parser.yy"
     {
                         typedefTable.leaveContext();
@@ -7539 +7543 @@
 
 /* Line 1806 of yacc.c  */
-#line 1819 "parser.yy"
+#line 1814 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
 
   case 492:
+
+/* Line 1806 of yacc.c  */
+#line 1824 "parser.yy"
+    {
+                        typedefTable.addToEnclosingScope2( TypedefTable::ID );
+                        (yyval.decl) = (yyvsp[(1) - (1)].decl);
+                }
+    break;
+
+  case 493:
 
 /* Line 1806 of yacc.c  */
@@ -7553 +7567 @@
     break;
 
-  case 493:
+  case 494:
 
 /* Line 1806 of yacc.c  */
 #line 1834 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope2( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(1) - (1)].decl);
-                }
-    break;
-
-  case 494:
-
-/* Line 1806 of yacc.c  */
-#line 1839 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
@@ -7576 +7580 @@
 
 /* Line 1806 of yacc.c  */
-#line 1847 "parser.yy"
+#line 1842 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7586 +7590 @@
 
 /* Line 1806 of yacc.c  */
-#line 1852 "parser.yy"
+#line 1847 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7596 +7600 @@
 
 /* Line 1806 of yacc.c  */
-#line 1862 "parser.yy"
+#line 1857 "parser.yy"
     {}
     break;
@@ -7603 +7607 @@
 
 /* Line 1806 of yacc.c  */
-#line 1864 "parser.yy"
+#line 1859 "parser.yy"
     {
                         if ( theTree ) {
@@ -7616 +7620 @@
 
 /* Line 1806 of yacc.c  */
+#line 1871 "parser.yy"
+    { (yyval.decl) = ( (yyvsp[(1) - (3)].decl) != NULL ) ? (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ) : (yyvsp[(3) - (3)].decl); }
+    break;
+
+  case 501:
+
+/* Line 1806 of yacc.c  */
 #line 1876 "parser.yy"
-    { (yyval.decl) = ( (yyvsp[(1) - (3)].decl) != NULL ) ? (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ) : (yyvsp[(3) - (3)].decl); }
-    break;
-
-  case 501:
-
-/* Line 1806 of yacc.c  */
-#line 1881 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7630 +7634 @@
 
 /* Line 1806 of yacc.c  */
-#line 1889 "parser.yy"
+#line 1884 "parser.yy"
     {}
     break;
@@ -7637 +7641 @@
 
 /* Line 1806 of yacc.c  */
-#line 1891 "parser.yy"
+#line 1886 "parser.yy"
     {
                         linkageStack.push( linkage );
@@ -7647 +7651 @@
 
 /* Line 1806 of yacc.c  */
-#line 1896 "parser.yy"
+#line 1891 "parser.yy"
     {
                         linkage = linkageStack.top();
@@ -7658 +7662 @@
 
 /* Line 1806 of yacc.c  */
-#line 1902 "parser.yy"
+#line 1897 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
     break;
@@ -7665 +7669 @@
 
 /* Line 1806 of yacc.c  */
-#line 1912 "parser.yy"
+#line 1907 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7676 +7680 @@
 
 /* Line 1806 of yacc.c  */
-#line 1918 "parser.yy"
+#line 1913 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7687 +7691 @@
 
 /* Line 1806 of yacc.c  */
-#line 1927 "parser.yy"
+#line 1922 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7698 +7702 @@
 
 /* Line 1806 of yacc.c  */
-#line 1933 "parser.yy"
+#line 1928 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7709 +7713 @@
 
 /* Line 1806 of yacc.c  */
-#line 1939 "parser.yy"
+#line 1934 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7720 +7724 @@
 
 /* Line 1806 of yacc.c  */
-#line 1945 "parser.yy"
+#line 1940 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7731 +7735 @@
 
 /* Line 1806 of yacc.c  */
-#line 1951 "parser.yy"
+#line 1946 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7742 +7746 @@
 
 /* Line 1806 of yacc.c  */
-#line 1959 "parser.yy"
+#line 1954 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7753 +7757 @@
 
 /* Line 1806 of yacc.c  */
-#line 1965 "parser.yy"
+#line 1960 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7764 +7768 @@
 
 /* Line 1806 of yacc.c  */
-#line 1973 "parser.yy"
+#line 1968 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7775 +7779 @@
 
 /* Line 1806 of yacc.c  */
-#line 1979 "parser.yy"
+#line 1974 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7786 +7790 @@
 
 /* Line 1806 of yacc.c  */
-#line 1994 "parser.yy"
+#line 1989 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Range ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 
-  case 527:
-
-/* Line 1806 of yacc.c  */
-#line 2004 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
-  case 530:
-
-/* Line 1806 of yacc.c  */
-#line 2011 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 531:
-
-/* Line 1806 of yacc.c  */
-#line 2017 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
   case 537:
 
 /* Line 1806 of yacc.c  */
-#line 2032 "parser.yy"
+#line 2023 "parser.yy"
     {}
     break;
@@ -7821 +7804 @@
 
 /* Line 1806 of yacc.c  */
-#line 2033 "parser.yy"
+#line 2024 "parser.yy"
     {}
     break;
@@ -7828 +7811 @@
 
 /* Line 1806 of yacc.c  */
-#line 2034 "parser.yy"
+#line 2025 "parser.yy"
     {}
     break;
@@ -7835 +7818 @@
 
 /* Line 1806 of yacc.c  */
-#line 2035 "parser.yy"
+#line 2026 "parser.yy"
     {}
     break;
 
-  case 541:
-
-/* Line 1806 of yacc.c  */
-#line 2070 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 543:
-
-/* Line 1806 of yacc.c  */
-#line 2073 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 544:
-
-/* Line 1806 of yacc.c  */
-#line 2075 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 545:
 
 /* Line 1806 of yacc.c  */
-#line 2080 "parser.yy"
+#line 2068 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -7873 +7835 @@
 
 /* Line 1806 of yacc.c  */
-#line 2085 "parser.yy"
+#line 2073 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -7880 +7842 @@
 
 /* Line 1806 of yacc.c  */
-#line 2090 "parser.yy"
+#line 2078 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -7887 +7849 @@
 
 /* Line 1806 of yacc.c  */
-#line 2092 "parser.yy"
+#line 2080 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -7894 +7856 @@
 
 /* Line 1806 of yacc.c  */
-#line 2094 "parser.yy"
+#line 2082 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -7901 +7863 @@
 
 /* Line 1806 of yacc.c  */
-#line 2099 "parser.yy"
+#line 2087 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7908 +7870 @@
 
 /* Line 1806 of yacc.c  */
-#line 2101 "parser.yy"
+#line 2089 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -7915 +7877 @@
 
 /* Line 1806 of yacc.c  */
-#line 2103 "parser.yy"
+#line 2091 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -7922 +7884 @@
 
 /* Line 1806 of yacc.c  */
-#line 2105 "parser.yy"
+#line 2093 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -7929 +7891 @@
 
 /* Line 1806 of yacc.c  */
-#line 2110 "parser.yy"
+#line 2098 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -7936 +7898 @@
 
 /* Line 1806 of yacc.c  */
-#line 2112 "parser.yy"
+#line 2100 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 556:
-
-/* Line 1806 of yacc.c  */
-#line 2122 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 558:
+  case 559:
+
+/* Line 1806 of yacc.c  */
+#line 2116 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
+    break;
+
+  case 560:
+
+/* Line 1806 of yacc.c  */
+#line 2118 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 561:
+
+/* Line 1806 of yacc.c  */
+#line 2120 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 562:
 
 /* Line 1806 of yacc.c  */
 #line 2125 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 559:
-
-/* Line 1806 of yacc.c  */
-#line 2130 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 563:
+
+/* Line 1806 of yacc.c  */
+#line 2127 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 564:
+
+/* Line 1806 of yacc.c  */
+#line 2129 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 565:
+
+/* Line 1806 of yacc.c  */
+#line 2134 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 566:
+
+/* Line 1806 of yacc.c  */
+#line 2136 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 567:
+
+/* Line 1806 of yacc.c  */
+#line 2138 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 571:
+
+/* Line 1806 of yacc.c  */
+#line 2153 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addIdList( (yyvsp[(3) - (4)].decl) ); }
+    break;
+
+  case 572:
+
+/* Line 1806 of yacc.c  */
+#line 2155 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (6)].decl)->addIdList( (yyvsp[(5) - (6)].decl) ); }
+    break;
+
+  case 573:
+
+/* Line 1806 of yacc.c  */
+#line 2157 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 574:
+
+/* Line 1806 of yacc.c  */
+#line 2162 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 575:
+
+/* Line 1806 of yacc.c  */
+#line 2164 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 576:
+
+/* Line 1806 of yacc.c  */
+#line 2166 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 577:
+
+/* Line 1806 of yacc.c  */
+#line 2171 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 578:
+
+/* Line 1806 of yacc.c  */
+#line 2173 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 579:
+
+/* Line 1806 of yacc.c  */
+#line 2175 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 585:
+
+/* Line 1806 of yacc.c  */
+#line 2198 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 586:
+
+/* Line 1806 of yacc.c  */
+#line 2203 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 587:
+
+/* Line 1806 of yacc.c  */
+#line 2205 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 588:
+
+/* Line 1806 of yacc.c  */
+#line 2207 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 589:
+
+/* Line 1806 of yacc.c  */
+#line 2212 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 590:
+
+/* Line 1806 of yacc.c  */
+#line 2214 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 591:
+
+/* Line 1806 of yacc.c  */
+#line 2216 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 592:
+
+/* Line 1806 of yacc.c  */
+#line 2218 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 593:
+
+/* Line 1806 of yacc.c  */
+#line 2223 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
 
-  case 560:
-
-/* Line 1806 of yacc.c  */
-#line 2132 "parser.yy"
+  case 594:
+
+/* Line 1806 of yacc.c  */
+#line 2225 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
 
-  case 561:
-
-/* Line 1806 of yacc.c  */
-#line 2134 "parser.yy"
+  case 595:
+
+/* Line 1806 of yacc.c  */
+#line 2227 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 562:
-
-/* Line 1806 of yacc.c  */
-#line 2139 "parser.yy"
+  case 600:
+
+/* Line 1806 of yacc.c  */
+#line 2244 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 
-  case 563:
-
-/* Line 1806 of yacc.c  */
-#line 2141 "parser.yy"
+  case 601:
+
+/* Line 1806 of yacc.c  */
+#line 2246 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
 
-  case 564:
-
-/* Line 1806 of yacc.c  */
-#line 2143 "parser.yy"
+  case 602:
+
+/* Line 1806 of yacc.c  */
+#line 2248 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 565:
-
-/* Line 1806 of yacc.c  */
-#line 2148 "parser.yy"
+  case 603:
+
+/* Line 1806 of yacc.c  */
+#line 2253 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 604:
+
+/* Line 1806 of yacc.c  */
+#line 2255 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 
-  case 566:
-
-/* Line 1806 of yacc.c  */
-#line 2150 "parser.yy"
+  case 605:
+
+/* Line 1806 of yacc.c  */
+#line 2257 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 
-  case 567:
-
-/* Line 1806 of yacc.c  */
-#line 2152 "parser.yy"
+  case 606:
+
+/* Line 1806 of yacc.c  */
+#line 2259 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 571:
-
-/* Line 1806 of yacc.c  */
-#line 2167 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addIdList( (yyvsp[(3) - (4)].decl) ); }
-    break;
-
-  case 572:
-
-/* Line 1806 of yacc.c  */
-#line 2169 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (6)].decl)->addIdList( (yyvsp[(5) - (6)].decl) ); }
-    break;
-
-  case 573:
-
-/* Line 1806 of yacc.c  */
-#line 2171 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 574:
-
-/* Line 1806 of yacc.c  */
-#line 2176 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 575:
-
-/* Line 1806 of yacc.c  */
-#line 2178 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 576:
-
-/* Line 1806 of yacc.c  */
-#line 2180 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 577:
-
-/* Line 1806 of yacc.c  */
-#line 2185 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 578:
-
-/* Line 1806 of yacc.c  */
-#line 2187 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 579:
-
-/* Line 1806 of yacc.c  */
-#line 2189 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 580:
-
-/* Line 1806 of yacc.c  */
-#line 2204 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 582:
-
-/* Line 1806 of yacc.c  */
-#line 2207 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 583:
-
-/* Line 1806 of yacc.c  */
-#line 2209 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 585:
-
-/* Line 1806 of yacc.c  */
-#line 2215 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 586:
-
-/* Line 1806 of yacc.c  */
-#line 2220 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 587:
-
-/* Line 1806 of yacc.c  */
-#line 2222 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 588:
-
-/* Line 1806 of yacc.c  */
-#line 2224 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 589:
-
-/* Line 1806 of yacc.c  */
-#line 2229 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 590:
-
-/* Line 1806 of yacc.c  */
-#line 2231 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 591:
-
-/* Line 1806 of yacc.c  */
-#line 2233 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 592:
-
-/* Line 1806 of yacc.c  */
-#line 2235 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 593:
-
-/* Line 1806 of yacc.c  */
-#line 2240 "parser.yy"
+  case 607:
+
+/* Line 1806 of yacc.c  */
+#line 2264 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
 
-  case 594:
-
-/* Line 1806 of yacc.c  */
-#line 2242 "parser.yy"
+  case 608:
+
+/* Line 1806 of yacc.c  */
+#line 2266 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
 
-  case 595:
-
-/* Line 1806 of yacc.c  */
-#line 2244 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 596:
-
-/* Line 1806 of yacc.c  */
-#line 2254 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 598:
-
-/* Line 1806 of yacc.c  */
-#line 2257 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 599:
-
-/* Line 1806 of yacc.c  */
-#line 2259 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 600:
-
-/* Line 1806 of yacc.c  */
-#line 2264 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 601:
-
-/* Line 1806 of yacc.c  */
-#line 2266 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 602:
+  case 609:
 
 /* Line 1806 of yacc.c  */
@@ -8220 +8175 @@
     break;
 
-  case 603:
-
-/* Line 1806 of yacc.c  */
-#line 2273 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 604:
-
-/* Line 1806 of yacc.c  */
-#line 2275 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 605:
-
-/* Line 1806 of yacc.c  */
-#line 2277 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 606:
-
-/* Line 1806 of yacc.c  */
-#line 2279 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 607:
-
-/* Line 1806 of yacc.c  */
-#line 2284 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-
-  case 608:
-
-/* Line 1806 of yacc.c  */
-#line 2286 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 609:
-
-/* Line 1806 of yacc.c  */
-#line 2288 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 610:
-
-/* Line 1806 of yacc.c  */
-#line 2319 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 612:
-
-/* Line 1806 of yacc.c  */
-#line 2322 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 613:
-
-/* Line 1806 of yacc.c  */
-#line 2324 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 614:
 
 /* Line 1806 of yacc.c  */
-#line 2329 "parser.yy"
+#line 2306 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8303 +8188 @@
 
 /* Line 1806 of yacc.c  */
-#line 2334 "parser.yy"
+#line 2311 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8313 +8198 @@
 
 /* Line 1806 of yacc.c  */
-#line 2342 "parser.yy"
+#line 2319 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8320 +8205 @@
 
 /* Line 1806 of yacc.c  */
-#line 2344 "parser.yy"
+#line 2321 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8327 +8212 @@
 
 /* Line 1806 of yacc.c  */
-#line 2346 "parser.yy"
+#line 2323 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8334 +8219 @@
 
 /* Line 1806 of yacc.c  */
-#line 2351 "parser.yy"
+#line 2328 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8341 +8226 @@
 
 /* Line 1806 of yacc.c  */
-#line 2353 "parser.yy"
+#line 2330 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8348 +8233 @@
 
 /* Line 1806 of yacc.c  */
-#line 2358 "parser.yy"
+#line 2335 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
@@ -8355 +8240 @@
 
 /* Line 1806 of yacc.c  */
-#line 2360 "parser.yy"
+#line 2337 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
 
-  case 624:
+  case 626:
+
+/* Line 1806 of yacc.c  */
+#line 2357 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
+    break;
+
+  case 627:
+
+/* Line 1806 of yacc.c  */
+#line 2359 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 628:
+
+/* Line 1806 of yacc.c  */
+#line 2361 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 629:
+
+/* Line 1806 of yacc.c  */
+#line 2363 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 630:
+
+/* Line 1806 of yacc.c  */
+#line 2365 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 632:
+
+/* Line 1806 of yacc.c  */
+#line 2371 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 633:
+
+/* Line 1806 of yacc.c  */
+#line 2373 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 634:
 
 /* Line 1806 of yacc.c  */
 #line 2375 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 625:
-
-/* Line 1806 of yacc.c  */
-#line 2377 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 626:
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 635:
+
+/* Line 1806 of yacc.c  */
+#line 2380 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
+    break;
+
+  case 636:
 
 /* Line 1806 of yacc.c  */
 #line 2382 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 637:
+
+/* Line 1806 of yacc.c  */
+#line 2384 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 638:
+
+/* Line 1806 of yacc.c  */
+#line 2390 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
+    break;
+
+  case 639:
+
+/* Line 1806 of yacc.c  */
+#line 2392 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false )->addArray( (yyvsp[(3) - (3)].decl) ); }
+    break;
+
+  case 641:
+
+/* Line 1806 of yacc.c  */
+#line 2398 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(3) - (5)].en), 0, false ); }
+    break;
+
+  case 642:
+
+/* Line 1806 of yacc.c  */
+#line 2400 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newVarArray( 0 ); }
+    break;
+
+  case 643:
+
+/* Line 1806 of yacc.c  */
+#line 2402 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newArray( (yyvsp[(4) - (6)].en), 0, false ) ); }
+    break;
+
+  case 644:
+
+/* Line 1806 of yacc.c  */
+#line 2404 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newVarArray( 0 ) ); }
+    break;
+
+  case 648:
+
+/* Line 1806 of yacc.c  */
+#line 2424 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
 
-  case 627:
-
-/* Line 1806 of yacc.c  */
-#line 2384 "parser.yy"
+  case 649:
+
+/* Line 1806 of yacc.c  */
+#line 2426 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 628:
-
-/* Line 1806 of yacc.c  */
-#line 2386 "parser.yy"
+  case 650:
+
+/* Line 1806 of yacc.c  */
+#line 2428 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 
-  case 629:
-
-/* Line 1806 of yacc.c  */
-#line 2388 "parser.yy"
+  case 651:
+
+/* Line 1806 of yacc.c  */
+#line 2430 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
 
-  case 630:
-
-/* Line 1806 of yacc.c  */
-#line 2390 "parser.yy"
+  case 652:
+
+/* Line 1806 of yacc.c  */
+#line 2432 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 632:
-
-/* Line 1806 of yacc.c  */
-#line 2396 "parser.yy"
+  case 654:
+
+/* Line 1806 of yacc.c  */
+#line 2438 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 
-  case 633:
-
-/* Line 1806 of yacc.c  */
-#line 2398 "parser.yy"
+  case 655:
+
+/* Line 1806 of yacc.c  */
+#line 2440 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 
-  case 634:
-
-/* Line 1806 of yacc.c  */
-#line 2400 "parser.yy"
+  case 656:
+
+/* Line 1806 of yacc.c  */
+#line 2442 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 635:
-
-/* Line 1806 of yacc.c  */
-#line 2405 "parser.yy"
+  case 657:
+
+/* Line 1806 of yacc.c  */
+#line 2447 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
     break;
 
-  case 636:
-
-/* Line 1806 of yacc.c  */
-#line 2407 "parser.yy"
+  case 658:
+
+/* Line 1806 of yacc.c  */
+#line 2449 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
 
-  case 637:
-
-/* Line 1806 of yacc.c  */
-#line 2409 "parser.yy"
+  case 659:
+
+/* Line 1806 of yacc.c  */
+#line 2451 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 638:
-
-/* Line 1806 of yacc.c  */
-#line 2415 "parser.yy"
+  case 661:
+
+/* Line 1806 of yacc.c  */
+#line 2458 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 663:
+
+/* Line 1806 of yacc.c  */
+#line 2469 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
     break;
 
-  case 639:
-
-/* Line 1806 of yacc.c  */
-#line 2417 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false )->addArray( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 641:
-
-/* Line 1806 of yacc.c  */
-#line 2423 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(3) - (5)].en), 0, false ); }
-    break;
-
-  case 642:
-
-/* Line 1806 of yacc.c  */
-#line 2425 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newVarArray( 0 ); }
-    break;
-
-  case 643:
-
-/* Line 1806 of yacc.c  */
-#line 2427 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newArray( (yyvsp[(4) - (6)].en), 0, false ) ); }
-    break;
-
-  case 644:
-
-/* Line 1806 of yacc.c  */
-#line 2429 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newVarArray( 0 ) ); }
-    break;
-
-  case 646:
-
-/* Line 1806 of yacc.c  */
-#line 2444 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 647:
-
-/* Line 1806 of yacc.c  */
-#line 2446 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 648:
-
-/* Line 1806 of yacc.c  */
-#line 2451 "parser.yy"
+  case 664:
+
+/* Line 1806 of yacc.c  */
+#line 2472 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
+    break;
+
+  case 665:
+
+/* Line 1806 of yacc.c  */
+#line 2474 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( 0, (yyvsp[(3) - (5)].decl), false ); }
+    break;
+
+  case 666:
+
+/* Line 1806 of yacc.c  */
+#line 2477 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
+    break;
+
+  case 667:
+
+/* Line 1806 of yacc.c  */
+#line 2479 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl), true ); }
+    break;
+
+  case 668:
+
+/* Line 1806 of yacc.c  */
+#line 2481 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(3) - (7)].decl), true ); }
+    break;
+
+  case 672:
+
+/* Line 1806 of yacc.c  */
+#line 2500 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
 
-  case 649:
-
-/* Line 1806 of yacc.c  */
-#line 2453 "parser.yy"
+  case 673:
+
+/* Line 1806 of yacc.c  */
+#line 2502 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 650:
-
-/* Line 1806 of yacc.c  */
-#line 2455 "parser.yy"
+  case 674:
+
+/* Line 1806 of yacc.c  */
+#line 2504 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 
-  case 651:
-
-/* Line 1806 of yacc.c  */
-#line 2457 "parser.yy"
+  case 675:
+
+/* Line 1806 of yacc.c  */
+#line 2506 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
 
-  case 652:
-
-/* Line 1806 of yacc.c  */
-#line 2459 "parser.yy"
+  case 676:
+
+/* Line 1806 of yacc.c  */
+#line 2508 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 654:
-
-/* Line 1806 of yacc.c  */
-#line 2465 "parser.yy"
+  case 678:
+
+/* Line 1806 of yacc.c  */
+#line 2514 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 
-  case 655:
-
-/* Line 1806 of yacc.c  */
-#line 2467 "parser.yy"
+  case 679:
+
+/* Line 1806 of yacc.c  */
+#line 2516 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 
-  case 656:
-
-/* Line 1806 of yacc.c  */
-#line 2469 "parser.yy"
+  case 680:
+
+/* Line 1806 of yacc.c  */
+#line 2518 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 657:
-
-/* Line 1806 of yacc.c  */
-#line 2474 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
-    break;
-
-  case 658:
-
-/* Line 1806 of yacc.c  */
-#line 2476 "parser.yy"
+  case 681:
+
+/* Line 1806 of yacc.c  */
+#line 2523 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
 
-  case 659:
-
-/* Line 1806 of yacc.c  */
-#line 2478 "parser.yy"
+  case 682:
+
+/* Line 1806 of yacc.c  */
+#line 2525 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 661:
-
-/* Line 1806 of yacc.c  */
-#line 2485 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 663:
-
-/* Line 1806 of yacc.c  */
-#line 2496 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
-    break;
-
-  case 664:
-
-/* Line 1806 of yacc.c  */
-#line 2499 "parser.yy"
+  case 685:
+
+/* Line 1806 of yacc.c  */
+#line 2535 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 688:
+
+/* Line 1806 of yacc.c  */
+#line 2545 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 689:
+
+/* Line 1806 of yacc.c  */
+#line 2547 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+    break;
+
+  case 690:
+
+/* Line 1806 of yacc.c  */
+#line 2549 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 691:
+
+/* Line 1806 of yacc.c  */
+#line 2551 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+    break;
+
+  case 692:
+
+/* Line 1806 of yacc.c  */
+#line 2553 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 693:
+
+/* Line 1806 of yacc.c  */
+#line 2555 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+    break;
+
+  case 694:
+
+/* Line 1806 of yacc.c  */
+#line 2562 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 695:
+
+/* Line 1806 of yacc.c  */
+#line 2564 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 696:
+
+/* Line 1806 of yacc.c  */
+#line 2566 "parser.yy"
+    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 697:
+
+/* Line 1806 of yacc.c  */
+#line 2568 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
+    break;
+
+  case 698:
+
+/* Line 1806 of yacc.c  */
+#line 2570 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 699:
+
+/* Line 1806 of yacc.c  */
+#line 2572 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 700:
+
+/* Line 1806 of yacc.c  */
+#line 2574 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 701:
+
+/* Line 1806 of yacc.c  */
+#line 2576 "parser.yy"
+    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 702:
+
+/* Line 1806 of yacc.c  */
+#line 2578 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
+    break;
+
+  case 703:
+
+/* Line 1806 of yacc.c  */
+#line 2580 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 704:
+
+/* Line 1806 of yacc.c  */
+#line 2585 "parser.yy"
     { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
     break;
 
-  case 665:
-
-/* Line 1806 of yacc.c  */
-#line 2501 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( 0, (yyvsp[(3) - (5)].decl), false ); }
-    break;
-
-  case 666:
-
-/* Line 1806 of yacc.c  */
-#line 2504 "parser.yy"
+  case 705:
+
+/* Line 1806 of yacc.c  */
+#line 2587 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
     break;
 
-  case 667:
-
-/* Line 1806 of yacc.c  */
-#line 2506 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl), true ); }
-    break;
-
-  case 668:
-
-/* Line 1806 of yacc.c  */
-#line 2508 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(3) - (7)].decl), true ); }
-    break;
-
-  case 670:
-
-/* Line 1806 of yacc.c  */
-#line 2522 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 671:
-
-/* Line 1806 of yacc.c  */
-#line 2524 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 672:
-
-/* Line 1806 of yacc.c  */
-#line 2529 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
-    break;
-
-  case 673:
-
-/* Line 1806 of yacc.c  */
-#line 2531 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 674:
-
-/* Line 1806 of yacc.c  */
-#line 2533 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 675:
-
-/* Line 1806 of yacc.c  */
-#line 2535 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 676:
-
-/* Line 1806 of yacc.c  */
-#line 2537 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 678:
-
-/* Line 1806 of yacc.c  */
-#line 2543 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 679:
-
-/* Line 1806 of yacc.c  */
-#line 2545 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 680:
-
-/* Line 1806 of yacc.c  */
-#line 2547 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 681:
-
-/* Line 1806 of yacc.c  */
-#line 2552 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 682:
-
-/* Line 1806 of yacc.c  */
-#line 2554 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 685:
-
-/* Line 1806 of yacc.c  */
-#line 2564 "parser.yy"
+  case 706:
+
+/* Line 1806 of yacc.c  */
+#line 2592 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), true ); }
+    break;
+
+  case 707:
+
+/* Line 1806 of yacc.c  */
+#line 2594 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl)->addQualifiers( (yyvsp[(3) - (7)].decl) ), true ); }
+    break;
+
+  case 709:
+
+/* Line 1806 of yacc.c  */
+#line 2621 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 688:
-
-/* Line 1806 of yacc.c  */
-#line 2574 "parser.yy"
+  case 713:
+
+/* Line 1806 of yacc.c  */
+#line 2632 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 
-  case 689:
-
-/* Line 1806 of yacc.c  */
-#line 2576 "parser.yy"
+  case 714:
+
+/* Line 1806 of yacc.c  */
+#line 2634 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
 
-  case 690:
-
-/* Line 1806 of yacc.c  */
-#line 2578 "parser.yy"
+  case 715:
+
+/* Line 1806 of yacc.c  */
+#line 2636 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 
-  case 691:
-
-/* Line 1806 of yacc.c  */
-#line 2580 "parser.yy"
+  case 716:
+
+/* Line 1806 of yacc.c  */
+#line 2638 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
 
-  case 692:
-
-/* Line 1806 of yacc.c  */
-#line 2582 "parser.yy"
+  case 717:
+
+/* Line 1806 of yacc.c  */
+#line 2640 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 
-  case 693:
-
-/* Line 1806 of yacc.c  */
-#line 2584 "parser.yy"
+  case 718:
+
+/* Line 1806 of yacc.c  */
+#line 2642 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
 
-  case 694:
-
-/* Line 1806 of yacc.c  */
-#line 2591 "parser.yy"
+  case 719:
+
+/* Line 1806 of yacc.c  */
+#line 2649 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
 
-  case 695:
-
-/* Line 1806 of yacc.c  */
-#line 2593 "parser.yy"
+  case 720:
+
+/* Line 1806 of yacc.c  */
+#line 2651 "parser.yy"
+    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 721:
+
+/* Line 1806 of yacc.c  */
+#line 2653 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 696:
-
-/* Line 1806 of yacc.c  */
-#line 2595 "parser.yy"
+  case 722:
+
+/* Line 1806 of yacc.c  */
+#line 2655 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 723:
+
+/* Line 1806 of yacc.c  */
+#line 2657 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
 
-  case 697:
-
-/* Line 1806 of yacc.c  */
-#line 2597 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
-    break;
-
-  case 698:
-
-/* Line 1806 of yacc.c  */
-#line 2599 "parser.yy"
+  case 724:
+
+/* Line 1806 of yacc.c  */
+#line 2659 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 699:
-
-/* Line 1806 of yacc.c  */
-#line 2601 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 700:
-
-/* Line 1806 of yacc.c  */
-#line 2603 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 701:
-
-/* Line 1806 of yacc.c  */
-#line 2605 "parser.yy"
-    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 702:
-
-/* Line 1806 of yacc.c  */
-#line 2607 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
-    break;
-
-  case 703:
-
-/* Line 1806 of yacc.c  */
-#line 2609 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 704:
-
-/* Line 1806 of yacc.c  */
-#line 2614 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
-    break;
-
-  case 705:
-
-/* Line 1806 of yacc.c  */
-#line 2616 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
-    break;
-
-  case 706:
-
-/* Line 1806 of yacc.c  */
-#line 2621 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), true ); }
-    break;
-
-  case 707:
-
-/* Line 1806 of yacc.c  */
-#line 2623 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl)->addQualifiers( (yyvsp[(3) - (7)].decl) ), true ); }
-    break;
-
-  case 709:
-
-/* Line 1806 of yacc.c  */
-#line 2650 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 713:
-
-/* Line 1806 of yacc.c  */
-#line 2661 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 714:
-
-/* Line 1806 of yacc.c  */
-#line 2663 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
-    break;
-
-  case 715:
-
-/* Line 1806 of yacc.c  */
-#line 2665 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 716:
-
-/* Line 1806 of yacc.c  */
-#line 2667 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
-    break;
-
-  case 717:
+  case 725:
+
+/* Line 1806 of yacc.c  */
+#line 2664 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
+    break;
+
+  case 726:
 
 /* Line 1806 of yacc.c  */
 #line 2669 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 718:
+    { (yyval.decl) = DeclarationNode::newFunction( 0, DeclarationNode::newTuple( 0 ), (yyvsp[(4) - (5)].decl), 0 ); }
+    break;
+
+  case 727:
 
 /* Line 1806 of yacc.c  */
 #line 2671 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
-    break;
-
-  case 719:
-
-/* Line 1806 of yacc.c  */
-#line 2678 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 720:
-
-/* Line 1806 of yacc.c  */
-#line 2680 "parser.yy"
-    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 721:
-
-/* Line 1806 of yacc.c  */
-#line 2682 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 722:
-
-/* Line 1806 of yacc.c  */
-#line 2684 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 723:
-
-/* Line 1806 of yacc.c  */
-#line 2686 "parser.yy"
-    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 724:
-
-/* Line 1806 of yacc.c  */
-#line 2688 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 725:
-
-/* Line 1806 of yacc.c  */
-#line 2693 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
-    break;
-
-  case 726:
-
-/* Line 1806 of yacc.c  */
-#line 2698 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFunction( 0, DeclarationNode::newTuple( 0 ), (yyvsp[(4) - (5)].decl), 0 ); }
-    break;
-
-  case 727:
-
-/* Line 1806 of yacc.c  */
-#line 2700 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), 0 ); }
     break;
@@ -8978 +8821 @@
 
 /* Line 1806 of yacc.c  */
-#line 2702 "parser.yy"
+#line 2673 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), 0 ); }
     break;
@@ -8985 +8828 @@
 
 /* Line 1806 of yacc.c  */
-#line 2726 "parser.yy"
+#line 2697 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -8992 +8835 @@
 
 /* Line 1806 of yacc.c  */
-#line 2728 "parser.yy"
+#line 2699 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -8999 +8842 @@
 
 /* Line 1806 of yacc.c  */
-#line 9002 "Parser/parser.cc"
+#line 8845 "Parser/parser.cc"
       default: break;
     }
@@ -9230 +9073 @@
 
 /* Line 2067 of yacc.c  */
-#line 2731 "parser.yy"
+#line 2702 "parser.yy"
 
 // ----end of grammar----

src/Parser/parser.h

@@ -246 +246 @@
 
 /* Line 2068 of yacc.c  */
-#line 108 "parser.yy"
+#line 107 "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 : Thu Jul 16 16:25:12 2015
-// Update Count     : 1267
+// Last Modified On : Fri Jul  3 13:53:45 2015
+// Update Count     : 1220
 // 
 
@@ -54 +54 @@
 #include "lex.h"
 #include "ParseNode.h"
-#include "TypeData.h"
 #include "LinkageSpec.h"
 
@@ -228 +227 @@
 %type<decl> variable_abstract_array variable_abstract_declarator variable_abstract_function
 %type<decl> variable_abstract_ptr variable_array variable_declarator variable_function variable_ptr
-
-%type<decl> attribute_list_opt attribute_list attribute
 
 // initializers
@@ -623 +620 @@
 labeled_statement:
         no_attr_identifier ':' attribute_list_opt statement
-                {
-                        $$ = $4->add_label( $1 );
-                }
+                { $$ = $4->add_label( $1 );}
         ;
 
@@ -1187 +1182 @@
         type_qualifier_name
         | attribute
-        //{ $$ = DeclarationNode::newQualifier( DeclarationNode::Attribute ); }
+                { $$ = DeclarationNode::newQualifier( DeclarationNode::Attribute ); }
         ;
 
@@ -2002 +1997 @@
 attribute_list_opt:                                                                             // GCC
         // empty
-                { $$ = 0; }
         | attribute_list
         ;
@@ -2009 +2003 @@
         attribute
         | attribute_list attribute
-                { $$ = $2->addQualifiers( $1 ); }
         ;
 
 attribute:                                                                                              // GCC
         ATTRIBUTE '(' '(' attribute_parameter_list ')' ')'
-        //              { $$ = DeclarationNode::newQualifier( DeclarationNode::Attribute ); }
-                { $$ = 0; }
         ;
 
@@ -2068 +2059 @@
 variable_declarator:
         paren_identifier attribute_list_opt
-                { $$ = $1->addQualifiers( $2 ); }
         | variable_ptr
         | variable_array attribute_list_opt
-                { $$ = $1->addQualifiers( $2 ); }
         | variable_function attribute_list_opt
-                { $$ = $1->addQualifiers( $2 ); }
         ;
 
@@ -2120 +2108 @@
 function_declarator:
         function_no_ptr attribute_list_opt
-                { $$ = $1->addQualifiers( $2 ); }
         | function_ptr
         | function_array attribute_list_opt
-                { $$ = $1->addQualifiers( $2 ); }
         ;
 
@@ -2202 +2188 @@
 type_redeclarator:
         paren_type attribute_list_opt
-                { $$ = $1->addQualifiers( $2 ); }
         | type_ptr
         | type_array attribute_list_opt
-                { $$ = $1->addQualifiers( $2 ); }
         | type_function attribute_list_opt
-                { $$ = $1->addQualifiers( $2 ); }
         ;
 
@@ -2252 +2235 @@
 identifier_parameter_declarator:
         paren_identifier attribute_list_opt
-                { $$ = $1->addQualifiers( $2 ); }
         | identifier_parameter_ptr
         | identifier_parameter_array attribute_list_opt
-                { $$ = $1->addQualifiers( $2 ); }
         | identifier_parameter_function attribute_list_opt
-                { $$ = $1->addQualifiers( $2 ); }
         ;
 
@@ -2317 +2297 @@
 type_parameter_redeclarator:
         typedef attribute_list_opt
-                { $$ = $1->addQualifiers( $2 ); }
         | type_parameter_ptr
         | type_parameter_array attribute_list_opt
-                { $$ = $1->addQualifiers( $2 ); }
         | type_parameter_function attribute_list_opt
-                { $$ = $1->addQualifiers( $2 ); }
         ;
 
@@ -2373 +2350 @@
         abstract_ptr
         | abstract_array attribute_list_opt
-                { $$ = $1->addQualifiers( $2 ); }
         | abstract_function attribute_list_opt
-                { $$ = $1->addQualifiers( $2 ); }
         ;
 
@@ -2442 +2417 @@
         abstract_parameter_ptr
         | abstract_parameter_array attribute_list_opt
-                { $$ = $1->addQualifiers( $2 ); }
         | abstract_parameter_function attribute_list_opt
-                { $$ = $1->addQualifiers( $2 ); }
         ;
 
@@ -2520 +2493 @@
         variable_abstract_ptr
         | variable_abstract_array attribute_list_opt
-                { $$ = $1->addQualifiers( $2 ); }
         | variable_abstract_function attribute_list_opt
-                { $$ = $1->addQualifiers( $2 ); }
         ;
 

src/ResolvExpr/Resolver.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:17:01 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jul 15 14:54:04 2015
-// Update Count     : 167
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul  3 16:18:20 2015
+// Update Count     : 159
 //
 
@@ -226 +226 @@
 
         void Resolver::visit( ForStmt *forStmt ) {
-                SymTab::Indexer::visit( forStmt );
-
+            // SymTab::Indexer::visit( forStmt );
+                Expression *newExpr;
+            // for statements introduce a level of scope
+            enterScope();
+            maybeAccept( forStmt->get_initialization(), *this );
                 if ( forStmt->get_condition() ) {
-                        Expression * newExpr = findSingleExpression( forStmt->get_condition(), *this );
+                        newExpr = findSingleExpression( forStmt->get_condition(), *this );
                         delete forStmt->get_condition();
                         forStmt->set_condition( newExpr );
                 } // if
-                
+  
                 if ( forStmt->get_increment() ) {
-                        Expression * newExpr = findVoidExpression( forStmt->get_increment(), *this );
+                        newExpr = findVoidExpression( forStmt->get_increment(), *this );
                         delete forStmt->get_increment();
                         forStmt->set_increment( newExpr );
                 } // if
+
+            maybeAccept( forStmt->get_condition(), *this );
+            maybeAccept( forStmt->get_increment(), *this );
+            maybeAccept( forStmt->get_body(), *this );
+            leaveScope();
         }
 

src/SymTab/AddVisit.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 16:14:32 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jul 14 12:26:17 2015
-// Update Count     : 4
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun May 17 16:16:38 2015
+// Update Count     : 3
 //
 
@@ -57 +57 @@
         inline void addVisit(ForStmt *forStmt, Visitor &visitor) {
                 addVisitStatement( forStmt->get_body(), visitor );
-                acceptAll( forStmt->get_initialization(), visitor );
+                maybeAccept( forStmt->get_initialization(), visitor );
                 maybeAccept( forStmt->get_condition(), visitor );
                 maybeAccept( forStmt->get_increment(), visitor );

src/SymTab/TypeEquality.cc

@@ -10 +10 @@
 // Created On       : Tue Jul 07 16:28:29 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Mon Jul 20 14:16:11 2015
-// Update Count     : 37
+// Last Modified On : Thu Jul 09 11:18:46 2015
+// Update Count     : 36
 //
 
@@ -91 +91 @@
                         // and must both have a dimension expression or not have a dimension
                         result = result && arrayType->get_isVarLen() == at->get_isVarLen()
-                                && ((arrayType->get_dimension() != 0 && at->get_dimension() != 0)
-                                        || (arrayType->get_dimension() == 0 && at->get_dimension() == 0));
+                                && (arrayType->get_dimension() != 0 && at->get_dimension() != 0
+                                        || arrayType->get_dimension() == 0 && at->get_dimension() == 0);
 
                         if ( vlaErr ) {

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jul 22 13:16:00 2015
-// Update Count     : 194
+// Last Modified On : Mon Jul 13 14:38:19 2015
+// Update Count     : 184
 //
 
@@ -169 +169 @@
                 virtual TypeDecl *mutate( TypeDecl *typeDecl );
                 virtual DeclarationWithType *mutate( FunctionDecl *funcDecl );
-                virtual DeclarationWithType *mutate( ObjectDecl *objDecl );
+                virtual ObjectDecl *mutate( ObjectDecl *objDecl );
                 virtual CompoundStmt *mutate( CompoundStmt *compoundStmt );
                 virtual Type *mutate( TypeInstType *aggregateUseType );
@@ -203 +203 @@
         void validateType( Type *type, const Indexer *indexer ) {
                 Pass1 pass1;
-                Pass2 pass2( false, indexer );
                 Pass3 pass3( indexer );
                 type->accept( pass1 );
-                type->accept( pass2 );
                 type->accept( pass3 );
         }
@@ -405 +403 @@
                         } // for
                 } // for
-
-                if ( ctx->get_parameters().size() != contextInst->get_parameters().size() ) {
-                        throw SemanticError( "incorrect number of context parameters: ", contextInst );
-                } // if
-
                 applySubstitution( ctx->get_parameters().begin(), ctx->get_parameters().end(), contextInst->get_parameters().begin(), ctx->get_members().begin(), ctx->get_members().end(), back_inserter( contextInst->get_members() ) );
         }
@@ -541 +534 @@
                 init->get_args().push_back( new NameExpr( "0" ) );
                 Statement *initStmt = new ExprStmt( noLabels, init );
-                std::list<Statement *> initList;
-                initList.push_back( initStmt );
   
                 UntypedExpr *cond = new UntypedExpr( new NameExpr( "?<?" ) );
@@ -568 +559 @@
                 assignExpr->get_args().push_back( srcIndex );
   
-                *out++ = new ForStmt( noLabels, initList, cond, inc, new ExprStmt( noLabels, assignExpr ) );
+                *out++ = new ForStmt( noLabels, initStmt, cond, inc, new ExprStmt( noLabels, assignExpr ) );
         }
 
@@ -621 +612 @@
                         delete assigns.front();
                         assigns.pop_front();
-                } // for
+                }
 
                 declsToAdd.insert( declsToAdd.begin(), assigns.begin(), assigns.end() );
@@ -836 +827 @@
                                 rtt->get_parameters().clear();
                                 cloneAll(typeInst->get_parameters(), rtt->get_parameters());
-                        } // if
+                        }
                         delete typeInst;
                         return ret;
@@ -890 +881 @@
         }
 
-        DeclarationWithType *EliminateTypedef::mutate( ObjectDecl * objDecl ) {
+        ObjectDecl *EliminateTypedef::mutate( ObjectDecl * objDecl ) {
                 TypedefMap oldNames = typedefNames;
-                DeclarationWithType *ret = Mutator::mutate( objDecl );
-                if ( FunctionType *funtype = dynamic_cast<FunctionType *>( ret->get_type() ) ) {
-                        return new FunctionDecl( ret->get_name(), ret->get_storageClass(), ret->get_linkage(), funtype, 0, ret->get_isInline(), ret->get_isNoreturn() );
-                } else if ( objDecl->get_isInline() || objDecl->get_isNoreturn() ) {
-                        throw SemanticError( "invalid inline or _Noreturn specification in declaration of ", objDecl );
-                } // if
+                ObjectDecl *ret = Mutator::mutate( objDecl );
                 typedefNames = oldNames;
                 return ret;

src/SynTree/Declaration.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 13 17:58:38 2015
-// Update Count     : 10
+// Last Modified On : Sat Jun 13 08:07:20 2015
+// Update Count     : 9
 //
 
@@ -27 +27 @@
 
 Declaration::Declaration( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage )
-                : name( name ), storageClass( sc ), linkage( linkage ), isInline( false ), isNoreturn( false ), uniqueId( 0 ) {
+                : name( name ), storageClass( sc ), linkage( linkage ), uniqueId( 0 ) {
 }
 
 Declaration::Declaration( const Declaration &other )
-        : name( other.name ), storageClass( other.storageClass ), linkage( other.linkage ), isInline( other.isInline ), isNoreturn( other.isNoreturn ), uniqueId( other.uniqueId ) {
+                : name( other.name ), storageClass( other.storageClass ), linkage( other.linkage ), uniqueId( other.uniqueId ) {
 }
 

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 13 18:15:59 2015
-// Update Count     : 28
+// Last Modified On : Sat Jun 13 09:10:31 2015
+// Update Count     : 25
 //
 
@@ -35 +35 @@
         LinkageSpec::Type get_linkage() const { return linkage; }
         void set_linkage( LinkageSpec::Type newValue ) { linkage = newValue; }
-        bool get_isInline() const { return isInline; }
-        void set_isInline( bool newValue ) { isInline = newValue; }
-        bool get_isNoreturn() const { return isNoreturn; }
-        void set_isNoreturn( bool newValue ) { isNoreturn = newValue; }
         UniqueId get_uniqueId() const { return uniqueId; }
 
@@ -54 +50 @@
         DeclarationNode::StorageClass storageClass;
         LinkageSpec::Type linkage;
-        bool isInline, isNoreturn;
         UniqueId uniqueId;
 };
@@ -80 +75 @@
         typedef DeclarationWithType Parent;
   public:
-        ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init, bool isInline = false, bool isNoreturn = false );
+        ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init );
         ObjectDecl( const ObjectDecl &other );
         virtual ~ObjectDecl();
@@ -94 +89 @@
         virtual ObjectDecl *clone() const { return new ObjectDecl( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
-        virtual DeclarationWithType *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual ObjectDecl *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
         virtual void printShort( std::ostream &os, int indent = 0 ) const;
@@ -117 +112 @@
         CompoundStmt *get_statements() const { return statements; }
         void set_statements( CompoundStmt *newValue ) { statements = newValue; }
+        bool get_isInline() const { return isInline; }
+        bool get_isNoreturn() const { return isNoreturn; }
         std::list< std::string >& get_oldIdents() { return oldIdents; }
         std::list< Declaration* >& get_oldDecls() { return oldDecls; }
@@ -128 +125 @@
         FunctionType *type;
         CompoundStmt *statements;
+        bool isInline, isNoreturn;
         std::list< std::string > oldIdents;
         std::list< Declaration* > oldDecls;

src/SynTree/FunctionDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 13 18:11:44 2015
-// Update Count     : 19
+// Last Modified On : Sat Jun 13 09:10:32 2015
+// Update Count     : 16
 //
 
@@ -22 +22 @@
 
 FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn )
-                : Parent( name, sc, linkage ), type( type ), statements( statements ) {
-        set_isInline( isInline );
-        set_isNoreturn( isNoreturn );
+                : Parent( name, sc, linkage ), type( type ), statements( statements ), isInline( isInline ), isNoreturn( isNoreturn ) {
         // this is a brazen hack to force the function "main" to have C linkage
         if ( name == "main" ) {
@@ -32 +30 @@
 
 FunctionDecl::FunctionDecl( const FunctionDecl &other )
-        : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ) {
+        : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ), isInline( other.isInline ), isNoreturn( other.isNoreturn ) {
 }
 
@@ -59 +57 @@
                 os << LinkageSpec::toString( get_linkage() ) << " ";
         } // if
-        if ( get_isInline() ) {
+        if ( isInline ) {
                 os << "inline ";
         } // if
-        if ( get_isNoreturn() ) {
+        if ( isNoreturn ) {
                 os << "_Noreturn ";
         } // if
@@ -98 +96 @@
                 os << get_name() << ": ";
         } // if
-        if ( get_isInline() ) {
+        if ( isInline ) {
                 os << "inline ";
         } // if
-        if ( get_isNoreturn() ) {
+        if ( isNoreturn ) {
                 os << "_Noreturn ";
         } // if

src/SynTree/Mutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 16 16:10:54 2015
-// Update Count     : 3
+// Last Modified On : Mon May 18 10:10:46 2015
+// Update Count     : 1
 //
 
@@ -28 +28 @@
 Mutator::~Mutator() {}
 
-DeclarationWithType *Mutator::mutate( ObjectDecl *objectDecl ) {
+ObjectDecl *Mutator::mutate( ObjectDecl *objectDecl ) {
         objectDecl->set_type( maybeMutate( objectDecl->get_type(), *this ) );
         objectDecl->set_init( maybeMutate( objectDecl->get_init(), *this ) );
@@ -109 +109 @@
 
 Statement *Mutator::mutate( ForStmt *forStmt ) {
-        mutateAll( forStmt->get_initialization(), *this );
+        forStmt->set_initialization( maybeMutate( forStmt->get_initialization(), *this ) );
         forStmt->set_condition( maybeMutate( forStmt->get_condition(), *this ) );
         forStmt->set_increment( maybeMutate( forStmt->get_increment(), *this ) );

src/SynTree/Mutator.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 13 18:14:47 2015
-// Update Count     : 5
+// Last Modified By : Rob Schluntz
+// Last Modified On : Fri May 29 16:34:08 2015
+// Update Count     : 4
 //
 #include <cassert>
@@ -26 +26 @@
         virtual ~Mutator();
   public:
-        virtual DeclarationWithType* mutate( ObjectDecl *objectDecl );
+        virtual ObjectDecl* mutate( ObjectDecl *objectDecl );
         virtual DeclarationWithType* mutate( FunctionDecl *functionDecl );
         virtual Declaration* mutate( StructDecl *aggregateDecl );

src/SynTree/ObjectDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 13 18:08:27 2015
-// Update Count     : 16
+// Last Modified On : Sat Jun 13 08:10:16 2015
+// Update Count     : 15
 //
 
@@ -20 +20 @@
 #include "utility.h"
 
-ObjectDecl::ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init, bool isInline, bool isNoreturn )
+ObjectDecl::ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init )
         : Parent( name, sc, linkage ), type( type ), init( init ), bitfieldWidth( bitfieldWidth ) {
-        set_isInline( isInline );
-        set_isNoreturn( isNoreturn );
 }
 

src/SynTree/Statement.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jul 15 14:57:40 2015
-// Update Count     : 27
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Jun 29 17:37:10 2015
+// Update Count     : 22
 //
 
@@ -192 +192 @@
 }
 
-ForStmt::ForStmt( std::list<Label> labels, std::list<Statement *> initialization_, Expression *condition_, Expression *increment_, Statement *body_ ):
+ForStmt::ForStmt( std::list<Label> labels, Statement *initialization_, Expression *condition_, Expression *increment_, Statement *body_ ):
         Statement( labels ), initialization( initialization_ ), condition( condition_ ), increment( increment_ ), body( body_ ) {
 }
 
 ForStmt::~ForStmt() {
-        deleteAll( initialization );
+        delete initialization;
         delete condition;
         delete increment;
@@ -213 +213 @@
 
         os << string( indent + 2, ' ' ) << "initialization: \n"; 
-        for ( std::list<Statement *>::const_iterator it = initialization.begin(); it != initialization.end(); ++it ) {
-                (*it)->print( os, indent + 4 );
-        }
+        if ( initialization != 0 )
+                initialization->print( os, indent + 4 );
 
         os << "\n" << string( indent + 2, ' ' ) << "condition: \n"; 

src/SynTree/Statement.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jul 14 12:14:54 2015
-// Update Count     : 24
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jun 23 11:44:27 2015
+// Update Count     : 20
 //
 
@@ -199 +199 @@
 class ForStmt : public Statement {
   public:
-        ForStmt( std::list<Label> labels, std::list<Statement *> initialization,
+        ForStmt( std::list<Label> labels, Statement *initialization = 0,
              Expression *condition = 0, Expression *increment = 0, Statement *body = 0 );
         virtual ~ForStmt();
 
-        std::list<Statement *> &get_initialization() { return initialization; }
-        void set_initialization( std::list<Statement *> newValue ) { initialization = newValue; }
+        Statement *get_initialization() { return initialization; }
+        void set_initialization( Statement *newValue ) { initialization = newValue; }
         Expression *get_condition() { return condition; }
         void set_condition( Expression *newValue ) { condition = newValue; }
@@ -217 +217 @@
         virtual void print( std::ostream &os, int indent = 0 ) const;
   private:
-        std::list<Statement *> initialization;
+        Statement *initialization;
         Expression *condition;
         Expression *increment;

src/SynTree/Type.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul  9 16:45:13 2015
-// Update Count     : 3
+// Last Modified On : Tue May 19 16:52:27 2015
+// Update Count     : 2
 //
 
@@ -75 +75 @@
                 os << "_Atomic ";
         } // if
-        if ( tq.isAttribute ) {
-                os << "__attribute(( )) ";
-        } // if
 }
 

src/SynTree/Type.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul  9 16:46:15 2015
-// Update Count     : 14
+// Last Modified On : Fri Jun 26 16:47:54 2015
+// Update Count     : 13
 //
 
@@ -25 +25 @@
         struct Qualifiers {  
                 Qualifiers(): isConst( false ), isVolatile( false ), isRestrict( false ), isLvalue( false ), isAtomic( false ), isAttribute( false ) {}
-                Qualifiers( bool isConst, bool isVolatile, bool isRestrict, bool isLvalue, bool isAtomic, bool isAttribute ): isConst( isConst ), isVolatile( isVolatile ), isRestrict( isRestrict ), isLvalue( isLvalue ), isAtomic( isAtomic ), isAttribute( isAttribute ) {}
+                Qualifiers( bool isConst, bool isVolatile, bool isRestrict, bool isLvalue, bool isAtomic, bool isAttribute): isConst( isConst ), isVolatile( isVolatile ), isRestrict( isRestrict ), isLvalue( isLvalue ), isAtomic( isAtomic ), isAttribute( isAttribute ) {}
         
                 Qualifiers &operator+=( const Qualifiers &other );

src/SynTree/Visitor.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jul 14 12:31:03 2015
-// Update Count     : 3
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon May 18 11:14:51 2015
+// Update Count     : 2
 //
 
@@ -94 +94 @@
 
 void Visitor::visit( ForStmt *forStmt ) {
-        acceptAll( forStmt->get_initialization(), *this );
+        // ForStmt still needs to be fixed
+        maybeAccept( forStmt->get_initialization(), *this );
         maybeAccept( forStmt->get_condition(), *this );
         maybeAccept( forStmt->get_increment(), *this );

src/driver/cc1.cc

@@ -10 +10 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 16 17:09:14 2015
-// Update Count     : 54
+// Last Modified On : Sat May 30 08:58:29 2015
+// Update Count     : 51
 //
 
@@ -319 +319 @@
                 uargs[0] = ( *new string( bprefix + "/cfa-cpp" ) ).c_str();
 
+                uargs[nuargs] = "-p";
+                nuargs += 1;
+
                 uargs[nuargs] = tmpname;
                 nuargs += 1;

src/driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 16 17:09:23 2015
-// Update Count     : 124
+// Last Modified On : Tue Jun 23 17:47:03 2015
+// Update Count     : 119
 //
 
@@ -52 +52 @@
         string Version( VERSION );                                                      // current version number from CONFIG
         string Major( "0" ), Minor( "0" ), Patch( "0" );        // default version numbers
-
         int posn1 = Version.find( "." );                                        // find the divider between major and minor version numbers
         if ( posn1 == -1 ) {                                                            // not there ?
@@ -257 +256 @@
         // add the correct set of flags based on the type of compile this is
 
-        args[nargs] = ( *new string( string("-D__CFA__=") + Major ) ).c_str();
+        args[nargs] = ( *new string( string("-D__CFA_MAJOR__=") + Major ) ).c_str();
         nargs += 1;
         args[nargs] = ( *new string( string("-D__CFA_MINOR__=") + Minor ) ).c_str();
-        nargs += 1;
-        args[nargs] = ( *new string( string("-D__CFA_PATCHLEVEL__=") + Patch ) ).c_str();
         nargs += 1;
 

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jul 15 16:45:24 2015
-// Update Count     : 145
+// Last Modified On : Mon Jul 06 15:01:26 2015
+// Update Count     : 79
 //
 
@@ -54 +54 @@
         if ( errorp ) std::cerr << x << std::endl;
 
-static void parse( FILE * input, LinkageSpec::Type t, bool shouldExit = false );
-static void dump( std::list< Declaration * > & translationUnit );
+void parse( FILE * input, LinkageSpec::Type t, bool shouldExit = false );
 
 bool
@@ -65 +64 @@
         libcfap = false,
         nopreludep = false,
-        noprotop = false,
+        protop = false,
         parsep = false,
         resolvep = false,                                                                       // used in AlternativeFinder
@@ -82 +81 @@
         { "grammar", no_argument, 0, Grammar },
         { "libcfa", no_argument, 0, LibCFA },
-        { "no-preamble", no_argument, 0, Nopreamble },
+        { "nopreamble", no_argument, 0, Nopreamble },
         { "parse", no_argument, 0, Parse },
-        { "no-prototypes", no_argument, 0, Prototypes },
+        { "prototypes", no_argument, 0, Prototypes },
         { "resolver", no_argument, 0, Resolver },
         { "symbol", no_argument, 0, Symbol },
@@ -132 +131 @@
                   case Prototypes:
                   case 'p':                                                                             // generate prototypes for preamble functions
-                        noprotop = true;
+                        protop = true;
                         break;
                   case Parse:
@@ -222 +221 @@
                 Parser::get_parser().freeTree();
                 if ( astp ) {
-                        dump( translationUnit );
+                        printAll( translationUnit, std::cout );
                         return 0;
                 } // if
@@ -243 +242 @@
 
                 if ( validp ) {
-                        dump( translationUnit );
+                        printAll( translationUnit, std::cout );
                         return 0;
                 } // if
@@ -253 +252 @@
 
                 if ( libcfap ) {
+                        protop = true;
                         // generate the bodies of cfa library functions
                         LibCfa::makeLibCfa( translationUnit );
@@ -258 +258 @@
 
                 if ( bresolvep ) {
-                        dump( translationUnit );
+                        printAll( translationUnit, std::cout );
                         return 0;
                 } // if
@@ -265 +265 @@
                 ResolvExpr::resolve( translationUnit );
                 if ( exprp ) {
-                        dump( translationUnit );
+                        printAll( translationUnit, std::cout );
                 }
 
@@ -279 +279 @@
                 // print tree right before code generation
                 if ( codegenp ) {
-                        dump( translationUnit );
-                        return 0;
-                } // if
-
-                CodeGen::generate( translationUnit, *output, ! noprotop );
+                        printAll( translationUnit, std::cout );
+                        return 0;
+                } // if
+
+                CodeGen::generate( translationUnit, *output, true ); //protop );
 
                 if ( output != &std::cout ) {
@@ -290 +290 @@
         } catch ( SemanticError &e ) {
                 if ( errorp ) {
-                        dump( translationUnit );
+                        printAll( translationUnit, std::cerr );
                 }
                 e.print( std::cerr );
@@ -315 +315 @@
 } // main
 
-static void parse( FILE * input, LinkageSpec::Type linkage, bool shouldExit ) {
+void parse( FILE * input, LinkageSpec::Type linkage, bool shouldExit ) {
         Parser::get_parser().set_linkage( linkage );
         Parser::get_parser().parse( input );
@@ -325 +325 @@
 }
 
-static bool notPrelude( Declaration * decl ) {
-        return ! LinkageSpec::isBuiltin( decl->get_linkage() );
-}
-
-static void dump( std::list< Declaration * > & translationUnit ) {
-        std::list< Declaration * > decls;
-        if ( noprotop ) {
-                filter( translationUnit.begin(), translationUnit.end(), 
-                                std::back_inserter( decls ), notPrelude );
-        } else {
-                decls = translationUnit;
-        }
-
-        printAll( decls, std::cout );
-}
-
-
 // Local Variables: //
 // tab-width: 4 //