Changes in / [12bc63a:fc4a0fa]

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (3 diffs)
• CodeGen/CodeGenerator.h (modified) (1 diff)
• ControlStruct/LabelTypeChecker.cc (added)
• ControlStruct/LabelTypeChecker.h (added)
• ControlStruct/Mutate.cc (modified) (2 diffs)
• ControlStruct/module.mk (modified) (2 diffs)
• GenPoly/Box.cc (modified) (18 diffs)
• GenPoly/Lvalue.cc (modified) (6 diffs)
• GenPoly/Specialize.cc (modified) (4 diffs)
• InitTweak/FixInit.cc (modified) (6 diffs)
• InitTweak/InitTweak.cc (modified) (3 diffs)
• Makefile.in (modified) (12 diffs)
• Parser/ExpressionNode.cc (modified) (1 diff)
• Parser/ParseNode.h (modified) (1 diff)
• Parser/parser.cc (modified) (239 diffs)
• Parser/parser.yy (modified) (1 diff)
• ResolvExpr/Alternative.cc (modified) (3 diffs)
• ResolvExpr/AlternativeFinder.cc (modified) (28 diffs)
• ResolvExpr/AlternativeFinder.h (modified) (2 diffs)
• ResolvExpr/AlternativePrinter.cc (modified) (2 diffs)
• ResolvExpr/ConversionCost.cc (modified) (1 diff)
• ResolvExpr/ResolveTypeof.cc (modified) (2 diffs)
• ResolvExpr/Resolver.cc (modified) (6 diffs)
• ResolvExpr/Unify.cc (modified) (1 diff)
• ResolvExpr/typeops.h (modified) (6 diffs)
• SymTab/Autogen.cc (modified) (1 diff)
• SymTab/Indexer.cc (modified) (11 diffs)
• SymTab/Indexer.h (modified) (1 diff)
• SynTree/AddressExpr.cc (modified) (2 diffs)
• SynTree/ApplicationExpr.cc (modified) (2 diffs)
• SynTree/CommaExpr.cc (modified) (1 diff)
• SynTree/Expression.cc (modified) (19 diffs)
• SynTree/Expression.h (modified) (8 diffs)
• SynTree/Mutator.cc (modified) (20 diffs)
• SynTree/Mutator.h (modified) (2 diffs)
• SynTree/ReferenceToType.cc (modified) (1 diff)
• SynTree/SynTree.h (modified) (2 diffs)
• SynTree/TupleExpr.cc (modified) (3 diffs)
• SynTree/TupleType.cc (modified) (2 diffs)
• SynTree/Type.h (modified) (6 diffs)
• SynTree/Visitor.cc (modified) (11 diffs)
• SynTree/Visitor.h (modified) (2 diffs)
• Tuples/NameMatcher.cc (added)
• Tuples/NameMatcher.h (added)
• Tuples/TupleAssignment.cc (modified) (3 diffs)
• Tuples/TupleAssignment.h (added)
• Tuples/TupleExpansion.cc (deleted)
• Tuples/Tuples.h (deleted)
• Tuples/module.mk (modified) (2 diffs)
• main.cc (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -309 +309 @@
                                                         UntypedExpr * newExpr = new UntypedExpr( new NameExpr( "*?" ) );
                                                         newExpr->get_args().push_back( *arg );
-                                                        Type * type = InitTweak::getPointerBase( (*arg)->get_result() );
+                                                        assert( (*arg)->get_results().size() == 1 );
+                                                        Type * type = InitTweak::getPointerBase( (*arg)->get_results().front() );
                                                         assert( type );
-                                                        newExpr->set_result( type->clone() );
+                                                        newExpr->get_results().push_back( type->clone() );
                                                         *arg = newExpr;
                                                 } // if
@@ -526 +527 @@
                 extension( castExpr );
                 output << "(";
-                if ( castExpr->get_result()->isVoid() ) {
+                if ( castExpr->get_results().empty() ) {
                         output << "(void)" ;
-                } else if ( ! castExpr->get_result()->get_isLvalue() ) {
+                } else if ( ! castExpr->get_results().front()->get_isLvalue() ) {
                         // at least one result type of cast, but not an lvalue
                         output << "(";
-                        output << genType( castExpr->get_result(), "" );
+                        output << genType( castExpr->get_results().front(), "" );
                         output << ")";
                 } else {
@@ -653 +654 @@
                 asmExpr->get_operand()->accept( *this );
                 output << " )";
-        }
-
-        void CodeGenerator::visit( StmtExpr * stmtExpr ) {
-                output << "(";
-                stmtExpr->get_statements()->accept( *this );
-                output << ")";
         }
 

src/CodeGen/CodeGenerator.h

@@ -73 +73 @@
                 virtual void visit( TypeExpr *typeExpr );
                 virtual void visit( AsmExpr * );
-                virtual void visit( StmtExpr * );
 
                 //*** Statements

src/ControlStruct/Mutate.cc

@@ -23 +23 @@
 #include "MLEMutator.h"
 #include "ForExprMutator.h"
+#include "LabelTypeChecker.h"
 //#include "ExceptMutator.h"
 
@@ -40 +41 @@
 
                 //ExceptMutator exc;
+                // LabelTypeChecker lbl;
 
                 mutateAll( translationUnit, formut );
                 acceptAll( translationUnit, lfix );
                 //mutateAll( translationUnit, exc );
+                //acceptAll( translationUnit, lbl );
         }
 } // namespace CodeGen

src/ControlStruct/module.mk

@@ -6 +6 @@
 ## file "LICENCE" distributed with Cforall.
 ##
-## module.mk --
+## module.mk -- 
 ##
 ## Author           : Richard C. Bilson
@@ -19 +19 @@
         ControlStruct/MLEMutator.cc \
         ControlStruct/Mutate.cc \
-        ControlStruct/ForExprMutator.cc
+        ControlStruct/ForExprMutator.cc \
+        ControlStruct/LabelTypeChecker.cc
 

src/GenPoly/Box.cc

@@ -782 +782 @@
 
                         // add size/align for generic types to parameter list
-                        if ( ! appExpr->get_function()->has_result() ) return;
-                        FunctionType *funcType = getFunctionType( appExpr->get_function()->get_result() );
+                        if ( appExpr->get_function()->get_results().empty() ) return;
+                        FunctionType *funcType = getFunctionType( appExpr->get_function()->get_results().front() );
                         assert( funcType );
 
@@ -799 +799 @@
                         for ( ; fnParm != funcType->get_parameters().end() && fnArg != appExpr->get_args().end(); ++fnParm, ++fnArg ) {
                                 VariableExpr *fnArgBase = getBaseVar( *fnArg );
-                                if ( ! fnArgBase ) continue; // xxx - previously had check for non-empty fnArgBase results
-                                passArgTypeVars( appExpr, (*fnParm)->get_type(), fnArgBase->get_result(), arg, exprTyVars, seenTypes );
+                                if ( ! fnArgBase || fnArgBase->get_results().empty() ) continue;
+                                passArgTypeVars( appExpr, (*fnParm)->get_type(), fnArgBase->get_results().front(), arg, exprTyVars, seenTypes );
                         }
                 }
@@ -890 +890 @@
                         Type * adapteeType = new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) );
                         appExpr->get_args().push_front( new CastExpr( appExpr->get_function(), adapteeType ) );
-                        appExpr->set_function( new NameExpr( adapterName ) ); // xxx - result is never set on NameExpr
+                        appExpr->set_function( new NameExpr( adapterName ) );
 
                         return ret;
