Changes in / [c331406:5070fe4]

Files:

• doc/aaron_comp_II/comp_II.tex (modified) (1 diff)
• src/CodeGen/CodeGenerator.cc (modified) (45 diffs)
• src/CodeGen/CodeGenerator.h (modified) (2 diffs)
• src/ControlStruct/CaseRangeMutator.cc (added)
• src/ControlStruct/CaseRangeMutator.h (added)
• src/ControlStruct/MLEMutator.cc (modified) (3 diffs)
• src/ControlStruct/Mutate.cc (modified) (4 diffs)
• src/ControlStruct/module.mk (modified) (2 diffs)
• src/GenPoly/DeclMutator.cc (modified) (2 diffs)
• src/GenPoly/DeclMutator.h (modified) (2 diffs)
• src/GenPoly/PolyMutator.cc (modified) (2 diffs)
• src/GenPoly/Specialize.cc (modified) (2 diffs)
• src/InitTweak/FixGlobalInit.cc (modified) (3 diffs)
• src/InitTweak/FixInit.cc (modified) (11 diffs)
• src/InitTweak/FixInit.h (modified) (1 diff)
• src/InitTweak/GenInit.cc (modified) (5 diffs)
• src/InitTweak/InitTweak.cc (modified) (7 diffs)
• src/InitTweak/InitTweak.h (modified) (1 diff)
• src/Makefile.in (modified) (6 diffs)
• src/Parser/ExpressionNode.cc (modified) (12 diffs)
• src/Parser/ParseNode.h (modified) (6 diffs)
• src/Parser/StatementNode.cc (modified) (2 diffs)
• src/Parser/TypeData.cc (modified) (1 diff)
• src/Parser/parser.cc (modified) (289 diffs)
• src/Parser/parser.h (modified) (2 diffs)
• src/Parser/parser.yy (modified) (27 diffs)
• src/ResolvExpr/Resolver.cc (modified) (7 diffs)
• src/SymTab/AddVisit.h (modified) (2 diffs)
• src/SymTab/Autogen.cc (modified) (3 diffs)
• src/SymTab/Autogen.h (modified) (1 diff)
• src/SymTab/FixFunction.cc (modified) (2 diffs)
• src/SymTab/Validate.cc (modified) (4 diffs)
• src/SynTree/AddStmtVisitor.cc (modified) (2 diffs)
• src/SynTree/Declaration.cc (modified) (2 diffs)
• src/SynTree/Declaration.h (modified) (6 diffs)
• src/SynTree/DeclarationWithType.cc (modified) (1 diff)
• src/SynTree/Expression.cc (modified) (3 diffs)
• src/SynTree/Expression.h (modified) (3 diffs)
• src/SynTree/FunctionDecl.cc (modified) (4 diffs)
• src/SynTree/Initializer.h (modified) (1 diff)
• src/SynTree/Label.h (modified) (1 diff)
• src/SynTree/Mutator.cc (modified) (3 diffs)
• src/SynTree/Mutator.h (modified) (2 diffs)
• src/SynTree/ObjectDecl.cc (modified) (3 diffs)
• src/SynTree/Statement.cc (modified) (4 diffs)
• src/SynTree/Statement.h (modified) (4 diffs)
• src/SynTree/SynTree.h (modified) (2 diffs)
• src/SynTree/Visitor.cc (modified) (3 diffs)
• src/SynTree/Visitor.h (modified) (2 diffs)
• src/examples/gc_no_raii/bug-repro/return_template.c (modified) (1 diff)
• src/examples/gc_no_raii/src/gc.h (modified) (1 diff)
• src/examples/gc_no_raii/src/gcpointers.c (modified) (1 diff)
• src/examples/gc_no_raii/src/gcpointers.h (modified) (2 diffs)
• src/examples/gc_no_raii/src/internal/memory_pool.h (modified) (1 diff)
• src/examples/gc_no_raii/src/internal/state.h (modified) (1 diff)
• src/examples/gc_no_raii/src/tools/worklist.h (modified) (1 diff)
• src/examples/gc_no_raii/test/badlll.c (modified) (2 diffs)
• src/examples/gc_no_raii/test/gctest.c (modified) (1 diff)
• src/main.cc (modified) (3 diffs)
• src/tests/.expect/64/extension.txt (modified) (1 diff)
• src/tests/.expect/multiDimension.txt (deleted)
• src/tests/init_once.c (modified) (2 diffs)
• src/tests/multiDimension.c (deleted)
• src/tests/switch.c (modified) (2 diffs)

doc/aaron_comp_II/comp_II.tex

@@ -156 +156 @@
 
 forall(otype M | has_magnitude(M))
-M abs( M m ) {
+int sgn( M m ) {
     M zero = 0;  // uses zero_t constructor from trait
-    return m < zero ? -m : m;
-}
-
-forall(otype M | has_magnitude(M))
-M max_magnitude( M a, M b ) {
-    M aa = abs(a), ab = abs(b);
-    return aa < ab ? b : a; 
-}
-\end{lstlisting}
-
-Semantically, a trait is merely a named list of type assertions, but they can be used in many of the same situations where an interface in Java or an abstract base class in \CC would be used.
-Unlike Java interfaces or \CC base classes, \CFA types do not explicitly state any inheritance relationship to traits they satisfy; this can be considered a form of structural inheritance, similar to interface implementation in Go, as opposed to the nominal inheritance model of Java and \CC. 
-% TODO talk about modelling of nominal inheritance with structural inheritance, possibility of investigating some resolver algorithms that require nominal
+    if ( m < zero ) return -1;
+    if ( zero < m ) return 1;
+    return 0; 
+}
+
+// TODO write another function
+\end{lstlisting} 
 
 \subsection{Name Overloading}

src/CodeGen/CodeGenerator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 13:35:30 2016
-// Update Count     : 352
+// Last Modified By : 
+// Last Modified On : Sun Jul 31 08:42:18 2016
+// Update Count     : 345
 //
 
@@ -48 +48 @@
         }
 
-        void CodeGenerator::extension( Expression * expr ) {
+        void CodeGenerator::extension( Expression *expr ) {
                 if ( expr->get_extension() ) {
                         output << "__extension__ ";
@@ -54 +54 @@
         } // extension
 
-        void CodeGenerator::extension( Declaration * decl ) {
+        void CodeGenerator::extension( Declaration *decl ) {
                 if ( decl->get_extension() ) {
                         output << "__extension__ ";
@@ -73 +73 @@
         }
 
-        ostream & operator<<( ostream & output, CodeGenerator::LabelPrinter & printLabels ) {
+        ostream & operator<<( ostream & output, CodeGenerator::LabelPrinter &printLabels ) {
                 std::list< Label > & labs = *printLabels.labels;
                 // l.unique(); // assumes a sorted list. Why not use set? Does order matter?
@@ -79 +79 @@
                         output << l.get_name() + ": ";
                         printLabels.cg.genAttributes( l.get_attributes() );
-                } // for
+                }
                 return output;
         }
 
-        CodeGenerator::CodeGenerator( std::ostream & os ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ) {}
-
-        CodeGenerator::CodeGenerator( std::ostream & os, std::string init, int indentation, bool infunp )
+        CodeGenerator::CodeGenerator( std::ostream &os ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ) {}
+
+        CodeGenerator::CodeGenerator( std::ostream &os, std::string init, int indentation, bool infunp )
                         : indent( *this), cur_indent( indentation ), insideFunction( infunp ), output( os ), printLabels( *this ) {
                 //output << std::string( init );
         }
 
-        CodeGenerator::CodeGenerator( std::ostream & os, char * init, int indentation, bool infunp )
+        CodeGenerator::CodeGenerator( std::ostream &os, char *init, int indentation, bool infunp )
                         : indent( *this ), cur_indent( indentation ), insideFunction( infunp ), output( os ), printLabels( *this ) {
                 //output << std::string( init );
         }
 
-        string mangleName( DeclarationWithType * decl ) {
+        string mangleName( DeclarationWithType *decl ) {
                 if ( decl->get_mangleName() != "" ) {
                         // need to incorporate scope level in order to differentiate names for destructors
@@ -112 +112 @@
                                         genCommaList( attr->get_parameters().begin(), attr->get_parameters().end() );
                                         output << ")";
-                                } // if
+                                }
                                 output << ",";
-                        } // for
+                        }
                         output << ")) ";
-                } // if
+                }
         }
 
 
         //*** Declarations
