Changes in / [1b0020a:4e2a1137]

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (2 diffs)
• CodeGen/CodeGenerator.h (modified) (2 diffs)
• Parser/ExpressionNode.cc (modified) (10 diffs)
• Parser/ParseNode.h (modified) (4 diffs)
• Parser/StatementNode.cc (modified) (1 diff)
• Parser/parser.cc (modified) (288 diffs)
• Parser/parser.h (modified) (2 diffs)
• Parser/parser.yy (modified) (26 diffs)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 13:35:30 2016
-// Update Count     : 352
+// Last Modified On : Thu Aug  4 11:16:21 2016
+// Update Count     : 351
 //
 
@@ -494 +494 @@
         }
 
-        void CodeGenerator::visit( RangeExpr * rangeExpr ) {
-                rangeExpr->get_low()->accept( *this );
-                output << " ... ";
-                rangeExpr->get_high()->accept( *this );
-        }
-
         void CodeGenerator::visit( NameExpr * nameExpr ) {
                 extension( nameExpr );

src/CodeGen/CodeGenerator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 13:37:07 2016
-// Update Count     : 38
+// Last Modified On : Sat Jul 30 11:10:42 2016
+// Update Count     : 37
 //
 
@@ -54 +54 @@
                 virtual void visit( ApplicationExpr *applicationExpr );
                 virtual void visit( UntypedExpr *untypedExpr );
-                virtual void visit( RangeExpr * rangeExpr );
                 virtual void visit( NameExpr *nameExpr );
                 virtual void visit( AddressExpr *addressExpr );

src/Parser/ExpressionNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug  5 07:56:23 2016
-// Update Count     : 375
+// Last Modified On : Tue Aug  2 15:10:23 2016
+// Update Count     : 322
 //
 
@@ -258 +258 @@
 OperatorNode::~OperatorNode() {}
 
-OperatorNode::Type OperatorNode::get_type( void ) const {
+OperatorNode::Type OperatorNode::get_type( void ) const{
         return type;
 }
@@ -311 +311 @@
 }
 
-
-Expression *build_cast( TypeValueNode * arg, ExpressionNode *expr_node ) {
-        DeclarationNode *decl_node = arg->get_decl();
-
-        Type *targetType = decl_node->buildType();
-        if ( dynamic_cast< VoidType* >( targetType ) ) {
-                delete targetType;
-                return new CastExpr( maybeBuild<Expression>(expr_node) );
-        } else {
-                return new CastExpr( maybeBuild<Expression>(expr_node), targetType );
-        } // if
-}
-
-Expression *build_fieldSel( ExpressionNode *expr_node, VarRefNode *member ) {
-        NameExpr* memberExpr = dynamic_cast<NameExpr*> ( maybeBuild<Expression>( member) );
-        assert( memberExpr );
-        UntypedMemberExpr *ret = new UntypedMemberExpr( memberExpr->get_name(), maybeBuild<Expression>(expr_node) );
-        delete member;
-        return ret;
-}
-
-Expression *build_pfieldSel( ExpressionNode *expr_node, VarRefNode *member ) {
-        NameExpr* memberExpr = dynamic_cast<NameExpr*> ( maybeBuild<Expression>( member) );
-        assert( memberExpr );
-        UntypedExpr *deref = new UntypedExpr( new NameExpr( "*?" ) );
-        deref->get_args().push_back( maybeBuild<Expression>(expr_node) );
-        UntypedMemberExpr *ret = new UntypedMemberExpr( memberExpr->get_name(), deref );
-        delete member;
-        return ret;
-}
-
-Expression *build_addressOf( ExpressionNode *expr_node ) {
-                return new AddressExpr( maybeBuild<Expression>(expr_node) );
-}
-Expression *build_sizeOf( ExpressionNode *expr_node ) {
-        if ( TypeValueNode * arg = dynamic_cast<TypeValueNode *>( expr_node ) ) {
-                return new SizeofExpr( arg->get_decl()->buildType() );
-        } else {
-                return new SizeofExpr( maybeBuild<Expression>(expr_node) );
-        } // if
-}
-Expression *build_alignOf( ExpressionNode *expr_node ) {
-        if ( TypeValueNode * arg = dynamic_cast<TypeValueNode *>( expr_node ) ) {
-                return new AlignofExpr( arg->get_decl()->buildType() );
-        } else {
-                return new AlignofExpr( maybeBuild<Expression>(expr_node) );
-        } // if
-}
-Expression *build_offsetOf( TypeValueNode * arg, VarRefNode *member ) {
-        NameExpr *memberExpr = dynamic_cast<NameExpr *>( maybeBuild<Expression>( member ) );
-        assert( memberExpr );
-        return new UntypedOffsetofExpr( arg->get_decl()->buildType(), memberExpr->get_name() );
-}
-
-Expression *build_and_or( ExpressionNode *expr_node1, ExpressionNode *expr_node2, bool kind ) {
-        return new LogicalExpr( notZeroExpr( maybeBuild<Expression>(expr_node1) ), notZeroExpr( maybeBuild<Expression>(expr_node2) ), kind );
-}
-
-Expression *build_opr1( OperatorNode::Type op, ExpressionNode *expr_node ) {
-        std::list<Expression *> args;
-        args.push_back( new AddressExpr( maybeBuild<Expression>(expr_node) ) );
-        return new UntypedExpr( new NameExpr( opName[ op ] ), args );
-}
-Expression *build_opr2( OperatorNode::Type op, ExpressionNode *expr_node1, ExpressionNode *expr_node2 ) {
-        std::list<Expression *> args;
-        args.push_back( maybeBuild<Expression>(expr_node1) );
-        args.push_back( maybeBuild<Expression>(expr_node2) );
-        return new UntypedExpr( new NameExpr( opName[ op ] ), args );
-}
-
-Expression *build_cond( ExpressionNode *expr_node1, ExpressionNode *expr_node2, ExpressionNode *expr_node3 ) {
-        return new ConditionalExpr( notZeroExpr( maybeBuild<Expression>(expr_node1) ), maybeBuild<Expression>(expr_node2), maybeBuild<Expression>(expr_node3) );
-}
-
-Expression *build_comma( ExpressionNode *expr_node1, ExpressionNode *expr_node2 ) {
-        return new CommaExpr( maybeBuild<Expression>(expr_node1), maybeBuild<Expression>(expr_node2) );
-}
-
-CompositeExprNode2::CompositeExprNode2( Expression *expr ) : expr( expr ) {}
-CompositeExprNode2::CompositeExprNode2( const CompositeExprNode2 &other ) : expr( other.expr->clone() ) {}
-CompositeExprNode2::~CompositeExprNode2() { delete expr; }
-void CompositeExprNode2::print( std::ostream &, int indent ) const { assert( false ); }
-void CompositeExprNode2::printOneLine( std::ostream &, int indent ) const { assert( false ); }
-
+#include "Common/utility.h"
 
 Expression *CompositeExprNode::build() const {
@@ -406 +323 @@
         } // if
 
-        switch ( op->get_type() ) {
+        switch ( op->get_type()) {
+          case OperatorNode::Incr:
+          case OperatorNode::Decr:
+          case OperatorNode::IncrPost:
+          case OperatorNode::DecrPost:
           case OperatorNode::Assign:
           case OperatorNode::MulAssn:
@@ -418 +339 @@
           case OperatorNode::ERAssn:
           case OperatorNode::OrAssn:
+                // the rewrite rules for these expressions specify that the first argument has its address taken
                 assert( ! args.empty() );
                 args.front() = new AddressExpr( args.front() );
+                break;
+          default:              // do nothing
+                ;
+        } // switch
+
+        switch ( op->get_type() ) {
+          case OperatorNode::Incr:
+          case OperatorNode::Decr:
+          case OperatorNode::IncrPost:
+          case OperatorNode::DecrPost:
+          case OperatorNode::Assign:
+          case OperatorNode::MulAssn:
+          case OperatorNode::DivAssn:
+          case OperatorNode::ModAssn:
+          case OperatorNode::PlusAssn:
+          case OperatorNode::MinusAssn:
+          case OperatorNode::LSAssn:
+          case OperatorNode::RSAssn:
+          case OperatorNode::AndAssn:
+          case OperatorNode::ERAssn:
+          case OperatorNode::OrAssn:
+          case OperatorNode::Plus:
+          case OperatorNode::Minus:
+          case OperatorNode::Mul:
+          case OperatorNode::Div:
+          case OperatorNode::Mod:
+          case OperatorNode::BitOr:
+          case OperatorNode::BitAnd:
+          case OperatorNode::Xor:
+          case OperatorNode::LShift:
+          case OperatorNode::RShift:
+          case OperatorNode::LThan:
+          case OperatorNode::GThan:
+          case OperatorNode::LEThan:
+          case OperatorNode::GEThan:
+          case OperatorNode::Eq:
+          case OperatorNode::Neq:
+          case OperatorNode::Index:
+          case OperatorNode::Range:
           case OperatorNode::UnPlus:
           case OperatorNode::UnMinus:
@@ -427 +388 @@
           case OperatorNode::LabelAddress:
                 return new UntypedExpr( new NameExpr( opName[ op->get_type() ] ), args );
-
+          case OperatorNode::AddressOf:
+                assert( args.size() == 1 );
+                assert( args.front() );
+
+                return new AddressExpr( args.front() );
+          case OperatorNode::Cast:
+                {
+                        TypeValueNode * arg = dynamic_cast<TypeValueNode *>( get_args());
+                        assert( arg );
+
+                        DeclarationNode *decl_node = arg->get_decl();
+                        ExpressionNode *expr_node = dynamic_cast<ExpressionNode *>( arg->get_link());
+
+                        Type *targetType = decl_node->buildType();
+                        if ( dynamic_cast< VoidType* >( targetType ) ) {
+                                delete targetType;
+                                return new CastExpr( maybeBuild<Expression>(expr_node), maybeBuild< Expression >( get_argName() ) );
+                        } else {
+                                return new CastExpr( maybeBuild<Expression>(expr_node),targetType, maybeBuild< Expression >( get_argName() ) );
+                        } // if
+                }
+          case OperatorNode::FieldSel:
+                {
+                        assert( args.size() == 2 );
+
+                        NameExpr *member = dynamic_cast<NameExpr *>( args.back());
+                        // TupleExpr *memberTup = dynamic_cast<TupleExpr *>( args.back());
+
+                        if ( member != 0 ) {
+                                UntypedMemberExpr *ret = new UntypedMemberExpr( member->get_name(), args.front());
+                                delete member;
+                                return ret;
+                                /* else if ( memberTup != 0 )
+                                   {
+                                   UntypedMemberExpr *ret = new UntypedMemberExpr( memberTup->get_name(), args.front());
+                                   delete member;
+                                   return ret;
+                                   } */
+                        } else
+                                assert( false );
+                }
+          case OperatorNode::PFieldSel:
+                {
+                        assert( args.size() == 2 );
+
+                        NameExpr *member = dynamic_cast<NameExpr *>( args.back());  // modify for Tuples   xxx
+                        assert( member != 0 );
+
+                        UntypedExpr *deref = new UntypedExpr( new NameExpr( "*?" ) );
+                        deref->get_args().push_back( args.front() );
+
+                        UntypedMemberExpr *ret = new UntypedMemberExpr( member->get_name(), deref );
+                        delete member;
+                        return ret;
+                }
+          case OperatorNode::SizeOf:
+                {
+                        if ( TypeValueNode * arg = dynamic_cast<TypeValueNode *>( get_args()) ) {
+                                return new SizeofExpr( arg->get_decl()->buildType());
+                        } else {
+                                return new SizeofExpr( args.front());
+                        } // if
+                }
+          case OperatorNode::AlignOf:
+                {
+                        if ( TypeValueNode * arg = dynamic_cast<TypeValueNode *>( get_args()) ) {
+                                return new AlignofExpr( arg->get_decl()->buildType());
+                        } else {
+                                return new AlignofExpr( args.front());
+                        } // if
+                }
+          case OperatorNode::OffsetOf:
+                {
+                        assert( args.size() == 2 );
+
+                        if ( TypeValueNode * arg = dynamic_cast<TypeValueNode *>( get_args() ) ) {
+                                NameExpr *member = dynamic_cast<NameExpr *>( args.back() );
+                                assert( member != 0 );
+
+                                return new UntypedOffsetofExpr( arg->get_decl()->buildType(), member->get_name() );
+                        } else assert( false );
+                }
           case OperatorNode::Attr:
                 {
-                        VarRefNode *var = dynamic_cast<VarRefNode *>( get_args() );
+                        VarRefNode *var = dynamic_cast<VarRefNode *>( get_args());
                         assert( var );
                         if ( ! get_args()->get_link() ) {
                                 return new AttrExpr( maybeBuild<Expression>(var), ( Expression*)0);
-                        } else if ( TypeValueNode * arg = dynamic_cast<TypeValueNode *>( get_args()->get_link() ) ) {
-                                return new AttrExpr( maybeBuild<Expression>(var), arg->get_decl()->buildType() );
+                        } else if ( TypeValueNode * arg = dynamic_cast<TypeValueNode *>( get_args()->get_link()) ) {
+                                return new AttrExpr( maybeBuild<Expression>(var), arg->get_decl()->buildType());
                         } else {
-                                return new AttrExpr( maybeBuild<Expression>(var), args.back() );
+                                return new AttrExpr( maybeBuild<Expression>(var), args.back());
                         } // if
                 }
+          case OperatorNode::Or:
+          case OperatorNode::And:
+                assert( args.size() == 2);
+                return new LogicalExpr( notZeroExpr( args.front() ), notZeroExpr( args.back() ), ( op->get_type() == OperatorNode::And ) );
           case OperatorNode::Cond:
                 {
@@ -451 +497 @@
           case OperatorNode::NCond:
                 throw UnimplementedError( "GNU 2-argument conditional expression" );
+          case OperatorNode::Comma:
+                {
+                        assert( args.size() == 2);
+                        std::list< Expression * >::const_iterator i = args.begin();
+                        Expression *ret = *i++;
+                        while ( i != args.end() ) {
+                                ret = new CommaExpr( ret, *i++ );
+                        }
+                        return ret;
+                }
                 // Tuples
           case OperatorNode::TupleC:
@@ -459 +515 @@
                 }
           default:
-                assert( ((void)"CompositeExprNode::build", false) );
+                // shouldn't happen
+                assert( false );
                 return 0;
         } // switch
@@ -548 +605 @@
 
 void LabelNode::printOneLine( std::ostream &os, int indent ) const {}
+
+//##############################################################################
+
+CommaExprNode::CommaExprNode(): CompositeExprNode( new OperatorNode( OperatorNode::Comma )) {}
+
+CommaExprNode::CommaExprNode( ExpressionNode *exp ) : CompositeExprNode( new OperatorNode( OperatorNode::Comma ), exp ) {
+}
+
+CommaExprNode::CommaExprNode( ExpressionNode *exp1, ExpressionNode *exp2) : CompositeExprNode( new OperatorNode( OperatorNode::Comma ), exp1, exp2) {
+}
+
+// CommaExprNode *CommaExprNode::add_to_list( ExpressionNode *exp ) {
+//      add_arg( exp );
+//
+//      return this;
+// }
+
+CommaExprNode::CommaExprNode( const CommaExprNode &other ) : CompositeExprNode( other ) {
+}
 
 //##############################################################################
@@ -698 +774 @@
 }
 
+
 ExpressionNode *flattenCommas( ExpressionNode *list ) {
         if ( CompositeExprNode *composite = dynamic_cast< CompositeExprNode * >( list ) ) {

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug  5 07:49:32 2016
-// Update Count     : 288
+// Last Modified On : Sun Jul 24 02:17:00 2016
+// Update Count     : 269
 //
 
@@ -225 +225 @@
 };
 
-Expression *build_cast( TypeValueNode * arg, ExpressionNode *expr_node );
-Expression *build_fieldSel( ExpressionNode *expr_node, VarRefNode *member );
-Expression *build_pfieldSel( ExpressionNode *expr_node, VarRefNode *member );
-Expression *build_addressOf( ExpressionNode *expr_node );
-Expression *build_sizeOf( ExpressionNode *expr_node );
-Expression *build_alignOf( ExpressionNode *expr_node );
-Expression *build_offsetOf( TypeValueNode * arg, VarRefNode *member );
-Expression *build_and( ExpressionNode *expr_node1, ExpressionNode *expr_node2 );
-Expression *build_and_or( ExpressionNode *expr_node1, ExpressionNode *expr_node2, bool kind );
-Expression *build_opr1( OperatorNode::Type op, ExpressionNode *expr_node );
-Expression *build_opr2( OperatorNode::Type op, ExpressionNode *expr_node1, ExpressionNode *expr_node2 );
-Expression *build_cond( ExpressionNode *expr_node1, ExpressionNode *expr_node2, ExpressionNode *expr_node3 );
-Expression *build_comma( ExpressionNode *expr_node1, ExpressionNode *expr_node2 );
-
-class CompositeExprNode2 : public ExpressionNode {
-  public:
-        CompositeExprNode2( Expression *expr );
-        CompositeExprNode2( const CompositeExprNode2 &other );
-        virtual ~CompositeExprNode2();
-
-        virtual CompositeExprNode2 *clone() const { return new CompositeExprNode2( *this ); }
-        virtual Expression *build() const { return expr->clone(); }
-
-        virtual void print( std::ostream &, int indent = 0) const;
-        virtual void printOneLine( std::ostream &, int indent = 0) const;
-  private:
-        Expression *expr;
-};
-
 class CompositeExprNode : public ExpressionNode {
   public:
@@ -319 +290 @@
   private:
         std::list< Label > labels;
+};
+
+class CommaExprNode : public CompositeExprNode {
+  public:
+        CommaExprNode();
+        CommaExprNode( ExpressionNode * );
+        CommaExprNode( ExpressionNode *, ExpressionNode * );
+        CommaExprNode( const CommaExprNode &other );
+
+        // virtual CommaExprNode *add_to_list( ExpressionNode * );
+        virtual CommaExprNode *clone() const { return new CommaExprNode( *this ); }
 };
 
@@ -551 +533 @@
 };
 
+class NullStmtNode : public CompoundStmtNode {
+  public:
+        Statement *build() const;
+        void print( std::ostream &, int indent = 0 ) const;
+};
+
 class InitializerNode : public ParseNode {
   public:

src/Parser/StatementNode.cc

@@ -417 +417 @@
 }
 
+
+void NullStmtNode::print( ostream &os, int indent ) const {
+        os << string( indent, ' ' ) << "Null Statement:" << endl;
+}
+
+Statement *NullStmtNode::build() const {
+        return new NullStmt;
+}
+
 // Local Variables: //
 // tab-width: 4 //

src/Parser/parser.cc

@@ -354 +354 @@
         LabelNode *label;
         InitializerNode *in;
-        OperatorNode::Type op;
         bool flag;
 
@@ -360 +359 @@
 
 /* Line 293 of yacc.c  */
-#line 363 "Parser/parser.cc"
+#line 362 "Parser/parser.cc"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
@@ -372 +371 @@
 
 /* Line 343 of yacc.c  */
-#line 375 "Parser/parser.cc"
+#line 374 "Parser/parser.cc"
 
 #ifdef short
@@ -1017 +1016 @@
 static const yytype_uint16 yyrline[] =
 {
-       0,   292,   292,   298,   307,   308,   309,   313,   314,   315,
-     319,   320,   324,   325,   329,   330,   334,   335,   341,   343,
-     345,   347,   352,   353,   359,   363,   365,   366,   368,   369,
-     371,   373,   375,   383,   384,   390,   391,   392,   397,   399,
-     404,   405,   409,   413,   415,   417,   419,   424,   427,   429,
-     431,   436,   439,   441,   443,   445,   447,   449,   451,   453,
-     455,   457,   459,   466,   467,   469,   473,   474,   475,   476,
-     480,   481,   483,   488,   489,   491,   493,   498,   499,   501,
-     506,   507,   509,   514,   515,   517,   519,   521,   526,   527,
-     529,   534,   535,   540,   541,   546,   547,   552,   553,   558,
-     559,   564,   565,   568,   570,   575,   580,   581,   583,   585,
-     591,   592,   598,   600,   602,   604,   609,   610,   615,   616,
-     617,   618,   619,   620,   621,   622,   623,   624,   628,   629,
-     636,   637,   643,   644,   645,   646,   647,   648,   649,   650,
-     651,   661,   668,   670,   680,   681,   686,   688,   694,   696,
-     700,   701,   706,   711,   714,   716,   718,   728,   730,   741,
-     742,   744,   748,   750,   754,   755,   760,   761,   765,   770,
-     771,   775,   777,   783,   784,   788,   790,   792,   794,   800,
-     801,   805,   807,   812,   814,   816,   821,   823,   828,   830,
-     834,   837,   841,   844,   848,   850,   854,   856,   863,   865,
-     867,   876,   878,   880,   882,   884,   889,   891,   893,   895,
-     900,   913,   914,   919,   921,   926,   930,   932,   934,   936,
-     938,   944,   945,   951,   952,   956,   957,   962,   964,   970,
-     971,   973,   978,   980,   987,   989,   993,   994,   999,  1001,
-    1005,  1006,  1010,  1012,  1016,  1017,  1021,  1022,  1026,  1027,
-    1042,  1043,  1044,  1045,  1046,  1050,  1055,  1062,  1072,  1077,
-    1082,  1090,  1095,  1100,  1105,  1110,  1118,  1140,  1145,  1152,
-    1154,  1161,  1166,  1171,  1182,  1187,  1192,  1197,  1202,  1211,
-    1216,  1224,  1225,  1226,  1227,  1233,  1238,  1246,  1247,  1248,
-    1249,  1253,  1254,  1255,  1256,  1261,  1262,  1271,  1272,  1277,
-    1278,  1283,  1285,  1287,  1289,  1291,  1294,  1293,  1305,  1306,
-    1308,  1318,  1319,  1324,  1328,  1330,  1332,  1334,  1336,  1338,
-    1340,  1342,  1347,  1349,  1351,  1353,  1355,  1357,  1359,  1361,
-    1363,  1365,  1367,  1369,  1371,  1377,  1378,  1380,  1382,  1384,
-    1389,  1390,  1396,  1397,  1399,  1401,  1406,  1408,  1410,  1412,
-    1417,  1418,  1420,  1422,  1427,  1428,  1430,  1435,  1436,  1438,
-    1440,  1445,  1447,  1449,  1454,  1455,  1459,  1461,  1467,  1466,
-    1470,  1472,  1477,  1479,  1485,  1486,  1491,  1492,  1494,  1495,
-    1504,  1505,  1507,  1509,  1514,  1516,  1522,  1523,  1525,  1528,
-    1531,  1536,  1537,  1542,  1547,  1551,  1553,  1559,  1558,  1565,
-    1567,  1573,  1574,  1582,  1583,  1587,  1588,  1589,  1591,  1593,
-    1600,  1601,  1603,  1605,  1610,  1611,  1617,  1618,  1622,  1623,
-    1628,  1629,  1630,  1632,  1640,  1641,  1643,  1646,  1648,  1652,
-    1653,  1654,  1656,  1658,  1662,  1667,  1675,  1676,  1685,  1687,
-    1692,  1693,  1694,  1698,  1699,  1700,  1704,  1705,  1706,  1710,
-    1711,  1712,  1717,  1718,  1719,  1720,  1726,  1727,  1729,  1734,
-    1735,  1740,  1741,  1742,  1743,  1744,  1759,  1760,  1765,  1766,
-    1774,  1776,  1778,  1781,  1783,  1785,  1808,  1809,  1811,  1813,
-    1818,  1819,  1821,  1826,  1831,  1832,  1838,  1837,  1841,  1845,
-    1847,  1849,  1855,  1856,  1861,  1866,  1868,  1873,  1875,  1876,
-    1878,  1883,  1885,  1887,  1892,  1894,  1899,  1904,  1912,  1918,
-    1917,  1931,  1932,  1937,  1938,  1942,  1947,  1952,  1960,  1965,
-    1976,  1977,  1988,  1989,  1995,  1996,  2000,  2001,  2002,  2005,
-    2004,  2015,  2024,  2030,  2036,  2045,  2051,  2057,  2063,  2069,
-    2077,  2083,  2091,  2097,  2106,  2107,  2108,  2112,  2116,  2118,
-    2123,  2124,  2128,  2129,  2134,  2140,  2141,  2144,  2146,  2147,
-    2151,  2152,  2153,  2154,  2188,  2190,  2191,  2193,  2198,  2203,
-    2208,  2210,  2212,  2217,  2219,  2221,  2223,  2228,  2230,  2239,
-    2241,  2242,  2247,  2249,  2251,  2256,  2258,  2260,  2265,  2267,
-    2269,  2278,  2279,  2280,  2284,  2286,  2288,  2293,  2295,  2297,
-    2302,  2304,  2306,  2321,  2323,  2324,  2326,  2331,  2332,  2337,
-    2339,  2341,  2346,  2348,  2350,  2352,  2357,  2359,  2361,  2371,
-    2373,  2374,  2376,  2381,  2383,  2385,  2390,  2392,  2394,  2396,
-    2401,  2403,  2405,  2436,  2438,  2439,  2441,  2446,  2451,  2459,
-    2461,  2463,  2468,  2470,  2475,  2477,  2491,  2492,  2494,  2499,
-    2501,  2503,  2505,  2507,  2512,  2513,  2515,  2517,  2522,  2524,
-    2526,  2532,  2534,  2536,  2540,  2542,  2544,  2546,  2560,  2561,
-    2563,  2568,  2570,  2572,  2574,  2576,  2581,  2582,  2584,  2586,
-    2591,  2593,  2595,  2601,  2602,  2604,  2613,  2616,  2618,  2621,
-    2623,  2625,  2638,  2639,  2641,  2646,  2648,  2650,  2652,  2654,
-    2659,  2660,  2662,  2664,  2669,  2671,  2679,  2680,  2681,  2686,
-    2687,  2691,  2693,  2695,  2697,  2699,  2701,  2708,  2710,  2712,
-    2714,  2716,  2718,  2720,  2722,  2724,  2726,  2731,  2733,  2735,
-    2740,  2766,  2767,  2769,  2773,  2774,  2778,  2780,  2782,  2784,
-    2786,  2788,  2795,  2797,  2799,  2801,  2803,  2805,  2810,  2815,
-    2817,  2819,  2837,  2839,  2844,  2845
+       0,   290,   290,   296,   305,   306,   307,   311,   312,   313,
+     317,   318,   322,   323,   327,   328,   332,   333,   339,   341,
+     343,   345,   350,   351,   357,   361,   363,   364,   366,   367,
+     369,   371,   373,   381,   382,   388,   389,   390,   395,   397,
+     402,   403,   407,   411,   413,   415,   417,   422,   425,   427,
+     429,   431,   436,   438,   440,   442,   444,   446,   448,   450,
+     452,   454,   456,   463,   464,   466,   470,   471,   472,   473,
+     477,   478,   480,   485,   486,   488,   490,   495,   496,   498,
+     503,   504,   506,   511,   512,   514,   516,   518,   523,   524,
+     526,   531,   532,   537,   538,   543,   544,   549,   550,   555,
+     556,   561,   562,   564,   566,   571,   576,   577,   579,   581,
+     587,   588,   594,   596,   598,   600,   605,   606,   611,   612,
+     613,   614,   615,   616,   617,   618,   619,   620,   624,   625,
+     631,   632,   638,   639,   640,   641,   642,   643,   644,   645,
+     646,   656,   663,   665,   675,   676,   681,   683,   689,   691,
+     695,   696,   701,   706,   709,   711,   713,   723,   725,   736,
+     737,   739,   743,   744,   748,   749,   754,   755,   759,   764,
+     765,   769,   771,   777,   778,   782,   784,   786,   788,   794,
+     795,   799,   801,   806,   808,   810,   815,   817,   822,   824,
+     828,   831,   835,   838,   842,   844,   848,   850,   857,   859,
+     861,   870,   872,   874,   876,   878,   883,   885,   887,   889,
+     894,   907,   908,   913,   915,   920,   924,   926,   928,   930,
+     932,   938,   939,   945,   946,   950,   951,   956,   958,   964,
+     965,   967,   972,   974,   981,   983,   987,   988,   993,   995,
+     999,  1000,  1004,  1006,  1010,  1011,  1015,  1016,  1020,  1021,
+    1036,  1037,  1038,  1039,  1040,  1044,  1049,  1056,  1066,  1071,
+    1076,  1084,  1089,  1094,  1099,  1104,  1112,  1134,  1139,  1146,
+    1148,  1155,  1160,  1165,  1176,  1181,  1186,  1191,  1196,  1205,
+    1210,  1218,  1219,  1220,  1221,  1227,  1232,  1240,  1241,  1242,
+    1243,  1247,  1248,  1249,  1250,  1255,  1256,  1265,  1266,  1271,
+    1272,  1277,  1279,  1281,  1283,  1285,  1288,  1287,  1299,  1300,
+    1302,  1312,  1313,  1318,  1322,  1324,  1326,  1328,  1330,  1332,
+    1334,  1336,  1341,  1343,  1345,  1347,  1349,  1351,  1353,  1355,
+    1357,  1359,  1361,  1363,  1365,  1371,  1372,  1374,  1376,  1378,
+    1383,  1384,  1390,  1391,  1393,  1395,  1400,  1402,  1404,  1406,
+    1411,  1412,  1414,  1416,  1421,  1422,  1424,  1429,  1430,  1432,
+    1434,  1439,  1441,  1443,  1448,  1449,  1453,  1455,  1461,  1460,
+    1464,  1466,  1471,  1473,  1479,  1480,  1485,  1486,  1488,  1489,
+    1498,  1499,  1501,  1503,  1508,  1510,  1516,  1517,  1519,  1522,
+    1525,  1530,  1531,  1536,  1541,  1545,  1547,  1553,  1552,  1559,
+    1561,  1567,  1568,  1576,  1577,  1581,  1582,  1583,  1585,  1587,
+    1594,  1595,  1597,  1599,  1604,  1605,  1611,  1612,  1616,  1617,
+    1622,  1623,  1624,  1626,  1634,  1635,  1637,  1640,  1642,  1646,
+    1647,  1648,  1650,  1652,  1656,  1661,  1669,  1670,  1679,  1681,
+    1686,  1687,  1688,  1692,  1693,  1694,  1698,  1699,  1700,  1704,
+    1705,  1706,  1711,  1712,  1713,  1714,  1720,  1721,  1723,  1728,
+    1729,  1734,  1735,  1736,  1737,  1738,  1753,  1754,  1759,  1760,
+    1768,  1770,  1772,  1775,  1777,  1779,  1802,  1803,  1805,  1807,
+    1812,  1813,  1815,  1820,  1825,  1826,  1832,  1831,  1835,  1839,
+    1841,  1843,  1849,  1850,  1855,  1860,  1862,  1867,  1869,  1870,
+    1872,  1877,  1879,  1881,  1886,  1888,  1893,  1898,  1906,  1912,
+    1911,  1925,  1926,  1931,  1932,  1936,  1941,  1946,  1954,  1959,
+    1970,  1971,  1982,  1983,  1989,  1990,  1994,  1995,  1996,  1999,
+    1998,  2009,  2018,  2024,  2030,  2039,  2045,  2051,  2057,  2063,
+    2071,  2077,  2085,  2091,  2100,  2101,  2102,  2106,  2110,  2112,
+    2117,  2118,  2122,  2123,  2128,  2134,  2135,  2138,  2140,  2141,
+    2145,  2146,  2147,  2148,  2182,  2184,  2185,  2187,  2192,  2197,
+    2202,  2204,  2206,  2211,  2213,  2215,  2217,  2222,  2224,  2233,
+    2235,  2236,  2241,  2243,  2245,  2250,  2252,  2254,  2259,  2261,
+    2263,  2272,  2273,  2274,  2278,  2280,  2282,  2287,  2289,  2291,
+    2296,  2298,  2300,  2315,  2317,  2318,  2320,  2325,  2326,  2331,
+    2333,  2335,  2340,  2342,  2344,  2346,  2351,  2353,  2355,  2365,
+    2367,  2368,  2370,  2375,  2377,  2379,  2384,  2386,  2388,  2390,
+    2395,  2397,  2399,  2430,  2432,  2433,  2435,  2440,  2445,  2453,
+    2455,  2457,  2462,  2464,  2469,  2471,  2485,  2486,  2488,  2493,
+    2495,  2497,  2499,  2501,  2506,  2507,  2509,  2511,  2516,  2518,
+    2520,  2526,  2528,  2530,  2534,  2536,  2538,  2540,  2554,  2555,
+    2557,  2562,  2564,  2566,  2568,  2570,  2575,  2576,  2578,  2580,
+    2585,  2587,  2589,  2595,  2596,  2598,  2607,  2610,  2612,  2615,
+    2617,  2619,  2632,  2633,  2635,  2640,  2642,  2644,  2646,  2648,
+    2653,  2654,  2656,  2658,  2663,  2665,  2673,  2674,  2675,  2680,
+    2681,  2685,  2687,  2689,  2691,  2693,  2695,  2702,  2704,  2706,
+    2708,  2710,  2712,  2714,  2716,  2718,  2720,  2725,  2727,  2729,
+    2734,  2760,  2761,  2763,  2767,  2768,  2772,  2774,  2776,  2778,
+    2780,  2782,  2789,  2791,  2793,  2795,  2797,  2799,  2804,  2809,
+    2811,  2813,  2831,  2833,  2838,  2839
 };
 #endif
@@ -5217 +5216 @@
 
 /* Line 1806 of yacc.c  */
-#line 292 "parser.yy"
+#line 290 "parser.yy"
     {
                         typedefTable.enterScope();
@@ -5226 +5225 @@
 
 /* Line 1806 of yacc.c  */
-#line 298 "parser.yy"
+#line 296 "parser.yy"
     {
                         typedefTable.leaveScope();
@@ -5235 +5234 @@
 
 /* Line 1806 of yacc.c  */
+#line 305 "parser.yy"
+    { (yyval.constant) = makeConstantInteger( *(yyvsp[(1) - (1)].tok) ); }
+    break;
+
+  case 5:
+
+/* Line 1806 of yacc.c  */
+#line 306 "parser.yy"
+    { (yyval.constant) = makeConstantFloat( *(yyvsp[(1) - (1)].tok) ); }
+    break;
+
+  case 6:
+
+/* Line 1806 of yacc.c  */
 #line 307 "parser.yy"
-    { (yyval.constant) = makeConstantInteger( *(yyvsp[(1) - (1)].tok) ); }
-    break;
-
-  case 5:
-
-/* Line 1806 of yacc.c  */
-#line 308 "parser.yy"
-    { (yyval.constant) = makeConstantFloat( *(yyvsp[(1) - (1)].tok) ); }
-    break;
-
-  case 6:
-
-/* Line 1806 of yacc.c  */
-#line 309 "parser.yy"
     { (yyval.constant) = makeConstantChar( *(yyvsp[(1) - (1)].tok) ); }
     break;
@@ -5256 +5255 @@
 
 /* Line 1806 of yacc.c  */
-#line 334 "parser.yy"
+#line 332 "parser.yy"
     { (yyval.constant) = makeConstantStr( *(yyvsp[(1) - (1)].tok) ); }
     break;
@@ -5263 +5262 @@
 
 /* Line 1806 of yacc.c  */
-#line 335 "parser.yy"
+#line 333 "parser.yy"
     { (yyval.constant) = (yyvsp[(1) - (2)].constant)->appendstr( (yyvsp[(2) - (2)].tok) ); }
     break;
 
   case 18:
+
+/* Line 1806 of yacc.c  */
+#line 340 "parser.yy"
+    { (yyval.en) = new VarRefNode( (yyvsp[(1) - (1)].tok) ); }
+    break;
+
+  case 19:
 
 /* Line 1806 of yacc.c  */
@@ -5274 +5280 @@
     break;
 
-  case 19:
+  case 20:
 
 /* Line 1806 of yacc.c  */
 #line 344 "parser.yy"
-    { (yyval.en) = new VarRefNode( (yyvsp[(1) - (1)].tok) ); }
-    break;
-
-  case 20:
+    { (yyval.en) = (yyvsp[(2) - (3)].en); }
+    break;
+
+  case 21:
 
 /* Line 1806 of yacc.c  */
 #line 346 "parser.yy"
-    { (yyval.en) = (yyvsp[(2) - (3)].en); }
-    break;
-
-  case 21:
-
-/* Line 1806 of yacc.c  */
-#line 348 "parser.yy"
     { (yyval.en) = new ValofExprNode( (yyvsp[(2) - (3)].sn) ); }
     break;
@@ -5298 +5297 @@
 
 /* Line 1806 of yacc.c  */
+#line 356 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Index ), (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en) ); }
+    break;
+
+  case 24:
+
+/* Line 1806 of yacc.c  */
 #line 358 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr2( OperatorNode::Index, (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en) ) ); }
-    break;
-
-  case 24:
-
-/* Line 1806 of yacc.c  */
-#line 360 "parser.yy"
     { (yyval.en) = new CompositeExprNode( (yyvsp[(1) - (4)].en), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -5312 +5311 @@
 
 /* Line 1806 of yacc.c  */
-#line 364 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_fieldSel( (yyvsp[(1) - (3)].en), new VarRefNode( (yyvsp[(3) - (3)].tok) ) ) ); }
+#line 362 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::FieldSel ), (yyvsp[(1) - (3)].en), new VarRefNode( (yyvsp[(3) - (3)].tok) )); }
     break;
 
@@ -5319 +5318 @@
 
 /* Line 1806 of yacc.c  */
-#line 367 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_pfieldSel( (yyvsp[(1) - (3)].en), new VarRefNode( (yyvsp[(3) - (3)].tok) ) ) ); }
+#line 365 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::PFieldSel ), (yyvsp[(1) - (3)].en), new VarRefNode( (yyvsp[(3) - (3)].tok) )); }
     break;
 
@@ -5326 +5325 @@
 
 /* Line 1806 of yacc.c  */
+#line 368 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::IncrPost ), (yyvsp[(1) - (2)].en) ); }
+    break;
+
+  case 30:
+
+/* Line 1806 of yacc.c  */
 #line 370 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr1( OperatorNode::IncrPost, (yyvsp[(1) - (2)].en) ) ); }
-    break;
-
-  case 30:
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::DecrPost ), (yyvsp[(1) - (2)].en) ); }
+    break;
+
+  case 31:
 
 /* Line 1806 of yacc.c  */
 #line 372 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr1( OperatorNode::DecrPost, (yyvsp[(1) - (2)].en) ) ); }
-    break;
-
-  case 31:
+    { (yyval.en) = new CompoundLiteralNode( (yyvsp[(2) - (7)].decl), new InitializerNode( (yyvsp[(5) - (7)].in), true ) ); }
+    break;
+
+  case 32:
 
 /* Line 1806 of yacc.c  */
 #line 374 "parser.yy"
-    { (yyval.en) = new CompoundLiteralNode( (yyvsp[(2) - (7)].decl), new InitializerNode( (yyvsp[(5) - (7)].in), true ) ); }
-    break;
-
-  case 32:
-
-/* Line 1806 of yacc.c  */
-#line 376 "parser.yy"
     {
                         Token fn; fn.str = new std::string( "?{}" ); // location undefined
@@ -5357 +5356 @@
 
 /* Line 1806 of yacc.c  */
-#line 385 "parser.yy"
+#line 383 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) )); }
     break;
@@ -5364 +5363 @@
 
 /* Line 1806 of yacc.c  */
-#line 390 "parser.yy"
+#line 388 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -5371 +5370 @@
 
 /* Line 1806 of yacc.c  */
-#line 393 "parser.yy"
+#line 391 "parser.yy"
     { (yyval.en) = (yyvsp[(3) - (3)].en)->set_argName( (yyvsp[(1) - (3)].tok) ); }
     break;
@@ -5378 +5377 @@
 
 /* Line 1806 of yacc.c  */
+#line 396 "parser.yy"
+    { (yyval.en) = (yyvsp[(7) - (7)].en)->set_argName( (yyvsp[(3) - (7)].en) ); }
+    break;
+
+  case 39:
+
+/* Line 1806 of yacc.c  */
 #line 398 "parser.yy"
-    { (yyval.en) = (yyvsp[(7) - (7)].en)->set_argName( (yyvsp[(3) - (7)].en) ); }
-    break;
-
-  case 39:
-
-/* Line 1806 of yacc.c  */
-#line 400 "parser.yy"
     { (yyval.en) = (yyvsp[(9) - (9)].en)->set_argName( new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(yyvsp[(3) - (9)].en)->set_link( flattenCommas( (yyvsp[(5) - (9)].en) )))); }
     break;
@@ -5392 +5391 @@
 
 /* Line 1806 of yacc.c  */
-#line 405 "parser.yy"
+#line 403 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5399 +5398 @@
 
 /* Line 1806 of yacc.c  */
-#line 410 "parser.yy"
+#line 408 "parser.yy"
     { (yyval.en) = new VarRefNode( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -5406 +5405 @@
 
 /* Line 1806 of yacc.c  */
+#line 412 "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 414 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_fieldSel( (yyvsp[(3) - (3)].en), new VarRefNode( (yyvsp[(1) - (3)].tok) ) ) ); }
-    break;
-
-  case 44:
+    { (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 416 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_fieldSel( (yyvsp[(5) - (7)].en), new VarRefNode( (yyvsp[(1) - (7)].tok) ) ) ); }
-    break;
-
-  case 45:
+    { (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 418 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_pfieldSel( (yyvsp[(3) - (3)].en), new VarRefNode( (yyvsp[(1) - (3)].tok) ) ) ); }
-    break;
-
-  case 46:
-
-/* Line 1806 of yacc.c  */
-#line 420 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_pfieldSel( (yyvsp[(5) - (7)].en), new VarRefNode( (yyvsp[(1) - (7)].tok) ) ) ); }
+    { (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 426 "parser.yy"
+    { (yyval.en) = (yyvsp[(1) - (1)].constant); }
+    break;
+
+  case 49:
 
 /* Line 1806 of yacc.c  */
@@ -5438 +5444 @@
     break;
 
-  case 49:
+  case 50:
 
 /* Line 1806 of yacc.c  */
 #line 430 "parser.yy"
-    { (yyval.en) = (yyvsp[(1) - (1)].constant); }
-    break;
-
-  case 50:
+    { (yyval.en) = (yyvsp[(2) - (2)].en)->set_extension( true ); }
+    break;
+
+  case 51:
 
 /* Line 1806 of yacc.c  */
 #line 432 "parser.yy"
-    { (yyval.en) = (yyvsp[(2) - (2)].en)->set_extension( true ); }
-    break;
-
-  case 51:
+    { (yyval.en) = new CompositeExprNode( (yyvsp[(1) - (2)].en), (yyvsp[(2) - (2)].en) ); }
+    break;
+
+  case 52:
 
 /* Line 1806 of yacc.c  */
 #line 437 "parser.yy"
-    { (yyval.en) = (yyvsp[(1) - (2)].op) == OperatorNode::AddressOf ? (ExpressionNode*) new CompositeExprNode2( build_addressOf( (yyvsp[(2) - (2)].en) ) )
-                                                                                        : (ExpressionNode*)new CompositeExprNode( new OperatorNode ( (yyvsp[(1) - (2)].op) ), (yyvsp[(2) - (2)].en) ); }
-    break;
-
-  case 52:
-
-/* Line 1806 of yacc.c  */
-#line 440 "parser.yy"
     { (yyval.en) = new CompositeExprNode( (yyvsp[(1) - (2)].en), (yyvsp[(2) - (2)].en) ); }
     break;
@@ -5470 +5468 @@
 
 /* Line 1806 of yacc.c  */
-#line 442 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr1( OperatorNode::Incr, (yyvsp[(2) - (2)].en) ) ); }
+#line 439 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Incr ), (yyvsp[(2) - (2)].en) ); }
     break;
 
@@ -5477 +5475 @@
 
 /* Line 1806 of yacc.c  */
-#line 444 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr1( OperatorNode::Decr, (yyvsp[(2) - (2)].en) ) ); }
+#line 441 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Decr ), (yyvsp[(2) - (2)].en) ); }
     break;
 
@@ -5484 +5482 @@
 
 /* Line 1806 of yacc.c  */
-#line 446 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_sizeOf( (yyvsp[(2) - (2)].en) ) ); }
+#line 443 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::SizeOf ), (yyvsp[(2) - (2)].en) ); }
     break;
 
@@ -5491 +5489 @@
 
 /* Line 1806 of yacc.c  */
-#line 448 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_sizeOf( new TypeValueNode( (yyvsp[(3) - (4)].decl) ) ) ); }
+#line 445 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::SizeOf ), new TypeValueNode( (yyvsp[(3) - (4)].decl) )); }
     break;
 
@@ -5498 +5496 @@
 
 /* Line 1806 of yacc.c  */
-#line 450 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_offsetOf( new TypeValueNode( (yyvsp[(3) - (6)].decl) ), new VarRefNode( (yyvsp[(5) - (6)].tok) ) ) ); }
+#line 447 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::OffsetOf ), new TypeValueNode( (yyvsp[(3) - (6)].decl) ), new VarRefNode( (yyvsp[(5) - (6)].tok) )); }
     break;
 
@@ -5505 +5503 @@
 
 /* Line 1806 of yacc.c  */
-#line 452 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( (yyvsp[(1) - (1)].tok) ) ); }
+#line 449 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( (yyvsp[(1) - (1)].tok) )); }
     break;
 
@@ -5512 +5510 @@
 
 /* Line 1806 of yacc.c  */
-#line 454 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( (yyvsp[(1) - (4)].tok) ), new TypeValueNode( (yyvsp[(3) - (4)].decl) ) ); }
+#line 451 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( (yyvsp[(1) - (4)].tok) ), new TypeValueNode( (yyvsp[(3) - (4)].decl) )); }
     break;
 
@@ -5519 +5517 @@
 
 /* Line 1806 of yacc.c  */
-#line 456 "parser.yy"
+#line 453 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( (yyvsp[(1) - (4)].tok) ), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -5526 +5524 @@
 
 /* Line 1806 of yacc.c  */
-#line 458 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_alignOf( (yyvsp[(2) - (2)].en) ) ); }
+#line 455 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::AlignOf ), (yyvsp[(2) - (2)].en) ); }
     break;
 
@@ -5533 +5531 @@
 
 /* Line 1806 of yacc.c  */
-#line 460 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_alignOf( new TypeValueNode( (yyvsp[(3) - (4)].decl) ) ) ); }
+#line 457 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::AlignOf ), new TypeValueNode( (yyvsp[(3) - (4)].decl) ) ); }
     break;
 
@@ -5540 +5538 @@
 
 /* Line 1806 of yacc.c  */
+#line 463 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::PointTo ); }
+    break;
+
+  case 64:
+
+/* Line 1806 of yacc.c  */
+#line 464 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::AddressOf ); }
+    break;
+
+  case 65:
+
+/* Line 1806 of yacc.c  */
 #line 466 "parser.yy"
-    { (yyval.op) = OperatorNode::PointTo; }
-    break;
-
-  case 64:
-
-/* Line 1806 of yacc.c  */
-#line 467 "parser.yy"
-    { (yyval.op) = OperatorNode::AddressOf; }
-    break;
-
-  case 65:
-
-/* Line 1806 of yacc.c  */
-#line 469 "parser.yy"
-    { (yyval.op) = OperatorNode::And; }
+    { (yyval.en) = new OperatorNode( OperatorNode::And ); }
     break;
 
@@ -5561 +5559 @@
 
 /* Line 1806 of yacc.c  */
+#line 470 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::UnPlus ); }
+    break;
+
+  case 67:
+
+/* Line 1806 of yacc.c  */
+#line 471 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::UnMinus ); }
+    break;
+
+  case 68:
+
+/* Line 1806 of yacc.c  */
+#line 472 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::Neg ); }
+    break;
+
+  case 69:
+
+/* Line 1806 of yacc.c  */
 #line 473 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::UnPlus ); }
-    break;
-
-  case 67:
-
-/* Line 1806 of yacc.c  */
-#line 474 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::UnMinus ); }
-    break;
-
-  case 68:
-
-/* Line 1806 of yacc.c  */
-#line 475 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::Neg ); }
-    break;
-
-  case 69:
-
-/* Line 1806 of yacc.c  */
-#line 476 "parser.yy"
     { (yyval.en) = new OperatorNode( OperatorNode::BitNeg ); }
     break;
@@ -5589 +5587 @@
 
 /* Line 1806 of yacc.c  */
-#line 482 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_cast( new TypeValueNode( (yyvsp[(2) - (4)].decl) ), (yyvsp[(4) - (4)].en) ) ); }
+#line 479 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Cast ), new TypeValueNode( (yyvsp[(2) - (4)].decl) ), (yyvsp[(4) - (4)].en) ); }
     break;
 
@@ -5596 +5594 @@
 
 /* Line 1806 of yacc.c  */
-#line 484 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_cast( new TypeValueNode( (yyvsp[(2) - (4)].decl) ), (yyvsp[(4) - (4)].en) ) ); }
+#line 481 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Cast ), new TypeValueNode( (yyvsp[(2) - (4)].decl) ), (yyvsp[(4) - (4)].en) ); }
     break;
 
@@ -5603 +5601 @@
 
 /* Line 1806 of yacc.c  */
-#line 490 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr2( OperatorNode::Mul, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 487 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Mul ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -5610 +5608 @@
 
 /* Line 1806 of yacc.c  */
-#line 492 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr2( OperatorNode::Div, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 489 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Div ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -5617 +5615 @@
 
 /* Line 1806 of yacc.c  */
-#line 494 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr2( OperatorNode::Mod, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 491 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Mod ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -5624 +5622 @@
 
 /* Line 1806 of yacc.c  */
-#line 500 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr2( OperatorNode::Plus, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 497 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Plus ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -5631 +5629 @@
 
 /* Line 1806 of yacc.c  */
-#line 502 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr2( OperatorNode::Minus, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 499 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Minus ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -5638 +5636 @@
 
 /* Line 1806 of yacc.c  */
-#line 508 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr2( OperatorNode::LShift, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 505 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::LShift ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -5645 +5643 @@
 
 /* Line 1806 of yacc.c  */
-#line 510 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr2( OperatorNode::RShift, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 507 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::RShift ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -5652 +5650 @@
 
 /* Line 1806 of yacc.c  */
-#line 516 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr2( OperatorNode::LThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 513 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::LThan ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -5659 +5657 @@
 
 /* Line 1806 of yacc.c  */
-#line 518 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr2( OperatorNode::GThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 515 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::GThan ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -5666 +5664 @@
 
 /* Line 1806 of yacc.c  */
-#line 520 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr2( OperatorNode::LEThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 517 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::LEThan ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -5673 +5671 @@
 
 /* Line 1806 of yacc.c  */
-#line 522 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr2( OperatorNode::GEThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 519 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::GEThan ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -5680 +5678 @@
 
 /* Line 1806 of yacc.c  */
-#line 528 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr2( OperatorNode::Eq, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 525 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Eq ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -5687 +5685 @@
 
 /* Line 1806 of yacc.c  */
-#line 530 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr2( OperatorNode::Neq, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 527 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Neq ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -5694 +5692 @@
 
 /* Line 1806 of yacc.c  */
-#line 536 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr2( OperatorNode::BitAnd, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 533 "parser.yy"
+    { (yyval.en) =new CompositeExprNode( new OperatorNode( OperatorNode::BitAnd ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -5701 +5699 @@
 
 /* Line 1806 of yacc.c  */
-#line 542 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr2( OperatorNode::Xor, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 539 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Xor ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -5708 +5706 @@
 
 /* Line 1806 of yacc.c  */
-#line 548 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr2( OperatorNode::BitOr, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 545 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::BitOr ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -5715 +5713 @@
 
 /* Line 1806 of yacc.c  */
-#line 554 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_and_or( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en), true ) ); }
+#line 551 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::And ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -5722 +5720 @@
 
 /* Line 1806 of yacc.c  */
-#line 560 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_and_or( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en), false ) ); }
+#line 557 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Or ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -5729 +5727 @@
 
 /* Line 1806 of yacc.c  */
+#line 563 "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 565 "parser.yy"
+    { (yyval.en)=new CompositeExprNode( new OperatorNode( OperatorNode::NCond ), (yyvsp[(1) - (4)].en), (yyvsp[(4) - (4)].en) ); }
+    break;
+
+  case 104:
+
+/* Line 1806 of yacc.c  */
 #line 567 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_cond( (yyvsp[(1) - (5)].en), (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].en) ) ); }
-    break;
-
-  case 103:
-
-/* Line 1806 of yacc.c  */
-#line 569 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::NCond ), (yyvsp[(1) - (4)].en), (yyvsp[(4) - (4)].en) ); }
-    break;
-
-  case 104:
-
-/* Line 1806 of yacc.c  */
-#line 571 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_cond( (yyvsp[(1) - (5)].en), (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].en) ) ); }
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Cond ), (ExpressionNode *)mkList( (*(yyvsp[(1) - (5)].en), *(yyvsp[(3) - (5)].en), *(yyvsp[(5) - (5)].en) ) ) ); }
     break;
 
@@ -5750 +5748 @@
 
 /* Line 1806 of yacc.c  */
+#line 578 "parser.yy"
+    { (yyval.en) =new CompositeExprNode( new OperatorNode( OperatorNode::Assign ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 108:
+
+/* Line 1806 of yacc.c  */
+#line 580 "parser.yy"
+    { (yyval.en) =new CompositeExprNode( (yyvsp[(2) - (3)].en), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 109:
+
+/* Line 1806 of yacc.c  */
 #line 582 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Assign ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 108:
-
-/* Line 1806 of yacc.c  */
-#line 584 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( (yyvsp[(2) - (3)].en), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 109:
-
-/* Line 1806 of yacc.c  */
-#line 586 "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;
@@ -5771 +5769 @@
 
 /* Line 1806 of yacc.c  */
-#line 591 "parser.yy"
+#line 587 "parser.yy"
     { (yyval.en) = new NullExprNode; }
     break;
@@ -5778 +5776 @@
 
 /* Line 1806 of yacc.c  */
+#line 595 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ) ); }
+    break;
+
+  case 113:
+
+/* Line 1806 of yacc.c  */
+#line 597 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (yyvsp[(3) - (5)].en) ); }
+    break;
+
+  case 114:
+
+/* Line 1806 of yacc.c  */
 #line 599 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ) ); }
-    break;
-
-  case 113:
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(new NullExprNode)->set_link( (yyvsp[(4) - (6)].en) ) ); }
+    break;
+
+  case 115:
 
 /* Line 1806 of yacc.c  */
 #line 601 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (yyvsp[(3) - (5)].en) ); }
-    break;
-
-  case 114:
-
-/* Line 1806 of yacc.c  */
-#line 603 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(new NullExprNode)->set_link( (yyvsp[(4) - (6)].en) ) ); }
-    break;
-
-  case 115:
-
-/* Line 1806 of yacc.c  */
-#line 605 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(yyvsp[(3) - (7)].en)->set_link( flattenCommas( (yyvsp[(5) - (7)].en) ) ) ); }
     break;
@@ -5806 +5804 @@
 
 /* Line 1806 of yacc.c  */
+#line 607 "parser.yy"
+    { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 118:
+
+/* Line 1806 of yacc.c  */
 #line 611 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 118:
+    { (yyval.en) = new OperatorNode( OperatorNode::MulAssn ); }
+    break;
+
+  case 119:
+
+/* Line 1806 of yacc.c  */
+#line 612 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::DivAssn ); }
+    break;
+
+  case 120:
+
+/* Line 1806 of yacc.c  */
+#line 613 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::ModAssn ); }
+    break;
+
+  case 121:
+
+/* Line 1806 of yacc.c  */
+#line 614 "parser.yy"
+    { (yyval.en) = new OperatorNode( OperatorNode::PlusAssn ); }
+    break;
+
+  case 122:
 
 /* Line 1806 of yacc.c  */
 #line 615 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::MulAssn ); }
-    break;
-
-  case 119:
+    { (yyval.en) = new OperatorNode( OperatorNode::MinusAssn ); }
+    break;
+
+  case 123:
 
 /* Line 1806 of yacc.c  */
 #line 616 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::DivAssn ); }
-    break;
-
-  case 120:
+    { (yyval.en) = new OperatorNode( OperatorNode::LSAssn ); }
+    break;
+
+  case 124:
 
 /* Line 1806 of yacc.c  */
 #line 617 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::ModAssn ); }
-    break;
-
-  case 121:
+    { (yyval.en) = new OperatorNode( OperatorNode::RSAssn ); }
+    break;
+
+  case 125:
 
 /* Line 1806 of yacc.c  */
 #line 618 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::PlusAssn ); }
-    break;
-
-  case 122:
+    { (yyval.en) = new OperatorNode( OperatorNode::AndAssn ); }
+    break;
+
+  case 126:
 
 /* Line 1806 of yacc.c  */
 #line 619 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::MinusAssn ); }
-    break;
-
-  case 123:
+    { (yyval.en) = new OperatorNode( OperatorNode::ERAssn ); }
+    break;
+
+  case 127:
 
 /* Line 1806 of yacc.c  */
 #line 620 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::LSAssn ); }
-    break;
-
-  case 124:
-
-/* Line 1806 of yacc.c  */
-#line 621 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::RSAssn ); }
-    break;
-
-  case 125:
-
-/* Line 1806 of yacc.c  */
-#line 622 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::AndAssn ); }
-    break;
-
-  case 126:
-
-/* Line 1806 of yacc.c  */
-#line 623 "parser.yy"
-    { (yyval.en) = new OperatorNode( OperatorNode::ERAssn ); }
-    break;
-
-  case 127:
-
-/* Line 1806 of yacc.c  */
-#line 624 "parser.yy"
     { (yyval.en) = new OperatorNode( OperatorNode::OrAssn ); }
     break;
@@ -5883 +5881 @@
 
 /* Line 1806 of yacc.c  */
+#line 626 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Comma ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 130:
+
+/* Line 1806 of yacc.c  */
 #line 631 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_comma( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 130:
-
-/* Line 1806 of yacc.c  */
-#line 636 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -5897 +5895 @@
 
 /* Line 1806 of yacc.c  */
-#line 645 "parser.yy"
+#line 640 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (1)].sn); }
     break;
@@ -5904 +5902 @@
 
 /* Line 1806 of yacc.c  */
-#line 652 "parser.yy"
+#line 647 "parser.yy"
     {
                         Token fn; fn.str = new std::string( "^?{}" ); // location undefined
@@ -5915 +5913 @@
 
 /* Line 1806 of yacc.c  */
-#line 662 "parser.yy"
+#line 657 "parser.yy"
     {
                         (yyval.sn) = (yyvsp[(4) - (4)].sn)->add_label( (yyvsp[(1) - (4)].tok) );
@@ -5924 +5922 @@
 
 /* Line 1806 of yacc.c  */
-#line 669 "parser.yy"
+#line 664 "parser.yy"
     { (yyval.sn) = new CompoundStmtNode( (StatementNode *)0 ); }
     break;
@@ -5931 +5929 @@
 
 /* Line 1806 of yacc.c  */
-#line 676 "parser.yy"
+#line 671 "parser.yy"
     { (yyval.sn) = new CompoundStmtNode( (yyvsp[(5) - (7)].sn) ); }
     break;
@@ -5938 +5936 @@
 
 /* Line 1806 of yacc.c  */
+#line 677 "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 146:
+
+/* Line 1806 of yacc.c  */
 #line 682 "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 146:
-
-/* Line 1806 of yacc.c  */
-#line 687 "parser.yy"
     { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
     break;
@@ -5952 +5950 @@
 
 /* Line 1806 of yacc.c  */
-#line 689 "parser.yy"
+#line 684 "parser.yy"
     {   // mark all fields in list
                         for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_link() )
@@ -5963 +5961 @@
 
 /* Line 1806 of yacc.c  */
-#line 695 "parser.yy"
+#line 690 "parser.yy"
     { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
     break;
@@ -5970 +5968 @@
 
 /* Line 1806 of yacc.c  */
+#line 697 "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 152:
+
+/* Line 1806 of yacc.c  */
 #line 702 "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 152:
-
-/* Line 1806 of yacc.c  */
-#line 707 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Exp, (yyvsp[(1) - (2)].en), 0 ); }
     break;
@@ -5984 +5982 @@
 
 /* Line 1806 of yacc.c  */
-#line 713 "parser.yy"
+#line 708 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::If, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
     break;
@@ -5991 +5989 @@
 
 /* Line 1806 of yacc.c  */
-#line 715 "parser.yy"
+#line 710 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::If, (yyvsp[(3) - (7)].en), (StatementNode *)mkList((*(yyvsp[(5) - (7)].sn), *(yyvsp[(7) - (7)].sn) )) ); }
     break;
@@ -5998 +5996 @@
 
 /* Line 1806 of yacc.c  */
-#line 717 "parser.yy"
+#line 712 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
     break;
@@ -6005 +6003 @@
 
 /* Line 1806 of yacc.c  */
-#line 719 "parser.yy"
+#line 714 "parser.yy"
     {
                         StatementNode *sw = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) );
@@ -6020 +6018 @@
 
 /* Line 1806 of yacc.c  */
-#line 729 "parser.yy"
+#line 724 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
     break;
@@ -6027 +6025 @@
 
 /* Line 1806 of yacc.c  */
-#line 731 "parser.yy"
+#line 726 "parser.yy"
     {
                         StatementNode *sw = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) );
@@ -6037 +6035 @@
 
 /* Line 1806 of yacc.c  */
-#line 741 "parser.yy"
+#line 736 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
@@ -6044 +6042 @@
 
 /* Line 1806 of yacc.c  */
+#line 738 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Range ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 162:
+
+/* Line 1806 of yacc.c  */
 #line 743 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr2( OperatorNode::Range, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 162:
+    { (yyval.sn) = new StatementNode( StatementNode::Case, (yyvsp[(1) - (1)].en), 0 ); }
+    break;
+
+  case 163:
+
+/* Line 1806 of yacc.c  */
+#line 744 "parser.yy"
+    { (yyval.sn) = (StatementNode *)((yyvsp[(1) - (3)].sn)->set_link( new StatementNode( StatementNode::Case, (yyvsp[(3) - (3)].en), 0 ) ) ); }
+    break;
+
+  case 164:
 
 /* Line 1806 of yacc.c  */
 #line 748 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Case, (yyvsp[(1) - (1)].en), 0 ); }
-    break;
-
-  case 163:
-
-/* Line 1806 of yacc.c  */
-#line 750 "parser.yy"
-    { (yyval.sn) = (StatementNode *)((yyvsp[(1) - (3)].sn)->set_link( new StatementNode( StatementNode::Case, (yyvsp[(3) - (3)].en), 0 ) ) ); }
-    break;
-
-  case 164:
-
-/* Line 1806 of yacc.c  */
-#line 754 "parser.yy"
     { (yyval.sn) = (yyvsp[(2) - (3)].sn); }
     break;
@@ -6072 +6070 @@
 
 /* Line 1806 of yacc.c  */
+#line 749 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Default ); }
+    break;
+
+  case 167:
+
+/* Line 1806 of yacc.c  */
 #line 755 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Default ); }
-    break;
-
-  case 167:
-
-/* Line 1806 of yacc.c  */
-#line 761 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (2)].sn)->set_link( (yyvsp[(2) - (2)].sn) )); }
     break;
@@ -6086 +6084 @@
 
 /* Line 1806 of yacc.c  */
-#line 765 "parser.yy"
+#line 759 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( new CompoundStmtNode( (yyvsp[(2) - (2)].sn) ) ); }
     break;
@@ -6093 +6091 @@
 
 /* Line 1806 of yacc.c  */
+#line 764 "parser.yy"
+    { (yyval.sn) = 0; }
+    break;
+
+  case 171:
+
+/* Line 1806 of yacc.c  */
 #line 770 "parser.yy"
+    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( new CompoundStmtNode( (yyvsp[(2) - (2)].sn) ) ); }
+    break;
+
+  case 172:
+
+/* Line 1806 of yacc.c  */
+#line 772 "parser.yy"
+    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(2) - (3)].sn)->append_last_case( new CompoundStmtNode( (yyvsp[(3) - (3)].sn) ) ) ) ); }
+    break;
+
+  case 173:
+
+/* Line 1806 of yacc.c  */
+#line 777 "parser.yy"
     { (yyval.sn) = 0; }
     break;
 
-  case 171:
-
-/* Line 1806 of yacc.c  */
-#line 776 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( new CompoundStmtNode( (yyvsp[(2) - (2)].sn) ) ); }
-    break;
-
-  case 172:
-
-/* Line 1806 of yacc.c  */
-#line 778 "parser.yy"
-    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(2) - (3)].sn)->append_last_case( new CompoundStmtNode( (yyvsp[(3) - (3)].sn) ) ) ) ); }
-    break;
-
-  case 173:
+  case 175:
 
 /* Line 1806 of yacc.c  */
 #line 783 "parser.yy"
+    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
+    break;
+
+  case 176:
+
+/* Line 1806 of yacc.c  */
+#line 785 "parser.yy"
+    { (yyval.sn) = (yyvsp[(1) - (3)].sn)->append_last_case( new CompoundStmtNode( (StatementNode *)mkList( (*(yyvsp[(2) - (3)].sn), *(yyvsp[(3) - (3)].sn) ) ) ) ); }
+    break;
+
+  case 177:
+
+/* Line 1806 of yacc.c  */
+#line 787 "parser.yy"
+    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
+    break;
+
+  case 178:
+
+/* Line 1806 of yacc.c  */
+#line 789 "parser.yy"
+    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (4)].sn)->set_link( (yyvsp[(2) - (4)].sn)->append_last_case( new CompoundStmtNode( (StatementNode *)mkList( (*(yyvsp[(3) - (4)].sn), *(yyvsp[(4) - (4)].sn) ) ) ) ) ) ); }
+    break;
+
+  case 179:
+
+/* Line 1806 of yacc.c  */
+#line 794 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Break ); }
+    break;
+
+  case 181:
+
+/* Line 1806 of yacc.c  */
+#line 800 "parser.yy"
     { (yyval.sn) = 0; }
     break;
 