@@ -896 +896 @@
 
                 void Pass1::boxParam( Type *param, Expression *&arg, const TyVarMap &exprTyVars ) {
-                        assert( arg->has_result() );
+                        assert( ! arg->get_results().empty() );
                         if ( isPolyType( param, exprTyVars ) ) {
-                                if ( isPolyType( arg->get_result() ) ) {
+                                if ( isPolyType( arg->get_results().front() ) ) {
                                         // if the argument's type is polymorphic, we don't need to box again!
                                         return;
-                                } else if ( arg->get_result()->get_isLvalue() ) {
+                                } else if ( arg->get_results().front()->get_isLvalue() ) {
                                         // VariableExpr and MemberExpr are lvalues; need to check this isn't coming from the second arg of a comma expression though (not an lvalue)
                                         // xxx - need to test that this code is still reachable
@@ -987 +987 @@
                                         UntypedExpr *deref = new UntypedExpr( new NameExpr( "*?" ) );
                                         deref->get_args().push_back( new CastExpr( new VariableExpr( param ), new PointerType( Type::Qualifiers(), arg->get_type()->clone() ) ) );
-                                        deref->set_result( arg->get_type()->clone() );
+                                        deref->get_results().push_back( arg->get_type()->clone() );
                                         return deref;
                                 } // if
@@ -1124 +1124 @@
                         } // if
                         addAssign->get_args().push_back( new NameExpr( sizeofName( mangleType( polyType ) ) ) );
-                        addAssign->set_result( appExpr->get_result()->clone() );
+                        addAssign->get_results().front() = appExpr->get_results().front()->clone();
                         if ( appExpr->get_env() ) {
                                 addAssign->set_env( appExpr->get_env() );
@@ -1138 +1138 @@
                                 if ( varExpr->get_var()->get_linkage() == LinkageSpec::Intrinsic ) {
                                         if ( varExpr->get_var()->get_name() == "?[?]" ) {
-                                                assert( appExpr->has_result() );
+                                                assert( ! appExpr->get_results().empty() );
                                                 assert( appExpr->get_args().size() == 2 );
-                                                Type *baseType1 = isPolyPtr( appExpr->get_args().front()->get_result(), scopeTyVars, env );
-                                                Type *baseType2 = isPolyPtr( appExpr->get_args().back()->get_result(), scopeTyVars, env );
+                                                Type *baseType1 = isPolyPtr( appExpr->get_args().front()->get_results().front(), scopeTyVars, env );
+                                                Type *baseType2 = isPolyPtr( appExpr->get_args().back()->get_results().front(), scopeTyVars, env );
                                                 assert( ! baseType1 || ! baseType2 ); // the arguments cannot both be polymorphic pointers
                                                 UntypedExpr *ret = 0;
@@ -1161 +1161 @@
                                                 } // if
                                                 if ( baseType1 || baseType2 ) {
-                                                        ret->set_result( appExpr->get_result()->clone() );
+                                                        ret->get_results().push_front( appExpr->get_results().front()->clone() );
                                                         if ( appExpr->get_env() ) {
                                                                 ret->set_env( appExpr->get_env() );
@@ -1171 +1171 @@
                                                 } // if
                                         } else if ( varExpr->get_var()->get_name() == "*?" ) {
-                                                assert( appExpr->has_result() );
+                                                assert( ! appExpr->get_results().empty() );
                                                 assert( ! appExpr->get_args().empty() );
-                                                if ( isPolyType( appExpr->get_result(), scopeTyVars, env ) ) {
+                                                if ( isPolyType( appExpr->get_results().front(), scopeTyVars, env ) ) {
                                                         Expression *ret = appExpr->get_args().front();
-                                                        delete ret->get_result();
-                                                        ret->set_result( appExpr->get_result()->clone() );
+                                                        delete ret->get_results().front();
+                                                        ret->get_results().front() = appExpr->get_results().front()->clone();
                                                         if ( appExpr->get_env() ) {
                                                                 ret->set_env( appExpr->get_env() );
@@ -1186 +1186 @@
                                                 } // if
                                         } else if ( varExpr->get_var()->get_name() == "?++" || varExpr->get_var()->get_name() == "?--" ) {
-                                                assert( appExpr->has_result() );
+                                                assert( ! appExpr->get_results().empty() );
                                                 assert( appExpr->get_args().size() == 1 );
-                                                if ( Type *baseType = isPolyPtr( appExpr->get_result(), scopeTyVars, env ) ) {
-                                                        Type *tempType = appExpr->get_result()->clone();
+                                                if ( Type *baseType = isPolyPtr( appExpr->get_results().front(), scopeTyVars, env ) ) {
+                                                        Type *tempType = appExpr->get_results().front()->clone();
                                                         if ( env ) {
                                                                 env->apply( tempType );
@@ -1206 +1206 @@
                                                 } // if
                                         } else if ( varExpr->get_var()->get_name() == "++?" || varExpr->get_var()->get_name() == "--?" ) {
-                                                assert( appExpr->has_result() );
+                                                assert( ! appExpr->get_results().empty() );
                                                 assert( appExpr->get_args().size() == 1 );
-                                                if ( Type *baseType = isPolyPtr( appExpr->get_result(), scopeTyVars, env ) ) {
+                                                if ( Type *baseType = isPolyPtr( appExpr->get_results().front(), scopeTyVars, env ) ) {
                                                         return makeIncrDecrExpr( appExpr, baseType, varExpr->get_var()->get_name() == "++?" );
                                                 } // if
                                         } else if ( varExpr->get_var()->get_name() == "?+?" || varExpr->get_var()->get_name() == "?-?" ) {
-                                                assert( appExpr->has_result() );
+                                                assert( ! appExpr->get_results().empty() );
                                                 assert( appExpr->get_args().size() == 2 );
-                                                Type *baseType1 = isPolyPtr( appExpr->get_args().front()->get_result(), scopeTyVars, env );
-                                                Type *baseType2 = isPolyPtr( appExpr->get_args().back()->get_result(), scopeTyVars, env );
+                                                Type *baseType1 = isPolyPtr( appExpr->get_args().front()->get_results().front(), scopeTyVars, env );
+                                                Type *baseType2 = isPolyPtr( appExpr->get_args().back()->get_results().front(), scopeTyVars, env );
                                                 if ( baseType1 && baseType2 ) {
                                                         UntypedExpr *divide = new UntypedExpr( new NameExpr( "?/?" ) );
                                                         divide->get_args().push_back( appExpr );
                                                         divide->get_args().push_back( new SizeofExpr( baseType1->clone() ) );
-                                                        divide->set_result( appExpr->get_result()->clone() );
+                                                        divide->get_results().push_front( appExpr->get_results().front()->clone() );
                                                         if ( appExpr->get_env() ) {
                                                                 divide->set_env( appExpr->get_env() );
@@ -1238 +1238 @@
                                                 } // if
                                         } else if ( varExpr->get_var()->get_name() == "?+=?" || varExpr->get_var()->get_name() == "?-=?" ) {
-                                                assert( appExpr->has_result() );
+                                                assert( ! appExpr->get_results().empty() );
                                                 assert( appExpr->get_args().size() == 2 );
-                                                Type *baseType = isPolyPtr( appExpr->get_result(), scopeTyVars, env );
+                                                Type *baseType = isPolyPtr( appExpr->get_results().front(), scopeTyVars, env );
                                                 if ( baseType ) {
                                                         UntypedExpr *multiply = new UntypedExpr( new NameExpr( "?*?" ) );
@@ -1266 +1266 @@
                         useRetval = oldUseRetval;
 
-                        assert( appExpr->get_function()->has_result() );
-                        PointerType *pointer = safe_dynamic_cast< PointerType *>( appExpr->get_function()->get_result() );
-                        FunctionType *function = safe_dynamic_cast< FunctionType *>( pointer->get_base() );
+                        assert( ! appExpr->get_function()->get_results().empty() );
+                        PointerType *pointer = dynamic_cast< PointerType *>( appExpr->get_function()->get_results().front() );
+                        assert( pointer );
+                        FunctionType *function = dynamic_cast< FunctionType *>( pointer->get_base() );
+                        assert( function );
 
                         if ( Expression *newExpr = handleIntrinsics( appExpr ) ) {
@@ -1306 +1308 @@
 
                 Expression *Pass1::mutate( UntypedExpr *expr ) {
-                        if ( expr->has_result() && isPolyType( expr->get_result(), scopeTyVars, env ) ) {
+                        if ( ! expr->get_results().empty() && isPolyType( expr->get_results().front(), scopeTyVars, env ) ) {
                                 if ( NameExpr *name = dynamic_cast< NameExpr *>( expr->get_function() ) ) {
                                         if ( name->get_name() == "*?" ) {
@@ -1320 +1322 @@
 
                 Expression *Pass1::mutate( AddressExpr *addrExpr ) {
-                        assert( addrExpr->get_arg()->has_result() && ! addrExpr->get_arg()->get_result()->isVoid() );
+                        assert( ! addrExpr->get_arg()->get_results().empty() );
 
                         bool needs = false;
                         if ( UntypedExpr *expr = dynamic_cast< UntypedExpr *>( addrExpr->get_arg() ) ) {
-                                if ( expr->has_result() && isPolyType( expr->get_result(), scopeTyVars, env ) ) {
+                                if ( ! expr->get_results().empty() && isPolyType( expr->get_results().front(), scopeTyVars, env ) ) {
                                         if ( NameExpr *name = dynamic_cast< NameExpr *>( expr->get_function() ) ) {
                                                 if ( name->get_name() == "*?" ) {
                                                         if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( expr->get_args().front() ) ) {
-                                                                assert( appExpr->get_function()->has_result() );
-                                                                PointerType *pointer = safe_dynamic_cast< PointerType *>( appExpr->get_function()->get_result() );
-                                                                FunctionType *function = safe_dynamic_cast< FunctionType *>( pointer->get_base() );
+                                                                assert( ! appExpr->get_function()->get_results().empty() );
+                                                                PointerType *pointer = dynamic_cast< PointerType *>( appExpr->get_function()->get_results().front() );
+                                                                assert( pointer );
+                                                                FunctionType *function = dynamic_cast< FunctionType *>( pointer->get_base() );
+                                                                assert( function );
                                                                 needs = needsAdapter( function, scopeTyVars );
                                                         } // if
@@ -1339 +1343 @@
                         // isPolyType check needs to happen before mutating addrExpr arg, so pull it forward
                         // out of the if condition.
-                        bool polytype = isPolyType( addrExpr->get_arg()->get_result(), scopeTyVars, env );
+                        bool polytype = isPolyType( addrExpr->get_arg()->get_results().front(), scopeTyVars, env );
                         addrExpr->set_arg( mutateExpression( addrExpr->get_arg() ) );
                         if ( polytype || needs ) {
                                 Expression *ret = addrExpr->get_arg();
-                                delete ret->get_result();
-                                ret->set_result( addrExpr->get_result()->clone() );
+                                delete ret->get_results().front();
+                                ret->get_results().front() = addrExpr->get_results().front()->clone();
                                 addrExpr->set_arg( 0 );
                                 delete addrExpr;
@@ -1382 +1386 @@
                 Statement * Pass1::mutate( ReturnStmt *returnStmt ) {
                         if ( retval && returnStmt->get_expr() ) {
-                                assert( returnStmt->get_expr()->has_result() && ! returnStmt->get_expr()->get_result()->isVoid() );
+                                assert( ! returnStmt->get_expr()->get_results().empty() );
                                 // ***** Code Removal ***** After introducing a temporary variable for all return expressions, the following code appears superfluous.
                                 // if ( returnStmt->get_expr()->get_results().front()->get_isLvalue() ) {
@@ -1462 +1466 @@
                                 // replace return statement with appropriate assignment to out parameter
                                 Expression *retParm = new NameExpr( retval->get_name() );
-                                retParm->set_result( new PointerType( Type::Qualifiers(), retval->get_type()->clone() ) );
+                                retParm->get_results().push_back( new PointerType( Type::Qualifiers(), retval->get_type()->clone() ) );
                                 assignExpr->get_args().push_back( retParm );
                                 assignExpr->get_args().push_back( returnStmt->get_expr() );

src/GenPoly/Lvalue.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Lvalue.cc --
+// Lvalue.cc -- 
 //
 // Author           : Richard C. Bilson
@@ -41 +41 @@
                   public:
                         Pass1();
-
+  
                         virtual Expression *mutate( ApplicationExpr *appExpr );
                         virtual Statement *mutate( ReturnStmt *appExpr );
@@ -99 +99 @@
                         appExpr->get_function()->acceptMutator( *this );
                         mutateAll( appExpr->get_args(), *this );
+  
+                        assert( ! appExpr->get_function()->get_results().empty() );
 
-                        PointerType *pointer = safe_dynamic_cast< PointerType* >( appExpr->get_function()->get_result() );
-                        FunctionType *function = safe_dynamic_cast< FunctionType* >( pointer->get_base() );
+                        PointerType *pointer = dynamic_cast< PointerType* >( appExpr->get_function()->get_results().front() );
+                        assert( pointer );
+                        FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() );
+                        assert( function );
 
                         Type *funType = isLvalueRet( function );
                         if ( funType && ! isIntrinsicApp( appExpr ) ) {
                                 Expression *expr = appExpr;
-                                Type *appType = appExpr->get_result();
+                                Type *appType = appExpr->get_results().front();
                                 if ( isPolyType( funType ) && ! isPolyType( appType ) ) {
                                         // make sure cast for polymorphic type is inside dereference
@@ -112 +116 @@
                                 }
                                 UntypedExpr *deref = new UntypedExpr( new NameExpr( "*?" ) );
-                                deref->set_result( appType->clone() );
-                                appExpr->set_result( new PointerType( Type::Qualifiers(), appType ) );
+                                deref->get_results().push_back( appType->clone() );
+                                appExpr->get_results().front() = new PointerType( Type::Qualifiers(), appType );
                                 deref->get_args().push_back( expr );
                                 return deref;
@@ -123 +127 @@
                 Statement * Pass1::mutate(ReturnStmt *retStmt) {
                         if ( retval && retStmt->get_expr() ) {
-                                if ( retStmt->get_expr()->get_result()->get_isLvalue() ) {
+                                assert( ! retStmt->get_expr()->get_results().empty() );
+                                if ( retStmt->get_expr()->get_results().front()->get_isLvalue() ) {
                                         // ***** Code Removal ***** because casts may be stripped already
 
@@ -150 +155 @@
                                 retParm->set_type( new PointerType( Type::Qualifiers(), retParm->get_type() ) );
                         } // if
-
+  
                         Visitor::visit( funType );
                 }

src/GenPoly/Specialize.cc

@@ -147 +147 @@
 
         Expression * Specialize::doSpecialization( Type *formalType, Expression *actual, InferredParams *inferParams ) {
-                assert( actual->has_result() );
-                if ( needsSpecialization( formalType, actual->get_result(), env ) ) {
+                assert( ! actual->get_results().empty() ); // using front, should have this assert
+                if ( needsSpecialization( formalType, actual->get_results().front(), env ) ) {
                         FunctionType *funType;
                         if ( ( funType = getFunctionType( formalType ) ) ) {
@@ -171 +171 @@
         void Specialize::handleExplicitParams( ApplicationExpr *appExpr ) {
                 // create thunks for the explicit parameters
-                assert( appExpr->get_function()->has_result() );
-                FunctionType *function = getFunctionType( appExpr->get_function()->get_result() );
+                assert( ! appExpr->get_function()->get_results().empty() );
+                FunctionType *function = getFunctionType( appExpr->get_function()->get_results().front() );
                 assert( function );
                 std::list< DeclarationWithType* >::iterator formal;
@@ -200 +200 @@
         Expression * Specialize::mutate( AddressExpr *addrExpr ) {
                 addrExpr->get_arg()->acceptMutator( *this );
-                assert( addrExpr->has_result() );
-                addrExpr->set_arg( doSpecialization( addrExpr->get_result(), addrExpr->get_arg() ) );
+                assert( ! addrExpr->get_results().empty() );
+                addrExpr->set_arg( doSpecialization( addrExpr->get_results().front(), addrExpr->get_arg() ) );
                 return addrExpr;
         }
@@ -207 +207 @@
         Expression * Specialize::mutate( CastExpr *castExpr ) {
                 castExpr->get_arg()->acceptMutator( *this );
-                if ( castExpr->get_result()->isVoid() ) {
+                if ( castExpr->get_results().empty() ) {
                         // can't specialize if we don't have a return value
                         return castExpr;
                 }
-                Expression *specialized = doSpecialization( castExpr->get_result(), castExpr->get_arg() );
+                Expression *specialized = doSpecialization( castExpr->get_results().front(), castExpr->get_arg() );
                 if ( specialized != castExpr->get_arg() ) {
                         // assume here that the specialization incorporates the cast

src/InitTweak/FixInit.cc

@@ -391 +391 @@
                                 CP_CTOR_PRINT( std::cerr << "Type Substitution: " << *impCpCtorExpr->get_env() << std::endl; )
                                 // xxx - need to handle tuple arguments
-                                assert( arg->has_result() );
-                                Type * result = arg->get_result();
+                                assert( ! arg->get_results().empty() );
+                                Type * result = arg->get_results().front();
                                 if ( skipCopyConstruct( result ) ) continue; // skip certain non-copyable types
                                 // type may involve type variables, so apply type substitution to get temporary variable's actual type
@@ -423 +423 @@
                         // level. Trying to pass that environment along.
                         callExpr->set_env( impCpCtorExpr->get_env()->clone() );
-                        Type * result = appExpr->get_result();
-                        if ( ! result->isVoid() ) {
-                                // need to flatten result type and construct each
+                        for ( Type * result : appExpr->get_results() ) {
                                 result = result->clone();
                                 impCpCtorExpr->get_env()->apply( result );
@@ -481 +479 @@
                                 // know the result type of the assignment is the type of the LHS (minus the pointer), so
                                 // add that onto the assignment expression so that later steps have the necessary information
-                                assign->set_result( returnDecl->get_type()->clone() );
+                                assign->add_result( returnDecl->get_type()->clone() );
 
                                 Expression * retExpr = new CommaExpr( assign, new VariableExpr( returnDecl ) );
-                                if ( callExpr->get_result()->get_isLvalue() ) {
+                                if ( callExpr->get_results().front()->get_isLvalue() ) {
                                         // lvalue returning functions are funny. Lvalue.cc inserts a *? in front of any lvalue returning
                                         // non-intrinsic function. Add an AddressExpr to the call to negate the derefence and change the
@@ -502 +500 @@
                                         UntypedExpr * deref = new UntypedExpr( new NameExpr( "*?" ) );
                                         deref->get_args().push_back( retExpr );
-                                        deref->set_result( resultType );
+                                        deref->add_result( resultType );
                                         retExpr = deref;
                                 } // if
@@ -941 +939 @@
                 Expression * FixCtorExprs::mutate( ConstructorExpr * ctorExpr ) {
                         static UniqueName tempNamer( "_tmp_ctor_expr" );
-                        assert( ctorExpr->has_result() && ctorExpr->get_result()->size() == 1 );
-                        ObjectDecl * tmp = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, nullptr, ctorExpr->get_result()->clone(), nullptr );
+                        assert( ctorExpr->get_results().size() == 1 );
+                        ObjectDecl * tmp = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, nullptr, ctorExpr->get_results().front()->clone(), nullptr );
                         addDeclaration( tmp );
 
@@ -954 +952 @@
                         assign->get_args().push_back( new VariableExpr( tmp ) );
                         assign->get_args().push_back( firstArg );
-                        assign->set_result( ctorExpr->get_result()->clone() );
+                        cloneAll( ctorExpr->get_results(), assign->get_results() );
                         firstArg = assign;
 

src/InitTweak/InitTweak.cc

@@ -340 +340 @@
                 return allofCtorDtor( stmt, []( Expression * callExpr ){
                         if ( ApplicationExpr * appExpr = isIntrinsicCallExpr( callExpr ) ) {
-                                FunctionType *funcType = GenPoly::getFunctionType( appExpr->get_function()->get_result() );
+                                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;
@@ -387 +388 @@
                                 return memberExpr->get_member()->get_name();
                         } else if ( UntypedMemberExpr * memberExpr = dynamic_cast< UntypedMemberExpr * > ( func ) ) {
-                                return funcName( memberExpr->get_member() );
+                                return memberExpr->get_member();
                         } else {
                                 assertf( false, "Unexpected expression type being called as a function in call expression" );
@@ -450 +451 @@
                 // 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; }
-                virtual void visit( TupleExpr *tupleExpr ) { isConstExpr = false; }
-                virtual void visit( TupleAssignExpr *tupleExpr ) { isConstExpr = false; }
 
                 bool isConstExpr;

src/Makefile.in

@@ -104 +104 @@
         ControlStruct/driver_cfa_cpp-Mutate.$(OBJEXT) \
         ControlStruct/driver_cfa_cpp-ForExprMutator.$(OBJEXT) \
+        ControlStruct/driver_cfa_cpp-LabelTypeChecker.$(OBJEXT) \
         GenPoly/driver_cfa_cpp-Box.$(OBJEXT) \
         GenPoly/driver_cfa_cpp-GenPoly.$(OBJEXT) \
@@ -188 +189 @@
         SynTree/driver_cfa_cpp-Attribute.$(OBJEXT) \
         Tuples/driver_cfa_cpp-TupleAssignment.$(OBJEXT) \
-        Tuples/driver_cfa_cpp-TupleExpansion.$(OBJEXT)
+        Tuples/driver_cfa_cpp-NameMatcher.$(OBJEXT)
 am_driver_cfa_cpp_OBJECTS = $(am__objects_1)
 driver_cfa_cpp_OBJECTS = $(am_driver_cfa_cpp_OBJECTS)
@@ -360 +361 @@
         ControlStruct/LabelGenerator.cc ControlStruct/LabelFixer.cc \
         ControlStruct/MLEMutator.cc ControlStruct/Mutate.cc \
-        ControlStruct/ForExprMutator.cc GenPoly/Box.cc \
+        ControlStruct/ForExprMutator.cc \
+        ControlStruct/LabelTypeChecker.cc GenPoly/Box.cc \
         GenPoly/GenPoly.cc GenPoly/PolyMutator.cc \
         GenPoly/ScrubTyVars.cc GenPoly/Lvalue.cc GenPoly/Specialize.cc \
@@ -400 +402 @@
         SynTree/AddStmtVisitor.cc SynTree/TypeSubstitution.cc \
         SynTree/Attribute.cc Tuples/TupleAssignment.cc \
-        Tuples/TupleExpansion.cc
+        Tuples/NameMatcher.cc
 MAINTAINERCLEANFILES = Parser/parser.output ${libdir}/${notdir \
         ${cfa_cpplib_PROGRAMS}}
@@ -533 +535 @@
         ControlStruct/$(DEPDIR)/$(am__dirstamp)
 ControlStruct/driver_cfa_cpp-ForExprMutator.$(OBJEXT):  \
+        ControlStruct/$(am__dirstamp) \
+        ControlStruct/$(DEPDIR)/$(am__dirstamp)
+ControlStruct/driver_cfa_cpp-LabelTypeChecker.$(OBJEXT):  \
         ControlStruct/$(am__dirstamp) \
         ControlStruct/$(DEPDIR)/$(am__dirstamp)
@@ -764 +769 @@
 Tuples/driver_cfa_cpp-TupleAssignment.$(OBJEXT):  \
         Tuples/$(am__dirstamp) Tuples/$(DEPDIR)/$(am__dirstamp)
-Tuples/driver_cfa_cpp-TupleExpansion.$(OBJEXT):  \
-        Tuples/$(am__dirstamp) Tuples/$(DEPDIR)/$(am__dirstamp)
+Tuples/driver_cfa_cpp-NameMatcher.$(OBJEXT): Tuples/$(am__dirstamp) \
+        Tuples/$(DEPDIR)/$(am__dirstamp)
 driver/$(am__dirstamp):
         @$(MKDIR_P) driver
@@ -786 +791 @@
         -rm -f ControlStruct/driver_cfa_cpp-LabelFixer.$(OBJEXT)
         -rm -f ControlStruct/driver_cfa_cpp-LabelGenerator.$(OBJEXT)
+        -rm -f ControlStruct/driver_cfa_cpp-LabelTypeChecker.$(OBJEXT)
         -rm -f ControlStruct/driver_cfa_cpp-MLEMutator.$(OBJEXT)
         -rm -f ControlStruct/driver_cfa_cpp-Mutate.$(OBJEXT)
@@ -871 +877 @@
         -rm -f SynTree/driver_cfa_cpp-Visitor.$(OBJEXT)
         -rm -f SynTree/driver_cfa_cpp-VoidType.$(OBJEXT)
+        -rm -f Tuples/driver_cfa_cpp-NameMatcher.$(OBJEXT)
         -rm -f Tuples/driver_cfa_cpp-TupleAssignment.$(OBJEXT)
-        -rm -f Tuples/driver_cfa_cpp-TupleExpansion.$(OBJEXT)
 
 distclean-compile:
@@ -890 +896 @@
 @AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelFixer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelGenerator.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelTypeChecker.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-MLEMutator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-Mutate.Po@am__quote@
@@ -975 +982 @@
 @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-Visitor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-VoidType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/driver_cfa_cpp-NameMatcher.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/driver_cfa_cpp-TupleAssignment.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/driver_cfa_cpp-TupleExpansion.Po@am__quote@
 
 .cc.o:
@@ -1204 +1211 @@
 @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-ForExprMutator.obj `if test -f 'ControlStruct/ForExprMutator.cc'; then $(CYGPATH_W) 'ControlStruct/ForExprMutator.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/ForExprMutator.cc'; fi`
 
+ControlStruct/driver_cfa_cpp-LabelTypeChecker.o: ControlStruct/LabelTypeChecker.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-LabelTypeChecker.o -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelTypeChecker.Tpo -c -o ControlStruct/driver_cfa_cpp-LabelTypeChecker.o `test -f 'ControlStruct/LabelTypeChecker.cc' || echo '$(srcdir)/'`ControlStruct/LabelTypeChecker.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelTypeChecker.Tpo ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelTypeChecker.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ControlStruct/LabelTypeChecker.cc' object='ControlStruct/driver_cfa_cpp-LabelTypeChecker.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-LabelTypeChecker.o `test -f 'ControlStruct/LabelTypeChecker.cc' || echo '$(srcdir)/'`ControlStruct/LabelTypeChecker.cc
+
+ControlStruct/driver_cfa_cpp-LabelTypeChecker.obj: ControlStruct/LabelTypeChecker.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-LabelTypeChecker.obj -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelTypeChecker.Tpo -c -o ControlStruct/driver_cfa_cpp-LabelTypeChecker.obj `if test -f 'ControlStruct/LabelTypeChecker.cc'; then $(CYGPATH_W) 'ControlStruct/LabelTypeChecker.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/LabelTypeChecker.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelTypeChecker.Tpo ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelTypeChecker.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ControlStruct/LabelTypeChecker.cc' object='ControlStruct/driver_cfa_cpp-LabelTypeChecker.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-LabelTypeChecker.obj `if test -f 'ControlStruct/LabelTypeChecker.cc'; then $(CYGPATH_W) 'ControlStruct/LabelTypeChecker.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/LabelTypeChecker.cc'; fi`
+
 GenPoly/driver_cfa_cpp-Box.o: GenPoly/Box.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT GenPoly/driver_cfa_cpp-Box.o -MD -MP -MF GenPoly/$(DEPDIR)/driver_cfa_cpp-Box.Tpo -c -o GenPoly/driver_cfa_cpp-Box.o `test -f 'GenPoly/Box.cc' || echo '$(srcdir)/'`GenPoly/Box.cc
@@ -2380 +2401 @@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Tuples/driver_cfa_cpp-TupleAssignment.obj `if test -f 'Tuples/TupleAssignment.cc'; then $(CYGPATH_W) 'Tuples/TupleAssignment.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/TupleAssignment.cc'; fi`
 
-Tuples/driver_cfa_cpp-TupleExpansion.o: Tuples/TupleExpansion.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-TupleExpansion.o -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-TupleExpansion.Tpo -c -o Tuples/driver_cfa_cpp-TupleExpansion.o `test -f 'Tuples/TupleExpansion.cc' || echo '$(srcdir)/'`Tuples/TupleExpansion.cc
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-TupleExpansion.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-TupleExpansion.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/TupleExpansion.cc' object='Tuples/driver_cfa_cpp-TupleExpansion.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 Tuples/driver_cfa_cpp-TupleExpansion.o `test -f 'Tuples/TupleExpansion.cc' || echo '$(srcdir)/'`Tuples/TupleExpansion.cc
-
-Tuples/driver_cfa_cpp-TupleExpansion.obj: Tuples/TupleExpansion.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-TupleExpansion.obj -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-TupleExpansion.Tpo -c -o Tuples/driver_cfa_cpp-TupleExpansion.obj `if test -f 'Tuples/TupleExpansion.cc'; then $(CYGPATH_W) 'Tuples/TupleExpansion.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/TupleExpansion.cc'; fi`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-TupleExpansion.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-TupleExpansion.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/TupleExpansion.cc' object='Tuples/driver_cfa_cpp-TupleExpansion.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 Tuples/driver_cfa_cpp-TupleExpansion.obj `if test -f 'Tuples/TupleExpansion.cc'; then $(CYGPATH_W) 'Tuples/TupleExpansion.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/TupleExpansion.cc'; fi`
+Tuples/driver_cfa_cpp-NameMatcher.o: Tuples/NameMatcher.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-NameMatcher.o -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-NameMatcher.Tpo -c -o Tuples/driver_cfa_cpp-NameMatcher.o `test -f 'Tuples/NameMatcher.cc' || echo '$(srcdir)/'`Tuples/NameMatcher.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-NameMatcher.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-NameMatcher.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/NameMatcher.cc' object='Tuples/driver_cfa_cpp-NameMatcher.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 Tuples/driver_cfa_cpp-NameMatcher.o `test -f 'Tuples/NameMatcher.cc' || echo '$(srcdir)/'`Tuples/NameMatcher.cc
+
+Tuples/driver_cfa_cpp-NameMatcher.obj: Tuples/NameMatcher.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-NameMatcher.obj -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-NameMatcher.Tpo -c -o Tuples/driver_cfa_cpp-NameMatcher.obj `if test -f 'Tuples/NameMatcher.cc'; then $(CYGPATH_W) 'Tuples/NameMatcher.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/NameMatcher.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-NameMatcher.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-NameMatcher.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/NameMatcher.cc' object='Tuples/driver_cfa_cpp-NameMatcher.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 Tuples/driver_cfa_cpp-NameMatcher.obj `if test -f 'Tuples/NameMatcher.cc'; then $(CYGPATH_W) 'Tuples/NameMatcher.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/NameMatcher.cc'; fi`
 
 .ll.cc:

src/Parser/ExpressionNode.cc

@@ -200 +200 @@
 }
 
-Expression *build_fieldSel( ExpressionNode *expr_node, Expression *member ) {
-        UntypedMemberExpr *ret = new UntypedMemberExpr( member, maybeMoveBuild< Expression >(expr_node) );
-        return ret;
-}
-
-Expression *build_pfieldSel( ExpressionNode *expr_node, Expression *member ) {
+Expression *build_fieldSel( ExpressionNode *expr_node, NameExpr *member ) {
+        UntypedMemberExpr *ret = new UntypedMemberExpr( member->get_name(), maybeMoveBuild< Expression >(expr_node) );
+        delete member;
+        return ret;
+}
+
+Expression *build_pfieldSel( ExpressionNode *expr_node, NameExpr *member ) {
         UntypedExpr *deref = new UntypedExpr( new NameExpr( "*?" ) );
         deref->get_args().push_back( maybeMoveBuild< Expression >(expr_node) );
-        UntypedMemberExpr *ret = new UntypedMemberExpr( member, deref );
+        UntypedMemberExpr *ret = new UntypedMemberExpr( member->get_name(), deref );
+        delete member;
         return ret;
 }

src/Parser/ParseNode.h

@@ -165 +165 @@
 
 Expression * build_cast( DeclarationNode * decl_node, ExpressionNode * expr_node );
-Expression * build_fieldSel( ExpressionNode * expr_node, Expression * member );
-Expression * build_pfieldSel( ExpressionNode * expr_node, Expression * member );
+Expression * build_fieldSel( ExpressionNode * expr_node, NameExpr * member );
+Expression * build_pfieldSel( ExpressionNode * expr_node, NameExpr * member );
 Expression * build_addressOf( ExpressionNode * expr_node );
 Expression * build_sizeOfexpr( ExpressionNode * expr_node );

src/Parser/parser.cc

@@ -1023 +1023 @@
        0,   300,   300,   304,   311,   312,   313,   317,   318,   319,
      323,   324,   328,   329,   333,   334,   338,   342,   343,   354,
-     356,   358,   360,   365,   366,   372,   376,   378,   380,   382,
-     384,   386,   388,   390,   399,   400,   406,   407,   411,   412,
-     416,   420,   422,   424,   426,   431,   434,   436,   438,   443,
-     456,   458,   460,   462,   464,   466,   468,   470,   472,   474,
-     476,   483,   484,   490,   491,   492,   493,   497,   498,   500,
-     505,   506,   508,   510,   515,   516,   518,   523,   524,   526,
-     531,   532,   534,   536,   538,   543,   544,   546,   551,   552,
-     557,   558,   563,   564,   569,   570,   575,   576,   581,   582,
-     585,   587,   592,   597,   598,   600,   606,   607,   611,   612,
-     613,   614,   615,   616,   617,   618,   619,   620,   621,   622,
-     628,   630,   632,   634,   639,   640,   645,   646,   652,   653,
-     659,   660,   661,   662,   663,   664,   665,   666,   667,   677,
-     684,   686,   696,   697,   702,   704,   710,   712,   716,   717,
-     722,   727,   730,   732,   734,   744,   746,   757,   758,   760,
-     764,   766,   770,   771,   776,   777,   781,   786,   787,   791,
-     793,   799,   800,   804,   806,   808,   810,   816,   817,   821,
-     823,   828,   830,   832,   837,   839,   844,   846,   850,   853,
-     857,   860,   864,   866,   868,   870,   875,   877,   879,   884,
-     886,   888,   890,   892,   897,   899,   901,   903,   908,   920,
-     921,   926,   928,   933,   937,   939,   941,   943,   945,   951,
-     952,   958,   959,   963,   964,   969,   971,   977,   978,   980,
-     985,   990,  1000,  1002,  1006,  1007,  1012,  1014,  1018,  1019,
-    1023,  1025,  1029,  1030,  1034,  1035,  1039,  1040,  1055,  1056,
-    1057,  1058,  1059,  1063,  1068,  1075,  1085,  1090,  1095,  1103,
-    1108,  1113,  1118,  1123,  1131,  1153,  1158,  1165,  1167,  1174,
-    1179,  1184,  1195,  1200,  1205,  1210,  1215,  1224,  1229,  1237,
-    1238,  1239,  1240,  1246,  1251,  1259,  1260,  1261,  1262,  1266,
-    1267,  1268,  1269,  1274,  1275,  1284,  1285,  1290,  1291,  1296,
-    1298,  1300,  1302,  1304,  1307,  1306,  1318,  1319,  1321,  1331,
-    1332,  1337,  1339,  1341,  1343,  1345,  1348,  1350,  1353,  1358,
-    1360,  1362,  1364,  1366,  1368,  1370,  1372,  1374,  1376,  1378,
-    1380,  1382,  1388,  1389,  1391,  1393,  1395,  1400,  1401,  1407,
-    1408,  1410,  1412,  1417,  1419,  1421,  1423,  1428,  1429,  1431,
-    1433,  1438,  1439,  1441,  1446,  1447,  1449,  1451,  1456,  1458,
-    1460,  1465,  1466,  1470,  1472,  1478,  1477,  1481,  1483,  1488,
-    1490,  1496,  1497,  1502,  1503,  1505,  1506,  1515,  1516,  1518,
-    1520,  1525,  1527,  1533,  1534,  1536,  1539,  1542,  1547,  1548,
-    1553,  1558,  1562,  1564,  1570,  1569,  1576,  1578,  1584,  1585,
-    1593,  1594,  1598,  1599,  1600,  1602,  1604,  1611,  1612,  1614,
-    1616,  1621,  1622,  1628,  1629,  1633,  1634,  1639,  1640,  1641,
-    1643,  1651,  1652,  1654,  1657,  1659,  1663,  1664,  1665,  1667,
-    1669,  1673,  1678,  1686,  1687,  1696,  1698,  1703,  1704,  1705,
-    1709,  1710,  1711,  1715,  1716,  1717,  1721,  1722,  1723,  1728,
-    1729,  1730,  1731,  1737,  1738,  1740,  1745,  1746,  1751,  1752,
-    1753,  1754,  1755,  1770,  1771,  1776,  1777,  1783,  1785,  1788,
-    1790,  1792,  1815,  1816,  1818,  1820,  1825,  1826,  1828,  1833,
-    1838,  1839,  1845,  1844,  1848,  1852,  1854,  1856,  1862,  1863,
-    1868,  1873,  1875,  1880,  1882,  1883,  1885,  1890,  1892,  1894,
-    1899,  1901,  1906,  1911,  1919,  1925,  1924,  1938,  1939,  1944,
-    1945,  1949,  1954,  1959,  1967,  1972,  1983,  1984,  1989,  1990,
-    1996,  1997,  2001,  2002,  2003,  2006,  2005,  2016,  2025,  2031,
-    2037,  2046,  2052,  2058,  2064,  2070,  2078,  2084,  2092,  2098,
-    2107,  2108,  2109,  2113,  2117,  2119,  2124,  2125,  2129,  2130,
-    2135,  2141,  2142,  2145,  2147,  2148,  2152,  2153,  2154,  2155,
-    2189,  2191,  2192,  2194,  2199,  2204,  2209,  2211,  2213,  2218,
-    2220,  2222,  2224,  2229,  2231,  2240,  2242,  2243,  2248,  2250,
-    2252,  2257,  2259,  2261,  2266,  2268,  2270,  2279,  2280,  2281,
-    2285,  2287,  2289,  2294,  2296,  2298,  2303,  2305,  2307,  2322,
-    2324,  2325,  2327,  2332,  2333,  2338,  2340,  2342,  2347,  2349,
-    2351,  2353,  2358,  2360,  2362,  2372,  2374,  2375,  2377,  2382,
-    2384,  2386,  2391,  2393,  2395,  2397,  2402,  2404,  2406,  2437,
-    2439,  2440,  2442,  2447,  2452,  2460,  2462,  2464,  2469,  2471,
-    2476,  2478,  2492,  2493,  2495,  2500,  2502,  2504,  2506,  2508,
-    2513,  2514,  2516,  2518,  2523,  2525,  2527,  2533,  2535,  2537,
-    2541,  2543,  2545,  2547,  2561,  2562,  2564,  2569,  2571,  2573,
-    2575,  2577,  2582,  2583,  2585,  2587,  2592,  2594,  2596,  2602,
-    2603,  2605,  2614,  2617,  2619,  2622,  2624,  2626,  2639,  2640,
-    2642,  2647,  2649,  2651,  2653,  2655,  2660,  2661,  2663,  2665,
-    2670,  2672,  2680,  2681,  2682,  2687,  2688,  2692,  2694,  2696,
-    2698,  2700,  2702,  2709,  2711,  2713,  2715,  2717,  2719,  2721,
-    2723,  2725,  2727,  2732,  2734,  2736,  2741,  2767,  2768,  2770,
-    2774,  2775,  2779,  2781,  2783,  2785,  2787,  2789,  2796,  2798,
-    2800,  2802,  2804,  2806,  2811,  2816,  2818,  2820,  2838,  2840,
-    2845,  2846
+     356,   358,   360,   365,   366,   372,   376,   378,   379,   381,
+     382,   384,   386,   388,   397,   398,   404,   405,   409,   410,
+     414,   418,   420,   422,   424,   429,   432,   434,   436,   441,
+     454,   456,   458,   460,   462,   464,   466,   468,   470,   472,
+     474,   481,   482,   488,   489,   490,   491,   495,   496,   498,
+     503,   504,   506,   508,   513,   514,   516,   521,   522,   524,
+     529,   530,   532,   534,   536,   541,   542,   544,   549,   550,
+     555,   556,   561,   562,   567,   568,   573,   574,   579,   580,
+     583,   585,   590,   595,   596,   598,   604,   605,   609,   610,
+     611,   612,   613,   614,   615,   616,   617,   618,   619,   620,
+     626,   628,   630,   632,   637,   638,   643,   644,   650,   651,
+     657,   658,   659,   660,   661,   662,   663,   664,   665,   675,
+     682,   684,   694,   695,   700,   702,   708,   710,   714,   715,
+     720,   725,   728,   730,   732,   742,   744,   755,   756,   758,
+     762,   764,   768,   769,   774,   775,   779,   784,   785,   789,
+     791,   797,   798,   802,   804,   806,   808,   814,   815,   819,
+     821,   826,   828,   830,   835,   837,   842,   844,   848,   851,
+     855,   858,   862,   864,   866,   868,   873,   875,   877,   882,
+     884,   886,   888,   890,   895,   897,   899,   901,   906,   918,
+     919,   924,   926,   931,   935,   937,   939,   941,   943,   949,
+     950,   956,   957,   961,   962,   967,   969,   975,   976,   978,
+     983,   988,   998,  1000,  1004,  1005,  1010,  1012,  1016,  1017,
+    1021,  1023,  1027,  1028,  1032,  1033,  1037,  1038,  1053,  1054,
+    1055,  1056,  1057,  1061,  1066,  1073,  1083,  1088,  1093,  1101,
+    1106,  1111,  1116,  1121,  1129,  1151,  1156,  1163,  1165,  1172,
+    1177,  1182,  1193,  1198,  1203,  1208,  1213,  1222,  1227,  1235,
+    1236,  1237,  1238,  1244,  1249,  1257,  1258,  1259,  1260,  1264,
+    1265,  1266,  1267,  1272,  1273,  1282,  1283,  1288,  1289,  1294,
+    1296,  1298,  1300,  1302,  1305,  1304,  1316,  1317,  1319,  1329,
+    1330,  1335,  1337,  1339,  1341,  1343,  1346,  1348,  1351,  1356,
+    1358,  1360,  1362,  1364,  1366,  1368,  1370,  1372,  1374,  1376,
+    1378,  1380,  1386,  1387,  1389,  1391,  1393,  1398,  1399,  1405,
+    1406,  1408,  1410,  1415,  1417,  1419,  1421,  1426,  1427,  1429,
+    1431,  1436,  1437,  1439,  1444,  1445,  1447,  1449,  1454,  1456,
+    1458,  1463,  1464,  1468,  1470,  1476,  1475,  1479,  1481,  1486,
+    1488,  1494,  1495,  1500,  1501,  1503,  1504,  1513,  1514,  1516,
+    1518,  1523,  1525,  1531,  1532,  1534,  1537,  1540,  1545,  1546,
+    1551,  1556,  1560,  1562,  1568,  1567,  1574,  1576,  1582,  1583,
+    1591,  1592,  1596,  1597,  1598,  1600,  1602,  1609,  1610,  1612,
+    1614,  1619,  1620,  1626,  1627,  1631,  1632,  1637,  1638,  1639,
+    1641,  1649,  1650,  1652,  1655,  1657,  1661,  1662,  1663,  1665,
+    1667,  1671,  1676,  1684,  1685,  1694,  1696,  1701,  1702,  1703,
+    1707,  1708,  1709,  1713,  1714,  1715,  1719,  1720,  1721,  1726,
+    1727,  1728,  1729,  1735,  1736,  1738,  1743,  1744,  1749,  1750,
+    1751,  1752,  1753,  1768,  1769,  1774,  1775,  1781,  1783,  1786,
+    1788,  1790,  1813,  1814,  1816,  1818,  1823,  1824,  1826,  1831,
+    1836,  1837,  1843,  1842,  1846,  1850,  1852,  1854,  1860,  1861,
+    1866,  1871,  1873,  1878,  1880,  1881,  1883,  1888,  1890,  1892,
+    1897,  1899,  1904,  1909,  1917,  1923,  1922,  1936,  1937,  1942,
+    1943,  1947,  1952,  1957,  1965,  1970,  1981,  1982,  1987,  1988,
+    1994,  1995,  1999,  2000,  2001,  2004,  2003,  2014,  2023,  2029,
+    2035,  2044,  2050,  2056,  2062,  2068,  2076,  2082,  2090,  2096,
+    2105,  2106,  2107,  2111,  2115,  2117,  2122,  2123,  2127,  2128,
+    2133,  2139,  2140,  2143,  2145,  2146,  2150,  2151,  2152,  2153,
+    2187,  2189,  2190,  2192,  2197,  2202,  2207,  2209,  2211,  2216,
+    2218,  2220,  2222,  2227,  2229,  2238,  2240,  2241,  2246,  2248,
+    2250,  2255,  2257,  2259,  2264,  2266,  2268,  2277,  2278,  2279,
+    2283,  2285,  2287,  2292,  2294,  2296,  2301,  2303,  2305,  2320,
+    2322,  2323,  2325,  2330,  2331,  2336,  2338,  2340,  2345,  2347,
+    2349,  2351,  2356,  2358,  2360,  2370,  2372,  2373,  2375,  2380,
+    2382,  2384,  2389,  2391,  2393,  2395,  2400,  2402,  2404,  2435,
+    2437,  2438,  2440,  2445,  2450,  2458,  2460,  2462,  2467,  2469,
+    2474,  2476,  2490,  2491,  2493,  2498,  2500,  2502,  2504,  2506,
+    2511,  2512,  2514,  2516,  2521,  2523,  2525,  2531,  2533,  2535,
+    2539,  2541,  2543,  2545,  2559,  2560,  2562,  2567,  2569,  2571,
+    2573,  2575,  2580,  2581,  2583,  2585,  2590,  2592,  2594,  2600,
+    2601,  2603,  2612,  2615,  2617,  2620,  2622,  2624,  2637,  2638,
+    2640,  2645,  2647,  2649,  2651,  2653,  2658,  2659,  2661,  2663,
+    2668,  2670,  2678,  2679,  2680,  2685,  2686,  2690,  2692,  2694,
+    2696,  2698,  2700,  2707,  2709,  2711,  2713,  2715,  2717,  2719,
+    2721,  2723,  2725,  2730,  2732,  2734,  2739,  2765,  2766,  2768,
+    2772,  2773,  2777,  2779,  2781,  2783,  2785,  2787,  2794,  2796,
+    2798,  2800,  2802,  2804,  2809,  2814,  2816,  2818,  2836,  2838,
+    2843,  2844
 };
 #endif
@@ -5077 +5077 @@
     break;
 
-  case 27:
-
-/* Line 1806 of yacc.c  */
-#line 379 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(1) - (7)].en), build_tuple( (yyvsp[(5) - (7)].en) ) ) ); }
-    break;
-
   case 28:
 
 /* Line 1806 of yacc.c  */
-#line 381 "parser.yy"
+#line 380 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(1) - (3)].en), build_varref( (yyvsp[(3) - (3)].tok) ) ) ); }
     break;
 
-  case 29:
+  case 30:
 
 /* Line 1806 of yacc.c  */
 #line 383 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(1) - (7)].en), build_tuple( (yyvsp[(5) - (7)].en) ) ) ); }
-    break;
-
-  case 30:
+    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::IncrPost, (yyvsp[(1) - (2)].en) ) ); }
+    break;
+
+  case 31:
 
 /* Line 1806 of yacc.c  */
 #line 385 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::IncrPost, (yyvsp[(1) - (2)].en) ) ); }
-    break;
-
-  case 31:
+    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::DecrPost, (yyvsp[(1) - (2)].en) ) ); }
+    break;
+
+  case 32:
 
 /* Line 1806 of yacc.c  */
 #line 387 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::DecrPost, (yyvsp[(1) - (2)].en) ) ); }
-    break;
-
-  case 32:
+    { (yyval.en) = new ExpressionNode( build_compoundLiteral( (yyvsp[(2) - (7)].decl), new InitializerNode( (yyvsp[(5) - (7)].in), true ) ) ); }
+    break;
+
+  case 33:
 
 /* Line 1806 of yacc.c  */
 #line 389 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_compoundLiteral( (yyvsp[(2) - (7)].decl), new InitializerNode( (yyvsp[(5) - (7)].in), true ) ) ); }
-    break;
-
-  case 33:
-
-/* Line 1806 of yacc.c  */
-#line 391 "parser.yy"
     {
                         Token fn;
@@ -5133 +5119 @@
 
 /* Line 1806 of yacc.c  */
-#line 401 "parser.yy"
+#line 399 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) )); }
     break;
@@ -5140 +5126 @@
 
 /* Line 1806 of yacc.c  */
-#line 406 "parser.yy"
+#line 404 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -5147 +5133 @@
 
 /* Line 1806 of yacc.c  */
-#line 412 "parser.yy"
+#line 410 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5154 +5140 @@
 
 /* Line 1806 of yacc.c  */
-#line 417 "parser.yy"
+#line 415 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[(1) - (1)].tok) ) ); }
     break;
@@ -5161 +5147 @@
 
 /* Line 1806 of yacc.c  */
+#line 419 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(3) - (3)].en), build_varref( (yyvsp[(1) - (3)].tok) ) ) ); }
+    break;
+
+  case 42:
+
+/* Line 1806 of yacc.c  */
 #line 421 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(3) - (3)].en), build_varref( (yyvsp[(1) - (3)].tok) ) ) ); }
-    break;
-
-  case 42:
+    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(5) - (7)].en), build_varref( (yyvsp[(1) - (7)].tok) ) ) ); }
+    break;
+
+  case 43:
 
 /* Line 1806 of yacc.c  */
 #line 423 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(5) - (7)].en), build_varref( (yyvsp[(1) - (7)].tok) ) ) ); }
-    break;
-
-  case 43:
+    { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(3) - (3)].en), build_varref( (yyvsp[(1) - (3)].tok) ) ) ); }
+    break;
+
+  case 44:
 
 /* Line 1806 of yacc.c  */
 #line 425 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(3) - (3)].en), build_varref( (yyvsp[(1) - (3)].tok) ) ) ); }
-    break;
-
-  case 44:
-
-/* Line 1806 of yacc.c  */
-#line 427 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(5) - (7)].en), build_varref( (yyvsp[(1) - (7)].tok) ) ) ); }
     break;
@@ -5189 +5175 @@
 
 /* Line 1806 of yacc.c  */
+#line 433 "parser.yy"
+    { (yyval.en) = (yyvsp[(1) - (1)].en); }
+    break;
+
+  case 47:
+
+/* Line 1806 of yacc.c  */
 #line 435 "parser.yy"
-    { (yyval.en) = (yyvsp[(1) - (1)].en); }
-    break;
-
-  case 47:
+    { (yyval.en) = new ExpressionNode( (yyvsp[(1) - (1)].constant) ); }
+    break;
+
+  case 48:
 
 /* Line 1806 of yacc.c  */
 #line 437 "parser.yy"
-    { (yyval.en) = new ExpressionNode( (yyvsp[(1) - (1)].constant) ); }
-    break;
-
-  case 48:
-
-/* Line 1806 of yacc.c  */
-#line 439 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en)->set_extension( true ); }
     break;
@@ -5210 +5196 @@
 
 /* Line 1806 of yacc.c  */
-#line 444 "parser.yy"
+#line 442 "parser.yy"
     {
                         switch ( (yyvsp[(1) - (2)].op) ) {
@@ -5228 +5214 @@
 
 /* Line 1806 of yacc.c  */
+#line 455 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_unary_val( (yyvsp[(1) - (2)].op), (yyvsp[(2) - (2)].en) ) ); }
+    break;
+
+  case 51:
+
+/* Line 1806 of yacc.c  */
 #line 457 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_unary_val( (yyvsp[(1) - (2)].op), (yyvsp[(2) - (2)].en) ) ); }
-    break;
-
-  case 51:
+    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::Incr, (yyvsp[(2) - (2)].en) ) ); }
+    break;
+
+  case 52:
 
 /* Line 1806 of yacc.c  */
 #line 459 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::Incr, (yyvsp[(2) - (2)].en) ) ); }
-    break;
-
-  case 52:
+    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::Decr, (yyvsp[(2) - (2)].en) ) ); }
+    break;
+
+  case 53:
 
 /* Line 1806 of yacc.c  */
 #line 461 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::Decr, (yyvsp[(2) - (2)].en) ) ); }
-    break;
-
-  case 53:
+    { (yyval.en) = new ExpressionNode( build_sizeOfexpr( (yyvsp[(2) - (2)].en) ) ); }
+    break;
+
+  case 54:
 
 /* Line 1806 of yacc.c  */
 #line 463 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_sizeOfexpr( (yyvsp[(2) - (2)].en) ) ); }
-    break;
-
-  case 54:
+    { (yyval.en) = new ExpressionNode( build_sizeOftype( (yyvsp[(3) - (4)].decl) ) ); }
+    break;
+
+  case 55:
 
 /* Line 1806 of yacc.c  */
 #line 465 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_sizeOftype( (yyvsp[(3) - (4)].decl) ) ); }
-    break;
-
-  case 55:
+    { (yyval.en) = new ExpressionNode( build_alignOfexpr( (yyvsp[(2) - (2)].en) ) ); }
+    break;
+
+  case 56:
 
 /* Line 1806 of yacc.c  */
 #line 467 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_alignOfexpr( (yyvsp[(2) - (2)].en) ) ); }
-    break;
-
-  case 56:
+    { (yyval.en) = new ExpressionNode( build_alignOftype( (yyvsp[(3) - (4)].decl) ) ); }
+    break;
+
+  case 57:
 
 /* Line 1806 of yacc.c  */
 #line 469 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_alignOftype( (yyvsp[(3) - (4)].decl) ) ); }
-    break;
-
-  case 57:
+    { (yyval.en) = new ExpressionNode( build_offsetOf( (yyvsp[(3) - (6)].decl), build_varref( (yyvsp[(5) - (6)].tok) ) ) ); }
+    break;
+
+  case 58:
 
 /* Line 1806 of yacc.c  */
 #line 471 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_offsetOf( (yyvsp[(3) - (6)].decl), build_varref( (yyvsp[(5) - (6)].tok) ) ) ); }
-    break;
-
-  case 58:
+    { (yyval.en) = new ExpressionNode( build_attrexpr( build_varref( (yyvsp[(1) - (1)].tok) ), nullptr ) ); }
+    break;
+
+  case 59:
 
 /* Line 1806 of yacc.c  */
 #line 473 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_attrexpr( build_varref( (yyvsp[(1) - (1)].tok) ), nullptr ) ); }
-    break;
-
-  case 59:
+    { (yyval.en) = new ExpressionNode( build_attrexpr( build_varref( (yyvsp[(1) - (4)].tok) ), (yyvsp[(3) - (4)].en) ) ); }
+    break;
+
+  case 60:
 
 /* Line 1806 of yacc.c  */
 #line 475 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_attrexpr( build_varref( (yyvsp[(1) - (4)].tok) ), (yyvsp[(3) - (4)].en) ) ); }
-    break;
-
-  case 60:
-
-/* Line 1806 of yacc.c  */
-#line 477 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_attrtype( build_varref( (yyvsp[(1) - (4)].tok) ), (yyvsp[(3) - (4)].decl) ) ); }
     break;
@@ -5305 +5291 @@
 
 /* Line 1806 of yacc.c  */
-#line 483 "parser.yy"
+#line 481 "parser.yy"
     { (yyval.op) = OperKinds::PointTo; }
     break;
@@ -5312 +5298 @@
 
 /* Line 1806 of yacc.c  */
-#line 484 "parser.yy"
+#line 482 "parser.yy"
     { (yyval.op) = OperKinds::AddressOf; }
     break;
@@ -5319 +5305 @@
 
 /* Line 1806 of yacc.c  */
+#line 488 "parser.yy"
+    { (yyval.op) = OperKinds::UnPlus; }
+    break;
+
+  case 64:
+
+/* Line 1806 of yacc.c  */
+#line 489 "parser.yy"
+    { (yyval.op) = OperKinds::UnMinus; }
+    break;
+
+  case 65:
+
+/* Line 1806 of yacc.c  */
 #line 490 "parser.yy"
-    { (yyval.op) = OperKinds::UnPlus; }
-    break;
-
-  case 64:
+    { (yyval.op) = OperKinds::Neg; }
+    break;
+
+  case 66:
 
 /* Line 1806 of yacc.c  */
 #line 491 "parser.yy"
-    { (yyval.op) = OperKinds::UnMinus; }
-    break;
-
-  case 65:
-
-/* Line 1806 of yacc.c  */
-#line 492 "parser.yy"
-    { (yyval.op) = OperKinds::Neg; }
-    break;
-
-  case 66:
-
-/* Line 1806 of yacc.c  */
-#line 493 "parser.yy"
     { (yyval.op) = OperKinds::BitNeg; }
     break;
 
   case 68:
+
+/* Line 1806 of yacc.c  */
+#line 497 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_cast( (yyvsp[(2) - (4)].decl), (yyvsp[(4) - (4)].en) ) ); }
+    break;
+
+  case 69:
 
 /* Line 1806 of yacc.c  */
@@ -5351 +5344 @@
     break;
 
-  case 69:
-
-/* Line 1806 of yacc.c  */
-#line 501 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_cast( (yyvsp[(2) - (4)].decl), (yyvsp[(4) - (4)].en) ) ); }
-    break;
-
   case 71:
 
 /* Line 1806 of yacc.c  */
+#line 505 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Mul, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+    break;
+
+  case 72:
+
+/* Line 1806 of yacc.c  */
 #line 507 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Mul, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 72:
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Div, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+    break;
+
+  case 73:
 
 /* Line 1806 of yacc.c  */
 #line 509 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Div, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 73:
-
-/* Line 1806 of yacc.c  */
-#line 511 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Mod, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5382 +5368 @@
 
 /* Line 1806 of yacc.c  */
+#line 515 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Plus, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+    break;
+
+  case 76:
+
+/* Line 1806 of yacc.c  */
 #line 517 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Plus, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 76:
-
-/* Line 1806 of yacc.c  */
-#line 519 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Minus, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5396 +5382 @@
 
 /* Line 1806 of yacc.c  */
+#line 523 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LShift, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+    break;
+
+  case 79:
+
+/* Line 1806 of yacc.c  */
 #line 525 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LShift, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 79:
-
-/* Line 1806 of yacc.c  */
-#line 527 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::RShift, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5410 +5396 @@
 
 /* Line 1806 of yacc.c  */
+#line 531 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+    break;
+
+  case 82:
+
+/* Line 1806 of yacc.c  */
 #line 533 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 82:
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::GThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+    break;
+
+  case 83:
 
 /* Line 1806 of yacc.c  */
 #line 535 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::GThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 83:
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LEThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+    break;
+
+  case 84:
 
 /* Line 1806 of yacc.c  */
 #line 537 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LEThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 84:
-
-/* Line 1806 of yacc.c  */
-#line 539 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::GEThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5438 +5424 @@
 
 /* Line 1806 of yacc.c  */
+#line 543 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Eq, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+    break;
+
+  case 87:
+
+/* Line 1806 of yacc.c  */
 #line 545 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Eq, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 87:
-
-/* Line 1806 of yacc.c  */
-#line 547 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Neq, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5452 +5438 @@
 
 /* Line 1806 of yacc.c  */
-#line 553 "parser.yy"
+#line 551 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::BitAnd, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5459 +5445 @@
 
 /* Line 1806 of yacc.c  */
-#line 559 "parser.yy"
+#line 557 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Xor, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5466 +5452 @@
 
 /* Line 1806 of yacc.c  */
-#line 565 "parser.yy"
+#line 563 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::BitOr, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5473 +5459 @@
 
 /* Line 1806 of yacc.c  */
-#line 571 "parser.yy"
+#line 569 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_and_or( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en), true ) ); }
     break;
@@ -5480 +5466 @@
 
 /* Line 1806 of yacc.c  */
-#line 577 "parser.yy"
+#line 575 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_and_or( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en), false ) ); }
     break;
@@ -5487 +5473 @@
 
 /* Line 1806 of yacc.c  */
-#line 583 "parser.yy"
+#line 581 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[(1) - (5)].en), (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].en) ) ); }
     break;
@@ -5494 +5480 @@
 
 /* Line 1806 of yacc.c  */
+#line 584 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[(1) - (4)].en), (yyvsp[(1) - (4)].en), (yyvsp[(4) - (4)].en) ) ); }
+    break;
+
+  case 101:
+
+/* Line 1806 of yacc.c  */
 #line 586 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[(1) - (4)].en), (yyvsp[(1) - (4)].en), (yyvsp[(4) - (4)].en) ) ); }
-    break;
-
-  case 101:
-
-/* Line 1806 of yacc.c  */
-#line 588 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[(1) - (5)].en), (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].en) ) ); }
     break;
@@ -5508 +5494 @@
 
 /* Line 1806 of yacc.c  */
+#line 597 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_binary_ptr( (yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+    break;
+
+  case 105:
+
+/* Line 1806 of yacc.c  */
 #line 599 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_ptr( (yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 105:
-
-/* Line 1806 of yacc.c  */
-#line 601 "parser.yy"
     { (yyval.en) = ( (yyvsp[(2) - (2)].en) == 0 ) ? (yyvsp[(1) - (2)].en) : new ExpressionNode( build_binary_ptr( OperKinds::Assign, (yyvsp[(1) - (2)].en), (yyvsp[(2) - (2)].en) ) ); }
     break;
@@ -5522 +5508 @@
 
 /* Line 1806 of yacc.c  */
-#line 606 "parser.yy"
+#line 604 "parser.yy"
     { (yyval.en) = nullptr; }
     break;
@@ -5529 +5515 @@
 
 /* Line 1806 of yacc.c  */
+#line 609 "parser.yy"
+    { (yyval.op) = OperKinds::Assign; }
+    break;
+
+  case 109:
+
+/* Line 1806 of yacc.c  */
+#line 610 "parser.yy"
+    { (yyval.op) = OperKinds::AtAssn; }
+    break;
+
+  case 110:
+
+/* Line 1806 of yacc.c  */
 #line 611 "parser.yy"
-    { (yyval.op) = OperKinds::Assign; }
-    break;
-
-  case 109:
+    { (yyval.op) = OperKinds::MulAssn; }
+    break;
+
+  case 111:
 
 /* Line 1806 of yacc.c  */
 #line 612 "parser.yy"
-    { (yyval.op) = OperKinds::AtAssn; }
-    break;
-
-  case 110:
+    { (yyval.op) = OperKinds::DivAssn; }
+    break;
+
+  case 112:
 
 /* Line 1806 of yacc.c  */
 #line 613 "parser.yy"
-    { (yyval.op) = OperKinds::MulAssn; }
-    break;
-
-  case 111:
+    { (yyval.op) = OperKinds::ModAssn; }
+    break;
+
+  case 113:
 
 /* Line 1806 of yacc.c  */
 #line 614 "parser.yy"
-    { (yyval.op) = OperKinds::DivAssn; }
-    break;
-
-  case 112:
+    { (yyval.op) = OperKinds::PlusAssn; }
+    break;
+
+  case 114:
 
 /* Line 1806 of yacc.c  */
 #line 615 "parser.yy"
-    { (yyval.op) = OperKinds::ModAssn; }
-    break;
-
-  case 113:
+    { (yyval.op) = OperKinds::MinusAssn; }
+    break;
+
+  case 115:
 
 /* Line 1806 of yacc.c  */
 #line 616 "parser.yy"
-    { (yyval.op) = OperKinds::PlusAssn; }
-    break;
-
-  case 114:
+    { (yyval.op) = OperKinds::LSAssn; }
+    break;
+
+  case 116:
 
 /* Line 1806 of yacc.c  */
 #line 617 "parser.yy"
-    { (yyval.op) = OperKinds::MinusAssn; }
-    break;
-
-  case 115:
+    { (yyval.op) = OperKinds::RSAssn; }
+    break;
+
+  case 117:
 
 /* Line 1806 of yacc.c  */
 #line 618 "parser.yy"
-    { (yyval.op) = OperKinds::LSAssn; }
-    break;
-
-  case 116:
+    { (yyval.op) = OperKinds::AndAssn; }
+    break;
+
+  case 118:
 
 /* Line 1806 of yacc.c  */
 #line 619 "parser.yy"
-    { (yyval.op) = OperKinds::RSAssn; }
-    break;
-
-  case 117:
+    { (yyval.op) = OperKinds::ERAssn; }
+    break;
+
+  case 119:
 
 /* Line 1806 of yacc.c  */
 #line 620 "parser.yy"
-    { (yyval.op) = OperKinds::AndAssn; }
-    break;
-
-  case 118:
-
-/* Line 1806 of yacc.c  */
-#line 621 "parser.yy"
-    { (yyval.op) = OperKinds::ERAssn; }
-    break;
-
-  case 119:
-
-/* Line 1806 of yacc.c  */
-#line 622 "parser.yy"
     { (yyval.op) = OperKinds::OrAssn; }
     break;
@@ -5613 +5599 @@
 
 /* Line 1806 of yacc.c  */
+#line 627 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_tuple() ); }
+    break;
+
+  case 121:
+
+/* Line 1806 of yacc.c  */
 #line 629 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_tuple() ); }
-    break;
-
-  case 121:
+    { (yyval.en) = new ExpressionNode( build_tuple( (yyvsp[(3) - (5)].en) ) ); }
+    break;
+
+  case 122:
 
 /* Line 1806 of yacc.c  */
 #line 631 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_tuple( (yyvsp[(3) - (5)].en) ) ); }
-    break;
-
-  case 122:
+    { (yyval.en) = new ExpressionNode( build_tuple( (ExpressionNode *)(new ExpressionNode( nullptr ) )->set_last( (yyvsp[(4) - (6)].en) ) ) ); }
+    break;
+
+  case 123:
 
 /* Line 1806 of yacc.c  */
 #line 633 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_tuple( (ExpressionNode *)(new ExpressionNode( nullptr ) )->set_last( (yyvsp[(4) - (6)].en) ) ) ); }
-    break;
-
-  case 123:
-
-/* Line 1806 of yacc.c  */
-#line 635 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_tuple( (ExpressionNode *)(yyvsp[(3) - (7)].en)->set_last( (yyvsp[(5) - (7)].en) ) ) ); }
     break;
@@ -5641 +5627 @@
 
 /* Line 1806 of yacc.c  */
-#line 641 "parser.yy"
+#line 639 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) ); }
     break;
@@ -5648 +5634 @@
 
 /* Line 1806 of yacc.c  */
-#line 647 "parser.yy"
+#line 645 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_comma( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5655 +5641 @@
 
 /* Line 1806 of yacc.c  */
-#line 652 "parser.yy"
+#line 650 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -5662 +5648 @@
 
 /* Line 1806 of yacc.c  */
-#line 661 "parser.yy"
+#line 659 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (1)].sn); }
     break;
@@ -5669 +5655 @@
 
 /* Line 1806 of yacc.c  */
-#line 668 "parser.yy"
+#line 666 "parser.yy"
     {
                         Token fn;
@@ -5680 +5666 @@
 
 /* Line 1806 of yacc.c  */
-#line 678 "parser.yy"
+#line 676 "parser.yy"
     {
                         (yyval.sn) = (yyvsp[(4) - (4)].sn)->add_label( (yyvsp[(1) - (4)].tok) );
@@ -5689 +5675 @@
 
 /* Line 1806 of yacc.c  */
-#line 685 "parser.yy"
+#line 683 "parser.yy"
     { (yyval.sn) = new StatementNode( build_compound( (StatementNode *)0 ) ); }
     break;
@@ -5696 +5682 @@
 
 /* Line 1806 of yacc.c  */
-#line 692 "parser.yy"
+#line 690 "parser.yy"
     { (yyval.sn) = new StatementNode( build_compound( (yyvsp[(5) - (7)].sn) ) ); }
     break;
@@ -5703 +5689 @@
 
 /* Line 1806 of yacc.c  */
-#line 698 "parser.yy"
+#line 696 "parser.yy"
     { if ( (yyvsp[(1) - (3)].sn) != 0 ) { (yyvsp[(1) - (3)].sn)->set_last( (yyvsp[(3) - (3)].sn) ); (yyval.sn) = (yyvsp[(1) - (3)].sn); } }
     break;
@@ -5710 +5696 @@
 
 /* Line 1806 of yacc.c  */
+#line 701 "parser.yy"
+    { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
+    break;
+
+  case 145:
+
+/* Line 1806 of yacc.c  */
 #line 703 "parser.yy"
-    { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
-    break;
-
-  case 145:
-
-/* Line 1806 of yacc.c  */
-#line 705 "parser.yy"
     {   // mark all fields in list
                         for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
@@ -5728 +5714 @@
 
 /* Line 1806 of yacc.c  */
-#line 711 "parser.yy"
+#line 709 "parser.yy"
     { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
     break;
@@ -5735 +5721 @@
 
 /* Line 1806 of yacc.c  */
-#line 718 "parser.yy"
+#line 716 "parser.yy"
     { if ( (yyvsp[(1) - (2)].sn) != 0 ) { (yyvsp[(1) - (2)].sn)->set_last( (yyvsp[(2) - (2)].sn) ); (yyval.sn) = (yyvsp[(1) - (2)].sn); } }
     break;
@@ -5742 +5728 @@
 
 /* Line 1806 of yacc.c  */
-#line 723 "parser.yy"
+#line 721 "parser.yy"
     { (yyval.sn) = new StatementNode( build_expr( (yyvsp[(1) - (2)].en) ) ); }
     break;
@@ -5749 +5735 @@
 
 /* Line 1806 of yacc.c  */
+#line 727 "parser.yy"
+    { (yyval.sn) = new StatementNode( build_if( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn), nullptr ) ); }
+    break;
+
+  case 152:
+
+/* Line 1806 of yacc.c  */
 #line 729 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_if( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn), nullptr ) ); }
-    break;
-
-  case 152:
+    { (yyval.sn) = new StatementNode( build_if( (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].sn), (yyvsp[(7) - (7)].sn) ) ); }
+    break;
+
+  case 153:
 
 /* Line 1806 of yacc.c  */
 #line 731 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_if( (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].sn), (yyvsp[(7) - (7)].sn) ) ); }
-    break;
-
-  case 153:
+    { (yyval.sn) = new StatementNode( build_switch( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ) ); }
+    break;
+
+  case 154:
 
 /* Line 1806 of yacc.c  */
 #line 733 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_switch( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ) ); }
-    break;
-
-  case 154:
-
-/* Line 1806 of yacc.c  */
-#line 735 "parser.yy"
     {
                         StatementNode *sw = new StatementNode( build_switch( (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) ) );
@@ -5785 +5771 @@
 
 /* Line 1806 of yacc.c  */
+#line 743 "parser.yy"
+    { (yyval.sn) = new StatementNode( build_switch( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ) ); }
+    break;
+
+  case 156:
+
+/* Line 1806 of yacc.c  */
 #line 745 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_switch( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ) ); }
-    break;
-
-  case 156:
-
-/* Line 1806 of yacc.c  */
-#line 747 "parser.yy"
     {
                         StatementNode *sw = new StatementNode( build_switch( (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) ) );
@@ -5802 +5788 @@
 
 /* Line 1806 of yacc.c  */
+#line 755 "parser.yy"
+    { (yyval.en) = (yyvsp[(1) - (1)].en); }
+    break;
+
+  case 158:
+
+/* Line 1806 of yacc.c  */
 #line 757 "parser.yy"
-    { (yyval.en) = (yyvsp[(1) - (1)].en); }
-    break;
-
-  case 158:
-
-/* Line 1806 of yacc.c  */
-#line 759 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_range( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -5816 +5802 @@
 
 /* Line 1806 of yacc.c  */
+#line 762 "parser.yy"
+    { (yyval.sn) = new StatementNode( build_case( (yyvsp[(1) - (1)].en) ) ); }
+    break;
+
+  case 161:
+
+/* Line 1806 of yacc.c  */
 #line 764 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_case( (yyvsp[(1) - (1)].en) ) ); }
-    break;
-
-  case 161:
-
-/* Line 1806 of yacc.c  */
-#line 766 "parser.yy"
     { (yyval.sn) = (StatementNode *)((yyvsp[(1) - (3)].sn)->set_last( new StatementNode( build_case( (yyvsp[(3) - (3)].en) ) ) ) ); }
     break;
@@ -5830 +5816 @@
 
 /* Line 1806 of yacc.c  */
-#line 770 "parser.yy"
+#line 768 "parser.yy"
     { (yyval.sn) = (yyvsp[(2) - (3)].sn); }
     break;
@@ -5837 +5823 @@
 
 /* Line 1806 of yacc.c  */
-#line 771 "parser.yy"
+#line 769 "parser.yy"
     { (yyval.sn) = new StatementNode( build_default() ); }
     break;
@@ -5844 +5830 @@
 
 /* Line 1806 of yacc.c  */
-#line 777 "parser.yy"
+#line 775 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (2)].sn)->set_last( (yyvsp[(2) - (2)].sn) )); }
     break;
@@ -5851 +5837 @@
 
 /* Line 1806 of yacc.c  */
-#line 781 "parser.yy"
+#line 779 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( new StatementNode( build_compound( (yyvsp[(2) - (2)].sn) ) ) ); }
     break;
@@ -5858 +5844 @@
 
 /* Line 1806 of yacc.c  */
-#line 786 "parser.yy"
+#line 784 "parser.yy"
     { (yyval.sn) = 0; }
     break;
@@ -5865 +5851 @@
 
 /* Line 1806 of yacc.c  */
+#line 790 "parser.yy"
+    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( new StatementNode( build_compound( (yyvsp[(2) - (2)].sn) ) ) ); }
+    break;
+
+  case 170:
+
+/* Line 1806 of yacc.c  */
 #line 792 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( new StatementNode( build_compound( (yyvsp[(2) - (2)].sn) ) ) ); }
-    break;
-
-  case 170:
-
-/* Line 1806 of yacc.c  */
-#line 794 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_last( (yyvsp[(2) - (3)].sn)->append_last_case( new StatementNode( build_compound( (yyvsp[(3) - (3)].sn) ) ) ) ) ); }
     break;
@@ -5879 +5865 @@
 
 /* Line 1806 of yacc.c  */
-#line 799 "parser.yy"
+#line 797 "parser.yy"
     { (yyval.sn) = 0; }
     break;
@@ -5886 +5872 @@
 
 /* Line 1806 of yacc.c  */
+#line 803 "parser.yy"
+    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
+    break;
+
+  case 174:
+
+/* Line 1806 of yacc.c  */
 #line 805 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
-    break;
-
-  case 174:
+    { (yyval.sn) = (yyvsp[(1) - (3)].sn)->append_last_case( new StatementNode( build_compound( (StatementNode *)(yyvsp[(2) - (3)].sn)->set_last( (yyvsp[(3) - (3)].sn) ) ) ) ); }
+    break;
+
+  case 175:
 
 /* Line 1806 of yacc.c  */
 #line 807 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (3)].sn)->append_last_case( new StatementNode( build_compound( (StatementNode *)(yyvsp[(2) - (3)].sn)->set_last( (yyvsp[(3) - (3)].sn) ) ) ) ); }
-    break;
-
-  case 175:
+    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_last( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
+    break;
+
+  case 176:
 
 /* Line 1806 of yacc.c  */
 #line 809 "parser.yy"
-    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_last( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
-    break;
-
-  case 176:
-
-/* Line 1806 of yacc.c  */
-#line 811 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (4)].sn)->set_last( (yyvsp[(2) - (4)].sn)->append_last_case( new StatementNode( build_compound( (StatementNode *)(yyvsp[(3) - (4)].sn)->set_last( (yyvsp[(4) - (4)].sn) ) ) ) ) ) ); }
     break;
@@ -5914 +5900 @@
 
 /* Line 1806 of yacc.c  */
-#line 816 "parser.yy"
+#line 814 "parser.yy"
     { (yyval.sn) = new StatementNode( build_branch( BranchStmt::Break ) ); }
     break;
 
   case 179:
+
+/* Line 1806 of yacc.c  */
+#line 820 "parser.yy"
+    { (yyval.sn) = 0; }
+    break;
+
+  case 180:
 
 /* Line 1806 of yacc.c  */
@@ -5925 +5918 @@
     break;
 
-  case 180:
-
-/* Line 1806 of yacc.c  */
-#line 824 "parser.yy"
-    { (yyval.sn) = 0; }
-    break;
-
   case 181:
 
 /* Line 1806 of yacc.c  */
+#line 827 "parser.yy"
+    { (yyval.sn) = new StatementNode( build_while( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ) ); }
+    break;
+
+  case 182:
+
+/* Line 1806 of yacc.c  */
 #line 829 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_while( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ) ); }
-    break;
-
-  case 182:
+    { (yyval.sn) = new StatementNode( build_while( (yyvsp[(5) - (7)].en), (yyvsp[(2) - (7)].sn), true ) ); }
+    break;
+
+  case 183:
 
 /* Line 1806 of yacc.c  */
 #line 831 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_while( (yyvsp[(5) - (7)].en), (yyvsp[(2) - (7)].sn), true ) ); }
-    break;
-
-  case 183:
-
-/* Line 1806 of yacc.c  */
-#line 833 "parser.yy"
     { (yyval.sn) = new StatementNode( build_for( (yyvsp[(4) - (6)].fctl), (yyvsp[(6) - (6)].sn) ) ); }
     break;
@@ -5956 +5942 @@
 
 /* Line 1806 of yacc.c  */
+#line 836 "parser.yy"
+    { (yyval.fctl) = new ForCtl( (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].en) ); }
+    break;
+
+  case 185:
+
+/* Line 1806 of yacc.c  */
 #line 838 "parser.yy"
-    { (yyval.fctl) = new ForCtl( (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].en) ); }
-    break;
-
-  case 185:
-
-/* Line 1806 of yacc.c  */
-#line 840 "parser.yy"
     { (yyval.fctl) = new ForCtl( (yyvsp[(1) - (4)].decl), (yyvsp[(2) - (4)].en), (yyvsp[(4) - (4)].en) ); }
     break;
@@ -5970 +5956 @@
 
 /* Line 1806 of yacc.c  */
-#line 845 "parser.yy"
+#line 843 "parser.yy"
     { (yyval.sn) = new StatementNode( build_branch( (yyvsp[(2) - (3)].tok), BranchStmt::Goto ) ); }
     break;
@@ -5977 +5963 @@
 
 /* Line 1806 of yacc.c  */
-#line 849 "parser.yy"
+#line 847 "parser.yy"
     { (yyval.sn) = new StatementNode( build_computedgoto( (yyvsp[(3) - (4)].en) ) ); }
     break;
@@ -5984 +5970 @@
 
 /* Line 1806 of yacc.c  */
-#line 852 "parser.yy"
+#line 850 "parser.yy"
     { (yyval.sn) = new StatementNode( build_branch( BranchStmt::Continue ) ); }
     break;
@@ -5991 +5977 @@
 
 /* Line 1806 of yacc.c  */
-#line 856 "parser.yy"
+#line 854 "parser.yy"
     { (yyval.sn) = new StatementNode( build_branch( (yyvsp[(2) - (3)].tok), BranchStmt::Continue ) ); }
     break;
@@ -5998 +5984 @@
 
 /* Line 1806 of yacc.c  */
-#line 859 "parser.yy"
+#line 857 "parser.yy"
     { (yyval.sn) = new StatementNode( build_branch( BranchStmt::Break ) ); }
     break;
@@ -6005 +5991 @@
 
 /* Line 1806 of yacc.c  */
+#line 861 "parser.yy"
+    { (yyval.sn) = new StatementNode( build_branch( (yyvsp[(2) - (3)].tok), BranchStmt::Break ) ); }
+    break;
+
+  case 192:
+
+/* Line 1806 of yacc.c  */
 #line 863 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_branch( (yyvsp[(2) - (3)].tok), BranchStmt::Break ) ); }
-    break;
-
-  case 192:
+    { (yyval.sn) = new StatementNode( build_return( (yyvsp[(2) - (3)].en) ) ); }
+    break;
+
+  case 193:
 
 /* Line 1806 of yacc.c  */
 #line 865 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_return( (yyvsp[(2) - (3)].en) ) ); }
-    break;
-
-  case 193:
+    { (yyval.sn) = new StatementNode( build_throw( (yyvsp[(2) - (3)].en) ) ); }
+    break;
+
+  case 194:
 
 /* Line 1806 of yacc.c  */
@@ -6023 +6016 @@
     break;
 
-  case 194:
+  case 195:
 
 /* Line 1806 of yacc.c  */
 #line 869 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_throw( (yyvsp[(2) - (3)].en) ) ); }
-    break;
-
-  case 195:
-
-/* Line 1806 of yacc.c  */
-#line 871 "parser.yy"
     { (yyval.sn) = new StatementNode( build_throw( (yyvsp[(2) - (5)].en) ) ); }
     break;
@@ -6040 +6026 @@
 
 /* Line 1806 of yacc.c  */
+#line 874 "parser.yy"
+    { (yyval.sn) = new StatementNode( build_try( (yyvsp[(2) - (3)].sn), (yyvsp[(3) - (3)].sn), 0 ) ); }
+    break;
+
+  case 197:
+
+/* Line 1806 of yacc.c  */
 #line 876 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_try( (yyvsp[(2) - (3)].sn), (yyvsp[(3) - (3)].sn), 0 ) ); }
-    break;
-
-  case 197:
+    { (yyval.sn) = new StatementNode( build_try( (yyvsp[(2) - (3)].sn), 0, (yyvsp[(3) - (3)].sn) ) ); }
+    break;
+
+  case 198:
 
 /* Line 1806 of yacc.c  */
 #line 878 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_try( (yyvsp[(2) - (3)].sn), 0, (yyvsp[(3) - (3)].sn) ) ); }
-    break;
-
-  case 198:
-
-/* Line 1806 of yacc.c  */
-#line 880 "parser.yy"
     { (yyval.sn) = new StatementNode( build_try( (yyvsp[(2) - (4)].sn), (yyvsp[(3) - (4)].sn), (yyvsp[(4) - (4)].sn) ) ); }
     break;
@@ -6061 +6047 @@
 
 /* Line 1806 of yacc.c  */
+#line 885 "parser.yy"
+    { (yyval.sn) = new StatementNode( build_catch( 0, (yyvsp[(5) - (5)].sn), true ) ); }
+    break;
+
+  case 201:
+
+/* Line 1806 of yacc.c  */
 #line 887 "parser.yy"
+    { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (6)].sn)->set_last( new StatementNode( build_catch( 0, (yyvsp[(6) - (6)].sn), true ) ) ); }
+    break;
+
+  case 202:
+
+/* Line 1806 of yacc.c  */
+#line 889 "parser.yy"
     { (yyval.sn) = new StatementNode( build_catch( 0, (yyvsp[(5) - (5)].sn), true ) ); }
     break;
 
-  case 201:
-
-/* Line 1806 of yacc.c  */
-#line 889 "parser.yy"
+  case 203:
+
+/* Line 1806 of yacc.c  */
+#line 891 "parser.yy"
     { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (6)].sn)->set_last( new StatementNode( build_catch( 0, (yyvsp[(6) - (6)].sn), true ) ) ); }
     break;
 
-  case 202:
-
-/* Line 1806 of yacc.c  */
-#line 891 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_catch( 0, (yyvsp[(5) - (5)].sn), true ) ); }
-    break;
-
-  case 203:
-
-/* Line 1806 of yacc.c  */
-#line 893 "parser.yy"
-    { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (6)].sn)->set_last( new StatementNode( build_catch( 0, (yyvsp[(6) - (6)].sn), true ) ) ); }
-    break;
-
   case 204:
 
 /* Line 1806 of yacc.c  */
+#line 896 "parser.yy"
+    { (yyval.sn) = new StatementNode( build_catch( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ) ); }
+    break;
+
+  case 205:
+
+/* Line 1806 of yacc.c  */
 #line 898 "parser.yy"
+    { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (10)].sn)->set_last( new StatementNode( build_catch( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ) ); }
+    break;
+
+  case 206:
+
+/* Line 1806 of yacc.c  */
+#line 900 "parser.yy"
     { (yyval.sn) = new StatementNode( build_catch( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ) ); }
     break;
 
-  case 205:
-
-/* Line 1806 of yacc.c  */
-#line 900 "parser.yy"
+  case 207:
+
+/* Line 1806 of yacc.c  */
+#line 902 "parser.yy"
     { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (10)].sn)->set_last( new StatementNode( build_catch( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ) ); }
     break;
 
-  case 206:
-
-/* Line 1806 of yacc.c  */
-#line 902 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_catch( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ) ); }
-    break;
-
-  case 207:
-
-/* Line 1806 of yacc.c  */
-#line 904 "parser.yy"
-    { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (10)].sn)->set_last( new StatementNode( build_catch( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ) ); }
-    break;
-
   case 208:
 
 /* Line 1806 of yacc.c  */
-#line 909 "parser.yy"
+#line 907 "parser.yy"
     {
                         (yyval.sn) = new StatementNode( build_finally( (yyvsp[(2) - (2)].sn) ) );
@@ -6126 +6112 @@
 
 /* Line 1806 of yacc.c  */
-#line 922 "parser.yy"
+#line 920 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6136 +6122 @@
 
 /* Line 1806 of yacc.c  */
+#line 925 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 212:
+
+/* Line 1806 of yacc.c  */
 #line 927 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 212:
-
-/* Line 1806 of yacc.c  */
-#line 929 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6153 +6139 @@
 
 /* Line 1806 of yacc.c  */
+#line 936 "parser.yy"
+    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (6)].flag), (yyvsp[(4) - (6)].constant), 0 ) ); }
+    break;
+
+  case 215:
+
+/* Line 1806 of yacc.c  */
 #line 938 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (6)].flag), (yyvsp[(4) - (6)].constant), 0 ) ); }
-    break;
-
-  case 215:
+    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (8)].flag), (yyvsp[(4) - (8)].constant), (yyvsp[(6) - (8)].en) ) ); }
+    break;
+
+  case 216:
 
 /* Line 1806 of yacc.c  */
 #line 940 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (8)].flag), (yyvsp[(4) - (8)].constant), (yyvsp[(6) - (8)].en) ) ); }
-    break;
-
-  case 216:
+    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (10)].flag), (yyvsp[(4) - (10)].constant), (yyvsp[(6) - (10)].en), (yyvsp[(8) - (10)].en) ) ); }
+    break;
+
+  case 217:
 
 /* Line 1806 of yacc.c  */
 #line 942 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (10)].flag), (yyvsp[(4) - (10)].constant), (yyvsp[(6) - (10)].en), (yyvsp[(8) - (10)].en) ) ); }
-    break;
-
-  case 217:
+    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (12)].flag), (yyvsp[(4) - (12)].constant), (yyvsp[(6) - (12)].en), (yyvsp[(8) - (12)].en), (yyvsp[(10) - (12)].en) ) ); }
+    break;
+
+  case 218:
 
 /* Line 1806 of yacc.c  */
 #line 944 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (12)].flag), (yyvsp[(4) - (12)].constant), (yyvsp[(6) - (12)].en), (yyvsp[(8) - (12)].en), (yyvsp[(10) - (12)].en) ) ); }