-        void CodeGenerator::visit( FunctionDecl * functionDecl ) {
+        void CodeGenerator::visit( FunctionDecl *functionDecl ) {
                 extension( functionDecl );
                 genAttributes( functionDecl->get_attributes() );
@@ -146 +146 @@
         }
 
-        void CodeGenerator::visit( ObjectDecl * objectDecl ) {
+        void CodeGenerator::visit( ObjectDecl *objectDecl ) {
                 extension( objectDecl );
-                genAttributes( objectDecl->get_attributes() );
-
                 handleStorageClass( objectDecl );
                 output << genType( objectDecl->get_type(), mangleName( objectDecl ) );
@@ -164 +162 @@
         }
 
-        void CodeGenerator::handleAggregate( AggregateDecl * aggDecl ) {
+        void CodeGenerator::handleAggregate( AggregateDecl *aggDecl ) {
                 if ( aggDecl->get_name() != "" )
                         output << aggDecl->get_name();
 
-                std::list< Declaration * > & memb = aggDecl->get_members();
+                std::list< Declaration * > &memb = aggDecl->get_members();
                 if ( ! memb.empty() ) {
 //              if ( aggDecl->has_body() ) {
-//                      std::list< Declaration * > & memb = aggDecl->get_members();
+//                      std::list< Declaration * > &memb = aggDecl->get_members();
                         output << " {" << endl;
 
@@ -187 +185 @@
         }
 
-        void CodeGenerator::visit( StructDecl * structDecl ) {
+        void CodeGenerator::visit( StructDecl *structDecl ) {
                 extension( structDecl );
                 output << "struct ";
@@ -193 +191 @@
         }
 
-        void CodeGenerator::visit( UnionDecl * unionDecl ) {
+        void CodeGenerator::visit( UnionDecl *unionDecl ) {
                 extension( unionDecl );
                 output << "union ";
@@ -199 +197 @@
         }
 
-        void CodeGenerator::visit( EnumDecl * enumDecl ) {
+        void CodeGenerator::visit( EnumDecl *enumDecl ) {
                 extension( enumDecl );
                 output << "enum ";
@@ -213 +211 @@
                         cur_indent += CodeGenerator::tabsize;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
-                                ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
+                                ObjectDecl *obj = dynamic_cast< ObjectDecl* >( *i );
                                 assert( obj );
                                 output << indent << mangleName( obj );
@@ -229 +227 @@
         }
 
-        void CodeGenerator::visit( TraitDecl * traitDecl ) {}
-
-        void CodeGenerator::visit( TypedefDecl * typeDecl ) {
+        void CodeGenerator::visit( TraitDecl *traitDecl ) {}
+
+        void CodeGenerator::visit( TypedefDecl *typeDecl ) {
                 assert( false && "Typedefs are removed and substituted in earlier passes." );
                 //output << "typedef ";
@@ -237 +235 @@
         }
 
-        void CodeGenerator::visit( TypeDecl * typeDecl ) {
+        void CodeGenerator::visit( TypeDecl *typeDecl ) {
                 // really, we should mutate this into something that isn't a TypeDecl but that requires large-scale changes,
                 // still to be done
@@ -265 +263 @@
         }
 
-        void CodeGenerator::visit( SingleInit * init ) {
+        void CodeGenerator::visit( SingleInit *init ) {
                 printDesignators( init->get_designators() );
                 init->get_value()->accept( *this );
         }
 
-        void CodeGenerator::visit( ListInit * init ) {
+        void CodeGenerator::visit( ListInit *init ) {
                 printDesignators( init->get_designators() );
                 output << "{ ";
-                if ( init->begin() == init->end() ) {
+                if ( init->begin_initializers() == init->end_initializers() ) {
                         // illegal to leave initializer list empty for scalar initializers, but always legal to have 0
                         output << "0";
                 } else {
-                        genCommaList( init->begin(), init->end() );
-                } // if
+                        genCommaList( init->begin_initializers(), init->end_initializers() );
+                }
                 output << " }";
         }
 
-        void CodeGenerator::visit( Constant * constant ) {
+        void CodeGenerator::visit( Constant *constant ) {
                 output << constant->get_value() ;
         }
 
         //*** Expressions
-        void CodeGenerator::visit( ApplicationExpr * applicationExpr ) {
+        void CodeGenerator::visit( ApplicationExpr *applicationExpr ) {
                 extension( applicationExpr );
-                if ( VariableExpr * varExpr = dynamic_cast< VariableExpr* >( applicationExpr->get_function() ) ) {
+                if ( VariableExpr *varExpr = dynamic_cast< VariableExpr* >( applicationExpr->get_function() ) ) {
                         OperatorInfo opInfo;
                         if ( varExpr->get_var()->get_linkage() == LinkageSpec::Intrinsic && operatorLookup( varExpr->get_var()->get_name(), opInfo ) ) {
@@ -301 +299 @@
                                         {
                                                 assert( arg != applicationExpr->get_args().end() );
-                                                if ( AddressExpr * addrExpr = dynamic_cast< AddressExpr * >( *arg ) ) {
+                                                if ( AddressExpr *addrExpr = dynamic_cast< AddressExpr * >( *arg ) ) {
                                                         // remove & from first assignment/ctor argument
                                                         *arg = addrExpr->get_arg();
                                                 } else {
                                                         // no address-of operator, so must be a pointer - add dereference
-                                                        UntypedExpr * newExpr = new UntypedExpr( new NameExpr( "*?" ) );
+                                                        UntypedExpr *newExpr = new UntypedExpr( new NameExpr( "*?" ) );
                                                         newExpr->get_args().push_back( *arg );
                                                         assert( (*arg)->get_results().size() == 1 );
@@ -354 +352 @@
                                                 // no constructors with 0 or more than 2 parameters
                                                 assert( false );
-                                        } // if
+                                        }
                                         break;
 
@@ -403 +401 @@
         }
 
-        void CodeGenerator::visit( UntypedExpr * untypedExpr ) {
+        void CodeGenerator::visit( UntypedExpr *untypedExpr ) {
                 extension( untypedExpr );
-                if ( NameExpr * nameExpr = dynamic_cast< NameExpr* >( untypedExpr->get_function() ) ) {
+                if ( NameExpr *nameExpr = dynamic_cast< NameExpr* >( untypedExpr->get_function() ) ) {
                         OperatorInfo opInfo;
                         if ( operatorLookup( nameExpr->get_name(), opInfo ) ) {
@@ -474 +472 @@
                                 } // switch
                         } else {
-                                if ( nameExpr->get_name() == "..." ) { // case V1 ... V2 or case V1~V2
+                                if ( nameExpr->get_name() == "Range" ) { // case V1 ... V2 or case V1~V2
                                         assert( untypedExpr->get_args().size() == 2 );
                                         (*untypedExpr->get_args().begin())->accept( *this );
@@ -494 +492 @@
         }
 
-        void CodeGenerator::visit( RangeExpr * rangeExpr ) {
-                rangeExpr->get_low()->accept( *this );
-                output << " ... ";
-                rangeExpr->get_high()->accept( *this );
-        }
-
-        void CodeGenerator::visit( NameExpr * nameExpr ) {
+        void CodeGenerator::visit( NameExpr *nameExpr ) {
                 extension( nameExpr );
                 OperatorInfo opInfo;
@@ -511 +503 @@
         }
 
-        void CodeGenerator::visit( AddressExpr * addressExpr ) {
+        void CodeGenerator::visit( AddressExpr *addressExpr ) {
                 extension( addressExpr );
                 output << "(&";
                 // this hack makes sure that we don't convert "constant_zero" to "0" if we're taking its address
-                if ( VariableExpr * variableExpr = dynamic_cast< VariableExpr* >( addressExpr->get_arg() ) ) {
+                if ( VariableExpr *variableExpr = dynamic_cast< VariableExpr* >( addressExpr->get_arg() ) ) {
                         output << mangleName( variableExpr->get_var() );
                 } else {
@@ -523 +515 @@
         }
 
-        void CodeGenerator::visit( CastExpr * castExpr ) {
+        void CodeGenerator::visit( CastExpr *castExpr ) {
                 extension( castExpr );
                 output << "(";
@@ -541 +533 @@
         }
 
-        void CodeGenerator::visit( UntypedMemberExpr * memberExpr ) {
+        void CodeGenerator::visit( UntypedMemberExpr *memberExpr ) {
                 assert( false );
         }
 
-        void CodeGenerator::visit( MemberExpr * memberExpr ) {
+        void CodeGenerator::visit( MemberExpr *memberExpr ) {
                 extension( memberExpr );
                 memberExpr->get_aggregate()->accept( *this );
@@ -551 +543 @@
         }
 
-        void CodeGenerator::visit( VariableExpr * variableExpr ) {
+        void CodeGenerator::visit( VariableExpr *variableExpr ) {
                 extension( variableExpr );
                 OperatorInfo opInfo;
@@ -561 +553 @@
         }
 
-        void CodeGenerator::visit( ConstantExpr * constantExpr ) {
+        void CodeGenerator::visit( ConstantExpr *constantExpr ) {
                 assert( constantExpr->get_constant() );
                 extension( constantExpr );
@@ -567 +559 @@
         }
 
-        void CodeGenerator::visit( SizeofExpr * sizeofExpr ) {
+        void CodeGenerator::visit( SizeofExpr *sizeofExpr ) {
                 extension( sizeofExpr );
                 output << "sizeof(";
@@ -578 +570 @@
         }
 
-        void CodeGenerator::visit( AlignofExpr * alignofExpr ) {
+        void CodeGenerator::visit( AlignofExpr *alignofExpr ) {
                 // use GCC extension to avoid bumping std to C11
                 extension( alignofExpr );
@@ -590 +582 @@
         }
 
-        void CodeGenerator::visit( UntypedOffsetofExpr * offsetofExpr ) {
+        void CodeGenerator::visit( UntypedOffsetofExpr *offsetofExpr ) {
                 assert( false && "UntypedOffsetofExpr should not reach code generation." );
         }
 
-        void CodeGenerator::visit( OffsetofExpr * offsetofExpr ) {
+        void CodeGenerator::visit( OffsetofExpr *offsetofExpr ) {
                 // use GCC builtin
                 output << "__builtin_offsetof(";
@@ -602 +594 @@
         }
 
-        void CodeGenerator::visit( OffsetPackExpr * offsetPackExpr ) {
+        void CodeGenerator::visit( OffsetPackExpr *offsetPackExpr ) {
                 assert( false && "OffsetPackExpr should not reach code generation." );
         }
 
-        void CodeGenerator::visit( LogicalExpr * logicalExpr ) {
+        void CodeGenerator::visit( LogicalExpr *logicalExpr ) {
                 extension( logicalExpr );
                 output << "(";
@@ -619 +611 @@
         }
 
-        void CodeGenerator::visit( ConditionalExpr * conditionalExpr ) {
+        void CodeGenerator::visit( ConditionalExpr *conditionalExpr ) {
                 extension( conditionalExpr );
                 output << "(";
@@ -630 +622 @@
         }
 
-        void CodeGenerator::visit( CommaExpr * commaExpr ) {
+        void CodeGenerator::visit( CommaExpr *commaExpr ) {
                 extension( commaExpr );
                 output << "(";
@@ -639 +631 @@
         }
 
-        void CodeGenerator::visit( TupleExpr * tupleExpr ) {}
-
-        void CodeGenerator::visit( TypeExpr * typeExpr ) {}
-
-        void CodeGenerator::visit( AsmExpr * asmExpr ) {
+        void CodeGenerator::visit( TupleExpr *tupleExpr ) {}
+
+        void CodeGenerator::visit( TypeExpr *typeExpr ) {}
+
+        void CodeGenerator::visit( AsmExpr *asmExpr ) {
                 if ( asmExpr->get_inout() ) {
                         output << "[ ";
@@ -656 +648 @@
 
         //*** Statements
-        void CodeGenerator::visit( CompoundStmt * compoundStmt ) {
+        void CodeGenerator::visit( CompoundStmt *compoundStmt ) {
                 std::list<Statement*> ks = compoundStmt->get_kids();
                 output << "{" << endl;
@@ -670 +662 @@
                                 output << endl;
                         } // if
-                } // for
+                }
                 cur_indent -= CodeGenerator::tabsize;
 
@@ -676 +668 @@
         }
 
-        void CodeGenerator::visit( ExprStmt * exprStmt ) {
+        void CodeGenerator::visit( ExprStmt *exprStmt ) {
                 assert( exprStmt );
                 // cast the top-level expression to void to reduce gcc warnings.
@@ -684 +676 @@
         }
 
-        void CodeGenerator::visit( AsmStmt * asmStmt ) {
+        void CodeGenerator::visit( AsmStmt *asmStmt ) {
                 output << "asm ";
                 if ( asmStmt->get_voltile() ) output << "volatile ";
@@ -707 +699 @@
         }
 
-        void CodeGenerator::visit( IfStmt * ifStmt ) {
+        void CodeGenerator::visit( IfStmt *ifStmt ) {
                 output << "if ( ";
                 ifStmt->get_condition()->accept( *this );
@@ -720 +712 @@
         }
 
-        void CodeGenerator::visit( SwitchStmt * switchStmt ) {
+        void CodeGenerator::visit( SwitchStmt *switchStmt ) {
                 output << "switch ( " ;
                 switchStmt->get_condition()->accept( *this );
@@ -727 +719 @@
                 output << "{" << std::endl;
                 cur_indent += CodeGenerator::tabsize;
-                acceptAll( switchStmt->get_statements(), *this );
+
+                acceptAll( switchStmt->get_branches(), *this );
+
                 cur_indent -= CodeGenerator::tabsize;
+
                 output << indent << "}";
         }
 
-        void CodeGenerator::visit( CaseStmt * caseStmt ) {
+        void CodeGenerator::visit( CaseStmt *caseStmt ) {
                 output << indent;
                 if ( caseStmt->isDefault()) {
@@ -753 +748 @@
         }
 
-        void CodeGenerator::visit( BranchStmt * branchStmt ) {
+        void CodeGenerator::visit( BranchStmt *branchStmt ) {
                 switch ( branchStmt->get_type()) {
                   case BranchStmt::Goto:
@@ -776 +771 @@
 
 
-        void CodeGenerator::visit( ReturnStmt * returnStmt ) {
+        void CodeGenerator::visit( ReturnStmt *returnStmt ) {
                 output << "return ";
                 maybeAccept( returnStmt->get_expr(), *this );
@@ -782 +777 @@
         }
 
-        void CodeGenerator::visit( WhileStmt * whileStmt ) {
+        void CodeGenerator::visit( WhileStmt *whileStmt ) {
                 if ( whileStmt->get_isDoWhile() ) {
                         output << "do" ;
@@ -804 +799 @@
         }
 
-        void CodeGenerator::visit( ForStmt * forStmt ) {
+        void CodeGenerator::visit( ForStmt *forStmt ) {
                 // initialization is always hoisted, so don't bother doing anything with that
                 output << "for (;";
@@ -826 +821 @@
         }
 
-        void CodeGenerator::visit( NullStmt * nullStmt ) {
+        void CodeGenerator::visit( NullStmt *nullStmt ) {
                 //output << indent << CodeGenerator::printLabels( nullStmt->get_labels() );
                 output << "/* null statement */ ;";
         }
 
-        void CodeGenerator::visit( DeclStmt * declStmt ) {
+        void CodeGenerator::visit( DeclStmt *declStmt ) {
                 declStmt->get_decl()->accept( *this );
 
@@ -839 +834 @@
         }
 
-        void CodeGenerator::handleStorageClass( Declaration * decl ) {
+        void CodeGenerator::handleStorageClass( Declaration *decl ) {
                 switch ( decl->get_storageClass() ) {
                   case DeclarationNode::Extern:

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/ControlStruct/MLEMutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:21:32 2016
-// Update Count     : 202
+// Last Modified On : Tue Jul 12 17:36:51 2016
+// Update Count     : 197
 //
 
@@ -128 +128 @@
                 Label brkLabel = generator->newLabel("switchBreak");
                 enclosingControlStructures.push_back( Entry(switchStmt, brkLabel) );
-                mutateAll( switchStmt->get_statements(), *this );
+                mutateAll( switchStmt->get_branches(), *this );
 
                 Entry &e = enclosingControlStructures.back();
@@ -138 +138 @@
                         // switch should be CastStmts), append the exit label + break to the last case statement; create a default
                         // case if there are no cases
-                        std::list< Statement * > &statements = switchStmt->get_statements();
-                        if ( statements.empty() ) {
-                                statements.push_back( CaseStmt::makeDefault() );
-                        } // if
-
-                        if ( CaseStmt * c = dynamic_cast< CaseStmt * >( statements.back() ) ) {
+                        std::list< Statement * > &branches = switchStmt->get_branches();
+                        if ( branches.empty() ) {
+                                branches.push_back( CaseStmt::makeDefault() );
+                        } // if
+
+                        if ( CaseStmt * c = dynamic_cast< CaseStmt * >( branches.back() ) ) {
                                 std::list<Label> temp; temp.push_back( brkLabel );
                                 c->get_statements().push_back( new BranchStmt( temp, Label("brkLabel"), BranchStmt::Break ) );
-                        } else assert(0); // as of this point, all statements of a switch are still CaseStmts
+                        } else assert(0); // as of this point, all branches of a switch are still CaseStmts
                 } // if
 

src/ControlStruct/Mutate.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:39:08 2016
-// Update Count     : 9
+// Last Modified On : Tue Jul 12 17:37:45 2016
+// Update Count     : 8
 //
 
@@ -22 +22 @@
 #include "LabelFixer.h"
 #include "MLEMutator.h"
+#include "CaseRangeMutator.h"
 #include "ForExprMutator.h"
 #include "LabelTypeChecker.h"
@@ -40 +41 @@
                 LabelFixer lfix;
 
+                // expand case ranges and turn fallthru into a null statement
+                CaseRangeMutator ranges;
+
                 //ExceptMutator exc;
                 // LabelTypeChecker lbl;
@@ -45 +49 @@
                 mutateAll( translationUnit, formut );
                 acceptAll( translationUnit, lfix );
+                mutateAll( translationUnit, ranges );
                 //mutateAll( translationUnit, exc );
                 //acceptAll( translationUnit, lbl );

src/ControlStruct/module.mk

@@ -11 +11 @@
 ## Created On       : Mon Jun  1 17:49:17 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Thu Aug  4 11:38:06 2016
-## Update Count     : 3
+## Last Modified On : Tue Jul 12 17:40:31 2016
+## Update Count     : 2
 ###############################################################################
 
@@ -18 +18 @@
         ControlStruct/LabelFixer.cc \
         ControlStruct/MLEMutator.cc \
+        ControlStruct/CaseRangeMutator.cc \
         ControlStruct/Mutate.cc \
         ControlStruct/ForExprMutator.cc \

src/GenPoly/DeclMutator.cc

@@ -10 +10 @@
 // Created On       : Fri Nov 27 14:44:00 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:16:43 2016
-// Update Count     : 3
+// Last Modified On : Tue Jul 12 17:38:46 2016
+// Update Count     : 2
 //
 
@@ -163 +163 @@
         Statement* DeclMutator::mutate(SwitchStmt *switchStmt) {
                 switchStmt->set_condition( maybeMutate( switchStmt->get_condition(), *this ) );
-                mutateAll( switchStmt->get_statements(), *this );
+                mutateAll( switchStmt->get_branches(), *this );
                 return switchStmt;
         }

src/GenPoly/DeclMutator.h

@@ -28 +28 @@
         class DeclMutator : public Mutator {
         public:
-                typedef Mutator Parent;
-
                 DeclMutator();
                 virtual ~DeclMutator();
-
-                using Parent::mutate;
+                
                 virtual CompoundStmt* mutate(CompoundStmt *compoundStmt);
                 virtual Statement* mutate(IfStmt *ifStmt);
@@ -45 +42 @@
                 /// Mutates a list of declarations with this visitor
                 void mutateDeclarationList(std::list< Declaration* >& decls);
-
+                
                 /// Called on entry to a new scope; overriders should call this as a super-class call
                 virtual void doBeginScope();

src/GenPoly/PolyMutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:26:22 2016
-// Update Count     : 16
+// Last Modified On : Tue Jul 12 17:39:32 2016
+// Update Count     : 12
 //
 
@@ -99 +99 @@
 
         Statement * PolyMutator::mutate(SwitchStmt *switchStmt) {
-                mutateStatementList( switchStmt->get_statements() );
+                mutateStatementList( switchStmt->get_branches() );
                 switchStmt->set_condition( mutateExpression( switchStmt->get_condition() ) );
                 return switchStmt;

src/GenPoly/Specialize.cc

@@ -31 +31 @@
 #include "Common/UniqueName.h"
 #include "Common/utility.h"
-#include "InitTweak/InitTweak.h"
 
 namespace GenPoly {
@@ -185 +184 @@
                 mutateAll( appExpr->get_args(), *this );
 
-                if ( ! InitTweak::isIntrinsicCallExpr( appExpr ) ) {
-                        // create thunks for the inferred parameters
-                        // don't need to do this for intrinsic calls, because they aren't actually passed
-                        for ( InferredParams::iterator inferParam = appExpr->get_inferParams().begin(); inferParam != appExpr->get_inferParams().end(); ++inferParam ) {
-                                inferParam->second.expr = doSpecialization( inferParam->second.formalType, inferParam->second.expr, &appExpr->get_inferParams() );
-                        }
-
-                        handleExplicitParams( appExpr );
-                }
+                // create thunks for the inferred parameters
+                for ( InferredParams::iterator inferParam = appExpr->get_inferParams().begin(); inferParam != appExpr->get_inferParams().end(); ++inferParam ) {
+                        inferParam->second.expr = doSpecialization( inferParam->second.formalType, inferParam->second.expr, &appExpr->get_inferParams() );
+                }
+
+                handleExplicitParams( appExpr );
 
                 return appExpr;

src/InitTweak/FixGlobalInit.cc

@@ -46 +46 @@
                 FunctionDecl * destroyFunction;
         };
+
+        class ConstExprChecker : public Visitor {
+        public:
+                ConstExprChecker() : isConstExpr( true ) {}
+
+                virtual void visit( ApplicationExpr *applicationExpr ) { isConstExpr = false; }
+                virtual void visit( UntypedExpr *untypedExpr ) { isConstExpr = false; }
+                virtual void visit( NameExpr *nameExpr ) { isConstExpr = false; }
+                virtual void visit( CastExpr *castExpr ) { isConstExpr = false; }
+                virtual void visit( LabelAddressExpr *labAddressExpr ) { isConstExpr = false; }
+                virtual void visit( UntypedMemberExpr *memberExpr ) { isConstExpr = false; }
+                virtual void visit( MemberExpr *memberExpr ) { isConstExpr = false; }
+                virtual void visit( VariableExpr *variableExpr ) { isConstExpr = false; }
+                virtual void visit( ConstantExpr *constantExpr ) { /* bottom out */ }
+                // these might be okay?
+                // virtual void visit( SizeofExpr *sizeofExpr );
+                // virtual void visit( AlignofExpr *alignofExpr );
+                // virtual void visit( UntypedOffsetofExpr *offsetofExpr );
+                // virtual void visit( OffsetofExpr *offsetofExpr );
+                // virtual void visit( OffsetPackExpr *offsetPackExpr );
+                // virtual void visit( AttrExpr *attrExpr );
+                // virtual void visit( CommaExpr *commaExpr );
+                // virtual void visit( LogicalExpr *logicalExpr );
+                // virtual void visit( ConditionalExpr *conditionalExpr );
+                virtual void visit( TupleExpr *tupleExpr ) { isConstExpr = false; }
+                virtual void visit( SolvedTupleExpr *tupleExpr ) { isConstExpr = false; }
+                virtual void visit( TypeExpr *typeExpr ) { isConstExpr = false; }
+                virtual void visit( AsmExpr *asmExpr ) { isConstExpr = false; }
+                virtual void visit( UntypedValofExpr *valofExpr ) { isConstExpr = false; }
+                virtual void visit( CompoundLiteralExpr *compLitExpr ) { isConstExpr = false; }
+
+                bool isConstExpr;
+        };
+
+        bool isConstExpr( Initializer * init ) {
+                if ( init ) {
+                        ConstExprChecker checker;
+                        init->accept( checker );
+                        return checker.isConstExpr;
+                } // if
+                // for all intents and purposes, no initializer means const expr
+                return true;
+        }
 
         void fixGlobalInit( std::list< Declaration * > & translationUnit, const std::string & name, bool inLibrary ) {
@@ -97 +140 @@
                 std::list< Statement * > & destroyStatements = destroyFunction->get_statements()->get_kids();
 
+                if ( ! tryConstruct( objDecl ) ) return; // don't construct @= or designated objects
+                if ( objDecl->get_storageClass() == DeclarationNode::Extern ) return;
                 // C allows you to initialize objects with constant expressions
                 // xxx - this is an optimization. Need to first resolve constructors before we decide
@@ -102 +147 @@
                 // if ( isConstExpr( objDecl->get_init() ) ) return;
 
-                if ( ConstructorInit * ctorInit = dynamic_cast< ConstructorInit * >( objDecl->get_init() ) ) {
-                        // a decision should have been made by the resolver, so ctor and init are not both non-NULL
-                        assert( ! ctorInit->get_ctor() || ! ctorInit->get_init() );
+                if ( dynamic_cast< ArrayType * > ( objDecl->get_type() ) ) {
+                        // xxx - initialize each element of the array
+                } else {
+                        // steal initializer from object and attach it to a new temporary
+                        ObjectDecl *newObj = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, objDecl->get_type()->clone(), objDecl->get_init() );
+                        objDecl->set_init( NULL );
+                        initStatements.push_back( new DeclStmt( noLabels, newObj ) );
 
-                        Statement * dtor = ctorInit->get_dtor();
-                        if ( dtor && ! isIntrinsicSingleArgCallStmt( dtor ) ) {
-                                // don't need to call intrinsic dtor, because it does nothing, but
-                                // non-intrinsic dtors must be called
-                                destroyStatements.push_front( dtor );
-                                ctorInit->set_dtor( NULL );
-                        } // if
-                        if ( Statement * ctor = ctorInit->get_ctor() ) {
-                                initStatements.push_back( ctor );
-                                objDecl->set_init( NULL );
-                                ctorInit->set_ctor( NULL );
-                        } else if ( Initializer * init = ctorInit->get_init() ) {
-                                objDecl->set_init( init );
-                                ctorInit->set_init( NULL );
-                        } else {
-                                // no constructor and no initializer, which is okay
-                                objDecl->set_init( NULL );
-                        } // if
-                        delete ctorInit;
+                        // copy construct objDecl using temporary
+                        UntypedExpr * init = new UntypedExpr( new NameExpr( "?{}" ) );
+                        init->get_args().push_back( new AddressExpr( new VariableExpr( objDecl ) ) );
+                        init->get_args().push_back( new VariableExpr( newObj ) );
+                        initStatements.push_back( new ImplicitCtorDtorStmt( new ExprStmt( noLabels, init ) ) );
+
+                        // add destructor calls to global destroy function
+                        UntypedExpr * destroy = new UntypedExpr( new NameExpr( "^?{}" ) );
+                        destroy->get_args().push_back( new AddressExpr( new VariableExpr( objDecl ) ) );
+                        destroyStatements.push_front( new ImplicitCtorDtorStmt( new ExprStmt( noLabels, destroy ) ) );
                 } // if
         }

src/InitTweak/FixInit.cc

@@ -18 +18 @@
 #include <iterator>
 #include <algorithm>
+#include "FixInit.h"
 #include "InitTweak.h"
-#include "FixInit.h"
-#include "FixGlobalInit.h"
 #include "ResolvExpr/Resolver.h"
 #include "ResolvExpr/typeops.h"
@@ -26 +25 @@
 #include "SynTree/Type.h"
 #include "SynTree/Expression.h"
-#include "SynTree/Attribute.h"
 #include "SynTree/Statement.h"
 #include "SynTree/Initializer.h"
@@ -85 +83 @@
                 };
 
-                // debug
                 struct printSet {
                         typedef ObjDeclCollector::ObjectSet ObjectSet;
@@ -162 +159 @@
 
                         virtual DeclarationWithType * mutate( ObjectDecl *objDecl );
-
-                        std::list< Declaration * > staticDtorDecls;
                 };
 
@@ -176 +171 @@
         } // namespace
 
-        void fix( std::list< Declaration * > & translationUnit, const std::string & filename, bool inLibrary ) {
-                // fixes ConstructorInit for global variables. should happen before fixInitializers.
-                InitTweak::fixGlobalInit( translationUnit, filename, inLibrary );
-
+        void fix( std::list< Declaration * > & translationUnit ) {
                 InsertImplicitCalls::insert( translationUnit );
                 ResolveCopyCtors::resolveImplicitCalls( translationUnit );
@@ -202 +194 @@
                 void FixInit::fixInitializers( std::list< Declaration * > & translationUnit ) {
                         FixInit fixer;
-
-                        // can't use mutateAll, because need to insert declarations at top-level
-                        // can't use DeclMutator, because sometimes need to insert IfStmt, etc.
-                        SemanticError errors;
-                        for ( std::list< Declaration * >::iterator i = translationUnit.begin(); i != translationUnit.end(); ++i ) {
-                                try {
-                                        *i = maybeMutate( *i, fixer );
-                                        translationUnit.splice( i, fixer.staticDtorDecls );
-                                } catch( SemanticError &e ) {
-                                        errors.append( e );
-                                } // try
-                        } // for
-                        if ( ! errors.isEmpty() ) {
-                                throw errors;
-                        } // if
+                        mutateAll( translationUnit, fixer );
                 }
 
@@ -444 +422 @@
                                 if ( Statement * ctor = ctorInit->get_ctor() ) {
                                         if ( objDecl->get_storageClass() == DeclarationNode::Static ) {
-                                                // originally wanted to take advantage of gcc nested functions, but
-                                                // we get memory errors with this approach. To remedy this, the static
-                                                // variable is hoisted when the destructor needs to be called.
-                                                //
                                                 // generate:
-                                                // static T __objName_static_varN;
-                                                // void __objName_dtor_atexitN() {
-                                                //   __dtor__...;
+                                                // static bool __objName_uninitialized = true;
+                                                // if (__objName_uninitialized) {
+                                                //   __ctor(__objName);
+                                                //   void dtor_atexit() {
+                                                //     __dtor(__objName);
+                                                //   }
+                                                //   on_exit(dtorOnExit, &__objName);
+                                                //   __objName_uninitialized = false;
                                                 // }
-                                                // int f(...) {
-                                                //   ...
-                                                //   static bool __objName_uninitialized = true;
-                                                //   if (__objName_uninitialized) {
-                                                //     __ctor(__objName);
-                                                //     __objName_uninitialized = false;
-                                                //     atexit(__objName_dtor_atexitN);
-                                                //   }
-                                                //   ...
-                                                // }
-
-                                                static UniqueName dtorCallerNamer( "_dtor_atexit" );
-
-                                                // static bool __objName_uninitialized = true
+
+                                                // generate first line
                                                 BasicType * boolType = new BasicType( Type::Qualifiers(), BasicType::Bool );
                                                 SingleInit * boolInitExpr = new SingleInit( new ConstantExpr( Constant( boolType->clone(), "1" ) ), noDesignators );
@@ -472 +439 @@
                                                 isUninitializedVar->fixUniqueId();
 
+                                                // void dtor_atexit(...) {...}
+                                                FunctionDecl * dtorCaller = new FunctionDecl( objDecl->get_mangleName() + "_dtor_atexit", DeclarationNode::NoStorageClass, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ), false, false );
+                                                dtorCaller->fixUniqueId();
+                                                dtorCaller->get_statements()->get_kids().push_back( ctorInit->get_dtor()->clone() );
+
+                                                // on_exit(dtor_atexit);
+                                                UntypedExpr * callAtexit = new UntypedExpr( new NameExpr( "atexit" ) );
+                                                callAtexit->get_args().push_back( new VariableExpr( dtorCaller ) );
+
                                                 // __objName_uninitialized = false;
                                                 UntypedExpr * setTrue = new UntypedExpr( new NameExpr( "?=?" ) );
@@ -481 +457 @@
                                                 std::list< Statement * > & body = initStmts->get_kids();
                                                 body.push_back( ctor );
+                                                body.push_back( new DeclStmt( noLabels, dtorCaller ) );
+                                                body.push_back( new ExprStmt( noLabels, callAtexit ) );
                                                 body.push_back( new ExprStmt( noLabels, setTrue ) );
 
@@ -487 +465 @@
                                                 stmtsToAddAfter.push_back( new DeclStmt( noLabels, isUninitializedVar ) );
                                                 stmtsToAddAfter.push_back( ifStmt );
-
-                                                if ( ctorInit->get_dtor() ) {
-                                                        // if the object has a non-trivial destructor, have to
-                                                        // hoist it and the object into the global space and
-                                                        // call the destructor function with atexit.
-
-                                                        Statement * dtorStmt = ctorInit->get_dtor()->clone();
-
-                                                        // void __objName_dtor_atexitN(...) {...}
-                                                        FunctionDecl * dtorCaller = new FunctionDecl( objDecl->get_mangleName() + dtorCallerNamer.newName(), DeclarationNode::Static, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ), false, false );
-                                                        dtorCaller->fixUniqueId();
-                                                        dtorCaller->get_statements()->get_kids().push_back( dtorStmt );
-
-                                                        // atexit(dtor_atexit);
-                                                        UntypedExpr * callAtexit = new UntypedExpr( new NameExpr( "atexit" ) );
-                                                        callAtexit->get_args().push_back( new VariableExpr( dtorCaller ) );
-
-                                                        body.push_back( new ExprStmt( noLabels, callAtexit ) );
-
-                                                        // hoist variable and dtor caller decls to list of decls that will be added into global scope
-                                                        staticDtorDecls.push_back( objDecl );
-                                                        staticDtorDecls.push_back( dtorCaller );
-
-                                                        // need to rename object uniquely since it now appears
-                                                        // at global scope and there could be multiple function-scoped
-                                                        // static variables with the same name in different functions.
-                                                        static UniqueName staticNamer( "_static_var" );
-                                                        objDecl->set_mangleName( objDecl->get_mangleName() + staticNamer.newName() );
-
-                                                        objDecl->set_init( NULL );
-                                                        ctorInit->set_ctor( NULL );
-                                                        delete ctorInit;
-
-                                                        // xxx - temporary hack: need to return a declaration, but want to hoist the current object out of this scope
-                                                        // create a new object which is never used
-                                                        static UniqueName dummyNamer( "_dummy" );
-                                                        ObjectDecl * dummy = new ObjectDecl( dummyNamer.newName(), DeclarationNode::Static, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ), 0, std::list< Attribute * >{ new Attribute("unused") } );
-                                                        return dummy;
-                                                }
                                         } else {
                                                 stmtsToAddAfter.push_back( ctor );
@@ -585 +524 @@
                                         assert( ! ctorInit->get_ctor() || ! ctorInit->get_init() );
                                         Statement * dtor = ctorInit->get_dtor();
-                                        if ( dtor && ! isIntrinsicSingleArgCallStmt( dtor ) ) {
+                                        if ( dtor && ! isInstrinsicSingleArgCallStmt( dtor ) ) {
                                                 // don't need to call intrinsic dtor, because it does nothing, but
                                                 // non-intrinsic dtors must be called

src/InitTweak/FixInit.h

@@ -27 +27 @@
   /// replace constructor initializers with expression statements
   /// and unwrap basic C-style initializers
-        void fix( std::list< Declaration * > & translationUnit, const std::string & name, bool inLibrary );
+        void fix( std::list< Declaration * > & translationUnit );
 } // namespace
 

src/InitTweak/GenInit.cc

@@ -26 +26 @@
 #include "SymTab/Autogen.h"
 #include "GenPoly/PolyMutator.h"
-#include "GenPoly/DeclMutator.h"
 
 namespace InitTweak {
@@ -56 +55 @@
           public:
                 /// create constructor and destructor statements for object declarations.
-                /// the actual call statements will be added in after the resolver has run
-                /// so that the initializer expression is only removed if a constructor is found
-                /// and the same destructor call is inserted in all of the appropriate locations.
+                /// Destructors are inserted directly into the code, whereas constructors
+                /// will be added in after the resolver has run so that the initializer expression
+                /// is only removed if a constructor is found
                 static void generateCtorDtor( std::list< Declaration * > &translationUnit );
+
+                CtorDtor() : inFunction( false ) {}
 
                 virtual DeclarationWithType * mutate( ObjectDecl * );
                 virtual DeclarationWithType * mutate( FunctionDecl *functionDecl );
-                // should not traverse into any of these declarations to find objects
-                // that need to be constructed or destructed
-                virtual Declaration* mutate( StructDecl *aggregateDecl ) { return aggregateDecl; }
-                virtual Declaration* mutate( UnionDecl *aggregateDecl ) { return aggregateDecl; }
-                virtual Declaration* mutate( EnumDecl *aggregateDecl ) { return aggregateDecl; }
-                virtual Declaration* mutate( TraitDecl *aggregateDecl ) { return aggregateDecl; }
-                virtual TypeDecl* mutate( TypeDecl *typeDecl ) { return typeDecl; }
-                virtual Declaration* mutate( TypedefDecl *typeDecl ) { return typeDecl; }
-
-                virtual Type * mutate( FunctionType *funcType ) { return funcType; }
+                virtual Declaration* mutate( StructDecl *aggregateDecl );
+                virtual Declaration* mutate( UnionDecl *aggregateDecl );
+                virtual Declaration* mutate( EnumDecl *aggregateDecl );
+                virtual Declaration* mutate( TraitDecl *aggregateDecl );
+                virtual TypeDecl* mutate( TypeDecl *typeDecl );
+                virtual Declaration* mutate( TypedefDecl *typeDecl );
+
+                virtual Type * mutate( FunctionType *funcType );
 
           protected:
-        };
-
-        class HoistArrayDimension : public GenPoly::DeclMutator {
-          public:
-                typedef GenPoly::DeclMutator Parent;
-
-                /// hoist dimension from array types in object declaration so that it uses a single
-                /// const variable of type size_t, so that side effecting array dimensions are only
-                /// computed once.
-                static void hoistArrayDimension( std::list< Declaration * > & translationUnit );
-
-          private:
-                virtual DeclarationWithType * mutate( ObjectDecl * objectDecl );
-                virtual DeclarationWithType * mutate( FunctionDecl *functionDecl );
-                // should not traverse into any of these declarations to find objects
-                // that need to be constructed or destructed
-                virtual Declaration* mutate( StructDecl *aggregateDecl ) { return aggregateDecl; }
-                virtual Declaration* mutate( UnionDecl *aggregateDecl ) { return aggregateDecl; }
-                virtual Declaration* mutate( EnumDecl *aggregateDecl ) { return aggregateDecl; }
-                virtual Declaration* mutate( TraitDecl *aggregateDecl ) { return aggregateDecl; }
-                virtual TypeDecl* mutate( TypeDecl *typeDecl ) { return typeDecl; }
-                virtual Declaration* mutate( TypedefDecl *typeDecl ) { return typeDecl; }
-
-                virtual Type* mutate( FunctionType *funcType ) { return funcType; }
-
-                void hoist( Type * type );
-
-                DeclarationNode::StorageClass storageclass = DeclarationNode::NoStorageClass;
-                bool inFunction = false;
+                bool inFunction;
         };
 
         void genInit( std::list< Declaration * > & translationUnit ) {
                 ReturnFixer::makeReturnTemp( translationUnit );
-                HoistArrayDimension::hoistArrayDimension( translationUnit );
                 CtorDtor::generateCtorDtor( translationUnit );
         }
@@ -154 +124 @@
         }
 
-        // precompute array dimension expression, because constructor generation may duplicate it,
-        // which would be incorrect if it is a side-effecting computation.
-        void HoistArrayDimension::hoistArrayDimension( std::list< Declaration * > & translationUnit ) {
-                HoistArrayDimension hoister;
-                hoister.mutateDeclarationList( translationUnit );
-        }
-
-        DeclarationWithType * HoistArrayDimension::mutate( ObjectDecl * objectDecl ) {
-                storageclass = objectDecl->get_storageClass();
-                DeclarationWithType * temp = Parent::mutate( objectDecl );
-                hoist( objectDecl->get_type() );
-                storageclass = DeclarationNode::NoStorageClass;
-                return temp;
-        }
-
-        void HoistArrayDimension::hoist( Type * type ) {
-                // if in function, generate const size_t var
-                static UniqueName dimensionName( "_array_dim" );
-
-                // C doesn't allow variable sized arrays at global scope or for static variables,
-                // so don't hoist dimension.
-                if ( ! inFunction ) return;
-                if ( storageclass == DeclarationNode::Static ) return;
-
-                if ( ArrayType * arrayType = dynamic_cast< ArrayType * >( type ) ) {
-                        if ( ! arrayType->get_dimension() ) return; // xxx - recursive call to hoist?
-
-                        // don't need to hoist dimension if it's a constexpr - only need to if there's potential
-                        // for side effects.
-                        if ( isConstExpr( arrayType->get_dimension() ) ) return;
-
-                        ObjectDecl * arrayDimension = new ObjectDecl( dimensionName.newName(), storageclass, LinkageSpec::C, 0, SymTab::SizeType->clone(), new SingleInit( arrayType->get_dimension() ) );
-                        arrayDimension->get_type()->set_isConst( true );
-
-                        arrayType->set_dimension( new VariableExpr( arrayDimension ) );
-                        addDeclaration( arrayDimension );
-
-                        hoist( arrayType->get_base() );
-                        return;
-                }
-        }
-
-        DeclarationWithType * HoistArrayDimension::mutate( FunctionDecl *functionDecl ) {
-                bool oldInFunc = inFunction;
-                inFunction = true;
-                DeclarationWithType * decl = Parent::mutate( functionDecl );
-                inFunction = oldInFunc;
-                return decl;
-        }
 
         void CtorDtor::generateCtorDtor( std::list< Declaration * > & translationUnit ) {
@@ -209 +130 @@
         }
 
+        namespace {
+                Expression * makeCtorDtorExpr( std::string name, ObjectDecl * objDecl, std::list< Expression * > args ) {
+                        UntypedExpr * expr = new UntypedExpr( new NameExpr( name ) );
+                        expr->get_args().push_back( new AddressExpr( new VariableExpr( objDecl ) ) );
+                        expr->get_args().splice( expr->get_args().end(), args );
+                        return expr;
+                }
+        }
+
         DeclarationWithType * CtorDtor::mutate( ObjectDecl * objDecl ) {
-                // hands off if designated, if @=, or if extern
+                // hands off if designated or if @=
                 if ( tryConstruct( objDecl ) ) {
-                        // call into genImplicitCall from Autogen.h to generate calls to ctor/dtor
-                        // for each constructable object
-                        std::list< Statement * > ctor;
-                        std::list< Statement * > dtor;
-
-                        InitExpander srcParam( objDecl->get_init() );
-                        InitExpander nullParam( (Initializer *)NULL );
-                        SymTab::genImplicitCall( srcParam, new VariableExpr( objDecl ), "?{}", back_inserter( ctor ), objDecl );
-                        SymTab::genImplicitCall( nullParam, new VariableExpr( objDecl ), "^?{}", front_inserter( dtor ), objDecl, false );
-
-                        // Currently genImplicitCall produces a single Statement - a CompoundStmt
-                        // which  wraps everything that needs to happen. As such, it's technically
-                        // possible to use a Statement ** in the above calls, but this is inherently
-                        // unsafe, so instead we take the slightly less efficient route, but will be
-                        // immediately informed if somehow the above assumption is broken. In this case,
-                        // we could always wrap the list of statements at this point with a CompoundStmt,
-                        // but it seems reasonable at the moment for this to be done by genImplicitCall
-                        // itself. It is possible that genImplicitCall produces no statements (e.g. if
-                        // an array type does not have a dimension). In this case, it's fine to ignore
-                        // the object for the purposes of construction.
-                        assert( ctor.size() == dtor.size() && ctor.size() <= 1 );
-                        if ( ctor.size() == 1 ) {
-                                // need to remember init expression, in case no ctors exist
-                                // if ctor does exist, want to use ctor expression instead of init
-                                // push this decision to the resolver
-                                assert( dynamic_cast< ImplicitCtorDtorStmt * > ( ctor.front() ) && dynamic_cast< ImplicitCtorDtorStmt * > ( dtor.front() ) );
-                                objDecl->set_init( new ConstructorInit( ctor.front(), dtor.front(), objDecl->get_init() ) );
+                        if ( inFunction ) {
+                                if ( ArrayType * at = dynamic_cast< ArrayType * >( objDecl->get_type() ) ) {
+                                        // call into makeArrayFunction from validate.cc to generate calls to ctor/dtor for each element of array
+                                        // TODO: walk initializer and generate appropriate copy ctor if element has initializer
+                                        std::list< Expression * > args = makeInitList( objDecl->get_init() );
+                                        if ( args.empty() ) {
+                                                std::list< Statement * > ctor;
+                                                std::list< Statement * > dtor;
+
+                                                SymTab::makeArrayFunction( NULL, new VariableExpr( objDecl ), at, "?{}", back_inserter( ctor ) );
+                                                SymTab::makeArrayFunction( NULL, new VariableExpr( objDecl ), at, "^?{}", front_inserter( dtor ), false );
+
+                                                // Currently makeArrayFunction produces a single Statement - a CompoundStmt
+                                                // which  wraps everything that needs to happen. As such, it's technically
+                                                // possible to use a Statement ** in the above calls, but this is inherently
+                                                // unsafe, so instead we take the slightly less efficient route, but will be
+                                                // immediately informed if somehow the above assumption is broken. In this case,
+                                                // we could always wrap the list of statements at this point with a CompoundStmt,
+                                                // but it seems reasonable at the moment for this to be done by makeArrayFunction
+                                                // itself
+                                                assert( ctor.size() == 1 && dynamic_cast< ImplicitCtorDtorStmt * >( ctor.front() ) );
+                                                assert( dtor.size() == 1 && dynamic_cast< ImplicitCtorDtorStmt * >( dtor.front() ) );
+                                                objDecl->set_init( new ConstructorInit( ctor.front(), dtor.front(), objDecl->get_init() ) );
+                                        } else {
+                                                // array came with an initializer list: initialize each element
+                                                // may have more initializers than elements in the array - need to check at each index that
+                                                // we haven't exceeded size. This requires precomputing the size because it might be a side-effecting
+                                                // computation.
+                                                // may have fewer initializers than eleemnts in the array - need to default construct
+                                                // remaining elements.
+                                                // might be able to merge this with the case above.
+                                        }
+                                } else {
+                                        // it's sufficient to attempt to call the ctor/dtor for the given object and its initializer
+                                        Expression * ctor = makeCtorDtorExpr( "?{}", objDecl, makeInitList( objDecl->get_init() ) );
+                                        Expression * dtor = makeCtorDtorExpr( "^?{}", objDecl, std::list< Expression * >() );
+
+                                        // need to remember init expression, in case no ctors exist
+                                        // if ctor does exist, want to use ctor expression instead of init
+                                        // push this decision to the resolver
+                                        ExprStmt * ctorStmt = new ExprStmt( noLabels, ctor );
+                                        ExprStmt * dtorStmt = new ExprStmt( noLabels, dtor );
+                                        objDecl->set_init( new ConstructorInit( new ImplicitCtorDtorStmt( ctorStmt ), new ImplicitCtorDtorStmt( dtorStmt ), objDecl->get_init() ) );
+                                }
                         }
                 }
@@ -246 +193 @@
         DeclarationWithType * CtorDtor::mutate( FunctionDecl *functionDecl ) {
                 // parameters should not be constructed and destructed, so don't mutate FunctionType
+                bool oldInFunc = inFunction;
                 mutateAll( functionDecl->get_oldDecls(), *this );
+                inFunction = true;
                 functionDecl->set_statements( maybeMutate( functionDecl->get_statements(), *this ) );
+                inFunction = oldInFunc;
                 return functionDecl;
         }
+
+        // should not traverse into any of these declarations to find objects
+        // that need to be constructed or destructed
+        Declaration* CtorDtor::mutate( StructDecl *aggregateDecl ) { return aggregateDecl; }
+        Declaration* CtorDtor::mutate( UnionDecl *aggregateDecl ) { return aggregateDecl; }
+        Declaration* CtorDtor::mutate( EnumDecl *aggregateDecl ) { return aggregateDecl; }
+        Declaration* CtorDtor::mutate( TraitDecl *aggregateDecl ) { return aggregateDecl; }
+        TypeDecl* CtorDtor::mutate( TypeDecl *typeDecl ) { return typeDecl; }
+        Declaration* CtorDtor::mutate( TypedefDecl *typeDecl ) { return typeDecl; }
+        Type* CtorDtor::mutate( FunctionType *funcType ) { return funcType; }
+
 } // namespace InitTweak
 

src/InitTweak/InitTweak.cc

@@ -1 @@
-#include <algorithm>
 #include "InitTweak.h"
 #include "SynTree/Visitor.h"
@@ -5 +4 @@
 #include "SynTree/Initializer.h"
 #include "SynTree/Expression.h"
-#include "SynTree/Attribute.h"
 #include "GenPoly/GenPoly.h"
 
@@ -22 +20 @@
                 };
 
-                class InitFlattener : public Visitor {
+                class InitExpander : public Visitor {
                         public:
+                        InitExpander() {}
                         virtual void visit( SingleInit * singleInit );
                         virtual void visit( ListInit * listInit );
@@ -29 +28 @@
                 };
 
-                void InitFlattener::visit( SingleInit * singleInit ) {
+                void InitExpander::visit( SingleInit * singleInit ) {
                         argList.push_back( singleInit->get_value()->clone() );
                 }
 
-                void InitFlattener::visit( ListInit * listInit ) {
-                        // flatten nested list inits
-                        std::list<Initializer*>::iterator it = listInit->begin();
-                        for ( ; it != listInit->end(); ++it ) {
+                void InitExpander::visit( ListInit * listInit ) {
+                        // xxx - for now, assume no nested list inits
+                        std::list<Initializer*>::iterator it = listInit->begin_initializers();
+                        for ( ; it != listInit->end_initializers(); ++it ) {
                                 (*it)->accept( *this );
                         }
@@ -43 +42 @@
 
         std::list< Expression * > makeInitList( Initializer * init ) {
-                InitFlattener flattener;
-                maybeAccept( init, flattener );
-                return flattener.argList;
+                InitExpander expander;
+                maybeAccept( init, expander );
+                return expander.argList;
         }
 
@@ -54 +53 @@
         }
 
-        class InitExpander::ExpanderImpl {
-        public:
-                virtual std::list< Expression * > next( std::list< Expression * > & indices ) = 0;
-                virtual Statement * buildListInit( UntypedExpr * callExpr, std::list< Expression * > & indices ) = 0;
-        };
-
-        class InitImpl : public InitExpander::ExpanderImpl {
-        public:
-                InitImpl( Initializer * init ) : init( init ) {}
-
-                virtual std::list< Expression * > next( std::list< Expression * > & indices ) {
-                        // this is wrong, but just a placeholder for now
-                        // if ( ! flattened ) flatten( indices );
-                        // return ! inits.empty() ? makeInitList( inits.front() ) : std::list< Expression * >();
-                        return makeInitList( init );
-                }
-
-                virtual Statement * buildListInit( UntypedExpr * callExpr, std::list< Expression * > & indices );
-        private:
-                Initializer * init;
-        };
-
-        class ExprImpl : public InitExpander::ExpanderImpl {
-        public:
-                ExprImpl( Expression * expr ) : arg( expr ) {}
-
-                virtual std::list< Expression * > next( std::list< Expression * > & indices ) {
-                        std::list< Expression * > ret;
-                        Expression * expr = maybeClone( arg );
-                        if ( expr ) {
-                                for ( std::list< Expression * >::reverse_iterator it = indices.rbegin(); it != indices.rend(); ++it ) {
-                                        // go through indices and layer on subscript exprs ?[?]
-                                        ++it;
-                                        UntypedExpr * subscriptExpr = new UntypedExpr( new NameExpr( "?[?]") );
-                                        subscriptExpr->get_args().push_back( expr );
-                                        subscriptExpr->get_args().push_back( (*it)->clone() );
-                                        expr = subscriptExpr;
-                                }
-                                ret.push_back( expr );
-                        }
-                        return ret;
-                }
-
-                virtual Statement * buildListInit( UntypedExpr * callExpr, std::list< Expression * > & indices );
-        private:
-                Expression * arg;
-        };
-
-        InitExpander::InitExpander( Initializer * init ) : expander( new InitImpl( init ) ) {}
-
-        InitExpander::InitExpander( Expression * expr ) : expander( new ExprImpl( expr ) ) {}
-
-        std::list< Expression * > InitExpander::operator*() {
-                return cur;
-        }
-
-        InitExpander & InitExpander::operator++() {
-                cur = expander->next( indices );
-                return *this;
-        }
-
-        // use array indices list to build switch statement
-        void InitExpander::addArrayIndex( Expression * index, Expression * dimension ) {
-                indices.push_back( index );
-                indices.push_back( dimension );
-        }
-
-        void InitExpander::clearArrayIndices() {
-                indices.clear();
-        }
-
-        namespace {
-                /// given index i, dimension d, initializer init, and callExpr f, generates
-                ///   if (i < d) f(..., init)
-                ///   ++i;
-                /// so that only elements within the range of the array are constructed
-                template< typename OutIterator >
-                void buildCallExpr( UntypedExpr * callExpr, Expression * index, Expression * dimension, Initializer * init, OutIterator out ) {
-                        UntypedExpr * cond = new UntypedExpr( new NameExpr( "?<?") );
-                        cond->get_args().push_back( index->clone() );
-                        cond->get_args().push_back( dimension->clone() );
-
-                        std::list< Expression * > args = makeInitList( init );
-                        callExpr->get_args().splice( callExpr->get_args().end(), args );
-
-                        *out++ = new IfStmt( noLabels, cond, new ExprStmt( noLabels, callExpr ), NULL );
-
-                        UntypedExpr * increment = new UntypedExpr( new NameExpr( "++?" ) );
-                        increment->get_args().push_back( new AddressExpr( index->clone() ) );
-                        *out++ = new ExprStmt( noLabels, increment );
-                }
-
-                template< typename OutIterator >
-                void build( UntypedExpr * callExpr, InitExpander::IndexList::iterator idx, InitExpander::IndexList::iterator idxEnd, Initializer * init, OutIterator out ) {
-                        if ( idx == idxEnd ) return;
-                        Expression * index = *idx++;
-                        assert( idx != idxEnd );
-                        Expression * dimension = *idx++;
-
-                        // xxx - may want to eventually issue a warning here if we can detect
-                        // that the number of elements exceeds to dimension of the array
-                        if ( idx == idxEnd ) {
-                                if ( ListInit * listInit = dynamic_cast< ListInit * >( init ) ) {
-                                        for ( Initializer * init : *listInit ) {
-                                                buildCallExpr( callExpr->clone(), index, dimension, init, out );
-                                        }
-                                } else {
-                                        buildCallExpr( callExpr->clone(), index, dimension, init, out );
-                                }
-                        } else {
-                                std::list< Statement * > branches;
-
-                                unsigned long cond = 0;
-                                ListInit * listInit = dynamic_cast< ListInit * >( init );
-                                if ( ! listInit ) {
-                                        // xxx - this shouldn't be an error, but need a way to
-                                        // terminate without creating output, so should catch this error
-                                        throw SemanticError( "unbalanced list initializers" );
-                                }
-
-                                static UniqueName targetLabel( "L__autogen__" );
-                                Label switchLabel( targetLabel.newName(), 0, std::list< Attribute * >{ new Attribute("unused") } );
-                                for ( Initializer * init : *listInit ) {
-                                        Expression * condition;
-                                        // check for designations
-                                        // if ( init-> ) {
-                                                condition = new ConstantExpr( Constant::from_ulong( cond ) );
-                                                ++cond;
-                                        // } else {
-                                        //      condition = // ... take designation
-                                        //      cond = // ... take designation+1
-                                        // }
-                                        std::list< Statement * > stmts;
-                                        build( callExpr, idx, idxEnd, init, back_inserter( stmts ) );
-                                        stmts.push_back( new BranchStmt( noLabels, switchLabel, BranchStmt::Break ) );
-                                        CaseStmt * caseStmt = new CaseStmt( noLabels, condition, stmts );
-                                        branches.push_back( caseStmt );
-                                }
-                                *out++ = new SwitchStmt( noLabels, index->clone(), branches );
-                                *out++ = new NullStmt( std::list<Label>{ switchLabel } );
-                        }
-                }
-        }
-
-        // if array came with an initializer list: initialize each element
-        // may have more initializers than elements in the array - need to check at each index that
-        // we haven't exceeded size.
-        // may have fewer initializers than elements in the array - need to default construct
-        // remaining elements.
-        // To accomplish this, generate switch statement, consuming all of expander's elements
-        Statement * InitImpl::buildListInit( UntypedExpr * dst, std::list< Expression * > & indices ) {
-                if ( ! init ) return NULL;
-                CompoundStmt * block = new CompoundStmt( noLabels );
-                build( dst, indices.begin(), indices.end(), init, back_inserter( block->get_kids() ) );
-                if ( block->get_kids().empty() ) {
-                        delete block;
-                        return NULL;
-                } else {
-                        init = NULL; // init was consumed in creating the list init
-                        return block;
-                }
-        }
-
-        Statement * ExprImpl::buildListInit( UntypedExpr * dst, std::list< Expression * > & indices ) {
-                return NULL;
-        }
-
-        Statement * InitExpander::buildListInit( UntypedExpr * dst ) {
-                return expander->buildListInit( dst, indices );
-        }
-
         bool tryConstruct( ObjectDecl * objDecl ) {
                 return ! LinkageSpec::isBuiltin( objDecl->get_linkage() ) &&
                         (objDecl->get_init() == NULL ||
                                 ( objDecl->get_init() != NULL && objDecl->get_init()->get_maybeConstructed() )) &&
-                        ! isDesignated( objDecl->get_init() )
-                        && objDecl->get_storageClass() != DeclarationNode::Extern;
-        }
-
-        class CallFinder : public Visitor {
-        public:
-                typedef Visitor Parent;
-                CallFinder( const std::list< std::string > & names ) : names( names ) {}
-
-                virtual void visit( ApplicationExpr * appExpr ) {
-                        handleCallExpr( appExpr );
-                }
-
-                virtual void visit( UntypedExpr * untypedExpr ) {
-                        handleCallExpr( untypedExpr );
-                }
-
-                std::list< Expression * > * matches;
-        private:
-                const std::list< std::string > names;
-
-                template< typename CallExpr >
-                void handleCallExpr( CallExpr * expr ) {
-                        Parent::visit( expr );
-                        std::string fname = getFunctionName( expr );
-                        if ( std::find( names.begin(), names.end(), fname ) != names.end() ) {
-                                matches->push_back( expr );
-                        }
-                }
-        };
-
-        void collectCtorDtorCalls( Statement * stmt, std::list< Expression * > & matches ) {
-                static CallFinder finder( std::list< std::string >{ "?{}", "^?{}" } );
-                finder.matches = &matches;
-                maybeAccept( stmt, finder );
+                        ! isDesignated( objDecl->get_init() );
         }
 
         Expression * getCtorDtorCall( Statement * stmt ) {
-                std::list< Expression * > matches;
-                collectCtorDtorCalls( stmt, matches );
-                assert( matches.size() <= 1 );
-                return matches.size() == 1 ? matches.front() : NULL;
-        }
-
-        namespace {
-                VariableExpr * getCalledFunction( ApplicationExpr * appExpr ) {
-                        assert( appExpr );
-                        // xxx - it's possible this can be other things, e.g. MemberExpr, so this is insufficient
-                        return dynamic_cast< VariableExpr * >( appExpr->get_function() );
+                if ( stmt == NULL ) return NULL;
+                if ( ExprStmt * exprStmt = dynamic_cast< ExprStmt * >( stmt ) ) {
+                        return exprStmt->get_expr();
+                } else if ( CompoundStmt * compoundStmt = dynamic_cast< CompoundStmt * >( stmt ) ) {
+                        // could also be a compound statement with a loop, in the case of an array
+                        if( compoundStmt->get_kids().size() == 2 ) {
+                                // loop variable and loop
+                                ForStmt * forStmt = dynamic_cast< ForStmt * >( compoundStmt->get_kids().back() );
+                                assert( forStmt && forStmt->get_body() );
+                                return getCtorDtorCall( forStmt->get_body() );
+                        } else if ( compoundStmt->get_kids().size() == 1 ) {
+                                // should be the call statement, but in any case there's only one option
+                                return getCtorDtorCall( compoundStmt->get_kids().front() );
+                        } else {
+                                assert( false && "too many statements in compoundStmt for getCtorDtorCall" );
+                        }
+                } if ( ImplicitCtorDtorStmt * impCtorDtorStmt = dynamic_cast< ImplicitCtorDtorStmt * > ( stmt ) ) {
+                        return getCtorDtorCall( impCtorDtorStmt->get_callStmt() );
+                } else {
+                        // should never get here
+                        assert( false && "encountered unknown call statement" );
                 }
         }
 
-        ApplicationExpr * isIntrinsicCallExpr( Expression * expr ) {
-                ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( expr );
-                if ( ! appExpr ) return NULL;
-                VariableExpr * function = getCalledFunction( appExpr );
+        bool isInstrinsicSingleArgCallStmt( Statement * stmt ) {
+                Expression * callExpr = getCtorDtorCall( stmt );
+                if ( ! callExpr ) return false;
+                ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( callExpr );
+                assert( appExpr );
+                VariableExpr * function = dynamic_cast< VariableExpr * >( appExpr->get_function() );
                 assert( function );
                 // check for Intrinsic only - don't want to remove all overridable ctor/dtors because autogenerated ctor/dtor
                 // will call all member dtors, and some members may have a user defined dtor.
-                return function->get_var()->get_linkage() == LinkageSpec::Intrinsic ? appExpr : NULL;
-        }
-
-        bool isIntrinsicSingleArgCallStmt( Statement * stmt ) {
-                std::list< Expression * > callExprs;
-                collectCtorDtorCalls( stmt, callExprs );
-                // if ( callExprs.empty() ) return false; // xxx - do I still need this check?
-                return std::all_of( callExprs.begin(), callExprs.end(), []( Expression * callExpr ){
-                        if ( ApplicationExpr * appExpr = isIntrinsicCallExpr( callExpr ) ) {
-                                assert( ! appExpr->get_function()->get_results().empty() );
-                                FunctionType *funcType = GenPoly::getFunctionType( appExpr->get_function()->get_results().front() );
-                                assert( funcType );
-                                return funcType->get_parameters().size() == 1;
-                        }
-                        return false;
-                });
+                FunctionType * funcType = GenPoly::getFunctionType( function->get_var()->get_type() );
+                assert( funcType );
+                return function->get_var()->get_linkage() == LinkageSpec::Intrinsic && funcType->get_parameters().size() == 1;
         }
 
@@ -367 +160 @@
                 else return NULL;
         }
-
-        class ConstExprChecker : public Visitor {
-        public:
-                ConstExprChecker() : isConstExpr( true ) {}
-
-                virtual void visit( ApplicationExpr *applicationExpr ) { isConstExpr = false; }
-                virtual void visit( UntypedExpr *untypedExpr ) { isConstExpr = false; }
-                virtual void visit( NameExpr *nameExpr ) { isConstExpr = false; }
-                virtual void visit( CastExpr *castExpr ) { isConstExpr = false; }
-                virtual void visit( LabelAddressExpr *labAddressExpr ) { isConstExpr = false; }
-                virtual void visit( UntypedMemberExpr *memberExpr ) { isConstExpr = false; }
-                virtual void visit( MemberExpr *memberExpr ) { isConstExpr = false; }
-                virtual void visit( VariableExpr *variableExpr ) { isConstExpr = false; }
-                virtual void visit( ConstantExpr *constantExpr ) { /* bottom out */ }
-                // these might be okay?
-                // virtual void visit( SizeofExpr *sizeofExpr );
-                // virtual void visit( AlignofExpr *alignofExpr );
-                // virtual void visit( UntypedOffsetofExpr *offsetofExpr );
-                // virtual void visit( OffsetofExpr *offsetofExpr );
-                // virtual void visit( OffsetPackExpr *offsetPackExpr );
-                // virtual void visit( AttrExpr *attrExpr );
-                // virtual void visit( CommaExpr *commaExpr );
-                // virtual void visit( LogicalExpr *logicalExpr );
-                // virtual void visit( ConditionalExpr *conditionalExpr );
-                virtual void visit( TupleExpr *tupleExpr ) { isConstExpr = false; }
-                virtual void visit( SolvedTupleExpr *tupleExpr ) { isConstExpr = false; }
-                virtual void visit( TypeExpr *typeExpr ) { isConstExpr = false; }
-                virtual void visit( AsmExpr *asmExpr ) { isConstExpr = false; }
-                virtual void visit( UntypedValofExpr *valofExpr ) { isConstExpr = false; }
-                virtual void visit( CompoundLiteralExpr *compLitExpr ) { isConstExpr = false; }
-
-                bool isConstExpr;
-        };
-
-        bool isConstExpr( Expression * expr ) {
-                if ( expr ) {
-                        ConstExprChecker checker;
-                        expr->accept( checker );
-                        return checker.isConstExpr;
-                }
-                return true;
-        }
-
-        bool isConstExpr( Initializer * init ) {
-                if ( init ) {
-                        ConstExprChecker checker;
-                        init->accept( checker );
-                        return checker.isConstExpr;
-                } // if
-                // for all intents and purposes, no initializer means const expr
-                return true;
-        }
-
 }

src/InitTweak/InitTweak.h

@@ -26 +26 @@
 // helper functions for initialization
 namespace InitTweak {
-        /// transform Initializer into an argument list that can be passed to a call expression
-        std::list< Expression * > makeInitList( Initializer * init );
+  /// transform Initializer into an argument list that can be passed to a call expression
+  std::list< Expression * > makeInitList( Initializer * init );
 
-        /// True if the resolver should try to construct objDecl
-        bool tryConstruct( ObjectDecl * objDecl );
+  /// True if the resolver should try to construct objDecl
+  bool tryConstruct( ObjectDecl * objDecl );
 
-        /// True if the Initializer contains designations
-        bool isDesignated( Initializer * init );
+  /// True if the Initializer contains designations
+  bool isDesignated( Initializer * init );
 
-  /// Non-Null if expr is a call expression whose target function is intrinsic
-  ApplicationExpr * isIntrinsicCallExpr( Expression * expr );
+  /// True if stmt is a call statement where the function called is intrinsic and takes one parameter.
+  /// Intended to be used for default ctor/dtor calls, but might have use elsewhere.
+  /// Currently has assertions that make it less than fully general.
+  bool isInstrinsicSingleArgCallStmt( Statement * expr );
 
-        /// True if stmt is a call statement where the function called is intrinsic and takes one parameter.
-        /// Intended to be used for default ctor/dtor calls, but might have use elsewhere.
-        /// Currently has assertions that make it less than fully general.
-        bool isIntrinsicSingleArgCallStmt( Statement * expr );
+  /// get the Ctor/Dtor call expression from a Statement that looks like a generated ctor/dtor call
+  Expression * getCtorDtorCall( Statement * stmt );
 
-        /// get all Ctor/Dtor call expressions from a Statement
-        void collectCtorDtorCalls( Statement * stmt, std::list< Expression * > & matches );
+  /// returns the name of the function being called
+  std::string getFunctionName( Expression * expr );
 
-        /// get the Ctor/Dtor call expression from a Statement that looks like a generated ctor/dtor call
-        Expression * getCtorDtorCall( Statement * stmt );
+  /// returns the argument to a call expression in position N indexed from 0
+  Expression *& getCallArg( Expression * callExpr, unsigned int pos );
 
-        /// returns the name of the function being called
-        std::string getFunctionName( Expression * expr );
+  /// returns the base type of a PointerType or ArrayType, else returns NULL
+  Type * getPointerBase( Type * );
 
-        /// returns the argument to a call expression in position N indexed from 0
-        Expression *& getCallArg( Expression * callExpr, unsigned int pos );
-
-        /// returns the base type of a PointerType or ArrayType, else returns NULL
-        Type * getPointerBase( Type * );
-
-        /// returns the argument if it is a PointerType or ArrayType, else returns NULL
-        Type * isPointerType( Type * );
-
-        /// returns true if expr is trivially a compile-time constant
-        bool isConstExpr( Expression * expr );
-        bool isConstExpr( Initializer * init );
-
-        class InitExpander {
-        public:
-                // expand by stepping through init to get each list of arguments
-                InitExpander( Initializer * init );
-
-                // always expand to expr
-                InitExpander( Expression * expr );
-
-                // iterator-like interface
-                std::list< Expression * > operator*();
-                InitExpander & operator++();
-
-                // builds statement which has the same semantics as a C-style list initializer
-                // (for array initializers) using callExpr as the base expression to perform initialization
-                Statement * buildListInit( UntypedExpr * callExpr );
-                void addArrayIndex( Expression * index, Expression * dimension );
-                void clearArrayIndices();
-
-                class ExpanderImpl;
-        private:
-                std::shared_ptr< ExpanderImpl > expander;
-                std::list< Expression * > cur;
-
-                // invariant: list of size 2N (elements come in pairs [index, dimension])
-                typedef std::list< Expression * > IndexList;
-                IndexList indices;
-        };
+  /// returns the argument if it is a PointerType or ArrayType, else returns NULL
+  Type * isPointerType( Type * );
 } // namespace
 

src/Makefile.in

@@ -108 +108 @@
         ControlStruct/driver_cfa_cpp-LabelFixer.$(OBJEXT) \
         ControlStruct/driver_cfa_cpp-MLEMutator.$(OBJEXT) \
+        ControlStruct/driver_cfa_cpp-CaseRangeMutator.$(OBJEXT) \
         ControlStruct/driver_cfa_cpp-Mutate.$(OBJEXT) \
         ControlStruct/driver_cfa_cpp-ForExprMutator.$(OBJEXT) \
@@ -372 +373 @@
         Common/SemanticError.cc Common/UniqueName.cc \
         ControlStruct/LabelGenerator.cc ControlStruct/LabelFixer.cc \
-        ControlStruct/MLEMutator.cc ControlStruct/Mutate.cc \
-        ControlStruct/ForExprMutator.cc \
+        ControlStruct/MLEMutator.cc ControlStruct/CaseRangeMutator.cc \
+        ControlStruct/Mutate.cc ControlStruct/ForExprMutator.cc \
         ControlStruct/LabelTypeChecker.cc Designators/Processor.cc \
         GenPoly/Box.cc GenPoly/GenPoly.cc GenPoly/PolyMutator.cc \
@@ -542 +543 @@
         ControlStruct/$(DEPDIR)/$(am__dirstamp)
 ControlStruct/driver_cfa_cpp-MLEMutator.$(OBJEXT):  \
+        ControlStruct/$(am__dirstamp) \
+        ControlStruct/$(DEPDIR)/$(am__dirstamp)
+ControlStruct/driver_cfa_cpp-CaseRangeMutator.$(OBJEXT):  \
         ControlStruct/$(am__dirstamp) \
         ControlStruct/$(DEPDIR)/$(am__dirstamp)
@@ -819 +823 @@
         -rm -f Common/driver_cfa_cpp-SemanticError.$(OBJEXT)
         -rm -f Common/driver_cfa_cpp-UniqueName.$(OBJEXT)
+        -rm -f ControlStruct/driver_cfa_cpp-CaseRangeMutator.$(OBJEXT)
         -rm -f ControlStruct/driver_cfa_cpp-ForExprMutator.$(OBJEXT)
         -rm -f ControlStruct/driver_cfa_cpp-LabelFixer.$(OBJEXT)
@@ -929 +934 @@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-SemanticError.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-UniqueName.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-CaseRangeMutator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-ForExprMutator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelFixer.Po@am__quote@
@@ -1211 +1217 @@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-MLEMutator.obj `if test -f 'ControlStruct/MLEMutator.cc'; then $(CYGPATH_W) 'ControlStruct/MLEMutator.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/MLEMutator.cc'; fi`
 
+ControlStruct/driver_cfa_cpp-CaseRangeMutator.o: ControlStruct/CaseRangeMutator.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ControlStruct/driver_cfa_cpp-CaseRangeMutator.o -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-CaseRangeMutator.Tpo -c -o ControlStruct/driver_cfa_cpp-CaseRangeMutator.o `test -f 'ControlStruct/CaseRangeMutator.cc' || echo '$(srcdir)/'`ControlStruct/CaseRangeMutator.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ControlStruct/$(DEPDIR)/driver_cfa_cpp-CaseRangeMutator.Tpo ControlStruct/$(DEPDIR)/driver_cfa_cpp-CaseRangeMutator.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ControlStruct/CaseRangeMutator.cc' object='ControlStruct/driver_cfa_cpp-CaseRangeMutator.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-CaseRangeMutator.o `test -f 'ControlStruct/CaseRangeMutator.cc' || echo '$(srcdir)/'`ControlStruct/CaseRangeMutator.cc
+
+ControlStruct/driver_cfa_cpp-CaseRangeMutator.obj: ControlStruct/CaseRangeMutator.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ControlStruct/driver_cfa_cpp-CaseRangeMutator.obj -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-CaseRangeMutator.Tpo -c -o ControlStruct/driver_cfa_cpp-CaseRangeMutator.obj `if test -f 'ControlStruct/CaseRangeMutator.cc'; then $(CYGPATH_W) 'ControlStruct/CaseRangeMutator.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/CaseRangeMutator.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ControlStruct/$(DEPDIR)/driver_cfa_cpp-CaseRangeMutator.Tpo ControlStruct/$(DEPDIR)/driver_cfa_cpp-CaseRangeMutator.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ControlStruct/CaseRangeMutator.cc' object='ControlStruct/driver_cfa_cpp-CaseRangeMutator.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-CaseRangeMutator.obj `if test -f 'ControlStruct/CaseRangeMutator.cc'; then $(CYGPATH_W) 'ControlStruct/CaseRangeMutator.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/CaseRangeMutator.cc'; fi`
+
 ControlStruct/driver_cfa_cpp-Mutate.o: ControlStruct/Mutate.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ControlStruct/driver_cfa_cpp-Mutate.o -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-Mutate.Tpo -c -o ControlStruct/driver_cfa_cpp-Mutate.o `test -f 'ControlStruct/Mutate.cc' || echo '$(srcdir)/'`ControlStruct/Mutate.cc

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 Jul  5 13:41:55 2016
+// Update Count     : 320
 //
 
@@ -83 +83 @@
 }
 
-// CommaExprNode *ExpressionNode::add_to_list( ExpressionNode *exp ) {
-//      return new CommaExprNode( this, exp );
-// }
+CommaExprNode *ExpressionNode::add_to_list( ExpressionNode *exp ) {
+        return new CommaExprNode( this, exp );
+}
 
 //##############################################################################
@@ -246 +246 @@
         "?|?", "?&?", "?^?", "Cast", "?<<?", "?>>?", "?<?", "?>?", "?<=?", "?>=?", "?==?", "?!=?",
         "?=?", "?*=?", "?/=?", "?%=?", "?+=?", "?-=?", "?<<=?", "?>>=?", "?&=?", "?^=?", "?|=?",
-        "?[?]", "FieldSel", "PFieldSel", "...",
+        "?[?]", "FieldSel", "PFieldSel", "Range",
         // monadic
         "+?", "-?", "AddressOf", "*?", "!?", "~?", "++?", "?++", "--?", "?--", "&&"
@@ -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
 //
 
@@ -77 +77 @@
         virtual ExpressionNode *clone() const = 0;
 
-        // virtual CommaExprNode *add_to_list( ExpressionNode * );
+        virtual CommaExprNode *add_to_list( ExpressionNode * );
 
         ExpressionNode *get_argName() const { return argName; }
@@ -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 ); }
 };
 
@@ -503 +485 @@
         std::string get_target() const;
 
-        // StatementNode *add_controlexp( ExpressionNode * );
+        StatementNode *add_controlexp( ExpressionNode * );
         StatementNode *append_block( StatementNode * );
         StatementNode *append_last_case( StatementNode * );
@@ -549 +531 @@
         ConstantNode *clobber;
         std::list< Label > gotolabels;
+};
+
+class NullStmtNode : public CompoundStmtNode {
+  public:
+        Statement *build() const;
+        void print( std::ostream &, int indent = 0 ) const;
 };
 

src/Parser/StatementNode.cc

@@ -107 +107 @@
 }
 
-// StatementNode *StatementNode::add_controlexp( ExpressionNode *e ) {
-//      if ( control && e )
-//              control->add_to_list( e ); // xxx - check this
-//      return this;
-// }
+StatementNode *StatementNode::add_controlexp( ExpressionNode *e ) {
+        if ( control && e )
+                control->add_to_list( e ); // xxx - check this
+        return this;
+}
 
 StatementNode *StatementNode::append_block( StatementNode *stmt ) {
@@ -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/TypeData.cc

@@ -510 +510 @@
                 return buildVariable();
         } else {
-                return new ObjectDecl( name, sc, linkage, bitfieldWidth, build(), init, std::list< Attribute * >(),  isInline, isNoreturn );
+                return new ObjectDecl( name, sc, linkage, bitfieldWidth, build(), init, isInline, isNoreturn );
         } // if
         return 0;

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,   722,   724,   735,
+     736,   738,   742,   743,   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) );
@@ -6011 +6009 @@
                         // *before* the transfer to the appropriate case clause by hoisting the declarations into a compound
                         // statement around the switch.  Statements after the initial declaration list can never be executed, and
-                        // therefore, are removed from the grammar even though C allows it. The change also applies to choose
-                        // statement.
+                        // therefore, are removed from the grammar even though C allows it. Change also applies to choose statement.
                         (yyval.sn) = (yyvsp[(7) - (9)].decl) != 0 ? new CompoundStmtNode( (StatementNode *)((new StatementNode( (yyvsp[(7) - (9)].decl) ))->set_link( sw )) ) : sw;
                 }
@@ -6020 +6017 @@
 
 /* Line 1806 of yacc.c  */
-#line 729 "parser.yy"
+#line 723 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
     break;
@@ -6027 +6024 @@
 
 /* Line 1806 of yacc.c  */
-#line 731 "parser.yy"
+#line 725 "parser.yy"
     {
                         StatementNode *sw = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) );
@@ -6037 +6034 @@
 
 /* Line 1806 of yacc.c  */
-#line 741 "parser.yy"
+#line 735 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
@@ -6044 +6041 @@
 
 /* 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:
+#line 737 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Range ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
+    break;
+
+  case 163:
+
+/* Line 1806 of yacc.c  */
+#line 744 "parser.yy"
+    { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(tupleContents( (yyvsp[(1) - (3)].en) ))->set_link( (yyvsp[(3) - (3)].en) ) ); }
+    break;
+
+  case 164:
 
 /* Line 1806 of yacc.c  */
 #line 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); }
+    { (yyval.sn) = new StatementNode( StatementNode::Case, (yyvsp[(2) - (3)].en), 0 ); }
     break;
 
@@ -6072 +6062 @@
 
 /* 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 +6076 @@
 
 /* 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 +6083 @@
 
 /* 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 +6265 @@
 
 /* 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 +6272 @@
 
 /* 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 +6279 @@
 
 /* Line 1806 of yacc.c  */
-#line 868 "parser.yy"
+#line 862 "parser.yy"
     {
                         (yyvsp[(3) - (4)].pn)->set_link( (yyvsp[(4) - (4)].pn) );
@@ -6299 +6289 @@
 
 /* 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 +6355 @@
 
 /* Line 1806 of yacc.c  */
-#line 915 "parser.yy"
+#line 909 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6375 +6365 @@
 
 /* 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 +6372 @@
 
 /* Line 1806 of yacc.c  */
-#line 922 "parser.yy"
+#line 916 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6392 +6382 @@
 
 /* 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 +6417 @@
 
 /* Line 1806 of yacc.c  */
-#line 944 "parser.yy"
+#line 938 "parser.yy"
     { (yyval.flag) = false; }
     break;
@@ -6434 +6424 @@
 
 /* Line 1806 of yacc.c  */
-#line 946 "parser.yy"
+#line 940 "parser.yy"
     { (yyval.flag) = true; }
     break;
@@ -6441 +6431 @@
 
 /* Line 1806 of yacc.c  */
-#line 951 "parser.yy"
+#line 945 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -6448 +6438 @@
 
 /* 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 +6445 @@
 
 /* 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 +6452 @@
 
 /* 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 +6459 @@
 
 /* Line 1806 of yacc.c  */
-#line 970 "parser.yy"
+#line 964 "parser.yy"
     { (yyval.constant) = 0; }
     break;
@@ -6476 +6466 @@
 
 /* Line 1806 of yacc.c  */
-#line 972 "parser.yy"
+#line 966 "parser.yy"
     { (yyval.constant) = (yyvsp[(1) - (1)].constant); }
     break;
@@ -6483 +6473 @@
 
 /* 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 +6480 @@
 
 /* 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 +6487 @@
 
 /* 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 +6494 @@
 
 /* Line 1806 of yacc.c  */
-#line 988 "parser.yy"
+#line 982 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6511 +6501 @@
 
 /* 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 +6508 @@
 
 /* Line 1806 of yacc.c  */
-#line 1000 "parser.yy"
+#line 994 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6525 +6515 @@
 
 /* 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 +6522 @@
 
 /* Line 1806 of yacc.c  */
-#line 1021 "parser.yy"
+#line 1015 "parser.yy"
     {}
     break;
@@ -6539 +6529 @@
 
 /* Line 1806 of yacc.c  */
-#line 1022 "parser.yy"
+#line 1016 "parser.yy"
     {}
     break;
@@ -6546 +6536 @@
 
 /* Line 1806 of yacc.c  */
-#line 1051 "parser.yy"
+#line 1045 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6556 +6546 @@
 
 /* Line 1806 of yacc.c  */
-#line 1058 "parser.yy"
+#line 1052 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6566 +6556 @@
 
 /* Line 1806 of yacc.c  */
-#line 1063 "parser.yy"
+#line 1057 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (6)].tok), TypedefTable::ID );
@@ -6576 +6566 @@
 
 /* Line 1806 of yacc.c  */
-#line 1073 "parser.yy"
+#line 1067 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
@@ -6586 +6576 @@
 
 /* Line 1806 of yacc.c  */
-#line 1078 "parser.yy"
+#line 1072 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
@@ -6596 +6586 @@
 
 /* Line 1806 of yacc.c  */
-#line 1083 "parser.yy"
+#line 1077 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(3) - (4)].tok) );
@@ -6606 +6596 @@
 
 /* Line 1806 of yacc.c  */
-#line 1091 "parser.yy"
+#line 1085 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6616 +6606 @@
 
 /* Line 1806 of yacc.c  */
-#line 1096 "parser.yy"
+#line 1090 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6626 +6616 @@
 
 /* Line 1806 of yacc.c  */
-#line 1101 "parser.yy"
+#line 1095 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6636 +6626 @@
 
 /* Line 1806 of yacc.c  */
-#line 1106 "parser.yy"
+#line 1100 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6646 +6636 @@
 
 /* Line 1806 of yacc.c  */
-#line 1111 "parser.yy"
+#line 1105 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
@@ -6656 +6646 @@
 
 /* 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 +6655 @@
 
 /* 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 +6664 @@
 
 /* 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 +6673 @@
 
 /* Line 1806 of yacc.c  */
-#line 1153 "parser.yy"
+#line 1147 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -6690 +6680 @@
 
 /* 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 +6687 @@
 
 /* Line 1806 of yacc.c  */
-#line 1162 "parser.yy"
+#line 1156 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6707 +6697 @@
 
 /* Line 1806 of yacc.c  */
-#line 1167 "parser.yy"
+#line 1161 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6717 +6707 @@
 
 /* Line 1806 of yacc.c  */
-#line 1172 "parser.yy"
+#line 1166 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::TD );
@@ -6727 +6717 @@
 
 /* Line 1806 of yacc.c  */
-#line 1183 "parser.yy"
+#line 1177 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6737 +6727 @@
 
 /* Line 1806 of yacc.c  */
-#line 1188 "parser.yy"
+#line 1182 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6747 +6737 @@
 
 /* Line 1806 of yacc.c  */
-#line 1193 "parser.yy"
+#line 1187 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6757 +6747 @@
 
 /* Line 1806 of yacc.c  */
-#line 1198 "parser.yy"
+#line 1192 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6767 +6757 @@
 
 /* Line 1806 of yacc.c  */
-#line 1203 "parser.yy"
+#line 1197 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6777 +6767 @@
 
 /* Line 1806 of yacc.c  */
-#line 1212 "parser.yy"
+#line 1206 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (4)].tok), TypedefTable::TD );
@@ -6787 +6777 @@
 
 /* Line 1806 of yacc.c  */
-#line 1217 "parser.yy"
+#line 1211 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (7)].tok), TypedefTable::TD );
@@ -6797 +6787 @@
 
 /* Line 1806 of yacc.c  */
-#line 1234 "parser.yy"
+#line 1228 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6807 +6797 @@
 
 /* Line 1806 of yacc.c  */
-#line 1239 "parser.yy"
+#line 1233 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6817 +6807 @@
 
 /* Line 1806 of yacc.c  */
-#line 1261 "parser.yy"
+#line 1255 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6824 +6814 @@
 
 /* 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 +6821 @@
 
 /* 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 +6865 @@
 
 /* Line 1806 of yacc.c  */
-#line 1298 "parser.yy"
+#line 1292 "parser.yy"
     {
                         typedefTable.leaveScope();
@@ -6885 +6875 @@
 
 /* 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 +6882 @@
 
 /* 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 +6889 @@
 
 /* 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 +6896 @@
 
 /* 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 +6952 @@
 
 /* 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 +7043 @@
 
 /* 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 +7211 @@
 
 /* Line 1806 of yacc.c  */
-#line 1462 "parser.yy"
+#line 1456 "parser.yy"
     {
                         typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
@@ -7231 +7221 @@
 
 /* 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 +7249 @@
 
 /* Line 1806 of yacc.c  */
-#line 1478 "parser.yy"
+#line 1472 "parser.yy"
     { (yyval.aggKey) = DeclarationNode::Struct; }
     break;
@@ -7266 +7256 @@
 
 /* Line 1806 of yacc.c  */
-#line 1480 "parser.yy"
+#line 1474 "parser.yy"
     { (yyval.aggKey) = DeclarationNode::Union; }
     break;
@@ -7273 +7263 @@
 
 /* Line 1806 of yacc.c  */
-#line 1485 "parser.yy"
+#line 1479 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7280 +7270 @@
 
 /* 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 +7284 @@
 
 /* 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 +7295 @@
 
 /* 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 +7302 @@
 
 /* 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 +7309 @@
 
 /* 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 +7316 @@
 
 /* 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 +7323 @@
 
 /* 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 +7330 @@
 
 /* Line 1806 of yacc.c  */
-#line 1522 "parser.yy"
+#line 1516 "parser.yy"
     { (yyval.decl) = DeclarationNode::newName( 0 ); /* XXX */ }
     break;
@@ -7347 +7337 @@
 
 /* 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 +7365 @@
 
 /* Line 1806 of yacc.c  */
-#line 1538 "parser.yy"
+#line 1532 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
@@ -7382 +7372 @@
 
 /* Line 1806 of yacc.c  */
-#line 1543 "parser.yy"
+#line 1537 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -7389 +7379 @@
 
 /* Line 1806 of yacc.c  */
-#line 1552 "parser.yy"
+#line 1546 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( 0, (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -7396 +7386 @@
 
 /* Line 1806 of yacc.c  */
-#line 1554 "parser.yy"
+#line 1548 "parser.yy"
     {
                         typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
@@ -7406 +7396 @@
 
 /* Line 1806 of yacc.c  */
-#line 1559 "parser.yy"
+#line 1553 "parser.yy"
     { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
     break;
@@ -7413 +7403 @@
 
 /* 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 +7410 @@
 
 /* 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 +7417 @@
 
 /* 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 +7424 @@
 
 /* Line 1806 of yacc.c  */
-#line 1573 "parser.yy"
+#line 1567 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -7441 +7431 @@
 
 /* Line 1806 of yacc.c  */
-#line 1575 "parser.yy"
+#line 1569 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -7448 +7438 @@
 
 /* Line 1806 of yacc.c  */
-#line 1582 "parser.yy"
+#line 1576 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7455 +7445 @@
 
 /* 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 +7452 @@
 
 /* Line 1806 of yacc.c  */
-#line 1592 "parser.yy"
+#line 1586 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
@@ -7469 +7459 @@
 
 /* Line 1806 of yacc.c  */
-#line 1594 "parser.yy"
+#line 1588 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
@@ -7476 +7466 @@
 
 /* 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 +7473 @@
 
 /* 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 +7480 @@
 
 /* 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 +7494 @@
 
 /* Line 1806 of yacc.c  */
-#line 1617 "parser.yy"
+#line 1611 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7511 +7501 @@
 
 /* Line 1806 of yacc.c  */
-#line 1624 "parser.yy"
+#line 1618 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
@@ -7518 +7508 @@
 
 /* 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 +7515 @@
 
 /* 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 +7522 @@
 
 /* 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 +7529 @@
 
 /* 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 +7536 @@
 
 /* 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 +7543 @@
 
 /* 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 +7560 @@
 
 /* Line 1806 of yacc.c  */
-#line 1668 "parser.yy"
+#line 1662 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7580 +7570 @@
 
 /* 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 +7577 @@
 
 /* Line 1806 of yacc.c  */
-#line 1686 "parser.yy"
+#line 1680 "parser.yy"
     { (yyval.decl) = DeclarationNode::newName( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -7594 +7584 @@
 
 /* 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 +7591 @@
 
 /* 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 +7598 @@
 
 /* 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 +7605 @@
 
 /* Line 1806 of yacc.c  */
-#line 1726 "parser.yy"
+#line 1720 "parser.yy"
     { (yyval.in) = 0; }
     break;
@@ -7622 +7612 @@
 
 /* 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 +7647 @@
 
 /* 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 +7654 @@
 
 /* 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 +7661 @@
 
 /* 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 +7668 @@
 
 /* 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 +7682 @@
 
 /* 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 +7689 @@
 
 /* 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 +7696 @@
 
 /* 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 +7724 @@
 
 /* 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 +7731 @@
 
 /* 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 +7738 @@
 
 /* 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 +7752 @@
 
 /* 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 +7759 @@
 
 /* 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 +7773 @@
 
 /* Line 1806 of yacc.c  */
-#line 1838 "parser.yy"
+#line 1832 "parser.yy"
     { typedefTable.addToEnclosingScope( *(yyvsp[(2) - (2)].tok), TypedefTable::TD ); }
     break;
@@ -7790 +7780 @@
 
 /* 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 +7794 @@
 
 /* Line 1806 of yacc.c  */
-#line 1848 "parser.yy"
+#line 1842 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Ftype; }
     break;
@@ -7811 +7801 @@
 
 /* Line 1806 of yacc.c  */
-#line 1850 "parser.yy"
+#line 1844 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Dtype; }
     break;
@@ -7818 +7808 @@
 
 /* Line 1806 of yacc.c  */
-#line 1855 "parser.yy"
+#line 1849 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7825 +7815 @@
 
 /* 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 +7822 @@
 
 /* Line 1806 of yacc.c  */
-#line 1862 "parser.yy"
+#line 1856 "parser.yy"
     {
                         typedefTable.openTrait( *(yyvsp[(2) - (5)].tok) );
@@ -7842 +7832 @@
 
 /* Line 1806 of yacc.c  */
-#line 1867 "parser.yy"
+#line 1861 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (5)].decl); }
     break;
@@ -7849 +7839 @@
 
 /* Line 1806 of yacc.c  */
-#line 1869 "parser.yy"
+#line 1863 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7856 +7846 @@
 
 /* Line 1806 of yacc.c  */
-#line 1874 "parser.yy"
+#line 1868 "parser.yy"
     { (yyval.en) = new TypeValueNode( (yyvsp[(1) - (1)].decl) ); }
     break;
@@ -7863 +7853 @@
 
 /* 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 +7860 @@
 
 /* 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 +7867 @@
 
 /* Line 1806 of yacc.c  */
-#line 1884 "parser.yy"
+#line 1878 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
     break;
@@ -7884 +7874 @@
 
 /* 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 +7881 @@
 
 /* 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 +7888 @@
 
 /* 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 +7895 @@
 
 /* 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 +7902 @@
 
 /* Line 1806 of yacc.c  */
-#line 1900 "parser.yy"
+#line 1894 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (1)].tok), TypedefTable::TD );
@@ -7922 +7912 @@
 
 /* Line 1806 of yacc.c  */
-#line 1905 "parser.yy"
+#line 1899 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (6)].tok), TypedefTable::TG );
@@ -7932 +7922 @@
 
 /* Line 1806 of yacc.c  */
-#line 1913 "parser.yy"
+#line 1907 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (9)].tok), TypedefTable::ID );
@@ -7942 +7932 @@
 
 /* Line 1806 of yacc.c  */
-#line 1918 "parser.yy"
+#line 1912 "parser.yy"
     {
                         typedefTable.enterTrait( *(yyvsp[(2) - (8)].tok) );
@@ -7952 +7942 @@
 
 /* Line 1806 of yacc.c  */
-#line 1923 "parser.yy"
+#line 1917 "parser.yy"
     {
                         typedefTable.leaveTrait();
@@ -7963 +7953 @@
 
 /* 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 +7960 @@
 
 /* Line 1806 of yacc.c  */
-#line 1943 "parser.yy"
+#line 1937 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7980 +7970 @@
 
 /* Line 1806 of yacc.c  */
-#line 1948 "parser.yy"
+#line 1942 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7990 +7980 @@
 
 /* Line 1806 of yacc.c  */
-#line 1953 "parser.yy"
+#line 1947 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
@@ -8000 +7990 @@
 
 /* Line 1806 of yacc.c  */
-#line 1961 "parser.yy"
+#line 1955 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -8010 +8000 @@
 
 /* Line 1806 of yacc.c  */
-#line 1966 "parser.yy"
+#line 1960 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -8020 +8010 @@
 
 /* Line 1806 of yacc.c  */
-#line 1976 "parser.yy"
+#line 1970 "parser.yy"
     {}
     break;
@@ -8027 +8017 @@
 
 /* Line 1806 of yacc.c  */
-#line 1978 "parser.yy"
+#line 1972 "parser.yy"
     {
                         if ( theTree ) {
@@ -8040 +8030 @@
 
 /* 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 +8037 @@
 
 /* Line 1806 of yacc.c  */
-#line 1995 "parser.yy"
+#line 1989 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -8054 +8044 @@
 
 /* Line 1806 of yacc.c  */
-#line 2003 "parser.yy"
+#line 1997 "parser.yy"
     {}
     break;
@@ -8061 +8051 @@
 
 /* Line 1806 of yacc.c  */
-#line 2005 "parser.yy"
+#line 1999 "parser.yy"
     {
                         linkageStack.push( linkage );
@@ -8071 +8061 @@
 
 /* Line 1806 of yacc.c  */
-#line 2010 "parser.yy"
+#line 2004 "parser.yy"
     {
                         linkage = linkageStack.top();
@@ -8082 +8072 @@
 
 /* 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 +8083 @@
 
 /* Line 1806 of yacc.c  */
-#line 2031 "parser.yy"
+#line 2025 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8104 +8094 @@
 
 /* Line 1806 of yacc.c  */
-#line 2037 "parser.yy"
+#line 2031 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8115 +8105 @@
 
 /* Line 1806 of yacc.c  */
-#line 2046 "parser.yy"
+#line 2040 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8126 +8116 @@
 
 /* Line 1806 of yacc.c  */
-#line 2052 "parser.yy"
+#line 2046 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8135 +8125 @@
 
   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 +8146 @@
     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 +8160 @@
 
 /* Line 1806 of yacc.c  */
-#line 2078 "parser.yy"
+#line 2072 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8181 +8171 @@
 
 /* Line 1806 of yacc.c  */
-#line 2084 "parser.yy"
+#line 2078 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8192 +8182 @@
 
 /* Line 1806 of yacc.c  */
-#line 2092 "parser.yy"
+#line 2086 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8203 +8193 @@
 
 /* Line 1806 of yacc.c  */
-#line 2098 "parser.yy"
+#line 2092 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8214 +8204 @@
 
 /* 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 +8211 @@
 
 /* Line 1806 of yacc.c  */
-#line 2123 "parser.yy"
+#line 2117 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -8228 +8218 @@
 
 /* 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 +8232 @@
 
 /* Line 1806 of yacc.c  */
-#line 2151 "parser.yy"
+#line 2145 "parser.yy"
     {}
     break;
@@ -8249 +8239 @@
 
 /* Line 1806 of yacc.c  */
-#line 2152 "parser.yy"
+#line 2146 "parser.yy"
     {}
     break;
@@ -8256 +8246 @@
 
 /* Line 1806 of yacc.c  */
-#line 2153 "parser.yy"
+#line 2147 "parser.yy"
     {}
     break;
@@ -8263 +8253 @@
 
 /* Line 1806 of yacc.c  */
-#line 2154 "parser.yy"
+#line 2148 "parser.yy"
     {}
     break;
@@ -8270 +8260 @@
 
 /* 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 +8267 @@
 
 /* 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 +8274 @@
 
 /* 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 +8281 @@
 
 /* Line 1806 of yacc.c  */
-#line 2199 "parser.yy"
+#line 2193 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8301 +8291 @@
 
 /* Line 1806 of yacc.c  */
-#line 2204 "parser.yy"
+#line 2198 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8308 +8298 @@
 
 /* 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 +8305 @@
 
 /* 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 +8312 @@
 
 /* Line 1806 of yacc.c  */
-#line 2213 "parser.yy"
+#line 2207 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8329 +8319 @@
 
 /* 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 +8721 @@
 
 /* Line 1806 of yacc.c  */
-#line 2452 "parser.yy"
+#line 2446 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8741 +8731 @@
 
 /* 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 +8738 @@
 
 /* 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 +8745 @@
 
 /* Line 1806 of yacc.c  */
-#line 2464 "parser.yy"
+#line 2458 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8762 +8752 @@
 
 /* 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 +8759 @@
 
 /* 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 +8766 @@
 
 /* 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 +8773 @@
 
 /* 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 +8780 @@
 
 /* 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 +8787 @@
 
 /* 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 +8794 @@
 
 /* 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 +9144 @@
 
 /* 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 +9218 @@
     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 +9253 @@
     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 +9358 @@
     break;
 
-  case 743:
+  case 746:
 
 /* Line 1806 of yacc.c  */
@@ -9354 +9365 @@
     break;
 
-  case 744:
+  case 747:
 
 /* Line 1806 of yacc.c  */
@@ -9361 +9372 @@
     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 +9382 @@
 
 /* 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 +9389 @@
 
 /* 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 +9396 @@
 
 /* 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 +9403 @@
 
 /* Line 1806 of yacc.c  */
-#line 2844 "parser.yy"
+#line 2838 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -9420 +9410 @@
 
 /* Line 1806 of yacc.c  */
-#line 2846 "parser.yy"
+#line 2840 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -9427 +9417 @@
 
 /* Line 1806 of yacc.c  */
-#line 9430 "Parser/parser.cc"
+#line 9420 "Parser/parser.cc"
       default: break;
     }
@@ -9658 +9648 @@
 
 /* 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 : Sat Jul 23 17:01:30 2016
+// Update Count     : 1668
 //
 
@@ -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
@@ -152 +150 @@
 %type<sn> block_item_list                               block_item
 %type<sn> case_clause
-%type<en> case_value
-%type<sn> case_value_list                               case_label                                      case_label_list
+%type<en> case_value                                    case_value_list
+%type<sn> case_label                                    case_label_list
 %type<sn> switch_clause_list_opt                switch_clause_list                      choose_clause_list_opt          choose_clause_list
 %type<pn> handler_list                                  handler_clause                          finally_clause
@@ -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 ); }
         ;
 
@@ -721 +717 @@
                         // *before* the transfer to the appropriate case clause by hoisting the declarations into a compound
                         // statement around the switch.  Statements after the initial declaration list can never be executed, and
-                        // therefore, are removed from the grammar even though C allows it. The change also applies to choose
-                        // statement.
+                        // therefore, are removed from the grammar even though C allows it. Change also applies to choose statement.
                         $$ = $7 != 0 ? new CompoundStmtNode( (StatementNode *)((new StatementNode( $7 ))->set_link( sw )) ) : sw;
                 }
@@ -740 +735 @@
         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
         ;
 
 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 ) ) ); }
+        case_value
+        | case_value_list ',' case_value
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(tupleContents( $1 ))->set_link( $3 ) ); }
         ;
 
 case_label:                                                                                             // CFA
-        CASE case_value_list ':'                                        { $$ = $2; }
+        CASE case_value_list ':'                                        { $$ = new StatementNode( StatementNode::Case, $2, 0 ); }
         | DEFAULT ':'                                                           { $$ = new StatementNode( StatementNode::Default ); }
                 // A semantic check is required to ensure only one default clause per switch/choose statement.
@@ -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 ); }
         ;
 

src/ResolvExpr/Resolver.cc

@@ -24 +24 @@
 #include "SynTree/Initializer.h"
 #include "SymTab/Indexer.h"
-#include "SymTab/Autogen.h"
 #include "Common/utility.h"
 #include "InitTweak/InitTweak.h"
@@ -42 +41 @@
 
                 virtual void visit( ArrayType * at );
-                virtual void visit( PointerType * at );
 
                 virtual void visit( ExprStmt *exprStmt );
@@ -54 +52 @@
                 virtual void visit( BranchStmt *branchStmt );
                 virtual void visit( ReturnStmt *returnStmt );
+                virtual void visit( ImplicitCtorDtorStmt * impCtorDtorStmt );
 
                 virtual void visit( SingleInit *singleInit );
@@ -60 +59 @@
           private:
         typedef std::list< Initializer * >::iterator InitIterator;
-
-                template< typename PtrType >
-                void handlePtrType( PtrType * type );
 
           void resolveAggrInit( AggregateDecl *, InitIterator &, InitIterator & );
@@ -196 +192 @@
         }
 
-        template< typename PtrType >
-        void Resolver::handlePtrType( PtrType * type ) {
-                if ( type->get_dimension() ) {
-                        CastExpr *castExpr = new CastExpr( type->get_dimension(), SymTab::SizeType->clone() );
+        void Resolver::visit( ArrayType * at ) {
+                if ( at->get_dimension() ) {
+                        BasicType arrayLenType = BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt );
+                        CastExpr *castExpr = new CastExpr( at->get_dimension(), arrayLenType.clone() );
                         Expression *newExpr = findSingleExpression( castExpr, *this );
-                        delete type->get_dimension();
-                        type->set_dimension( newExpr );
-                }
-        }
-
-        void Resolver::visit( ArrayType * at ) {
-                handlePtrType( at );
+                        delete at->get_dimension();
+                        at->set_dimension( newExpr );
+                }
                 Visitor::visit( at );
-        }
-
-        void Resolver::visit( PointerType * pt ) {
-                handlePtrType( pt );
-                Visitor::visit( pt );
         }
 
@@ -435 +422 @@
 
         void Resolver::visit( ListInit * listInit ) {
-                InitIterator iter = listInit->begin();
-                InitIterator end = listInit->end();
+                InitIterator iter = listInit->begin_initializers();
+                InitIterator end = listInit->end_initializers();
 
                 if ( ArrayType * at = dynamic_cast< ArrayType * >( initContext ) ) {
@@ -534 +521 @@
                 // implicitly generated, there's no way for it to have side effects, so get rid of it
                 // to clean up generated code.
-                if ( InitTweak::isIntrinsicSingleArgCallStmt( ctorInit->get_ctor() ) ) {
+                if ( InitTweak::isInstrinsicSingleArgCallStmt( ctorInit->get_ctor() ) ) {
                         delete ctorInit->get_ctor();
                         ctorInit->set_ctor( NULL );
                 }
-
-                // xxx - todo
-                // if ( InitTweak::isIntrinsicCallStmt( ctorInit->get_ctor() ) ) {
-                //      // can reduce the constructor down to a SingleInit using the
-                //      // second argument from the ctor call
-                // }
-
-                if ( InitTweak::isIntrinsicSingleArgCallStmt( ctorInit->get_dtor() ) ) {
+                if ( InitTweak::isInstrinsicSingleArgCallStmt( ctorInit->get_ctor() ) ) {
                         delete ctorInit->get_dtor();
                         ctorInit->set_dtor( NULL );
                 }
+        }
+
+        void Resolver::visit( ImplicitCtorDtorStmt * impCtorDtorStmt ) {
+                // before resolving ctor/dtor, need to remove type qualifiers from the first argument (the object being constructed).
+                // Do this through a cast expression to greatly simplify the code.
+                Expression * callExpr = InitTweak::getCtorDtorCall( impCtorDtorStmt );
+                assert( callExpr );
+                Expression *& constructee = InitTweak::getCallArg( callExpr, 0 );
+                Type * type = 0;
+
+                // need to find the type of the first argument, which is unfortunately not uniform since array construction
+                // includes an untyped '+' expression.
+                if ( UntypedExpr * plusExpr = dynamic_cast< UntypedExpr * >( constructee ) ) {
+                        // constructee is <array>+<index>
+                        // get Variable <array>, then get the base type of the VariableExpr - this is the type that needs to be fixed
+                        Expression * arr = InitTweak::getCallArg( plusExpr, 0 );
+                        assert( dynamic_cast< VariableExpr * >( arr ) || dynamic_cast< MemberExpr *>( arr ) );
+                        assert( arr && arr->get_results().size() == 1 );
+                        type = arr->get_results().front()->clone();
+                } else {
+                        // otherwise, constructing a plain object, which means the object's address is being taken.
+                        // Need to get the type of the VariableExpr object, because the AddressExpr is rebuilt and uses the
+                        // type of the VariableExpr to do so.
+                        assert( constructee->get_results().size() == 1 );
+                        AddressExpr * addrExpr = dynamic_cast< AddressExpr * > ( constructee );
+                        assert( addrExpr && addrExpr->get_results().size() == 1 );
+                        type = addrExpr->get_results().front()->clone();
+                }
+                // cast to T* with qualifiers removed.
+                // unfortunately, lvalue is considered a qualifier. For AddressExpr to resolve, its argument
+                // must have an lvalue qualified type, so remove all qualifiers except lvalue. If we ever
+                // remove lvalue as a qualifier, this can change to
+                //   type->get_qualifiers() = Type::Qualifiers();
+                Type * base = InitTweak::getPointerBase( type );
+                assert( base );
+                base->get_qualifiers() -= Type::Qualifiers(true, true, true, false, true, true);
+                // if pointer has lvalue qualifier, cast won't appear in output
+                type->set_isLvalue( false );
+                constructee = new CastExpr( constructee, type );
+
+                // finally, resolve the ctor/dtor
+                impCtorDtorStmt->get_callStmt()->accept( *this );
         }
 } // namespace ResolvExpr

src/SymTab/AddVisit.h

@@ -10 +10 @@
 // Created On       : Sun May 17 16:14:32 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:22:01 2016
-// Update Count     : 9
+// Last Modified On : Tue Jul 12 17:46:33 2016
+// Update Count     : 6
 //
 
@@ -33 +33 @@
         template< typename Visitor >
         inline void addVisit(SwitchStmt *switchStmt, Visitor &visitor) {
-                addVisitStatementList( switchStmt->get_statements(), visitor );
+                addVisitStatementList( switchStmt->get_branches(), visitor );
                 maybeAccept( switchStmt->get_condition(), visitor );
         }

src/SymTab/Autogen.cc

@@ -26 +26 @@
 
 namespace SymTab {
-        Type * SizeType = 0;
-
         class AutogenerateRoutines : public Visitor {
                 public:
@@ -61 +59 @@
         bool isUnnamedBitfield( ObjectDecl * obj ) {
                 return obj != NULL && obj->get_name() == "" && obj->get_bitfieldWidth() != NULL;
+        }
+
+        template< typename OutputIterator >
+        void makeScalarFunction( Expression *src, ObjectDecl *dstParam, DeclarationWithType *member, std::string fname, OutputIterator out ) {
+                ObjectDecl *obj = dynamic_cast<ObjectDecl *>( member );
+                // unnamed bit fields are not copied as they cannot be accessed
+                if ( isUnnamedBitfield( obj ) ) return;
+
+                // want to be able to generate assignment, ctor, and dtor generically,
+                // so fname is either ?=?, ?{}, or ^?{}
+                UntypedExpr *fExpr = new UntypedExpr( new NameExpr( fname ) );
+
+                UntypedExpr *derefExpr = new UntypedExpr( new NameExpr( "*?" ) );
+                derefExpr->get_args().push_back( new VariableExpr( dstParam ) );
+
+                // do something special for unnamed members
+                Expression *dstselect = new AddressExpr( new MemberExpr( member, derefExpr ) );
+                fExpr->get_args().push_back( dstselect );
+
+                if ( src ) {
+                        fExpr->get_args().push_back( src );
+                }
+
+                Statement * callStmt = new ExprStmt( noLabels, fExpr );
+                if ( (fname == "?{}" || fname == "^?{}") && ( !obj || ( obj && obj->get_bitfieldWidth() == NULL ) ) ) {
+                        // implicitly generated ctor/dtor calls should be wrapped
+                        // so that later passes are aware they were generated.
+                        // xxx - don't mark as an implicit ctor/dtor if obj is a bitfield,
+                        // because this causes the address to be taken at codegen, which is illegal in C.
+                        callStmt = new ImplicitCtorDtorStmt( callStmt );
+                }
+                *out++ = callStmt;
         }
 
@@ -189 +219 @@
                 }
 
-                InitTweak::InitExpander srcParam( src );
-
                 // assign to destination (and return value if generic)
-                UntypedExpr *derefExpr = new UntypedExpr( new NameExpr( "*?" ) );
-                derefExpr->get_args().push_back( new VariableExpr( dstParam ) );
-                Expression *dstselect = new MemberExpr( field, derefExpr );
-                genImplicitCall( srcParam, dstselect, func->get_name(), back_inserter( func->get_statements()->get_kids() ), field, forward );
-
-                if ( isDynamicLayout && returnVal ) {
-                        UntypedExpr *derefRet = new UntypedExpr( new NameExpr( "*?" ) );
-                        derefRet->get_args().push_back( new VariableExpr( returnVal ) );
-                        Expression *retselect = new MemberExpr( field, derefRet );
-                        genImplicitCall( srcParam, retselect, func->get_name(), back_inserter( func->get_statements()->get_kids() ), field, forward );
+                if ( ArrayType *array = dynamic_cast< ArrayType * >( field->get_type() ) ) {
+                        UntypedExpr *derefExpr = new UntypedExpr( new NameExpr( "*?" ) );
+                        derefExpr->get_args().push_back( new VariableExpr( dstParam ) );
+                        Expression *dstselect = new MemberExpr( field, derefExpr );
+
+                        makeArrayFunction( src, dstselect, array, func->get_name(), back_inserter( func->get_statements()->get_kids() ), forward );
+                        if ( isDynamicLayout && returnVal ) {
+                                UntypedExpr *derefRet = new UntypedExpr( new NameExpr( "*?" ) );
+                                derefRet->get_args().push_back( new VariableExpr( returnVal ) );
+                                Expression *retselect = new MemberExpr( field, derefRet );
+
+                                makeArrayFunction( src, retselect, array, func->get_name(), back_inserter( func->get_statements()->get_kids() ), forward );
+                        }
+                } else {
+                        makeScalarFunction( src, dstParam, field, func->get_name(), back_inserter( func->get_statements()->get_kids() ) );
+                        if ( isDynamicLayout && returnVal ) makeScalarFunction( src, returnVal, field, func->get_name(), back_inserter( func->get_statements()->get_kids() ) );
                 } // if
         }

src/SymTab/Autogen.h

@@ -22 +22 @@
 #include "SynTree/Declaration.h"
 #include "SynTree/Initializer.h"
-#include "InitTweak/InitTweak.h"
 
 namespace SymTab {
-        /// Generates assignment operators, constructors, and destructor for aggregate types as required
-        void autogenerateRoutines( std::list< Declaration * > &translationUnit );
+  /// Generates assignment operators, constructors, and destructor for aggregate types as required
+  void autogenerateRoutines( std::list< Declaration * > &translationUnit );
 
-        /// returns true if obj's name is the empty string and it has a bitfield width
-        bool isUnnamedBitfield( ObjectDecl * obj );
+  // originally makeArrayAssignment - changed to Function because it is now used for ctors and dtors as well
+  // admittedly not a great name change. This used to live in Validate.cc, but has been moved so it can be reused elsewhere
 
-        /// size_t type - set when size_t typedef is seen. Useful in a few places,
-        /// such as in determining array dimension type
-        extern Type * SizeType;
+  /// Store in out a loop which calls fname on each element of the array with srcParam and dstParam as arguments.
+  /// If forward is true, loop goes from 0 to N-1, else N-1 to 0
+  template< typename OutputIterator >
+  void makeArrayFunction( Expression *srcParam, Expression *dstParam, ArrayType *array, std::string fname, OutputIterator out, bool forward = true ) {
+    static UniqueName indexName( "_index" );
 
-        /// inserts into out a generated call expression to function fname with arguments dstParam and srcParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls.
-        template< typename OutputIterator >
-        Statement * genCall( InitTweak::InitExpander & srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, Type * type, bool addCast = false, bool forward = true );
+    // for a flexible array member nothing is done -- user must define own assignment
+    if ( ! array->get_dimension() ) return;
 
-        /// inserts into out a generated call expression to function fname with arguments dstParam and srcParam. Should only be called with non-array types.
-        /// optionally returns a statement which must be inserted prior to the containing loop, if there is one
-        template< typename OutputIterator >
-        Statement * genScalarCall( InitTweak::InitExpander & srcParam, Expression *dstParam, const std::string & fname, OutputIterator out, Type * type, bool addCast = false ) {
-                // want to be able to generate assignment, ctor, and dtor generically,
-                // so fname is either ?=?, ?{}, or ^?{}
-                UntypedExpr *fExpr = new UntypedExpr( new NameExpr( fname ) );
+    Expression * begin, * end, * update, * cmp;
+    if ( forward ) {
+      // generate: for ( int i = 0; i < 0; ++i )
+      begin = new NameExpr( "0" );
+      end = array->get_dimension()->clone();
+      cmp = new NameExpr( "?<?" );
+      update = new NameExpr( "++?" );
+    } else {
+      // generate: for ( int i = N-1; i >= 0; --i )
+      begin = new UntypedExpr( new NameExpr( "?-?" ) );
+      ((UntypedExpr*)begin)->get_args().push_back( array->get_dimension()->clone() );
+      ((UntypedExpr*)begin)->get_args().push_back( new NameExpr( "1" ) );
+      end = new NameExpr( "0" );
+      cmp = new NameExpr( "?>=?" );
+      update = new NameExpr( "--?" );
+    }
 
-                // do something special for unnamed members
-                dstParam = new AddressExpr( dstParam );
-                if ( addCast ) {
-                        // cast to T* with qualifiers removed, so that qualified objects can be constructed
-                        // and destructed with the same functions as non-qualified objects.
-                        // unfortunately, lvalue is considered a qualifier. For AddressExpr to resolve, its argument
-                        // must have an lvalue qualified type, so remove all qualifiers except lvalue. If we ever
-                        // remove lvalue as a qualifier, this can change to
-                        //   type->get_qualifiers() = Type::Qualifiers();
-                        assert( type );
-                        Type * castType = type->clone();
-                        castType->get_qualifiers() -= Type::Qualifiers(true, true, true, false, true, true);
-                        castType->set_isLvalue( true ); // xxx - might not need this
-                        dstParam = new CastExpr( dstParam, new PointerType( Type::Qualifiers(), castType ) );
-                }
-                fExpr->get_args().push_back( dstParam );
+    ObjectDecl *index = new ObjectDecl( indexName.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), NULL );
 
-                Statement * listInit = srcParam.buildListInit( fExpr );
+    UntypedExpr *init = new UntypedExpr( new NameExpr( "?=?" ) );
+    init->get_args().push_back( new AddressExpr( new VariableExpr( index ) ) );
+    init->get_args().push_back( begin );
+    index->set_init( new SingleInit( init, std::list<Expression*>() ) );
 
-                std::list< Expression * > args = *++srcParam;
-                fExpr->get_args().splice( fExpr->get_args().end(), args );
+    UntypedExpr *cond = new UntypedExpr( cmp );
+    cond->get_args().push_back( new VariableExpr( index ) );
+    cond->get_args().push_back( end );
 
-                *out++ = new ExprStmt( noLabels, fExpr );
+    UntypedExpr *inc = new UntypedExpr( update );
+    inc->get_args().push_back( new AddressExpr( new VariableExpr( index ) ) );
 
-                srcParam.clearArrayIndices();
+    // want to be able to generate assignment, ctor, and dtor generically,
+    // so fname is either ?=?, ?{}, or ^?{}
+    UntypedExpr *fExpr = new UntypedExpr( new NameExpr( fname ) );
 
-                return listInit;
-        }
+    UntypedExpr *dstIndex = new UntypedExpr( new NameExpr( "?+?" ) );
+    dstIndex->get_args().push_back( dstParam );
+    dstIndex->get_args().push_back( new VariableExpr( index ) );
+    fExpr->get_args().push_back( dstIndex );
 
-        /// Store in out a loop which calls fname on each element of the array with srcParam and dstParam as arguments.
-        /// If forward is true, loop goes from 0 to N-1, else N-1 to 0
-        template< typename OutputIterator >
-        void genArrayCall( InitTweak::InitExpander & srcParam, Expression *dstParam, const std::string & fname, OutputIterator out, ArrayType *array, bool addCast = false, bool forward = true ) {
-                static UniqueName indexName( "_index" );
+    // srcParam is NULL for default ctor/dtor
+    if ( srcParam ) {
+      UntypedExpr *srcIndex = new UntypedExpr( new NameExpr( "?[?]" ) );
+      srcIndex->get_args().push_back( srcParam );
+      srcIndex->get_args().push_back( new VariableExpr( index ) );
+      fExpr->get_args().push_back( srcIndex );
+    }
 
-                // for a flexible array member nothing is done -- user must define own assignment
-                if ( ! array->get_dimension() ) return ;
+    std::list<Statement *> initList;
+    CompoundStmt * block = new CompoundStmt( noLabels );
+    block->get_kids().push_back( new DeclStmt( noLabels, index ) );
+    block->get_kids().push_back( new ForStmt( noLabels, initList, cond, inc, new ExprStmt( noLabels, fExpr ) ) );
 
-                Expression * begin, * end, * update, * cmp;
-                if ( forward ) {
-                        // generate: for ( int i = 0; i < 0; ++i )
-                        begin = new NameExpr( "0" );
-                        end = array->get_dimension()->clone();
-                        cmp = new NameExpr( "?<?" );
-                        update = new NameExpr( "++?" );
-                } else {
-                        // generate: for ( int i = N-1; i >= 0; --i )
-                        begin = new UntypedExpr( new NameExpr( "?-?" ) );
-                        ((UntypedExpr*)begin)->get_args().push_back( array->get_dimension()->clone() );
-                        ((UntypedExpr*)begin)->get_args().push_back( new NameExpr( "1" ) );
-                        end = new NameExpr( "0" );
-                        cmp = new NameExpr( "?>=?" );
-                        update = new NameExpr( "--?" );
-                }
-
-                ObjectDecl *index = new ObjectDecl( indexName.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), NULL );
-
-                UntypedExpr *init = new UntypedExpr( new NameExpr( "?=?" ) );
-                init->get_args().push_back( new AddressExpr( new VariableExpr( index ) ) );
-                init->get_args().push_back( begin );
-                index->set_init( new SingleInit( init, std::list<Expression*>() ) );
-
-                UntypedExpr *cond = new UntypedExpr( cmp );
-                cond->get_args().push_back( new VariableExpr( index ) );
-                cond->get_args().push_back( end );
-
-                UntypedExpr *inc = new UntypedExpr( update );
-                inc->get_args().push_back( new AddressExpr( new VariableExpr( index ) ) );
-
-                UntypedExpr *dstIndex = new UntypedExpr( new NameExpr( "?[?]" ) );
-                dstIndex->get_args().push_back( dstParam );
-                dstIndex->get_args().push_back( new VariableExpr( index ) );
-                dstParam = dstIndex;
-
-                // srcParam must keep track of the array indices to build the
-                // source parameter and/or array list initializer
-                srcParam.addArrayIndex( new VariableExpr( index ), array->get_dimension()->clone() );
-
-                // for stmt's body, eventually containing call
-                CompoundStmt * body = new CompoundStmt( noLabels );
-                Statement * listInit = genCall( srcParam, dstParam, fname, back_inserter( body->get_kids() ), array->get_base(), addCast, forward );
-
-                // block containing for stmt and index variable
-                std::list<Statement *> initList;
-                CompoundStmt * block = new CompoundStmt( noLabels );
-                block->get_kids().push_back( new DeclStmt( noLabels, index ) );
-                if ( listInit ) block->get_kids().push_back( listInit );
-                block->get_kids().push_back( new ForStmt( noLabels, initList, cond, inc, body ) );
-
-                *out++ = block;
-        }
-
-        template< typename OutputIterator >
-        Statement * genCall( InitTweak::InitExpander &  srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, Type * type, bool addCast, bool forward ) {
-                if ( ArrayType * at = dynamic_cast< ArrayType * >( type ) ) {
-                        genArrayCall( srcParam, dstParam, fname, out, at, addCast, forward );
-                        return 0;
-                } else {
-                        return genScalarCall( srcParam, dstParam, fname, out, type, addCast );
-                }
-        }
-
-        /// inserts into out a generated call expression to function fname with arguments dstParam
-        /// and srcParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls. decl is the
-        /// object being constructed. The function wraps constructor and destructor calls in an
-        /// ImplicitCtorDtorStmt node.
-        template< typename OutputIterator >
-        void genImplicitCall( InitTweak::InitExpander &  srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, DeclarationWithType * decl, bool forward = true ) {
-                ObjectDecl *obj = dynamic_cast<ObjectDecl *>( decl );
-                assert( obj );
-                // unnamed bit fields are not copied as they cannot be accessed
-                if ( isUnnamedBitfield( obj ) ) return;
-
-                bool addCast = (fname == "?{}" || fname == "^?{}") && ( !obj || ( obj && obj->get_bitfieldWidth() == NULL ) );
-                std::list< Statement * > stmts;
-                genCall( srcParam, dstParam, fname, back_inserter( stmts ), obj->get_type(), addCast, forward );
-
-                // currently genCall should produce at most one element, but if that changes then the next line needs to be updated to grab the statement which contains the call
-                assert( stmts.size() <= 1 );
-                if ( stmts.size() == 1 ) {
-                        Statement * callStmt = stmts.front();
-                        if ( addCast ) {
-                                // implicitly generated ctor/dtor calls should be wrapped
-                                // so that later passes are aware they were generated.
-                                // xxx - don't mark as an implicit ctor/dtor if obj is a bitfield,
-                                // because this causes the address to be taken at codegen, which is illegal in C.
-                                callStmt = new ImplicitCtorDtorStmt( callStmt );
-                        }
-                        *out++ = callStmt;
-                }
-        }
+    Statement * stmt = block;
+    if ( fname == "?{}" || fname == "^?{}" ) {
+      // implicitly generated ctor/dtor calls should be wrapped
+      // so that later passes are aware they were generated
+      stmt = new ImplicitCtorDtorStmt( stmt );
+    }
+    *out++ = stmt;
+  }
 } // namespace SymTab
 #endif // AUTOGEN_H

src/SymTab/FixFunction.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixFunction.cc --
+// FixFunction.cc -- 
 //
 // Author           : Richard C. Bilson
@@ -44 +44 @@
 
         Type * FixFunction::mutate(ArrayType *arrayType) {
-                // need to recursively mutate the base type in order for multi-dimensional arrays to work.
-                PointerType *pointerType = new PointerType( arrayType->get_qualifiers(), arrayType->get_base()->clone()->acceptMutator( *this ), maybeClone( arrayType->get_dimension() ), arrayType->get_isVarLen(), arrayType->get_isStatic() );
+                PointerType *pointerType = new PointerType( arrayType->get_qualifiers(), maybeClone( arrayType->get_base()->clone() ), maybeClone( arrayType->get_dimension() ), arrayType->get_isVarLen(), arrayType->get_isStatic() );
                 delete arrayType;
                 return pointerType;

src/SymTab/Validate.cc

@@ -174 +174 @@
 
                 virtual void visit( FunctionDecl *funcDecl );
-        };
+};
 
         class CompoundLiteral : public GenPoly::DeclMutator {
@@ -191 +191 @@
                 EliminateTypedef::eliminateTypedef( translationUnit );
                 HoistStruct::hoistStruct( translationUnit );
-                autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs Pass1
                 acceptAll( translationUnit, pass1 );
                 acceptAll( translationUnit, pass2 );
                 ReturnChecker::checkFunctionReturns( translationUnit );
-                compoundliteral.mutateDeclarationList( translationUnit );
+                mutateAll( translationUnit, compoundliteral );
+                autogenerateRoutines( translationUnit );
                 acceptAll( translationUnit, pass3 );
                 VerifyCtorDtor::verify( translationUnit );
@@ -490 +490 @@
                 EliminateTypedef eliminator;
                 mutateAll( translationUnit, eliminator );
-                if ( eliminator.typedefNames.count( "size_t" ) ) {
-                        // grab and remember declaration of size_t
-                        SizeType = eliminator.typedefNames["size_t"].first->get_base()->clone();
-                } else {
-                        // xxx - missing global typedef for size_t - default to long unsigned int, even though that may be wrong
-                        // eventually should have a warning for this case.
-                        SizeType = new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt );
-                }
                 filter( translationUnit, isTypedef, true );
-
         }
 
@@ -527 +518 @@
         Declaration *EliminateTypedef::mutate( TypedefDecl * tyDecl ) {
                 Declaration *ret = Mutator::mutate( tyDecl );
-
                 if ( typedefNames.count( tyDecl->get_name() ) == 1 && typedefNames[ tyDecl->get_name() ].second == scopeLevel ) {
                         // typedef to the same name from the same scope

src/SynTree/AddStmtVisitor.cc

@@ -10 +10 @@
 // Created On       : Wed Jun 22 12:11:17 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:23:47 2016
-// Update Count     : 16
+// Last Modified On : Tue Jul 12 17:49:59 2016
+// Update Count     : 12
 //
 
@@ -71 +71 @@
 
 void AddStmtVisitor::visit(SwitchStmt *switchStmt) {
-        visitStatementList( switchStmt->get_statements() );
+        visitStatementList( switchStmt->get_branches() );
         maybeAccept( switchStmt->get_condition(), *this );
 }

src/SynTree/Declaration.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Declaration.cc --
+// Declaration.cc -- 
 //
 // Author           : Richard C. Bilson
@@ -20 +20 @@
 #include "Initializer.h"
 #include "Type.h"
-#include "Attribute.h"
 #include "Common/utility.h"
 

src/SynTree/Declaration.h

@@ -64 +64 @@
 class DeclarationWithType : public Declaration {
   public:
-        DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, const std::list< Attribute * > & attributes );
+        DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage );
         DeclarationWithType( const DeclarationWithType &other );
         virtual ~DeclarationWithType();
@@ -75 +75 @@
         int get_scopeLevel() const { return scopeLevel; }
         void set_scopeLevel( int newValue ) { scopeLevel = newValue; }
-
-        std::list< Attribute * >& get_attributes() { return attributes; }
-        const std::list< Attribute * >& get_attributes() const { return attributes; }
 
         virtual DeclarationWithType *clone() const = 0;
@@ -90 +87 @@
         // shadowed identifiers can be accessed
         int scopeLevel = 0;
-
-        std::list< Attribute * > attributes;
 };
 
@@ -97 +92 @@
         typedef DeclarationWithType Parent;
   public:
-        ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes = std::list< Attribute * >(), bool isInline = false, bool isNoreturn = false );
+        ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init, bool isInline = false, bool isNoreturn = false );
         ObjectDecl( const ObjectDecl &other );
         virtual ~ObjectDecl();
@@ -136 +131 @@
         std::list< std::string >& get_oldIdents() { return oldIdents; }
         std::list< Declaration* >& get_oldDecls() { return oldDecls; }
+        std::list< Attribute * >& get_attributes() { return attributes; }
 
         virtual FunctionDecl *clone() const { return new FunctionDecl( *this ); }
@@ -147 +143 @@
         std::list< std::string > oldIdents;
         std::list< Declaration* > oldDecls;
+        std::list< Attribute * > attributes;
 };
 

src/SynTree/DeclarationWithType.cc

@@ -16 +16 @@
 #include "Declaration.h"
 #include "Type.h"
-#include "Attribute.h"
 #include "Common/utility.h"
 
-DeclarationWithType::DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, const std::list< Attribute * > & attributes )
-                : Declaration( name, sc, linkage ), attributes( attributes ) {
+DeclarationWithType::DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage )
+                : Declaration( name, sc, linkage ) {
 }
 
 DeclarationWithType::DeclarationWithType( const DeclarationWithType &other )
                 : Declaration( other ), mangleName( other.mangleName ), scopeLevel( other.scopeLevel ) {
-        cloneAll( other.attributes, attributes );
 }
 
 DeclarationWithType::~DeclarationWithType() {
-        deleteAll( attributes );
 }
 

src/SynTree/Expression.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug  3 17:06:51 2016
-// Update Count     : 45
+// Last Modified On : Mon Jun 13 16:03:39 2016
+// Update Count     : 42
 //
 
@@ -344 +344 @@
 }
 
-//// is this right? It's cloning the member, but the member is a declaration so probably shouldn't be cloned...
 MemberExpr::MemberExpr( const MemberExpr &other ) :
-                Expression( other ), member( other.member ), aggregate( maybeClone( other.aggregate ) ) {
+                Expression( other ), member( maybeClone( other.member ) ), aggregate( maybeClone( other.aggregate ) ) {
 }
 
 MemberExpr::~MemberExpr() {
-        // delete member;
+        delete member;
         delete aggregate;
 }
@@ -529 +528 @@
 }
 
-RangeExpr::RangeExpr( ConstantExpr *low, ConstantExpr *high ) : low( low ), high( high ) {}
-RangeExpr::RangeExpr( const RangeExpr &other ) : low( other.low->clone() ), high( other.high->clone() ) {}
-void RangeExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Range Expression: ";
-        low->print( os, indent );
-        os << " ... ";
-        high->print( os, indent );
-}
 
 std::ostream & operator<<( std::ostream & out, Expression * expr ) {

src/SynTree/Expression.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug  3 17:08:44 2016
-// Update Count     : 27
+// Last Modified On : Mon Jul  4 14:45:32 2016
+// Update Count     : 23
 //
 
@@ -18 +18 @@
 
 #include <map>
-#include <memory>
 #include "SynTree.h"
 #include "Visitor.h"
@@ -635 +634 @@
 };
 
-class RangeExpr : public Expression {
-  public:
-        RangeExpr( ConstantExpr *low, ConstantExpr *high );
-        RangeExpr( const RangeExpr &other );
-
-        ConstantExpr * get_low() const { return low.get(); }
-        ConstantExpr * get_high() const { return high.get(); }
-        RangeExpr * set_low( ConstantExpr *low ) { RangeExpr::low.reset( low ); return this; }
-        RangeExpr * set_high( ConstantExpr *high ) { RangeExpr::high.reset( high ); return this; }
-
-        virtual RangeExpr *clone() const { return new RangeExpr( *this ); }
-        virtual void accept( Visitor &v ) { v.visit( this ); }
-        virtual Expression *acceptMutator( Mutator &m ) { return m.mutate( this ); }
-        virtual void print( std::ostream &os, int indent = 0 ) const;
-  private:
-        std::unique_ptr<ConstantExpr> low, high;
-};
-
 std::ostream & operator<<( std::ostream & out, Expression * expr );
 

src/SynTree/FunctionDecl.cc

@@ -23 +23 @@
 
 FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, std::list< Attribute * > attributes )
-                : Parent( name, sc, linkage, attributes ), type( type ), statements( statements ) {
+                : Parent( name, sc, linkage ), type( type ), statements( statements ), attributes( attributes ) {
         set_isInline( isInline );
         set_isNoreturn( isNoreturn );
@@ -34 +34 @@
 FunctionDecl::FunctionDecl( const FunctionDecl &other )
         : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ) {
+                cloneAll( other.attributes, attributes );
 }
 
@@ -39 +40 @@
         delete type;
         delete statements;
+        deleteAll( attributes );
 }
 
@@ -67 +69 @@
         } // if
 
-        printAll( get_attributes(), os, indent );
+        printAll( attributes, os, indent );
 
         if ( get_storageClass() != DeclarationNode::NoStorageClass ) {

src/SynTree/Initializer.h

@@ -93 +93 @@
         std::list<Initializer*> &get_initializers() { return initializers; }
 
-        typedef std::list<Initializer*>::iterator iterator;
-        iterator begin() { return initializers.begin(); }
-        iterator end() { return initializers.end(); }
+        std::list<Initializer*>::iterator begin_initializers() { return initializers.begin(); }
+        std::list<Initializer*>::iterator end_initializers() { return initializers.end(); }
 
         virtual ListInit *clone() const { return new ListInit( *this ); }

src/SynTree/Label.h

@@ -24 +24 @@
 class Label {
   public:
-        Label( const std::string & name = "", Statement * labelled = 0, const std::list< Attribute * > & attributes = std::list< Attribute * >() ) : name( name ), labelled( labelled ), attributes( attributes ) {}
+        Label( const std::string & name = "", Statement * labelled = 0 ) : name( name ), labelled( labelled ) {}
         Label( const char * name, Statement * labelled = 0 ) : name( name ), labelled( labelled ) {}
 

src/SynTree/Mutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:23:21 2016
-// Update Count     : 19
+// Last Modified On : Tue Jul 12 17:51:19 2016
+// Update Count     : 17
 //
 
@@ -126 +126 @@
 Statement *Mutator::mutate( SwitchStmt *switchStmt ) {
         switchStmt->set_condition( maybeMutate( switchStmt->get_condition(), *this ) );
-        mutateAll( switchStmt->get_statements(), *this );
+        mutateAll( switchStmt->get_branches(), *this );
         return switchStmt;
 }
@@ -349 +349 @@
         compLitExpr->set_initializer( maybeMutate( compLitExpr->get_initializer(), *this ) );
         return compLitExpr;
-}
-
-Expression *Mutator::mutate( RangeExpr *rangeExpr ) {
-        rangeExpr->set_low( maybeMutate( rangeExpr->get_low(), *this ) );
-        rangeExpr->set_high( maybeMutate( rangeExpr->get_high(), *this ) );
-        return rangeExpr;
 }
 

src/SynTree/Mutator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug  3 16:59:45 2016
-// Update Count     : 12
+// Last Modified On : Tue Jul 12 17:51:43 2016
+// Update Count     : 11
 //
 #include <cassert>
@@ -78 +78 @@
         virtual Expression* mutate( UntypedValofExpr *valofExpr );
         virtual Expression* mutate( CompoundLiteralExpr *compLitExpr );
-        virtual Expression* mutate( RangeExpr *rangeExpr );
 
         virtual Type* mutate( VoidType *basicType );

src/SynTree/ObjectDecl.cc

@@ -18 +18 @@
 #include "Initializer.h"
 #include "Expression.h"
-#include "Attribute.h"
 #include "Common/utility.h"
 #include "Statement.h"
 
-ObjectDecl::ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes, bool isInline, bool isNoreturn )
-        : Parent( name, sc, linkage, attributes ), type( type ), init( init ), bitfieldWidth( bitfieldWidth ) {
+ObjectDecl::ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init, bool isInline, bool isNoreturn )
+        : Parent( name, sc, linkage ), type( type ), init( init ), bitfieldWidth( bitfieldWidth ) {
         set_isInline( isInline );
         set_isNoreturn( isNoreturn );
@@ -46 +45 @@
                 os << LinkageSpec::toString( get_linkage() ) << " ";
         } // if
-
-        printAll( get_attributes(), os, indent );
 
         if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
@@ -83 +80 @@
         } // if
 
-        // xxx - should printShort print attributes?
-
         if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
                 os << DeclarationNode::storageName[ get_storageClass() ] << ' ';

src/SynTree/Statement.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:25:20 2016
-// Update Count     : 61
+// Last Modified On : Tue Jul 12 17:52:32 2016
+// Update Count     : 55
 //
 
@@ -143 +143 @@
 }
 
-SwitchStmt::SwitchStmt( std::list<Label> _labels, Expression * _condition, std::list<Statement *> &_statements ):
-        Statement( _labels ), condition( _condition ), statements( _statements ) {
+SwitchStmt::SwitchStmt( std::list<Label> _labels, Expression * _condition, std::list<Statement *> &_branches ):
+        Statement( _labels ), condition( _condition ), branches( _branches ) {
 }
 
 SwitchStmt::SwitchStmt( const SwitchStmt & other ):
         Statement( other ), condition( maybeClone( other.condition ) ) {
-        cloneAll( other.statements, statements );
+        cloneAll( other.branches, branches );
 }
 
 SwitchStmt::~SwitchStmt() {
         delete condition;
-        // destroy statements
-}
+        // destroy branches
+}
+
+void SwitchStmt::add_case( CaseStmt *c ) {}
 
 void SwitchStmt::print( std::ostream &os, int indent ) const {
@@ -162 +164 @@
         os << endl;
 
-        // statements
+        // branches
         std::list<Statement *>::const_iterator i;
-        for ( i = statements.begin(); i != statements.end(); i++)
+        for ( i = branches.begin(); i != branches.end(); i++)
                 (*i)->print( os, indent + 4 );
 
-        //for_each( statements.begin(), statements.end(), mem_fun( bind1st(&Statement::print ), os ));
+        //for_each( branches.begin(), branches.end(), mem_fun( bind1st(&Statement::print ), os ));
 }
 
@@ -185 +187 @@
 }
 
-CaseStmt * CaseStmt::makeDefault( std::list<Label> labels, std::list<Statement *> stmts ) {
-        return new CaseStmt( labels, 0, stmts, true );
+CaseStmt * CaseStmt::makeDefault( std::list<Label> labels, std::list<Statement *> branches ) {
+        return new CaseStmt( labels, 0, branches, true );
 }
 

src/SynTree/Statement.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:26:02 2016
-// Update Count     : 64
+// Last Modified On : Tue Jul 12 17:53:29 2016
+// Update Count     : 47
 //
 
@@ -129 +129 @@
 class SwitchStmt : public Statement {
   public:
-        SwitchStmt( std::list<Label> labels, Expression *condition, std::list<Statement *> &statements );
+        SwitchStmt( std::list<Label> labels, Expression *condition, std::list<Statement *> &branches );
         SwitchStmt( const SwitchStmt &other );
         virtual ~SwitchStmt();
@@ -136 +136 @@
         void set_condition( Expression *newValue ) { condition = newValue; }
 
-        std::list<Statement *> & get_statements() { return statements; }
+        std::list<Statement *> & get_branches() { return branches; }
+        void add_case( CaseStmt * );
 
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -145 +146 @@
   private:
         Expression * condition;
-        std::list<Statement *> statements;
+        std::list<Statement *> branches; // should be list of CaseStmt
 };
 
 class CaseStmt : public Statement {
   public:
-        CaseStmt( std::list<Label> labels, Expression *conditions, std::list<Statement *> &stmts, bool isdef = false ) throw(SemanticError);
+        CaseStmt( std::list<Label> labels, Expression *conditions,
+              std::list<Statement *> &stmts, bool isdef = false ) throw(SemanticError);
         CaseStmt( const CaseStmt &other );
         virtual ~CaseStmt();
 
-        static CaseStmt * makeDefault( std::list<Label> labels = std::list<Label>(), std::list<Statement *> stmts = std::list<Statement *>() );
+        static CaseStmt * makeDefault( std::list<Label> labels = std::list<Label>(),
+                std::list<Statement *> stmts = std::list<Statement *>() );
 
         bool isDefault() const { return _isDefault; }

src/SynTree/SynTree.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug  3 17:02:34 2016
-// Update Count     : 7
+// Last Modified On : Tue Jul 12 17:54:02 2016
+// Update Count     : 6
 //
 
@@ -83 +83 @@
 class UntypedValofExpr;
 class CompoundLiteralExpr;
-class RangeExpr;
 
 class Type;

src/SynTree/Visitor.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:24:25 2016
-// Update Count     : 21
+// Last Modified On : Tue Jul 12 17:54:39 2016
+// Update Count     : 19
 //
 
@@ -109 +109 @@
 void Visitor::visit( SwitchStmt *switchStmt ) {
         maybeAccept( switchStmt->get_condition(), *this );
-        acceptAll( switchStmt->get_statements(), *this );
+        acceptAll( switchStmt->get_branches(), *this );
 }
 
@@ -296 +296 @@
         maybeAccept( compLitExpr->get_type(), *this );
         maybeAccept( compLitExpr->get_initializer(), *this );
-}
-
-void Visitor::visit( RangeExpr *rangeExpr ) {
-        maybeAccept( rangeExpr->get_low(), *this );
-        maybeAccept( rangeExpr->get_high(), *this );
 }
 

src/SynTree/Visitor.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug  3 17:01:50 2016
-// Update Count     : 9
+// Last Modified On : Tue Jul 12 17:55:09 2016
+// Update Count     : 8
 //
 
@@ -78 +78 @@
         virtual void visit( UntypedValofExpr *valofExpr );
         virtual void visit( CompoundLiteralExpr *compLitExpr );
-        virtual void visit( RangeExpr *rangeExpr );
 
         virtual void visit( VoidType *basicType );

src/examples/gc_no_raii/bug-repro/return_template.c

@@ -5 +5 @@
 };
 
-forall(otype T) void ?{}(wrap(T)* this);
-forall(otype T) void ?{}(wrap(T)* this, wrap(T)* rhs);
-forall(otype T) void ^?{}(wrap(T)* this);
-forall(otype T) void ?=?(wrap(T)* this, wrap(T)* rhs);
-
 forall(otype T)
-wrap(T) test()
+static inline wrap(T) test()
 {
         wrap(T) tester;

src/examples/gc_no_raii/src/gc.h

@@ -7 +7 @@
 static inline gcpointer(T) gcmalloc()
 {
-    gcpointer(T) ptr;
-    void* address = gc_allocate(sizeof(T));
-    (&ptr){ address };
-    ctor(&ptr, address);
-    gc_conditional_collect();
-    return ptr;
+    gcpointer(T) test;
+    // ctor(&test, gc_allocate(sizeof(T)));
+    // gc_conditional_collect();
+    return test;
 }

src/examples/gc_no_raii/src/gcpointers.c

@@ -1 +1 @@
 #include "gcpointers.h"
 
-// #include "gc.h"
+#include "gc.h"
 #include "internal/collector.h"
 #include "internal/object_header.h"

src/examples/gc_no_raii/src/gcpointers.h

@@ -10 +10 @@
 };
 
-void ?{}(gcpointer_t* this);
-void ?{}(gcpointer_t* this, void* address);
-void ?{}(gcpointer_t* this, gcpointer_t other);
-void ^?{}(gcpointer_t* this);
-gcpointer_t* ?=?(gcpointer_t this, gcpointer_t rhs);
+void gcpointer_ctor(gcpointer_t* this);
+void gcpointer_ctor(gcpointer_t* this, void* address);
+void gcpointer_ctor(gcpointer_t* this, gcpointer_t* other);
+void gcpointer_dtor(gcpointer_t* this);
+gcpointer_t* gcpointer_assign(gcpointer_t* this, gcpointer_t* rhs);
 
 //Logical operators
@@ -27 +27 @@
 };
 
-//
-forall(otype T) void ?{}(gcpointer(T)* this);
-forall(otype T) void ?{}(gcpointer(T)* this, void* address);
-forall(otype T) void ctor(gcpointer(T)* this, void* address);
-forall(otype T) void ?{}(gcpointer(T)* this, gcpointer(T)* other);
-forall(otype T) void ^?{}(gcpointer(T)* this);
-forall(otype T) gcpointer(T) ?=?(gcpointer(T) this, gcpointer(T) rhs);
+forall(otype T)
+static inline void ctor(gcpointer(T)* this)
+{
+        gcpointer_ctor(&this->internal);
+}
 
+// forall(otype T)
+// static inline void ctor(gcpointer(T)* this, int null)
+// {
+//      gcpointer_ctor(&this->internal, NULL);
+// }
 
-forall(otype T) T *?(gcpointer(T) this);
+forall(otype T)
+static inline void ctor(gcpointer(T)* this, void* address)
+{
+        gcpointer_ctor(&this->internal, address);
+}
+
+forall(otype T)
+static inline void ctor(gcpointer(T)* this, gcpointer(T)* other)
+{
+        gcpointer_ctor(&this->internal, other);
+}
+
+forall(otype T)
+static inline void dtor(gcpointer(T)* this)
+{
+        gcpointer_dtor(&this->internal);
+}
+
+forall(otype T)
+static inline gcpointer(T)* ?=?(gcpointer(T)* this, gcpointer(T)* rhs)
+{
+        gcpointer_assign(&this->internal, &rhs->internal);
+        return this;
+}
+
+forall(otype T)
+static inline T *?(gcpointer(T) this)
+{
+        return *(T*)this.internal.ptr;
+}
 
 //Logical operators
-forall(otype T) int ?!=?(gcpointer(T) this, gcpointer(T) rhs);
-forall(otype T) int ?==?(gcpointer(T) this, gcpointer(T) rhs);
+forall(otype T)
+static inline int ?!=?(gcpointer(T) this, gcpointer(T) rhs)
+{
+        return this.internal.ptr != rhs.internal.ptr;
+}
+
+forall(otype T)
+static inline int ?==?(gcpointer(T) this, gcpointer(T) rhs)
+{
+        return !(this == rhs);
+}
+
+forall(otype T)
+extern struct gcpointer(T) 0;

src/examples/gc_no_raii/src/internal/memory_pool.h

@@ -3 +3 @@
 extern "C" {
 #include <stdbool.h>
-#include <stddef.h>
 #include <stdint.h>
 }

src/examples/gc_no_raii/src/internal/state.h

@@ -1 +1 @@
 #pragma once
 
-#ifdef __cforall
-extern "C" {
-#endif
 #include <stddef.h>
 #include <stdint.h>
-#ifdef __cforall
-}
-#endif
-#include <vector>
 
 #include "tools.h"
+#include "vector.h"
 
 typedef vector(struct gc_memory_pool*, heap_allocator(struct gc_memory_pool*)) pools_table_t;

src/examples/gc_no_raii/src/tools/worklist.h

@@ -10 +10 @@
 #endif
 
-#include <vector>
+#include "vector.h"
 
 typedef vector(intptr_t*, heap_allocator(intptr_t*)) worklist_t;

src/examples/gc_no_raii/test/badlll.c

@@ -7 +7 @@
 };
 
-void ?{}(List_t* this);
-List_t* ?=?(List_t* this, List_t* rhs);
-
 typedef gcpointer(List_t) LLL;
 
 #define MAX (1024 * 1024)
 
-// LLL buildLLL(int sz)
-void bla()
+LLL buildLLL(int sz)
 {
         int i;
-        // LLL ll0;//, lll, llc;
-//
-//      ll0 = gcmalloc();
-//      ll0->val = 0;
-//      lll = ll0;
-//
-//      for (i = 1; i < sz; i++)
-//      {
-//              llc = gcmalloc();
-//              llc->val = i;
-//              lll->next = llc;
-//              lll = llc;
-//      }
-//
-        // return ll0;
+        LLL ll0, lll, llc;
+
+        ll0 = gcmalloc();
+        ll0->val = 0;
+        lll = ll0;
+
+        for (i = 1; i < sz; i++)
+        {
+                llc = gcmalloc();
+                llc->val = i;
+                lll->next = llc;
+                lll = llc;
+        }
+
+        return ll0;
 }
-//
-// void testLLL(LLL lll)
-// {
-//      unsigned char *counted;
-//
-//      counted = (unsigned char *) calloc(MAX, sizeof(unsigned char));
-//      while (lll)
-//      {
-//              counted[lll->val]++;
-//              if (counted[lll->val] > 1)
-//              {
-//                      fprintf(stderr, "ERROR! Encountered %d twice!\n", lll->val);
-//                      exit(1);
-//              }
-//              lll = lll->next;
-//      }
-//
-//      return;
-// }
+
+void testLLL(LLL lll)
+{
+        unsigned char *counted;
+
+        counted = (unsigned char *) calloc(MAX, sizeof(unsigned char));
+        while (lll)
+        {
+                counted[lll->val]++;
+                if (counted[lll->val] > 1)
+                {
+                        fprintf(stderr, "ERROR! Encountered %d twice!\n", lll->val);
+                        exit(1);
+                }
+                lll = lll->next;
+        }
+
+        return;
+}
 
 int main(void)
@@ -58 +54 @@
         LLL mylll;
 
-        // mylll = buildLLL(MAX);
-        //
-        // testLLL(mylll);
+        mylll = buildLLL(MAX);
+
+        testLLL(mylll);
 
         return 0;

src/examples/gc_no_raii/test/gctest.c

@@ -7 +7 @@
 int main() {
         sout | "Bonjour au monde!\n";
-
-        gcpointer(int) anInt = gcmalloc();
 }

src/main.cc

@@ -43 +43 @@
 #include "InitTweak/GenInit.h"
 #include "InitTweak/FixInit.h"
+#include "InitTweak/FixGlobalInit.h"
 //#include "Explain/GenProlog.h"
 //#include "Try/Visit.h"
@@ -282 +283 @@
                 OPTPRINT( "fixNames" )
                 CodeGen::fixNames( translationUnit );
+                OPTPRINT( "fixGlobalInit" );
+                InitTweak::fixGlobalInit( translationUnit, filename, libcfap || treep );
                 OPTPRINT( "tweakInit" )
                 InitTweak::genInit( translationUnit );
@@ -302 +305 @@
                 }
 
+                OPTPRINT( "fixInit" )
                 // fix ObjectDecl - replaces ConstructorInit nodes
-                OPTPRINT( "fixInit" )
-                InitTweak::fix( translationUnit, filename, libcfap || treep );
+                InitTweak::fix( translationUnit );
                 if ( ctorinitp ) {
                         dump ( translationUnit );

src/tests/.expect/64/extension.txt

@@ -100 +100 @@
     ((void)((__extension__ __a__i_2 , __extension__ __b__i_2) , __extension__ __c__i_2));
 }
+__attribute__ ((constructor(),)) static void _init_extension(void){
+    int _global_init0;
+    ((void)((*((int *)(&__a__i_1)))=_global_init0) /* ?{} */);
+    int _global_init1;
+    ((void)((*((int *)(&__b__i_1)))=_global_init1) /* ?{} */);
+    int _global_init2;
+    ((void)((*((int *)(&__c__i_1)))=_global_init2) /* ?{} */);
+}
+__attribute__ ((destructor(),)) static void _destroy_extension(void){
+    ((void)((*((int *)(&__c__i_1)))) /* ^?{} */);
+    ((void)((*((int *)(&__b__i_1)))) /* ^?{} */);
+    ((void)((*((int *)(&__a__i_1)))) /* ^?{} */);
+}

src/tests/init_once.c

@@ -92 +92 @@
 init_once y = x;
 
-void static_variable() {
-        static init_once x;
-}
-
 int main() {
         // local variables
@@ -183 +179 @@
                 }
         }
-
-        // function-scoped static variable
-        for (int i = 0; i < 10; i++) {
-                static_variable();
-        }
 }
 

src/tests/switch.c

@@ -10 +10 @@
 // Created On       : Tue Jul 12 06:50:22 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:44:29 2016
-// Update Count     : 31
+// Last Modified On : Sat Jul 30 14:41:32 2016
+// Update Count     : 30
 // 
 
@@ -39 +39 @@
           case 4:
                 j = 0;
-        }
-
-        switch ( i ) {
-          case 1, 2, 3:
-                switch ( i ) {
-                  case 2, 3, 4:
-                        7;
-                }
         }