-  case 175:
-
-/* Line 1806 of yacc.c  */
-#line 789 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
-    break;
-
-  case 176:
-
-/* Line 1806 of yacc.c  */
-#line 791 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (3)].sn)->append_last_case( new CompoundStmtNode( (StatementNode *)mkList( (*(yyvsp[(2) - (3)].sn), *(yyvsp[(3) - (3)].sn) ) ) ) ); }
-    break;
-
-  case 177:
-
-/* Line 1806 of yacc.c  */
-#line 793 "parser.yy"
-    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
-    break;
-
-  case 178:
-
-/* Line 1806 of yacc.c  */
-#line 795 "parser.yy"
-    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (4)].sn)->set_link( (yyvsp[(2) - (4)].sn)->append_last_case( new CompoundStmtNode( (StatementNode *)mkList( (*(yyvsp[(3) - (4)].sn), *(yyvsp[(4) - (4)].sn) ) ) ) ) ) ); }
-    break;
-
-  case 179:
-
-/* Line 1806 of yacc.c  */
-#line 800 "parser.yy"
+  case 182:
+
+/* Line 1806 of yacc.c  */
+#line 802 "parser.yy"
+    { (yyval.sn) = 0; }
+    break;
+
+  case 183:
+
+/* Line 1806 of yacc.c  */
+#line 807 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::While, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
+    break;
+
+  case 184:
+
+/* Line 1806 of yacc.c  */
+#line 809 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Do, (yyvsp[(5) - (7)].en), (yyvsp[(2) - (7)].sn) ); }
+    break;
+
+  case 185:
+
+/* Line 1806 of yacc.c  */
+#line 811 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::For, (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].sn) ); }
+    break;
+
+  case 186:
+
+/* Line 1806 of yacc.c  */
+#line 816 "parser.yy"
+    { (yyval.en) = new ForCtlExprNode( (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].en) ); }
+    break;
+
+  case 187:
+
+/* Line 1806 of yacc.c  */
+#line 818 "parser.yy"
+    { (yyval.en) = new ForCtlExprNode( (yyvsp[(1) - (4)].decl), (yyvsp[(2) - (4)].en), (yyvsp[(4) - (4)].en) ); }
+    break;
+
+  case 188:
+
+/* Line 1806 of yacc.c  */
+#line 823 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Goto, (yyvsp[(2) - (3)].tok) ); }
+    break;
+
+  case 189:
+
+/* Line 1806 of yacc.c  */
+#line 827 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Goto, (yyvsp[(3) - (4)].en) ); }
+    break;
+
+  case 190:
+
+/* Line 1806 of yacc.c  */
+#line 830 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Continue ); }
+    break;
+
+  case 191:
+
+/* Line 1806 of yacc.c  */
+#line 834 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Continue, (yyvsp[(2) - (3)].tok) ); }
+    break;
+
+  case 192:
+
+/* Line 1806 of yacc.c  */
+#line 837 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Break ); }
     break;
 