-    break;
-
-  case 218:
-
-/* Line 1806 of yacc.c  */
-#line 946 "parser.yy"
     { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (14)].flag), (yyvsp[(5) - (14)].constant), 0, (yyvsp[(8) - (14)].en), (yyvsp[(10) - (14)].en), (yyvsp[(12) - (14)].label) ) ); }
     break;
@@ -6188 +6174 @@
 
 /* Line 1806 of yacc.c  */
+#line 949 "parser.yy"
+    { (yyval.flag) = false; }
+    break;
+
+  case 220:
+
+/* Line 1806 of yacc.c  */
 #line 951 "parser.yy"
-    { (yyval.flag) = false; }
-    break;
-
-  case 220:
-
-/* Line 1806 of yacc.c  */
-#line 953 "parser.yy"
     { (yyval.flag) = true; }
     break;
@@ -6202 +6188 @@
 
 /* Line 1806 of yacc.c  */
-#line 958 "parser.yy"
+#line 956 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -6209 +6195 @@
 
 /* Line 1806 of yacc.c  */
-#line 965 "parser.yy"
+#line 963 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) ); }
     break;
@@ -6216 +6202 @@
 
 /* Line 1806 of yacc.c  */
+#line 968 "parser.yy"
+    { (yyval.en) = new ExpressionNode( build_asmexpr( 0, (yyvsp[(1) - (4)].constant), (yyvsp[(3) - (4)].en) ) ); }
+    break;
+
+  case 226:
+
+/* Line 1806 of yacc.c  */
 #line 970 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_asmexpr( 0, (yyvsp[(1) - (4)].constant), (yyvsp[(3) - (4)].en) ) ); }
-    break;
-
-  case 226:
-
-/* Line 1806 of yacc.c  */
-#line 972 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_asmexpr( (yyvsp[(2) - (7)].en), (yyvsp[(4) - (7)].constant), (yyvsp[(6) - (7)].en) ) ); }
     break;
@@ -6230 +6216 @@
 
 /* Line 1806 of yacc.c  */
+#line 975 "parser.yy"
+    { (yyval.en) = 0; }
+    break;
+
+  case 228:
+
+/* Line 1806 of yacc.c  */
 #line 977 "parser.yy"
-    { (yyval.en) = 0; }
-    break;
-
-  case 228:
+    { (yyval.en) = new ExpressionNode( (yyvsp[(1) - (1)].constant) ); }
+    break;
+
+  case 229:
 
 /* Line 1806 of yacc.c  */
 #line 979 "parser.yy"
-    { (yyval.en) = new ExpressionNode( (yyvsp[(1) - (1)].constant) ); }
-    break;
-
-  case 229:
-
-/* Line 1806 of yacc.c  */
-#line 981 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_last( new ExpressionNode( (yyvsp[(3) - (3)].constant) ) ); }
     break;
@@ -6251 +6237 @@
 
 /* Line 1806 of yacc.c  */
-#line 986 "parser.yy"
+#line 984 "parser.yy"
     {
                         (yyval.label) = new LabelNode(); (yyval.label)->labels.push_back( *(yyvsp[(1) - (1)].tok) );
@@ -6261 +6247 @@
 
 /* Line 1806 of yacc.c  */
-#line 991 "parser.yy"
+#line 989 "parser.yy"
     {
                         (yyval.label) = (yyvsp[(1) - (3)].label); (yyvsp[(1) - (3)].label)->labels.push_back( *(yyvsp[(3) - (3)].tok) );
@@ -6271 +6257 @@
 
 /* Line 1806 of yacc.c  */
-#line 1001 "parser.yy"
+#line 999 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6278 +6264 @@
 
 /* Line 1806 of yacc.c  */
-#line 1008 "parser.yy"
+#line 1006 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6285 +6271 @@
 
 /* Line 1806 of yacc.c  */
-#line 1013 "parser.yy"
+#line 1011 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6292 +6278 @@
 
 /* Line 1806 of yacc.c  */
-#line 1020 "parser.yy"
+#line 1018 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6299 +6285 @@
 
 /* Line 1806 of yacc.c  */
-#line 1034 "parser.yy"
+#line 1032 "parser.yy"
     {}
     break;
@@ -6306 +6292 @@
 
 /* Line 1806 of yacc.c  */
-#line 1035 "parser.yy"
+#line 1033 "parser.yy"
     {}
     break;
@@ -6313 +6299 @@
 
 /* Line 1806 of yacc.c  */
-#line 1064 "parser.yy"
+#line 1062 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6323 +6309 @@
 
 /* Line 1806 of yacc.c  */
-#line 1071 "parser.yy"
+#line 1069 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6333 +6319 @@
 
 /* Line 1806 of yacc.c  */
-#line 1076 "parser.yy"
+#line 1074 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (6)].tok), TypedefTable::ID );
@@ -6343 +6329 @@
 
 /* Line 1806 of yacc.c  */
-#line 1086 "parser.yy"
+#line 1084 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
@@ -6353 +6339 @@
 
 /* Line 1806 of yacc.c  */
-#line 1091 "parser.yy"
+#line 1089 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
@@ -6363 +6349 @@
 
 /* Line 1806 of yacc.c  */
-#line 1096 "parser.yy"
+#line 1094 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(3) - (4)].tok) );
@@ -6373 +6359 @@
 
 /* Line 1806 of yacc.c  */
-#line 1104 "parser.yy"
+#line 1102 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6383 +6369 @@
 
 /* Line 1806 of yacc.c  */
-#line 1109 "parser.yy"
+#line 1107 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6393 +6379 @@
 
 /* Line 1806 of yacc.c  */
-#line 1114 "parser.yy"
+#line 1112 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6403 +6389 @@
 
 /* Line 1806 of yacc.c  */
-#line 1119 "parser.yy"
+#line 1117 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6413 +6399 @@
 
 /* Line 1806 of yacc.c  */
-#line 1124 "parser.yy"
+#line 1122 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
@@ -6423 +6409 @@
 
 /* Line 1806 of yacc.c  */
-#line 1132 "parser.yy"
+#line 1130 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(3) - (8)].tok), DeclarationNode::newTuple( 0 ), (yyvsp[(6) - (8)].decl), 0, true );
@@ -6432 +6418 @@
 
 /* Line 1806 of yacc.c  */
-#line 1155 "parser.yy"
+#line 1153 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
@@ -6441 +6427 @@
 
 /* Line 1806 of yacc.c  */
-#line 1159 "parser.yy"
+#line 1157 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
@@ -6450 +6436 @@
 
 /* Line 1806 of yacc.c  */
-#line 1166 "parser.yy"
+#line 1164 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -6457 +6443 @@
 
 /* Line 1806 of yacc.c  */
-#line 1170 "parser.yy"
+#line 1168 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (9)].decl)->appendList( (yyvsp[(7) - (9)].decl) ) ); }
     break;
@@ -6464 +6450 @@
 
 /* Line 1806 of yacc.c  */
-#line 1175 "parser.yy"
+#line 1173 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6474 +6460 @@
 
 /* Line 1806 of yacc.c  */
-#line 1180 "parser.yy"
+#line 1178 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6484 +6470 @@
 
 /* Line 1806 of yacc.c  */
-#line 1185 "parser.yy"
+#line 1183 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::TD );
@@ -6494 +6480 @@
 
 /* Line 1806 of yacc.c  */
-#line 1196 "parser.yy"
+#line 1194 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6504 +6490 @@
 
 /* Line 1806 of yacc.c  */
-#line 1201 "parser.yy"
+#line 1199 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6514 +6500 @@
 
 /* Line 1806 of yacc.c  */
-#line 1206 "parser.yy"
+#line 1204 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6524 +6510 @@
 
 /* Line 1806 of yacc.c  */
-#line 1211 "parser.yy"
+#line 1209 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6534 +6520 @@
 
 /* Line 1806 of yacc.c  */
-#line 1216 "parser.yy"
+#line 1214 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6544 +6530 @@
 
 /* Line 1806 of yacc.c  */
-#line 1225 "parser.yy"
+#line 1223 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (4)].tok), TypedefTable::TD );
@@ -6554 +6540 @@
 
 /* Line 1806 of yacc.c  */
-#line 1230 "parser.yy"
+#line 1228 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (7)].tok), TypedefTable::TD );
@@ -6564 +6550 @@
 
 /* Line 1806 of yacc.c  */
-#line 1247 "parser.yy"
+#line 1245 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6574 +6560 @@
 
 /* Line 1806 of yacc.c  */
-#line 1252 "parser.yy"
+#line 1250 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6584 +6570 @@
 
 /* Line 1806 of yacc.c  */
-#line 1274 "parser.yy"
+#line 1272 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6591 +6577 @@
 
 /* Line 1806 of yacc.c  */
-#line 1286 "parser.yy"
+#line 1284 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6598 +6584 @@
 
 /* Line 1806 of yacc.c  */
+#line 1295 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Const ); }
+    break;
+
+  case 300:
+
+/* Line 1806 of yacc.c  */
 #line 1297 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Const ); }
-    break;
-
-  case 300:
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Restrict ); }
+    break;
+
+  case 301:
 
 /* Line 1806 of yacc.c  */
 #line 1299 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Restrict ); }
-    break;
-
-  case 301:
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Volatile ); }
+    break;
+
+  case 302:
 
 /* Line 1806 of yacc.c  */
 #line 1301 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Volatile ); }
-    break;
-
-  case 302:
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Lvalue ); }
+    break;
+
+  case 303:
 
 /* Line 1806 of yacc.c  */
 #line 1303 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Lvalue ); }
-    break;
-
-  case 303:
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Atomic ); }
+    break;
+
+  case 304:
 
 /* Line 1806 of yacc.c  */
 #line 1305 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Atomic ); }
-    break;
-
-  case 304:
-
-/* Line 1806 of yacc.c  */
-#line 1307 "parser.yy"
     {
                         typedefTable.enterScope();
@@ -6642 +6628 @@
 
 /* Line 1806 of yacc.c  */
-#line 1311 "parser.yy"
+#line 1309 "parser.yy"
     {
                         typedefTable.leaveScope();
@@ -6652 +6638 @@
 
 /* Line 1806 of yacc.c  */
+#line 1318 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 308:
+
+/* Line 1806 of yacc.c  */
 #line 1320 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
+    break;
+
+  case 310:
+
+/* Line 1806 of yacc.c  */
+#line 1331 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 308:
-
-/* Line 1806 of yacc.c  */
-#line 1322 "parser.yy"
+  case 311:
+
+/* Line 1806 of yacc.c  */
+#line 1336 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Extern ); }
+    break;
+
+  case 312:
+
+/* Line 1806 of yacc.c  */
+#line 1338 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Static ); }
+    break;
+
+  case 313:
+
+/* Line 1806 of yacc.c  */
+#line 1340 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Auto ); }
+    break;
+
+  case 314:
+
+/* Line 1806 of yacc.c  */
+#line 1342 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Register ); }
+    break;
+
+  case 315:
+
+/* Line 1806 of yacc.c  */
+#line 1345 "parser.yy"
+    { (yyval.decl) = new DeclarationNode; (yyval.decl)->isInline = true; }
+    break;
+
+  case 316:
+
+/* Line 1806 of yacc.c  */
+#line 1347 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Fortran ); }
+    break;
+
+  case 317:
+
+/* Line 1806 of yacc.c  */
+#line 1350 "parser.yy"
+    { (yyval.decl) = new DeclarationNode; (yyval.decl)->isNoreturn = true; }
+    break;
+
+  case 318:
+
+/* Line 1806 of yacc.c  */
+#line 1352 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Threadlocal ); }
+    break;
+
+  case 319:
+
+/* Line 1806 of yacc.c  */
+#line 1357 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Char ); }
+    break;
+
+  case 320:
+
+/* Line 1806 of yacc.c  */
+#line 1359 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Double ); }
+    break;
+
+  case 321:
+
+/* Line 1806 of yacc.c  */
+#line 1361 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Float ); }
+    break;
+
+  case 322:
+
+/* Line 1806 of yacc.c  */
+#line 1363 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Int ); }
+    break;
+
+  case 323:
+
+/* Line 1806 of yacc.c  */
+#line 1365 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newLength( DeclarationNode::Long ); }
+    break;
+
+  case 324:
+
+/* Line 1806 of yacc.c  */
+#line 1367 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newLength( DeclarationNode::Short ); }
+    break;
+
+  case 325:
+
+/* Line 1806 of yacc.c  */
+#line 1369 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newSignedNess( DeclarationNode::Signed ); }
+    break;
+
+  case 326:
+
+/* Line 1806 of yacc.c  */
+#line 1371 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newSignedNess( DeclarationNode::Unsigned ); }
+    break;
+
+  case 327:
+
+/* Line 1806 of yacc.c  */
+#line 1373 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Void ); }
+    break;
+
+  case 328:
+
+/* Line 1806 of yacc.c  */
+#line 1375 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Bool ); }
+    break;
+
+  case 329:
+
+/* Line 1806 of yacc.c  */
+#line 1377 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newComplexType( DeclarationNode::Complex ); }
+    break;
+
+  case 330:
+
+/* Line 1806 of yacc.c  */
+#line 1379 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newComplexType( DeclarationNode::Imaginary ); }
+    break;
+
+  case 331:
+
+/* Line 1806 of yacc.c  */
+#line 1381 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
+    break;
+
+  case 333:
+
+/* Line 1806 of yacc.c  */
+#line 1388 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 334:
+
+/* Line 1806 of yacc.c  */
+#line 1390 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 335:
+
+/* Line 1806 of yacc.c  */
+#line 1392 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
 
-  case 310:
-
-/* Line 1806 of yacc.c  */
-#line 1333 "parser.yy"
+  case 336:
+
+/* Line 1806 of yacc.c  */
+#line 1394 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addType( (yyvsp[(1) - (3)].decl) ); }
+    break;
+
+  case 338:
+
+/* Line 1806 of yacc.c  */
+#line 1400 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
+    break;
+
+  case 340:
+
+/* Line 1806 of yacc.c  */
+#line 1407 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 341:
+
+/* Line 1806 of yacc.c  */
+#line 1409 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 311:
-
-/* Line 1806 of yacc.c  */
-#line 1338 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Extern ); }
-    break;
-
-  case 312:
-
-/* Line 1806 of yacc.c  */
-#line 1340 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Static ); }
-    break;
-
-  case 313:
-
-/* Line 1806 of yacc.c  */
-#line 1342 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Auto ); }
-    break;
-
-  case 314:
-
-/* Line 1806 of yacc.c  */
-#line 1344 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Register ); }
-    break;
-
-  case 315:
-
-/* Line 1806 of yacc.c  */
-#line 1347 "parser.yy"
-    { (yyval.decl) = new DeclarationNode; (yyval.decl)->isInline = true; }
-    break;
-
-  case 316:
-
-/* Line 1806 of yacc.c  */
-#line 1349 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Fortran ); }
-    break;
-
-  case 317:
-
-/* Line 1806 of yacc.c  */
-#line 1352 "parser.yy"
-    { (yyval.decl) = new DeclarationNode; (yyval.decl)->isNoreturn = true; }
-    break;
-
-  case 318:
-
-/* Line 1806 of yacc.c  */
-#line 1354 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Threadlocal ); }
-    break;
-
-  case 319:
-
-/* Line 1806 of yacc.c  */
-#line 1359 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Char ); }
-    break;
-
-  case 320:
-
-/* Line 1806 of yacc.c  */
-#line 1361 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Double ); }
-    break;
-
-  case 321:
-
-/* Line 1806 of yacc.c  */
-#line 1363 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Float ); }
-    break;
-
-  case 322:
-
-/* Line 1806 of yacc.c  */
-#line 1365 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Int ); }
-    break;
-
-  case 323:
-
-/* Line 1806 of yacc.c  */
-#line 1367 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newLength( DeclarationNode::Long ); }
-    break;
-
-  case 324:
-
-/* Line 1806 of yacc.c  */
-#line 1369 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newLength( DeclarationNode::Short ); }
-    break;
-
-  case 325:
-
-/* Line 1806 of yacc.c  */
-#line 1371 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newSignedNess( DeclarationNode::Signed ); }
-    break;
-
-  case 326:
-
-/* Line 1806 of yacc.c  */
-#line 1373 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newSignedNess( DeclarationNode::Unsigned ); }
-    break;
-
-  case 327:
-
-/* Line 1806 of yacc.c  */
-#line 1375 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Void ); }
-    break;
-
-  case 328:
-
-/* Line 1806 of yacc.c  */
-#line 1377 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Bool ); }
-    break;
-
-  case 329:
-
-/* Line 1806 of yacc.c  */
-#line 1379 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newComplexType( DeclarationNode::Complex ); }
-    break;
-
-  case 330:
-
-/* Line 1806 of yacc.c  */
-#line 1381 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newComplexType( DeclarationNode::Imaginary ); }
-    break;
-
-  case 331:
-
-/* Line 1806 of yacc.c  */
-#line 1383 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
-    break;
-
-  case 333:
-
-/* Line 1806 of yacc.c  */
-#line 1390 "parser.yy"
+  case 342:
+
+/* Line 1806 of yacc.c  */
+#line 1411 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addType( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 343:
+
+/* Line 1806 of yacc.c  */
+#line 1416 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (4)].decl); }
+    break;
+
+  case 344:
+
+/* Line 1806 of yacc.c  */
+#line 1418 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newTypeof( (yyvsp[(3) - (4)].en) ); }
+    break;
+
+  case 345:
+
+/* Line 1806 of yacc.c  */
+#line 1420 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].decl) ); }
+    break;
+
+  case 346:
+
+/* Line 1806 of yacc.c  */
+#line 1422 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
+    break;
+
+  case 348:
+
+/* Line 1806 of yacc.c  */
+#line 1428 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 334:
-
-/* Line 1806 of yacc.c  */
-#line 1392 "parser.yy"
+  case 349:
+
+/* Line 1806 of yacc.c  */
+#line 1430 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 335:
-
-/* Line 1806 of yacc.c  */
-#line 1394 "parser.yy"
+  case 350:
+
+/* Line 1806 of yacc.c  */
+#line 1432 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
 
-  case 336:
-
-/* Line 1806 of yacc.c  */
-#line 1396 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addType( (yyvsp[(1) - (3)].decl) ); }
-    break;
-
-  case 338:
-
-/* Line 1806 of yacc.c  */
-#line 1402 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 340:
-
-/* Line 1806 of yacc.c  */
-#line 1409 "parser.yy"
+  case 352:
+
+/* Line 1806 of yacc.c  */
+#line 1438 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 341:
-
-/* Line 1806 of yacc.c  */
-#line 1411 "parser.yy"
+  case 353:
+
+/* Line 1806 of yacc.c  */
+#line 1440 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 342:
-
-/* Line 1806 of yacc.c  */
-#line 1413 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addType( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 343:
-
-/* Line 1806 of yacc.c  */
-#line 1418 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (4)].decl); }
-    break;
-
-  case 344:
-
-/* Line 1806 of yacc.c  */
-#line 1420 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newTypeof( (yyvsp[(3) - (4)].en) ); }
-    break;
-
-  case 345:
-
-/* Line 1806 of yacc.c  */
-#line 1422 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].decl) ); }
-    break;
-
-  case 346:
-
-/* Line 1806 of yacc.c  */
-#line 1424 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
-    break;
-
-  case 348:
-
-/* Line 1806 of yacc.c  */
-#line 1430 "parser.yy"
+  case 355:
+
+/* Line 1806 of yacc.c  */
+#line 1446 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 349:
-
-/* Line 1806 of yacc.c  */
-#line 1432 "parser.yy"
+  case 356:
+
+/* Line 1806 of yacc.c  */
+#line 1448 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 350:
-
-/* Line 1806 of yacc.c  */
-#line 1434 "parser.yy"
+  case 357:
+
+/* Line 1806 of yacc.c  */
+#line 1450 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
 
-  case 352:
-
-/* Line 1806 of yacc.c  */
-#line 1440 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 353:
-
-/* Line 1806 of yacc.c  */
-#line 1442 "parser.yy"
+  case 358:
+
+/* Line 1806 of yacc.c  */
+#line 1455 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(1) - (1)].tok) ); }
+    break;
+
+  case 359:
+
+/* Line 1806 of yacc.c  */
+#line 1457 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(2) - (2)].tok) )->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 360:
+
+/* Line 1806 of yacc.c  */
+#line 1459 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 355:
-
-/* Line 1806 of yacc.c  */
-#line 1448 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 356:
-
-/* Line 1806 of yacc.c  */
-#line 1450 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 357:
-
-/* Line 1806 of yacc.c  */
-#line 1452 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 358:
-
-/* Line 1806 of yacc.c  */
-#line 1457 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(1) - (1)].tok) ); }
-    break;
-
-  case 359:
-
-/* Line 1806 of yacc.c  */
-#line 1459 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(2) - (2)].tok) )->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 360:
-
-/* Line 1806 of yacc.c  */
-#line 1461 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 363:
 
 /* Line 1806 of yacc.c  */
+#line 1469 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (4)].aggKey), 0, 0, (yyvsp[(3) - (4)].decl), true ); }
+    break;
+
+  case 364:
+
+/* Line 1806 of yacc.c  */
 #line 1471 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (4)].aggKey), 0, 0, (yyvsp[(3) - (4)].decl), true ); }
-    break;
-
-  case 364:
-
-/* Line 1806 of yacc.c  */
-#line 1473 "parser.yy"
     {
                         typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
@@ -6998 +6984 @@
 
 /* Line 1806 of yacc.c  */
+#line 1476 "parser.yy"
+    { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
+    break;
+
+  case 366:
+
+/* Line 1806 of yacc.c  */
 #line 1478 "parser.yy"
-    { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
-    break;
-
-  case 366:
+    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (6)].aggKey), (yyvsp[(2) - (6)].tok), 0, (yyvsp[(5) - (6)].decl), true ); }
+    break;
+
+  case 367:
 
 /* Line 1806 of yacc.c  */
 #line 1480 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (6)].aggKey), (yyvsp[(2) - (6)].tok), 0, (yyvsp[(5) - (6)].decl), true ); }
-    break;
-
-  case 367:
+    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (7)].aggKey), 0, (yyvsp[(3) - (7)].en), (yyvsp[(6) - (7)].decl), false ); }
+    break;
+
+  case 368:
 
 /* Line 1806 of yacc.c  */
 #line 1482 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (7)].aggKey), 0, (yyvsp[(3) - (7)].en), (yyvsp[(6) - (7)].decl), false ); }
-    break;
-
-  case 368:
-
-/* Line 1806 of yacc.c  */
-#line 1484 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
     break;
@@ -7026 +7012 @@
 
 /* Line 1806 of yacc.c  */
+#line 1487 "parser.yy"
+    { (yyval.aggKey) = DeclarationNode::Struct; }
+    break;
+
+  case 370:
+
+/* Line 1806 of yacc.c  */
 #line 1489 "parser.yy"
-    { (yyval.aggKey) = DeclarationNode::Struct; }
-    break;
-
-  case 370:
-
-/* Line 1806 of yacc.c  */
-#line 1491 "parser.yy"
     { (yyval.aggKey) = DeclarationNode::Union; }
     break;
@@ -7040 +7026 @@
 
 /* Line 1806 of yacc.c  */
+#line 1494 "parser.yy"
+    { (yyval.decl) = 0; }
+    break;
+
+  case 372:
+
+/* Line 1806 of yacc.c  */
 #line 1496 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
-  case 372:
-
-/* Line 1806 of yacc.c  */
-#line 1498 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl) != 0 ? (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ) : (yyvsp[(2) - (2)].decl); }
     break;
@@ -7054 +7040 @@
 
 /* Line 1806 of yacc.c  */
-#line 1504 "parser.yy"
+#line 1502 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl)->set_extension( true ); }
     break;
@@ -7061 +7047 @@
 
 /* Line 1806 of yacc.c  */
-#line 1507 "parser.yy"
+#line 1505 "parser.yy"
     {   // mark all fields in list
                         for ( DeclarationNode *iter = (yyvsp[(2) - (3)].decl); iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
@@ -7072 +7058 @@
 
 /* Line 1806 of yacc.c  */
+#line 1515 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addName( (yyvsp[(2) - (2)].tok) ); }
+    break;
+
+  case 379:
+
+/* Line 1806 of yacc.c  */
 #line 1517 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addName( (yyvsp[(2) - (2)].tok) ); }
-    break;
-
-  case 379:
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(1) - (3)].decl)->cloneType( (yyvsp[(3) - (3)].tok) ) ); }
+    break;
+
+  case 380:
 
 /* Line 1806 of yacc.c  */
 #line 1519 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(1) - (3)].decl)->cloneType( (yyvsp[(3) - (3)].tok) ) ); }
-    break;
-
-  case 380:
-
-/* Line 1806 of yacc.c  */
-#line 1521 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(1) - (2)].decl)->cloneType( 0 ) ); }
     break;
@@ -7093 +7079 @@
 
 /* Line 1806 of yacc.c  */
+#line 1524 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 382:
+
+/* Line 1806 of yacc.c  */
 #line 1526 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 382:
-
-/* Line 1806 of yacc.c  */
-#line 1528 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(1) - (4)].decl)->cloneBaseType( (yyvsp[(4) - (4)].decl) ) ); }
     break;
@@ -7107 +7093 @@
 
 /* Line 1806 of yacc.c  */
+#line 1531 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newName( 0 ); /* XXX */ }
+    break;
+
+  case 384:
+
+/* Line 1806 of yacc.c  */
 #line 1533 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newName( 0 ); /* XXX */ }
-    break;
-
-  case 384:
-
-/* Line 1806 of yacc.c  */
-#line 1535 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBitfield( (yyvsp[(1) - (1)].en) ); }
     break;
@@ -7121 +7107 @@
 
 /* Line 1806 of yacc.c  */
-#line 1538 "parser.yy"
+#line 1536 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
     break;
@@ -7128 +7114 @@
 
 /* Line 1806 of yacc.c  */
-#line 1541 "parser.yy"
+#line 1539 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
     break;
@@ -7135 +7121 @@
 
 /* Line 1806 of yacc.c  */
+#line 1545 "parser.yy"
+    { (yyval.en) = 0; }
+    break;
+
+  case 389:
+
+/* Line 1806 of yacc.c  */
 #line 1547 "parser.yy"
-    { (yyval.en) = 0; }
-    break;
-
-  case 389:
-
-/* Line 1806 of yacc.c  */
-#line 1549 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
@@ -7149 +7135 @@
 
 /* Line 1806 of yacc.c  */
-#line 1554 "parser.yy"
+#line 1552 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -7156 +7142 @@
 
 /* Line 1806 of yacc.c  */
+#line 1561 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newEnum( 0, (yyvsp[(3) - (5)].decl) ); }
+    break;
+
+  case 393:
+
+/* Line 1806 of yacc.c  */
 #line 1563 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newEnum( 0, (yyvsp[(3) - (5)].decl) ); }
-    break;
-
-  case 393:
-
-/* Line 1806 of yacc.c  */
-#line 1565 "parser.yy"
     {
                         typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
@@ -7173 +7159 @@
 
 /* Line 1806 of yacc.c  */
+#line 1568 "parser.yy"
+    { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
+    break;
+
+  case 395:
+
+/* Line 1806 of yacc.c  */
 #line 1570 "parser.yy"
-    { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
-    break;
-
-  case 395:
-
-/* Line 1806 of yacc.c  */
-#line 1572 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( (yyvsp[(2) - (7)].tok), (yyvsp[(5) - (7)].decl) ); }
     break;
@@ -7187 +7173 @@
 
 /* Line 1806 of yacc.c  */
+#line 1575 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newEnumConstant( (yyvsp[(1) - (2)].tok), (yyvsp[(2) - (2)].en) ); }
+    break;
+
+  case 397:
+
+/* Line 1806 of yacc.c  */
 #line 1577 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newEnumConstant( (yyvsp[(1) - (2)].tok), (yyvsp[(2) - (2)].en) ); }
-    break;
-
-  case 397:
-
-/* Line 1806 of yacc.c  */
-#line 1579 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( DeclarationNode::newEnumConstant( (yyvsp[(3) - (4)].tok), (yyvsp[(4) - (4)].en) ) ); }
     break;
@@ -7201 +7187 @@
 
 /* Line 1806 of yacc.c  */
+#line 1582 "parser.yy"
+    { (yyval.en) = 0; }
+    break;
+
+  case 399:
+
+/* Line 1806 of yacc.c  */
 #line 1584 "parser.yy"
-    { (yyval.en) = 0; }
-    break;
-
-  case 399:
-
-/* Line 1806 of yacc.c  */
-#line 1586 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -7215 +7201 @@
 
 /* Line 1806 of yacc.c  */
-#line 1593 "parser.yy"
+#line 1591 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7222 +7208 @@
 
 /* Line 1806 of yacc.c  */
+#line 1599 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
+    break;
+
+  case 405:
+
+/* Line 1806 of yacc.c  */
 #line 1601 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
-    break;
-
-  case 405:
+    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
+    break;
+
+  case 406:
 
 /* Line 1806 of yacc.c  */
@@ -7233 +7226 @@
     break;
 
-  case 406:
-
-/* Line 1806 of yacc.c  */
-#line 1605 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
-    break;
-
   case 408:
+
+/* Line 1806 of yacc.c  */
+#line 1611 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
+    break;
+
+  case 409:
 
 /* Line 1806 of yacc.c  */
@@ -7247 +7240 @@
     break;
 
-  case 409:
+  case 410:
 
 /* Line 1806 of yacc.c  */
 #line 1615 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (9)].decl)->appendList( (yyvsp[(5) - (9)].decl) )->appendList( (yyvsp[(9) - (9)].decl) ); }
+    break;
+
+  case 412:
+
+/* Line 1806 of yacc.c  */
+#line 1621 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
 
-  case 410:
-
-/* Line 1806 of yacc.c  */
-#line 1617 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (9)].decl)->appendList( (yyvsp[(5) - (9)].decl) )->appendList( (yyvsp[(9) - (9)].decl) ); }
-    break;
-
-  case 412:
-
-/* Line 1806 of yacc.c  */
-#line 1623 "parser.yy"
+  case 413:
+
+/* Line 1806 of yacc.c  */
+#line 1626 "parser.yy"
+    { (yyval.decl) = 0; }
+    break;
+
+  case 416:
+
+/* Line 1806 of yacc.c  */
+#line 1633 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
+    break;
+
+  case 419:
+
+/* Line 1806 of yacc.c  */
+#line 1640 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
 
-  case 413:
-
-/* Line 1806 of yacc.c  */
-#line 1628 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
-  case 416:
-
-/* Line 1806 of yacc.c  */
-#line 1635 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
-    break;
-
-  case 419:
+  case 420:
 
 /* Line 1806 of yacc.c  */
@@ -7289 +7282 @@
     break;
 
-  case 420:
-
-/* Line 1806 of yacc.c  */
-#line 1644 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
-    break;
-
   case 422:
 
 /* Line 1806 of yacc.c  */
-#line 1653 "parser.yy"
+#line 1651 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -7306 +7292 @@
 
 /* Line 1806 of yacc.c  */
+#line 1654 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
+    break;
+
+  case 424:
+
+/* Line 1806 of yacc.c  */
 #line 1656 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
-    break;
-
-  case 424:
-
-/* Line 1806 of yacc.c  */
-#line 1658 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addName( (yyvsp[(3) - (4)].tok) )->addQualifiers( (yyvsp[(1) - (4)].decl) ); }
     break;
@@ -7320 +7306 @@
 
 /* Line 1806 of yacc.c  */
-#line 1668 "parser.yy"
+#line 1666 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7327 +7313 @@
 
 /* Line 1806 of yacc.c  */
-#line 1674 "parser.yy"
+#line 1672 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7337 +7323 @@
 
 /* Line 1806 of yacc.c  */
-#line 1679 "parser.yy"
+#line 1677 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7347 +7333 @@
 
 /* Line 1806 of yacc.c  */
-#line 1688 "parser.yy"
+#line 1686 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7354 +7340 @@
 
 /* Line 1806 of yacc.c  */
+#line 1695 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newName( (yyvsp[(1) - (1)].tok) ); }
+    break;
+
+  case 436:
+
+/* Line 1806 of yacc.c  */
 #line 1697 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newName( (yyvsp[(1) - (1)].tok) ); }
-    break;
-
-  case 436:
-
-/* Line 1806 of yacc.c  */
-#line 1699 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( DeclarationNode::newName( (yyvsp[(3) - (3)].tok) ) ); }
     break;
@@ -7368 +7354 @@
 
 /* Line 1806 of yacc.c  */
-#line 1724 "parser.yy"
+#line 1722 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7375 +7361 @@
 
 /* Line 1806 of yacc.c  */
-#line 1732 "parser.yy"
+#line 1730 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7382 +7368 @@
 
 /* Line 1806 of yacc.c  */
+#line 1735 "parser.yy"
+    { (yyval.in) = 0; }
+    break;
+
+  case 454:
+
+/* Line 1806 of yacc.c  */
 #line 1737 "parser.yy"
+    { (yyval.in) = (yyvsp[(2) - (2)].in); }
+    break;
+
+  case 455:
+
+/* Line 1806 of yacc.c  */
+#line 1739 "parser.yy"
+    { (yyval.in) = (yyvsp[(2) - (2)].in)->set_maybeConstructed( false ); }
+    break;
+
+  case 456:
+
+/* Line 1806 of yacc.c  */
+#line 1743 "parser.yy"
+    { (yyval.in) = new InitializerNode( (yyvsp[(1) - (1)].en) ); }
+    break;
+
+  case 457:
+
+/* Line 1806 of yacc.c  */
+#line 1744 "parser.yy"
+    { (yyval.in) = new InitializerNode( (yyvsp[(2) - (4)].in), true ); }
+    break;
+
+  case 458:
+
+/* Line 1806 of yacc.c  */
+#line 1749 "parser.yy"
     { (yyval.in) = 0; }
     break;
 
-  case 454:
-
-/* Line 1806 of yacc.c  */
-#line 1739 "parser.yy"
-    { (yyval.in) = (yyvsp[(2) - (2)].in); }
-    break;
-
-  case 455:
-
-/* Line 1806 of yacc.c  */
-#line 1741 "parser.yy"
-    { (yyval.in) = (yyvsp[(2) - (2)].in)->set_maybeConstructed( false ); }
-    break;
-
-  case 456:
-
-/* Line 1806 of yacc.c  */
-#line 1745 "parser.yy"
-    { (yyval.in) = new InitializerNode( (yyvsp[(1) - (1)].en) ); }
-    break;
-
-  case 457:
-
-/* Line 1806 of yacc.c  */
-#line 1746 "parser.yy"
-    { (yyval.in) = new InitializerNode( (yyvsp[(2) - (4)].in), true ); }
-    break;
-
-  case 458:
+  case 460:
 
 /* Line 1806 of yacc.c  */
 #line 1751 "parser.yy"
-    { (yyval.in) = 0; }
-    break;
-
-  case 460:
-
-/* Line 1806 of yacc.c  */
-#line 1753 "parser.yy"
     { (yyval.in) = (yyvsp[(2) - (2)].in)->set_designators( (yyvsp[(1) - (2)].en) ); }
     break;
@@ -7431 +7417 @@
 
 /* Line 1806 of yacc.c  */
+#line 1752 "parser.yy"
+    { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (3)].in)->set_last( (yyvsp[(3) - (3)].in) ) ); }
+    break;
+
+  case 462:
+
+/* Line 1806 of yacc.c  */
 #line 1754 "parser.yy"
-    { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (3)].in)->set_last( (yyvsp[(3) - (3)].in) ) ); }
-    break;
-
-  case 462:
-
-/* Line 1806 of yacc.c  */
-#line 1756 "parser.yy"
     { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (4)].in)->set_last( (yyvsp[(4) - (4)].in)->set_designators( (yyvsp[(3) - (4)].en) ) ) ); }
     break;
@@ -7445 +7431 @@
 
 /* Line 1806 of yacc.c  */
-#line 1772 "parser.yy"
+#line 1770 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[(1) - (2)].tok) ) ); }
     break;
@@ -7452 +7438 @@
 
 /* Line 1806 of yacc.c  */
-#line 1778 "parser.yy"
+#line 1776 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (2)].en)->set_last( (yyvsp[(2) - (2)].en) ) ); }
     break;
@@ -7459 +7445 @@
 
 /* Line 1806 of yacc.c  */
-#line 1784 "parser.yy"
+#line 1782 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[(2) - (2)].tok) ) ); }
     break;
 
   case 468:
+
+/* Line 1806 of yacc.c  */
+#line 1785 "parser.yy"
+    { (yyval.en) = (yyvsp[(3) - (5)].en); }
+    break;
+
+  case 469:
 
 /* Line 1806 of yacc.c  */
@@ -7470 +7463 @@
     break;
 
-  case 469:
+  case 470:
 
 /* Line 1806 of yacc.c  */
 #line 1789 "parser.yy"
-    { (yyval.en) = (yyvsp[(3) - (5)].en); }
-    break;
-
-  case 470:
+    { (yyval.en) = new ExpressionNode( build_range( (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].en) ) ); }
+    break;
+
+  case 471:
 
 /* Line 1806 of yacc.c  */
 #line 1791 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_range( (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].en) ) ); }
-    break;
-
-  case 471:
-
-/* Line 1806 of yacc.c  */
-#line 1793 "parser.yy"
     { (yyval.en) = (yyvsp[(4) - (6)].en); }
     break;
@@ -7494 +7480 @@
 
 /* Line 1806 of yacc.c  */
+#line 1815 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 474:
+
+/* Line 1806 of yacc.c  */
 #line 1817 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 475:
+
+/* Line 1806 of yacc.c  */
+#line 1819 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
+    break;
+
+  case 477:
+
+/* Line 1806 of yacc.c  */
+#line 1825 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 474:
-
-/* Line 1806 of yacc.c  */
-#line 1819 "parser.yy"
+  case 478:
+
+/* Line 1806 of yacc.c  */
+#line 1827 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
-  case 475:
-
-/* Line 1806 of yacc.c  */
-#line 1821 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 477:
-
-/* Line 1806 of yacc.c  */
-#line 1827 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 478:
-
-/* Line 1806 of yacc.c  */
-#line 1829 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 479:
 
 /* Line 1806 of yacc.c  */
-#line 1834 "parser.yy"
+#line 1832 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypeGen( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -7536 +7522 @@
 
 /* Line 1806 of yacc.c  */
-#line 1840 "parser.yy"
+#line 1838 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -7543 +7529 @@
 
 /* Line 1806 of yacc.c  */
+#line 1843 "parser.yy"
+    { typedefTable.addToEnclosingScope( *(yyvsp[(2) - (2)].tok), TypedefTable::TD ); }
+    break;
+
+  case 483:
+
+/* Line 1806 of yacc.c  */
 #line 1845 "parser.yy"
-    { typedefTable.addToEnclosingScope( *(yyvsp[(2) - (2)].tok), TypedefTable::TD ); }
-    break;
-
-  case 483:
-
-/* Line 1806 of yacc.c  */
-#line 1847 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTypeParam( (yyvsp[(1) - (4)].tclass), (yyvsp[(2) - (4)].tok) )->addAssertions( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -7557 +7543 @@
 
 /* Line 1806 of yacc.c  */
+#line 1851 "parser.yy"
+    { (yyval.tclass) = DeclarationNode::Otype; }
+    break;
+
+  case 486:
+
+/* Line 1806 of yacc.c  */
 #line 1853 "parser.yy"
-    { (yyval.tclass) = DeclarationNode::Otype; }
-    break;
-
-  case 486:
+    { (yyval.tclass) = DeclarationNode::Ftype; }
+    break;
+
+  case 487:
 
 /* Line 1806 of yacc.c  */
 #line 1855 "parser.yy"
-    { (yyval.tclass) = DeclarationNode::Ftype; }
-    break;
-
-  case 487:
-
-/* Line 1806 of yacc.c  */
-#line 1857 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Dtype; }
     break;
@@ -7578 +7564 @@
 
 /* Line 1806 of yacc.c  */
+#line 1860 "parser.yy"
+    { (yyval.decl) = 0; }
+    break;
+
+  case 489:
+
+/* Line 1806 of yacc.c  */
 #line 1862 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
-  case 489:
-
-/* Line 1806 of yacc.c  */
-#line 1864 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl) != 0 ? (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ) : (yyvsp[(2) - (2)].decl); }
     break;
@@ -7592 +7578 @@
 
 /* Line 1806 of yacc.c  */
-#line 1869 "parser.yy"
+#line 1867 "parser.yy"
     {
                         typedefTable.openTrait( *(yyvsp[(2) - (5)].tok) );
@@ -7602 +7588 @@
 
 /* Line 1806 of yacc.c  */
+#line 1872 "parser.yy"
+    { (yyval.decl) = (yyvsp[(4) - (5)].decl); }
+    break;
+
+  case 492:
+
+/* Line 1806 of yacc.c  */
 #line 1874 "parser.yy"
-    { (yyval.decl) = (yyvsp[(4) - (5)].decl); }
-    break;
-
-  case 492:
-
-/* Line 1806 of yacc.c  */
-#line 1876 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7616 +7602 @@
 
 /* Line 1806 of yacc.c  */
-#line 1881 "parser.yy"
+#line 1879 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_typevalue( (yyvsp[(1) - (1)].decl) ) ); }
     break;
@@ -7623 +7609 @@
 
 /* Line 1806 of yacc.c  */
+#line 1882 "parser.yy"
+    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_last( new ExpressionNode( build_typevalue( (yyvsp[(3) - (3)].decl) ) ) ) ); }
+    break;
+
+  case 496:
+
+/* Line 1806 of yacc.c  */
 #line 1884 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_last( new ExpressionNode( build_typevalue( (yyvsp[(3) - (3)].decl) ) ) ) ); }
-    break;
-
-  case 496:
-
-/* Line 1806 of yacc.c  */
-#line 1886 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) )); }
     break;
@@ -7637 +7623 @@
 
 /* Line 1806 of yacc.c  */
+#line 1889 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
+    break;
+
+  case 498:
+
+/* Line 1806 of yacc.c  */
 #line 1891 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
-    break;
-
-  case 498:
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) ); }
+    break;
+
+  case 499:
 
 /* Line 1806 of yacc.c  */
 #line 1893 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) ); }
-    break;
-
-  case 499:
-
-/* Line 1806 of yacc.c  */
-#line 1895 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl)->copyStorageClasses( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -7658 +7644 @@
 
 /* Line 1806 of yacc.c  */
+#line 1898 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addAssertions( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 501:
+
+/* Line 1806 of yacc.c  */
 #line 1900 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addAssertions( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 501:
-
-/* Line 1806 of yacc.c  */
-#line 1902 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addAssertions( (yyvsp[(2) - (4)].decl) )->addType( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -7672 +7658 @@
 
 /* Line 1806 of yacc.c  */
-#line 1907 "parser.yy"
+#line 1905 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (1)].tok), TypedefTable::TD );
@@ -7682 +7668 @@
 
 /* Line 1806 of yacc.c  */
-#line 1912 "parser.yy"
+#line 1910 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (6)].tok), TypedefTable::TG );
@@ -7692 +7678 @@
 
 /* Line 1806 of yacc.c  */
-#line 1920 "parser.yy"
+#line 1918 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (9)].tok), TypedefTable::ID );
@@ -7702 +7688 @@
 
 /* Line 1806 of yacc.c  */