-  case 181:
-
-/* Line 1806 of yacc.c  */
-#line 806 "parser.yy"
-    { (yyval.sn) = 0; }
-    break;
-
-  case 182:
-
-/* Line 1806 of yacc.c  */
-#line 808 "parser.yy"
-    { (yyval.sn) = 0; }
-    break;
-
-  case 183:
-
-/* Line 1806 of yacc.c  */
-#line 813 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::While, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
-    break;
-
-  case 184:
-
-/* Line 1806 of yacc.c  */
-#line 815 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Do, (yyvsp[(5) - (7)].en), (yyvsp[(2) - (7)].sn) ); }
-    break;
-
-  case 185:
-
-/* Line 1806 of yacc.c  */
-#line 817 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::For, (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].sn) ); }
-    break;
-
-  case 186:
-
-/* Line 1806 of yacc.c  */
-#line 822 "parser.yy"
-    { (yyval.en) = new ForCtlExprNode( (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].en) ); }
-    break;
-
-  case 187:
-
-/* Line 1806 of yacc.c  */
-#line 824 "parser.yy"
-    { (yyval.en) = new ForCtlExprNode( (yyvsp[(1) - (4)].decl), (yyvsp[(2) - (4)].en), (yyvsp[(4) - (4)].en) ); }
-    break;
-
-  case 188:
-
-/* Line 1806 of yacc.c  */
-#line 829 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Goto, (yyvsp[(2) - (3)].tok) ); }
-    break;
-
-  case 189:
-
-/* Line 1806 of yacc.c  */
-#line 833 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Goto, (yyvsp[(3) - (4)].en) ); }
-    break;
-
-  case 190:
-
-/* Line 1806 of yacc.c  */
-#line 836 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Continue ); }
-    break;
-
-  case 191:
-
-/* Line 1806 of yacc.c  */
-#line 840 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Continue, (yyvsp[(2) - (3)].tok) ); }
-    break;
-
-  case 192:
+  case 193:
+
+/* Line 1806 of yacc.c  */
+#line 841 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Break, (yyvsp[(2) - (3)].tok) ); }
+    break;
+
+  case 194:
 
 /* Line 1806 of yacc.c  */
 #line 843 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Break ); }
-    break;
-
-  case 193:
-
-/* Line 1806 of yacc.c  */
-#line 847 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Break, (yyvsp[(2) - (3)].tok) ); }
-    break;
-
-  case 194:
+    { (yyval.sn) = new StatementNode( StatementNode::Return, (yyvsp[(2) - (3)].en), 0 ); }
+    break;
+
+  case 195:
+
+/* Line 1806 of yacc.c  */
+#line 845 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Throw, (yyvsp[(2) - (3)].en), 0 ); }
+    break;
+
+  case 196:
 
 /* Line 1806 of yacc.c  */
 #line 849 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Return, (yyvsp[(2) - (3)].en), 0 ); }
-    break;
-
-  case 195:
+    { (yyval.sn) = new StatementNode( StatementNode::Throw, (yyvsp[(2) - (3)].en), 0 ); }
+    break;
+
+  case 197:
 
 /* Line 1806 of yacc.c  */
 #line 851 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Throw, (yyvsp[(2) - (3)].en), 0 ); }
-    break;
-
-  case 196:
-
-/* Line 1806 of yacc.c  */
-#line 855 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Throw, (yyvsp[(2) - (3)].en), 0 ); }
-    break;
-
-  case 197:
-
-/* Line 1806 of yacc.c  */
-#line 857 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Throw, (yyvsp[(2) - (5)].en), 0 ); }
     break;
@@ -6275 +6273 @@
 
 /* Line 1806 of yacc.c  */
-#line 864 "parser.yy"
+#line 858 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].pn) )))); }
     break;
@@ -6282 +6280 @@
 
 /* Line 1806 of yacc.c  */
-#line 866 "parser.yy"
+#line 860 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].pn) )))); }
     break;
@@ -6289 +6287 @@
 
 /* Line 1806 of yacc.c  */
-#line 868 "parser.yy"
+#line 862 "parser.yy"
     {
                         (yyvsp[(3) - (4)].pn)->set_link( (yyvsp[(4) - (4)].pn) );
@@ -6299 +6297 @@
 
 /* Line 1806 of yacc.c  */
+#line 873 "parser.yy"
+    { (yyval.pn) = StatementNode::newCatchStmt( 0, (yyvsp[(5) - (5)].sn), true ); }
+    break;
+
+  case 203:
+
+/* Line 1806 of yacc.c  */
+#line 875 "parser.yy"
+    { (yyval.pn) = (yyvsp[(1) - (6)].pn)->set_link( StatementNode::newCatchStmt( 0, (yyvsp[(6) - (6)].sn), true ) ); }
+    break;
+
+  case 204:
+
+/* Line 1806 of yacc.c  */
+#line 877 "parser.yy"
+    { (yyval.pn) = StatementNode::newCatchStmt( 0, (yyvsp[(5) - (5)].sn), true ); }
+    break;
+
+  case 205:
+
+/* Line 1806 of yacc.c  */
 #line 879 "parser.yy"
-    { (yyval.pn) = StatementNode::newCatchStmt( 0, (yyvsp[(5) - (5)].sn), true ); }
-    break;
-
-  case 203:
-
-/* Line 1806 of yacc.c  */
-#line 881 "parser.yy"
     { (yyval.pn) = (yyvsp[(1) - (6)].pn)->set_link( StatementNode::newCatchStmt( 0, (yyvsp[(6) - (6)].sn), true ) ); }
     break;
 
-  case 204:
-
-/* Line 1806 of yacc.c  */
-#line 883 "parser.yy"
-    { (yyval.pn) = StatementNode::newCatchStmt( 0, (yyvsp[(5) - (5)].sn), true ); }
-    break;
-
-  case 205:
-
-/* Line 1806 of yacc.c  */
-#line 885 "parser.yy"
-    { (yyval.pn) = (yyvsp[(1) - (6)].pn)->set_link( StatementNode::newCatchStmt( 0, (yyvsp[(6) - (6)].sn), true ) ); }
-    break;
-
   case 206:
 
 /* Line 1806 of yacc.c  */
+#line 884 "parser.yy"
+    { (yyval.pn) = StatementNode::newCatchStmt( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ); }
+    break;
+
+  case 207:
+
+/* Line 1806 of yacc.c  */
+#line 886 "parser.yy"
+    { (yyval.pn) = (yyvsp[(1) - (10)].pn)->set_link( StatementNode::newCatchStmt( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ); }
+    break;
+
+  case 208:
+
+/* Line 1806 of yacc.c  */
+#line 888 "parser.yy"
+    { (yyval.pn) = StatementNode::newCatchStmt( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ); }
+    break;
+
+  case 209:
+
+/* Line 1806 of yacc.c  */
 #line 890 "parser.yy"
-    { (yyval.pn) = StatementNode::newCatchStmt( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ); }
-    break;
-
-  case 207:
-
-/* Line 1806 of yacc.c  */
-#line 892 "parser.yy"
     { (yyval.pn) = (yyvsp[(1) - (10)].pn)->set_link( StatementNode::newCatchStmt( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ); }
     break;
 
-  case 208:
-
-/* Line 1806 of yacc.c  */
-#line 894 "parser.yy"
-    { (yyval.pn) = StatementNode::newCatchStmt( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ); }
-    break;
-
-  case 209:
-
-/* Line 1806 of yacc.c  */
-#line 896 "parser.yy"
-    { (yyval.pn) = (yyvsp[(1) - (10)].pn)->set_link( StatementNode::newCatchStmt( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ); }
-    break;
-
   case 210:
 
 /* Line 1806 of yacc.c  */
-#line 901 "parser.yy"
+#line 895 "parser.yy"
     {
                         (yyval.pn) = new StatementNode( StatementNode::Finally, 0, (yyvsp[(2) - (2)].sn) );
@@ -6365 +6363 @@
 
 /* Line 1806 of yacc.c  */
-#line 915 "parser.yy"
+#line 909 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6375 +6373 @@
 
 /* Line 1806 of yacc.c  */
-#line 920 "parser.yy"
+#line 914 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6382 +6380 @@
 
 /* Line 1806 of yacc.c  */
-#line 922 "parser.yy"
+#line 916 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6392 +6390 @@
 
 /* Line 1806 of yacc.c  */
+#line 925 "parser.yy"
+    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (6)].flag), (yyvsp[(4) - (6)].constant), 0 ); }
+    break;
+
+  case 217:
+
+/* Line 1806 of yacc.c  */
+#line 927 "parser.yy"
+    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (8)].flag), (yyvsp[(4) - (8)].constant), (yyvsp[(6) - (8)].en) ); }
+    break;
+
+  case 218:
+
+/* Line 1806 of yacc.c  */
+#line 929 "parser.yy"
+    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (10)].flag), (yyvsp[(4) - (10)].constant), (yyvsp[(6) - (10)].en), (yyvsp[(8) - (10)].en) ); }
+    break;
+
+  case 219:
+
+/* Line 1806 of yacc.c  */
 #line 931 "parser.yy"
-    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (6)].flag), (yyvsp[(4) - (6)].constant), 0 ); }
-    break;
-
-  case 217:
+    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (12)].flag), (yyvsp[(4) - (12)].constant), (yyvsp[(6) - (12)].en), (yyvsp[(8) - (12)].en), (yyvsp[(10) - (12)].constant) ); }
+    break;
+
+  case 220:
 
 /* Line 1806 of yacc.c  */
 #line 933 "parser.yy"
-    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (8)].flag), (yyvsp[(4) - (8)].constant), (yyvsp[(6) - (8)].en) ); }
-    break;
-
-  case 218:
-
-/* Line 1806 of yacc.c  */
-#line 935 "parser.yy"
-    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (10)].flag), (yyvsp[(4) - (10)].constant), (yyvsp[(6) - (10)].en), (yyvsp[(8) - (10)].en) ); }
-    break;
-
-  case 219:
-
-/* Line 1806 of yacc.c  */
-#line 937 "parser.yy"
-    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (12)].flag), (yyvsp[(4) - (12)].constant), (yyvsp[(6) - (12)].en), (yyvsp[(8) - (12)].en), (yyvsp[(10) - (12)].constant) ); }
-    break;
-
-  case 220:
-
-/* Line 1806 of yacc.c  */
-#line 939 "parser.yy"
     { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (14)].flag), (yyvsp[(5) - (14)].constant), 0, (yyvsp[(8) - (14)].en), (yyvsp[(10) - (14)].constant), (yyvsp[(12) - (14)].label) ); }
     break;
@@ -6427 +6425 @@
 
 /* Line 1806 of yacc.c  */
-#line 944 "parser.yy"
+#line 938 "parser.yy"
     { (yyval.flag) = false; }
     break;
@@ -6434 +6432 @@
 
 /* Line 1806 of yacc.c  */
-#line 946 "parser.yy"
+#line 940 "parser.yy"
     { (yyval.flag) = true; }
     break;
@@ -6441 +6439 @@
 
 /* Line 1806 of yacc.c  */
-#line 951 "parser.yy"
+#line 945 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -6448 +6446 @@
 
 /* Line 1806 of yacc.c  */
-#line 958 "parser.yy"
+#line 952 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
     break;
@@ -6455 +6453 @@
 
 /* Line 1806 of yacc.c  */
-#line 963 "parser.yy"
+#line 957 "parser.yy"
     { (yyval.en) = new AsmExprNode( 0, (yyvsp[(1) - (4)].constant), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -6462 +6460 @@
 
 /* Line 1806 of yacc.c  */
-#line 965 "parser.yy"
+#line 959 "parser.yy"
     { (yyval.en) = new AsmExprNode( (yyvsp[(2) - (7)].en), (yyvsp[(4) - (7)].constant), (yyvsp[(6) - (7)].en) ); }
     break;
@@ -6469 +6467 @@
 
 /* Line 1806 of yacc.c  */
-#line 970 "parser.yy"
+#line 964 "parser.yy"
     { (yyval.constant) = 0; }
     break;
@@ -6476 +6474 @@
 
 /* Line 1806 of yacc.c  */
-#line 972 "parser.yy"
+#line 966 "parser.yy"
     { (yyval.constant) = (yyvsp[(1) - (1)].constant); }
     break;
@@ -6483 +6481 @@
 
 /* Line 1806 of yacc.c  */
-#line 974 "parser.yy"
+#line 968 "parser.yy"
     { (yyval.constant) = (ConstantNode *)(yyvsp[(1) - (3)].constant)->set_link( (yyvsp[(3) - (3)].constant) ); }
     break;
@@ -6490 +6488 @@
 
 /* Line 1806 of yacc.c  */
-#line 979 "parser.yy"
+#line 973 "parser.yy"
     { (yyval.label) = new LabelNode(); (yyval.label)->append_label( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -6497 +6495 @@
 
 /* Line 1806 of yacc.c  */
-#line 981 "parser.yy"
+#line 975 "parser.yy"
     { (yyval.label) = (yyvsp[(1) - (3)].label); (yyvsp[(1) - (3)].label)->append_label( (yyvsp[(3) - (3)].tok) ); }
     break;
@@ -6504 +6502 @@
 
 /* Line 1806 of yacc.c  */
-#line 988 "parser.yy"
+#line 982 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6511 +6509 @@
 
 /* Line 1806 of yacc.c  */
-#line 995 "parser.yy"
+#line 989 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6518 +6516 @@
 
 /* Line 1806 of yacc.c  */
-#line 1000 "parser.yy"
+#line 994 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6525 +6523 @@
 
 /* Line 1806 of yacc.c  */
-#line 1007 "parser.yy"
+#line 1001 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6532 +6530 @@
 
 /* Line 1806 of yacc.c  */
-#line 1021 "parser.yy"
+#line 1015 "parser.yy"
     {}
     break;
@@ -6539 +6537 @@
 
 /* Line 1806 of yacc.c  */
-#line 1022 "parser.yy"
+#line 1016 "parser.yy"
     {}
     break;
@@ -6546 +6544 @@
 
 /* Line 1806 of yacc.c  */
-#line 1051 "parser.yy"
+#line 1045 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6556 +6554 @@
 
 /* Line 1806 of yacc.c  */
-#line 1058 "parser.yy"
+#line 1052 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6566 +6564 @@
 
 /* Line 1806 of yacc.c  */
-#line 1063 "parser.yy"
+#line 1057 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (6)].tok), TypedefTable::ID );
@@ -6576 +6574 @@
 
 /* Line 1806 of yacc.c  */
-#line 1073 "parser.yy"
+#line 1067 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
@@ -6586 +6584 @@
 
 /* Line 1806 of yacc.c  */
-#line 1078 "parser.yy"
+#line 1072 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
@@ -6596 +6594 @@
 
 /* Line 1806 of yacc.c  */
-#line 1083 "parser.yy"
+#line 1077 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(3) - (4)].tok) );
@@ -6606 +6604 @@
 
 /* Line 1806 of yacc.c  */
-#line 1091 "parser.yy"
+#line 1085 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6616 +6614 @@
 
 /* Line 1806 of yacc.c  */
-#line 1096 "parser.yy"
+#line 1090 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6626 +6624 @@
 
 /* Line 1806 of yacc.c  */
-#line 1101 "parser.yy"
+#line 1095 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6636 +6634 @@
 
 /* Line 1806 of yacc.c  */
-#line 1106 "parser.yy"
+#line 1100 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6646 +6644 @@
 
 /* Line 1806 of yacc.c  */
-#line 1111 "parser.yy"
+#line 1105 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
@@ -6656 +6654 @@
 
 /* Line 1806 of yacc.c  */
-#line 1119 "parser.yy"
+#line 1113 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(3) - (8)].tok), DeclarationNode::newTuple( 0 ), (yyvsp[(6) - (8)].decl), 0, true );
@@ -6665 +6663 @@
 
 /* Line 1806 of yacc.c  */
-#line 1142 "parser.yy"
+#line 1136 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
@@ -6674 +6672 @@
 
 /* Line 1806 of yacc.c  */
-#line 1146 "parser.yy"
+#line 1140 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
@@ -6683 +6681 @@
 
 /* Line 1806 of yacc.c  */
-#line 1153 "parser.yy"
+#line 1147 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -6690 +6688 @@
 
 /* Line 1806 of yacc.c  */
-#line 1157 "parser.yy"
+#line 1151 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (9)].decl)->appendList( (yyvsp[(7) - (9)].decl) ) ); }
     break;
@@ -6697 +6695 @@
 
 /* Line 1806 of yacc.c  */
-#line 1162 "parser.yy"
+#line 1156 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6707 +6705 @@
 
 /* Line 1806 of yacc.c  */
-#line 1167 "parser.yy"
+#line 1161 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6717 +6715 @@
 
 /* Line 1806 of yacc.c  */
-#line 1172 "parser.yy"
+#line 1166 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::TD );
@@ -6727 +6725 @@
 
 /* Line 1806 of yacc.c  */
-#line 1183 "parser.yy"
+#line 1177 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6737 +6735 @@
 
 /* Line 1806 of yacc.c  */
-#line 1188 "parser.yy"
+#line 1182 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6747 +6745 @@
 
 /* Line 1806 of yacc.c  */
-#line 1193 "parser.yy"
+#line 1187 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6757 +6755 @@
 
 /* Line 1806 of yacc.c  */
-#line 1198 "parser.yy"
+#line 1192 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6767 +6765 @@
 
 /* Line 1806 of yacc.c  */
-#line 1203 "parser.yy"
+#line 1197 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6777 +6775 @@
 
 /* Line 1806 of yacc.c  */
-#line 1212 "parser.yy"
+#line 1206 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (4)].tok), TypedefTable::TD );
@@ -6787 +6785 @@
 
 /* Line 1806 of yacc.c  */
-#line 1217 "parser.yy"
+#line 1211 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (7)].tok), TypedefTable::TD );
@@ -6797 +6795 @@
 
 /* Line 1806 of yacc.c  */
-#line 1234 "parser.yy"
+#line 1228 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6807 +6805 @@
 
 /* Line 1806 of yacc.c  */
-#line 1239 "parser.yy"
+#line 1233 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6817 +6815 @@
 
 /* Line 1806 of yacc.c  */
-#line 1261 "parser.yy"
+#line 1255 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6824 +6822 @@
 
 /* Line 1806 of yacc.c  */
-#line 1273 "parser.yy"
+#line 1267 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6831 +6829 @@
 
 /* Line 1806 of yacc.c  */
+#line 1278 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Const ); }
+    break;
+
+  case 302:
+
+/* Line 1806 of yacc.c  */
+#line 1280 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Restrict ); }
+    break;
+
+  case 303:
+
+/* Line 1806 of yacc.c  */
+#line 1282 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Volatile ); }
+    break;
+
+  case 304:
+
+/* Line 1806 of yacc.c  */
 #line 1284 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Const ); }
-    break;
-
-  case 302:
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Lvalue ); }
+    break;
+
+  case 305:
 
 /* Line 1806 of yacc.c  */
 #line 1286 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Restrict ); }
-    break;
-
-  case 303:
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Atomic ); }
+    break;
+
+  case 306:
 
 /* Line 1806 of yacc.c  */
 #line 1288 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Volatile ); }