-#line 1925 "parser.yy"
+#line 1923 "parser.yy"
     {
                         typedefTable.enterTrait( *(yyvsp[(2) - (8)].tok) );
@@ -7712 +7698 @@
 
 /* Line 1806 of yacc.c  */
-#line 1930 "parser.yy"
+#line 1928 "parser.yy"
     {
                         typedefTable.leaveTrait();
@@ -7723 +7709 @@
 
 /* Line 1806 of yacc.c  */
-#line 1940 "parser.yy"
+#line 1938 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7730 +7716 @@
 
 /* Line 1806 of yacc.c  */
-#line 1950 "parser.yy"
+#line 1948 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7740 +7726 @@
 
 /* Line 1806 of yacc.c  */
-#line 1955 "parser.yy"
+#line 1953 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7750 +7736 @@
 
 /* Line 1806 of yacc.c  */
-#line 1960 "parser.yy"
+#line 1958 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
@@ -7760 +7746 @@
 
 /* Line 1806 of yacc.c  */
-#line 1968 "parser.yy"
+#line 1966 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7770 +7756 @@
 
 /* Line 1806 of yacc.c  */
-#line 1973 "parser.yy"
+#line 1971 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7780 +7766 @@
 
 /* Line 1806 of yacc.c  */
+#line 1981 "parser.yy"
+    {}
+    break;
+
+  case 517:
+
+/* Line 1806 of yacc.c  */
 #line 1983 "parser.yy"
+    { parseTree = parseTree != nullptr ? parseTree->appendList( (yyvsp[(1) - (1)].decl) ) : (yyvsp[(1) - (1)].decl);    }
+    break;
+
+  case 519:
+
+/* Line 1806 of yacc.c  */
+#line 1989 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl) != nullptr ? (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ) : (yyvsp[(3) - (3)].decl); }
+    break;
+
+  case 520:
+
+/* Line 1806 of yacc.c  */
+#line 1994 "parser.yy"
+    { (yyval.decl) = 0; }
+    break;
+
+  case 524:
+
+/* Line 1806 of yacc.c  */
+#line 2002 "parser.yy"
     {}
     break;
 
-  case 517:
-
-/* Line 1806 of yacc.c  */
-#line 1985 "parser.yy"
-    { parseTree = parseTree != nullptr ? parseTree->appendList( (yyvsp[(1) - (1)].decl) ) : (yyvsp[(1) - (1)].decl);    }
-    break;
-
-  case 519:
-
-/* Line 1806 of yacc.c  */
-#line 1991 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl) != nullptr ? (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ) : (yyvsp[(3) - (3)].decl); }
-    break;
-
-  case 520:
-
-/* Line 1806 of yacc.c  */
-#line 1996 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
-  case 524:
+  case 525:
 
 /* Line 1806 of yacc.c  */
 #line 2004 "parser.yy"
-    {}
-    break;
-
-  case 525:
-
-/* Line 1806 of yacc.c  */
-#line 2006 "parser.yy"
     {
                         linkageStack.push( linkage );                           // handle nested extern "C"/"Cforall"
@@ -7825 +7811 @@
 
 /* Line 1806 of yacc.c  */
-#line 2011 "parser.yy"
+#line 2009 "parser.yy"
     {
                         linkage = linkageStack.top();
@@ -7836 +7822 @@
 
 /* Line 1806 of yacc.c  */
-#line 2017 "parser.yy"
+#line 2015 "parser.yy"
     {   // mark all fields in list
                         for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
@@ -7847 +7833 @@
 
 /* Line 1806 of yacc.c  */
-#line 2032 "parser.yy"
+#line 2030 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7858 +7844 @@
 
 /* Line 1806 of yacc.c  */
-#line 2038 "parser.yy"
+#line 2036 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7869 +7855 @@
 
 /* Line 1806 of yacc.c  */
-#line 2047 "parser.yy"
+#line 2045 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7880 +7866 @@
 
 /* Line 1806 of yacc.c  */
-#line 2053 "parser.yy"
+#line 2051 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7891 +7877 @@
 
 /* Line 1806 of yacc.c  */
-#line 2059 "parser.yy"
+#line 2057 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7902 +7888 @@
 
 /* Line 1806 of yacc.c  */
-#line 2065 "parser.yy"
+#line 2063 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7913 +7899 @@
 
 /* Line 1806 of yacc.c  */
-#line 2071 "parser.yy"
+#line 2069 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7924 +7910 @@
 
 /* Line 1806 of yacc.c  */
-#line 2079 "parser.yy"
+#line 2077 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7935 +7921 @@
 
 /* Line 1806 of yacc.c  */
-#line 2085 "parser.yy"
+#line 2083 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7946 +7932 @@
 
 /* Line 1806 of yacc.c  */
-#line 2093 "parser.yy"
+#line 2091 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7957 +7943 @@
 
 /* Line 1806 of yacc.c  */
-#line 2099 "parser.yy"
+#line 2097 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7968 +7954 @@
 
 /* Line 1806 of yacc.c  */
-#line 2114 "parser.yy"
+#line 2112 "parser.yy"
     { (yyval.en) = new ExpressionNode( build_range( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -7975 +7961 @@
 
 /* Line 1806 of yacc.c  */
-#line 2119 "parser.yy"
+#line 2117 "parser.yy"
     { delete (yyvsp[(3) - (5)].str); }
     break;
@@ -7982 +7968 @@
 
 /* Line 1806 of yacc.c  */
-#line 2124 "parser.yy"
+#line 2122 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7989 +7975 @@
 
 /* Line 1806 of yacc.c  */
-#line 2131 "parser.yy"
+#line 2129 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7996 +7982 @@
 
 /* Line 1806 of yacc.c  */
-#line 2137 "parser.yy"
+#line 2135 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -8003 +7989 @@
 
 /* Line 1806 of yacc.c  */
-#line 2148 "parser.yy"
+#line 2146 "parser.yy"
     { delete (yyvsp[(3) - (4)].en); }
     break;
@@ -8010 +7996 @@
 
 /* Line 1806 of yacc.c  */
+#line 2150 "parser.yy"
+    { delete (yyvsp[(1) - (1)].tok); }
+    break;
+
+  case 557:
+
+/* Line 1806 of yacc.c  */
+#line 2151 "parser.yy"
+    { delete (yyvsp[(1) - (1)].decl); }
+    break;
+
+  case 558:
+
+/* Line 1806 of yacc.c  */
 #line 2152 "parser.yy"
-    { delete (yyvsp[(1) - (1)].tok); }
-    break;
-
-  case 557:
+    { delete (yyvsp[(1) - (1)].decl); }
+    break;
+
+  case 559:
 
 /* Line 1806 of yacc.c  */
@@ -8021 +8021 @@
     break;
 
-  case 558:
-
-/* Line 1806 of yacc.c  */
-#line 2154 "parser.yy"
-    { delete (yyvsp[(1) - (1)].decl); }
-    break;
-
-  case 559:
-
-/* Line 1806 of yacc.c  */
-#line 2155 "parser.yy"
-    { delete (yyvsp[(1) - (1)].decl); }
-    break;
-
   case 560:
 
 /* Line 1806 of yacc.c  */
-#line 2190 "parser.yy"
+#line 2188 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
   case 562:
+
+/* Line 1806 of yacc.c  */
+#line 2191 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 563:
 
 /* Line 1806 of yacc.c  */
@@ -8049 +8042 @@
     break;
 
-  case 563:
-
-/* Line 1806 of yacc.c  */
-#line 2195 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 564:
 
 /* Line 1806 of yacc.c  */
-#line 2200 "parser.yy"
+#line 2198 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8069 +8055 @@
 
 /* Line 1806 of yacc.c  */
-#line 2205 "parser.yy"
+#line 2203 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8076 +8062 @@
 
 /* Line 1806 of yacc.c  */
+#line 2208 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 567:
+
+/* Line 1806 of yacc.c  */
 #line 2210 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 567:
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 568:
 
 /* Line 1806 of yacc.c  */
 #line 2212 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 568:
-
-/* Line 1806 of yacc.c  */
-#line 2214 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8097 +8083 @@
 
 /* Line 1806 of yacc.c  */
+#line 2217 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 570:
+
+/* Line 1806 of yacc.c  */
 #line 2219 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 570:
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 571:
 
 /* Line 1806 of yacc.c  */
@@ -8108 +8101 @@
     break;
 
-  case 571:
+  case 572:
 
 /* Line 1806 of yacc.c  */
 #line 2223 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 573:
+
+/* Line 1806 of yacc.c  */
+#line 2228 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 574:
+
+/* Line 1806 of yacc.c  */
+#line 2230 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 575:
+
+/* Line 1806 of yacc.c  */
+#line 2239 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 577:
+
+/* Line 1806 of yacc.c  */
+#line 2242 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 578:
+
+/* Line 1806 of yacc.c  */
+#line 2247 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
+    break;
+
+  case 579:
+
+/* Line 1806 of yacc.c  */
+#line 2249 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 580:
+
+/* Line 1806 of yacc.c  */
+#line 2251 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 581:
+
+/* Line 1806 of yacc.c  */
+#line 2256 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 582:
+
+/* Line 1806 of yacc.c  */
+#line 2258 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 583:
+
+/* Line 1806 of yacc.c  */
+#line 2260 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 584:
+
+/* Line 1806 of yacc.c  */
+#line 2265 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 
-  case 572:
-
-/* Line 1806 of yacc.c  */
-#line 2225 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 573:
-
-/* Line 1806 of yacc.c  */
-#line 2230 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 574:
-
-/* Line 1806 of yacc.c  */
-#line 2232 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 575:
-
-/* Line 1806 of yacc.c  */
-#line 2241 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 577:
-
-/* Line 1806 of yacc.c  */
-#line 2244 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 578:
-
-/* Line 1806 of yacc.c  */
-#line 2249 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-
-  case 579:
-
-/* Line 1806 of yacc.c  */
-#line 2251 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 580:
-
-/* Line 1806 of yacc.c  */
-#line 2253 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 581:
-
-/* Line 1806 of yacc.c  */
-#line 2258 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 582:
-
-/* Line 1806 of yacc.c  */
-#line 2260 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 583:
-
-/* Line 1806 of yacc.c  */
-#line 2262 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 584:
+  case 585:
 
 /* Line 1806 of yacc.c  */
@@ -8199 +8192 @@
     break;
 
-  case 585:
+  case 586:
 
 /* Line 1806 of yacc.c  */
 #line 2269 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 590:
+
+/* Line 1806 of yacc.c  */
+#line 2284 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addIdList( (yyvsp[(3) - (4)].decl) ); }
+    break;
+
+  case 591:
+
+/* Line 1806 of yacc.c  */
+#line 2286 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (6)].decl)->addIdList( (yyvsp[(5) - (6)].decl) ); }
+    break;
+
+  case 592:
+
+/* Line 1806 of yacc.c  */
+#line 2288 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 593:
+
+/* Line 1806 of yacc.c  */
+#line 2293 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 594:
+
+/* Line 1806 of yacc.c  */
+#line 2295 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 595:
+
+/* Line 1806 of yacc.c  */
+#line 2297 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
+
+  case 596:
+
+/* Line 1806 of yacc.c  */
+#line 2302 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 
-  case 586:
-
-/* Line 1806 of yacc.c  */
-#line 2271 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 590:
-
-/* Line 1806 of yacc.c  */
-#line 2286 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addIdList( (yyvsp[(3) - (4)].decl) ); }
-    break;
-
-  case 591:
-
-/* Line 1806 of yacc.c  */
-#line 2288 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (6)].decl)->addIdList( (yyvsp[(5) - (6)].decl) ); }
-    break;
-
-  case 592:
-
-/* Line 1806 of yacc.c  */
-#line 2290 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 593:
-
-/* Line 1806 of yacc.c  */
-#line 2295 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 594:
-
-/* Line 1806 of yacc.c  */
-#line 2297 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 595:
-
-/* Line 1806 of yacc.c  */
-#line 2299 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 596:
+  case 597:
 
 /* Line 1806 of yacc.c  */
@@ -8262 +8255 @@
     break;
 
-  case 597:
+  case 598:
 
 /* Line 1806 of yacc.c  */
 #line 2306 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 598:
-
-/* Line 1806 of yacc.c  */
-#line 2308 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8279 +8265 @@
 
 /* Line 1806 of yacc.c  */
-#line 2323 "parser.yy"
+#line 2321 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
   case 601:
+
+/* Line 1806 of yacc.c  */
+#line 2324 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 602:
 
 /* Line 1806 of yacc.c  */
@@ -8290 +8283 @@
     break;
 
-  case 602:
-
-/* Line 1806 of yacc.c  */
-#line 2328 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 604:
 
 /* Line 1806 of yacc.c  */
-#line 2334 "parser.yy"
+#line 2332 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8307 +8293 @@
 
 /* Line 1806 of yacc.c  */
+#line 2337 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 606:
+
+/* Line 1806 of yacc.c  */
 #line 2339 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 606:
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 607:
 
 /* Line 1806 of yacc.c  */
 #line 2341 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 607:
-
-/* Line 1806 of yacc.c  */
-#line 2343 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8328 +8314 @@
 
 /* Line 1806 of yacc.c  */
+#line 2346 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 609:
+
+/* Line 1806 of yacc.c  */
 #line 2348 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 609:
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 610:
 
 /* Line 1806 of yacc.c  */
@@ -8339 +8332 @@
     break;
 
-  case 610:
+  case 611:
 
 /* Line 1806 of yacc.c  */
 #line 2352 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 611:
-
-/* Line 1806 of yacc.c  */
-#line 2354 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8356 +8342 @@
 
 /* Line 1806 of yacc.c  */
+#line 2357 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
+    break;
+
+  case 613:
+
+/* Line 1806 of yacc.c  */
 #line 2359 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-
-  case 613:
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 614:
 
 /* Line 1806 of yacc.c  */
 #line 2361 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 614:
-
-/* Line 1806 of yacc.c  */
-#line 2363 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8377 +8363 @@
 
 /* Line 1806 of yacc.c  */
-#line 2373 "parser.yy"
+#line 2371 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
   case 617:
+
+/* Line 1806 of yacc.c  */
+#line 2374 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 618:
 
 /* Line 1806 of yacc.c  */
@@ -8388 +8381 @@
     break;
 
-  case 618:
-
-/* Line 1806 of yacc.c  */
-#line 2378 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 619:
 
 /* Line 1806 of yacc.c  */
+#line 2381 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 620:
+
+/* Line 1806 of yacc.c  */
 #line 2383 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 620:
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 621:
 
 /* Line 1806 of yacc.c  */
 #line 2385 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 621:
-
-/* Line 1806 of yacc.c  */
-#line 2387 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8419 +8405 @@
 
 /* Line 1806 of yacc.c  */
+#line 2390 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 623:
+
+/* Line 1806 of yacc.c  */
 #line 2392 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 623:
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 624:
 
 /* Line 1806 of yacc.c  */
@@ -8430 +8423 @@
     break;
 
-  case 624:
+  case 625:
 
 /* Line 1806 of yacc.c  */
 #line 2396 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 625:
-
-/* Line 1806 of yacc.c  */
-#line 2398 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8447 +8433 @@
 
 /* Line 1806 of yacc.c  */
+#line 2401 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
+    break;
+
+  case 627:
+
+/* Line 1806 of yacc.c  */
 #line 2403 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-
-  case 627:
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 628:
 
 /* Line 1806 of yacc.c  */
 #line 2405 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 628:
-
-/* Line 1806 of yacc.c  */
-#line 2407 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8468 +8454 @@
 
 /* Line 1806 of yacc.c  */
-#line 2438 "parser.yy"
+#line 2436 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 
   case 631:
+
+/* Line 1806 of yacc.c  */
+#line 2439 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 632:
 
 /* Line 1806 of yacc.c  */
@@ -8479 +8472 @@
     break;
 
-  case 632:
-
-/* Line 1806 of yacc.c  */
-#line 2443 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 633:
 
 /* Line 1806 of yacc.c  */
-#line 2448 "parser.yy"
+#line 2446 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8499 +8485 @@
 
 /* Line 1806 of yacc.c  */
-#line 2453 "parser.yy"
+#line 2451 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8509 +8495 @@
 
 /* Line 1806 of yacc.c  */
+#line 2459 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 636:
+
+/* Line 1806 of yacc.c  */
 #line 2461 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 636:
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 637:
 
 /* Line 1806 of yacc.c  */
 #line 2463 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 637:
-
-/* Line 1806 of yacc.c  */
-#line 2465 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8530 +8516 @@
 
 /* Line 1806 of yacc.c  */
+#line 2468 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 639:
+
+/* Line 1806 of yacc.c  */
 #line 2470 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 639:
-
-/* Line 1806 of yacc.c  */
-#line 2472 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8544 +8530 @@
 
 /* Line 1806 of yacc.c  */
+#line 2475 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
+    break;
+
+  case 641:
+
+/* Line 1806 of yacc.c  */
 #line 2477 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-
-  case 641:
-
-/* Line 1806 of yacc.c  */
-#line 2479 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
 
   case 643:
+
+/* Line 1806 of yacc.c  */
+#line 2492 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 644:
 
 /* Line 1806 of yacc.c  */
@@ -8562 +8555 @@
     break;
 
-  case 644:
-
-/* Line 1806 of yacc.c  */
-#line 2496 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 645:
 
 /* Line 1806 of yacc.c  */
+#line 2499 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
+    break;
+
+  case 646:
+
+/* Line 1806 of yacc.c  */
 #line 2501 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
-    break;
-
-  case 646:
+    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 647:
 
 /* Line 1806 of yacc.c  */
 #line 2503 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 647:
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 648:
 
 /* Line 1806 of yacc.c  */
 #line 2505 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 648:
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 649:
 
 /* Line 1806 of yacc.c  */
 #line 2507 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 649:
-
-/* Line 1806 of yacc.c  */
-#line 2509 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
   case 651:
+
+/* Line 1806 of yacc.c  */
+#line 2513 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 652:
 
 /* Line 1806 of yacc.c  */
@@ -8611 +8604 @@
     break;
 
-  case 652:
+  case 653:
 
 /* Line 1806 of yacc.c  */
 #line 2517 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 653:
-
-/* Line 1806 of yacc.c  */
-#line 2519 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8628 +8614 @@
 
 /* Line 1806 of yacc.c  */
+#line 2522 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
+    break;
+
+  case 655:
+
+/* Line 1806 of yacc.c  */
 #line 2524 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
-    break;
-
-  case 655:
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 656:
 
 /* Line 1806 of yacc.c  */
 #line 2526 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 656:
-
-/* Line 1806 of yacc.c  */
-#line 2528 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8649 +8635 @@
 
 /* Line 1806 of yacc.c  */
+#line 2532 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
+    break;
+
+  case 658:
+
+/* Line 1806 of yacc.c  */
 #line 2534 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
-    break;
-
-  case 658:
-
-/* Line 1806 of yacc.c  */
-#line 2536 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false )->addArray( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -8663 +8649 @@
 
 /* Line 1806 of yacc.c  */
+#line 2540 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(3) - (5)].en), 0, false ); }
+    break;
+
+  case 661:
+
+/* Line 1806 of yacc.c  */
 #line 2542 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(3) - (5)].en), 0, false ); }
-    break;
-
-  case 661:
+    { (yyval.decl) = DeclarationNode::newVarArray( 0 ); }
+    break;
+
+  case 662:
 
 /* Line 1806 of yacc.c  */
 #line 2544 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newVarArray( 0 ); }
-    break;
-
-  case 662:
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newArray( (yyvsp[(4) - (6)].en), 0, false ) ); }
+    break;
+
+  case 663:
 
 /* Line 1806 of yacc.c  */
 #line 2546 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newArray( (yyvsp[(4) - (6)].en), 0, false ) ); }
-    break;
-
-  case 663:
-
-/* Line 1806 of yacc.c  */
-#line 2548 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newVarArray( 0 ) ); }
     break;
 
   case 665:
+
+/* Line 1806 of yacc.c  */
+#line 2561 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 666:
 
 /* Line 1806 of yacc.c  */
@@ -8695 +8688 @@
     break;
 
-  case 666:
-
-/* Line 1806 of yacc.c  */
-#line 2565 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 667:
 
 /* Line 1806 of yacc.c  */
+#line 2568 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
+    break;
+
+  case 668:
+
+/* Line 1806 of yacc.c  */
 #line 2570 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
-    break;
-
-  case 668:
+    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 669:
 
 /* Line 1806 of yacc.c  */
 #line 2572 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 669:
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 670:
 
 /* Line 1806 of yacc.c  */
 #line 2574 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 670:
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 671:
 
 /* Line 1806 of yacc.c  */
 #line 2576 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 671:
-
-/* Line 1806 of yacc.c  */
-#line 2578 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
   case 673:
+
+/* Line 1806 of yacc.c  */
+#line 2582 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 674:
 
 /* Line 1806 of yacc.c  */
@@ -8744 +8737 @@
     break;
 
-  case 674:
+  case 675:
 
 /* Line 1806 of yacc.c  */
 #line 2586 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 675:
-
-/* Line 1806 of yacc.c  */
-#line 2588 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8761 +8747 @@
 
 /* Line 1806 of yacc.c  */
+#line 2591 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
+    break;
+
+  case 677:
+
+/* Line 1806 of yacc.c  */
 #line 2593 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
-    break;
-
-  case 677:
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 678:
 
 /* Line 1806 of yacc.c  */
 #line 2595 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 678:
-
-/* Line 1806 of yacc.c  */
-#line 2597 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8782 +8768 @@
 
 /* Line 1806 of yacc.c  */
-#line 2604 "parser.yy"
+#line 2602 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8789 +8775 @@
 
 /* Line 1806 of yacc.c  */
-#line 2615 "parser.yy"
+#line 2613 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
     break;
@@ -8796 +8782 @@
 
 /* Line 1806 of yacc.c  */
+#line 2616 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
+    break;
+
+  case 684:
+
+/* Line 1806 of yacc.c  */
 #line 2618 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
-    break;
-
-  case 684:
-
-/* Line 1806 of yacc.c  */
-#line 2620 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, (yyvsp[(3) - (5)].decl), false ); }
     break;
@@ -8810 +8796 @@
 
 /* Line 1806 of yacc.c  */
+#line 2621 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
+    break;
+
+  case 686:
+
+/* Line 1806 of yacc.c  */
 #line 2623 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
-    break;
-
-  case 686:
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl), true ); }
+    break;
+
+  case 687:
 
 /* Line 1806 of yacc.c  */
 #line 2625 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl), true ); }
-    break;
-
-  case 687:
-
-/* Line 1806 of yacc.c  */
-#line 2627 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(3) - (7)].decl), true ); }
     break;
 
   case 689:
+
+/* Line 1806 of yacc.c  */
+#line 2639 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 690:
 
 /* Line 1806 of yacc.c  */
@@ -8835 +8828 @@
     break;
 
-  case 690:
-
-/* Line 1806 of yacc.c  */
-#line 2643 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
   case 691:
 
 /* Line 1806 of yacc.c  */
+#line 2646 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
+    break;
+
+  case 692:
+
+/* Line 1806 of yacc.c  */
 #line 2648 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
-    break;
-
-  case 692:
+    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
+    break;
+
+  case 693:
 
 /* Line 1806 of yacc.c  */
 #line 2650 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 693:
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 694:
 
 /* Line 1806 of yacc.c  */
 #line 2652 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 694:
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+
+  case 695:
 
 /* Line 1806 of yacc.c  */
 #line 2654 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 695:
-
-/* Line 1806 of yacc.c  */
-#line 2656 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 
   case 697:
+
+/* Line 1806 of yacc.c  */
+#line 2660 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+
+  case 698:
 
 /* Line 1806 of yacc.c  */
@@ -8884 +8877 @@
     break;
 
-  case 698:
+  case 699:
 
 /* Line 1806 of yacc.c  */
 #line 2664 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 699:
-
-/* Line 1806 of yacc.c  */
-#line 2666 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8901 +8887 @@
 
 /* Line 1806 of yacc.c  */
+#line 2669 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+
+  case 701:
+
+/* Line 1806 of yacc.c  */
 #line 2671 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 701:
-
-/* Line 1806 of yacc.c  */
-#line 2673 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8915 +8901 @@
 
 /* Line 1806 of yacc.c  */
-#line 2683 "parser.yy"
+#line 2681 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -8922 +8908 @@
 
 /* Line 1806 of yacc.c  */
+#line 2691 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 708:
+
+/* Line 1806 of yacc.c  */
 #line 2693 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+    break;
+
+  case 709:
+
+/* Line 1806 of yacc.c  */
+#line 2695 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 
-  case 708:
-
-/* Line 1806 of yacc.c  */
-#line 2695 "parser.yy"
+  case 710:
+
+/* Line 1806 of yacc.c  */
+#line 2697 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
 
-  case 709:
-
-/* Line 1806 of yacc.c  */
-#line 2697 "parser.yy"
+  case 711:
+
+/* Line 1806 of yacc.c  */
+#line 2699 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 
-  case 710:
-
-/* Line 1806 of yacc.c  */
-#line 2699 "parser.yy"
+  case 712:
+
+/* Line 1806 of yacc.c  */
+#line 2701 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
 
-  case 711:
-
-/* Line 1806 of yacc.c  */
-#line 2701 "parser.yy"
+  case 713:
+
+/* Line 1806 of yacc.c  */
+#line 2708 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 714:
+
+/* Line 1806 of yacc.c  */
+#line 2710 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 715:
+
+/* Line 1806 of yacc.c  */
+#line 2712 "parser.yy"
+    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 716:
+
+/* Line 1806 of yacc.c  */
+#line 2714 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
+    break;
+
+  case 717:
+
+/* Line 1806 of yacc.c  */
+#line 2716 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 718:
+
+/* Line 1806 of yacc.c  */
+#line 2718 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 719:
+
+/* Line 1806 of yacc.c  */
+#line 2720 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 720:
+
+/* Line 1806 of yacc.c  */
+#line 2722 "parser.yy"
+    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 721:
+
+/* Line 1806 of yacc.c  */
+#line 2724 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
+    break;
+
+  case 722:
+
+/* Line 1806 of yacc.c  */
+#line 2726 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 723:
+
+/* Line 1806 of yacc.c  */
+#line 2731 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
+    break;
+
+  case 724:
+
+/* Line 1806 of yacc.c  */
+#line 2733 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
+    break;
+
+  case 725:
+
+/* Line 1806 of yacc.c  */
+#line 2738 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), true ); }
+    break;
+
+  case 726:
+
+/* Line 1806 of yacc.c  */
+#line 2740 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl)->addQualifiers( (yyvsp[(3) - (7)].decl) ), true ); }
+    break;
+
+  case 728:
+
+/* Line 1806 of yacc.c  */
+#line 2767 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
+  case 732:
+
+/* Line 1806 of yacc.c  */
+#line 2778 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 
-  case 712:
-
-/* Line 1806 of yacc.c  */
-#line 2703 "parser.yy"
+  case 733:
+
+/* Line 1806 of yacc.c  */
+#line 2780 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
 
-  case 713:
-
-/* Line 1806 of yacc.c  */
-#line 2710 "parser.yy"
+  case 734:
+
+/* Line 1806 of yacc.c  */
+#line 2782 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 735:
+
+/* Line 1806 of yacc.c  */
+#line 2784 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+    break;
+
+  case 736:
+
+/* Line 1806 of yacc.c  */
+#line 2786 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+
+  case 737:
+
+/* Line 1806 of yacc.c  */
+#line 2788 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+    break;
+
+  case 738:
+
+/* Line 1806 of yacc.c  */
+#line 2795 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
 
-  case 714:
-
-/* Line 1806 of yacc.c  */
-#line 2712 "parser.yy"
+  case 739:
+
+/* Line 1806 of yacc.c  */
+#line 2797 "parser.yy"
+    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 740:
+
+/* Line 1806 of yacc.c  */
+#line 2799 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 715:
-
-/* Line 1806 of yacc.c  */
-#line 2714 "parser.yy"
+  case 741:
+
+/* Line 1806 of yacc.c  */
+#line 2801 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+    break;
+
+  case 742:
+
+/* Line 1806 of yacc.c  */
+#line 2803 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
 
-  case 716:
-
-/* Line 1806 of yacc.c  */
-#line 2716 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
-    break;
-
-  case 717:
-
-/* Line 1806 of yacc.c  */
-#line 2718 "parser.yy"
+  case 743:
+
+/* Line 1806 of yacc.c  */
+#line 2805 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
 
-  case 718:
-
-/* Line 1806 of yacc.c  */
-#line 2720 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 719:
-
-/* Line 1806 of yacc.c  */
-#line 2722 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 720:
-
-/* Line 1806 of yacc.c  */
-#line 2724 "parser.yy"
-    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 721:
-
-/* Line 1806 of yacc.c  */
-#line 2726 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
-    break;
-
-  case 722:
-
-/* Line 1806 of yacc.c  */
-#line 2728 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 723:
-
-/* Line 1806 of yacc.c  */
-#line 2733 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
-    break;
-
-  case 724:
-
-/* Line 1806 of yacc.c  */
-#line 2735 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
-    break;
-
-  case 725:
-
-/* Line 1806 of yacc.c  */
-#line 2740 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), true ); }
-    break;
-
-  case 726:
-
-/* Line 1806 of yacc.c  */
-#line 2742 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl)->addQualifiers( (yyvsp[(3) - (7)].decl) ), true ); }
-    break;
-
-  case 728:
-
-/* Line 1806 of yacc.c  */
-#line 2769 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 732:
-
-/* Line 1806 of yacc.c  */
-#line 2780 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 733:
-
-/* Line 1806 of yacc.c  */
-#line 2782 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
-    break;
-
-  case 734:
-
-/* Line 1806 of yacc.c  */
-#line 2784 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 735:
-
-/* Line 1806 of yacc.c  */
-#line 2786 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
-    break;
-
-  case 736:
-
-/* Line 1806 of yacc.c  */
-#line 2788 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 737:
-
-/* Line 1806 of yacc.c  */
-#line 2790 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
-    break;
-
-  case 738:
-
-/* Line 1806 of yacc.c  */
-#line 2797 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 739:
-
-/* Line 1806 of yacc.c  */
-#line 2799 "parser.yy"
-    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 740:
-
-/* Line 1806 of yacc.c  */
-#line 2801 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 741:
-
-/* Line 1806 of yacc.c  */
-#line 2803 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 742:
-
-/* Line 1806 of yacc.c  */
-#line 2805 "parser.yy"
-    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 743:
-
-/* Line 1806 of yacc.c  */
-#line 2807 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
   case 744:
 
 /* Line 1806 of yacc.c  */
-#line 2812 "parser.yy"
+#line 2810 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -9160 +9146 @@
 
 /* Line 1806 of yacc.c  */
+#line 2815 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newFunction( 0, DeclarationNode::newTuple( 0 ), (yyvsp[(4) - (5)].decl), 0 ); }
+    break;
+
+  case 746:
+
+/* Line 1806 of yacc.c  */
 #line 2817 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFunction( 0, DeclarationNode::newTuple( 0 ), (yyvsp[(4) - (5)].decl), 0 ); }
-    break;
-
-  case 746:
+    { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), 0 ); }
+    break;
+
+  case 747:
 
 /* Line 1806 of yacc.c  */
@@ -9171 +9164 @@
     break;
 
-  case 747:
-
-/* Line 1806 of yacc.c  */
-#line 2821 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), 0 ); }
-    break;
-
   case 750:
 
 /* Line 1806 of yacc.c  */
+#line 2843 "parser.yy"
+    { (yyval.en) = 0; }
+    break;
+
+  case 751:
+
+/* Line 1806 of yacc.c  */
 #line 2845 "parser.yy"
-    { (yyval.en) = 0; }
-    break;
-
-  case 751:
-
-/* Line 1806 of yacc.c  */
-#line 2847 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -9195 +9181 @@
 
 /* Line 1806 of yacc.c  */
-#line 9198 "Parser/parser.cc"
+#line 9184 "Parser/parser.cc"
       default: break;
     }
@@ -9426 +9412 @@
 
 /* Line 2067 of yacc.c  */
-#line 2850 "parser.yy"
+#line 2848 "parser.yy"
 
 // ----end of grammar----

src/Parser/parser.yy

@@ -377 +377 @@
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_varref( $3 ) ) ); }
         | postfix_expression '.' '[' push field_list pop ']' // CFA, tuple field selector
-                { $$ = new ExpressionNode( build_fieldSel( $1, build_tuple( $5 ) ) ); }
         | postfix_expression ARROW no_attr_identifier
                 { $$ = new ExpressionNode( build_pfieldSel( $1, build_varref( $3 ) ) ); }
         | postfix_expression ARROW '[' push field_list pop ']' // CFA, tuple field selector
-                        { $$ = new ExpressionNode( build_pfieldSel( $1, build_tuple( $5 ) ) ); }
         | postfix_expression ICR
                 { $$ = new ExpressionNode( build_unary_ptr( OperKinds::IncrPost, $1 ) ); }

src/ResolvExpr/Alternative.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Alternative.cc --
+// Alternative.cc -- 
 //
 // Author           : Richard C. Bilson
@@ -12 +12 @@
 // Last Modified On : Sat May 16 23:54:23 2015
 // Update Count     : 2
-//
+// 
 
 #include "Alternative.h"
@@ -54 +54 @@
                         expr->print( os, indent );
                         os << "(types:" << std::endl;
-                        os << std::string( indent+4, ' ' );
-                        expr->get_result()->print( os, indent + 4 );
-                        os << std::endl << ")" << std::endl;
+                        printAll( expr->get_results(), os, indent + 4 );
+                        os << ")" << std::endl;
                 } else {
                         os << "Null expression!" << std::endl;

src/ResolvExpr/AlternativeFinder.cc

@@ -38 +38 @@
 #include "SynTree/TypeSubstitution.h"
 #include "SymTab/Validate.h"
-#include "Tuples/Tuples.h"
+#include "Tuples/TupleAssignment.h"
+#include "Tuples/NameMatcher.h"
 #include "Common/utility.h"
 #include "InitTweak/InitTweak.h"
@@ -63 +64 @@
         }
 
-        Cost sumCost( const AltList &in ) {
-                Cost total;
-                for ( AltList::const_iterator i = in.begin(); i != in.end(); ++i ) {
-                        total += i->cost;
-                }
-                return total;
-        }
-
         namespace {
                 void printAlts( const AltList &list, std::ostream &os, int indent = 0 ) {
@@ -83 +76 @@
                                 out.push_back( i->expr->clone() );
                         }
+                }
+
+                Cost sumCost( const AltList &in ) {
+                        Cost total;
+                        for ( AltList::const_iterator i = in.begin(); i != in.end(); ++i ) {
+                                total += i->cost;
+                        }
+                        return total;
                 }
 
@@ -100 +101 @@
                                 PruneStruct current( candidate );
                                 std::string mangleName;
-                                {
-                                        Type * newType = candidate->expr->get_result()->clone();
+                                for ( std::list< Type* >::const_iterator retType = candidate->expr->get_results().begin(); retType != candidate->expr->get_results().end(); ++retType ) {
+                                        Type *newType = (*retType)->clone();
                                         candidate->env.apply( newType );
-                                        mangleName = SymTab::Mangler::mangle( newType );
+                                        mangleName += SymTab::Mangler::mangle( newType );
                                         delete newType;
                                 }
@@ -132 +133 @@
                                 if ( ! target->second.isAmbiguous ) {
                                         Alternative &alt = *target->second.candidate;
-                                        alt.env.applyFree( alt.expr->get_result() );
+                                        for ( std::list< Type* >::iterator result = alt.expr->get_results().begin(); result != alt.expr->get_results().end(); ++result ) {
+                                                alt.env.applyFree( *result );
+                                        }
                                         *out++ = alt;
                                 }
                         }
+
+                }
+
+                template< typename InputIterator, typename OutputIterator >
+                void findMinCost( InputIterator begin, InputIterator end, OutputIterator out ) {
+                        AltList alternatives;
+
+                        // select the alternatives that have the minimum parameter cost
+                        Cost minCost = Cost::infinity;
+                        for ( AltList::iterator i = begin; i != end; ++i ) {
+                                if ( i->cost < minCost ) {
+                                        minCost = i->cost;
+                                        i->cost = i->cvtCost;
+                                        alternatives.clear();
+                                        alternatives.push_back( *i );
+                                } else if ( i->cost == minCost ) {
+                                        i->cost = i->cvtCost;
+                                        alternatives.push_back( *i );
+                                }
+                        }
+                        std::copy( alternatives.begin(), alternatives.end(), out );
                 }
 
@@ -146 +170 @@
 
                 void renameTypes( Expression *expr ) {
-                        expr->get_result()->accept( global_renamer );
+                        for ( std::list< Type* >::iterator i = expr->get_results().begin(); i != expr->get_results().end(); ++i ) {
+                                (*i)->accept( global_renamer );
+                        }
                 }
         }
@@ -178 +204 @@
                 for ( AltList::iterator i = alternatives.begin(); i != alternatives.end(); ++i ) {
                         if ( adjust ) {
-                                adjustExprType( i->expr->get_result(), i->env, indexer );
+                                adjustExprTypeList( i->expr->get_results().begin(), i->expr->get_results().end(), i->env, indexer );
                         }
                 }
@@ -215 +241 @@
 
         template< typename StructOrUnionType >