-    break;
-
-  case 304:
-
-/* Line 1806 of yacc.c  */
-#line 1290 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Lvalue ); }
-    break;
-
-  case 305:
-
-/* Line 1806 of yacc.c  */
-#line 1292 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Atomic ); }
-    break;
-
-  case 306:
-
-/* Line 1806 of yacc.c  */
-#line 1294 "parser.yy"
     {
                         typedefTable.enterScope();
@@ -6875 +6873 @@
 
 /* Line 1806 of yacc.c  */
-#line 1298 "parser.yy"
+#line 1292 "parser.yy"
     {
                         typedefTable.leaveScope();
@@ -6885 +6883 @@
 
 /* Line 1806 of yacc.c  */
-#line 1307 "parser.yy"
+#line 1301 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6892 +6890 @@
 
 /* Line 1806 of yacc.c  */
-#line 1309 "parser.yy"
+#line 1303 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6899 +6897 @@
 
 /* Line 1806 of yacc.c  */
-#line 1320 "parser.yy"
+#line 1314 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6906 +6904 @@
 
 /* Line 1806 of yacc.c  */
+#line 1323 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Extern ); }
+    break;
+
+  case 315:
+
+/* Line 1806 of yacc.c  */
+#line 1325 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Static ); }
+    break;
+
+  case 316:
+
+/* Line 1806 of yacc.c  */
+#line 1327 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Auto ); }
+    break;
+
+  case 317:
+
+/* Line 1806 of yacc.c  */
 #line 1329 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Extern ); }
-    break;
-
-  case 315:
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Register ); }
+    break;
+
+  case 318:
 
 /* Line 1806 of yacc.c  */
 #line 1331 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Static ); }
-    break;
-
-  case 316:
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Inline ); }
+    break;
+
+  case 319:
 
 /* Line 1806 of yacc.c  */
 #line 1333 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Auto ); }
-    break;
-
-  case 317:
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Fortran ); }
+    break;
+
+  case 320:
 
 /* Line 1806 of yacc.c  */
 #line 1335 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Register ); }
-    break;
-
-  case 318:
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Noreturn ); }
+    break;
+
+  case 321:
 
 /* Line 1806 of yacc.c  */
 #line 1337 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Inline ); }
-    break;
-
-  case 319:
-
-/* Line 1806 of yacc.c  */
-#line 1339 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Fortran ); }
-    break;
-
-  case 320:
-
-/* Line 1806 of yacc.c  */
-#line 1341 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Noreturn ); }
-    break;
-
-  case 321:
-
-/* Line 1806 of yacc.c  */
-#line 1343 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Threadlocal ); }
     break;
@@ -6962 +6960 @@
 
 /* Line 1806 of yacc.c  */
+#line 1342 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Char ); }
+    break;
+
+  case 323:
+
+/* Line 1806 of yacc.c  */
+#line 1344 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Double ); }
+    break;
+
+  case 324:
+
+/* Line 1806 of yacc.c  */
+#line 1346 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Float ); }
+    break;
+
+  case 325:
+
+/* Line 1806 of yacc.c  */
 #line 1348 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Char ); }
-    break;
-
-  case 323:
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Int ); }
+    break;
+
+  case 326:
 
 /* Line 1806 of yacc.c  */
 #line 1350 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Double ); }
-    break;
-
-  case 324:
+    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Long ); }
+    break;
+
+  case 327:
 
 /* Line 1806 of yacc.c  */
 #line 1352 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Float ); }
-    break;
-
-  case 325:
+    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Short ); }
+    break;
+
+  case 328:
 
 /* Line 1806 of yacc.c  */
 #line 1354 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Int ); }
-    break;
-
-  case 326:
+    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Signed ); }
+    break;
+
+  case 329:
 
 /* Line 1806 of yacc.c  */
 #line 1356 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Long ); }
-    break;
-
-  case 327:
+    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Unsigned ); }
+    break;
+
+  case 330:
 
 /* Line 1806 of yacc.c  */
 #line 1358 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Short ); }
-    break;
-
-  case 328:
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Void ); }
+    break;
+
+  case 331:
 
 /* Line 1806 of yacc.c  */
 #line 1360 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Signed ); }
-    break;
-
-  case 329:
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Bool ); }
+    break;
+
+  case 332:
 
 /* Line 1806 of yacc.c  */
 #line 1362 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Unsigned ); }
-    break;
-
-  case 330:
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Complex ); }
+    break;
+
+  case 333:
 
 /* Line 1806 of yacc.c  */
 #line 1364 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Void ); }
-    break;
-
-  case 331:
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Imaginary ); }
+    break;
+
+  case 334:
 
 /* Line 1806 of yacc.c  */
 #line 1366 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Bool ); }
-    break;
-
-  case 332:
-
-/* Line 1806 of yacc.c  */
-#line 1368 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Complex ); }
-    break;
-
-  case 333:
-
-/* Line 1806 of yacc.c  */
-#line 1370 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Imaginary ); }
-    break;
-
-  case 334:
-
-/* Line 1806 of yacc.c  */
-#line 1372 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
     break;
@@ -7053 +7051 @@
 
 /* Line 1806 of yacc.c  */
+#line 1373 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 337:
+
+/* Line 1806 of yacc.c  */
+#line 1375 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 338:
+
+/* Line 1806 of yacc.c  */
+#line 1377 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
+    break;
+
+  case 339:
+
+/* Line 1806 of yacc.c  */
 #line 1379 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addType( (yyvsp[(1) - (3)].decl) ); }
+    break;
+
+  case 341:
+
+/* Line 1806 of yacc.c  */
+#line 1385 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
+    break;
+
+  case 343:
+
+/* Line 1806 of yacc.c  */
+#line 1392 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 337:
-
-/* Line 1806 of yacc.c  */
-#line 1381 "parser.yy"
+  case 344:
+
+/* Line 1806 of yacc.c  */
+#line 1394 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 338:
-
-/* Line 1806 of yacc.c  */
-#line 1383 "parser.yy"
+  case 345:
+
+/* Line 1806 of yacc.c  */
+#line 1396 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addType( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 346:
+
+/* Line 1806 of yacc.c  */
+#line 1401 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (4)].decl); }
+    break;
+
+  case 347:
+
+/* Line 1806 of yacc.c  */
+#line 1403 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newTypeof( (yyvsp[(3) - (4)].en) ); }
+    break;
+
+  case 348:
+
+/* Line 1806 of yacc.c  */
+#line 1405 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].decl) ); }
+    break;
+
+  case 349:
+
+/* Line 1806 of yacc.c  */
+#line 1407 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
+    break;
+
+  case 351:
+
+/* Line 1806 of yacc.c  */
+#line 1413 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 352:
+
+/* Line 1806 of yacc.c  */
+#line 1415 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 353:
+
+/* Line 1806 of yacc.c  */
+#line 1417 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
 
-  case 339:
-
-/* Line 1806 of yacc.c  */
-#line 1385 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addType( (yyvsp[(1) - (3)].decl) ); }
-    break;
-
-  case 341:
-
-/* Line 1806 of yacc.c  */
-#line 1391 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 343:
-
-/* Line 1806 of yacc.c  */
-#line 1398 "parser.yy"
+  case 355:
+
+/* Line 1806 of yacc.c  */
+#line 1423 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 344:
-
-/* Line 1806 of yacc.c  */
-#line 1400 "parser.yy"
+  case 356:
+
+/* Line 1806 of yacc.c  */
+#line 1425 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 345:
-
-/* Line 1806 of yacc.c  */
-#line 1402 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addType( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 346:
-
-/* Line 1806 of yacc.c  */
-#line 1407 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (4)].decl); }
-    break;
-
-  case 347:
-
-/* Line 1806 of yacc.c  */
-#line 1409 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newTypeof( (yyvsp[(3) - (4)].en) ); }
-    break;
-
-  case 348:
-
-/* Line 1806 of yacc.c  */
-#line 1411 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].decl) ); }
-    break;
-
-  case 349:
-
-/* Line 1806 of yacc.c  */
-#line 1413 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
-    break;
-
-  case 351:
-
-/* Line 1806 of yacc.c  */
-#line 1419 "parser.yy"
+  case 358:
+
+/* Line 1806 of yacc.c  */
+#line 1431 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 352:
-
-/* Line 1806 of yacc.c  */
-#line 1421 "parser.yy"
+  case 359:
+
+/* Line 1806 of yacc.c  */
+#line 1433 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 353:
-
-/* Line 1806 of yacc.c  */
-#line 1423 "parser.yy"
+  case 360:
+
+/* Line 1806 of yacc.c  */
+#line 1435 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
 
-  case 355:
-
-/* Line 1806 of yacc.c  */
-#line 1429 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 356:
-
-/* Line 1806 of yacc.c  */
-#line 1431 "parser.yy"
+  case 361:
+
+/* Line 1806 of yacc.c  */
+#line 1440 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(1) - (1)].tok) ); }
+    break;
+
+  case 362:
+
+/* Line 1806 of yacc.c  */
+#line 1442 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(2) - (2)].tok) )->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 363:
+
+/* Line 1806 of yacc.c  */
+#line 1444 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 358:
-
-/* Line 1806 of yacc.c  */
-#line 1437 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 359:
-
-/* Line 1806 of yacc.c  */
-#line 1439 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 360:
-
-/* Line 1806 of yacc.c  */
-#line 1441 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 361:
-
-/* Line 1806 of yacc.c  */
-#line 1446 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(1) - (1)].tok) ); }
-    break;
-
-  case 362:
-
-/* Line 1806 of yacc.c  */
-#line 1448 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(2) - (2)].tok) )->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 363:
-
-/* Line 1806 of yacc.c  */
-#line 1450 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 366:
 
 /* Line 1806 of yacc.c  */
-#line 1460 "parser.yy"
+#line 1454 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (4)].aggKey), 0, 0, (yyvsp[(3) - (4)].decl), true ); }
     break;
@@ -7221 +7219 @@
 
 /* Line 1806 of yacc.c  */
-#line 1462 "parser.yy"
+#line 1456 "parser.yy"
     {
                         typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
@@ -7231 +7229 @@
 
 /* Line 1806 of yacc.c  */
+#line 1461 "parser.yy"
+    { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
+    break;
+
+  case 369:
+
+/* Line 1806 of yacc.c  */
+#line 1463 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (6)].aggKey), (yyvsp[(2) - (6)].tok), 0, (yyvsp[(5) - (6)].decl), true ); }
+    break;
+
+  case 370:
+
+/* Line 1806 of yacc.c  */
+#line 1465 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (7)].aggKey), 0, (yyvsp[(3) - (7)].en), (yyvsp[(6) - (7)].decl), false ); }
+    break;
+
+  case 371:
+
+/* Line 1806 of yacc.c  */
 #line 1467 "parser.yy"
-    { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
-    break;
-
-  case 369:
-
-/* Line 1806 of yacc.c  */
-#line 1469 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (6)].aggKey), (yyvsp[(2) - (6)].tok), 0, (yyvsp[(5) - (6)].decl), true ); }
-    break;
-
-  case 370:
-
-/* Line 1806 of yacc.c  */
-#line 1471 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (7)].aggKey), 0, (yyvsp[(3) - (7)].en), (yyvsp[(6) - (7)].decl), false ); }
-    break;
-
-  case 371:
-
-/* Line 1806 of yacc.c  */
-#line 1473 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
     break;
@@ -7259 +7257 @@
 
 /* Line 1806 of yacc.c  */
-#line 1478 "parser.yy"
+#line 1472 "parser.yy"
     { (yyval.aggKey) = DeclarationNode::Struct; }
     break;
@@ -7266 +7264 @@
 
 /* Line 1806 of yacc.c  */
-#line 1480 "parser.yy"
+#line 1474 "parser.yy"
     { (yyval.aggKey) = DeclarationNode::Union; }
     break;
@@ -7273 +7271 @@
 
 /* Line 1806 of yacc.c  */
-#line 1485 "parser.yy"
+#line 1479 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7280 +7278 @@
 
 /* Line 1806 of yacc.c  */
+#line 1481 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl) != 0 ? (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ) : (yyvsp[(2) - (2)].decl); }
+    break;
+
+  case 377:
+
+/* Line 1806 of yacc.c  */
 #line 1487 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl) != 0 ? (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ) : (yyvsp[(2) - (2)].decl); }
-    break;
-
-  case 377:
-
-/* Line 1806 of yacc.c  */
-#line 1493 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl)->set_extension( true ); }
     break;
@@ -7294 +7292 @@
 
 /* Line 1806 of yacc.c  */
-#line 1496 "parser.yy"
+#line 1490 "parser.yy"
     {   // mark all fields in list
                         for ( DeclarationNode *iter = (yyvsp[(2) - (3)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_link() )
@@ -7305 +7303 @@
 
 /* Line 1806 of yacc.c  */
-#line 1506 "parser.yy"
+#line 1500 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addName( (yyvsp[(2) - (2)].tok) ); }
     break;
@@ -7312 +7310 @@
 
 /* Line 1806 of yacc.c  */
-#line 1508 "parser.yy"
+#line 1502 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(1) - (3)].decl)->cloneType( (yyvsp[(3) - (3)].tok) ) ); }
     break;
@@ -7319 +7317 @@
 
 /* Line 1806 of yacc.c  */
-#line 1510 "parser.yy"
+#line 1504 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(1) - (2)].decl)->cloneType( 0 ) ); }
     break;
@@ -7326 +7324 @@
 
 /* Line 1806 of yacc.c  */
-#line 1515 "parser.yy"
+#line 1509 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7333 +7331 @@
 
 /* Line 1806 of yacc.c  */
-#line 1517 "parser.yy"
+#line 1511 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(1) - (4)].decl)->cloneBaseType( (yyvsp[(4) - (4)].decl) ) ); }
     break;
@@ -7340 +7338 @@
 
 /* Line 1806 of yacc.c  */
-#line 1522 "parser.yy"
+#line 1516 "parser.yy"
     { (yyval.decl) = DeclarationNode::newName( 0 ); /* XXX */ }
     break;
@@ -7347 +7345 @@
 
 /* Line 1806 of yacc.c  */
+#line 1518 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBitfield( (yyvsp[(1) - (1)].en) ); }
+    break;
+
+  case 388:
+
+/* Line 1806 of yacc.c  */
+#line 1521 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
+    break;
+
+  case 389:
+
+/* Line 1806 of yacc.c  */
 #line 1524 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBitfield( (yyvsp[(1) - (1)].en) ); }
-    break;
-
-  case 388:
-
-/* Line 1806 of yacc.c  */
-#line 1527 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
     break;
 
-  case 389:
+  case 391:
 
 /* Line 1806 of yacc.c  */
 #line 1530 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
-    break;
-
-  case 391:
-
-/* Line 1806 of yacc.c  */
-#line 1536 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -7375 +7373 @@
 
 /* Line 1806 of yacc.c  */
-#line 1538 "parser.yy"
+#line 1532 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
@@ -7382 +7380 @@
 
 /* Line 1806 of yacc.c  */
-#line 1543 "parser.yy"
+#line 1537 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -7389 +7387 @@
 
 /* Line 1806 of yacc.c  */
-#line 1552 "parser.yy"
+#line 1546 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( 0, (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -7396 +7394 @@
 
 /* Line 1806 of yacc.c  */
-#line 1554 "parser.yy"
+#line 1548 "parser.yy"
     {
                         typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
@@ -7406 +7404 @@
 
 /* Line 1806 of yacc.c  */
-#line 1559 "parser.yy"
+#line 1553 "parser.yy"
     { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
     break;
@@ -7413 +7411 @@
 
 /* Line 1806 of yacc.c  */
-#line 1561 "parser.yy"
+#line 1555 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( (yyvsp[(2) - (7)].tok), (yyvsp[(5) - (7)].decl) ); }
     break;
@@ -7420 +7418 @@
 
 /* Line 1806 of yacc.c  */
-#line 1566 "parser.yy"
+#line 1560 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnumConstant( (yyvsp[(1) - (2)].tok), (yyvsp[(2) - (2)].en) ); }
     break;
@@ -7427 +7425 @@
 
 /* Line 1806 of yacc.c  */
-#line 1568 "parser.yy"
+#line 1562 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( DeclarationNode::newEnumConstant( (yyvsp[(3) - (4)].tok), (yyvsp[(4) - (4)].en) ) ); }
     break;
@@ -7434 +7432 @@
 
 /* Line 1806 of yacc.c  */
-#line 1573 "parser.yy"
+#line 1567 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -7441 +7439 @@
 
 /* Line 1806 of yacc.c  */
-#line 1575 "parser.yy"
+#line 1569 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -7448 +7446 @@
 
 /* Line 1806 of yacc.c  */
-#line 1582 "parser.yy"
+#line 1576 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7455 +7453 @@
 
 /* Line 1806 of yacc.c  */
-#line 1590 "parser.yy"
+#line 1584 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7462 +7460 @@
 
 /* Line 1806 of yacc.c  */
-#line 1592 "parser.yy"
+#line 1586 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
@@ -7469 +7467 @@
 
 /* Line 1806 of yacc.c  */
-#line 1594 "parser.yy"
+#line 1588 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
@@ -7476 +7474 @@
 
 /* Line 1806 of yacc.c  */
-#line 1602 "parser.yy"
+#line 1596 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7483 +7481 @@
 
 /* Line 1806 of yacc.c  */
-#line 1604 "parser.yy"
+#line 1598 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7490 +7488 @@
 
 /* Line 1806 of yacc.c  */
+#line 1600 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (9)].decl)->appendList( (yyvsp[(5) - (9)].decl) )->appendList( (yyvsp[(9) - (9)].decl) ); }
+    break;
+
+  case 415:
+
+/* Line 1806 of yacc.c  */
 #line 1606 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (9)].decl)->appendList( (yyvsp[(5) - (9)].decl) )->appendList( (yyvsp[(9) - (9)].decl) ); }
-    break;
-
-  case 415:
-
-/* Line 1806 of yacc.c  */
-#line 1612 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7504 +7502 @@
 
 /* Line 1806 of yacc.c  */
-#line 1617 "parser.yy"
+#line 1611 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7511 +7509 @@
 
 /* Line 1806 of yacc.c  */
-#line 1624 "parser.yy"
+#line 1618 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
@@ -7518 +7516 @@
 
 /* Line 1806 of yacc.c  */
-#line 1631 "parser.yy"
+#line 1625 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7525 +7523 @@
 
 /* Line 1806 of yacc.c  */
-#line 1633 "parser.yy"
+#line 1627 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7532 +7530 @@
 
 /* Line 1806 of yacc.c  */
-#line 1642 "parser.yy"
+#line 1636 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -7539 +7537 @@
 
 /* Line 1806 of yacc.c  */
-#line 1645 "parser.yy"
+#line 1639 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -7546 +7544 @@
 
 /* Line 1806 of yacc.c  */
-#line 1647 "parser.yy"
+#line 1641 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addName( (yyvsp[(3) - (4)].tok) )->addQualifiers( (yyvsp[(1) - (4)].decl) ); }
     break;
@@ -7553 +7551 @@
 
 /* Line 1806 of yacc.c  */
+#line 1651 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 434:
+
+/* Line 1806 of yacc.c  */
 #line 1657 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 434:
-
-/* Line 1806 of yacc.c  */
-#line 1663 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7570 +7568 @@
 
 /* Line 1806 of yacc.c  */
-#line 1668 "parser.yy"
+#line 1662 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7580 +7578 @@
 
 /* Line 1806 of yacc.c  */
-#line 1677 "parser.yy"
+#line 1671 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7587 +7585 @@
 
 /* Line 1806 of yacc.c  */
-#line 1686 "parser.yy"
+#line 1680 "parser.yy"
     { (yyval.decl) = DeclarationNode::newName( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -7594 +7592 @@
 
 /* Line 1806 of yacc.c  */
-#line 1688 "parser.yy"
+#line 1682 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( DeclarationNode::newName( (yyvsp[(3) - (3)].tok) ) ); }
     break;
@@ -7601 +7599 @@
 
 /* Line 1806 of yacc.c  */
-#line 1713 "parser.yy"
+#line 1707 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7608 +7606 @@
 
 /* Line 1806 of yacc.c  */
-#line 1721 "parser.yy"
+#line 1715 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7615 +7613 @@
 
 /* Line 1806 of yacc.c  */
-#line 1726 "parser.yy"
+#line 1720 "parser.yy"
     { (yyval.in) = 0; }
     break;
@@ -7622 +7620 @@
 
 /* Line 1806 of yacc.c  */
+#line 1722 "parser.yy"
+    { (yyval.in) = (yyvsp[(2) - (2)].in); }
+    break;
+
+  case 458:
+
+/* Line 1806 of yacc.c  */
+#line 1724 "parser.yy"
+    { (yyval.in) = (yyvsp[(2) - (2)].in)->set_maybeConstructed( false ); }
+    break;
+
+  case 459:
+
+/* Line 1806 of yacc.c  */
 #line 1728 "parser.yy"
-    { (yyval.in) = (yyvsp[(2) - (2)].in); }
-    break;
-
-  case 458:
-
-/* Line 1806 of yacc.c  */
-#line 1730 "parser.yy"
-    { (yyval.in) = (yyvsp[(2) - (2)].in)->set_maybeConstructed( false ); }
-    break;
-
-  case 459:
+    { (yyval.in) = new InitializerNode( (yyvsp[(1) - (1)].en) ); }
+    break;
+
+  case 460:
+
+/* Line 1806 of yacc.c  */
+#line 1729 "parser.yy"
+    { (yyval.in) = new InitializerNode( (yyvsp[(2) - (4)].in), true ); }
+    break;
+
+  case 461:
 
 /* Line 1806 of yacc.c  */
 #line 1734 "parser.yy"
-    { (yyval.in) = new InitializerNode( (yyvsp[(1) - (1)].en) ); }
-    break;
-
-  case 460:
-
-/* Line 1806 of yacc.c  */
-#line 1735 "parser.yy"
-    { (yyval.in) = new InitializerNode( (yyvsp[(2) - (4)].in), true ); }
-    break;
-
-  case 461:
-
-/* Line 1806 of yacc.c  */
-#line 1740 "parser.yy"
     { (yyval.in) = 0; }
     break;
@@ -7657 +7655 @@
 
 /* Line 1806 of yacc.c  */
-#line 1742 "parser.yy"
+#line 1736 "parser.yy"
     { (yyval.in) = (yyvsp[(2) - (2)].in)->set_designators( (yyvsp[(1) - (2)].en) ); }
     break;
@@ -7664 +7662 @@
 
 /* Line 1806 of yacc.c  */
-#line 1743 "parser.yy"
+#line 1737 "parser.yy"
     { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (3)].in)->set_link( (yyvsp[(3) - (3)].in) ) ); }
     break;
@@ -7671 +7669 @@
 
 /* Line 1806 of yacc.c  */
-#line 1745 "parser.yy"
+#line 1739 "parser.yy"
     { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (4)].in)->set_link( (yyvsp[(4) - (4)].in)->set_designators( (yyvsp[(3) - (4)].en) ) ) ); }
     break;
@@ -7678 +7676 @@
 
 /* Line 1806 of yacc.c  */
+#line 1755 "parser.yy"
+    { (yyval.en) = new VarRefNode( (yyvsp[(1) - (2)].tok) ); }
+    break;
+
+  case 469:
+
+/* Line 1806 of yacc.c  */
 #line 1761 "parser.yy"
-    { (yyval.en) = new VarRefNode( (yyvsp[(1) - (2)].tok) ); }
-    break;
-
-  case 469:
-
-/* Line 1806 of yacc.c  */
-#line 1767 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (2)].en)->set_link( (yyvsp[(2) - (2)].en) )); }
     break;
@@ -7692 +7690 @@
 
 /* Line 1806 of yacc.c  */
-#line 1775 "parser.yy"
+#line 1769 "parser.yy"
     { (yyval.en) = new DesignatorNode( new VarRefNode( (yyvsp[(1) - (1)].tok) ) ); }
     break;
@@ -7699 +7697 @@
 
 /* Line 1806 of yacc.c  */
-#line 1777 "parser.yy"
+#line 1771 "parser.yy"
     { (yyval.en) = new DesignatorNode( new VarRefNode( (yyvsp[(2) - (2)].tok) ) ); }
     break;
@@ -7706 +7704 @@
 
 /* Line 1806 of yacc.c  */
+#line 1774 "parser.yy"
+    { (yyval.en) = new DesignatorNode( (yyvsp[(3) - (5)].en), true ); }
+    break;
+
+  case 473:
+
+/* Line 1806 of yacc.c  */
+#line 1776 "parser.yy"
+    { (yyval.en) = new DesignatorNode( (yyvsp[(3) - (5)].en), true ); }
+    break;
+
+  case 474:
+
+/* Line 1806 of yacc.c  */
+#line 1778 "parser.yy"
+    { (yyval.en) = new DesignatorNode( new CompositeExprNode( new OperatorNode( OperatorNode::Range ), (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].en) ), true ); }
+    break;
+
+  case 475:
+
+/* Line 1806 of yacc.c  */
 #line 1780 "parser.yy"
-    { (yyval.en) = new DesignatorNode( (yyvsp[(3) - (5)].en), true ); }
-    break;
-
-  case 473:
-
-/* Line 1806 of yacc.c  */
-#line 1782 "parser.yy"
-    { (yyval.en) = new DesignatorNode( (yyvsp[(3) - (5)].en), true ); }
-    break;
-
-  case 474:
-
-/* Line 1806 of yacc.c  */
-#line 1784 "parser.yy"
-    { (yyval.en) = new DesignatorNode( new CompositeExprNode2( build_opr2( OperatorNode::Range, (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].en) ) ), true ); }
-    break;
-
-  case 475:
-
-/* Line 1806 of yacc.c  */
-#line 1786 "parser.yy"
     { (yyval.en) = new DesignatorNode( (yyvsp[(4) - (6)].en) ); }
     break;
@@ -7734 +7732 @@
 
 /* Line 1806 of yacc.c  */
-#line 1810 "parser.yy"
+#line 1804 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7741 +7739 @@
 
 /* Line 1806 of yacc.c  */
-#line 1812 "parser.yy"
+#line 1806 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7748 +7746 @@
 
 /* Line 1806 of yacc.c  */
+#line 1808 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
+    break;
+
+  case 481:
+
+/* Line 1806 of yacc.c  */
 #line 1814 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 481:
-
-/* Line 1806 of yacc.c  */
-#line 1820 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7762 +7760 @@
 
 /* Line 1806 of yacc.c  */
-#line 1822 "parser.yy"
+#line 1816 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7769 +7767 @@
 
 /* Line 1806 of yacc.c  */
+#line 1821 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newFromTypeGen( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
+    break;
+
+  case 485:
+
+/* Line 1806 of yacc.c  */
 #line 1827 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFromTypeGen( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
-    break;
-
-  case 485:
-
-/* Line 1806 of yacc.c  */
-#line 1833 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -7783 +7781 @@
 
 /* Line 1806 of yacc.c  */
-#line 1838 "parser.yy"
+#line 1832 "parser.yy"
     { typedefTable.addToEnclosingScope( *(yyvsp[(2) - (2)].tok), TypedefTable::TD ); }
     break;
@@ -7790 +7788 @@
 
 /* Line 1806 of yacc.c  */
+#line 1834 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newTypeParam( (yyvsp[(1) - (4)].tclass), (yyvsp[(2) - (4)].tok) )->addAssertions( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 489:
+
+/* Line 1806 of yacc.c  */
 #line 1840 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newTypeParam( (yyvsp[(1) - (4)].tclass), (yyvsp[(2) - (4)].tok) )->addAssertions( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 489:
-
-/* Line 1806 of yacc.c  */
-#line 1846 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Type; }
     break;
@@ -7804 +7802 @@
 
 /* Line 1806 of yacc.c  */
-#line 1848 "parser.yy"
+#line 1842 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Ftype; }
     break;
@@ -7811 +7809 @@
 
 /* Line 1806 of yacc.c  */
-#line 1850 "parser.yy"
+#line 1844 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Dtype; }
     break;
@@ -7818 +7816 @@
 
 /* Line 1806 of yacc.c  */
-#line 1855 "parser.yy"
+#line 1849 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7825 +7823 @@
 
 /* Line 1806 of yacc.c  */
-#line 1857 "parser.yy"
+#line 1851 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl) != 0 ? (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ) : (yyvsp[(2) - (2)].decl); }
     break;
@@ -7832 +7830 @@
 
 /* Line 1806 of yacc.c  */
-#line 1862 "parser.yy"
+#line 1856 "parser.yy"
     {
                         typedefTable.openTrait( *(yyvsp[(2) - (5)].tok) );
@@ -7842 +7840 @@
 
 /* Line 1806 of yacc.c  */
-#line 1867 "parser.yy"
+#line 1861 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (5)].decl); }
     break;
@@ -7849 +7847 @@
 
 /* Line 1806 of yacc.c  */
-#line 1869 "parser.yy"
+#line 1863 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7856 +7854 @@
 
 /* Line 1806 of yacc.c  */
-#line 1874 "parser.yy"
+#line 1868 "parser.yy"
     { (yyval.en) = new TypeValueNode( (yyvsp[(1) - (1)].decl) ); }
     break;
@@ -7863 +7861 @@
 
 /* Line 1806 of yacc.c  */
-#line 1877 "parser.yy"
+#line 1871 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( new TypeValueNode( (yyvsp[(3) - (3)].decl) ))); }
     break;
@@ -7870 +7868 @@
 
 /* Line 1806 of yacc.c  */
-#line 1879 "parser.yy"
+#line 1873 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) )); }
     break;
@@ -7877 +7875 @@
 
 /* Line 1806 of yacc.c  */
-#line 1884 "parser.yy"
+#line 1878 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
     break;
@@ -7884 +7882 @@
 
 /* Line 1806 of yacc.c  */
-#line 1886 "parser.yy"
+#line 1880 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -7891 +7889 @@
 
 /* Line 1806 of yacc.c  */
-#line 1888 "parser.yy"
+#line 1882 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl)->copyStorageClasses( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -7898 +7896 @@
 
 /* Line 1806 of yacc.c  */
-#line 1893 "parser.yy"
+#line 1887 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addAssertions( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7905 +7903 @@
 
 /* Line 1806 of yacc.c  */
-#line 1895 "parser.yy"
+#line 1889 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addAssertions( (yyvsp[(2) - (4)].decl) )->addType( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -7912 +7910 @@
 
 /* Line 1806 of yacc.c  */
-#line 1900 "parser.yy"
+#line 1894 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (1)].tok), TypedefTable::TD );
@@ -7922 +7920 @@
 
 /* Line 1806 of yacc.c  */
-#line 1905 "parser.yy"
+#line 1899 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (6)].tok), TypedefTable::TG );
@@ -7932 +7930 @@
 
 /* Line 1806 of yacc.c  */
-#line 1913 "parser.yy"
+#line 1907 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (9)].tok), TypedefTable::ID );
@@ -7942 +7940 @@
 
 /* Line 1806 of yacc.c  */
-#line 1918 "parser.yy"
+#line 1912 "parser.yy"
     {
                         typedefTable.enterTrait( *(yyvsp[(2) - (8)].tok) );
@@ -7952 +7950 @@
 
 /* Line 1806 of yacc.c  */
-#line 1923 "parser.yy"
+#line 1917 "parser.yy"
     {
                         typedefTable.leaveTrait();
@@ -7963 +7961 @@
 
 /* Line 1806 of yacc.c  */
-#line 1933 "parser.yy"
+#line 1927 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7970 +7968 @@
 
 /* Line 1806 of yacc.c  */
-#line 1943 "parser.yy"
+#line 1937 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7980 +7978 @@
 
 /* Line 1806 of yacc.c  */
-#line 1948 "parser.yy"
+#line 1942 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7990 +7988 @@
 
 /* Line 1806 of yacc.c  */
-#line 1953 "parser.yy"
+#line 1947 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
@@ -8000 +7998 @@
 
 /* Line 1806 of yacc.c  */
-#line 1961 "parser.yy"
+#line 1955 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -8010 +8008 @@
 
 /* Line 1806 of yacc.c  */
-#line 1966 "parser.yy"
+#line 1960 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -8020 +8018 @@
 
 /* Line 1806 of yacc.c  */
-#line 1976 "parser.yy"
+#line 1970 "parser.yy"
     {}
     break;
@@ -8027 +8025 @@
 
 /* Line 1806 of yacc.c  */
-#line 1978 "parser.yy"
+#line 1972 "parser.yy"
     {
                         if ( theTree ) {
@@ -8040 +8038 @@
 
 /* Line 1806 of yacc.c  */
-#line 1990 "parser.yy"
+#line 1984 "parser.yy"
     { (yyval.decl) = ( (yyvsp[(1) - (3)].decl) != NULL ) ? (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ) : (yyvsp[(3) - (3)].decl); }
     break;
@@ -8047 +8045 @@
 
 /* Line 1806 of yacc.c  */
-#line 1995 "parser.yy"
+#line 1989 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -8054 +8052 @@
 
 /* Line 1806 of yacc.c  */
-#line 2003 "parser.yy"
+#line 1997 "parser.yy"
     {}
     break;
@@ -8061 +8059 @@
 
 /* Line 1806 of yacc.c  */
-#line 2005 "parser.yy"
+#line 1999 "parser.yy"
     {
                         linkageStack.push( linkage );
@@ -8071 +8069 @@
 
 /* Line 1806 of yacc.c  */
-#line 2010 "parser.yy"
+#line 2004 "parser.yy"
     {
                         linkage = linkageStack.top();
@@ -8082 +8080 @@
 
 /* Line 1806 of yacc.c  */
-#line 2016 "parser.yy"
+#line 2010 "parser.yy"
     {   // mark all fields in list
                         for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_link() )
@@ -8093 +8091 @@
 
 /* Line 1806 of yacc.c  */
-#line 2031 "parser.yy"
+#line 2025 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8104 +8102 @@
 
 /* Line 1806 of yacc.c  */
-#line 2037 "parser.yy"
+#line 2031 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8115 +8113 @@
 
 /* Line 1806 of yacc.c  */
-#line 2046 "parser.yy"
+#line 2040 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8126 +8124 @@
 
 /* Line 1806 of yacc.c  */
-#line 2052 "parser.yy"
+#line 2046 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8135 +8133 @@
 
   case 537:
+
+/* Line 1806 of yacc.c  */
+#line 2052 "parser.yy"
+    {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        typedefTable.leaveScope();
+                        (yyval.decl) = (yyvsp[(2) - (3)].decl)->addFunctionBody( (yyvsp[(3) - (3)].sn) )->addQualifiers( (yyvsp[(1) - (3)].decl) );
+                }
+    break;
+
+  case 538:
 
 /* Line 1806 of yacc.c  */
@@ -8145 +8154 @@
     break;
 
-  case 538:
+  case 539:
 
 /* Line 1806 of yacc.c  */
 #line 2064 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        typedefTable.leaveScope();
-                        (yyval.decl) = (yyvsp[(2) - (3)].decl)->addFunctionBody( (yyvsp[(3) - (3)].sn) )->addQualifiers( (yyvsp[(1) - (3)].decl) );
-                }
-    break;
-
-  case 539:
-
-/* Line 1806 of yacc.c  */
-#line 2070 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8170 +8168 @@
 
 /* Line 1806 of yacc.c  */
-#line 2078 "parser.yy"
+#line 2072 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8181 +8179 @@
 
 /* Line 1806 of yacc.c  */
-#line 2084 "parser.yy"
+#line 2078 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8192 +8190 @@
 
 /* Line 1806 of yacc.c  */
-#line 2092 "parser.yy"
+#line 2086 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8203 +8201 @@
 
 /* Line 1806 of yacc.c  */
-#line 2098 "parser.yy"
+#line 2092 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8214 +8212 @@
 
 /* Line 1806 of yacc.c  */
-#line 2113 "parser.yy"
-    { (yyval.en) = new CompositeExprNode2( build_opr2( OperatorNode::Range, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 2107 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Range ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 
@@ -8221 +8219 @@
 
 /* Line 1806 of yacc.c  */
-#line 2123 "parser.yy"
+#line 2117 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -8228 +8226 @@
 
 /* Line 1806 of yacc.c  */
+#line 2124 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 554:
+
+/* Line 1806 of yacc.c  */
 #line 2130 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 554:
-
-/* Line 1806 of yacc.c  */
-#line 2136 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -8242 +8240 @@
 
 /* Line 1806 of yacc.c  */
-#line 2151 "parser.yy"
+#line 2145 "parser.yy"
     {}
     break;
@@ -8249 +8247 @@
 
 /* Line 1806 of yacc.c  */
-#line 2152 "parser.yy"
+#line 2146 "parser.yy"
     {}
     break;
@@ -8256 +8254 @@
 
 /* Line 1806 of yacc.c  */
-#line 2153 "parser.yy"
+#line 2147 "parser.yy"
     {}
     break;
@@ -8263 +8261 @@
 
 /* Line 1806 of yacc.c  */
-#line 2154 "parser.yy"
+#line 2148 "parser.yy"
     {}
     break;
@@ -8270 +8268 @@
 
 /* Line 1806 of yacc.c  */
-#line 2189 "parser.yy"
+#line 2183 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8277 +8275 @@
 
 /* Line 1806 of yacc.c  */
-#line 2192 "parser.yy"
+#line 2186 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8284 +8282 @@
 
 /* Line 1806 of yacc.c  */
-#line 2194 "parser.yy"
+#line 2188 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8291 +8289 @@
 
 /* Line 1806 of yacc.c  */
-#line 2199 "parser.yy"
+#line 2193 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8301 +8299 @@
 
 /* Line 1806 of yacc.c  */
-#line 2204 "parser.yy"
+#line 2198 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8308 +8306 @@
 
 /* Line 1806 of yacc.c  */
-#line 2209 "parser.yy"
+#line 2203 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8315 +8313 @@
 
 /* Line 1806 of yacc.c  */
-#line 2211 "parser.yy"
+#line 2205 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8322 +8320 @@
 
 /* Line 1806 of yacc.c  */
-#line 2213 "parser.yy"
+#line 2207 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8329 +8327 @@
 
 /* Line 1806 of yacc.c  */
+#line 2212 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 574:
+
+/* Line 1806 of yacc.c  */
+#line 2214 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 575:
+
+/* Line 1806 of yacc.c  */
+#line 2216 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 576:
+
+/* Line 1806 of yacc.c  */
 #line 2218 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 577:
+
+/* Line 1806 of yacc.c  */
+#line 2223 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 578:
+
+/* Line 1806 of yacc.c  */
+#line 2225 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 579:
+
+/* Line 1806 of yacc.c  */
+#line 2234 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 581:
+
+/* Line 1806 of yacc.c  */
+#line 2237 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 582:
+
+/* Line 1806 of yacc.c  */
+#line 2242 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
+    break;
+
+  case 583:
+
+/* Line 1806 of yacc.c  */
+#line 2244 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 584:
+
+/* Line 1806 of yacc.c  */
+#line 2246 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 585:
+
+/* Line 1806 of yacc.c  */
+#line 2251 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 586:
+
+/* Line 1806 of yacc.c  */
+#line 2253 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 587:
+
+/* Line 1806 of yacc.c  */
+#line 2255 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 588:
+
+/* Line 1806 of yacc.c  */
+#line 2260 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 589:
+
+/* Line 1806 of yacc.c  */
+#line 2262 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 590:
+
+/* Line 1806 of yacc.c  */
+#line 2264 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 594:
+
+/* Line 1806 of yacc.c  */
+#line 2279 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addIdList( (yyvsp[(3) - (4)].decl) ); }
+    break;
+
+  case 595:
+
+/* Line 1806 of yacc.c  */
+#line 2281 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (6)].decl)->addIdList( (yyvsp[(5) - (6)].decl) ); }
+    break;
+
+  case 596:
+
+/* Line 1806 of yacc.c  */
+#line 2283 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 597:
+
+/* Line 1806 of yacc.c  */
+#line 2288 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 598:
+
+/* Line 1806 of yacc.c  */
+#line 2290 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 599:
+
+/* Line 1806 of yacc.c  */
+#line 2292 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 600:
+
+/* Line 1806 of yacc.c  */
+#line 2297 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 601:
+
+/* Line 1806 of yacc.c  */
+#line 2299 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 602:
+
+/* Line 1806 of yacc.c  */
+#line 2301 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 603:
+
+/* Line 1806 of yacc.c  */
+#line 2316 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 605:
+
+/* Line 1806 of yacc.c  */
+#line 2319 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 606:
+
+/* Line 1806 of yacc.c  */
+#line 2321 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 608:
+
+/* Line 1806 of yacc.c  */
+#line 2327 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 609:
+
+/* Line 1806 of yacc.c  */
+#line 2332 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 610:
+
+/* Line 1806 of yacc.c  */
+#line 2334 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 611:
+
+/* Line 1806 of yacc.c  */
+#line 2336 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 612:
+
+/* Line 1806 of yacc.c  */
+#line 2341 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 574:
-
-/* Line 1806 of yacc.c  */
-#line 2220 "parser.yy"
+  case 613:
+
+/* Line 1806 of yacc.c  */
+#line 2343 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 
-  case 575:
-
-/* Line 1806 of yacc.c  */
-#line 2222 "parser.yy"
+  case 614:
+
+/* Line 1806 of yacc.c  */
+#line 2345 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 
-  case 576:
-
-/* Line 1806 of yacc.c  */
-#line 2224 "parser.yy"
+  case 615:
+
+/* Line 1806 of yacc.c  */
+#line 2347 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 577:
-
-/* Line 1806 of yacc.c  */
-#line 2229 "parser.yy"
+  case 616:
+
+/* Line 1806 of yacc.c  */
+#line 2352 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
+    break;
+
+  case 617:
+
+/* Line 1806 of yacc.c  */
+#line 2354 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
 
-  case 578:
-
-/* Line 1806 of yacc.c  */
-#line 2231 "parser.yy"
+  case 618:
+
+/* Line 1806 of yacc.c  */
+#line 2356 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 579:
-
-/* Line 1806 of yacc.c  */
-#line 2240 "parser.yy"
+  case 619:
+
+/* Line 1806 of yacc.c  */
+#line 2366 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 581:
-
-/* Line 1806 of yacc.c  */
-#line 2243 "parser.yy"
+  case 621:
+
+/* Line 1806 of yacc.c  */
+#line 2369 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 582:
-
-/* Line 1806 of yacc.c  */
-#line 2248 "parser.yy"
+  case 622:
+
+/* Line 1806 of yacc.c  */
+#line 2371 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 623:
+
+/* Line 1806 of yacc.c  */
+#line 2376 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 624:
+
+/* Line 1806 of yacc.c  */
+#line 2378 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 625:
+
+/* Line 1806 of yacc.c  */
+#line 2380 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 626:
+
+/* Line 1806 of yacc.c  */
+#line 2385 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 627:
+
+/* Line 1806 of yacc.c  */
+#line 2387 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 628:
+
+/* Line 1806 of yacc.c  */
+#line 2389 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 629:
+
+/* Line 1806 of yacc.c  */
+#line 2391 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 630:
+
+/* Line 1806 of yacc.c  */
+#line 2396 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
 
-  case 583:
-
-/* Line 1806 of yacc.c  */
-#line 2250 "parser.yy"
+  case 631:
+
+/* Line 1806 of yacc.c  */
+#line 2398 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
 
-  case 584:
-
-/* Line 1806 of yacc.c  */
-#line 2252 "parser.yy"
+  case 632:
+
+/* Line 1806 of yacc.c  */
+#line 2400 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 585:
-
-/* Line 1806 of yacc.c  */
-#line 2257 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 586:
-
-/* Line 1806 of yacc.c  */
-#line 2259 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 587:
-
-/* Line 1806 of yacc.c  */
-#line 2261 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 588:
-
-/* Line 1806 of yacc.c  */
-#line 2266 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 589:
-
-/* Line 1806 of yacc.c  */
-#line 2268 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 590:
-
-/* Line 1806 of yacc.c  */
-#line 2270 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 594:
-
-/* Line 1806 of yacc.c  */
-#line 2285 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addIdList( (yyvsp[(3) - (4)].decl) ); }
-    break;
-
-  case 595:
-
-/* Line 1806 of yacc.c  */
-#line 2287 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (6)].decl)->addIdList( (yyvsp[(5) - (6)].decl) ); }
-    break;
-
-  case 596:
-
-/* Line 1806 of yacc.c  */
-#line 2289 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 597:
-
-/* Line 1806 of yacc.c  */
-#line 2294 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 598:
-
-/* Line 1806 of yacc.c  */
-#line 2296 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 599:
-
-/* Line 1806 of yacc.c  */
-#line 2298 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 600:
-
-/* Line 1806 of yacc.c  */
-#line 2303 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 601:
-
-/* Line 1806 of yacc.c  */
-#line 2305 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 602:
-
-/* Line 1806 of yacc.c  */
-#line 2307 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 603:
-
-/* Line 1806 of yacc.c  */
-#line 2322 "parser.yy"
+  case 633:
+
+/* Line 1806 of yacc.c  */
+#line 2431 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 605:
-
-/* Line 1806 of yacc.c  */
-#line 2325 "parser.yy"
+  case 635:
+
+/* Line 1806 of yacc.c  */
+#line 2434 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 606:
-
-/* Line 1806 of yacc.c  */
-#line 2327 "parser.yy"
+  case 636:
+
+/* Line 1806 of yacc.c  */
+#line 2436 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 608:
-
-/* Line 1806 of yacc.c  */
-#line 2333 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 609:
-
-/* Line 1806 of yacc.c  */
-#line 2338 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 610:
-
-/* Line 1806 of yacc.c  */
-#line 2340 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 611:
-
-/* Line 1806 of yacc.c  */
-#line 2342 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 612:
-
-/* Line 1806 of yacc.c  */
-#line 2347 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 613:
-
-/* Line 1806 of yacc.c  */
-#line 2349 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 614:
-
-/* Line 1806 of yacc.c  */
-#line 2351 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 615:
-
-/* Line 1806 of yacc.c  */
-#line 2353 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 616:
-
-/* Line 1806 of yacc.c  */
-#line 2358 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-
-  case 617:
-
-/* Line 1806 of yacc.c  */
-#line 2360 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 618:
-
-/* Line 1806 of yacc.c  */
-#line 2362 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 619:
-
-/* Line 1806 of yacc.c  */
-#line 2372 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 621:
-
-/* Line 1806 of yacc.c  */
-#line 2375 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 622:
-
-/* Line 1806 of yacc.c  */
-#line 2377 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 623:
-
-/* Line 1806 of yacc.c  */
-#line 2382 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 624:
-
-/* Line 1806 of yacc.c  */
-#line 2384 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 625:
-
-/* Line 1806 of yacc.c  */
-#line 2386 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 626:
-
-/* Line 1806 of yacc.c  */
-#line 2391 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 627:
-
-/* Line 1806 of yacc.c  */
-#line 2393 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 628:
-
-/* Line 1806 of yacc.c  */
-#line 2395 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 629:
-
-/* Line 1806 of yacc.c  */
-#line 2397 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 630:
-
-/* Line 1806 of yacc.c  */
-#line 2402 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-
-  case 631:
-
-/* Line 1806 of yacc.c  */
-#line 2404 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 632:
-
-/* Line 1806 of yacc.c  */
-#line 2406 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 633:
-
-/* Line 1806 of yacc.c  */
-#line 2437 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 635:
-
-/* Line 1806 of yacc.c  */
-#line 2440 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 636:
-
-/* Line 1806 of yacc.c  */
-#line 2442 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 637:
 
 /* Line 1806 of yacc.c  */
-#line 2447 "parser.yy"
+#line 2441 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8731 +8729 @@
 
 /* Line 1806 of yacc.c  */
-#line 2452 "parser.yy"
+#line 2446 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8741 +8739 @@
 
 /* Line 1806 of yacc.c  */
-#line 2460 "parser.yy"
+#line 2454 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8748 +8746 @@
 
 /* Line 1806 of yacc.c  */
-#line 2462 "parser.yy"
+#line 2456 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8755 +8753 @@
 
 /* Line 1806 of yacc.c  */
-#line 2464 "parser.yy"
+#line 2458 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8762 +8760 @@
 
 /* Line 1806 of yacc.c  */
-#line 2469 "parser.yy"
+#line 2463 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8769 +8767 @@
 
 /* Line 1806 of yacc.c  */
-#line 2471 "parser.yy"
+#line 2465 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8776 +8774 @@
 
 /* Line 1806 of yacc.c  */
-#line 2476 "parser.yy"
+#line 2470 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
@@ -8783 +8781 @@
 
 /* Line 1806 of yacc.c  */
-#line 2478 "parser.yy"
+#line 2472 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8790 +8788 @@
 
 /* Line 1806 of yacc.c  */
-#line 2493 "parser.yy"
+#line 2487 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8797 +8795 @@
 
 /* Line 1806 of yacc.c  */
-#line 2495 "parser.yy"
+#line 2489 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8804 +8802 @@
 
 /* Line 1806 of yacc.c  */
+#line 2494 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
+    break;
+
+  case 650:
+
+/* Line 1806 of yacc.c  */
+#line 2496 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 651:
+
+/* Line 1806 of yacc.c  */
+#line 2498 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 652:
+
+/* Line 1806 of yacc.c  */
 #line 2500 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 653:
+
+/* Line 1806 of yacc.c  */
+#line 2502 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 655:
+
+/* Line 1806 of yacc.c  */
+#line 2508 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 656:
+
+/* Line 1806 of yacc.c  */
+#line 2510 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 657:
+
+/* Line 1806 of yacc.c  */
+#line 2512 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 658:
+
+/* Line 1806 of yacc.c  */
+#line 2517 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
+    break;
+
+  case 659:
+
+/* Line 1806 of yacc.c  */
+#line 2519 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 660:
+
+/* Line 1806 of yacc.c  */
+#line 2521 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 661:
+
+/* Line 1806 of yacc.c  */
+#line 2527 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
+    break;
+
+  case 662:
+
+/* Line 1806 of yacc.c  */
+#line 2529 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false )->addArray( (yyvsp[(3) - (3)].decl) ); }
+    break;
+
+  case 664:
+
+/* Line 1806 of yacc.c  */
+#line 2535 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(3) - (5)].en), 0, false ); }
+    break;
+
+  case 665:
+
+/* Line 1806 of yacc.c  */
+#line 2537 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newVarArray( 0 ); }
+    break;
+
+  case 666:
+
+/* Line 1806 of yacc.c  */
+#line 2539 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newArray( (yyvsp[(4) - (6)].en), 0, false ) ); }
+    break;
+
+  case 667:
+
+/* Line 1806 of yacc.c  */
+#line 2541 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newVarArray( 0 ) ); }
+    break;
+
+  case 669:
+
+/* Line 1806 of yacc.c  */
+#line 2556 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 670:
+
+/* Line 1806 of yacc.c  */
+#line 2558 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 671:
+
+/* Line 1806 of yacc.c  */
+#line 2563 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
 
-  case 650:
-
-/* Line 1806 of yacc.c  */
-#line 2502 "parser.yy"
+  case 672:
+
+/* Line 1806 of yacc.c  */
+#line 2565 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 651:
-
-/* Line 1806 of yacc.c  */
-#line 2504 "parser.yy"
+  case 673:
+
+/* Line 1806 of yacc.c  */
+#line 2567 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 
-  case 652:
-
-/* Line 1806 of yacc.c  */
-#line 2506 "parser.yy"
+  case 674:
+
+/* Line 1806 of yacc.c  */
+#line 2569 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
 
-  case 653:
-
-/* Line 1806 of yacc.c  */
-#line 2508 "parser.yy"
+  case 675:
+
+/* Line 1806 of yacc.c  */
+#line 2571 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 655:
-
-/* Line 1806 of yacc.c  */
-#line 2514 "parser.yy"
+  case 677:
+
+/* Line 1806 of yacc.c  */
+#line 2577 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 
-  case 656:
-
-/* Line 1806 of yacc.c  */
-#line 2516 "parser.yy"
+  case 678:
+
+/* Line 1806 of yacc.c  */
+#line 2579 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 
-  case 657:
-
-/* Line 1806 of yacc.c  */
-#line 2518 "parser.yy"
+  case 679:
+
+/* Line 1806 of yacc.c  */
+#line 2581 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 658:
-
-/* Line 1806 of yacc.c  */
-#line 2523 "parser.yy"
+  case 680:
+
+/* Line 1806 of yacc.c  */
+#line 2586 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
     break;
 
-  case 659:
-
-/* Line 1806 of yacc.c  */
-#line 2525 "parser.yy"
+  case 681:
+
+/* Line 1806 of yacc.c  */
+#line 2588 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
 
-  case 660:
-
-/* Line 1806 of yacc.c  */
-#line 2527 "parser.yy"
+  case 682:
+
+/* Line 1806 of yacc.c  */
+#line 2590 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 661:
-
-/* Line 1806 of yacc.c  */
-#line 2533 "parser.yy"
+  case 684:
+
+/* Line 1806 of yacc.c  */
+#line 2597 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 686:
+
+/* Line 1806 of yacc.c  */
+#line 2608 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
     break;
 
-  case 662:
-
-/* Line 1806 of yacc.c  */
-#line 2535 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false )->addArray( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 664:
-
-/* Line 1806 of yacc.c  */
-#line 2541 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(3) - (5)].en), 0, false ); }
-    break;
-
-  case 665:
-
-/* Line 1806 of yacc.c  */
-#line 2543 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newVarArray( 0 ); }
-    break;
-
-  case 666:
-
-/* Line 1806 of yacc.c  */
-#line 2545 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newArray( (yyvsp[(4) - (6)].en), 0, false ) ); }
-    break;
-
-  case 667:
-
-/* Line 1806 of yacc.c  */
-#line 2547 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newVarArray( 0 ) ); }
-    break;
-
-  case 669:
-
-/* Line 1806 of yacc.c  */
-#line 2562 "parser.yy"
+  case 687:
+
+/* Line 1806 of yacc.c  */
+#line 2611 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
+    break;
+
+  case 688:
+
+/* Line 1806 of yacc.c  */
+#line 2613 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( 0, (yyvsp[(3) - (5)].decl), false ); }
+    break;
+
+  case 689:
+
+/* Line 1806 of yacc.c  */
+#line 2616 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
+    break;
+
+  case 690:
+
+/* Line 1806 of yacc.c  */
+#line 2618 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl), true ); }
+    break;
+
+  case 691:
+
+/* Line 1806 of yacc.c  */
+#line 2620 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(3) - (7)].decl), true ); }
+    break;
+
+  case 693:
+
+/* Line 1806 of yacc.c  */
+#line 2634 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 670:
-
-/* Line 1806 of yacc.c  */
-#line 2564 "parser.yy"
+  case 694:
+
+/* Line 1806 of yacc.c  */
+#line 2636 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 671:
-
-/* Line 1806 of yacc.c  */
-#line 2569 "parser.yy"
+  case 695:
+
+/* Line 1806 of yacc.c  */
+#line 2641 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
 
-  case 672:
-
-/* Line 1806 of yacc.c  */
-#line 2571 "parser.yy"
+  case 696:
+
+/* Line 1806 of yacc.c  */
+#line 2643 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 673:
-
-/* Line 1806 of yacc.c  */
-#line 2573 "parser.yy"
+  case 697:
+
+/* Line 1806 of yacc.c  */
+#line 2645 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 
-  case 674:
-
-/* Line 1806 of yacc.c  */
-#line 2575 "parser.yy"
+  case 698:
+
+/* Line 1806 of yacc.c  */
+#line 2647 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
 
-  case 675:
-
-/* Line 1806 of yacc.c  */
-#line 2577 "parser.yy"
+  case 699:
+
+/* Line 1806 of yacc.c  */
+#line 2649 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 677:
-
-/* Line 1806 of yacc.c  */
-#line 2583 "parser.yy"
+  case 701:
+
+/* Line 1806 of yacc.c  */
+#line 2655 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 
-  case 678:
-
-/* Line 1806 of yacc.c  */
-#line 2585 "parser.yy"
+  case 702:
+
+/* Line 1806 of yacc.c  */
+#line 2657 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 
-  case 679:
-
-/* Line 1806 of yacc.c  */
-#line 2587 "parser.yy"
+  case 703:
+
+/* Line 1806 of yacc.c  */
+#line 2659 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 680:
-
-/* Line 1806 of yacc.c  */
-#line 2592 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
-    break;
-
-  case 681:
-
-/* Line 1806 of yacc.c  */
-#line 2594 "parser.yy"
+  case 704:
+
+/* Line 1806 of yacc.c  */
+#line 2664 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
 
-  case 682:
-
-/* Line 1806 of yacc.c  */
-#line 2596 "parser.yy"
+  case 705:
+
+/* Line 1806 of yacc.c  */
+#line 2666 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
-  case 684:
-
-/* Line 1806 of yacc.c  */
-#line 2603 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 686:
-
-/* Line 1806 of yacc.c  */
-#line 2614 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
-    break;
-
-  case 687:
-
-/* Line 1806 of yacc.c  */
-#line 2617 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
-    break;
-
-  case 688:
-
-/* Line 1806 of yacc.c  */
-#line 2619 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( 0, (yyvsp[(3) - (5)].decl), false ); }
-    break;
-
-  case 689:
-
-/* Line 1806 of yacc.c  */
-#line 2622 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
-    break;
-
-  case 690:
-
-/* Line 1806 of yacc.c  */
-#line 2624 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl), true ); }
-    break;
-
-  case 691:
-
-/* Line 1806 of yacc.c  */
-#line 2626 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(3) - (7)].decl), true ); }
-    break;
-
-  case 693:
-
-/* Line 1806 of yacc.c  */
-#line 2640 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 694:
-
-/* Line 1806 of yacc.c  */
-#line 2642 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 695:
-
-/* Line 1806 of yacc.c  */
-#line 2647 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
-    break;
-
-  case 696:
-
-/* Line 1806 of yacc.c  */
-#line 2649 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 697:
-
-/* Line 1806 of yacc.c  */
-#line 2651 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 698:
-
-/* Line 1806 of yacc.c  */
-#line 2653 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 699:
-
-/* Line 1806 of yacc.c  */
-#line 2655 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 701:
-
-/* Line 1806 of yacc.c  */
-#line 2661 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 702:
-
-/* Line 1806 of yacc.c  */
-#line 2663 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 703:
-
-/* Line 1806 of yacc.c  */
-#line 2665 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 704:
-
-/* Line 1806 of yacc.c  */
-#line 2670 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 705:
-
-/* Line 1806 of yacc.c  */
-#line 2672 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
   case 708:
 
 /* Line 1806 of yacc.c  */
-#line 2682 "parser.yy"
+#line 2676 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9154 +9152 @@
 
 /* Line 1806 of yacc.c  */
+#line 2686 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 712:
+
+/* Line 1806 of yacc.c  */
+#line 2688 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+    break;
+
+  case 713:
+
+/* Line 1806 of yacc.c  */
+#line 2690 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 714:
+
+/* Line 1806 of yacc.c  */
 #line 2692 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+    break;
+
+  case 715:
+
+/* Line 1806 of yacc.c  */
+#line 2694 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 
-  case 712:
-
-/* Line 1806 of yacc.c  */
-#line 2694 "parser.yy"
+  case 716:
+
+/* Line 1806 of yacc.c  */
+#line 2696 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
 
-  case 713:
-
-/* Line 1806 of yacc.c  */
-#line 2696 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 714:
-
-/* Line 1806 of yacc.c  */
-#line 2698 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
-    break;
-
-  case 715:
-
-/* Line 1806 of yacc.c  */
-#line 2700 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 716:
-
-/* Line 1806 of yacc.c  */
-#line 2702 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
-    break;
-
   case 717:
 
 /* Line 1806 of yacc.c  */
+#line 2703 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 718:
+
+/* Line 1806 of yacc.c  */
+#line 2705 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 719:
+
+/* Line 1806 of yacc.c  */
+#line 2707 "parser.yy"
+    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 720:
+
+/* Line 1806 of yacc.c  */
 #line 2709 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 718:
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
+    break;
+
+  case 721:
 
 /* Line 1806 of yacc.c  */
@@ -9207 +9226 @@
     break;
 
-  case 719:
+  case 722:
 
 /* Line 1806 of yacc.c  */
 #line 2713 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 723:
+
+/* Line 1806 of yacc.c  */
+#line 2715 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 724:
+
+/* Line 1806 of yacc.c  */
+#line 2717 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
 
-  case 720:
-
-/* Line 1806 of yacc.c  */
-#line 2715 "parser.yy"
+  case 725:
+
+/* Line 1806 of yacc.c  */
+#line 2719 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
     break;
 
-  case 721:
-
-/* Line 1806 of yacc.c  */
-#line 2717 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 722:
-
-/* Line 1806 of yacc.c  */
-#line 2719 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 723:
+  case 726:
 
 /* Line 1806 of yacc.c  */
@@ -9242 +9261 @@
     break;
 
-  case 724:
-
-/* Line 1806 of yacc.c  */
-#line 2723 "parser.yy"
+  case 727:
+
+/* Line 1806 of yacc.c  */
+#line 2726 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
+    break;
+
+  case 728:
+
+/* Line 1806 of yacc.c  */
+#line 2728 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
+    break;
+
+  case 729:
+
+/* Line 1806 of yacc.c  */
+#line 2733 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), true ); }
+    break;
+
+  case 730:
+
+/* Line 1806 of yacc.c  */
+#line 2735 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl)->addQualifiers( (yyvsp[(3) - (7)].decl) ), true ); }
+    break;
+
+  case 732:
+
+/* Line 1806 of yacc.c  */
+#line 2762 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 736:
+
+/* Line 1806 of yacc.c  */
+#line 2773 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 737:
+
+/* Line 1806 of yacc.c  */
+#line 2775 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+    break;
+
+  case 738:
+
+/* Line 1806 of yacc.c  */
+#line 2777 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 739:
+
+/* Line 1806 of yacc.c  */
+#line 2779 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+    break;
+
+  case 740:
+
+/* Line 1806 of yacc.c  */
+#line 2781 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 741:
+
+/* Line 1806 of yacc.c  */
+#line 2783 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+    break;
+
+  case 742:
+
+/* Line 1806 of yacc.c  */
+#line 2790 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 743:
+
+/* Line 1806 of yacc.c  */
+#line 2792 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
 
-  case 725:
-
-/* Line 1806 of yacc.c  */
-#line 2725 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
-    break;
-
-  case 726:
-
-/* Line 1806 of yacc.c  */
-#line 2727 "parser.yy"
+  case 744:
+
+/* Line 1806 of yacc.c  */
+#line 2794 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 727:
-
-/* Line 1806 of yacc.c  */
-#line 2732 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
-    break;
-
-  case 728:
-
-/* Line 1806 of yacc.c  */
-#line 2734 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
-    break;
-
-  case 729:
-
-/* Line 1806 of yacc.c  */
-#line 2739 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), true ); }
-    break;
-
-  case 730:
-
-/* Line 1806 of yacc.c  */
-#line 2741 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl)->addQualifiers( (yyvsp[(3) - (7)].decl) ), true ); }
-    break;
-
-  case 732:
-
-/* Line 1806 of yacc.c  */
-#line 2768 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 736:
-
-/* Line 1806 of yacc.c  */
-#line 2779 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 737:
-
-/* Line 1806 of yacc.c  */
-#line 2781 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
-    break;
-
-  case 738:
-
-/* Line 1806 of yacc.c  */
-#line 2783 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 739:
-
-/* Line 1806 of yacc.c  */
-#line 2785 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
-    break;
-
-  case 740:
-
-/* Line 1806 of yacc.c  */
-#line 2787 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 741:
-
-/* Line 1806 of yacc.c  */
-#line 2789 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
-    break;
-
-  case 742:
+  case 745:
 
 /* Line 1806 of yacc.c  */
@@ -9347 +9366 @@
     break;
 
-  case 743:
+  case 746:
 
 /* Line 1806 of yacc.c  */
@@ -9354 +9373 @@
     break;
 
-  case 744:
+  case 747:
 
 /* Line 1806 of yacc.c  */
@@ -9361 +9380 @@
     break;
 
-  case 745:
-
-/* Line 1806 of yacc.c  */
-#line 2802 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 746:
-
-/* Line 1806 of yacc.c  */
-#line 2804 "parser.yy"
-    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 747:
-
-/* Line 1806 of yacc.c  */
-#line 2806 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
   case 748:
 
 /* Line 1806 of yacc.c  */
-#line 2811 "parser.yy"
+#line 2805 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -9392 +9390 @@
 
 /* Line 1806 of yacc.c  */
-#line 2816 "parser.yy"
+#line 2810 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, DeclarationNode::newTuple( 0 ), (yyvsp[(4) - (5)].decl), 0 ); }
     break;
@@ -9399 +9397 @@
 
 /* Line 1806 of yacc.c  */
-#line 2818 "parser.yy"
+#line 2812 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), 0 ); }
     break;
@@ -9406 +9404 @@
 
 /* Line 1806 of yacc.c  */
-#line 2820 "parser.yy"
+#line 2814 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), 0 ); }
     break;
@@ -9413 +9411 @@
 
 /* Line 1806 of yacc.c  */
-#line 2844 "parser.yy"
+#line 2838 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -9420 +9418 @@
 
 /* Line 1806 of yacc.c  */
-#line 2846 "parser.yy"
+#line 2840 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -9427 +9425 @@
 
 /* Line 1806 of yacc.c  */
-#line 9430 "Parser/parser.cc"
+#line 9428 "Parser/parser.cc"
       default: break;
     }
@@ -9658 +9656 @@
 
 /* Line 2067 of yacc.c  */
-#line 2849 "parser.yy"
+#line 2843 "parser.yy"
 
 // ----end of grammar----

src/Parser/parser.h

@@ -274 +274 @@
         LabelNode *label;
         InitializerNode *in;
-        OperatorNode::Type op;
         bool flag;
 
@@ -280 +279 @@
 
 /* Line 2068 of yacc.c  */
-#line 283 "Parser/parser.h"
+#line 282 "Parser/parser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug  5 08:15:57 2016
-// Update Count     : 1721
+// Last Modified On : Thu Aug  4 11:28:18 2016
+// Update Count     : 1672
 //
 
@@ -119 +119 @@
         LabelNode *label;
         InitializerNode *in;
-        OperatorNode::Type op;
         bool flag;
 }
@@ -130 +129 @@
 %type<constant> constant
 %type<en> tuple                                                 tuple_expression_list
-%type<op> ptrref_operator
-%type<en> unary_operator                                assignment_operator
+%type<en> ptrref_operator                               unary_operator                          assignment_operator
 %type<en> primary_expression                    postfix_expression                      unary_expression
 %type<en> cast_expression                               multiplicative_expression       additive_expression                     shift_expression
@@ -356 +354 @@
                 // little advantage to this feature and many disadvantages. It is possible to write x[(i,j)] in CFA, which is
                 // equivalent to the old x[i,j].
-                { $$ = new CompositeExprNode2( build_opr2( OperatorNode::Index, $1, $4 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Index ), $1, $4 ); }
         | postfix_expression '(' argument_expression_list ')'
                 { $$ = new CompositeExprNode( $1, $3 ); }
@@ -362 +360 @@
                 //   struct S { int 0, 1; } s; s. 0 = 0; s. 1 = 1;
         | postfix_expression '.' no_attr_identifier
-                { $$ = new CompositeExprNode2( build_fieldSel( $1, new VarRefNode( $3 ) ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::FieldSel ), $1, new VarRefNode( $3 )); }
         | postfix_expression '.' '[' push field_list pop ']' // CFA, tuple field selector
         | postfix_expression ARROW no_attr_identifier
-                { $$ = new CompositeExprNode2( build_pfieldSel( $1, new VarRefNode( $3 ) ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::PFieldSel ), $1, new VarRefNode( $3 )); }
         | postfix_expression ARROW '[' push field_list pop ']' // CFA, tuple field selector
         | postfix_expression ICR
-                { $$ = new CompositeExprNode2( build_opr1( OperatorNode::IncrPost, $1 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::IncrPost ), $1 ); }
         | postfix_expression DECR
-                { $$ = new CompositeExprNode2( build_opr1( OperatorNode::DecrPost, $1 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::DecrPost ), $1 ); }
         | '(' type_name_no_function ')' '{' initializer_list comma_opt '}' // C99
                 { $$ = new CompoundLiteralNode( $2, new InitializerNode( $5, true ) ); }
@@ -412 +410 @@
                 //   struct S { int 0, 1; } s; s. 0 = 0; s. 1 = 1;
         | no_attr_identifier '.' field
-                { $$ = new CompositeExprNode2( build_fieldSel( $3, new VarRefNode( $1 ) ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::FieldSel ), new VarRefNode( $1 ), $3 ); }
         | no_attr_identifier '.' '[' push field_list pop ']'
-                { $$ = new CompositeExprNode2( build_fieldSel( $5, new VarRefNode( $1 ) ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::FieldSel ), new VarRefNode( $1 ), $5 ); }
         | no_attr_identifier ARROW field
-                { $$ = new CompositeExprNode2( build_pfieldSel( $3, new VarRefNode( $1 ) ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::PFieldSel ), new VarRefNode( $1 ), $3 ); }
         | no_attr_identifier ARROW '[' push field_list pop ']'
-                { $$ = new CompositeExprNode2( build_pfieldSel( $5, new VarRefNode( $1 ) ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::PFieldSel ), new VarRefNode( $1 ), $5 ); }
         ;
 
@@ -431 +429 @@
         | EXTENSION cast_expression                                                     // GCC
                 { $$ = $2->set_extension( true ); }
+        | ptrref_operator cast_expression                                       // CFA
+                { $$ = new CompositeExprNode( $1, $2 ); }
                 // '*' ('&') is separated from unary_operator because of shift/reduce conflict in:
                 //              { * X; }         // dereference X
                 //              { * int X; } // CFA declaration of pointer to int
-        | ptrref_operator cast_expression                                       // CFA
-                { $$ = $1 == OperatorNode::AddressOf ? (ExpressionNode*) new CompositeExprNode2( build_addressOf( $2 ) )
-                                                                                        : (ExpressionNode*)new CompositeExprNode( new OperatorNode ( $1 ), $2 ); }
         | unary_operator cast_expression
                 { $$ = new CompositeExprNode( $1, $2 ); }
         | ICR unary_expression
-                { $$ = new CompositeExprNode2( build_opr1( OperatorNode::Incr, $2 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Incr ), $2 ); }
         | DECR unary_expression
-                { $$ = new CompositeExprNode2( build_opr1( OperatorNode::Decr, $2 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Decr ), $2 ); }
         | SIZEOF unary_expression
-                { $$ = new CompositeExprNode2( build_sizeOf( $2 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::SizeOf ), $2 ); }
         | SIZEOF '(' type_name_no_function ')'
-                { $$ = new CompositeExprNode2( build_sizeOf( new TypeValueNode( $3 ) ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::SizeOf ), new TypeValueNode( $3 )); }
         | OFFSETOF '(' type_name_no_function ',' no_attr_identifier ')'
-                { $$ = new CompositeExprNode2( build_offsetOf( new TypeValueNode( $3 ), new VarRefNode( $5 ) ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::OffsetOf ), new TypeValueNode( $3 ), new VarRefNode( $5 )); }
         | ATTR_IDENTIFIER
-                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( $1 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( $1 )); }
         | ATTR_IDENTIFIER '(' type_name ')'
-                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( $1 ), new TypeValueNode( $3 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( $1 ), new TypeValueNode( $3 )); }
         | ATTR_IDENTIFIER '(' argument_expression ')'
                 { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( $1 ), $3 ); }
         | ALIGNOF unary_expression                                                      // GCC, variable alignment
-                { $$ = new CompositeExprNode2( build_alignOf( $2 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::AlignOf ), $2 ); }
         | ALIGNOF '(' type_name_no_function ')'                         // GCC, type alignment
-                { $$ = new CompositeExprNode2( build_alignOf( new TypeValueNode( $3 ) ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::AlignOf ), new TypeValueNode( $3 ) ); }
 //      | ANDAND IDENTIFIER                                                                     // GCC, address of label
 //              { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::LabelAddress ), new VarRefNode( $2, true ) ); }
@@ -464 +461 @@
 
 ptrref_operator:
-        '*'                                                                                     { $$ = OperatorNode::PointTo; }
-        | '&'                                                                           { $$ = OperatorNode::AddressOf; }
+        '*'                                                                                     { $$ = new OperatorNode( OperatorNode::PointTo ); }
+        | '&'                                                                           { $$ = new OperatorNode( OperatorNode::AddressOf ); }
                 // GCC, address of label must be handled by semantic check for ref,ref,label
-        | ANDAND                                                                        { $$ = OperatorNode::And; }
+        | ANDAND                                                                        { $$ = new OperatorNode( OperatorNode::And ); }
         ;
 
@@ -480 +477 @@
         unary_expression
         | '(' type_name_no_function ')' cast_expression
-                { $$ = new CompositeExprNode2( build_cast( new TypeValueNode( $2 ), $4 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Cast ), new TypeValueNode( $2 ), $4 ); }
         | '(' type_name_no_function ')' tuple
-                { $$ = new CompositeExprNode2( build_cast( new TypeValueNode( $2 ), $4 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Cast ), new TypeValueNode( $2 ), $4 ); }
         ;
 
@@ -488 +485 @@
         cast_expression
         | multiplicative_expression '*' cast_expression
-                { $$ = new CompositeExprNode2( build_opr2( OperatorNode::Mul, $1, $3 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Mul ), $1, $3 ); }
         | multiplicative_expression '/' cast_expression
-                { $$ = new CompositeExprNode2( build_opr2( OperatorNode::Div, $1, $3 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Div ), $1, $3 ); }
         | multiplicative_expression '%' cast_expression
-                { $$ = new CompositeExprNode2( build_opr2( OperatorNode::Mod, $1, $3 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Mod ), $1, $3 ); }
         ;
 
@@ -498 +495 @@
         multiplicative_expression
         | additive_expression '+' multiplicative_expression
-                { $$ = new CompositeExprNode2( build_opr2( OperatorNode::Plus, $1, $3 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Plus ), $1, $3 ); }
         | additive_expression '-' multiplicative_expression
-                { $$ = new CompositeExprNode2( build_opr2( OperatorNode::Minus, $1, $3 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Minus ), $1, $3 ); }
         ;
 
@@ -506 +503 @@
         additive_expression
         | shift_expression LS additive_expression
-                { $$ = new CompositeExprNode2( build_opr2( OperatorNode::LShift, $1, $3 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::LShift ), $1, $3 ); }
         | shift_expression RS additive_expression
-                { $$ = new CompositeExprNode2( build_opr2( OperatorNode::RShift, $1, $3 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::RShift ), $1, $3 ); }
         ;
 
@@ -514 +511 @@
         shift_expression
         | relational_expression '<' shift_expression
-                { $$ = new CompositeExprNode2( build_opr2( OperatorNode::LThan, $1, $3 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::LThan ), $1, $3 ); }
         | relational_expression '>' shift_expression
-                { $$ = new CompositeExprNode2( build_opr2( OperatorNode::GThan, $1, $3 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::GThan ), $1, $3 ); }
         | relational_expression LE shift_expression
-                { $$ = new CompositeExprNode2( build_opr2( OperatorNode::LEThan, $1, $3 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::LEThan ), $1, $3 ); }
         | relational_expression GE shift_expression
-                { $$ = new CompositeExprNode2( build_opr2( OperatorNode::GEThan, $1, $3 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::GEThan ), $1, $3 ); }
         ;
 
@@ -526 +523 @@
         relational_expression
         | equality_expression EQ relational_expression
-                { $$ = new CompositeExprNode2( build_opr2( OperatorNode::Eq, $1, $3 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Eq ), $1, $3 ); }
         | equality_expression NE relational_expression
-                { $$ = new CompositeExprNode2( build_opr2( OperatorNode::Neq, $1, $3 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Neq ), $1, $3 ); }
         ;
 
@@ -534 +531 @@
         equality_expression
         | AND_expression '&' equality_expression
-                { $$ = new CompositeExprNode2( build_opr2( OperatorNode::BitAnd, $1, $3 ) ); }
+                { $$ =new CompositeExprNode( new OperatorNode( OperatorNode::BitAnd ), $1, $3 ); }
         ;
 
@@ -540 +537 @@
         AND_expression
         | exclusive_OR_expression '^' AND_expression
-                { $$ = new CompositeExprNode2( build_opr2( OperatorNode::Xor, $1, $3 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Xor ), $1, $3 ); }
         ;
 
@@ -546 +543 @@
         exclusive_OR_expression
         | inclusive_OR_expression '|' exclusive_OR_expression
-                { $$ = new CompositeExprNode2( build_opr2( OperatorNode::BitOr, $1, $3 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::BitOr ), $1, $3 ); }
         ;
 
@@ -552 +549 @@
         inclusive_OR_expression
         | logical_AND_expression ANDAND inclusive_OR_expression
-                { $$ = new CompositeExprNode2( build_and_or( $1, $3, true ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::And ), $1, $3 ); }
         ;
 
@@ -558 +555 @@
         logical_AND_expression
         | logical_OR_expression OROR logical_AND_expression
-                { $$ = new CompositeExprNode2( build_and_or( $1, $3, false ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Or ), $1, $3 ); }
         ;
 
@@ -564 +561 @@
         logical_OR_expression
         | logical_OR_expression '?' comma_expression ':' conditional_expression
-                { $$ = new CompositeExprNode2( build_cond( $1, $3, $5 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Cond ), (ExpressionNode *)mkList( (*$1, *$3, *$5 ) ) ); }
         | logical_OR_expression '?' /* empty */ ':' conditional_expression // GCC, omitted first operand
-                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::NCond ), $1, $4 ); }
+                { $$=new CompositeExprNode( new OperatorNode( OperatorNode::NCond ), $1, $4 ); }
         | logical_OR_expression '?' comma_expression ':' tuple // CFA, tuple expression
-                { $$ = new CompositeExprNode2( build_cond( $1, $3, $5 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Cond ), (ExpressionNode *)mkList( (*$1, *$3, *$5 ) ) ); }
         ;
 
@@ -579 +576 @@
         conditional_expression
         | unary_expression '=' assignment_expression
-                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Assign ), $1, $3 ); }
+                { $$ =new CompositeExprNode( new OperatorNode( OperatorNode::Assign ), $1, $3 ); }
         | unary_expression assignment_operator assignment_expression