-        void AlternativeFinder::addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, Expression * member ) {
-
-                // // member must be either a tuple expression or a name expr
-                // if ( NameExpr * nameExpr = dynamic_cast< NameExpr * >( memberExpr->get_member() ) ) {
-                //  addAggMembers( structInst, agg->expr, agg->cost, nameExpr->get_name() );
-                // } else {
-                //  TupleExpr * tupleExpr = safe_dynamic_cast< TupleExpr * >( memberExpr->get_member() );
-                //  // xxx - ...
-                //  assert( false );
-                // }
-                // if ( TupleExpr * tupleExpr = dynamic_cast< TupleExpr * >( memberExpr->get_member() ) ) {
-
-                // }
-                NameExpr * nameExpr = safe_dynamic_cast< NameExpr * >( member );
-                const std::string & name = nameExpr->get_name();
+        void AlternativeFinder::addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, const std::string &name ) {
                 std::list< Declaration* > members;
                 aggInst->lookup( name, members );
@@ -247 +259 @@
 
         Cost computeConversionCost( Alternative &alt, const SymTab::Indexer &indexer ) {
-                ApplicationExpr *appExpr = safe_dynamic_cast< ApplicationExpr* >( alt.expr );
-                PointerType *pointer = safe_dynamic_cast< PointerType* >( appExpr->get_function()->get_result() );
-                FunctionType *function = safe_dynamic_cast< FunctionType* >( pointer->get_base() );
+                ApplicationExpr *appExpr = dynamic_cast< ApplicationExpr* >( alt.expr );
+                assert( appExpr );
+                PointerType *pointer = dynamic_cast< PointerType* >( appExpr->get_function()->get_results().front() );
+                assert( pointer );
+                FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() );
+                assert( function );
 
                 Cost convCost( 0, 0, 0 );
@@ -255 +270 @@
                 std::list< DeclarationWithType* >::iterator formal = formals.begin();
                 std::list< Expression* >& actuals = appExpr->get_args();
-
-                std::list< Type * > formalTypes;
-                std::list< Type * >::iterator formalType = formalTypes.end();
-
                 for ( std::list< Expression* >::iterator actualExpr = actuals.begin(); actualExpr != actuals.end(); ++actualExpr ) {
-
                         PRINT(
                                 std::cerr << "actual expression:" << std::endl;
                                 (*actualExpr)->print( std::cerr, 8 );
                                 std::cerr << "--- results are" << std::endl;
-                                (*actualExpr)->get_result()->print( std::cerr, 8 );
+                                printAll( (*actualExpr)->get_results(), std::cerr, 8 );
                         )
                         std::list< DeclarationWithType* >::iterator startFormal = formal;
                         Cost actualCost;
-                        std::list< Type * > flatActualTypes;
-                        flatten( (*actualExpr)->get_result(), back_inserter( flatActualTypes ) );
-                        for ( std::list< Type* >::iterator actualType = flatActualTypes.begin(); actualType != flatActualTypes.end(); ++actualType ) {
-
-
-                                // tuple handling code
-                                if ( formalType == formalTypes.end() ) {
-                                        // the type of the formal parameter may be a tuple type. To make this easier to work with,
-                                        // flatten the tuple type and traverse the resulting list of types, incrementing the formal
-                                        // iterator once its types have been extracted. Once a particular formal parameter's type has
-                                        // been exhausted load the next formal parameter's type.
-                                        if ( formal == formals.end() ) {
-                                                if ( function->get_isVarArgs() ) {
-                                                        convCost += Cost( 1, 0, 0 );
-                                                        break;
-                                                } else {
-                                                        return Cost::infinity;
-                                                }
+                        for ( std::list< Type* >::iterator actual = (*actualExpr)->get_results().begin(); actual != (*actualExpr)->get_results().end(); ++actual ) {
+                                if ( formal == formals.end() ) {
+                                        if ( function->get_isVarArgs() ) {
+                                                convCost += Cost( 1, 0, 0 );
+                                                break;
+                                        } else {
+                                                return Cost::infinity;
                                         }
-                                        formalTypes.clear();
-                                        flatten( (*formal)->get_type(), back_inserter( formalTypes ) );
-                                        formalType = formalTypes.begin();
-                                        ++formal;
                                 }
-
                                 PRINT(
                                         std::cerr << std::endl << "converting ";
-                                        (*actualType)->print( std::cerr, 8 );
+                                        (*actual)->print( std::cerr, 8 );
                                         std::cerr << std::endl << " to ";
                                         (*formal)->get_type()->print( std::cerr, 8 );
                                 )
-                                Cost newCost = conversionCost( *actualType, *formalType, indexer, alt.env );
+                                Cost newCost = conversionCost( *actual, (*formal)->get_type(), indexer, alt.env );
                                 PRINT(
                                         std::cerr << std::endl << "cost is" << newCost << std::endl;
@@ -311 +305 @@
                                 actualCost += newCost;
 
-                                convCost += Cost( 0, polyCost( *formalType, alt.env, indexer ) + polyCost( *actualType, alt.env, indexer ), 0 );
-
-                                formalType++;
+                                convCost += Cost( 0, polyCost( (*formal)->get_type(), alt.env, indexer ) + polyCost( *actual, alt.env, indexer ), 0 );
+
+                                formal++;
                         }
                         if ( actualCost != Cost( 0, 0, 0 ) ) {
@@ -379 +373 @@
                 resultEnv.extractOpenVars( openVars );
 
+                /*
+                  Tuples::NameMatcher matcher( formals );
+                  try {
+                  matcher.match( actuals );
+                  } catch ( Tuples::NoMatch &e ) {
+                  std::cerr << "Alternative doesn't match: " << e.message << std::endl;
+                  }
+                */
                 std::list< DeclarationWithType* >::iterator formal = formals.begin();
-
-                std::list< Type * > formalTypes;
-                std::list< Type * >::iterator formalType = formalTypes.end();
-
                 for ( AltList::const_iterator actualExpr = actuals.begin(); actualExpr != actuals.end(); ++actualExpr ) {
-                        std::list< Type * > flatActualTypes;
-                        flatten( actualExpr->expr->get_result(), back_inserter( flatActualTypes ) );
-                        for ( std::list< Type* >::iterator actualType = flatActualTypes.begin(); actualType != flatActualTypes.end(); ++actualType, ++formalType ) {
-                                if ( formalType == formalTypes.end() ) {
-                                        // the type of the formal parameter may be a tuple type. To make this easier to work with,
-                                        // flatten the tuple type and traverse the resulting list of types, incrementing the formal
-                                        // iterator once its types have been extracted. Once a particular formal parameter's type has
-                                        // been exhausted load the next formal parameter's type.
-                                        if ( formal == formals.end() ) {
-                                                return isVarArgs;
-                                        }
-                                        formalTypes.clear();
-                                        flatten( (*formal)->get_type(), back_inserter( formalTypes ) );
-                                        formalType = formalTypes.begin();
-                                        ++formal;
+                        for ( std::list< Type* >::iterator actual = actualExpr->expr->get_results().begin(); actual != actualExpr->expr->get_results().end(); ++actual ) {
+                                if ( formal == formals.end() ) {
+                                        return isVarArgs;
                                 }
                                 PRINT(
                                         std::cerr << "formal type is ";
-                                        (*formalType)->print( std::cerr );
+                                        (*formal)->get_type()->print( std::cerr );
                                         std::cerr << std::endl << "actual type is ";
-                                        (*actualType)->print( std::cerr );
+                                        (*actual)->print( std::cerr );
                                         std::cerr << std::endl;
                                 )
-                                if ( ! unify( *formalType, *actualType, resultEnv, resultNeed, resultHave, openVars, indexer ) ) {
+                                if ( ! unify( (*formal)->get_type(), *actual, resultEnv, resultNeed, resultHave, openVars, indexer ) ) {
                                         return false;
                                 }
-                        }
-                }
-
-                // xxx - a tuple type was not completely matched
-                // partially handle the tuple with default arguments??
-                if ( formalType != formalTypes.end() ) return false;
-
+                                formal++;
+                        }
+                }
                 // Handling of default values
                 while ( formal != formals.end() ) {
@@ -518 +500 @@
                                 //if ( newNeedParents[ curDecl->get_uniqueId() ][ candDecl->get_uniqueId() ]++ > recursionParentLimit ) continue;
                                 Expression *varExpr = new VariableExpr( candDecl );
-                                delete varExpr->get_result();
-                                varExpr->set_result( adjType->clone() );
+                                deleteAll( varExpr->get_results() );
+                                varExpr->get_results().clear();
+                                varExpr->get_results().push_front( adjType->clone() );
                                 PRINT(
                                         std::cerr << "satisfying assertion " << curDecl->get_uniqueId() << " ";
@@ -591 +574 @@
                                 PointerType pt( Type::Qualifiers(), v.clone() );
                                 UntypedExpr *vexpr = untypedExpr->clone();
-                                vexpr->set_result( pt.clone() );
+                                vexpr->get_results().push_front( pt.clone() );
                                 alternatives.push_back( Alternative( vexpr, env, Cost()) );
                                 return;
@@ -604 +587 @@
                 combos( argAlternatives.begin(), argAlternatives.end(), back_inserter( possibilities ) );
 
-                // take care of possible tuple assignments
-                // if not tuple assignment, assignment is taken care of as a normal function call
-                Tuples::handleTupleAssignment( *this, untypedExpr, possibilities );
+                Tuples::TupleAssignSpotter tassign( this );
+                if ( tassign.isTupleAssignment( untypedExpr, possibilities ) ) {
+                        // take care of possible tuple assignments, or discard expression
+                        return;
+                } // else ...
 
                 AltList candidates;
@@ -619 +604 @@
                                 // check if the type is pointer to function
                                 PointerType *pointer;
-                                if ( ( pointer = dynamic_cast< PointerType* >( func->expr->get_result() ) ) ) {
+                                if ( func->expr->get_results().size() == 1 && ( pointer = dynamic_cast< PointerType* >( func->expr->get_results().front() ) ) ) {
                                         if ( FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() ) ) {
                                                 for ( std::list< AltList >::iterator actualAlt = possibilities.begin(); actualAlt != possibilities.end(); ++actualAlt ) {
@@ -655 +640 @@
                                                 // check if the type is pointer to function
                                                 PointerType *pointer;
-                                                if ( ( pointer = dynamic_cast< PointerType* >( funcOp->expr->get_result() ) ) ) {
+                                                if ( funcOp->expr->get_results().size() == 1
+                                                        && ( pointer = dynamic_cast< PointerType* >( funcOp->expr->get_results().front() ) ) ) {
                                                         if ( FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() ) ) {
                                                                 for ( std::list< AltList >::iterator actualAlt = possibilities.begin(); actualAlt != possibilities.end(); ++actualAlt ) {
@@ -679 +665 @@
 
                         PRINT(
-                                ApplicationExpr *appExpr = safe_dynamic_cast< ApplicationExpr* >( withFunc->expr );
-                                PointerType *pointer = safe_dynamic_cast< PointerType* >( appExpr->get_function()->get_result() );
-                                FunctionType *function = safe_dynamic_cast< FunctionType* >( pointer->get_base() );
+                                ApplicationExpr *appExpr = dynamic_cast< ApplicationExpr* >( withFunc->expr );
+                                assert( appExpr );
+                                PointerType *pointer = dynamic_cast< PointerType* >( appExpr->get_function()->get_results().front() );
+                                assert( pointer );
+                                FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() );
+                                assert( function );
                                 std::cerr << "Case +++++++++++++" << std::endl;
                                 std::cerr << "formals are:" << std::endl;
@@ -703 +692 @@
 
         bool isLvalue( Expression *expr ) {
-                // xxx - recurse into tuples?
-                return expr->has_result() && expr->get_result()->get_isLvalue();
+                for ( std::list< Type* >::const_iterator i = expr->get_results().begin(); i != expr->get_results().end(); ++i ) {
+                        if ( !(*i)->get_isLvalue() ) return false;
+                } // for
+                return true;
         }
 
@@ -718 +709 @@
 
         void AlternativeFinder::visit( CastExpr *castExpr ) {
-                Type *& toType = castExpr->get_result();
-                toType = resolveTypeof( toType, indexer );
-                SymTab::validateType( toType, &indexer );
-                adjustExprType( toType, env, indexer );
+                for ( std::list< Type* >::iterator i = castExpr->get_results().begin(); i != castExpr->get_results().end(); ++i ) {
+                        *i = resolveTypeof( *i, indexer );
+                        SymTab::validateType( *i, &indexer );
+                        adjustExprType( *i, env, indexer );
+                } // for
 
                 AlternativeFinder finder( indexer, env );
@@ -735 +727 @@
                         // that are cast directly.  The candidate is invalid if it has fewer results than there are types to cast
                         // to.
-                        int discardedValues = (*i).expr->get_result()->size() - castExpr->get_result()->size();
+                        int discardedValues = (*i).expr->get_results().size() - castExpr->get_results().size();
                         if ( discardedValues < 0 ) continue;
-                        // xxx - may need to go into tuple types and extract relavent types and use unifyList
+                        std::list< Type* >::iterator candidate_end = (*i).expr->get_results().begin();
+                        std::advance( candidate_end, castExpr->get_results().size() );
                         // unification run for side-effects
-                        unify( castExpr->get_result(), (*i).expr->get_result(), i->env, needAssertions, haveAssertions, openVars, indexer );
-                        Cost thisCost = castCost( (*i).expr->get_result(), castExpr->get_result(), indexer, i->env );
+                        unifyList( castExpr->get_results().begin(), castExpr->get_results().end(),
+                                           (*i).expr->get_results().begin(), candidate_end,
+                                   i->env, needAssertions, haveAssertions, openVars, indexer );
+                        Cost thisCost = castCostList( (*i).expr->get_results().begin(), candidate_end,
+                                                                                  castExpr->get_results().begin(), castExpr->get_results().end(),
+                                                                                  indexer, i->env );
                         if ( thisCost != Cost::infinity ) {
                                 // count one safe conversion for each value that is thrown away
@@ -763 +760 @@
 
                 for ( AltList::const_iterator agg = funcFinder.alternatives.begin(); agg != funcFinder.alternatives.end(); ++agg ) {
-                        if ( StructInstType *structInst = dynamic_cast< StructInstType* >( agg->expr->get_result() ) ) {
-                                addAggMembers( structInst, agg->expr, agg->cost, agg->env, memberExpr->get_member() );
-                        } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( agg->expr->get_result() ) ) {
-                                addAggMembers( unionInst, agg->expr, agg->cost, agg->env, memberExpr->get_member() );
+                        if ( agg->expr->get_results().size() == 1 ) {
+                                if ( StructInstType *structInst = dynamic_cast< StructInstType* >( agg->expr->get_results().front() ) ) {
+                                        addAggMembers( structInst, agg->expr, agg->cost, agg->env, memberExpr->get_member() );
+                                } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( agg->expr->get_results().front() ) ) {
+                                        addAggMembers( unionInst, agg->expr, agg->cost, agg->env, memberExpr->get_member() );
+                                } // if
                         } // if
                 } // for
@@ -792 +791 @@
                         renameTypes( alternatives.back().expr );
                         if ( StructInstType *structInst = dynamic_cast< StructInstType* >( (*i)->get_type() ) ) {
-                                NameExpr nameExpr( "" );
-                                addAggMembers( structInst, &newExpr, Cost( 0, 0, 1 ), env, &nameExpr );
+                                addAggMembers( structInst, &newExpr, Cost( 0, 0, 1 ), env, "" );
                         } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( (*i)->get_type() ) ) {
-                                NameExpr nameExpr( "" );
-                                addAggMembers( unionInst, &newExpr, Cost( 0, 0, 1 ), env, &nameExpr );
+                                addAggMembers( unionInst, &newExpr, Cost( 0, 0, 1 ), env, "" );
                         } // if
                 } // for
@@ -897 +894 @@
                         alternatives.push_back( Alternative( new AttrExpr( new VariableExpr( funcDecl ), argType->clone() ), env, Cost::zero ) );
                         for ( std::list< DeclarationWithType* >::iterator i = function->get_returnVals().begin(); i != function->get_returnVals().end(); ++i ) {
-                                alternatives.back().expr->set_result( (*i)->get_type()->clone() );
+                                alternatives.back().expr->get_results().push_back( (*i)->get_type()->clone() );
                         } // for
                 } // if
@@ -920 +917 @@
                                                         finder.find( attrExpr->get_expr() );
                                                         for ( AltList::iterator choice = finder.alternatives.begin(); choice != finder.alternatives.end(); ++choice ) {
-                                                                if ( choice->expr->get_result()->size() == 1 ) {
-                                                                        resolveAttr(*i, function, choice->expr->get_result(), choice->env );
+                                                                if ( choice->expr->get_results().size() == 1 ) {
+                                                                        resolveAttr(*i, function, choice->expr->get_results().front(), choice->env );
                                                                 } // fi
                                                         } // for
@@ -963 +960 @@
                                         AssertionSet needAssertions, haveAssertions;
                                         Alternative newAlt( 0, third->env, first->cost + second->cost + third->cost );
-                                        Type* commonType;
-                                        if ( unify( second->expr->get_result(), third->expr->get_result(), newAlt.env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) {
+                                        std::list< Type* > commonTypes;
+                                        if ( unifyList( second->expr->get_results().begin(), second->expr->get_results().end(), third->expr->get_results().begin(), third->expr->get_results().end(), newAlt.env, needAssertions, haveAssertions, openVars, indexer, commonTypes ) ) {
                                                 ConditionalExpr *newExpr = new ConditionalExpr( first->expr->clone(), second->expr->clone(), third->expr->clone() );
-                                                newExpr->set_result( commonType ? commonType : second->expr->get_result()->clone() );
+                                                std::list< Type* >::const_iterator original = second->expr->get_results().begin();
+                                                std::list< Type* >::const_iterator commonType = commonTypes.begin();
+                                                for ( ; original != second->expr->get_results().end() && commonType != commonTypes.end(); ++original, ++commonType ) {
+                                                        if ( *commonType ) {
+                                                                newExpr->get_results().push_back( *commonType );
+                                                        } else {
+                                                                newExpr->get_results().push_back( (*original)->clone() );
+                                                        } // if
+                                                } // for
                                                 newAlt.expr = newExpr;
                                                 inferParameters( needAssertions, haveAssertions, newAlt, openVars, back_inserter( alternatives ) );
@@ -994 +999 @@
                         TupleExpr *newExpr = new TupleExpr;
                         makeExprList( *i, newExpr->get_exprs() );
-                        TupleType *tupleType = new TupleType( Type::Qualifiers(true, true, true, true, true, true) );
-                        Type::Qualifiers &qualifiers = tupleType->get_qualifiers();
-                        for ( Expression * resultExpr : newExpr->get_exprs() ) {
-                                Type * type = resultExpr->get_result()->clone();
-                                tupleType->get_types().push_back( type );
-                                qualifiers &= type->get_qualifiers();
+                        for ( std::list< Expression* >::const_iterator resultExpr = newExpr->get_exprs().begin(); resultExpr != newExpr->get_exprs().end(); ++resultExpr ) {
+                                for ( std::list< Type* >::const_iterator resultType = (*resultExpr)->get_results().begin(); resultType != (*resultExpr)->get_results().end(); ++resultType ) {
+                                        newExpr->get_results().push_back( (*resultType)->clone() );
+                                } // for
                         } // for
-                        newExpr->set_result( tupleType );
 
                         TypeEnvironment compositeEnv;
@@ -1022 +1024 @@
                 }
         }
-
-        void AlternativeFinder::visit( TupleIndexExpr *tupleExpr ) {
-                alternatives.push_back( Alternative( tupleExpr->clone(), env, Cost::zero ) );
-        }
-
-        void AlternativeFinder::visit( TupleAssignExpr *tupleAssignExpr ) {
-                alternatives.push_back( Alternative( tupleAssignExpr->clone(), env, Cost::zero ) );
-        }
 } // namespace ResolvExpr
 

src/ResolvExpr/AlternativeFinder.h

@@ -67 +67 @@
                 virtual void visit( ImplicitCopyCtorExpr * impCpCtorExpr );
                 virtual void visit( ConstructorExpr * ctorExpr );
-                virtual void visit( TupleIndexExpr *tupleExpr );
-                virtual void visit( TupleAssignExpr *tupleExpr );
-                /// Runs a new alternative finder on each element in [begin, end)
-                /// and writes each alternative finder to out.
+          public:  // xxx - temporary hack - should make Tuples::TupleAssignment a friend
                 template< typename InputIterator, typename OutputIterator >
                 void findSubExprs( InputIterator begin, InputIterator end, OutputIterator out );
 
+          private:
                 /// Adds alternatives for member expressions, given the aggregate, conversion cost for that aggregate, and name of the member
-                template< typename StructOrUnionType > void addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, Expression * member );
+                template< typename StructOrUnionType > void addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, const std::string &name );
                 /// Adds alternatives for offsetof expressions, given the base type and name of the member
                 template< typename StructOrUnionType > void addOffsetof( StructOrUnionType *aggInst, const std::string &name );
@@ -91 +89 @@
 
         Expression *resolveInVoidContext( Expression *expr, const SymTab::Indexer &indexer, TypeEnvironment &env );
-
-        template< typename InputIterator, typename OutputIterator >
-        void findMinCost( InputIterator begin, InputIterator end, OutputIterator out ) {
-                AltList alternatives;
-
-                // select the alternatives that have the minimum parameter cost
-                Cost minCost = Cost::infinity;
-                for ( InputIterator i = begin; i != end; ++i ) {
-                        if ( i->cost < minCost ) {
-                                minCost = i->cost;
-                                i->cost = i->cvtCost;
-                                alternatives.clear();
-                                alternatives.push_back( *i );
-                        } else if ( i->cost == minCost ) {
-                                i->cost = i->cvtCost;
-                                alternatives.push_back( *i );
-                        }
-                }
-                std::copy( alternatives.begin(), alternatives.end(), out );
-        }
-
-        Cost sumCost( const AltList &in );
 } // namespace ResolvExpr
 

src/ResolvExpr/AlternativePrinter.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// AlternativePrinter.cc --
+// AlternativePrinter.cc -- 
 //
 // Author           : Richard C. Bilson
@@ -33 +33 @@
                 for ( AltList::const_iterator i = finder.get_alternatives().begin(); i != finder.get_alternatives().end(); ++i ) {
                         os << "Alternative " << count++ << " ==============" << std::endl;
-                        i->expr->get_result()->print( os );
+                        printAll( i->expr->get_results(), os );
                         //    i->print( os );
                         os << std::endl;

src/ResolvExpr/ConversionCost.cc

@@ -236 +236 @@
                         std::list< Type* >::const_iterator srcIt = tupleType->get_types().begin();
                         std::list< Type* >::const_iterator destIt = destAsTuple->get_types().begin();
-                        while ( srcIt != tupleType->get_types().end() && destIt != destAsTuple->get_types().end() ) {
+                        while ( srcIt != tupleType->get_types().end() ) {
                                 Cost newCost = conversionCost( *srcIt++, *destIt++, indexer, env );
                                 if ( newCost == Cost::infinity ) {

src/ResolvExpr/ResolveTypeof.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ResolveTypeof.cc --
+// ResolveTypeof.cc -- 
 //
 // Author           : Richard C. Bilson
@@ -58 +58 @@
                 if ( typeofType->get_expr() ) {
                         Expression *newExpr = resolveInVoidContext( typeofType->get_expr(), indexer );
-                        assert( newExpr->has_result() && ! newExpr->get_result()->isVoid() );
-                        Type *newType = newExpr->get_result();
+                        assert( newExpr->get_results().size() > 0 );
+                        Type *newType;
+                        if ( newExpr->get_results().size() > 1 ) {
+                                TupleType *tupleType = new TupleType( Type::Qualifiers() );
+                                cloneAll( newExpr->get_results(), tupleType->get_types() );
+                                newType = tupleType;
+                        } else {
+                                newType = newExpr->get_results().front()->clone();
+                        } // if
                         delete typeofType;
                         return newType;

src/ResolvExpr/Resolver.cc

@@ -19 +19 @@
 #include "RenameVars.h"
 #include "ResolveTypeof.h"
-#include "typeops.h"
 #include "SynTree/Statement.h"
 #include "SynTree/Type.h"
@@ -68 +67 @@
           void resolveSingleAggrInit( Declaration *, InitIterator &, InitIterator & );
           void fallbackInit( ConstructorInit * ctorInit );
-                Type * functionReturn;
+                std::list< Type * > functionReturn;
                 Type *initContext;
                 Type *switchType;
@@ -156 +155 @@
                         const TypeEnvironment *newEnv = 0;
                         for ( AltList::const_iterator i = finder.get_alternatives().begin(); i != finder.get_alternatives().end(); ++i ) {
-                                if ( i->expr->get_result()->size() == 1 && isIntegralType( i->expr->get_result() ) ) {
+                                if ( i->expr->get_results().size() == 1 && isIntegralType( i->expr->get_results().front() ) ) {
                                         if ( newExpr ) {
                                                 throw SemanticError( "Too many interpretations for case control expression", untyped );
@@ -233 +232 @@
                 Type *new_type = resolveTypeof( functionDecl->get_type(), *this );
                 functionDecl->set_type( new_type );
-                ValueGuard< Type * > oldFunctionReturn( functionReturn );
-                functionReturn = ResolvExpr::extractResultType( functionDecl->get_functionType() );
+                std::list< Type * > oldFunctionReturn = functionReturn;
+                functionReturn.clear();
+                for ( std::list< DeclarationWithType * >::const_iterator i = functionDecl->get_functionType()->get_returnVals().begin(); i != functionDecl->get_functionType()->get_returnVals().end(); ++i ) {
+                        functionReturn.push_back( (*i)->get_type() );
+                } // for
                 SymTab::Indexer::visit( functionDecl );
+                functionReturn = oldFunctionReturn;
         }
 
@@ -333 +336 @@
         void Resolver::visit( ReturnStmt *returnStmt ) {
                 if ( returnStmt->get_expr() ) {
-                        CastExpr *castExpr = new CastExpr( returnStmt->get_expr(), functionReturn->clone() );
+                        CastExpr *castExpr = new CastExpr( returnStmt->get_expr() );
+                        cloneAll( functionReturn, castExpr->get_results() );
                         Expression *newExpr = findSingleExpression( castExpr, *this );
                         delete castExpr;
@@ -378 +382 @@
                                 if ( isCharType( at->get_base() ) ) {
                                         // check if the resolved type is char *
-                                        if ( PointerType * pt = dynamic_cast< PointerType *>( newExpr->get_result() ) ) {
+                                        if ( PointerType * pt = dynamic_cast< PointerType *>( newExpr->get_results().front() ) ) {
                                                 if ( isCharType( pt->get_base() ) ) {
                                                         // strip cast if we're initializing a char[] with a char *, e.g.  char x[] = "hello";

src/ResolvExpr/Unify.cc

@@ -588 +588 @@
         }
 
-        // xxx - compute once and store in the FunctionType?
-        Type * extractResultType( FunctionType * function ) {
-                if ( function->get_returnVals().size() == 0 ) {
-                        return new VoidType( Type::Qualifiers() );
-                } else if ( function->get_returnVals().size() == 1 ) {
-                        return function->get_returnVals().front()->get_type()->clone();
-                } else {
-                        TupleType * tupleType = new TupleType( Type::Qualifiers() );
-                        for ( DeclarationWithType * decl : function->get_returnVals() ) {
-                                tupleType->get_types().push_back( decl->get_type()->clone() );
-                        } // for
-                        return tupleType;
-                }
-        }
-
 } // namespace ResolvExpr
 

src/ResolvExpr/typeops.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// typeops.h --
+// typeops.h -- 
 //
 // Author           : Richard C. Bilson
@@ -30 +30 @@
                 typedef typename InputIterator::value_type SetType;
                 typedef typename std::list< typename SetType::value_type > ListType;
-
+  
                 if ( begin == end )     {
                         *out++ = ListType();
                         return;
                 } // if
-
+  
                 InputIterator current = begin;
                 begin++;
@@ -41 +41 @@
                 std::list< ListType > recursiveResult;
                 combos( begin, end, back_inserter( recursiveResult ) );
-
+  
                 for ( typename std::list< ListType >::const_iterator i = recursiveResult.begin(); i != recursiveResult.end(); ++i ) {
                         for ( typename ListType::const_iterator j = current->begin(); j != current->end(); ++j ) {
@@ -52 +52 @@
                 } // for
         }
-
+  
         // in AdjustExprType.cc
         /// Replaces array types with the equivalent pointer, and function types with a pointer-to-function
@@ -144 +144 @@
         }
 
-        /// creates the type represented by the list of returnVals in a FunctionType. The caller owns the return value.
-        Type * extractResultType( FunctionType * functionType );
-
         // in CommonType.cc
         Type *commonType( Type *type1, Type *type2, bool widenFirst, bool widenSecond, const SymTab::Indexer &indexer, TypeEnvironment &env, const OpenVarSet &openVars );
@@ -155 +152 @@
         // in Occurs.cc
         bool occurs( Type *type, std::string varName, const TypeEnvironment &env );
-
-        // flatten tuple type into list of types
-        template< typename OutputIterator >
-        void flatten( Type * type, OutputIterator out ) {
-                if ( TupleType * tupleType = dynamic_cast< TupleType * >( type ) ) {
-                        for ( Type * t : tupleType->get_types() ) {
-                                flatten( t, out );
-                        }
-                } else {
-                        *out++ = type;
-                }
-        }
 } // namespace ResolvExpr
 

src/SymTab/Autogen.cc

@@ -116 +116 @@
                 // This happens before function pointer type conversion, so need to do it manually here
                 VariableExpr * assignVarExpr = new VariableExpr( assignDecl );
-                Type * assignVarExprType = assignVarExpr->get_result();
+                Type *& assignVarExprType = assignVarExpr->get_results().front();
                 assignVarExprType = new PointerType( Type::Qualifiers(), assignVarExprType );
-                assignVarExpr->set_result( assignVarExprType );
                 ApplicationExpr * assignExpr = new ApplicationExpr( assignVarExpr );
                 assignExpr->get_args().push_back( new VariableExpr( dstParam ) );

src/SymTab/Indexer.cc

@@ -40 +40 @@
 
 namespace SymTab {
-        template< typename TreeType, typename VisitorType >
-        inline void acceptNewScope( TreeType *tree, VisitorType &visitor ) {
+        template< typename Container, typename VisitorType >
+        inline void acceptAllNewScope( Container &container, VisitorType &visitor ) {
                 visitor.enterScope();
-                maybeAccept( tree, visitor );
+                acceptAll( container, visitor );
                 visitor.leaveScope();
         }
@@ -337 +337 @@
 
         void Indexer::visit( ApplicationExpr *applicationExpr ) {
-                acceptNewScope( applicationExpr->get_result(), *this );
+                acceptAllNewScope( applicationExpr->get_results(), *this );
                 maybeAccept( applicationExpr->get_function(), *this );
                 acceptAll( applicationExpr->get_args(), *this );
@@ -343 +343 @@
 
         void Indexer::visit( UntypedExpr *untypedExpr ) {
-                acceptNewScope( untypedExpr->get_result(), *this );
+                acceptAllNewScope( untypedExpr->get_results(), *this );
                 acceptAll( untypedExpr->get_args(), *this );
         }
 
         void Indexer::visit( NameExpr *nameExpr ) {
-                acceptNewScope( nameExpr->get_result(), *this );
+                acceptAllNewScope( nameExpr->get_results(), *this );
         }
 
         void Indexer::visit( AddressExpr *addressExpr ) {
-                acceptNewScope( addressExpr->get_result(), *this );
+                acceptAllNewScope( addressExpr->get_results(), *this );
                 maybeAccept( addressExpr->get_arg(), *this );
         }
 
         void Indexer::visit( LabelAddressExpr *labAddressExpr ) {
-                acceptNewScope( labAddressExpr->get_result(), *this );
+                acceptAllNewScope( labAddressExpr->get_results(), *this );
                 maybeAccept( labAddressExpr->get_arg(), *this );
         }
 
         void Indexer::visit( CastExpr *castExpr ) {
-                acceptNewScope( castExpr->get_result(), *this );
+                acceptAllNewScope( castExpr->get_results(), *this );
                 maybeAccept( castExpr->get_arg(), *this );
         }
 
         void Indexer::visit( UntypedMemberExpr *memberExpr ) {
-                acceptNewScope( memberExpr->get_result(), *this );
+                acceptAllNewScope( memberExpr->get_results(), *this );
                 maybeAccept( memberExpr->get_aggregate(), *this );
         }
 
         void Indexer::visit( MemberExpr *memberExpr ) {
-                acceptNewScope( memberExpr->get_result(), *this );
+                acceptAllNewScope( memberExpr->get_results(), *this );
                 maybeAccept( memberExpr->get_aggregate(), *this );
         }
 
         void Indexer::visit( VariableExpr *variableExpr ) {
-                acceptNewScope( variableExpr->get_result(), *this );
+                acceptAllNewScope( variableExpr->get_results(), *this );
         }
 
         void Indexer::visit( ConstantExpr *constantExpr ) {
-                acceptNewScope( constantExpr->get_result(), *this );
+                acceptAllNewScope( constantExpr->get_results(), *this );
                 maybeAccept( constantExpr->get_constant(), *this );
         }
 
         void Indexer::visit( SizeofExpr *sizeofExpr ) {
-                acceptNewScope( sizeofExpr->get_result(), *this );
+                acceptAllNewScope( sizeofExpr->get_results(), *this );
                 if ( sizeofExpr->get_isType() ) {
                         maybeAccept( sizeofExpr->get_type(), *this );
@@ -395 +395 @@
 
         void Indexer::visit( AlignofExpr *alignofExpr ) {
-                acceptNewScope( alignofExpr->get_result(), *this );
+                acceptAllNewScope( alignofExpr->get_results(), *this );
                 if ( alignofExpr->get_isType() ) {
                         maybeAccept( alignofExpr->get_type(), *this );
@@ -404 +404 @@
 
         void Indexer::visit( UntypedOffsetofExpr *offsetofExpr ) {
-                acceptNewScope( offsetofExpr->get_result(), *this );
+                acceptAllNewScope( offsetofExpr->get_results(), *this );
                 maybeAccept( offsetofExpr->get_type(), *this );
         }
 
         void Indexer::visit( OffsetofExpr *offsetofExpr ) {
-                acceptNewScope( offsetofExpr->get_result(), *this );
+                acceptAllNewScope( offsetofExpr->get_results(), *this );
                 maybeAccept( offsetofExpr->get_type(), *this );
                 maybeAccept( offsetofExpr->get_member(), *this );
@@ -415 +415 @@
 
         void Indexer::visit( OffsetPackExpr *offsetPackExpr ) {
-                acceptNewScope( offsetPackExpr->get_result(), *this );
+                acceptAllNewScope( offsetPackExpr->get_results(), *this );
                 maybeAccept( offsetPackExpr->get_type(), *this );
         }
 
         void Indexer::visit( AttrExpr *attrExpr ) {
-                acceptNewScope( attrExpr->get_result(), *this );
+                acceptAllNewScope( attrExpr->get_results(), *this );
                 if ( attrExpr->get_isType() ) {
                         maybeAccept( attrExpr->get_type(), *this );
@@ -429 +429 @@
 
         void Indexer::visit( LogicalExpr *logicalExpr ) {
-                acceptNewScope( logicalExpr->get_result(), *this );
+                acceptAllNewScope( logicalExpr->get_results(), *this );
                 maybeAccept( logicalExpr->get_arg1(), *this );
                 maybeAccept( logicalExpr->get_arg2(), *this );
@@ -435 +435 @@
 
         void Indexer::visit( ConditionalExpr *conditionalExpr ) {
-                acceptNewScope( conditionalExpr->get_result(), *this );
+                acceptAllNewScope( conditionalExpr->get_results(), *this );
                 maybeAccept( conditionalExpr->get_arg1(), *this );
                 maybeAccept( conditionalExpr->get_arg2(), *this );
@@ -442 +442 @@
 
         void Indexer::visit( CommaExpr *commaExpr ) {
-                acceptNewScope( commaExpr->get_result(), *this );
+                acceptAllNewScope( commaExpr->get_results(), *this );
                 maybeAccept( commaExpr->get_arg1(), *this );
                 maybeAccept( commaExpr->get_arg2(), *this );
@@ -448 +448 @@
 
         void Indexer::visit( TupleExpr *tupleExpr ) {
-                acceptNewScope( tupleExpr->get_result(), *this );
+                acceptAllNewScope( tupleExpr->get_results(), *this );
                 acceptAll( tupleExpr->get_exprs(), *this );
         }
 
-        void Indexer::visit( TupleAssignExpr *tupleExpr ) {
-                acceptNewScope( tupleExpr->get_result(), *this );
-                enterScope();
-                acceptAll( tupleExpr->get_tempDecls(), *this );
-                acceptAll( tupleExpr->get_assigns(), *this );
-                leaveScope();
+        void Indexer::visit( SolvedTupleExpr *tupleExpr ) {
+                acceptAllNewScope( tupleExpr->get_results(), *this );
+                acceptAll( tupleExpr->get_exprs(), *this );
         }
 
         void Indexer::visit( TypeExpr *typeExpr ) {
-                acceptNewScope( typeExpr->get_result(), *this );
+                acceptAllNewScope( typeExpr->get_results(), *this );
                 maybeAccept( typeExpr->get_type(), *this );
         }
@@ -472 +469 @@
 
         void Indexer::visit( UntypedValofExpr *valofExpr ) {
-                acceptNewScope( valofExpr->get_result(), *this );
+                acceptAllNewScope( valofExpr->get_results(), *this );
                 maybeAccept( valofExpr->get_body(), *this );
         }

src/SymTab/Indexer.h

@@ -64 +64 @@
                 virtual void visit( ConditionalExpr *conditionalExpr );
                 virtual void visit( CommaExpr *commaExpr );
+                virtual void visit( TupleExpr *tupleExpr );
+                virtual void visit( SolvedTupleExpr *tupleExpr );
                 virtual void visit( TypeExpr *typeExpr );
                 virtual void visit( AsmExpr *asmExpr );
                 virtual void visit( UntypedValofExpr *valofExpr );
-                virtual void visit( TupleExpr *tupleExpr );
-                virtual void visit( TupleAssignExpr *tupleExpr );
 
                 virtual void visit( TraitInstType *contextInst );

src/SynTree/AddressExpr.cc

@@ -19 +19 @@
 
 AddressExpr::AddressExpr( Expression *arg, Expression *_aname ) : Expression( _aname ), arg( arg ) {
-        if ( arg->has_result() ) {
-                set_result( new PointerType( Type::Qualifiers(), arg->get_result()->clone() ) );
-        }
+        for ( std::list< Type* >::const_iterator i = arg->get_results().begin(); i != arg->get_results().end(); ++i ) {
+                get_results().push_back( new PointerType( Type::Qualifiers(), (*i)->clone() ) );
+        } // for
 }
 
@@ -35 +35 @@
         if ( arg ) {
                 os << std::string( indent+2, ' ' );
-                arg->print( os, indent+2 );
+    arg->print( os, indent+2 );
         } // if
 }

src/SynTree/ApplicationExpr.cc

@@ -21 +21 @@
 #include "TypeSubstitution.h"
 #include "Common/utility.h"
-#include "ResolvExpr/typeops.h"
+
 
 ParamEntry::ParamEntry( const ParamEntry &other ) :
@@ -43 +43 @@
 
 ApplicationExpr::ApplicationExpr( Expression *funcExpr ) : function( funcExpr ) {
-        PointerType *pointer = safe_dynamic_cast< PointerType* >( funcExpr->get_result() );
-        FunctionType *function = safe_dynamic_cast< FunctionType* >( pointer->get_base() );
+        PointerType *pointer = dynamic_cast< PointerType* >( funcExpr->get_results().front() );
+        assert( pointer );
+        FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() );
+        assert( function );
 
-        set_result( ResolvExpr::extractResultType( function ) );
-
-        assert( has_result() );
+        for ( std::list< DeclarationWithType* >::const_iterator i = function->get_returnVals().begin(); i != function->get_returnVals().end(); ++i ) {
+                get_results().push_back( (*i)->get_type()->clone() );
+        } // for
 }
 

src/SynTree/CommaExpr.cc

@@ -23 +23 @@
         // to false on all result types. Actually doing this causes some strange things
         // to happen in later passes (particularly, Specialize, Lvalue, and Box). This needs to be looked into.
-        set_result( maybeClone( arg2->get_result() ) );
-        // get_type->set_isLvalue( false );
+        cloneAll( arg2->get_results(), get_results() );
+        // for ( Type *& type : get_results() ) {
+        //      type->set_isLvalue( false );
+        // }
 }
 

src/SynTree/Expression.cc

@@ -31 +31 @@
 
 
-Expression::Expression( Expression *_aname ) : result( 0 ), env( 0 ), argName( _aname ) {}
-
-Expression::Expression( const Expression &other ) : result( maybeClone( other.result ) ), env( maybeClone( other.env ) ), argName( maybeClone( other.get_argName() ) ), extension( other.extension ) {
+Expression::Expression( Expression *_aname ) : env( 0 ), argName( _aname ) {}
+
+Expression::Expression( const Expression &other ) : env( maybeClone( other.env ) ), argName( maybeClone( other.get_argName() ) ), extension( other.extension ) {
+        cloneAll( other.results, results );
 }
 
@@ -39 +40 @@
         delete env;
         delete argName; // xxx -- there's a problem in cloning ConstantExpr I still don't know how to fix
-        delete result;
+        deleteAll( results );
+}
+
+void Expression::add_result( Type *t ) {
+        if ( TupleType *tuple = dynamic_cast< TupleType* >( t ) ) {
+                std::copy( tuple->get_types().begin(), tuple->get_types().end(), back_inserter( results ) );
+        } else {
+                results.push_back(t);
+        } // if
 }
 
@@ -59 +68 @@
 
 ConstantExpr::ConstantExpr( Constant _c, Expression *_aname ) : Expression( _aname ), constant( _c ) {
-        set_result( constant.get_type()->clone() );
+        add_result( constant.get_type()->clone() );
 }
 
@@ -76 +85 @@
         assert( var );
         assert( var->get_type() );
-        Type * type = var->get_type()->clone();
-        type->set_isLvalue( true );
-        set_result( type );
+        add_result( var->get_type()->clone() );
+        for ( std::list< Type* >::iterator i = get_results().begin(); i != get_results().end(); ++i ) {
+                (*i)->set_isLvalue( true );
+        } // for
 }
 
@@ -100 +110 @@
 SizeofExpr::SizeofExpr( Expression *expr_, Expression *_aname ) :
                 Expression( _aname ), expr(expr_), type(0), isType(false) {
-        set_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
+        add_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
 }
 
 SizeofExpr::SizeofExpr( Type *type_, Expression *_aname ) :
                 Expression( _aname ), expr(0), type(type_), isType(true) {
-        set_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
+        add_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
 }
 
@@ -131 +141 @@
 AlignofExpr::AlignofExpr( Expression *expr_, Expression *_aname ) :
                 Expression( _aname ), expr(expr_), type(0), isType(false) {
-        set_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
+        add_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
 }
 
 AlignofExpr::AlignofExpr( Type *type_, Expression *_aname ) :
                 Expression( _aname ), expr(0), type(type_), isType(true) {
-        set_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
+        add_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
 }
 
@@ -162 +172 @@
 UntypedOffsetofExpr::UntypedOffsetofExpr( Type *type_, const std::string &member_, Expression *_aname ) :
                 Expression( _aname ), type(type_), member(member_) {
-        set_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
+        add_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
 }
 
@@ -187 +197 @@
 OffsetofExpr::OffsetofExpr( Type *type_, DeclarationWithType *member_, Expression *_aname ) :
                 Expression( _aname ), type(type_), member(member_) {
-        set_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
+        add_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
 }
 
@@ -219 +229 @@
 
 OffsetPackExpr::OffsetPackExpr( StructInstType *type_, Expression *aname_ ) : Expression( aname_ ), type( type_ ) {
-        set_result( new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), 0, false, false ) );
+        add_result( new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), 0, false, false ) );
 }
 
@@ -274 +284 @@
 
 CastExpr::CastExpr( Expression *arg_, Type *toType, Expression *_aname ) : Expression( _aname ), arg(arg_) {
-        set_result(toType);
+        add_result(toType);
 }
 
 CastExpr::CastExpr( Expression *arg_, Expression *_aname ) : Expression( _aname ), arg(arg_) {
-        set_result( new VoidType( Type::Qualifiers() ) );
 }
 
@@ -294 +303 @@
         arg->print(os, indent+2);
         os << std::endl << std::string( indent, ' ' ) << "to:" << std::endl;
-        os << std::string( indent+2, ' ' );
-        if ( result->isVoid() ) {
-                os << "nothing";
+        if ( results.empty() ) {
+                os << std::string( indent+2, ' ' ) << "nothing" << std::endl;
         } else {
-                result->print( os, indent+2 );
+                printAll(results, os, indent+2);
         } // if
-        os << std::endl;
-        Expression::print( os, indent );
-}
-
-UntypedMemberExpr::UntypedMemberExpr( Expression * _member, Expression *_aggregate, Expression *_aname ) :
+        Expression::print( os, indent );
+}
+
+UntypedMemberExpr::UntypedMemberExpr( std::string _member, Expression *_aggregate, Expression *_aname ) :
                 Expression( _aname ), member(_member), aggregate(_aggregate) {}
 
 UntypedMemberExpr::UntypedMemberExpr( const UntypedMemberExpr &other ) :
-                Expression( other ), member( maybeClone( other.member ) ), aggregate( maybeClone( other.aggregate ) ) {
+                Expression( other ), member( other.member ), aggregate( maybeClone( other.aggregate ) ) {
 }
 
 UntypedMemberExpr::~UntypedMemberExpr() {
         delete aggregate;
-        delete member;
 }
 
 void UntypedMemberExpr::print( std::ostream &os, int indent ) const {
-        os << "Untyped Member Expression, with field: " << std::endl;
-        get_member()->print(os, indent+4);
-        os << std::string( indent+2, ' ' );
+        os << "Untyped Member Expression, with field: " << get_member();
 
         Expression *agg = get_aggregate();
-        os << "from aggregate: " << std::endl;
+        os << ", from aggregate: ";
         if (agg != 0) {
-                os << std::string( indent + 4, ' ' );
-                agg->print(os, indent + 4);
+                os << std::string( indent + 2, ' ' );
+                agg->print(os, indent + 2);
         }
         os << std::string( indent+2, ' ' );
@@ -334 +338 @@
 MemberExpr::MemberExpr( DeclarationWithType *_member, Expression *_aggregate, Expression *_aname ) :
                 Expression( _aname ), member(_member), aggregate(_aggregate) {
-        set_result( member->get_type()->clone() );
-        get_result()->set_isLvalue( true );
+        add_result( member->get_type()->clone() );
+        for ( std::list< Type* >::iterator i = get_results().begin(); i != get_results().end(); ++i ) {
+                (*i)->set_isLvalue( true );
+        } // for
 }
 
@@ -366 +372 @@
 }
 
-UntypedExpr::UntypedExpr( Expression *_function, const std::list<Expression *> &_args, Expression *_aname ) :
-                Expression( _aname ), function(_function), args(_args) {}
+
+UntypedExpr::UntypedExpr( Expression *_function, Expression *_aname ) : Expression( _aname ), function( _function ) {}
 
 UntypedExpr::UntypedExpr( const UntypedExpr &other ) :
@@ -373 +379 @@
         cloneAll( other.args, args );
 }
+
+UntypedExpr::UntypedExpr( Expression *_function, std::list<Expression *> &_args, Expression *_aname ) :
+                Expression( _aname ), function(_function), args(_args) {}
 
 UntypedExpr::~UntypedExpr() {
@@ -410 +419 @@
 LogicalExpr::LogicalExpr( Expression *arg1_, Expression *arg2_, bool andp, Expression *_aname ) :
                 Expression( _aname ), arg1(arg1_), arg2(arg2_), isAnd(andp) {
-        set_result( new BasicType( Type::Qualifiers(), BasicType::SignedInt ) );
+        add_result( new BasicType( Type::Qualifiers(), BasicType::SignedInt ) );
 }
 
@@ -468 +477 @@
 ImplicitCopyCtorExpr::ImplicitCopyCtorExpr( ApplicationExpr * callExpr ) : callExpr( callExpr ) {
         assert( callExpr );
-        assert( callExpr->has_result() );
-        set_result( callExpr->get_result()->clone() );
+        cloneAll( callExpr->get_results(), results );
 }
 
@@ -502 +510 @@
         Expression * arg = InitTweak::getCallArg( callExpr, 0 );
         assert( arg );
-        set_result( maybeClone( arg->get_result() ) );
+        cloneAll( arg->get_results(), results );
 }
 
@@ -522 +530 @@
 
 CompoundLiteralExpr::CompoundLiteralExpr( Type * type, Initializer * initializer ) : type( type ), initializer( initializer ) {
-        set_result( type->clone() );
+        add_result( type->clone() );
 }
 
@@ -557 +565 @@
 }
 
-StmtExpr::StmtExpr( CompoundStmt *statements ) : statements( statements ) {
-        assert( statements );
-        std::list< Statement * > & body = statements->get_kids();
-        if ( ! body.empty() ) {
-                if ( ExprStmt * exprStmt = dynamic_cast< ExprStmt * >( body.back() ) ) {
-                        set_result( maybeClone( exprStmt->get_expr()->get_result() ) );
-                }
-        }
-}
-StmtExpr::StmtExpr( const StmtExpr &other ) : statements( other.statements->clone() ) {}
-StmtExpr::~StmtExpr() {
-        delete statements;
-}
-void StmtExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Statement Expression: " << std::endl;
-        statements->print( os, indent+2 );
-}
-
 std::ostream & operator<<( std::ostream & out, const Expression * expr ) {
         expr->print( out );

src/SynTree/Expression.h

@@ -32 +32 @@
         virtual ~Expression();
 
-        Type *& get_result() { return result; }
-        void set_result( Type *newValue ) { result = newValue; }
-        bool has_result() const { return result != nullptr; }
+        std::list<Type *>& get_results() { return results; }
+        void add_result( Type *t );
 
         TypeSubstitution *get_env() const { return env; }
@@ -48 +47 @@
         virtual void print( std::ostream &os, int indent = 0 ) const;
   protected:
-        Type * result;
+        std::list<Type *> results;
         TypeSubstitution *env;
         Expression* argName; // if expression is used as an argument, it can be "designated" by this name
@@ -99 +98 @@
 class UntypedExpr : public Expression {
   public:
-        UntypedExpr( Expression *function, const std::list<Expression *> &args = std::list< Expression * >(), Expression *_aname = nullptr );
+        UntypedExpr( Expression *function, Expression *_aname = nullptr );
         UntypedExpr( const UntypedExpr &other );
+        UntypedExpr( Expression *function, std::list<Expression *> &args, Expression *_aname = nullptr );
         virtual ~UntypedExpr();
 
@@ -200 +200 @@
 class UntypedMemberExpr : public Expression {
   public:
-        UntypedMemberExpr( Expression *member, Expression *aggregate, Expression *_aname = nullptr );
+        UntypedMemberExpr( std::string member, Expression *aggregate, Expression *_aname = nullptr );
         UntypedMemberExpr( const UntypedMemberExpr &other );
         virtual ~UntypedMemberExpr();
 
-        Expression * get_member() const { return member; }
-        void set_member( Expression * newValue ) { member = newValue; }
+        std::string get_member() const { return member; }
+        void set_member( const std::string &newValue ) { member = newValue; }
         Expression *get_aggregate() const { return aggregate; }
         void set_aggregate( Expression *newValue ) { aggregate = newValue; }
@@ -214 +214 @@
         virtual void print( std::ostream &os, int indent = 0 ) const;
   private:
-        Expression *member;
+        std::string member;
         Expression *aggregate;
 };
@@ -483 +483 @@
 };
 
+/// TupleExpr represents a tuple expression ( [a, b, c] )
+class TupleExpr : public Expression {
+  public:
+        TupleExpr( Expression *_aname = nullptr );
+        TupleExpr( const TupleExpr &other );
+        virtual ~TupleExpr();
+
+        void set_exprs( std::list<Expression*> newValue ) { exprs = newValue; }
+        std::list<Expression*>& get_exprs() { return exprs; }
+
+        virtual TupleExpr *clone() const { return new TupleExpr( *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::list<Expression*> exprs;
+};
+
+/// SolvedTupleExpr represents a TupleExpr whose components have been type-resolved. It is effectively a shell for the code generator to work on
+class SolvedTupleExpr : public Expression {
+  public:
+        SolvedTupleExpr( Expression *_aname = nullptr ) : Expression( _aname ) {}
+        SolvedTupleExpr( std::list<Expression *> &, Expression *_aname = nullptr );
+        SolvedTupleExpr( const SolvedTupleExpr &other );
+        virtual ~SolvedTupleExpr() {}
+
+        std::list<Expression*> &get_exprs() { return exprs; }
+
+        virtual SolvedTupleExpr *clone() const { return new SolvedTupleExpr( *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::list<Expression*> exprs;
+};
+
 /// TypeExpr represents a type used in an expression (e.g. as a type generator parameter)
 class TypeExpr : public Expression {
@@ -582 +618 @@
         CompoundLiteralExpr( Type * type, Initializer * initializer );
         CompoundLiteralExpr( const CompoundLiteralExpr &other );
-        virtual ~CompoundLiteralExpr();
+        ~CompoundLiteralExpr();
 
         Type * get_type() const { return type; }
@@ -634 +670 @@
   private:
         Expression *low, *high;
-};
-
-/// TupleExpr represents a tuple expression ( [a, b, c] )
-class TupleExpr : public Expression {
-  public:
-        TupleExpr( Expression *_aname = nullptr );
-        TupleExpr( const TupleExpr &other );
-        virtual ~TupleExpr();
-
-        void set_exprs( std::list<Expression*> newValue ) { exprs = newValue; }
-        std::list<Expression*>& get_exprs() { return exprs; }
-
-        virtual TupleExpr *clone() const { return new TupleExpr( *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::list<Expression*> exprs;
-};
-
-/// TupleIndexExpr represents an element selection operation on a tuple value, e.g. t.3 after processing by the expression analyzer
-class TupleIndexExpr : public Expression {
-  public:
-        TupleIndexExpr( Expression * tuple, unsigned int index );
-        TupleIndexExpr( const TupleIndexExpr &other );
-        virtual ~TupleIndexExpr();
-
-        Expression * get_tuple() const { return tuple; }
-        int get_index() const { return index; }
-        TupleIndexExpr * set_tuple( Expression *newValue ) { tuple = newValue; return this; }
-        TupleIndexExpr * set_index( unsigned int newValue ) { index = newValue; return this; }
-
-        virtual TupleIndexExpr *clone() const { return new TupleIndexExpr( *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:
-        Expression * tuple;
-        unsigned int index;
-};
-
-/// MemberTupleExpr represents a tuple member selection operation on a struct type, e.g. s.[a, b, c] after processing by the expression analyzer
-class MemberTupleExpr : public Expression {
-  public:
-        MemberTupleExpr( Expression * member, Expression * aggregate, Expression * _aname = nullptr );
-        MemberTupleExpr( const MemberTupleExpr &other );
-        virtual ~MemberTupleExpr();
-
-        Expression * get_member() const { return member; }
-        Expression * get_aggregate() const { return aggregate; }
-        MemberTupleExpr * set_member( Expression *newValue ) { member = newValue; return this; }
-        MemberTupleExpr * set_aggregate( Expression *newValue ) { aggregate = newValue; return this; }
-
-        virtual MemberTupleExpr *clone() const { return new MemberTupleExpr( *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:
-        Expression * member;
-        Expression * aggregate;
-};
-
-/// TupleAssignExpr represents a multiple assignment operation, where both sides of the assignment have tuple type, e.g. [a, b, c] = [d, e, f];, or a mass assignment operation, where the left hand side has tuple type and the right hand side does not, e.g. [a, b, c] = 5.0;
-class TupleAssignExpr : public Expression {
-  public:
-        TupleAssignExpr( const std::list< Expression * > & assigns, const std::list< ObjectDecl * > & tempDecls, Expression * _aname = nullptr );
-        TupleAssignExpr( const TupleAssignExpr &other );
-        virtual ~TupleAssignExpr();
-
-        std::list< Expression * > & get_assigns() { return assigns; }
-        std::list< ObjectDecl * > & get_tempDecls() { return tempDecls; }
-
-        virtual TupleAssignExpr *clone() const { return new TupleAssignExpr( *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::list< Expression * > assigns; // assignment expressions that use tempDecls
-        std::list< ObjectDecl * > tempDecls; // temporaries for address of lhs exprs
-};
-
-/// StmtExpr represents a GCC 'statement expression', e.g. ({ int x = 5; x; })
-class StmtExpr : public Expression {
-public:
-        StmtExpr( CompoundStmt *statements );
-        StmtExpr( const StmtExpr & other );
-        virtual ~StmtExpr();
-
-        CompoundStmt * get_statements() const { return statements; }
-        StmtExpr * set_statements( CompoundStmt * newValue ) { statements = newValue; return this; }
-
-        virtual StmtExpr *clone() const { return new StmtExpr( *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:
-        CompoundStmt * statements;
 };
 

src/SynTree/Mutator.cc

@@ -178 +178 @@
 
 Expression *Mutator::mutate( ApplicationExpr *applicationExpr ) {
-        applicationExpr->set_result( maybeMutate( applicationExpr->get_result(), *this ) );
+        mutateAll( applicationExpr->get_results(), *this );
         applicationExpr->set_function( maybeMutate( applicationExpr->get_function(), *this ) );
         mutateAll( applicationExpr->get_args(), *this );
@@ -185 +185 @@
 
 Expression *Mutator::mutate( UntypedExpr *untypedExpr ) {
-        untypedExpr->set_result( maybeMutate( untypedExpr->get_result(), *this ) );
+        mutateAll( untypedExpr->get_results(), *this );
         mutateAll( untypedExpr->get_args(), *this );
         return untypedExpr;
@@ -191 +191 @@
 
 Expression *Mutator::mutate( NameExpr *nameExpr ) {
-        nameExpr->set_result( maybeMutate( nameExpr->get_result(), *this ) );
+        mutateAll( nameExpr->get_results(), *this );
         return nameExpr;
 }
 
 Expression *Mutator::mutate( AddressExpr *addressExpr ) {
-        addressExpr->set_result( maybeMutate( addressExpr->get_result(), *this ) );
+        mutateAll( addressExpr->get_results(), *this );
         addressExpr->set_arg( maybeMutate( addressExpr->get_arg(), *this ) );
         return addressExpr;
@@ -202 +202 @@
 
 Expression *Mutator::mutate( LabelAddressExpr *labelAddressExpr ) {
-        labelAddressExpr->set_result( maybeMutate( labelAddressExpr->get_result(), *this ) );
+        mutateAll( labelAddressExpr->get_results(), *this );
         labelAddressExpr->set_arg( maybeMutate( labelAddressExpr->get_arg(), *this ) );
         return labelAddressExpr;
@@ -208 +208 @@
 
 Expression *Mutator::mutate( CastExpr *castExpr ) {
-        castExpr->set_result( maybeMutate( castExpr->get_result(), *this ) );
+        mutateAll( castExpr->get_results(), *this );
         castExpr->set_arg( maybeMutate( castExpr->get_arg(), *this ) );
         return castExpr;
@@ -214 +214 @@
 
 Expression *Mutator::mutate( UntypedMemberExpr *memberExpr ) {
-        memberExpr->set_result( maybeMutate( memberExpr->get_result(), *this ) );
-        memberExpr->set_aggregate( maybeMutate( memberExpr->get_aggregate(), *this ) );
-        memberExpr->set_member( maybeMutate( memberExpr->get_member(), *this ) );
-        return memberExpr;
-}
-
-Expression *Mutator::mutate( MemberExpr *memberExpr ) {
-        memberExpr->set_result( maybeMutate( memberExpr->get_result(), *this ) );
+        mutateAll( memberExpr->get_results(), *this );
         memberExpr->set_aggregate( maybeMutate( memberExpr->get_aggregate(), *this ) );
         return memberExpr;
 }
 
+Expression *Mutator::mutate( MemberExpr *memberExpr ) {
+        mutateAll( memberExpr->get_results(), *this );
+        memberExpr->set_aggregate( maybeMutate( memberExpr->get_aggregate(), *this ) );
+        return memberExpr;
+}
+
 Expression *Mutator::mutate( VariableExpr *variableExpr ) {
-        variableExpr->set_result( maybeMutate( variableExpr->get_result(), *this ) );
+        mutateAll( variableExpr->get_results(), *this );
         return variableExpr;
 }
 
 Expression *Mutator::mutate( ConstantExpr *constantExpr ) {
-        constantExpr->set_result( maybeMutate( constantExpr->get_result(), *this ) );
+        mutateAll( constantExpr->get_results(), *this );
 //  maybeMutate( constantExpr->get_constant(), *this )
         return constantExpr;
@@ -238 +237 @@
 
 Expression *Mutator::mutate( SizeofExpr *sizeofExpr ) {
-        sizeofExpr->set_result( maybeMutate( sizeofExpr->get_result(), *this ) );
+        mutateAll( sizeofExpr->get_results(), *this );
         if ( sizeofExpr->get_isType() ) {
                 sizeofExpr->set_type( maybeMutate( sizeofExpr->get_type(), *this ) );
@@ -248 +247 @@
 
 Expression *Mutator::mutate( AlignofExpr *alignofExpr ) {
-        alignofExpr->set_result( maybeMutate( alignofExpr->get_result(), *this ) );
+        mutateAll( alignofExpr->get_results(), *this );
         if ( alignofExpr->get_isType() ) {
                 alignofExpr->set_type( maybeMutate( alignofExpr->get_type(), *this ) );
@@ -258 +257 @@
 
 Expression *Mutator::mutate( UntypedOffsetofExpr *offsetofExpr ) {
-        offsetofExpr->set_result( maybeMutate( offsetofExpr->get_result(), *this ) );
+        mutateAll( offsetofExpr->get_results(), *this );
         offsetofExpr->set_type( maybeMutate( offsetofExpr->get_type(), *this ) );
         return offsetofExpr;
@@ -264 +263 @@
 
 Expression *Mutator::mutate( OffsetofExpr *offsetofExpr ) {
-        offsetofExpr->set_result( maybeMutate( offsetofExpr->get_result(), *this ) );
+        mutateAll( offsetofExpr->get_results(), *this );
         offsetofExpr->set_type( maybeMutate( offsetofExpr->get_type(), *this ) );
         offsetofExpr->set_member( maybeMutate( offsetofExpr->get_member(), *this ) );
@@ -271 +270 @@
 
 Expression *Mutator::mutate( OffsetPackExpr *offsetPackExpr ) {
-        offsetPackExpr->set_result( maybeMutate( offsetPackExpr->get_result(), *this ) );
+        mutateAll( offsetPackExpr->get_results(), *this );
         offsetPackExpr->set_type( maybeMutate( offsetPackExpr->get_type(), *this ) );
         return offsetPackExpr;
@@ -277 +276 @@
 
 Expression *Mutator::mutate( AttrExpr *attrExpr ) {
-        attrExpr->set_result( maybeMutate( attrExpr->get_result(), *this ) );
+        mutateAll( attrExpr->get_results(), *this );
         if ( attrExpr->get_isType() ) {
                 attrExpr->set_type( maybeMutate( attrExpr->get_type(), *this ) );
@@ -287 +286 @@
 
 Expression *Mutator::mutate( LogicalExpr *logicalExpr ) {
-        logicalExpr->set_result( maybeMutate( logicalExpr->get_result(), *this ) );
+        mutateAll( logicalExpr->get_results(), *this );
         logicalExpr->set_arg1( maybeMutate( logicalExpr->get_arg1(), *this ) );
         logicalExpr->set_arg2( maybeMutate( logicalExpr->get_arg2(), *this ) );
@@ -294 +293 @@
 
 Expression *Mutator::mutate( ConditionalExpr *conditionalExpr ) {
-        conditionalExpr->set_result( maybeMutate( conditionalExpr->get_result(), *this ) );
+        mutateAll( conditionalExpr->get_results(), *this );
         conditionalExpr->set_arg1( maybeMutate( conditionalExpr->get_arg1(), *this ) );
         conditionalExpr->set_arg2( maybeMutate( conditionalExpr->get_arg2(), *this ) );
@@ -302 +301 @@
 
 Expression *Mutator::mutate( CommaExpr *commaExpr ) {
-        commaExpr->set_result( maybeMutate( commaExpr->get_result(), *this ) );
+        mutateAll( commaExpr->get_results(), *this );
         commaExpr->set_arg1( maybeMutate( commaExpr->get_arg1(), *this ) );
         commaExpr->set_arg2( maybeMutate( commaExpr->get_arg2(), *this ) );
@@ -308 +307 @@
 }
 
+Expression *Mutator::mutate( TupleExpr *tupleExpr ) {
+        mutateAll( tupleExpr->get_results(), *this );
+        mutateAll( tupleExpr->get_exprs(), *this );
+        return tupleExpr;
+}
+
+Expression *Mutator::mutate( SolvedTupleExpr *tupleExpr ) {
+        mutateAll( tupleExpr->get_results(), *this );
+        mutateAll( tupleExpr->get_exprs(), *this );
+        return tupleExpr;
+}
+
 Expression *Mutator::mutate( TypeExpr *typeExpr ) {
-        typeExpr->set_result( maybeMutate( typeExpr->get_result(), *this ) );
+        mutateAll( typeExpr->get_results(), *this );
         typeExpr->set_type( maybeMutate( typeExpr->get_type(), *this ) );
         return typeExpr;
@@ -329 +340 @@
 
 Expression* Mutator::mutate( ConstructorExpr *ctorExpr ) {
-        ctorExpr->set_result( maybeMutate( ctorExpr->get_result(), *this ) );
+        mutateAll( ctorExpr->get_results(), *this );
         ctorExpr->set_callExpr( maybeMutate( ctorExpr->get_callExpr(), *this ) );
         return ctorExpr;
@@ -335 +346 @@
 
 Expression *Mutator::mutate( CompoundLiteralExpr *compLitExpr ) {
-        compLitExpr->set_result( maybeMutate( compLitExpr->get_result(), *this ) );
+        mutateAll( compLitExpr->get_results(), *this );
         compLitExpr->set_type( maybeMutate( compLitExpr->get_type(), *this ) );
         compLitExpr->set_initializer( maybeMutate( compLitExpr->get_initializer(), *this ) );
@@ -342 +353 @@
 
 Expression *Mutator::mutate( UntypedValofExpr *valofExpr ) {
-        valofExpr->set_result( maybeMutate( valofExpr->get_result(), *this ) );
+        mutateAll( valofExpr->get_results(), *this );
         return valofExpr;
 }
@@ -350 +361 @@
         rangeExpr->set_high( maybeMutate( rangeExpr->get_high(), *this ) );
         return rangeExpr;
-}
-
-Expression *Mutator::mutate( TupleExpr *tupleExpr ) {
-        tupleExpr->set_result( maybeMutate( tupleExpr->get_result(), *this ) );
-        mutateAll( tupleExpr->get_exprs(), *this );
-        return tupleExpr;
-}
-
-Expression *Mutator::mutate( TupleIndexExpr *tupleExpr ) {
-        tupleExpr->set_result( maybeMutate( tupleExpr->get_result(), *this ) );
-        tupleExpr->set_tuple( maybeMutate( tupleExpr->get_tuple(), *this ) );
-        return tupleExpr;
-}
-
-Expression *Mutator::mutate( MemberTupleExpr *tupleExpr ) {
-        tupleExpr->set_result( maybeMutate( tupleExpr->get_result(), *this ) );
-        tupleExpr->set_member( maybeMutate( tupleExpr->get_member(), *this ) );
-        tupleExpr->set_aggregate( maybeMutate( tupleExpr->get_aggregate(), *this ) );
-        return tupleExpr;
-}
-
-Expression *Mutator::mutate( TupleAssignExpr *assignExpr ) {
-        assignExpr->set_result( maybeMutate( assignExpr->get_result(), *this ) );
-        mutateAll( assignExpr->get_tempDecls(), *this );
-        mutateAll( assignExpr->get_assigns(), *this );
-        return assignExpr;
-}
-
-Expression *Mutator::mutate( StmtExpr *stmtExpr ) {
-        stmtExpr->set_result( maybeMutate( stmtExpr->get_result(), *this ) );
-        stmtExpr->set_statements( maybeMutate( stmtExpr->get_statements(), *this ) );
-        return stmtExpr;
 }
 

src/SynTree/Mutator.h

@@ -71 +71 @@
         virtual Expression* mutate( ConditionalExpr *conditionalExpr );
         virtual Expression* mutate( CommaExpr *commaExpr );
+        virtual Expression* mutate( TupleExpr *tupleExpr );
+        virtual Expression* mutate( SolvedTupleExpr *tupleExpr );
         virtual Expression* mutate( TypeExpr *typeExpr );
         virtual Expression* mutate( AsmExpr *asmExpr );
@@ -78 +80 @@
         virtual Expression* mutate( UntypedValofExpr *valofExpr );
         virtual Expression* mutate( RangeExpr *rangeExpr );
-        virtual Expression* mutate( TupleExpr *tupleExpr );
-        virtual Expression* mutate( TupleIndexExpr *tupleExpr );
-        virtual Expression* mutate( MemberTupleExpr *tupleExpr );
-        virtual Expression* mutate( TupleAssignExpr *assignExpr );
-        virtual Expression* mutate( StmtExpr * stmtExpr );
 
         virtual Type* mutate( VoidType *basicType );

src/SynTree/ReferenceToType.cc

@@ -56 +56 @@
         }
 } // namespace
-
-StructInstType::StructInstType( const Type::Qualifiers & tq, StructDecl * baseStruct ) : Parent( tq, baseStruct->get_name() ), baseStruct( baseStruct ) {}
 
 std::string StructInstType::typeString() const { return "struct"; }

src/SynTree/SynTree.h

@@ -76 +76 @@
 class ConditionalExpr;
 class CommaExpr;
+class TupleExpr;
+class SolvedTupleExpr;
 class TypeExpr;
 class AsmExpr;
@@ -83 +85 @@
 class UntypedValofExpr;
 class RangeExpr;
-class TupleExpr;
-class TupleIndexExpr;
-class MemberTupleExpr;
-class TupleAssignExpr;
-class StmtExpr;
 
 class Type;

src/SynTree/TupleExpr.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TupleExpr.cc --
+// TupleExpr.cc -- 
 //
 // Author           : Richard C. Bilson
@@ -16 +16 @@
 #include "Expression.h"
 #include "Common/utility.h"
-#include "Type.h"
-#include "Declaration.h"
 
 TupleExpr::TupleExpr( Expression *_aname ) : Expression( _aname ) {
@@ -31 +29 @@
 
 void TupleExpr::print( std::ostream &os, int indent ) const {
-        os << "Tuple:" << std::endl;
+        os << std::string( indent, ' ' ) << "Tuple:" << std::endl;
         printAll( exprs, os, indent+2 );
         Expression::print( os, indent );
 }
 
-TupleIndexExpr::TupleIndexExpr( Expression * tuple, unsigned int index ) {
-        TupleType * type = safe_dynamic_cast< TupleType * >( tuple->get_result() );
-        assert( type->size() >= index );
-        set_result( *std::next( type->get_types().begin(), index ) );
+SolvedTupleExpr::SolvedTupleExpr( std::list<Expression *> &_exprs, Expression *_aname ) : Expression( _aname ) {
+        std::copy(_exprs.begin(), _exprs.end(), back_inserter(exprs));
 }
 
-TupleIndexExpr::TupleIndexExpr( const TupleIndexExpr &other ) : Expression( other ), tuple( other.tuple->clone() ), index( other.index ) {
+SolvedTupleExpr::SolvedTupleExpr( const SolvedTupleExpr &other ) : Expression( other ) {
+        cloneAll( other.exprs, exprs );
 }
 
-TupleIndexExpr::~TupleIndexExpr() {
-        delete tuple;
-}
-
-void TupleIndexExpr::print( std::ostream &os, int indent ) const {
-        os << "Tuple Index Expression, with tuple:" << std::endl;
-        tuple->print( os, indent+2 );
-        os << std::string( indent+2, ' ' ) << "with index: " << index << std::endl;
+void SolvedTupleExpr::print( std::ostream &os, int indent ) const {
+        os << std::string( indent, ' ' ) << "Solved Tuple:" << std::endl;
+        printAll( exprs, os, indent+2 );
         Expression::print( os, indent );
 }
-
-MemberTupleExpr::MemberTupleExpr( Expression * member, Expression * aggregate, Expression * _aname ) : Expression( _aname ) {
-        set_result( maybeClone( member->get_result() ) ); // xxx - ???
-}
-
-MemberTupleExpr::MemberTupleExpr( const MemberTupleExpr &other ) : Expression( other ), member( other.member->clone() ), aggregate( other.aggregate->clone() ) {
-}
-
-MemberTupleExpr::~MemberTupleExpr() {
-        delete member;
-        delete aggregate;
-}
-
-void MemberTupleExpr::print( std::ostream &os, int indent ) const {
-        os << "Member Tuple Expression, with aggregate:" << std::endl;
-        aggregate->print( os, indent+2 );
-        os << std::string( indent+2, ' ' ) << "with member: " << std::endl;
-        member->print( os, indent+2 );
-        Expression::print( os, indent );
-}
-
-
-TupleAssignExpr::TupleAssignExpr( const std::list< Expression * > & assigns, const std::list< ObjectDecl * > & tempDecls, Expression * _aname ) : Expression( _aname ), assigns( assigns ), tempDecls( tempDecls ) {
-        TupleType * type = new TupleType( Type::Qualifiers() );
-        for ( Expression * expr : assigns ) {
-                assert( expr->has_result() );
-                type->get_types().push_back( expr->get_result()->clone() );
-        }
-        set_result( type );
-}
-
-TupleAssignExpr::TupleAssignExpr( const TupleAssignExpr &other ) : Expression( other ), tempDecls( other.tempDecls ) /* temporary */ {
-        cloneAll( other.assigns, assigns );
-        // xxx - clone needs to go into assigns and replace tempDecls
-}
-
-TupleAssignExpr::~TupleAssignExpr() {
-        deleteAll( assigns );
-        // deleteAll( tempDecls );
-}
-
-void TupleAssignExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Tuple Assignment Expression, with temporaries:" << std::endl;
-        printAll( tempDecls, os, indent+4 );
-        os << std::string( indent+2, ' ' ) << "with assignments: " << std::endl;
-        printAll( assigns, os, indent+4 );
-        Expression::print( os, indent );
-}
-
-
 
 // Local Variables: //

src/SynTree/TupleType.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TupleType.cc --
+// TupleType.cc -- 
 //
 // Author           : Richard C. Bilson
@@ -17 +17 @@
 #include "Common/utility.h"
 
-TupleType::TupleType( const Type::Qualifiers &tq, const std::list< Type * > & types ) : Type( tq ), types( types ) {
+TupleType::TupleType( const Type::Qualifiers &tq ) : Type( tq ) {
 }
 

src/SynTree/Type.h

@@ -27 +27 @@
                 Qualifiers( bool isConst, bool isVolatile, bool isRestrict, bool isLvalue, bool isAtomic, bool isAttribute ): isConst( isConst ), isVolatile( isVolatile ), isRestrict( isRestrict ), isLvalue( isLvalue ), isAtomic( isAtomic ), isAttribute( isAttribute ) {}
 
-                Qualifiers &operator&=( const Qualifiers &other );
                 Qualifiers &operator+=( const Qualifiers &other );
                 Qualifiers &operator-=( const Qualifiers &other );
@@ -66 +65 @@
         std::list<TypeDecl*>& get_forall() { return forall; }
 
-        /// How many elemental types are represented by this type
-        virtual unsigned size() const { return 1; };
-        virtual bool isVoid() const { return size() == 0; }
-
         virtual Type *clone() const = 0;
         virtual void accept( Visitor &v ) = 0;
@@ -82 +77 @@
   public:
         VoidType( const Type::Qualifiers &tq );
-
-        virtual unsigned size() const { return 0; };
 
         virtual VoidType *clone() const { return new VoidType( *this ); }
@@ -241 +234 @@
   public:
         StructInstType( const Type::Qualifiers &tq, const std::string &name ) : Parent( tq, name ), baseStruct( 0 ) {}
-        StructInstType( const Type::Qualifiers &tq, StructDecl * baseStruct );
         StructInstType( const StructInstType &other ) : Parent( other ), baseStruct( other.baseStruct ) {}
 
@@ -356 +348 @@
 class TupleType : public Type {
   public:
-        TupleType( const Type::Qualifiers &tq, const std::list< Type * > & types = std::list< Type * >() );
+        TupleType( const Type::Qualifiers &tq );
         TupleType( const TupleType& );
         virtual ~TupleType();
 
-        typedef std::list<Type*> value_type;
-        typedef value_type::iterator iterator;
-
         std::list<Type*>& get_types() { return types; }
-        virtual unsigned size() const { return types.size(); };
-
-        iterator begin() { return types.begin(); }
-        iterator end() { return types.end(); }
 
         virtual TupleType *clone() const { return new TupleType( *this ); }
@@ -433 +418 @@
 };
 
-inline Type::Qualifiers &Type::Qualifiers::operator&=( const Type::Qualifiers &other ) {
-        isConst &= other.isConst;
-        isVolatile &= other.isVolatile;
-        isRestrict &= other.isRestrict;
-        isLvalue &= other.isLvalue;
-        isAtomic &= other.isAtomic;
-        return *this;
-}
-
 inline Type::Qualifiers &Type::Qualifiers::operator+=( const Type::Qualifiers &other ) {
         isConst |= other.isConst;

src/SynTree/Visitor.cc

@@ -150 +150 @@
 
 void Visitor::visit( ApplicationExpr *applicationExpr ) {
-        maybeAccept( applicationExpr->get_result(), *this );
+        acceptAll( applicationExpr->get_results(), *this );
         maybeAccept( applicationExpr->get_function(), *this );
         acceptAll( applicationExpr->get_args(), *this );
@@ -156 +156 @@
 
 void Visitor::visit( UntypedExpr *untypedExpr ) {
-        maybeAccept( untypedExpr->get_result(), *this );
+        acceptAll( untypedExpr->get_results(), *this );
         acceptAll( untypedExpr->get_args(), *this );
 }
 
 void Visitor::visit( NameExpr *nameExpr ) {
-        maybeAccept( nameExpr->get_result(), *this );
+        acceptAll( nameExpr->get_results(), *this );
 }
 
 void Visitor::visit( AddressExpr *addressExpr ) {
-        maybeAccept( addressExpr->get_result(), *this );
+        acceptAll( addressExpr->get_results(), *this );
         maybeAccept( addressExpr->get_arg(), *this );
 }
 
 void Visitor::visit( LabelAddressExpr *labAddressExpr ) {
-        maybeAccept( labAddressExpr->get_result(), *this );
+        acceptAll( labAddressExpr->get_results(), *this );
         maybeAccept( labAddressExpr->get_arg(), *this );
 }
 
 void Visitor::visit( CastExpr *castExpr ) {
-        maybeAccept( castExpr->get_result(), *this );
+        acceptAll( castExpr->get_results(), *this );
         maybeAccept( castExpr->get_arg(), *this );
 }
 
 void Visitor::visit( UntypedMemberExpr *memberExpr ) {
-        maybeAccept( memberExpr->get_result(), *this );
+        acceptAll( memberExpr->get_results(), *this );
         maybeAccept( memberExpr->get_aggregate(), *this );
-        maybeAccept( memberExpr->get_member(), *this );
 }
 
 void Visitor::visit( MemberExpr *memberExpr ) {
-        maybeAccept( memberExpr->get_result(), *this );
+        acceptAll( memberExpr->get_results(), *this );
         maybeAccept( memberExpr->get_aggregate(), *this );
 }
 
 void Visitor::visit( VariableExpr *variableExpr ) {
-        maybeAccept( variableExpr->get_result(), *this );
+        acceptAll( variableExpr->get_results(), *this );
 }
 
 void Visitor::visit( ConstantExpr *constantExpr ) {
-        maybeAccept( constantExpr->get_result(), *this );
+        acceptAll( constantExpr->get_results(), *this );
         maybeAccept( constantExpr->get_constant(), *this );
 }
 
 void Visitor::visit( SizeofExpr *sizeofExpr ) {
-        maybeAccept( sizeofExpr->get_result(), *this );
+        acceptAll( sizeofExpr->get_results(), *this );
         if ( sizeofExpr->get_isType() ) {
                 maybeAccept( sizeofExpr->get_type(), *this );
@@ -209 +208 @@
 
 void Visitor::visit( AlignofExpr *alignofExpr ) {
-        maybeAccept( alignofExpr->get_result(), *this );
+        acceptAll( alignofExpr->get_results(), *this );
         if ( alignofExpr->get_isType() ) {
                 maybeAccept( alignofExpr->get_type(), *this );
@@ -218 +217 @@
 
 void Visitor::visit( UntypedOffsetofExpr *offsetofExpr ) {
-        maybeAccept( offsetofExpr->get_result(), *this );
+        acceptAll( offsetofExpr->get_results(), *this );
         maybeAccept( offsetofExpr->get_type(), *this );
 }
 
 void Visitor::visit( OffsetofExpr *offsetofExpr ) {
-        maybeAccept( offsetofExpr->get_result(), *this );
+        acceptAll( offsetofExpr->get_results(), *this );
         maybeAccept( offsetofExpr->get_type(), *this );
         maybeAccept( offsetofExpr->get_member(), *this );
@@ -229 +228 @@
 
 void Visitor::visit( OffsetPackExpr *offsetPackExpr ) {
-        maybeAccept( offsetPackExpr->get_result(), *this );
+        acceptAll( offsetPackExpr->get_results(), *this );
         maybeAccept( offsetPackExpr->get_type(), *this );
 }
 
 void Visitor::visit( AttrExpr *attrExpr ) {
-        maybeAccept( attrExpr->get_result(), *this );
+        acceptAll( attrExpr->get_results(), *this );
         if ( attrExpr->get_isType() ) {
                 maybeAccept( attrExpr->get_type(), *this );
@@ -243 +242 @@
 
 void Visitor::visit( LogicalExpr *logicalExpr ) {
-        maybeAccept( logicalExpr->get_result(), *this );
+        acceptAll( logicalExpr->get_results(), *this );
         maybeAccept( logicalExpr->get_arg1(), *this );
         maybeAccept( logicalExpr->get_arg2(), *this );
@@ -249 +248 @@
 
 void Visitor::visit( ConditionalExpr *conditionalExpr ) {
-        maybeAccept( conditionalExpr->get_result(), *this );
+        acceptAll( conditionalExpr->get_results(), *this );
         maybeAccept( conditionalExpr->get_arg1(), *this );
         maybeAccept( conditionalExpr->get_arg2(), *this );
@@ -256 +255 @@
 
 void Visitor::visit( CommaExpr *commaExpr ) {
-        maybeAccept( commaExpr->get_result(), *this );
+        acceptAll( commaExpr->get_results(), *this );
         maybeAccept( commaExpr->get_arg1(), *this );
         maybeAccept( commaExpr->get_arg2(), *this );
 }
 
+void Visitor::visit( TupleExpr *tupleExpr ) {
+        acceptAll( tupleExpr->get_results(), *this );
+        acceptAll( tupleExpr->get_exprs(), *this );
+}
+
+void Visitor::visit( SolvedTupleExpr *tupleExpr ) {
+        acceptAll( tupleExpr->get_results(), *this );
+        acceptAll( tupleExpr->get_exprs(), *this );
+}
+
 void Visitor::visit( TypeExpr *typeExpr ) {
-        maybeAccept( typeExpr->get_result(), *this );
+        acceptAll( typeExpr->get_results(), *this );
         maybeAccept( typeExpr->get_type(), *this );
 }
@@ -279 +288 @@
 
 void Visitor::visit( ConstructorExpr * ctorExpr ) {
-        maybeAccept( ctorExpr->get_result(), *this );
+        acceptAll( ctorExpr->get_results(), *this );
         maybeAccept( ctorExpr->get_callExpr(), *this );
 }
 
 void Visitor::visit( CompoundLiteralExpr *compLitExpr ) {
-        maybeAccept( compLitExpr->get_result(), *this );
+        acceptAll( compLitExpr->get_results(), *this );
         maybeAccept( compLitExpr->get_type(), *this );
         maybeAccept( compLitExpr->get_initializer(), *this );
@@ -290 +299 @@
 
 void Visitor::visit( UntypedValofExpr *valofExpr ) {
-        maybeAccept( valofExpr->get_result(), *this );
+        acceptAll( valofExpr->get_results(), *this );
         maybeAccept( valofExpr->get_body(), *this );
 }
@@ -297 +306 @@
         maybeAccept( rangeExpr->get_low(), *this );
         maybeAccept( rangeExpr->get_high(), *this );
-}
-
-void Visitor::visit( TupleExpr *tupleExpr ) {
-        maybeAccept( tupleExpr->get_result(), *this );
-        acceptAll( tupleExpr->get_exprs(), *this );
-}
-
-void Visitor::visit( TupleIndexExpr *tupleExpr ) {
-        maybeAccept( tupleExpr->get_result(), *this );
-        maybeAccept( tupleExpr->get_tuple(), *this );
-}
-
-void Visitor::visit( MemberTupleExpr *tupleExpr ) {
-        maybeAccept( tupleExpr->get_result(), *this );
-        maybeAccept( tupleExpr->get_member(), *this );
-        maybeAccept( tupleExpr->get_aggregate(), *this );
-}
-
-void Visitor::visit( TupleAssignExpr *assignExpr ) {
-        maybeAccept( assignExpr->get_result(), *this );
-        acceptAll( assignExpr->get_tempDecls(), *this );
-        acceptAll( assignExpr->get_assigns(), *this );
-}
-
-void Visitor::visit( StmtExpr *stmtExpr ) {
-        maybeAccept( stmtExpr->get_result(), *this );
-        maybeAccept( stmtExpr->get_statements(), *this );
 }
 

src/SynTree/Visitor.h

@@ -71 +71 @@
         virtual void visit( ConditionalExpr *conditionalExpr );
         virtual void visit( CommaExpr *commaExpr );
+        virtual void visit( TupleExpr *tupleExpr );
+        virtual void visit( SolvedTupleExpr *tupleExpr );
         virtual void visit( TypeExpr *typeExpr );
         virtual void visit( AsmExpr *asmExpr );
@@ -78 +80 @@
         virtual void visit( UntypedValofExpr *valofExpr );
         virtual void visit( RangeExpr *rangeExpr );
-        virtual void visit( TupleExpr *tupleExpr );
-        virtual void visit( TupleIndexExpr *tupleExpr );
-        virtual void visit( MemberTupleExpr *tupleExpr );
-        virtual void visit( TupleAssignExpr *assignExpr );
-        virtual void visit( StmtExpr * stmtExpr );
 
         virtual void visit( VoidType *basicType );

src/Tuples/TupleAssignment.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TupleAssignment.cc --
+// TupleAssignment.cc -- 
 //
 // Author           : Rodolfo G. Esteves
@@ -18 +18 @@
 #include "ResolvExpr/typeops.h"
 #include "SynTree/Expression.h"
-#include "SynTree/Initializer.h"
-#include "Tuples.h"
+#include "TupleAssignment.h"
 #include "Common/SemanticError.h"
 
@@ -28 +27 @@
 #include <cassert>
 #include <set>
-#include <unordered_set>
 
 namespace Tuples {
-        class TupleAssignSpotter {
-          public:
-                // dispatcher for Tuple (multiple and mass) assignment operations
-                TupleAssignSpotter( ResolvExpr::AlternativeFinder & );
-                void spot( UntypedExpr * expr, std::list<ResolvExpr::AltList> &possibilities );
-
-          private:
-                void match();
-                // records for assignment generation
-                struct Options {
-                        void print( std::ostream & );
-                        int size() const { return options.size(); }
-                        bool empty() const { return options.empty(); }
-                        typedef std::list< ResolvExpr::AltList >::iterator iterator;
-                        iterator begin() { return options.begin(); }
-                        iterator end() { return options.end(); }
-
-                        std::list< ResolvExpr::AltList > options;
-                };
-
-                struct Matcher {
-                  public:
-                        Matcher( TupleAssignSpotter &spotter, Expression *_lhs, Expression *_rhs );
-                        virtual ~Matcher() {}
-                        virtual void match( std::list< Expression * > &out ) = 0;
-                        std::list< Expression * > lhs, rhs;
-                        TupleAssignSpotter &spotter;
-                        std::list< ObjectDecl * > tmpDecls;
-                };
-
-                struct MassAssignMatcher : public Matcher {
-                  public:
-                        MassAssignMatcher( TupleAssignSpotter &spotter, Expression *lhs, Expression *rhs ) : Matcher( spotter, lhs, rhs ) {
-                                this->rhs.push_back( rhs );
+        TupleAssignSpotter::TupleAssignSpotter( ResolvExpr::AlternativeFinder *f = 0 )
+                : currentFinder(f), matcher(0), hasMatched( false ) {}
+
+        bool TupleAssignSpotter::pointsToTuple( Expression *expr ) {
+                // also check for function returning tuple of reference types
+                if (AddressExpr *addr = dynamic_cast<AddressExpr *>(expr) )
+                        if ( isTuple(addr->get_arg() ) )
+                                return true;
+                return false;
+        }
+
+        bool TupleAssignSpotter::isTupleVar( DeclarationWithType *decl ) {
+                if ( dynamic_cast<TupleType *>(decl->get_type()) )
+                        return true;
+                return false;
+        }
+
+        bool TupleAssignSpotter::isTuple( Expression *expr, bool isRight ) {
+                // true if `expr' is an expression returning a tuple: tuple, tuple variable or MRV function
+                if ( ! expr ) return false;
+
+                if ( dynamic_cast<TupleExpr *>(expr) )
+                        return true;
+                else if ( VariableExpr *var = dynamic_cast<VariableExpr *>(expr) ) {
+                        if ( isTupleVar(var->get_var()) )
+                                return true;
+                }
+
+                return false;
+        }
+
+        bool TupleAssignSpotter::match() {
+                assert ( matcher != 0 );
+
+                std::list< Expression * > new_assigns;
+                if ( ! matcher->match(new_assigns) )
+                        return false;
+
+                if ( new_assigns.empty() ) return false;
+                /*return */matcher->solve( new_assigns );
+                if ( dynamic_cast<TupleAssignSpotter::MultipleAssignMatcher *>( matcher ) ) {
+                        // now resolve new assignments
+                        std::list< Expression * > solved_assigns;
+                        ResolvExpr::AltList solved_alts;
+                        assert( currentFinder != 0 );
+
+                        ResolvExpr::AltList current;
+                        for ( std::list< Expression * >::iterator i = new_assigns.begin(); i != new_assigns.end(); ++i ) {
+                                //try {
+                                ResolvExpr::AlternativeFinder finder( currentFinder->get_indexer(), currentFinder->get_environ() );
+                                finder.findWithAdjustment(*i);
+                                // prune expressions that don't coincide with
+                                ResolvExpr::AltList alts = finder.get_alternatives();
+                                assert( alts.size() == 1 );
+                                assert(alts.front().expr != 0 );
+                                current.push_back( finder.get_alternatives().front() );
+                                solved_assigns.push_back( alts.front().expr->clone() );
+                                //solved_assigns.back()->print(std::cerr);
+                                /*} catch( ... ) {
+                                  continue; // no reasonable alternative found
+                                  }*/
                         }
-                        virtual void match( std::list< Expression * > &out );
-                };
-
-                struct MultipleAssignMatcher : public Matcher {
-                  public:
-                        MultipleAssignMatcher( TupleAssignSpotter &spot, Expression *lhs, Expression *rhs );
-                        virtual void match( std::list< Expression * > &out );
-                };
-
-                ResolvExpr::AlternativeFinder &currentFinder;
-                // Expression *rhs, *lhs;
-                Matcher *matcher = nullptr;
-                Options options;
-        };
-
-        bool isTupleVar( DeclarationWithType *decl ) {
-                return dynamic_cast< TupleType * >( decl->get_type() );
-        }
-
-        /// true if expr is an expression of tuple type, i.e. a tuple expression, tuple variable, or MRV (multiple-return-value) function
-        bool isTuple( Expression *expr ) {
-                if ( ! expr ) return false;
-                assert( expr->has_result() );
-                // xxx - used to include cast to varExpr and call to isTupleVar, but this doesn't seem like it should be necessary
-                return dynamic_cast<TupleExpr *>(expr) || expr->get_result()->size() > 1;
-        }
-
-        bool pointsToTuple( Expression *expr ) {
-                // also check for function returning tuple of reference types
-                if ( AddressExpr *addr = dynamic_cast< AddressExpr * >( expr) ) {
-                        return isTuple( addr->get_arg() );
-                }
-                return false;
-        }
-
-        bool isTupleExpr( Expression *expr ) {
-                assert( expr->has_result() );
-                return expr->get_result()->size() > 1;
-        }
-
-        void handleTupleAssignment( ResolvExpr::AlternativeFinder & currentFinder, UntypedExpr * expr, std::list<ResolvExpr::AltList> &possibilities ) {
-                TupleAssignSpotter spotter( currentFinder );
-                spotter.spot( expr, possibilities );
-        }
-
-        TupleAssignSpotter::TupleAssignSpotter( ResolvExpr::AlternativeFinder &f )
-                : currentFinder(f) {}
-
-        void TupleAssignSpotter::spot( UntypedExpr * expr, std::list<ResolvExpr::AltList> &possibilities ) {
+                        options.add_option( current );
+
+                        return true;
+                } else { // mass assignment
+                        //if ( new_assigns.empty() ) return false;
+                        std::list< Expression * > solved_assigns;
+                        ResolvExpr::AltList solved_alts;
+                        assert( currentFinder != 0 );
+
+                        ResolvExpr::AltList current;
+                        if ( optMass.empty() ) {
+                                for ( std::list< Expression * >::size_type i = 0; i != new_assigns.size(); ++i )
+                                        optMass.push_back( ResolvExpr::AltList() );
+                        }
+                        int cnt = 0;
+                        for ( std::list< Expression * >::iterator i = new_assigns.begin(); i != new_assigns.end(); ++i, cnt++ ) {
+
+                                ResolvExpr::AlternativeFinder finder( currentFinder->get_indexer(), currentFinder->get_environ() );
+                                finder.findWithAdjustment(*i);
+                                ResolvExpr::AltList alts = finder.get_alternatives();
+                                assert( alts.size() == 1 );
+                                assert(alts.front().expr != 0 );
+                                current.push_back( finder.get_alternatives().front() );
+                                optMass[cnt].push_back( finder.get_alternatives().front() );
+                                solved_assigns.push_back( alts.front().expr->clone() );
+                        }
+
+                        return true;
+                }
+
+                return false;
+        }
+
+        bool TupleAssignSpotter::isMVR( Expression *expr ) {
+                if ( expr->get_results().size() > 1 ) {
+                        // MVR processing
+                        return true;
+                }
+                return false;
+        }
+
+        bool TupleAssignSpotter::isTupleAssignment( UntypedExpr * expr, std::list<ResolvExpr::AltList> &possibilities ) {
                 if (  NameExpr *assgnop = dynamic_cast< NameExpr * >(expr->get_function()) ) {
+
                         if ( assgnop->get_name() == std::string("?=?") ) {
+
                                 for ( std::list<ResolvExpr::AltList>::iterator ali = possibilities.begin(); ali != possibilities.end(); ++ali ) {
                                         assert( ali->size() == 2 );
-                                        ResolvExpr::Alternative op1 = ali->front(), op2 = ali->back();
-
-                                        MultipleAssignMatcher multiMatcher( *this, op1.expr, op2.expr );
-                                        MassAssignMatcher massMatcher( *this, op1.expr, op2.expr );
+                                        ResolvExpr::AltList::iterator opit = ali->begin();
+                                        ResolvExpr::Alternative op1 = *opit, op2 = *(++opit);
+
                                         if ( pointsToTuple(op1.expr) ) { // also handles tuple vars
-                                                if ( isTuple( op2.expr ) ) {
-                                                        matcher = &multiMatcher;
-                                                } else {
+                                                if ( isTuple( op2.expr, true ) )
+                                                        matcher = new MultipleAssignMatcher(op1.expr, op2.expr);
+                                                else if ( isMVR( op2.expr ) ) {
+                                                        // handle MVR differently
+                                                } else
                                                         // mass assignment
-                                                        matcher = &massMatcher;
+                                                        matcher = new MassAssignMatcher(op1.expr, op2.expr);
+
+                                                std::list< ResolvExpr::AltList > options;
+                                                if ( match() )
+                                                        /*
+                                                          if ( hasMatched ) {
+                                                          // throw SemanticError("Ambiguous tuple assignment");
+                                                          } else {*/
+                                                        // Matched for the first time
+                                                        hasMatched = true;
+                                                /*} */
+                                        } /* else if ( isTuple( op2 ) )
+                                                 throw SemanticError("Inapplicable tuple assignment.");
+                                          */
+                                }
+
+                                if ( hasMatched ) {
+                                        if ( dynamic_cast<TupleAssignSpotter::MultipleAssignMatcher *>( matcher ) ) {
+                                                //options.print( std::cerr );
+                                                std::list< ResolvExpr::AltList >best = options.get_best();
+                                                if ( best.size() == 1 ) {
+                                                        std::list<Expression *> solved_assigns;
+                                                        for ( ResolvExpr::AltList::iterator i = best.front().begin(); i != best.front().end(); ++i ) {
+                                                                solved_assigns.push_back( i->expr );
+                                                        }
+                                                        /* assigning cost zero? */
+                                                        currentFinder->get_alternatives().push_front( ResolvExpr::Alternative(new SolvedTupleExpr(solved_assigns/*, SolvedTupleExpr::MULTIPLE*/), currentFinder->get_environ(), ResolvExpr::Cost() ) );
                                                 }
-                                                match();
-                                        } else if ( isTuple( op2.expr ) ) {
-                                                throw SemanticError("Cannot assign a tuple value into a non-tuple lvalue.", expr);
+                                        } else {
+                                                assert( ! optMass.empty() );
+                                                ResolvExpr::AltList winners;
+                                                for ( std::vector< ResolvExpr::AltList >::iterator i = optMass.begin(); i != optMass.end(); ++i )
+                                                        findMinCostAlt( i->begin(), i->end(), back_inserter(winners) );
+
+                                                std::list< Expression *> solved_assigns;
+                                                for ( ResolvExpr::AltList::iterator i = winners.begin(); i != winners.end(); ++i )
+                                                        solved_assigns.push_back( i->expr );
+                                                currentFinder->get_alternatives().push_front( ResolvExpr::Alternative(new SolvedTupleExpr(solved_assigns/*, SolvedTupleExpr::MASS*/), currentFinder->get_environ(), ResolvExpr::Cost() ) );
                                         }
                                 }
                         }
                 }
-        }
-
-        void TupleAssignSpotter::match() {
-                assert ( matcher != 0 );
-
-                std::list< Expression * > new_assigns;
-                matcher->match( new_assigns );
-
-                if ( new_assigns.empty() ) return;
-                ResolvExpr::AltList current;
-                // now resolve new assignments
-                for ( std::list< Expression * >::iterator i = new_assigns.begin(); i != new_assigns.end(); ++i ) {
-                        ResolvExpr::AlternativeFinder finder( currentFinder.get_indexer(), currentFinder.get_environ() );
-                        finder.findWithAdjustment(*i);
-                        // prune expressions that don't coincide with
-                        ResolvExpr::AltList alts = finder.get_alternatives();
-                        assert( alts.size() == 1 );
-                        assert( alts.front().expr != 0 );
-                        current.push_back( alts.front() );
-                }
-
-                // extract expressions from the assignment alternatives to produce a list of assignments that
-                // together form a single alternative
-                std::list< Expression *> solved_assigns;
-                for ( ResolvExpr::Alternative & alt : current ) {
-                        solved_assigns.push_back( alt.expr->clone() );
-                }
-                // xxx - need to do this??
-                // TypeEnvironment compositeEnv;
-                // simpleCombineEnvironments( i->begin(), i->end(), compositeEnv );
-                currentFinder.get_alternatives().push_front( ResolvExpr::Alternative(new TupleAssignExpr(solved_assigns, matcher->tmpDecls), currentFinder.get_environ(), ResolvExpr::sumCost( current ) ) );
-        }
-
-        TupleAssignSpotter::Matcher::Matcher( TupleAssignSpotter &spotter, Expression *lhs, Expression *rhs ) : spotter(spotter) {
-                // xxx - shouldn't need to be &<tuple-expr>, just &<lvalue-tuple-type>
-                if (AddressExpr *addr = dynamic_cast<AddressExpr *>(lhs) )
+                return hasMatched;
+        }
+
+        void TupleAssignSpotter::Matcher::init( Expression *_lhs, Expression *_rhs ) {
+                lhs.clear();
+                if (AddressExpr *addr = dynamic_cast<AddressExpr *>(_lhs) )
                         if ( TupleExpr *tuple = dynamic_cast<TupleExpr *>(addr->get_arg()) )
-                                std::copy( tuple->get_exprs().begin(), tuple->get_exprs().end(), back_inserter(this->lhs) );
-        }
-
-        TupleAssignSpotter::MultipleAssignMatcher::MultipleAssignMatcher( TupleAssignSpotter &spotter, Expression *lhs, Expression *rhs ) : Matcher( spotter, lhs, rhs ) {
-
-                if ( TupleExpr *tuple = dynamic_cast<TupleExpr *>(rhs) )
-                        std::copy( tuple->get_exprs().begin(), tuple->get_exprs().end(), back_inserter(this->rhs) );
-        }
-
-        UntypedExpr * createAssgn( ObjectDecl *left, ObjectDecl *right ) {
-                assert( left && right );
-                std::list< Expression * > args;
-                args.push_back( new AddressExpr( new UntypedExpr( new NameExpr("*?"), std::list< Expression * >{ new VariableExpr( left ) } ) ) );
-                args.push_back( new VariableExpr( right ) );
-                return new UntypedExpr( new NameExpr( "?=?" ), args );
-        }
-
-        ObjectDecl * newObject( UniqueName & namer, Expression * expr ) {
-                assert( expr->has_result() && ! expr->get_result()->isVoid() );
-                return new ObjectDecl( namer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::Cforall, nullptr, expr->get_result()->clone(), new SingleInit( expr->clone() ) );
-        }
-
-        void TupleAssignSpotter::MassAssignMatcher::match( std::list< Expression * > &out ) {
-                static UniqueName lhsNamer( "__massassign_L" );
-                static UniqueName rhsNamer( "__massassign_R" );
-                assert ( ! lhs.empty() && rhs.size() == 1);
-
-                ObjectDecl * rtmp = newObject( rhsNamer, rhs.front() );
-                for ( Expression * l : lhs ) {
-                        ObjectDecl * ltmp = newObject( lhsNamer, new AddressExpr( l ) );
-                        out.push_back( createAssgn( ltmp, rtmp ) );
-                        tmpDecls.push_back( ltmp );
-                }
-                tmpDecls.push_back( rtmp );
-        }
-
-        void TupleAssignSpotter::MultipleAssignMatcher::match( std::list< Expression * > &out ) {
-                static UniqueName lhsNamer( "__multassign_L" );
-                static UniqueName rhsNamer( "__multassign_R" );
-                // xxx - need more complicated matching?
+                                std::copy( tuple->get_exprs().begin(), tuple->get_exprs().end(), back_inserter(lhs) );
+
+                rhs.clear();
+        }
+
+        TupleAssignSpotter::Matcher::Matcher( /*TupleAssignSpotter &spot,*/ Expression *_lhs, Expression *_rhs ) /*: own_spotter(spot) */{
+                init(_lhs,_rhs);
+        }
+
+        TupleAssignSpotter::MultipleAssignMatcher::MultipleAssignMatcher( Expression *_lhs, Expression *_rhs )/* : own_spotter(spot) */{
+                init(_lhs,_rhs);
+
+                if ( TupleExpr *tuple = dynamic_cast<TupleExpr *>(_rhs) )
+                        std::copy( tuple->get_exprs().begin(), tuple->get_exprs().end(), back_inserter(rhs) );
+        }
+
+        UntypedExpr *TupleAssignSpotter::Matcher::createAssgn( Expression *left, Expression *right ) {
+                if ( left && right ) {
+                        std::list< Expression * > args;
+                        args.push_back(new AddressExpr(left->clone()));  args.push_back(right->clone());
+                        return new UntypedExpr(new NameExpr("?=?"), args);
+                } else
+                        throw 0; // xxx - diagnose the problem
+        }
+
+        bool TupleAssignSpotter::MassAssignMatcher::match( std::list< Expression * > &out ) {
+                if ( lhs.empty() || (rhs.size() != 1) ) return false;
+
+                for ( std::list< Expression * >::iterator l = lhs.begin(); l != lhs.end(); l++ ) {
+                        std::list< Expression * > args;
+                        args.push_back( new AddressExpr(*l) );
+                        args.push_back( rhs.front() );
+                        out.push_back( new UntypedExpr(new NameExpr("?=?"), args) );
+                }
+
+                return true;
+        }
+
+        bool TupleAssignSpotter::MassAssignMatcher::solve( std::list< Expression * > &assigns ) {
+                /*
+                  std::list< Expression * > solved_assigns;
+                  ResolvExpr::AltList solved_alts;
+                  assert( currentFinder != 0 );
+
+                  ResolvExpr::AltList current;
+                  if ( optMass.empty() ) {
+                  for ( std::list< Expression * >::size_type i = 0; i != new_assigns.size(); ++i )
+                  optMass.push_back( ResolvExpr::AltList() );
+                  }
+                  int cnt = 0;
+                  for ( std::list< Expression * >::iterator i = new_assigns.begin(); i != new_assigns.end(); ++i, cnt++ ) {
+
+                  ResolvExpr::AlternativeFinder finder( currentFinder->get_indexer(), currentFinder->get_environ() );
+                  finder.findWithAdjustment(*i);
+                  ResolvExpr::AltList alts = finder.get_alternatives();
+                  assert( alts.size() == 1 );
+                  assert(alts.front().expr != 0 );
+                  current.push_back( finder.get_alternatives().front() );
+                  optMass[cnt].push_back( finder.get_alternatives().front() );
+                  solved_assigns.push_back( alts.front().expr->clone() );
+                  }
+                */
+                return true;
+        }
+
+        bool TupleAssignSpotter::MultipleAssignMatcher::match( std::list< Expression * > &out ) {
+                // need more complicated matching
                 if ( lhs.size() == rhs.size() ) {
-                        std::list< ObjectDecl * > ltmp;
-                        std::list< ObjectDecl * > rtmp;
-                        std::transform( lhs.begin(), lhs.end(), back_inserter( ltmp ), []( Expression * expr ){
-                                return newObject( lhsNamer, new AddressExpr( expr ) );
-                        });
-                        std::transform( rhs.begin(), rhs.end(), back_inserter( rtmp ), []( Expression * expr ){
-                                return newObject( rhsNamer, expr );
-                        });
-                        zipWith( ltmp.begin(), ltmp.end(), rtmp.begin(), rtmp.end(), back_inserter(out), createAssgn );
-                        tmpDecls.splice( tmpDecls.end(), ltmp );
-                        tmpDecls.splice( tmpDecls.end(), rtmp );
-                }
+                        zipWith( lhs.begin(), lhs.end(), rhs.begin(), rhs.end(), back_inserter(out), TupleAssignSpotter::Matcher::createAssgn );
+                        return true;
+                } //else
+                //std::cerr << "The length of (left, right) is: (" << lhs.size() << "," << rhs.size() << ")" << std::endl;*/
+                return false;
+        }
+
+        bool TupleAssignSpotter::MultipleAssignMatcher::solve( std::list< Expression * > &assigns ) {
+                /*
+                  std::list< Expression * > solved_assigns;
+                  ResolvExpr::AltList solved_alts;
+                  assert( currentFinder != 0 );
+
+                  ResolvExpr::AltList current;
+                  for ( std::list< Expression * >::iterator i = new_assigns.begin(); i != new_assigns.end(); ++i ) {
+                  //try {
+                  ResolvExpr::AlternativeFinder finder( currentFinder->get_indexer(), currentFinder->get_environ() );
+                  finder.findWithAdjustment(*i);
+                  // prune expressions that don't coincide with
+                  ResolvExpr::AltList alts = finder.get_alternatives();
+                  assert( alts.size() == 1 );
+                  assert(alts.front().expr != 0 );
+                  current.push_back( finder.get_alternatives().front() );
+                  solved_assigns.push_back( alts.front().expr->clone() );
+                  //solved_assigns.back()->print(std::cerr);
+                  //} catch( ... ) {
+                  //continue; // no reasonable alternative found
+                  //}
+                  }
+                  options.add_option( current );
+                */
+
+                return true;
+        }
+
+        void TupleAssignSpotter::Options::add_option( ResolvExpr::AltList &opt ) {
+                using namespace std;
+
+                options.push_back( opt );
+                /*
+                  vector< Cost > costs;
+                  costs.reserve( opt.size() );
+                  transform( opt.begin(), opt.end(), back_inserter(costs), ptr_fun(extract_cost) );
+                */
+                // transpose matrix
+                if ( costMatrix.empty() )
+                        for ( unsigned int i = 0; i< opt.size(); ++i)
+                                costMatrix.push_back( vector<ResolvExpr::Cost>() );
+
+                int cnt = 0;
+                for ( ResolvExpr::AltList::iterator i = opt.begin(); i != opt.end(); ++i, cnt++ )
+                        costMatrix[cnt].push_back( i->cost );
+
+                return;
+        }
+
+        std::list< ResolvExpr::AltList > TupleAssignSpotter::Options::get_best() {
+                using namespace std;
+                using namespace ResolvExpr;
+                list< ResolvExpr::AltList > ret;
+                list< multiset<int> > solns;
+                for ( vector< vector<Cost> >::iterator i = costMatrix.begin(); i != costMatrix.end(); ++i ) {
+                        list<int> current;
+                        findMinCost( i->begin(), i->end(), back_inserter(current) );
+                        solns.push_back( multiset<int>(current.begin(), current.end()) );
+                }
+                // need to combine
+                multiset<int> result;
+                lift_intersection( solns.begin(), solns.end(), inserter( result, result.begin() ) );
+                if ( result.size() != 1 )
+                        throw SemanticError("Ambiguous tuple expression");
+                ret.push_back(get_option( *(result.begin() )));
+                return ret;
         }
 
         void TupleAssignSpotter::Options::print( std::ostream &ostr ) {
-                for ( ResolvExpr::AltList & l : options ) {
-                        for ( ResolvExpr::Alternative & alt : l ) {
-                                alt.print( ostr );
-                                ostr << " ";
-                        }
+                using namespace std;
+
+                for ( vector< vector < ResolvExpr::Cost > >::iterator i = costMatrix.begin(); i != costMatrix.end(); ++i ) {
+                        for ( vector < ResolvExpr::Cost >::iterator j = i->begin(); j != i->end(); ++j )
+                                ostr << *j << " " ;
                         ostr << std::endl;
                 } // for
+                return;
+        }
+
+        ResolvExpr::Cost extract_cost( ResolvExpr::Alternative &alt ) {
+                return alt.cost;
+        }
+
+        template< typename InputIterator, typename OutputIterator >
+        void TupleAssignSpotter::Options::findMinCost( InputIterator begin, InputIterator end, OutputIterator out ) {
+                using namespace ResolvExpr;
+                std::list<int> alternatives;
+
+                // select the alternatives that have the minimum parameter cost
+                Cost minCost = Cost::infinity;
+                unsigned int index = 0;
+                for ( InputIterator i = begin; i != end; ++i, index++ ) {
+                        if ( *i < minCost ) {
+                                minCost = *i;
+                                alternatives.clear();
+                                alternatives.push_back( index );
+                        } else if ( *i == minCost ) {
+                                alternatives.push_back( index );
+                        }
+                }
+                std::copy( alternatives.begin(), alternatives.end(), out );
+        }
+
+        template< class InputIterator, class OutputIterator >
+        void TupleAssignSpotter::Options::lift_intersection( InputIterator begin, InputIterator end, OutputIterator out ) {
+                if ( begin == end ) return;
+                InputIterator test = begin;
+
+                if (++test == end)
+                        { copy(begin->begin(), begin->end(), out); return; }
+
+
+                std::multiset<int> cur; // InputIterator::value_type::value_type
+                copy( begin->begin(), begin->end(), inserter( cur, cur.begin() ) );
+
+                while ( test != end ) {
+                        std::multiset<int> temp;
+                        set_intersection( cur.begin(), cur.end(), test->begin(), test->end(), inserter(temp,temp.begin()) );
+                        cur.clear();
+                        copy( temp.begin(), temp.end(), inserter(cur,cur.begin()));
+                        ++test;
+                }
+
+                copy( cur.begin(), cur.end(), out );
+                return;
+        }
+
+        ResolvExpr::AltList TupleAssignSpotter::Options::get_option( std::list< ResolvExpr::AltList >::size_type index ) {
+                if ( index >= options.size() )
+                        throw 0; // XXX
+                std::list< ResolvExpr::AltList >::iterator it = options.begin();
+                for ( std::list< ResolvExpr::AltList >::size_type i = 0; i < index; ++i, ++it );
+                return *it;
         }
 } // namespace Tuples

src/Tuples/module.mk

@@ -6 +6 @@
 ## file "LICENCE" distributed with Cforall.
 ##
-## module.mk --
+## module.mk -- 
 ##
 ## Author           : Richard C. Bilson
@@ -16 +16 @@
 
 SRC +=  Tuples/TupleAssignment.cc \
-        Tuples/TupleExpansion.cc
+        Tuples/NameMatcher.cc

src/main.cc

@@ -42 +42 @@
 #include "Common/UnimplementedError.h"
 #include "../config.h"
-#include "Tuples/Tuples.h"
 
 using namespace std;
@@ -266 +265 @@
                 OPTPRINT( "convertLvalue" )
                 GenPoly::convertLvalue( translationUnit );
-                OPTPRINT( "expandTuples" ); // xxx - is this the right place for this?
-                Tuples::expandTuples( translationUnit );
 
                 if ( bboxp ) {