-                { $$ = new CompositeExprNode( $2, $1, $3 ); }
+                { $$ =new CompositeExprNode( $2, $1, $3 ); }
         | tuple assignment_opt                                                          // CFA, tuple expression
                 { $$ = ( $2 == 0 ) ? $1 : new CompositeExprNode( new OperatorNode( OperatorNode::Assign ), $1, $2 ); }
@@ -627 +624 @@
         assignment_expression
         | comma_expression ',' assignment_expression    // { $$ = (ExpressionNode *)$1->add_to_list( $3 ); }
-        //{ $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Comma ), $1, $3 ); }
-                { $$ = new CompositeExprNode2( build_comma( $1, $3 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Comma ), $1, $3 ); }
         ;
 
@@ -740 +736 @@
         constant_expression                                                     { $$ = $1; }
         | constant_expression ELLIPSIS constant_expression      // GCC, subrange
-                { $$ = new CompositeExprNode2( build_opr2( OperatorNode::Range, $1, $3 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Range ), $1, $3 ); }
         | subrange                                                                                      // CFA, subrange
         ;
@@ -746 +742 @@
 case_value_list:                                                                                // CFA
         case_value                                                                      { $$ = new StatementNode( StatementNode::Case, $1, 0 ); }
-                // convert case list, e.g., "case 1, 3, 5:" into "case 1: case 3: case 5"
         | case_value_list ',' case_value                        { $$ = (StatementNode *)($1->set_link( new StatementNode( StatementNode::Case, $3, 0 ) ) ); }
         ;
@@ -1781 +1776 @@
                 { $$ = new DesignatorNode( $3, true ); }
         | '[' push constant_expression ELLIPSIS constant_expression pop ']' // GCC, multiple array elements
-                { $$ = new DesignatorNode( new CompositeExprNode2( build_opr2( OperatorNode::Range, $3, $5 ) ), true ); }
+                { $$ = new DesignatorNode( new CompositeExprNode( new OperatorNode( OperatorNode::Range ), $3, $5 ), true ); }
         | '.' '[' push field_list pop ']'                                       // CFA, tuple field selector
                 { $$ = new DesignatorNode( $4 ); }
@@ -2110 +2105 @@
 subrange:
         constant_expression '~' constant_expression                     // CFA, integer subrange
-                { $$ = new CompositeExprNode2( build_opr2( OperatorNode::Range, $1, $3 ) ); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Range ), $1, $3 ); }
         ;