Changeset 04cdd9b for src

Timestamp:

Aug 19, 2016, 2:42:04 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

e85a8631

Parents:

03da511 (diff), ac71a86 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ctor

Location:

src

Files:

• Common/Assert.cc (added)
• Common/CompilerError.h (modified) (2 diffs)
• Common/module.mk (modified) (1 diff)
• Common/utility.h (modified) (1 diff)
• GenPoly/Box.cc (modified) (9 diffs)
• GenPoly/GenPoly.cc (modified) (3 diffs)
• GenPoly/GenPoly.h (modified) (2 diffs)
• GenPoly/InstantiateGeneric.cc (modified) (10 diffs)
• GenPoly/ScrubTyVars.cc (modified) (4 diffs)
• GenPoly/ScrubTyVars.h (modified) (3 diffs)
• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (13 diffs)
• Parser/DeclarationNode.cc (modified) (25 diffs)
• Parser/ExpressionNode.cc (modified) (8 diffs)
• Parser/InitializerNode.cc (modified) (6 diffs)
• Parser/LinkageSpec.cc (modified) (3 diffs)
• Parser/LinkageSpec.h (modified) (2 diffs)
• Parser/ParseNode.cc (modified) (2 diffs)
• Parser/ParseNode.h (modified) (13 diffs)
• Parser/Parser.cc (deleted)
• Parser/Parser.h (deleted)
• Parser/StatementNode.cc (modified) (2 diffs)
• Parser/TypeData.cc (modified) (5 diffs)
• Parser/TypeData.h (modified) (2 diffs)
• Parser/TypedefTable.cc (modified) (4 diffs)
• Parser/TypedefTable.h (modified) (2 diffs)
• Parser/lex.cc (modified) (6 diffs)
• Parser/lex.ll (modified) (4 diffs)
• Parser/module.mk (modified) (2 diffs)
• Parser/parser.cc (modified) (79 diffs)
• Parser/parser.h (modified) (5 diffs)
• Parser/parser.yy (modified) (63 diffs)
• Parser/parseutility.cc (modified) (2 diffs)
• SymTab/Autogen.cc (modified) (1 diff)
• SynTree/Declaration.cc (modified) (2 diffs)
• SynTree/Declaration.h (modified) (7 diffs)
• SynTree/DeclarationWithType.cc (modified) (2 diffs)
• SynTree/Expression.cc (modified) (1 diff)
• SynTree/FunctionDecl.cc (modified) (2 diffs)
• SynTree/Label.h (modified) (1 diff)
• SynTree/ObjectDecl.cc (modified) (2 diffs)
• SynTree/Statement.cc (modified) (3 diffs)
• SynTree/Statement.h (modified) (2 diffs)
• examples/asm.c (deleted)
• examples/gc_no_raii/containers/vector (added)
• examples/gc_no_raii/containers/vector.c (added)
• examples/gc_no_raii/premake4.lua (modified) (2 diffs)
• examples/gc_no_raii/src/gc.h (modified) (1 diff)
• examples/gc_no_raii/src/gcpointers.c (modified) (5 diffs)
• examples/gc_no_raii/src/gcpointers.h (modified) (2 diffs)
• examples/gc_no_raii/src/internal/collector.c (modified) (2 diffs)
• examples/gc_no_raii/src/internal/state.h (modified) (2 diffs)
• examples/gc_no_raii/test/gctest.c (modified) (2 diffs)
• include/assert.h (added)
• libcfa/Makefile.am (modified) (2 diffs)
• libcfa/Makefile.in (modified) (8 diffs)
• main.cc (modified) (12 diffs)
• tests/.expect/32/declarationSpecifier.txt (added)
• tests/.expect/32/gccExtensions.txt (modified) (4 diffs)
• tests/.expect/64/declarationSpecifier.txt (added)
• tests/.expect/64/gccExtensions.txt (modified) (3 diffs)
• tests/.expect/asmName.txt (deleted)
• tests/.expect/declarationErrors.txt (modified) (1 diff)
• tests/.expect/declarationSpecifier.txt (deleted)
• tests/.expect/libcfa_vector.txt (deleted)
• tests/Makefile.am (modified) (3 diffs)
• tests/Makefile.in (modified) (2 diffs)
• tests/asmName.c (deleted)
• tests/declarationErrors.c (modified) (2 diffs)
• tests/declarationSpecifier.c (modified) (6 diffs)
• tests/dtor-early-exit.c (modified) (2 diffs)
• tests/exception.c (modified) (2 diffs)
• tests/functions.c (modified) (2 diffs)
• tests/gccExtensions.c (modified) (4 diffs)
• tests/identFuncDeclarator.c (modified) (2 diffs)
• tests/identParamDeclarator.c (modified) (2 diffs)
• tests/labelledExit.c (modified) (2 diffs)
• tests/test.py (modified) (3 diffs)
• tests/variableDeclarator.c (modified) (2 diffs)

src/Common/CompilerError.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 07:20:37 2015
-// Update Count     : 2
+// Last Modified On : Thu Aug 18 23:41:30 2016
+// Update Count     : 3
 //
 
@@ -18 +18 @@
 
 #include <string>
-//#include "../config.h"
 
 class CompilerError : public std::exception {

src/Common/module.mk

@@ -11 +11 @@
 ## Created On       : Mon Jun  1 17:49:17 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Mon Jun  1 17:51:23 2015
-## Update Count     : 1
+## Last Modified On : Thu Aug 18 13:29:04 2016
+## Update Count     : 2
 ###############################################################################
 
 SRC += Common/SemanticError.cc \
-       Common/UniqueName.cc
+       Common/UniqueName.cc \
+       Common/Assert.cc

src/Common/utility.h

@@ -49 +49 @@
 }
 
+template< typename T, typename U >
+static inline T * maybeMoveBuild( const U *orig ) {
+        T* ret = maybeBuild<T>(orig);
+        delete orig;
+        return ret;
+}
+
+
 template< typename Input_iterator >
 void printEnums( Input_iterator begin, Input_iterator end, const char * const *name_array, std::ostream &os ) {

src/GenPoly/Box.cc

@@ -104 +104 @@
                         Type *replaceWithConcrete( ApplicationExpr *appExpr, Type *type, bool doClone = true );
                         /// wraps a function application returning a polymorphic type with a new temporary for the out-parameter return value
-                        Expression *addPolyRetParam( ApplicationExpr *appExpr, FunctionType *function, ReferenceToType *polyType, std::list< Expression *>::iterator &arg );
+                        Expression *addDynRetParam( ApplicationExpr *appExpr, FunctionType *function, ReferenceToType *polyType, std::list< Expression *>::iterator &arg );
                         Expression *applyAdapter( ApplicationExpr *appExpr, FunctionType *function, std::list< Expression *>::iterator &arg, const TyVarMap &exprTyVars );
                         void boxParam( Type *formal, Expression *&arg, const TyVarMap &exprTyVars );
@@ -661 +661 @@
                                 // process polymorphic return value
                                 retval = 0;
-                                if ( isPolyRet( functionDecl->get_functionType() ) && functionDecl->get_linkage() == LinkageSpec::Cforall ) {
+                                if ( isDynRet( functionDecl->get_functionType() ) && functionDecl->get_linkage() == LinkageSpec::Cforall ) {
                                         retval = functionDecl->get_functionType()->get_returnVals().front();
 
@@ -868 +868 @@
                 }
 
-                Expression *Pass1::addPolyRetParam( ApplicationExpr *appExpr, FunctionType *function, ReferenceToType *polyType, std::list< Expression *>::iterator &arg ) {
+                Expression *Pass1::addDynRetParam( ApplicationExpr *appExpr, FunctionType *function, ReferenceToType *dynType, std::list< Expression *>::iterator &arg ) {
                         assert( env );
-                        Type *concrete = replaceWithConcrete( appExpr, polyType );
+                        Type *concrete = replaceWithConcrete( appExpr, dynType );
                         // add out-parameter for return value
                         return addRetParam( appExpr, function, concrete, arg );
@@ -877 +877 @@
                 Expression *Pass1::applyAdapter( ApplicationExpr *appExpr, FunctionType *function, std::list< Expression *>::iterator &arg, const TyVarMap &tyVars ) {
                         Expression *ret = appExpr;
-                        if ( ! function->get_returnVals().empty() && isPolyType( function->get_returnVals().front()->get_type(), tyVars ) ) {
+//                      if ( ! function->get_returnVals().empty() && isPolyType( function->get_returnVals().front()->get_type(), tyVars ) ) {
+                        if ( isDynRet( function, tyVars ) ) {
                                 ret = addRetParam( appExpr, function, function->get_returnVals().front()->get_type(), arg );
                         } // if
@@ -968 +969 @@
                         // actually make the adapter type
                         FunctionType *adapter = adaptee->clone();
-                        if ( ! adapter->get_returnVals().empty() && isPolyType( adapter->get_returnVals().front()->get_type(), tyVars ) ) {
+//                      if ( ! adapter->get_returnVals().empty() && isPolyType( adapter->get_returnVals().front()->get_type(), tyVars ) ) {
+                        if ( isDynRet( adapter, tyVars ) ) {
                                 makeRetParm( adapter );
                         } // if
@@ -1030 +1032 @@
                                 addAdapterParams( adapteeApp, arg, param, adapterType->get_parameters().end(), realParam, tyVars );
                                 bodyStmt = new ExprStmt( noLabels, adapteeApp );
-                        } else if ( isPolyType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) {
+//                      } else if ( isPolyType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) {
+                        } else if ( isDynType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) {
                                 // return type T
                                 if ( (*param)->get_name() == "" ) {
@@ -1277 +1280 @@
                         TyVarMap exprTyVars( (TypeDecl::Kind)-1 );
                         makeTyVarMap( function, exprTyVars );
-                        ReferenceToType *polyRetType = isPolyRet( function );
-
-                        if ( polyRetType ) {
-                                ret = addPolyRetParam( appExpr, function, polyRetType, arg );
+                        ReferenceToType *dynRetType = isDynRet( function, exprTyVars );
+
+                        if ( dynRetType ) {
+                                ret = addDynRetParam( appExpr, function, dynRetType, arg );
                         } else if ( needsAdapter( function, scopeTyVars ) ) {
                                 // std::cerr << "needs adapter: ";
@@ -1290 +1293 @@
                         arg = appExpr->get_args().begin();
 
-                        passTypeVars( appExpr, polyRetType, arg, exprTyVars );
+                        passTypeVars( appExpr, dynRetType, arg, exprTyVars );
                         addInferredParams( appExpr, function, arg, exprTyVars );
 
@@ -1577 +1580 @@
 
                         // move polymorphic return type to parameter list
-                        if ( isPolyRet( funcType ) ) {
+                        if ( isDynRet( funcType ) ) {
                                 DeclarationWithType *ret = funcType->get_returnVals().front();
                                 ret->set_type( new PointerType( Type::Qualifiers(), ret->get_type() ) );

src/GenPoly/GenPoly.cc

@@ -23 +23 @@
 
 namespace GenPoly {
-        bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVars ) {
-                if ( ! adaptee->get_returnVals().empty() && isPolyType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) {
-                        return true;
-                } // if
-                for ( std::list< DeclarationWithType* >::const_iterator innerArg = adaptee->get_parameters().begin(); innerArg != adaptee->get_parameters().end(); ++innerArg ) {
-                        if ( isPolyType( (*innerArg)->get_type(), tyVars ) ) {
-                                return true;
-                        } // if
-                } // for
-                return false;
-        }
-
-        ReferenceToType *isPolyRet( FunctionType *function ) {
-                if ( ! function->get_returnVals().empty() ) {
-                        TyVarMap forallTypes( (TypeDecl::Kind)-1 );
-                        makeTyVarMap( function, forallTypes );
-                        return (ReferenceToType*)isPolyType( function->get_returnVals().front()->get_type(), forallTypes );
-                } // if
-                return 0;
-        }
-
         namespace {
                 /// Checks a parameter list for polymorphic parameters; will substitute according to env if present
@@ -64 +43 @@
                         return false;
                 }
+
+                /// Checks a parameter list for dynamic-layout parameters from tyVars; will substitute according to env if present
+                bool hasDynParams( std::list< Expression* >& params, const TyVarMap &tyVars, const TypeSubstitution *env ) {
+                        for ( std::list< Expression* >::iterator param = params.begin(); param != params.end(); ++param ) {
+                                TypeExpr *paramType = dynamic_cast< TypeExpr* >( *param );
+                                assert(paramType && "Aggregate parameters should be type expressions");
+                                if ( isDynType( paramType->get_type(), tyVars, env ) ) return true;
+                        }
+                        return false;
+                }
         }
 
@@ -101 +90 @@
                 }
                 return 0;
+        }
+
+        Type *isDynType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env ) {
+                type = replaceTypeInst( type, env );
+
+                if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) {
+                        auto var = tyVars.find( typeInst->get_name() );
+                        if ( var != tyVars.end() && var->second == TypeDecl::Any ) {
+                                return type;
+                        }
+                } else if ( StructInstType *structType = dynamic_cast< StructInstType* >( type ) ) {
+                        if ( hasDynParams( structType->get_parameters(), tyVars, env ) ) return type;
+                } else if ( UnionInstType *unionType = dynamic_cast< UnionInstType* >( type ) ) {
+                        if ( hasDynParams( unionType->get_parameters(), tyVars, env ) ) return type;
+                }
+                return 0;
+        }
+
+        ReferenceToType *isDynRet( FunctionType *function, const TyVarMap &forallTypes ) {
+                if ( function->get_returnVals().empty() ) return 0;
+                
+                return (ReferenceToType*)isDynType( function->get_returnVals().front()->get_type(), forallTypes );
+        }
+
+        ReferenceToType *isDynRet( FunctionType *function ) {
+                if ( function->get_returnVals().empty() ) return 0;
+
+                TyVarMap forallTypes( (TypeDecl::Kind)-1 );
+                makeTyVarMap( function, forallTypes );
+                return (ReferenceToType*)isDynType( function->get_returnVals().front()->get_type(), forallTypes );
+        }
+
+        bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVars ) {
+//              if ( ! adaptee->get_returnVals().empty() && isPolyType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) {
+//                      return true;
+//              } // if
+                if ( isDynRet( adaptee, tyVars ) ) return true;
+                
+                for ( std::list< DeclarationWithType* >::const_iterator innerArg = adaptee->get_parameters().begin(); innerArg != adaptee->get_parameters().end(); ++innerArg ) {
+//                      if ( isPolyType( (*innerArg)->get_type(), tyVars ) ) {
+                        if ( isDynType( (*innerArg)->get_type(), tyVars ) ) {
+                                return true;
+                        } // if
+                } // for
+                return false;
         }
 

src/GenPoly/GenPoly.h

@@ -31 +31 @@
 namespace GenPoly {
         typedef ErasableScopedMap< std::string, TypeDecl::Kind > TyVarMap;
-        
-        /// A function needs an adapter if it returns a polymorphic value or if any of its
-        /// parameters have polymorphic type
-        bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVarr );
-
-        /// true iff function has polymorphic return type
-        ReferenceToType *isPolyRet( FunctionType *function );
 
         /// Replaces a TypeInstType by its referrent in the environment, if applicable
@@ -47 +40 @@
         /// returns polymorphic type if is polymorphic type in tyVars, NULL otherwise; will look up substitution in env if provided
         Type *isPolyType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env = 0 );
+
+        /// returns dynamic-layout type if is dynamic-layout type in tyVars, NULL otherwise; will look up substitution in env if provided
+        Type *isDynType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env = 0 );
+
+        /// true iff function has dynamic-layout return type under the given type variable map
+        ReferenceToType *isDynRet( FunctionType *function, const TyVarMap &tyVars );
+
+        /// true iff function has dynamic-layout return type under the type variable map generated from its forall-parameters
+        ReferenceToType *isDynRet( FunctionType *function );
+
+        /// A function needs an adapter if it returns a dynamic-layout value or if any of its parameters have dynamic-layout type
+        bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVarr );
 
         /// returns polymorphic type if is pointer to polymorphic type, NULL otherwise; will look up substitution in env if provided

src/GenPoly/InstantiateGeneric.cc

@@ -24 +24 @@
 #include "GenPoly.h"
 #include "ScopedMap.h"
+#include "ScopedSet.h"
 
 #include "ResolvExpr/typeops.h"
@@ -122 +123 @@
                 }
         };
+
+        /// Possible options for a given specialization of a generic type
+        enum class genericType {
+                dtypeStatic,  ///< Concrete instantiation based solely on {d,f}type-to-void conversions
+                concrete,     ///< Concrete instantiation requiring at least one parameter type
+                dynamic       ///< No concrete instantiation
+        };
+
+        genericType& operator |= ( genericType& gt, const genericType& ht ) {
+                switch ( gt ) {
+                case genericType::dtypeStatic:
+                        gt = ht;
+                        break;
+                case genericType::concrete:
+                        if ( ht == genericType::dynamic ) { gt = genericType::dynamic; }
+                        break;
+                case genericType::dynamic:
+                        // nothing possible
+                        break;
+                }
+                return gt;
+        }
         
         /// Mutator pass that replaces concrete instantiations of generic types with actual struct declarations, scoped appropriately
@@ -127 +150 @@
                 /// Map of (generic type, parameter list) pairs to concrete type instantiations
                 InstantiationMap< AggregateDecl, AggregateDecl > instantiations;
+                /// Set of types which are dtype-only generic (and therefore have static layout)
+                ScopedSet< AggregateDecl* > dtypeStatics;
                 /// Namer for concrete types
                 UniqueName typeNamer;
 
         public:
-                GenericInstantiator() : DeclMutator(), instantiations(), typeNamer("_conc_") {}
+                GenericInstantiator() : DeclMutator(), instantiations(), dtypeStatics(), typeNamer("_conc_") {}
 
                 virtual Type* mutate( StructInstType *inst );
@@ -147 +172 @@
                 /// Wrap instantiation insertion for unions
                 void insert( UnionInstType *inst, const std::list< TypeExpr* > &typeSubs, UnionDecl *decl ) { instantiations.insert( inst->get_baseUnion(), typeSubs, decl ); }
+
+                /// Strips a dtype-static aggregate decl of its type parameters, marks it as stripped
+                void stripDtypeParams( AggregateDecl *base, std::list< TypeDecl* >& baseParams, const std::list< TypeExpr* >& typeSubs );
         };
 
@@ -154 +182 @@
         }
 
-        //////////////////////////////////////// GenericInstantiator //////////////////////////////////////////////////
-
-        /// Possible options for a given specialization of a generic type
-        enum class genericType {
-                dtypeStatic,  ///< Concrete instantiation based solely on {d,f}type-to-void conversions
-                concrete,     ///< Concrete instantiation requiring at least one parameter type
-                dynamic       ///< No concrete instantiation
-        };
-
-        genericType& operator |= ( genericType& gt, const genericType& ht ) {
-                switch ( gt ) {
-                case genericType::dtypeStatic:
-                        gt = ht;
-                        break;
-                case genericType::concrete:
-                        if ( ht == genericType::dynamic ) { gt = genericType::dynamic; }
-                        break;
-                case genericType::dynamic:
-                        // nothing possible
-                        break;
-                }
-                return gt;
-        }
-
-        /// Makes substitutions of params into baseParams; returns true if all parameters substituted for a concrete type
+        /// Makes substitutions of params into baseParams; returns dtypeStatic if there is a concrete instantiation based only on {d,f}type-to-void conversions,
+        /// concrete if there is a concrete instantiation requiring at least one parameter type, and dynamic if there is no concrete instantiation
         genericType makeSubstitutions( const std::list< TypeDecl* >& baseParams, const std::list< Expression* >& params, std::list< TypeExpr* >& out ) {
                 genericType gt = genericType::dtypeStatic;
@@ -223 +228 @@
         }
 
+        /// Substitutes types of members according to baseParams => typeSubs, working in-place
+        void substituteMembers( std::list< Declaration* >& members, const std::list< TypeDecl* >& baseParams, const std::list< TypeExpr* >& typeSubs ) {
+                // substitute types into new members
+                TypeSubstitution subs( baseParams.begin(), baseParams.end(), typeSubs.begin() );
+                for ( std::list< Declaration* >::iterator member = members.begin(); member != members.end(); ++member ) {
+                        subs.apply(*member);
+                }
+        }
+
+        /// Strips the instances's type parameters
+        void stripInstParams( ReferenceToType *inst ) {
+                deleteAll( inst->get_parameters() );
+                inst->get_parameters().clear();
+        }
+        
+        void GenericInstantiator::stripDtypeParams( AggregateDecl *base, std::list< TypeDecl* >& baseParams, const std::list< TypeExpr* >& typeSubs ) {
+                substituteMembers( base->get_members(), baseParams, typeSubs );
+
+                deleteAll( baseParams );
+                baseParams.clear();
+                
+                dtypeStatics.insert( base );
+        }
+
         Type* GenericInstantiator::mutate( StructInstType *inst ) {
                 // mutate subtypes
@@ -231 +260 @@
                 // exit early if no need for further mutation
                 if ( inst->get_parameters().empty() ) return inst;
+
+                // check for an already-instantiatiated dtype-static type
+                if ( dtypeStatics.find( inst->get_baseStruct() ) != dtypeStatics.end() ) {
+                        stripInstParams( inst );
+                        return inst;
+                }
+                
+                // check if type can be concretely instantiated; put substitutions into typeSubs
                 assert( inst->get_baseParameters() && "Base struct has parameters" );
-
-                // check if type can be concretely instantiated; put substitutions into typeSubs
                 std::list< TypeExpr* > typeSubs;
                 genericType gt = makeSubstitutions( *inst->get_baseParameters(), inst->get_parameters(), typeSubs );
                 switch ( gt ) {
-                case genericType::dtypeStatic: // TODO strip params off original decl and reuse here
-                case genericType::concrete:
-                {
+                case genericType::dtypeStatic:
+                        stripDtypeParams( inst->get_baseStruct(), *inst->get_baseParameters(), typeSubs );
+                        stripInstParams( inst );
+                        break;
+                
+                case genericType::concrete: {
                         // make concrete instantiation of generic type
                         StructDecl *concDecl = lookup( inst, typeSubs );
@@ -274 +312 @@
                 // exit early if no need for further mutation
                 if ( inst->get_parameters().empty() ) return inst;
+
+                // check for an already-instantiatiated dtype-static type
+                if ( dtypeStatics.find( inst->get_baseUnion() ) != dtypeStatics.end() ) {
+                        stripInstParams( inst );
+                        return inst;
+                }
+
+                // check if type can be concretely instantiated; put substitutions into typeSubs
                 assert( inst->get_baseParameters() && "Base union has parameters" );
-
-                // check if type can be concretely instantiated; put substitutions into typeSubs
                 std::list< TypeExpr* > typeSubs;
                 genericType gt = makeSubstitutions( *inst->get_baseParameters(), inst->get_parameters(), typeSubs );
                 switch ( gt ) {
-                case genericType::dtypeStatic:  // TODO strip params off original decls and reuse here
+                case genericType::dtypeStatic:
+                        stripDtypeParams( inst->get_baseUnion(), *inst->get_baseParameters(), typeSubs );
+                        stripInstParams( inst );
+                        break;
+                        
                 case genericType::concrete:
                 {
@@ -311 +359 @@
                 DeclMutator::doBeginScope();
                 instantiations.beginScope();
+                dtypeStatics.beginScope();
         }
 
@@ -316 +365 @@
                 DeclMutator::doEndScope();
                 instantiations.endScope();
+                dtypeStatics.endScope();
         }
 

src/GenPoly/ScrubTyVars.cc

@@ -45 +45 @@
 
         Type * ScrubTyVars::mutateAggregateType( Type *ty ) {
-                if ( isPolyType( ty, tyVars ) ) {
+                if ( shouldScrub( ty ) ) {
                         PointerType *ret = new PointerType( Type::Qualifiers(), new VoidType( ty->get_qualifiers() ) );
                         delete ty;
@@ -63 +63 @@
         Expression * ScrubTyVars::mutate( SizeofExpr *szeof ) {
                 // sizeof( T ) => _sizeof_T parameter, which is the size of T
-                if ( Type *polyType = isPolyType( szeof->get_type() ) ) {
-                        Expression *expr = new NameExpr( sizeofName( mangleType( polyType ) ) );
+                if ( Type *dynType = shouldScrub( szeof->get_type() ) ) {
+                        Expression *expr = new NameExpr( sizeofName( mangleType( dynType ) ) );
                         return expr;
                 } else {
@@ -73 +73 @@
         Expression * ScrubTyVars::mutate( AlignofExpr *algnof ) {
                 // alignof( T ) => _alignof_T parameter, which is the alignment of T
-                if ( Type *polyType = isPolyType( algnof->get_type() ) ) {
-                        Expression *expr = new NameExpr( alignofName( mangleType( polyType ) ) );
+                if ( Type *dynType = shouldScrub( algnof->get_type() ) ) {
+                        Expression *expr = new NameExpr( alignofName( mangleType( dynType ) ) );
                         return expr;
                 } else {
@@ -82 +82 @@
 
         Type * ScrubTyVars::mutate( PointerType *pointer ) {
-                if ( Type *polyType = isPolyType( pointer->get_base(), tyVars ) ) {
-                        Type *ret = polyType->acceptMutator( *this );
+//              // special case of shouldScrub that takes all TypeInstType pointer bases, even if they're not dynamic
+//              Type *base = pointer->get_base();
+//              Type *dynType = 0;
+//              if ( dynamicOnly ) {
+//                      if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( base ) ) {
+//                              if ( tyVars.find( typeInst->get_name() ) != tyVars.end() ) { dynType = typeInst; }
+//                      } else {
+//                              dynType = isDynType( base, tyVars );
+//                      }
+//              } else {
+//                      dynType = isPolyType( base, tyVars );
+//              }
+//              if ( dynType ) {
+                if ( Type *dynType = shouldScrub( pointer->get_base() ) ) {
+                        Type *ret = dynType->acceptMutator( *this );
                         ret->get_qualifiers() += pointer->get_qualifiers();
                         pointer->set_base( 0 );

src/GenPoly/ScrubTyVars.h

@@ -27 +27 @@
         class ScrubTyVars : public Mutator {
           public:
-                ScrubTyVars( const TyVarMap &tyVars ): tyVars( tyVars ) {}
+                ScrubTyVars( const TyVarMap &tyVars, bool dynamicOnly = false ): tyVars( tyVars ), dynamicOnly( dynamicOnly ) {}
 
                 /// For all polymorphic types with type variables in `tyVars`, replaces generic types, dtypes, and ftypes with the appropriate void type,
@@ -33 +33 @@
                 template< typename SynTreeClass >
                 static SynTreeClass *scrub( SynTreeClass *target, const TyVarMap &tyVars );
+
+                /// For all dynamic-layout types with type variables in `tyVars`, replaces generic types, dtypes, and ftypes with the appropriate void type,
+                /// and sizeof/alignof expressions with the proper variable
+                template< typename SynTreeClass >
+                static SynTreeClass *scrubDynamic( SynTreeClass *target, const TyVarMap &tyVars );
 
                 virtual Type* mutate( TypeInstType *typeInst );
@@ -42 +47 @@
 
           private:
+                /// Returns the type if it should be scrubbed, NULL otherwise.
+                Type* shouldScrub( Type *ty ) {
+                        return dynamicOnly ? isDynType( ty, tyVars ) : isPolyType( ty, tyVars );
+//                      if ( ! dynamicOnly ) return isPolyType( ty, tyVars );
+// 
+//                      if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( ty ) ) {
+//                              return tyVars.find( typeInst->get_name() ) != tyVars.end() ? ty : 0;
+//                      }
+// 
+//                      return isDynType( ty, tyVars );
+                }
+                
                 /// Mutates (possibly generic) aggregate types appropriately
                 Type* mutateAggregateType( Type *ty );
                 
-                const TyVarMap &tyVars;
+                const TyVarMap &tyVars;  ///< Type variables to scrub
+                bool dynamicOnly;        ///< only scrub the types with dynamic layout? [false]
         };
 
-        /* static class method */
         template< typename SynTreeClass >
         SynTreeClass * ScrubTyVars::scrub( SynTreeClass *target, const TyVarMap &tyVars ) {
                 ScrubTyVars scrubber( tyVars );
+                return static_cast< SynTreeClass * >( target->acceptMutator( scrubber ) );
+        }
+
+        template< typename SynTreeClass >
+        SynTreeClass * ScrubTyVars::scrubDynamic( SynTreeClass *target, const TyVarMap &tyVars ) {
+                ScrubTyVars scrubber( tyVars, true );
                 return static_cast< SynTreeClass * >( target->acceptMutator( scrubber ) );
         }

src/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:51:46 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Fri Jul  8 12:22:25 2016
-## Update Count     : 60
+## Last Modified On : Thu Aug 18 17:47:06 2016
+## Update Count     : 70
 ###############################################################################
 
@@ -42 +42 @@
 cfa_cpplib_PROGRAMS = driver/cfa-cpp
 driver_cfa_cpp_SOURCES = ${SRC}
-driver_cfa_cpp_LDADD = ${LEXLIB}        # yywrap
-# need files Common/utility.h
-driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL
-
-AM_CXXFLAGS = -g -std=c++11
+driver_cfa_cpp_LDADD = ${LEXLIB}                        # yywrap
+driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -I${abs_top_srcdir}/src/include
 
 MAINTAINERCLEANFILES += ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}

src/Makefile.in

@@ -105 +105 @@
         Common/driver_cfa_cpp-SemanticError.$(OBJEXT) \
         Common/driver_cfa_cpp-UniqueName.$(OBJEXT) \
+        Common/driver_cfa_cpp-Assert.$(OBJEXT) \
         ControlStruct/driver_cfa_cpp-LabelGenerator.$(OBJEXT) \
         ControlStruct/driver_cfa_cpp-LabelFixer.$(OBJEXT) \
@@ -137 +138 @@
         Parser/driver_cfa_cpp-LinkageSpec.$(OBJEXT) \
         Parser/driver_cfa_cpp-parseutility.$(OBJEXT) \
-        Parser/driver_cfa_cpp-Parser.$(OBJEXT) \
         ResolvExpr/driver_cfa_cpp-AlternativeFinder.$(OBJEXT) \
         ResolvExpr/driver_cfa_cpp-Alternative.$(OBJEXT) \
@@ -370 +370 @@
         CodeGen/CodeGenerator.cc CodeGen/GenType.cc \
         CodeGen/FixNames.cc CodeGen/OperatorTable.cc \
-        Common/SemanticError.cc Common/UniqueName.cc \
+        Common/SemanticError.cc Common/UniqueName.cc Common/Assert.cc \
         ControlStruct/LabelGenerator.cc ControlStruct/LabelFixer.cc \
         ControlStruct/MLEMutator.cc ControlStruct/Mutate.cc \
@@ -385 +385 @@
         Parser/ExpressionNode.cc Parser/StatementNode.cc \
         Parser/InitializerNode.cc Parser/TypeData.cc \
-        Parser/LinkageSpec.cc Parser/parseutility.cc Parser/Parser.cc \
+        Parser/LinkageSpec.cc Parser/parseutility.cc \
         ResolvExpr/AlternativeFinder.cc ResolvExpr/Alternative.cc \
         ResolvExpr/Unify.cc ResolvExpr/PtrsAssignable.cc \
@@ -426 +426 @@
 cfa_cpplibdir = ${libdir}
 driver_cfa_cpp_SOURCES = ${SRC}
-driver_cfa_cpp_LDADD = ${LEXLIB}        # yywrap
-# need files Common/utility.h
-driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL
-AM_CXXFLAGS = -g -std=c++11
+driver_cfa_cpp_LDADD = ${LEXLIB}                        # yywrap
+driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -I${abs_top_srcdir}/src/include
 all: $(BUILT_SOURCES)
         $(MAKE) $(AM_MAKEFLAGS) all-am
@@ -528 +526 @@
         Common/$(DEPDIR)/$(am__dirstamp)
 Common/driver_cfa_cpp-UniqueName.$(OBJEXT): Common/$(am__dirstamp) \
+        Common/$(DEPDIR)/$(am__dirstamp)
+Common/driver_cfa_cpp-Assert.$(OBJEXT): Common/$(am__dirstamp) \
         Common/$(DEPDIR)/$(am__dirstamp)
 ControlStruct/$(am__dirstamp):
@@ -632 +632 @@
         Parser/$(DEPDIR)/$(am__dirstamp)
 Parser/driver_cfa_cpp-parseutility.$(OBJEXT): Parser/$(am__dirstamp) \
-        Parser/$(DEPDIR)/$(am__dirstamp)
-Parser/driver_cfa_cpp-Parser.$(OBJEXT): Parser/$(am__dirstamp) \
         Parser/$(DEPDIR)/$(am__dirstamp)
 ResolvExpr/$(am__dirstamp):
@@ -817 +815 @@
         -rm -f CodeGen/driver_cfa_cpp-Generate.$(OBJEXT)
         -rm -f CodeGen/driver_cfa_cpp-OperatorTable.$(OBJEXT)
+        -rm -f Common/driver_cfa_cpp-Assert.$(OBJEXT)
         -rm -f Common/driver_cfa_cpp-SemanticError.$(OBJEXT)
         -rm -f Common/driver_cfa_cpp-UniqueName.$(OBJEXT)
@@ -845 +844 @@
         -rm -f Parser/driver_cfa_cpp-LinkageSpec.$(OBJEXT)
         -rm -f Parser/driver_cfa_cpp-ParseNode.$(OBJEXT)
-        -rm -f Parser/driver_cfa_cpp-Parser.$(OBJEXT)
         -rm -f Parser/driver_cfa_cpp-StatementNode.$(OBJEXT)
         -rm -f Parser/driver_cfa_cpp-TypeData.$(OBJEXT)
@@ -927 +925 @@
 @AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/driver_cfa_cpp-Generate.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/driver_cfa_cpp-OperatorTable.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-Assert.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-SemanticError.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-UniqueName.Po@am__quote@
@@ -955 +954 @@
 @AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-LinkageSpec.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-ParseNode.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-Parser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-StatementNode.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Parser/$(DEPDIR)/driver_cfa_cpp-TypeData.Po@am__quote@
@@ -1169 +1167 @@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Common/driver_cfa_cpp-UniqueName.obj `if test -f 'Common/UniqueName.cc'; then $(CYGPATH_W) 'Common/UniqueName.cc'; else $(CYGPATH_W) '$(srcdir)/Common/UniqueName.cc'; fi`
 
+Common/driver_cfa_cpp-Assert.o: Common/Assert.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Common/driver_cfa_cpp-Assert.o -MD -MP -MF Common/$(DEPDIR)/driver_cfa_cpp-Assert.Tpo -c -o Common/driver_cfa_cpp-Assert.o `test -f 'Common/Assert.cc' || echo '$(srcdir)/'`Common/Assert.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Common/$(DEPDIR)/driver_cfa_cpp-Assert.Tpo Common/$(DEPDIR)/driver_cfa_cpp-Assert.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Common/Assert.cc' object='Common/driver_cfa_cpp-Assert.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 Common/driver_cfa_cpp-Assert.o `test -f 'Common/Assert.cc' || echo '$(srcdir)/'`Common/Assert.cc
+
+Common/driver_cfa_cpp-Assert.obj: Common/Assert.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Common/driver_cfa_cpp-Assert.obj -MD -MP -MF Common/$(DEPDIR)/driver_cfa_cpp-Assert.Tpo -c -o Common/driver_cfa_cpp-Assert.obj `if test -f 'Common/Assert.cc'; then $(CYGPATH_W) 'Common/Assert.cc'; else $(CYGPATH_W) '$(srcdir)/Common/Assert.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Common/$(DEPDIR)/driver_cfa_cpp-Assert.Tpo Common/$(DEPDIR)/driver_cfa_cpp-Assert.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Common/Assert.cc' object='Common/driver_cfa_cpp-Assert.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 Common/driver_cfa_cpp-Assert.obj `if test -f 'Common/Assert.cc'; then $(CYGPATH_W) 'Common/Assert.cc'; else $(CYGPATH_W) '$(srcdir)/Common/Assert.cc'; fi`
+
 ControlStruct/driver_cfa_cpp-LabelGenerator.o: ControlStruct/LabelGenerator.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-LabelGenerator.o -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelGenerator.Tpo -c -o ControlStruct/driver_cfa_cpp-LabelGenerator.o `test -f 'ControlStruct/LabelGenerator.cc' || echo '$(srcdir)/'`ControlStruct/LabelGenerator.cc
@@ -1616 +1628 @@
 @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 Parser/driver_cfa_cpp-parseutility.obj `if test -f 'Parser/parseutility.cc'; then $(CYGPATH_W) 'Parser/parseutility.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/parseutility.cc'; fi`
-
-Parser/driver_cfa_cpp-Parser.o: Parser/Parser.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-Parser.o -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-Parser.Tpo -c -o Parser/driver_cfa_cpp-Parser.o `test -f 'Parser/Parser.cc' || echo '$(srcdir)/'`Parser/Parser.cc
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-Parser.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-Parser.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/Parser.cc' object='Parser/driver_cfa_cpp-Parser.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 Parser/driver_cfa_cpp-Parser.o `test -f 'Parser/Parser.cc' || echo '$(srcdir)/'`Parser/Parser.cc
-
-Parser/driver_cfa_cpp-Parser.obj: Parser/Parser.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Parser/driver_cfa_cpp-Parser.obj -MD -MP -MF Parser/$(DEPDIR)/driver_cfa_cpp-Parser.Tpo -c -o Parser/driver_cfa_cpp-Parser.obj `if test -f 'Parser/Parser.cc'; then $(CYGPATH_W) 'Parser/Parser.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/Parser.cc'; fi`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Parser/$(DEPDIR)/driver_cfa_cpp-Parser.Tpo Parser/$(DEPDIR)/driver_cfa_cpp-Parser.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Parser/Parser.cc' object='Parser/driver_cfa_cpp-Parser.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 Parser/driver_cfa_cpp-Parser.obj `if test -f 'Parser/Parser.cc'; then $(CYGPATH_W) 'Parser/Parser.cc'; else $(CYGPATH_W) '$(srcdir)/Parser/Parser.cc'; fi`
 
 ResolvExpr/driver_cfa_cpp-AlternativeFinder.o: ResolvExpr/AlternativeFinder.cc

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Aug  7 08:01:55 2016
-// Update Count     : 165
+// Last Modified On : Thu Aug 18 23:48:23 2016
+// Update Count     : 182
 //
 
@@ -25 +25 @@
 #include "SynTree/Expression.h"
 
-#include "Parser.h"
 #include "TypedefTable.h"
 extern TypedefTable typedefTable;
@@ -42 +41 @@
 UniqueName DeclarationNode::anonymous( "__anonymous" );
 
-extern LinkageSpec::Type linkage;                                               // defined in parser.yy
+extern LinkageSpec::Spec linkage;                                               // defined in parser.yy
 
 DeclarationNode *DeclarationNode::clone() const {
@@ -48 +47 @@
         newnode->type = maybeClone( type );
         newnode->name = name;
-        newnode->storageClasses = storageClasses;
-//PAB   newnode->bitfieldWidth = maybeClone( bitfieldWidth );
+        newnode->storageClass = storageClass;
+        newnode->isInline = isInline;
+        newnode->isNoreturn = isNoreturn;
         newnode->bitfieldWidth = bitfieldWidth;
         newnode->hasEllipsis = hasEllipsis;
         newnode->initializer = initializer;
-        newnode->next = maybeClone( next );
+        newnode->set_next( maybeClone( get_next() ) );
         newnode->linkage = linkage;
         return newnode;
 } // DeclarationNode::clone
 
-DeclarationNode::DeclarationNode() : type( 0 ), bitfieldWidth( 0 ), initializer( 0 ), hasEllipsis( false ), linkage( ::linkage ) {
+DeclarationNode::DeclarationNode()
+        : type( 0 )
+        , storageClass( NoStorageClass )
+        , isInline( false )
+        , isNoreturn( false )
+        , bitfieldWidth( 0 )
+        , initializer( 0 )
+        , hasEllipsis( false )
+        , linkage( ::linkage )
+        , extension( false )
+        , error() {
 }
 
@@ -83 +93 @@
         } // if
 
-        printEnums( storageClasses.begin(), storageClasses.end(), DeclarationNode::storageName, os );
+        if(storageClass != NoStorageClass) os << DeclarationNode::storageName[storageClass] << ' ';
+        if(isInline) os << DeclarationNode::storageName[Inline] << ' ';
+        if(isNoreturn) os << DeclarationNode::storageName[Noreturn] << ' ';
         if ( type ) {
                 type->print( os, indent );
@@ -144 +156 @@
 DeclarationNode *DeclarationNode::newStorageClass( DeclarationNode::StorageClass sc ) {
         DeclarationNode *newnode = new DeclarationNode;
-        newnode->storageClasses.push_back( sc );
+        switch (sc) {
+                case Inline: newnode->isInline = true; break;
+                case Noreturn: newnode->isNoreturn = true; break;
+                default: newnode->storageClass = sc; break;
+        }
         return newnode;
 } // DeclarationNode::newStorageClass
@@ -284 +300 @@
         newnode->type->array->dimension = size;
         newnode->type->array->isStatic = isStatic;
-        if ( newnode->type->array->dimension == 0 || dynamic_cast<ConstantNode *>( newnode->type->array->dimension ) ) {
+        if ( newnode->type->array->dimension == 0 || newnode->type->array->dimension->isExpressionType<ConstantExpr *>() ) {
                 newnode->type->array->isVarLen = false;
         } else {
@@ -360 +376 @@
 DeclarationNode *DeclarationNode::addQualifiers( DeclarationNode *q ) {
         if ( q ) {
-                storageClasses.splice( storageClasses.end(), q->storageClasses );
+                copyStorageClasses(q);
                 if ( q->type ) {
                         if ( ! type ) {
@@ -387 +403 @@
 
 DeclarationNode *DeclarationNode::copyStorageClasses( DeclarationNode *q ) {
-        storageClasses = q->storageClasses;
+        isInline = isInline || q->isInline;
+        isNoreturn = isNoreturn || q->isNoreturn;
+        if(storageClass == NoStorageClass) {
+                storageClass = q->storageClass;
+        }
+        else if (q->storageClass != NoStorageClass) {
+                q->error = "invalid combination of storage classes in declaration of ";
+        }
+        if(error.empty()) error = q->error;
         return this;
 }
@@ -447 +471 @@
 DeclarationNode *DeclarationNode::addType( DeclarationNode *o ) {
         if ( o ) {
-                storageClasses.splice( storageClasses.end(), o->storageClasses );
+                copyStorageClasses( o );
                 if ( o->type ) {
                         if ( ! type ) {
@@ -470 +494 @@
 
                 // there may be typedefs chained onto the type
-                if ( o->get_link() ) {
-                        set_link( o->get_link()->clone() );
+                if ( o->get_next() ) {
+                        set_last( o->get_next()->clone() );
                 } // if
         } // if
@@ -694 +718 @@
         } // if
         newnode->type->forall = maybeClone( type->forall );
-        newnode->storageClasses = storageClasses;
+        newnode->copyStorageClasses( this );
         newnode->name = assign_strptr( newName );
         return newnode;
@@ -701 +725 @@
 DeclarationNode *DeclarationNode::cloneBaseType( DeclarationNode *o ) {
         if ( o ) {
-                o->storageClasses.insert( o->storageClasses.end(), storageClasses.begin(), storageClasses.end() );
+                o->copyStorageClasses( this );
                 if ( type ) {
                         TypeData *srcType = type;
@@ -734 +758 @@
         DeclarationNode *newnode = new DeclarationNode;
         newnode->type = maybeClone( type );
-        newnode->storageClasses = storageClasses;
+        newnode->copyStorageClasses( this );
         newnode->name = assign_strptr( newName );
         return newnode;
@@ -741 +765 @@
 DeclarationNode *DeclarationNode::cloneType( DeclarationNode *o ) {
         if ( o ) {
-                o->storageClasses.insert( o->storageClasses.end(), storageClasses.begin(), storageClasses.end() );
+                o->copyStorageClasses( this );
                 if ( type ) {
                         TypeData *newType = type->clone();
@@ -755 +779 @@
 }
 
-DeclarationNode *DeclarationNode::appendList( DeclarationNode *node ) {
-        if ( node != 0 ) {
-                set_link( node );
-        } // if
-        return this;
-}
-
 DeclarationNode *DeclarationNode::extractAggregate() const {
         if ( type ) {
@@ -776 +793 @@
 void buildList( const DeclarationNode *firstNode, std::list< Declaration * > &outputList ) {
         SemanticError errors;
-        std::back_insert_iterator< std::list< Declaration *> > out( outputList );
+        std::back_insert_iterator< std::list< Declaration * > > out( outputList );
         const DeclarationNode *cur = firstNode;
         while ( cur ) {
@@ -794 +811 @@
                         errors.append( e );
                 } // try
-                cur = dynamic_cast<DeclarationNode *>( cur->get_link() );
+                cur = dynamic_cast< DeclarationNode * >( cur->get_next() );
         } // while
         if ( ! errors.isEmpty() ) {
@@ -801 +818 @@
 }
 
-void buildList( const DeclarationNode *firstNode, std::list< DeclarationWithType *> &outputList ) {
+void buildList( const DeclarationNode *firstNode, std::list< DeclarationWithType * > &outputList ) {
         SemanticError errors;
-        std::back_insert_iterator< std::list< DeclarationWithType *> > out( outputList );
+        std::back_insert_iterator< std::list< DeclarationWithType * > > out( outputList );
         const DeclarationNode *cur = firstNode;
         while ( cur ) {
@@ -817 +834 @@
                         Declaration *decl = cur->build();
                         if ( decl ) {
-                                if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType *>( decl ) ) {
+                                if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
                                         *out++ = dwt;
-                                } else if ( StructDecl *agg = dynamic_cast< StructDecl *>( decl ) ) {
+                                } else if ( StructDecl *agg = dynamic_cast< StructDecl * >( decl ) ) {
                                         StructInstType *inst = new StructInstType( Type::Qualifiers(), agg->get_name() );
                                         *out++ = new ObjectDecl( "", DeclarationNode::NoStorageClass, linkage, 0, inst, 0 );
                                         delete agg;
-                                } else if ( UnionDecl *agg = dynamic_cast< UnionDecl *>( decl ) ) {
+                                } else if ( UnionDecl *agg = dynamic_cast< UnionDecl * >( decl ) ) {
                                         UnionInstType *inst = new UnionInstType( Type::Qualifiers(), agg->get_name() );
                                         *out++ = new ObjectDecl( "", DeclarationNode::NoStorageClass, linkage, 0, inst, 0 );
@@ -831 +848 @@
                         errors.append( e );
                 } // try
-                cur = dynamic_cast< DeclarationNode *>( cur->get_link() );
+                cur = dynamic_cast< DeclarationNode * >( cur->get_next() );
         } // while
         if ( ! errors.isEmpty() ) {
@@ -838 +855 @@
 }
 
-void buildTypeList( const DeclarationNode *firstNode, std::list< Type *> &outputList ) {
+void buildTypeList( const DeclarationNode *firstNode, std::list< Type * > &outputList ) {
         SemanticError errors;
-        std::back_insert_iterator< std::list< Type *> > out( outputList );
+        std::back_insert_iterator< std::list< Type * > > out( outputList );
         const DeclarationNode *cur = firstNode;
         while ( cur ) {
@@ -848 +865 @@
                         errors.append( e );
                 } // try
-                cur = dynamic_cast< DeclarationNode *>( cur->get_link() );
+                cur = dynamic_cast< DeclarationNode * >( cur->get_next() );
         } // while
         if ( ! errors.isEmpty() ) {
@@ -856 +873 @@
 
 Declaration *DeclarationNode::build() const {
+        if( !error.empty() ) throw SemanticError( error, this );
         if ( type ) {
-                return type->buildDecl( name, buildStorageClass(), maybeBuild< Expression >( bitfieldWidth ), buildFuncSpecifier( Inline ), buildFuncSpecifier( Noreturn ), linkage, maybeBuild< Initializer >(initializer) )->set_extension( extension );
-        } // if
-        if ( ! buildFuncSpecifier( Inline ) && ! buildFuncSpecifier( Noreturn ) ) {
-                return (new ObjectDecl( name, buildStorageClass(), linkage, maybeBuild< Expression >( bitfieldWidth ), 0, maybeBuild< Initializer >( initializer ) ))->set_extension( extension );
+                return type->buildDecl( name, storageClass, maybeBuild< Expression >( bitfieldWidth ), isInline, isNoreturn, linkage, maybeBuild< Initializer >(initializer) )->set_extension( extension );
+        } // if
+        if ( ! isInline && ! isNoreturn ) {
+                return (new ObjectDecl( name, storageClass, linkage, maybeBuild< Expression >( bitfieldWidth ), 0, maybeBuild< Initializer >( initializer ) ))->set_extension( extension );
         } // if
         throw SemanticError( "invalid function specifier in declaration of ", this );
@@ -899 +917 @@
 }
 
-DeclarationNode::StorageClass DeclarationNode::buildStorageClass() const {
-        DeclarationNode::StorageClass ret = DeclarationNode::NoStorageClass;
-        for ( std::list< DeclarationNode::StorageClass >::const_iterator i = storageClasses.begin(); i != storageClasses.end(); ++i ) {
-          if ( *i == DeclarationNode::Inline || *i == DeclarationNode::Noreturn ) continue; // ignore function specifiers
-          if ( ret != DeclarationNode::NoStorageClass ) {       // already have a valid storage class ?
-                        throw SemanticError( "invalid combination of storage classes in declaration of ", this );
-                } // if
-                ret = *i;
-        } // for
-        return ret;
-}
-
-bool DeclarationNode::buildFuncSpecifier( DeclarationNode::StorageClass key ) const {
-        std::list< DeclarationNode::StorageClass >::const_iterator first = std::find( storageClasses.begin(), storageClasses.end(), key );
-  if ( first == storageClasses.end() ) return false;    // not found
-        first = std::find( ++first, storageClasses.end(), key ); // found
-  if ( first == storageClasses.end() ) return true;             // not found again
-        throw SemanticError( "duplicate function specifier in declaration of ", this );
-}
+// DeclarationNode::StorageClass DeclarationNode::buildStorageClass() const {
+//      DeclarationNode::StorageClass ret = DeclarationNode::NoStorageClass;
+//      for ( std::list< DeclarationNode::StorageClass >::const_iterator i = storageClasses.begin(); i != storageClasses.end(); ++i ) {
+//        if ( *i == DeclarationNode::Inline || *i == DeclarationNode::Noreturn ) continue; // ignore function specifiers
+//        if ( ret != DeclarationNode::NoStorageClass ) {       // already have a valid storage class ?
+//                      throw SemanticError( "invalid combination of storage classes in declaration of ", this );
+//              } // if
+//              ret = *i;
+//      } // for
+//      return ret;
+// }
+
+// bool DeclarationNode::buildFuncSpecifier( DeclarationNode::StorageClass key ) const {
+//      std::list< DeclarationNode::StorageClass >::const_iterator first = std::find( storageClasses.begin(), storageClasses.end(), key );
+//   if ( first == storageClasses.end() ) return false; // not found
+//      first = std::find( ++first, storageClasses.end(), key ); // found
+//   if ( first == storageClasses.end() ) return true;          // not found again
+//      throw SemanticError( "duplicate function specifier in declaration of ", this );
+// }
 
 // Local Variables: //

src/Parser/ExpressionNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Aug  7 09:23:12 2016
-// Update Count     : 437
+// Last Modified On : Tue Aug 16 00:09:20 2016
+// Update Count     : 495
 //
 
@@ -32 +32 @@
 using namespace std;
 
-ExpressionNode::ExpressionNode() : ParseNode() {}
-
-ExpressionNode::ExpressionNode( const string *name ) : ParseNode( name ) {}
-
-ExpressionNode::ExpressionNode( const ExpressionNode &other ) : ParseNode( other.name ), extension( other.extension ) {
-        if ( other.argName ) {
-                std::cout << "ExpressionNode" << std::endl;
-                argName = other.argName->clone();
-        } else {
-                argName = 0;
-        } // if
-}
-
-ExpressionNode * ExpressionNode::set_argName( const std::string *aName ) {
-        argName = new VarRefNode( aName );
-        return this;
-}
-
-ExpressionNode * ExpressionNode::set_argName( ExpressionNode *aDesignator ) {
-        argName = aDesignator;
-        return this;
-}
-
-void ExpressionNode::printDesignation( std::ostream &os, int indent ) const {
-        if ( argName ) {
-                os << string( indent, ' ' ) << "(designated by:  ";
-                argName->printOneLine( os, indent );
-                os << ")" << std::endl;
-        } // if
-}
-
-//##############################################################################
-
-NullExprNode::NullExprNode() {}
-
-NullExprNode *NullExprNode::clone() const {
-        return new NullExprNode();
-}
-
-void NullExprNode::print( std::ostream & os, int indent ) const {
-        printDesignation( os );
-        os << "null expression";
-}
-
-void NullExprNode::printOneLine( std::ostream & os, int indent ) const {
-        printDesignation( os );
-        os << "null";
-}
-
-Expression *NullExprNode::build() const {
-        return 0;
-}
+ExpressionNode::ExpressionNode( const ExpressionNode &other ) : ParseNode( other.get_name() ), extension( other.extension ) {}
 
 //##############################################################################
@@ -108 +57 @@
 static inline bool checkX( char c ) { return c == 'x' || c == 'X'; }
 
-ConstantNode *build_constantInteger( std::string & str ) {
+Expression *build_constantInteger( const std::string & str ) {
         static const BasicType::Kind kind[2][3] = {
                 { BasicType::SignedInt, BasicType::LongSignedInt, BasicType::LongLongSignedInt },
@@ -171 +120 @@
         } // if
 
-        return new ConstantNode( new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[Unsigned][size] ), str ) ) );
+        return new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[Unsigned][size] ), str ) );
 } // build_constantInteger
 
-ConstantNode *build_constantFloat( std::string & str ) {
+Expression *build_constantFloat( const std::string & str ) {
         static const BasicType::Kind kind[2][3] = {
                 { BasicType::Float, BasicType::Double, BasicType::LongDouble },
@@ -201 +150 @@
         } // if
 
-        return new ConstantNode( new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[complx][size] ), str ) ) );
+        return new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[complx][size] ), str ) );
 } // build_constantFloat
 
-ConstantNode *build_constantChar( std::string & str ) {
-        return new ConstantNode( new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::Char ), str ) ) );
+Expression *build_constantChar( const std::string & str ) {
+        return new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::Char ), str ) );
 } // build_constantChar
 
-ConstantNode *build_constantStr( std::string & str ) {
+ConstantExpr *build_constantStr( const std::string & str ) {
         // string should probably be a primitive type
         ArrayType *at = new ArrayType( emptyQualifiers, new BasicType( emptyQualifiers, BasicType::Char ),
@@ -214 +163 @@
                                                                                         toString( str.size()+1-2 ) ) ),  // +1 for '\0' and -2 for '"'
                                                                    false, false );
-        return new ConstantNode( new ConstantExpr( Constant( at, str ) ) );
+        return new ConstantExpr( Constant( at, str ) );
 } // build_constantStr
 
-//##############################################################################
-
-//Expression *build_varref( ExpressionNode expr ) {
-//      return new NameExpr( get_name(), maybeBuild<Expression>( get_argName() ) );
-//}
-
-VarRefNode::VarRefNode( const string *name, bool labelp ) : ExpressionNode( name ), isLabel( labelp ) {}
-
-VarRefNode::VarRefNode( const VarRefNode &other ) : ExpressionNode( other ), isLabel( other.isLabel ) {
-}
-
-Expression *VarRefNode::build() const {
-        return new NameExpr( get_name(), maybeBuild< Expression >( get_argName() ) );
-}
-
-void VarRefNode::printOneLine( std::ostream &os, int indent ) const {
-        printDesignation( os );
-        os << get_name() << ' ';
-}
-
-void VarRefNode::print( std::ostream &os, int indent ) const {
-        printDesignation( os );
-        os << string( indent, ' ' ) << "Referencing: ";
-        os << "Variable: " << get_name();
-        os << endl;
-}
-
-//##############################################################################
-
-DesignatorNode::DesignatorNode( ExpressionNode *expr, bool isArrayIndex ) : isArrayIndex( isArrayIndex ) {
-        set_argName( expr );
-        assert( get_argName() );
-
-        if ( ! isArrayIndex ) {
-                if ( VarRefNode * var = dynamic_cast< VarRefNode * >( expr ) ) {
-
-                        stringstream ss( var->get_name() );
-                        double value;
-                        if ( ss >> value ) {
-                                // this is a floating point constant. It MUST be ".0" or ".1", otherwise the program is invalid
-                                if ( ! (var->get_name() == ".0" || var->get_name() == ".1") ) {
-                                        throw SemanticError( "invalid designator name: " + var->get_name() );
-                                } // if
-                                var->set_name( var->get_name().substr(1) );
-                        } // if
-                } // if
-        } // if
-}
-
-DesignatorNode::DesignatorNode( const DesignatorNode &other ) : ExpressionNode( other ), isArrayIndex( other.isArrayIndex ) {
-}
-
-class DesignatorFixer : public Mutator {
-public:
-        virtual Expression* mutate( NameExpr *nameExpr ) {
-                if ( nameExpr->get_name() == "0" || nameExpr->get_name() == "1" ) {
-                        Constant val( new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nameExpr->get_name() );
-                        delete nameExpr;
-                        return new ConstantExpr( val );
-                }
-                return nameExpr;
-        }
-};
-
-Expression *DesignatorNode::build() const {
-        Expression * ret = maybeBuild<Expression>(get_argName());
-
-        if ( isArrayIndex ) {
-                // need to traverse entire structure and change any instances of 0 or 1 to ConstantExpr
-                DesignatorFixer fixer;
-                ret = ret->acceptMutator( fixer );
-        } // if
-
-        return ret;
-}
-
-void DesignatorNode::printOneLine( std::ostream &os, int indent ) const {
-        if ( get_argName() ) {
-                if ( isArrayIndex ) {
-                        os << "[";
-                        get_argName()->printOneLine( os, indent );
-                        os << "]";
-                } else {
-                        os << ".";
-                        get_argName()->printOneLine( os, indent );
-                }
-        } // if
-}
-
-void DesignatorNode::print( std::ostream &os, int indent ) const {
-        if ( get_argName() ) {
-                if ( isArrayIndex ) {
-                        os << "[";
-                        get_argName()->print( os, indent );
-                        os << "]";
-                } else {
-                        os << ".";
-                        get_argName()->print( os, indent );
-                }
-        } // if
-}
-
-//##############################################################################
+NameExpr * build_varref( const string *name, bool labelp ) {
+        NameExpr *expr = new NameExpr( *name, nullptr );
+        delete name;
+        return expr;
+}
 
 static const char *OperName[] = {
@@ -331 +182 @@
 };
 
-//##############################################################################
-
-Expression *build_cast( TypeValueNode * arg, ExpressionNode *expr_node ) {
-        DeclarationNode *decl_node = arg->get_decl();
-
+Expression *build_cast( DeclarationNode *decl_node, ExpressionNode *expr_node ) {
         Type *targetType = decl_node->buildType();
-        if ( dynamic_cast< VoidType* >( targetType ) ) {
+        if ( dynamic_cast< VoidType * >( targetType ) ) {
                 delete targetType;
-                return new CastExpr( maybeBuild<Expression>(expr_node) );
+                return new CastExpr( maybeMoveBuild< Expression >(expr_node) );
         } else {
-                return new CastExpr( maybeBuild<Expression>(expr_node), targetType );
-        } // if
-}
-
-Expression *build_fieldSel( ExpressionNode *expr_node, VarRefNode *member ) {
-        NameExpr* memberExpr = dynamic_cast<NameExpr*> ( maybeBuild<Expression>( member) );
-        assert( memberExpr );
-        UntypedMemberExpr *ret = new UntypedMemberExpr( memberExpr->get_name(), maybeBuild<Expression>(expr_node) );
+                return new CastExpr( maybeMoveBuild< Expression >(expr_node), targetType );
+        } // if
+}
+
+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, VarRefNode *member ) {
-        NameExpr* memberExpr = dynamic_cast<NameExpr*> ( maybeBuild<Expression>( member) );
-        assert( memberExpr );
+Expression *build_pfieldSel( ExpressionNode *expr_node, NameExpr *member ) {
         UntypedExpr *deref = new UntypedExpr( new NameExpr( "*?" ) );
-        deref->get_args().push_back( maybeBuild<Expression>(expr_node) );
-        UntypedMemberExpr *ret = new UntypedMemberExpr( memberExpr->get_name(), deref );
+        deref->get_args().push_back( maybeMoveBuild< Expression >(expr_node) );
+        UntypedMemberExpr *ret = new UntypedMemberExpr( member->get_name(), deref );
         delete member;
         return ret;
@@ -364 +207 @@
 
 Expression *build_addressOf( ExpressionNode *expr_node ) {
-                return new AddressExpr( maybeBuild<Expression>(expr_node) );
-}
-Expression *build_sizeOf( ExpressionNode *expr_node ) {
-        if ( TypeValueNode * arg = dynamic_cast<TypeValueNode *>( expr_node ) ) {
-                return new SizeofExpr( arg->get_decl()->buildType() );
-        } else {
-                return new SizeofExpr( maybeBuild<Expression>(expr_node) );
-        } // if
-}
-Expression *build_alignOf( ExpressionNode *expr_node ) {
-        if ( TypeValueNode * arg = dynamic_cast<TypeValueNode *>( expr_node ) ) {
-                return new AlignofExpr( arg->get_decl()->buildType() );
-        } else {
-                return new AlignofExpr( maybeBuild<Expression>(expr_node) );
-        } // if
-}
-Expression *build_offsetOf( TypeValueNode * arg, VarRefNode *member ) {
-        NameExpr *memberExpr = dynamic_cast<NameExpr *>( maybeBuild<Expression>( member ) );
-        assert( memberExpr );
-        return new UntypedOffsetofExpr( arg->get_decl()->buildType(), memberExpr->get_name() );
+                return new AddressExpr( maybeMoveBuild< Expression >(expr_node) );
+}
+Expression *build_sizeOfexpr( ExpressionNode *expr_node ) {
+        return new SizeofExpr( maybeMoveBuild< Expression >(expr_node) );
+}
+Expression *build_sizeOftype( DeclarationNode *decl_node ) {
+        Expression* ret = new SizeofExpr( decl_node->buildType() );
+        delete decl_node;
+        return ret;
+}
+Expression *build_alignOfexpr( ExpressionNode *expr_node ) {
+        return new AlignofExpr( maybeMoveBuild< Expression >(expr_node) );
+}
+Expression *build_alignOftype( DeclarationNode *decl_node ) {
+        return new AlignofExpr( decl_node->buildType() );
+}
+Expression *build_offsetOf( DeclarationNode *decl_node, NameExpr *member ) {
+        Expression* ret = new UntypedOffsetofExpr( decl_node->buildType(), member->get_name() );
+        delete decl_node;
+        delete member;
+        return ret;
 }
 
 Expression *build_and_or( ExpressionNode *expr_node1, ExpressionNode *expr_node2, bool kind ) {
-        return new LogicalExpr( notZeroExpr( maybeBuild<Expression>(expr_node1) ), notZeroExpr( maybeBuild<Expression>(expr_node2) ), kind );
+        return new LogicalExpr( notZeroExpr( maybeMoveBuild< Expression >(expr_node1) ), notZeroExpr( maybeMoveBuild< Expression >(expr_node2) ), kind );
 }
 
 Expression *build_unary_val( OperKinds op, ExpressionNode *expr_node ) {
-        std::list<Expression *> args;
-        args.push_back( maybeBuild<Expression>(expr_node) );
+        std::list< Expression * > args;
+        args.push_back( maybeMoveBuild< Expression >(expr_node) );
         return new UntypedExpr( new NameExpr( OperName[ (int)op ] ), args );
 }
 Expression *build_unary_ptr( OperKinds op, ExpressionNode *expr_node ) {
-        std::list<Expression *> args;
-        args.push_back( new AddressExpr( maybeBuild<Expression>(expr_node) ) );
+        std::list< Expression * > args;
+        args.push_back( new AddressExpr( maybeMoveBuild< Expression >(expr_node) ) );
         return new UntypedExpr( new NameExpr( OperName[ (int)op ] ), args );
 }
 Expression *build_binary_val( OperKinds op, ExpressionNode *expr_node1, ExpressionNode *expr_node2 ) {
-        std::list<Expression *> args;
-        args.push_back( maybeBuild<Expression>(expr_node1) );
-        args.push_back( maybeBuild<Expression>(expr_node2) );
+        std::list< Expression * > args;
+        args.push_back( maybeMoveBuild< Expression >(expr_node1) );
+        args.push_back( maybeMoveBuild< Expression >(expr_node2) );
         return new UntypedExpr( new NameExpr( OperName[ (int)op ] ), args );
 }
 Expression *build_binary_ptr( OperKinds op, ExpressionNode *expr_node1, ExpressionNode *expr_node2 ) {
-        std::list<Expression *> args;
-        args.push_back( new AddressExpr( maybeBuild<Expression>(expr_node1) ) );
-        args.push_back( maybeBuild<Expression>(expr_node2) );
+        std::list< Expression * > args;
+        args.push_back( new AddressExpr( maybeMoveBuild< Expression >(expr_node1) ) );
+        args.push_back( maybeMoveBuild< Expression >(expr_node2) );
         return new UntypedExpr( new NameExpr( OperName[ (int)op ] ), args );
 }
 
 Expression *build_cond( ExpressionNode *expr_node1, ExpressionNode *expr_node2, ExpressionNode *expr_node3 ) {
-        return new ConditionalExpr( notZeroExpr( maybeBuild<Expression>(expr_node1) ), maybeBuild<Expression>(expr_node2), maybeBuild<Expression>(expr_node3) );
+        return new ConditionalExpr( notZeroExpr( maybeMoveBuild< Expression >(expr_node1) ), maybeMoveBuild< Expression >(expr_node2), maybeMoveBuild< Expression >(expr_node3) );
 }
 
 Expression *build_comma( ExpressionNode *expr_node1, ExpressionNode *expr_node2 ) {
-        return new CommaExpr( maybeBuild<Expression>(expr_node1), maybeBuild<Expression>(expr_node2) );
-}
-
-Expression *build_attr( VarRefNode *var, ExpressionNode * expr ) {
-        if ( TypeValueNode * arg = dynamic_cast<TypeValueNode *>( expr ) ) {
-                return new AttrExpr( maybeBuild<Expression>(var), arg->get_decl()->buildType() );
-        } else {
-                return new AttrExpr( maybeBuild<Expression>(var), maybeBuild<Expression>(expr) );
-        } // if
-}
-
-Expression *build_tuple( ExpressionNode * expr ) {
+        return new CommaExpr( maybeMoveBuild< Expression >(expr_node1), maybeMoveBuild< Expression >(expr_node2) );
+}
+
+Expression *build_attrexpr( NameExpr *var, ExpressionNode * expr_node ) {
+        return new AttrExpr( var, maybeMoveBuild< Expression >(expr_node) );
+}
+Expression *build_attrtype( NameExpr *var, DeclarationNode * decl_node ) {
+        return new AttrExpr( var, decl_node->buildType() );
+}
+
+Expression *build_tuple( ExpressionNode * expr_node ) {
         TupleExpr *ret = new TupleExpr();
-        buildList( expr, ret->get_exprs() );
-        return ret;
-}
-
-Expression *build_func( ExpressionNode * function, ExpressionNode * expr ) {
-        std::list<Expression *> args;
-
-        buildList( expr, args );
-        return new UntypedExpr( maybeBuild<Expression>(function), args, nullptr );
+        buildMoveList( expr_node, ret->get_exprs() );
+        return ret;
+}
+
+Expression *build_func( ExpressionNode * function, ExpressionNode * expr_node ) {
+        std::list< Expression * > args;
+        buildMoveList( expr_node, args );
+        return new UntypedExpr( maybeMoveBuild< Expression >(function), args, nullptr );
 }
 
 Expression *build_range( ExpressionNode * low, ExpressionNode *high ) {
-        Expression *low_cexpr = maybeBuild<Expression>( low );
-        Expression *high_cexpr = maybeBuild<Expression>( high );
-        return new RangeExpr( low_cexpr, high_cexpr );
-}
-
-//##############################################################################
-
-Expression *AsmExprNode::build() const {
-        return new AsmExpr( maybeBuild< Expression >( inout ), (ConstantExpr *)maybeBuild<Expression>(constraint), maybeBuild<Expression>(operand) );
-}
-
-void AsmExprNode::print( std::ostream &os, int indent ) const {
-        os << string( indent, ' ' ) << "Assembler Expression:" << endl;
-        if ( inout ) {
-                os << string( indent, ' ' ) << "inout: " << std::endl;
-                inout->print( os, indent + 2 );
-        } // if
-        if ( constraint ) {
-                os << string( indent, ' ' ) << "constraint: " << std::endl;
-                constraint->print( os, indent + 2 );
-        } // if
-        if ( operand ) {
-                os << string( indent, ' ' ) << "operand: " << std::endl;
-                operand->print( os, indent + 2 );
-        } // if
-}
-
-void AsmExprNode::printOneLine( std::ostream &os, int indent ) const {
-        printDesignation( os );
-        os << "( ";
-        if ( inout ) inout->printOneLine( os, indent + 2 );
-        os << ", ";
-        if ( constraint ) constraint->printOneLine( os, indent + 2 );
-        os << ", ";
-        if ( operand ) operand->printOneLine( os, indent + 2 );
-        os << ") ";
-}
-
-//##############################################################################
-
-void LabelNode::print( std::ostream &os, int indent ) const {}
-
-void LabelNode::printOneLine( std::ostream &os, int indent ) const {}
-
-//##############################################################################
-
-ValofExprNode::ValofExprNode( StatementNode *s ): body( s ) {}
-
-ValofExprNode::ValofExprNode( const ValofExprNode &other ) : ExpressionNode( other ), body( maybeClone( body ) ) {
-}
-
-ValofExprNode::~ValofExprNode() {
-        delete body;
-}
-
-void ValofExprNode::print( std::ostream &os, int indent ) const {
-        printDesignation( os );
-        os << string( indent, ' ' ) << "Valof Expression:" << std::endl;
-        get_body()->print( os, indent + 4);
-}
-
-void ValofExprNode::printOneLine( std::ostream &, int indent ) const {
-        assert( false );
-}
-
-Expression *ValofExprNode::build() const {
-        return new UntypedValofExpr ( maybeBuild<Statement>(get_body()), maybeBuild< Expression >( get_argName() ) );
-}
-
-//##############################################################################
-
-ForCtlExprNode::ForCtlExprNode( ParseNode *init_, ExpressionNode *cond, ExpressionNode *incr ) throw ( SemanticError ) : condition( cond ), change( incr ) {
-        if ( init_ == 0 )
-                init = 0;
-        else {
-                DeclarationNode *decl;
-                ExpressionNode *exp;
-
-                if (( decl = dynamic_cast<DeclarationNode *>(init_) ) != 0)
-                        init = new StatementNode( decl );
-                else if (( exp = dynamic_cast<ExpressionNode *>( init_)) != 0)
-                        init = new StatementNode( StatementNode::Exp, exp );
-                else
-                        throw SemanticError("Error in for control expression");
-        }
-}
-
-ForCtlExprNode::ForCtlExprNode( const ForCtlExprNode &other )
-        : ExpressionNode( other ), init( maybeClone( other.init ) ), condition( maybeClone( other.condition ) ), change( maybeClone( other.change ) ) {
-}
-
-ForCtlExprNode::~ForCtlExprNode() {
-        delete init;
-        delete condition;
-        delete change;
-}
-
-Expression *ForCtlExprNode::build() const {
-        // this shouldn't be used!
-        assert( false );
-        return 0;
-}
-
-void ForCtlExprNode::print( std::ostream &os, int indent ) const{
-        os << string( indent,' ' ) << "For Control Expression -- :" << endl;
-
-        os << string( indent + 2, ' ' ) << "initialization:" << endl;
-        if ( init != 0 )
-                init->printList( os, indent + 4 );
-
-        os << string( indent + 2, ' ' ) << "condition: " << endl;
-        if ( condition != 0 )
-                condition->print( os, indent + 4 );
-        os << string( indent + 2, ' ' ) << "increment: " << endl;
-        if ( change != 0 )
-                change->print( os, indent + 4 );
-}
-
-void ForCtlExprNode::printOneLine( std::ostream &, int indent ) const {
-        assert( false );
-}
-
-//##############################################################################
-
-TypeValueNode::TypeValueNode( DeclarationNode *decl ) : decl( decl ) {
-}
-
-TypeValueNode::TypeValueNode( const TypeValueNode &other ) : ExpressionNode( other ), decl( maybeClone( other.decl ) ) {
-}
-
-Expression *TypeValueNode::build() const {
+        return new RangeExpr( maybeMoveBuild< Expression >( low ), maybeMoveBuild< Expression >( high ) );
+}
+
+Expression *build_asmexpr( ExpressionNode *inout, ConstantExpr *constraint, ExpressionNode *operand ) {
+        return new AsmExpr( maybeMoveBuild< Expression >( inout ), constraint, maybeMoveBuild< Expression >(operand) );
+}
+
+Expression *build_valexpr( StatementNode *s ) {
+        return new UntypedValofExpr( maybeMoveBuild< Statement >(s), nullptr );
+}
+Expression *build_typevalue( DeclarationNode *decl ) {
         return new TypeExpr( decl->buildType() );
 }
 
-void TypeValueNode::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Type:";
-        get_decl()->print( os, indent + 2);
-}
-
-void TypeValueNode::printOneLine( std::ostream &os, int indent ) const {
-        os << "Type:";
-        get_decl()->print( os, indent + 2);
-}
-
-
-CompoundLiteralNode::CompoundLiteralNode( DeclarationNode *type, InitializerNode *kids ) : type( type ), kids( kids ) {}
-CompoundLiteralNode::CompoundLiteralNode( const CompoundLiteralNode &other ) : ExpressionNode( other ), type( other.type ), kids( other.kids ) {}
-
-CompoundLiteralNode::~CompoundLiteralNode() {
-        delete kids;
-        delete type;
-}
-
-CompoundLiteralNode *CompoundLiteralNode::clone() const {
-        return new CompoundLiteralNode( *this );
-}
-
-void CompoundLiteralNode::print( std::ostream &os, int indent ) const {
-        os << string( indent,' ' ) << "CompoundLiteralNode:" << endl;
-
-        os << string( indent + 2, ' ' ) << "type:" << endl;
-        if ( type != 0 )
-                type->print( os, indent + 4 );
-
-        os << string( indent + 2, ' ' ) << "initialization:" << endl;
-        if ( kids != 0 )
-                kids->printList( os, indent + 4 );
-}
-
-void CompoundLiteralNode::printOneLine( std::ostream &os, int indent ) const {
-        os << "( ";
-        if ( type ) type->print( os );
-        os << ", ";
-        if ( kids ) kids->printOneLine( os );
-        os << ") ";
-}
-
-Expression *CompoundLiteralNode::build() const {
-        Declaration * newDecl = maybeBuild<Declaration>(type); // compound literal type
+Expression *build_compoundLiteral( DeclarationNode *decl_node, InitializerNode *kids ) {
+        Declaration * newDecl = maybeBuild< Declaration >(decl_node); // compound literal type
         if ( DeclarationWithType * newDeclWithType = dynamic_cast< DeclarationWithType * >( newDecl ) ) { // non-sue compound-literal type
-                return new CompoundLiteralExpr( newDeclWithType->get_type(), maybeBuild<Initializer>(kids) );
+                return new CompoundLiteralExpr( newDeclWithType->get_type(), maybeMoveBuild< Initializer >(kids) );
         // these types do not have associated type information
         } else if ( StructDecl * newDeclStructDecl = dynamic_cast< StructDecl * >( newDecl )  ) {
-                return new CompoundLiteralExpr( new StructInstType( Type::Qualifiers(), newDeclStructDecl->get_name() ), maybeBuild<Initializer>(kids) );
+                return new CompoundLiteralExpr( new StructInstType( Type::Qualifiers(), newDeclStructDecl->get_name() ), maybeMoveBuild< Initializer >(kids) );
         } else if ( UnionDecl * newDeclUnionDecl = dynamic_cast< UnionDecl * >( newDecl )  ) {
-                return new CompoundLiteralExpr( new UnionInstType( Type::Qualifiers(), newDeclUnionDecl->get_name() ), maybeBuild<Initializer>(kids) );
+                return new CompoundLiteralExpr( new UnionInstType( Type::Qualifiers(), newDeclUnionDecl->get_name() ), maybeMoveBuild< Initializer >(kids) );
         } else if ( EnumDecl * newDeclEnumDecl = dynamic_cast< EnumDecl * >( newDecl )  ) {
-                return new CompoundLiteralExpr( new EnumInstType( Type::Qualifiers(), newDeclEnumDecl->get_name() ), maybeBuild<Initializer>(kids) );
+                return new CompoundLiteralExpr( new EnumInstType( Type::Qualifiers(), newDeclEnumDecl->get_name() ), maybeMoveBuild< Initializer >(kids) );
         } else {
                 assert( false );

src/Parser/InitializerNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:20:24 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul  4 15:37:15 2016
-// Update Count     : 15
+// Last Modified On : Mon Aug 15 18:27:02 2016
+// Update Count     : 20
 //
 
@@ -25 +25 @@
         : expr( _expr ), aggregate( aggrp ), designator( des ), kids( 0 ), maybeConstructed( true ) {
         if ( aggrp )
-                kids = dynamic_cast< InitializerNode *>( get_link() );
+                kids = dynamic_cast< InitializerNode * >( get_next() );
 
         if ( kids != 0 )
-                set_link( 0 );
+                set_last( 0 );
 }
 
@@ -34 +34 @@
         : expr( 0 ), aggregate( aggrp ), designator( des ), kids( 0 ), maybeConstructed( true ) {
         if ( init != 0 )
-                set_link(init);
+                set_last( init );
 
         if ( aggrp )
-                kids = dynamic_cast< InitializerNode *>( get_link() );
+                kids = dynamic_cast< InitializerNode * >( get_next() );
 
         if ( kids != 0 )
@@ -58 +58 @@
                         while ( curdes != 0) {
                                 curdes->printOneLine(os);
-                                curdes = (ExpressionNode *)(curdes->get_link());
+                                curdes = (ExpressionNode *)(curdes->get_next());
                                 if ( curdes ) os << ", ";
                         } // while
@@ -72 +72 @@
 
         InitializerNode *moreInit;
-        if  ( get_link() != 0 && ((moreInit = dynamic_cast< InitializerNode * >( get_link() ) ) != 0) )
+        if  ( get_next() != 0 && ((moreInit = dynamic_cast< InitializerNode * >( get_next() ) ) != 0) )
                 moreInit->printOneLine( os );
 }
@@ -82 +82 @@
                 //assert( next_init() != 0 );
 
-                std::list< Initializer *> initlist;
-                buildList<Initializer, InitializerNode>( next_init(), initlist );
+                std::list< Initializer * > initlist;
+                buildList< Initializer, InitializerNode >( next_init(), initlist );
 
-                std::list< Expression *> designlist;
+                std::list< Expression * > designlist;
 
                 if ( designator != 0 ) {
-                        buildList<Expression, ExpressionNode>( designator, designlist );
+                        buildList< Expression, ExpressionNode >( designator, designlist );
                 } // if
 
                 return new ListInit( initlist, designlist, maybeConstructed );
         } else {
-                std::list< Expression *> designators;
+                std::list< Expression * > designators;
 
                 if ( designator != 0 )
-                        buildList<Expression, ExpressionNode>( designator, designators );
+                        buildList< Expression, ExpressionNode >( designator, designators );
 
                 if ( get_expression() != 0)
-                        return new SingleInit( maybeBuild<Expression>( get_expression() ), designators, maybeConstructed );
+                        return new SingleInit( maybeBuild< Expression >( get_expression() ), designators, maybeConstructed );
         } // if
 

src/Parser/LinkageSpec.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:22:09 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 19 15:53:05 2015
-// Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 18 23:47:14 2016
+// Update Count     : 12
 // 
 
@@ -20 +20 @@
 #include "Common/SemanticError.h"
 
-LinkageSpec::Type LinkageSpec::fromString( const std::string &stringSpec ) {
+LinkageSpec::Spec LinkageSpec::fromString( const std::string &stringSpec ) {
         if ( stringSpec == "\"Cforall\"" ) {
                 return Cforall;
@@ -30 +30 @@
 }
 
-std::string LinkageSpec::toString( LinkageSpec::Type linkage ) {
-        switch ( linkage ) {
-          case Intrinsic:
-                return "intrinsic";
-          case Cforall:
-                return "Cforall";
-          case C:
-                return "C";
-          case AutoGen:
-                return "automatically generated";
-          case Compiler:
-                return "compiler built-in";
-        }
-        assert( false );
-        return "";
+std::string LinkageSpec::toString( LinkageSpec::Spec linkage ) {
+        static const char *linkageKinds[LinkageSpec::NoOfSpecs] = {
+                "intrinsic", "Cforall", "C", "automatically generated", "compiler built-in",
+        };
+        return linkageKinds[linkage];
 }
 
-bool LinkageSpec::isDecoratable( Type t ) {
-        switch ( t ) {
-          case Intrinsic:
-          case Cforall:
-          case AutoGen:
-                return true;
-          case C:
-          case Compiler:
-                return false;
-        }
-        assert( false );
-        return false;
+bool LinkageSpec::isDecoratable( Spec t ) {
+        static bool decoratable[LinkageSpec::NoOfSpecs] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
+                        true,           true,           false,  true,           false, 
+        };
+        return decoratable[t];
 }
 
-bool LinkageSpec::isGeneratable( Type t ) {
-        switch ( t ) {
-          case Intrinsic:
-          case Cforall:
-          case AutoGen:
-          case C:
-                return true;
-          case Compiler:
-                return false;
-        }
-        assert( false );
-        return false;
+bool LinkageSpec::isGeneratable( Spec t ) {
+        static bool generatable[LinkageSpec::NoOfSpecs] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
+                        true,           true,           true,   true,           false, 
+        };
+        return generatable[t];
 }
 
-bool LinkageSpec::isOverloadable( Type t ) {
+bool LinkageSpec::isOverloadable( Spec t ) {
         return isDecoratable( t );
 }
 
 
-bool LinkageSpec::isOverridable( Type t ) {
-        switch ( t ) {
-          case Intrinsic:
-          case AutoGen:
-                return true;
-          case Cforall:
-          case C:
-          case Compiler:
-                return false;
-        }
-        assert( false );
-        return false;
+bool LinkageSpec::isOverridable( Spec t ) {
+        static bool overridable[LinkageSpec::NoOfSpecs] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
+                        true,           false,          false,  true,           false, 
+        };
+        return overridable[t];
 }
 
-bool LinkageSpec::isBuiltin( Type t ) {
-        switch ( t ) {
-          case Cforall:
-          case AutoGen:
-          case C:
-                return false;
-          case Intrinsic:
-          case Compiler:
-                return true;
-        }
-        assert( false );
-        return false;
+bool LinkageSpec::isBuiltin( Spec t ) {
+        static bool builtin[LinkageSpec::NoOfSpecs] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
+                        true,           false,          false,  false,          true, 
+        };
+        return builtin[t];
 }
 

src/Parser/LinkageSpec.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:24:28 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Aug 18 14:11:55 2015
-// Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 18 23:47:16 2016
+// Update Count     : 7
 //
 
@@ -20 +20 @@
 
 struct LinkageSpec {
-        enum Type {
+        enum Spec {
                 Intrinsic,                                                                              // C built-in defined in prelude
                 Cforall,                                                                                // ordinary
                 C,                                                                                              // not overloadable, not mangled
                 AutoGen,                                                                                // built by translator (struct assignment)
-                Compiler                                                                                // gcc internal
+                Compiler,                                                                               // gcc internal
+                NoOfSpecs
         };
   
-        static Type fromString( const std::string & );
-        static std::string toString( Type );
+        static Spec fromString( const std::string & );
+        static std::string toString( Spec );
   
-        static bool isDecoratable( Type );
-        static bool isGeneratable( Type );
-        static bool isOverloadable( Type );
-        static bool isOverridable( Type );
-        static bool isBuiltin( Type );
+        static bool isDecoratable( Spec );
+        static bool isGeneratable( Spec );
+        static bool isOverloadable( Spec );
+        static bool isOverridable( Spec );
+        static bool isBuiltin( Spec );
 };
 

src/Parser/ParseNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:26:29 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug  6 08:26:11 2016
-// Update Count     : 93
+// Last Modified On : Wed Aug 17 23:14:16 2016
+// Update Count     : 126
 // 
 
@@ -17 +17 @@
 using namespace std;
 
-// Builder
 int ParseNode::indent_by = 4;
-
-ParseNode::ParseNode() : next( 0 ) {};
-ParseNode::ParseNode( const string *name ) : name( *name ), next( 0 ) { delete name; }
-ParseNode::ParseNode( const string &name ) : name( name ), next( 0 ) { }
-
-ParseNode::~ParseNode() {
-        delete next;
-};
-
-ParseNode *ParseNode::get_last() {
-        ParseNode *current = this;
-
-        while ( current->get_link() != 0 )
-        current = current->get_link();
-
-        return current;
-}
-
-ParseNode *ParseNode::set_link( ParseNode *next_ ) {
-        if ( next_ != 0 ) get_last()->next = next_;
-        return this;
-}
-
-void ParseNode::print( std::ostream &os, int indent ) const {}
-
-
-void ParseNode::printList( std::ostream &os, int indent ) const {
-        print( os, indent );
-
-        if ( next ) {
-                next->printList( os, indent );
-        } // if
-}
-
-ParseNode &ParseNode::operator,( ParseNode &p ) {
-        set_link( &p );
-
-        return *this;
-}
-
-ParseNode *mkList( ParseNode &pn ) {
-        // it just relies on `operator,' to take care of the "arguments" and provides a nice interface to an awful-looking
-        // address-of, rendering, for example (StatementNode *)(&(*$5 + *$7)) into (StatementNode *)mkList(($5, $7))
-        // (although "nice" is probably not the word)
-        return &pn;
-}
 
 // Local Variables: //

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Aug  7 09:37:16 2016
-// Update Count     : 333
+// Last Modified On : Thu Aug 18 23:48:37 2016
+// Update Count     : 542
 //
 
@@ -22 +22 @@
 #include <memory>
 
-#include "Common/utility.h"
 #include "Parser/LinkageSpec.h"
 #include "SynTree/Type.h"
 #include "SynTree/Expression.h"
-//#include "SynTree/Declaration.h"
+#include "SynTree/Statement.h"
+#include "SynTree/Label.h"
+#include "Common/utility.h"
 #include "Common/UniqueName.h"
-#include "SynTree/Label.h"
 
 class StatementNode;
 class CompoundStmtNode;
 class DeclarationNode;
+class ExpressionNode;
 class InitializerNode;
 
-// Builder
+//##############################################################################
+
 class ParseNode {
   public:
-        ParseNode();
-        ParseNode( const std::string * );
-        ParseNode( const std::string & );                                       // for copy constructing subclasses
-        virtual ~ParseNode();
-
-        ParseNode *get_link() const { return next; }
-        ParseNode *get_last();
-        ParseNode *set_link( ParseNode * );
-        void set_next( ParseNode *newlink ) { next = newlink; }
-
-        virtual ParseNode *clone() const { return 0; };
+        ParseNode() {};
+        ParseNode( const std::string *name ) : name( *name ) { assert( false ); delete name; }
+        ParseNode( const std::string &name ) : name( name ) { assert( false ); }
+        virtual ~ParseNode() { delete next; };
+        virtual ParseNode *clone() const = 0;
+
+        ParseNode *get_next() const { return next; }
+        ParseNode *set_next( ParseNode *newlink ) { next = newlink; return this; }
+        ParseNode *get_last() {
+                ParseNode *current;
+                for ( current = this; current->get_next() != 0; current = current->get_next() );
+                return current;
+        }
+        ParseNode *set_last( ParseNode *newlast ) {
+                if ( newlast != 0 ) get_last()->set_next( newlast );
+                return this;
+        }
 
         const std::string &get_name() const { return name; }
         void set_name( const std::string &newValue ) { name = newValue; }
 
-        virtual void print( std::ostream &os, int indent = 0 ) const;
-        virtual void printList( std::ostream &os, int indent = 0 ) const;
-
-        ParseNode &operator,( ParseNode &);
-  protected:
+        virtual void print( std::ostream &os, int indent = 0 ) const {}
+        virtual void printList( std::ostream &os, int indent = 0 ) const {}
+  private:
+        static int indent_by;
+
+        ParseNode *next = nullptr;
         std::string name;
-        static int indent_by;
-        ParseNode *next;
-};
-
-ParseNode *mkList( ParseNode & );
-
-//##############################################################################
-
-class ExpressionNode : public ParseNode {
+}; // ParseNode
+
+//##############################################################################
+
+class InitializerNode : public ParseNode {
   public:
-        ExpressionNode();
-        ExpressionNode( const std::string * );
+        InitializerNode( ExpressionNode *, bool aggrp = false,  ExpressionNode *des = 0 );
+        InitializerNode( InitializerNode *, bool aggrp = false, ExpressionNode *des = 0 );
+        ~InitializerNode();
+        virtual InitializerNode *clone() const { assert( false ); return nullptr; }
+
+        ExpressionNode *get_expression() const { return expr; }
+
+        InitializerNode *set_designators( ExpressionNode *des ) { designator = des; return this; }
+        ExpressionNode *get_designators() const { return designator; }
+
+        InitializerNode *set_maybeConstructed( bool value ) { maybeConstructed = value; return this; }
+        bool get_maybeConstructed() const { return maybeConstructed; }
+
+        InitializerNode *next_init() const { return kids; }
+
+        void print( std::ostream &os, int indent = 0 ) const;
+        void printOneLine( std::ostream & ) const;
+
+        virtual Initializer *build() const;
+  private:
+        ExpressionNode *expr;
+        bool aggregate;
+        ExpressionNode *designator;                                                     // may be list
+        InitializerNode *kids;
+        bool maybeConstructed;
+};
+
+//##############################################################################
+
+class ExpressionNode final : public ParseNode {
+  public:
+        ExpressionNode( Expression * expr = nullptr ) : expr( expr ) {}
+        ExpressionNode( Expression * expr, const std::string *name ) : ParseNode( name ), expr( expr ) {}
         ExpressionNode( const ExpressionNode &other );
-        virtual ~ExpressionNode() { delete argName; }
-
-        virtual ExpressionNode *clone() const = 0;
-
-        ExpressionNode *get_argName() const { return argName; }
-        ExpressionNode *set_argName( const std::string *aName );
-        ExpressionNode *set_argName( ExpressionNode *aDesignator );
+        virtual ~ExpressionNode() {}
+        virtual ExpressionNode *clone() const { assert( false ); return nullptr; }
+
         bool get_extension() const { return extension; }
         ExpressionNode *set_extension( bool exten ) { extension = exten; return this; }
 
-        virtual void print( std::ostream &os, int indent = 0) const = 0;
-        virtual void printOneLine( std::ostream &os, int indent = 0) const = 0;
-
-        virtual Expression *build() const = 0;
-  protected:
-        void printDesignation ( std::ostream &os, int indent = 0) const;
+        void print( std::ostream &os, int indent = 0 ) const {}
+        void printOneLine( std::ostream &os, int indent = 0 ) const {}
+
+        template<typename T>
+        bool isExpressionType() const {
+                return nullptr != dynamic_cast<T>(expr.get());
+        }
+
+        Expression *build() const { return const_cast<ExpressionNode*>(this)->expr.release(); }
   private:
-        ExpressionNode *argName = 0;
         bool extension = false;
+        std::unique_ptr<Expression> expr;
 };
 
 template< typename T >
-struct maybeBuild_t<Expression, T> {
+struct maybeBuild_t< Expression, T > {
         static inline Expression * doit( const T *orig ) {
                 if ( orig ) {
@@ -101 +136 @@
                         return p;
                 } else {
-                        return 0;
+                        return nullptr;
                 } // if
         }
-};
-
-//##############################################################################
-
-// NullExprNode is used in tuples as a place-holder where a tuple component is omitted e.g., [ 2, , 3 ]
-class NullExprNode : public ExpressionNode {
-  public:
-        NullExprNode();
-
-        virtual NullExprNode *clone() const;
-
-        virtual void print( std::ostream &os, int indent = 0) const;
-        virtual void printOneLine( std::ostream &os, int indent = 0) const;
-
-        virtual Expression *build() const;
-};
-
-//##############################################################################
-
-class ConstantNode : public ExpressionNode {
-  public:
-        ConstantNode( ConstantExpr *expr ) : expr( expr ) {}
-        ConstantNode( const ConstantNode &other ) : expr( other.expr->clone() ) {}
-        virtual ~ConstantNode() {}
-
-        virtual ConstantNode *clone() const { assert( false ); return new ConstantNode( *this ); }
-
-        ConstantExpr *get_expr() const { return expr; }
-
-        virtual void print( std::ostream &os, int indent = 0 ) const {}
-        virtual void printOneLine( std::ostream &os, int indent = 0 ) const {}
-
-        Expression *build() const { return expr; }
-  private:
-        ConstantExpr *expr;
-};
-
-ConstantNode *build_constantInteger( std::string &str );
-ConstantNode *build_constantFloat( std::string &str );
-ConstantNode *build_constantChar( std::string &str );
-ConstantNode *build_constantStr( std::string &str );
-
-//##############################################################################
-
-class VarRefNode : public ExpressionNode {
-  public:
-        VarRefNode( const std::string *, bool isLabel = false );
-        VarRefNode( const VarRefNode &other );
-
-        virtual Expression *build() const ;
-
-        virtual VarRefNode *clone() const { return new VarRefNode( *this ); }
-
-        virtual void print( std::ostream &os, int indent = 0 ) const;
-        virtual void printOneLine( std::ostream &os, int indent = 0 ) const;
-  private:
-        bool isLabel;
-};
-
-//##############################################################################
-
-class DesignatorNode : public ExpressionNode {
-  public:
-        DesignatorNode( ExpressionNode *expr, bool isArrayIndex = false );
-        DesignatorNode( const DesignatorNode &other );
-
-        virtual Expression *build() const ;
-        virtual DesignatorNode *clone() const { return new DesignatorNode( *this ); }
-
-        virtual void print( std::ostream &os, int indent = 0 ) const;
-        virtual void printOneLine( std::ostream &os, int indent = 0 ) const;
-  private:
-        bool isArrayIndex;
-};
-
-//##############################################################################
-
-class TypeValueNode : public ExpressionNode {
-  public:
-        TypeValueNode( DeclarationNode * );
-        TypeValueNode( const TypeValueNode &other );
-
-        DeclarationNode *get_decl() const { return decl; }
-
-        virtual Expression *build() const ;
-
-        virtual TypeValueNode *clone() const { return new TypeValueNode( *this ); }
-
-        virtual void print( std::ostream &os, int indent = 0) const;
-        virtual void printOneLine( std::ostream &os, int indent = 0) const;
-  private:
-        DeclarationNode *decl;
-};
-
-//##############################################################################
-
-class CompositeExprNode : public ExpressionNode {
-  public:
-        CompositeExprNode( Expression *expr ) : expr( expr ) {}
-        CompositeExprNode( const CompositeExprNode &other ) : expr( other.expr->clone() ) {}
-        virtual ~CompositeExprNode() {}
-
-        CompositeExprNode *clone() const { assert( false ); return new CompositeExprNode( *this ); }
-
-        Expression *build() const { return expr; }
-
-        void print( std::ostream &os, int indent = 0 ) const {}
-        void printOneLine( std::ostream &os, int indent = 0 ) const {}
-  private:
-        Expression *expr;
 };
 
@@ -227 +152 @@
 };
 
-Expression *build_cast( TypeValueNode * arg, ExpressionNode *expr_node );
-Expression *build_fieldSel( ExpressionNode *expr_node, VarRefNode *member );
-Expression *build_pfieldSel( ExpressionNode *expr_node, VarRefNode *member );
+struct LabelNode {
+        std::list< Label > labels;
+};
+
+Expression *build_constantInteger( const std::string &str );
+Expression *build_constantFloat( const std::string &str );
+Expression *build_constantChar( const std::string &str );
+ConstantExpr *build_constantStr( const std::string &str );
+
+NameExpr *build_varref( const std::string *name, bool labelp = false );
+Expression *build_typevalue( DeclarationNode *decl );
+
+Expression *build_cast( DeclarationNode * decl_node, ExpressionNode *expr_node );
+Expression *build_fieldSel( ExpressionNode *expr_node, NameExpr *member );
+Expression *build_pfieldSel( ExpressionNode *expr_node, NameExpr *member );
 Expression *build_addressOf( ExpressionNode *expr_node );
-Expression *build_sizeOf( ExpressionNode *expr_node );
-Expression *build_alignOf( ExpressionNode *expr_node );
-Expression *build_offsetOf( TypeValueNode * arg, VarRefNode *member );
+Expression *build_sizeOfexpr( ExpressionNode *expr_node );
+Expression *build_sizeOftype( DeclarationNode *decl_node );
+Expression *build_alignOfexpr( ExpressionNode *expr_node );
+Expression *build_alignOftype( DeclarationNode *decl_node );
+Expression *build_offsetOf( DeclarationNode *decl_node, NameExpr *member );
 Expression *build_and( ExpressionNode *expr_node1, ExpressionNode *expr_node2 );
 Expression *build_and_or( ExpressionNode *expr_node1, ExpressionNode *expr_node2, bool kind );
@@ -242 +181 @@
 Expression *build_cond( ExpressionNode *expr_node1, ExpressionNode *expr_node2, ExpressionNode *expr_node3 );
 Expression *build_comma( ExpressionNode *expr_node1, ExpressionNode *expr_node2 );
-Expression *build_attr( VarRefNode *var, ExpressionNode * expr = 0 );
-Expression *build_tuple( ExpressionNode * expr = 0 );
-Expression *build_func( ExpressionNode * function, ExpressionNode * expr );
+Expression *build_attrexpr( NameExpr *var, ExpressionNode * expr_node );
+Expression *build_attrtype( NameExpr *var, DeclarationNode * decl_node );
+Expression *build_tuple( ExpressionNode * expr_node = 0 );
+Expression *build_func( ExpressionNode * function, ExpressionNode * expr_node );
 Expression *build_range( ExpressionNode * low, ExpressionNode *high );
-
-//##############################################################################
-
-class AsmExprNode : public ExpressionNode {
-  public:
-        AsmExprNode();
-        AsmExprNode( ExpressionNode *inout, ConstantNode *constraint, ExpressionNode *operand ) : inout( inout ), constraint( constraint ), operand( operand ) {}
-        virtual ~AsmExprNode() { delete inout; delete constraint; delete operand; }
-
-        virtual AsmExprNode *clone() const { return new AsmExprNode( *this ); }
-        virtual Expression *build() const;
-
-        virtual void print( std::ostream &os, int indent = 0) const;
-        virtual void printOneLine( std::ostream &os, int indent = 0) const;
-
-        ExpressionNode *get_inout() const { return inout; };
-        void set_inout( ExpressionNode *newValue ) { inout = newValue; }
-
-        ConstantNode *get_constraint() const { return constraint; };
-        void set_constraint( ConstantNode *newValue ) { constraint = newValue; }
-
-        ExpressionNode *get_operand() const { return operand; };
-        void set_operand( ExpressionNode *newValue ) { operand = newValue; }
-  private:
-        ExpressionNode *inout;
-        ConstantNode *constraint;
-        ExpressionNode *operand;
-};
-
-//##############################################################################
-
-class LabelNode : public ExpressionNode {
-  public:
-        virtual Expression *build() const { return NULL; }
-        virtual LabelNode *clone() const { return new LabelNode( *this ); }
-
-        virtual void print( std::ostream &os, int indent = 0) const;
-        virtual void printOneLine( std::ostream &os, int indent = 0) const;
-
-        const std::list< Label > &get_labels() const { return labels; };
-        void append_label( std::string *label ) { labels.push_back( *label ); delete label; }
-  private:
-        std::list< Label > labels;
-};
-
-//##############################################################################
-
-class ForCtlExprNode : public ExpressionNode {
-  public:
-        ForCtlExprNode( ParseNode *, ExpressionNode *, ExpressionNode * ) throw ( SemanticError );
-        ForCtlExprNode( const ForCtlExprNode &other );
-        ~ForCtlExprNode();
-
-        StatementNode *get_init() const { return init; }
-        ExpressionNode *get_condition() const { return condition; }
-        ExpressionNode *get_change() const { return change; }
-
-        virtual ForCtlExprNode *clone() const { return new ForCtlExprNode( *this ); }
-        virtual Expression *build() const;
-
-        virtual void print( std::ostream &os, int indent = 0 ) const;
-        virtual void printOneLine( std::ostream &os, int indent = 0 ) const;
-  private:
-        StatementNode *init;
-        ExpressionNode *condition;
-        ExpressionNode *change;
-};
-
-//##############################################################################
-
-class ValofExprNode : public ExpressionNode {
-  public:
-        ValofExprNode();
-        ValofExprNode( StatementNode *s = 0 );
-        ValofExprNode( const ValofExprNode &other );
-        ~ValofExprNode();
-
-        virtual ValofExprNode *clone() const { return new ValofExprNode( *this ); }
-
-        StatementNode *get_body() const { return body; }
-        void print( std::ostream &os, int indent = 0 ) const;
-        void printOneLine( std::ostream &os, int indent = 0 ) const;
-        Expression *build() const;
-
-  private:
-        StatementNode *body;
-};
+Expression *build_asmexpr( ExpressionNode *inout, ConstantExpr *constraint, ExpressionNode *operand );
+Expression *build_valexpr( StatementNode *s );
+Expression *build_compoundLiteral( DeclarationNode *decl_node, InitializerNode *kids );
 
 //##############################################################################
@@ -382 +238 @@
         static DeclarationNode *newBuiltinType( BuiltinType );
 
+        DeclarationNode();
+        ~DeclarationNode();
+        DeclarationNode *clone() const;
+
         DeclarationNode *addQualifiers( DeclarationNode *);
         DeclarationNode *copyStorageClasses( DeclarationNode *);
@@ -397 +257 @@
         DeclarationNode *addNewArray( DeclarationNode *array );
         DeclarationNode *addParamList( DeclarationNode *list );
-        DeclarationNode *addIdList( DeclarationNode *list );       // old-style functions
+        DeclarationNode *addIdList( DeclarationNode *list ); // old-style functions
         DeclarationNode *addInitializer( InitializerNode *init );
 
@@ -406 +266 @@
         DeclarationNode *cloneBaseType( DeclarationNode *newdecl );
 
-        DeclarationNode *appendList( DeclarationNode * );
-
-        DeclarationNode *clone() const;
+        DeclarationNode *appendList( DeclarationNode *node ) {
+                return (DeclarationNode *)set_last( node );
+        }
+
         void print( std::ostream &os, int indent = 0 ) const;
         void printList( std::ostream &os, int indent = 0 ) const;
@@ -417 +278 @@
         bool get_hasEllipsis() const;
         const std::string &get_name() const { return name; }
-        LinkageSpec::Type get_linkage() const { return linkage; }
+        LinkageSpec::Spec get_linkage() const { return linkage; }
         DeclarationNode *extractAggregate() const;
         ExpressionNode *get_enumeratorValue() const { return enumeratorValue; }
@@ -423 +284 @@
         bool get_extension() const { return extension; }
         DeclarationNode *set_extension( bool exten ) { extension = exten; return this; }
-
-        DeclarationNode();
-        ~DeclarationNode();
   private:
-        StorageClass buildStorageClass() const;
-        bool buildFuncSpecifier( StorageClass key ) const;
+        // StorageClass buildStorageClass() const;
+        // bool buildFuncSpecifier( StorageClass key ) const;
 
         TypeData *type;
         std::string name;
-        std::list< StorageClass > storageClasses;
+        // std::list< StorageClass > storageClasses;
+        StorageClass storageClass;
+        bool isInline, isNoreturn;
         std::list< std::string > attributes;
         ExpressionNode *bitfieldWidth;
@@ -438 +298 @@
         InitializerNode *initializer;
         bool hasEllipsis;
-        LinkageSpec::Type linkage;
+        LinkageSpec::Spec linkage;
         bool extension = false;
+        std::string error;
 
         static UniqueName anonymous;
 }; // DeclarationNode
 
-//##############################################################################
-
-class StatementNode : public ParseNode {
+Type *buildType( TypeData *type );
+
+//##############################################################################
+
+class StatementNode final : public ParseNode {
   public:
-        enum Type { Exp,   If,        Switch,  Case,    Default,  Choose,   Fallthru,
-                                While, Do,        For,
-                                Goto,  Continue,  Break,   Return,  Throw,
-                                Try,   Catch,     Finally, Asm,
-                                Decl
-        };
-
-        StatementNode();
-        StatementNode( const std::string *name );
-        StatementNode( Type t, ExpressionNode *control = 0, StatementNode *block = 0 );
-        StatementNode( Type t, std::string *target );
+        StatementNode() { stmt = nullptr; }
+        StatementNode( Statement *stmt ) : stmt( stmt ) {}
         StatementNode( DeclarationNode *decl );
-
-        ~StatementNode();
-
-        static StatementNode *newCatchStmt( DeclarationNode *d = 0, StatementNode *s = 0, bool catchRestP = false );
-
-        StatementNode *set_block( StatementNode *b ) {  block = b; return this; }
-        StatementNode *get_block() const { return block; }
-
-        void set_control( ExpressionNode *c ) { control = c; }
-        ExpressionNode *get_control() const { return control; }
-
-        StatementNode::Type get_type() const { return type; }
-
-        StatementNode *add_label( const std::string * );
-        const std::list<std::string> &get_labels() const { return labels; }
-
-        void addDeclaration( DeclarationNode *newDecl ) { decl = newDecl; }
-        void setCatchRest( bool newVal ) { isCatchRest = newVal; }
-
-        std::string get_target() const;
-
-        // StatementNode *add_controlexp( ExpressionNode * );
-        StatementNode *append_block( StatementNode * );
-        StatementNode *append_last_case( StatementNode * );
-
-        void print( std::ostream &os, int indent = 0) const;
-        virtual StatementNode *clone() const;
-        virtual Statement *build() const;
+        virtual ~StatementNode() {}
+
+        virtual StatementNode *clone() const final { assert( false ); return nullptr; }
+        Statement *build() const { return const_cast<StatementNode*>(this)->stmt.release(); }
+
+        virtual StatementNode *add_label( const std::string * name ) {
+                stmt->get_labels().emplace_back( *name );
+                delete name;
+                return this;
+        }
+
+        virtual StatementNode *append_last_case( StatementNode * );
+
+        virtual void print( std::ostream &os, int indent = 0 ) {}
+        virtual void printList( std::ostream &os, int indent = 0 ) {}
   private:
-        static const char *StType[];
-        Type type;
-        ExpressionNode *control;
-        StatementNode *block;
-        std::list<std::string> labels;
-        std::string *target;                            // target label for jump statements
-        DeclarationNode *decl;
-        bool isCatchRest;
+        std::unique_ptr<Statement> stmt;
 }; // StatementNode
 
-//##############################################################################
-
-class CompoundStmtNode : public StatementNode {
-  public:
-        CompoundStmtNode();
-        CompoundStmtNode( const std::string * );
-        CompoundStmtNode( StatementNode * );
-        ~CompoundStmtNode();
-
-        void add_statement( StatementNode * );
-
-        void print( std::ostream &os, int indent = 0 ) const;
-        virtual Statement *build() const;
-  private:
-        StatementNode *first, *last;
-};
-
-//##############################################################################
-
-class AsmStmtNode : public StatementNode {
-  public:
-        AsmStmtNode( Type, bool voltile, ConstantNode *instruction, ExpressionNode *output = 0, ExpressionNode *input = 0, ConstantNode *clobber = 0, LabelNode *gotolabels = 0 );
-        ~AsmStmtNode();
-
-        void print( std::ostream &os, int indent = 0 ) const;
-        Statement *build() const;
-  private:
-        bool voltile;
-        ConstantNode *instruction;
-        ExpressionNode *output, *input;
-        ConstantNode *clobber;
-        std::list< Label > gotolabels;
-};
-
-//##############################################################################
-
-class InitializerNode : public ParseNode {
-  public:
-        InitializerNode( ExpressionNode *, bool aggrp = false,  ExpressionNode *des = 0 );
-        InitializerNode( InitializerNode *, bool aggrp = false, ExpressionNode *des = 0 );
-        ~InitializerNode();
-
-        ExpressionNode *get_expression() const { return expr; }
-
-        InitializerNode *set_designators( ExpressionNode *des ) { designator = des; return this; }
-        ExpressionNode *get_designators() const { return designator; }
-
-        InitializerNode *set_maybeConstructed( bool value ) { maybeConstructed = value; return this; }
-        bool get_maybeConstructed() const { return maybeConstructed; }
-
-        InitializerNode *next_init() const { return kids; }
-
-        void print( std::ostream &os, int indent = 0 ) const;
-        void printOneLine( std::ostream & ) const;
-
-        virtual Initializer *build() const;
-  private:
-        ExpressionNode *expr;
-        bool aggregate;
-        ExpressionNode *designator; // may be list
-        InitializerNode *kids;
-        bool maybeConstructed;
-};
-
-//##############################################################################
-
-class CompoundLiteralNode : public ExpressionNode {
-  public:
-        CompoundLiteralNode( DeclarationNode *type, InitializerNode *kids );
-        CompoundLiteralNode( const CompoundLiteralNode &type );
-        ~CompoundLiteralNode();
-
-        virtual CompoundLiteralNode *clone() const;
-
-        DeclarationNode *get_type() const { return type; }
-        CompoundLiteralNode *set_type( DeclarationNode *t ) { type = t; return this; }
-
-        InitializerNode *get_initializer() const { return kids; }
-        CompoundLiteralNode *set_initializer( InitializerNode *k ) { kids = k; return this; }
-
-        void print( std::ostream &os, int indent = 0 ) const;
-        void printOneLine( std::ostream &os, int indent = 0 ) const;
-
-        virtual Expression *build() const;
-  private:
-        DeclarationNode *type;
-        InitializerNode *kids;
-};
+Statement *build_expr( ExpressionNode *ctl );
+
+struct ForCtl {
+        ForCtl( ExpressionNode *expr, ExpressionNode *condition, ExpressionNode *change ) :
+                init( new StatementNode( build_expr( expr ) ) ), condition( condition ), change( change ) {}
+        ForCtl( DeclarationNode *decl, ExpressionNode *condition, ExpressionNode *change ) :
+                init( new StatementNode( decl ) ), condition( condition ), change( change ) {}
+
+        StatementNode *init;
+        ExpressionNode *condition;
+        ExpressionNode *change;
+};
+
+Statement *build_if( ExpressionNode *ctl, StatementNode *then_stmt, StatementNode *else_stmt );
+Statement *build_switch( ExpressionNode *ctl, StatementNode *stmt );
+Statement *build_case( ExpressionNode *ctl );
+Statement *build_default();
+Statement *build_while( ExpressionNode *ctl, StatementNode *stmt, bool kind = false );
+Statement *build_for( ForCtl *forctl, StatementNode *stmt );
+Statement *build_branch( std::string identifier, BranchStmt::Type kind );
+Statement *build_computedgoto( ExpressionNode *ctl );
+Statement *build_return( ExpressionNode *ctl );
+Statement *build_throw( ExpressionNode *ctl );
+Statement *build_try( StatementNode *try_stmt, StatementNode *catch_stmt, StatementNode *finally_stmt );
+Statement *build_catch( DeclarationNode *decl, StatementNode *stmt, bool catchAny = false );
+Statement *build_finally( StatementNode *stmt );
+Statement *build_compound( StatementNode *first );
+Statement *build_asmstmt( bool voltile, ConstantExpr *instruction, ExpressionNode *output = 0, ExpressionNode *input = 0, ExpressionNode *clobber = 0, LabelNode *gotolabels = 0 );
+
+//##############################################################################
 
 template< typename SynTreeType, typename NodeType >
-void buildList( const NodeType *firstNode, std::list< SynTreeType *> &outputList ) {
+void buildList( const NodeType *firstNode, std::list< SynTreeType * > &outputList ) {
         SemanticError errors;
-        std::back_insert_iterator< std::list< SynTreeType *> > out( outputList );
+        std::back_insert_iterator< std::list< SynTreeType * > > out( outputList );
         const NodeType *cur = firstNode;
 
         while ( cur ) {
                 try {
-//                      SynTreeType *result = dynamic_cast< SynTreeType *>( maybeBuild<typename std::result_of<decltype(&NodeType::build)(NodeType)>::type>( cur ) );
-                        SynTreeType *result = dynamic_cast< SynTreeType *>( maybeBuild<typename std::pointer_traits<decltype(cur->build())>::element_type>( cur ) );
+//                      SynTreeType *result = dynamic_cast< SynTreeType * >( maybeBuild< typename std::result_of< decltype(&NodeType::build)(NodeType)>::type >( cur ) );
+                        SynTreeType *result = dynamic_cast< SynTreeType * >( maybeBuild< typename std::pointer_traits< decltype(cur->build())>::element_type >( cur ) );
                         if ( result ) {
                                 *out++ = result;
@@ -605 +381 @@
                         errors.append( e );
                 } // try
-                cur = dynamic_cast< NodeType *>( cur->get_link() );
+                cur = dynamic_cast< NodeType * >( cur->get_next() );
         } // while
         if ( ! errors.isEmpty() ) {
@@ -614 +390 @@
 // in DeclarationNode.cc
 void buildList( const DeclarationNode *firstNode, std::list< Declaration * > &outputList );
-void buildList( const DeclarationNode *firstNode, std::list< DeclarationWithType *> &outputList );
+void buildList( const DeclarationNode *firstNode, std::list< DeclarationWithType * > &outputList );
 void buildTypeList( const DeclarationNode *firstNode, std::list< Type * > &outputList );
+
+template< typename SynTreeType, typename NodeType >
+void buildMoveList( const NodeType *firstNode, std::list< SynTreeType * > &outputList ) {
+        buildList(firstNode, outputList);
+        delete firstNode;
+}
+
 
 #endif // PARSENODE_H

src/Parser/StatementNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Aug  7 06:42:38 2016
-// Update Count     : 135
+// Last Modified On : Mon Aug 15 20:47:11 2016
+// Update Count     : 322
 //
 
@@ -26 +26 @@
 using namespace std;
 
-const char *StatementNode::StType[] = {
-        "Exp",   "If",       "Switch", "Case",    "Default",  "Choose",   "Fallthru",
-        "While", "Do",       "For",
-        "Goto",  "Continue", "Break",  "Return",  "Throw",
-        "Try",   "Catch",    "Finally", "Asm",
-        "Decl"
-};
-
-StatementNode::StatementNode() : ParseNode(), control( 0 ), block( 0 ), labels( 0 ), target( 0 ), decl( 0 ), isCatchRest ( false ) {}
-
-StatementNode::StatementNode( const string *name ) : ParseNode( name ), control( 0 ), block( 0 ), labels( 0 ), target( 0 ), decl( 0 ), isCatchRest ( false ) {}
-
-StatementNode::StatementNode( DeclarationNode *decl ) : type( Decl ), control( 0 ), block( 0 ), labels( 0 ), target( 0 ), isCatchRest ( false ) {
+
+StatementNode::StatementNode( DeclarationNode *decl ) {
         if ( decl ) {
-                if ( DeclarationNode *agg = decl->extractAggregate() ) {
-                        this->decl = agg;
-                        StatementNode *nextStmt = new StatementNode;
-                        nextStmt->type = Decl;
-                        nextStmt->decl = decl;
-                        next = nextStmt;
-                        if ( decl->get_link() ) {
-                                next->set_next( new StatementNode( dynamic_cast< DeclarationNode* >( decl->get_link() ) ) );
+                DeclarationNode *agg = decl->extractAggregate();
+                if ( agg ) {
+                        StatementNode *nextStmt = new StatementNode( new DeclStmt( noLabels, maybeBuild< Declaration >( decl ) ) );
+                        set_next( nextStmt );
+                        if ( decl->get_next() ) {
+                                get_next()->set_next( new StatementNode( dynamic_cast< DeclarationNode * >(decl->get_next()) ) );
                                 decl->set_next( 0 );
                         } // if
                 } else {
-                        if ( decl->get_link() ) {
-                                next = new StatementNode( dynamic_cast< DeclarationNode* >( decl->get_link() ) );
+                        if ( decl->get_next() ) {
+                                set_next(new StatementNode( dynamic_cast< DeclarationNode * >( decl->get_next() ) ) );
                                 decl->set_next( 0 );
                         } // if
-                        this->decl = decl;
+                        agg = decl;
                 } // if
+                stmt.reset( new DeclStmt( noLabels, maybeBuild< Declaration >(agg) ) );
+        } else {
+                assert( false );
         } // if
 }
 
-StatementNode::StatementNode( Type t, ExpressionNode *ctrl_label, StatementNode *block ) : type( t ), control( ctrl_label ), block( block ), labels( 0 ), target( 0 ), decl( 0 ), isCatchRest ( false ) {
-        this->control = ( t == Default ) ? 0 : control;
-}
-
-StatementNode::StatementNode( Type t, string *target ) : type( t ), control( 0 ), block( 0 ), labels( 0 ), target( target ), decl( 0 ), isCatchRest ( false ) {}
-
-StatementNode::~StatementNode() {
-        delete control;
-        delete block;
-        delete target;
-        delete decl;
-}
-
-StatementNode * StatementNode::newCatchStmt( DeclarationNode *d, StatementNode *s, bool catchRestP ) {
-        StatementNode *ret = new StatementNode( StatementNode::Catch, 0, s );
-        ret->addDeclaration( d );
-        ret->setCatchRest( catchRestP );
-
-        return ret;
-}
-
-std::string StatementNode::get_target() const{
-        if ( target )
-                return *target;
-
-        return string("");
-}
-
-StatementNode * StatementNode::clone() const {
-        StatementNode *newnode = new StatementNode( type, maybeClone( control ), maybeClone( block ) );
-        if ( target ) {
-                newnode->target = new string( *target );
-        } else {
-                newnode->target = 0;
+StatementNode *StatementNode::append_last_case( StatementNode *stmt ) {
+        StatementNode *prev = this;
+        // find end of list and maintain previous pointer
+        for ( StatementNode * curr = prev; curr != nullptr; curr = (StatementNode *)curr->get_next() ) {
+                StatementNode *node = dynamic_cast< StatementNode * >(curr);
+                assert( node );
+                assert( dynamic_cast< CaseStmt * >(node->stmt.get()) );
+                prev = curr;
+        } // for
+        // convert from StatementNode list to Statement list
+        StatementNode *node = dynamic_cast< StatementNode * >(prev);
+        std::list< Statement * > stmts;
+        buildMoveList( stmt, stmts );
+        // splice any new Statements to end of current Statements
+        CaseStmt * caseStmt = dynamic_cast< CaseStmt * >(node->stmt.get());
+        caseStmt->get_statements().splice( caseStmt->get_statements().end(), stmts );
+        return this;
+}
+
+Statement *build_expr( ExpressionNode *ctl ) {
+        Expression *e = maybeMoveBuild< Expression >( ctl );
+
+        if ( e )
+                return new ExprStmt( noLabels, e );
+        else
+                return new NullStmt( noLabels );
+}
+
+Statement *build_if( ExpressionNode *ctl, StatementNode *then_stmt, StatementNode *else_stmt ) {
+        Statement *thenb, *elseb = 0;
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( then_stmt, branches );
+        assert( branches.size() == 1 );
+        thenb = branches.front();
+
+        if ( else_stmt ) {
+                std::list< Statement * > branches;
+                buildMoveList< Statement, StatementNode >( else_stmt, branches );
+                assert( branches.size() == 1 );
+                elseb = branches.front();
         } // if
-        newnode->decl = maybeClone( decl );
-        return newnode;
-}
-
-StatementNode *StatementNode::add_label( const std::string *l ) {
-        if ( l != 0 ) {
-                labels.push_front( *l );
-                delete l;
+        return new IfStmt( noLabels, notZeroExpr( maybeMoveBuild< Expression >(ctl) ), thenb, elseb );
+}
+
+Statement *build_switch( ExpressionNode *ctl, StatementNode *stmt ) {
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( stmt, branches );
+        assert( branches.size() >= 0 );                                         // size == 0 for switch (...) {}, i.e., no declaration or statements
+        return new SwitchStmt( noLabels, maybeMoveBuild< Expression >(ctl), branches );
+}
+Statement *build_case( ExpressionNode *ctl ) {
+        std::list< Statement * > branches;
+        return new CaseStmt( noLabels, maybeMoveBuild< Expression >(ctl), branches );
+}
+Statement *build_default() {
+        std::list< Statement * > branches;
+        return new CaseStmt( noLabels, nullptr, branches, true );
+}
+
+Statement *build_while( ExpressionNode *ctl, StatementNode *stmt, bool kind ) {
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( stmt, branches );
+        assert( branches.size() == 1 );
+        return new WhileStmt( noLabels, notZeroExpr( maybeMoveBuild< Expression >(ctl) ), branches.front(), kind );
+}
+
+Statement *build_for( ForCtl *forctl, StatementNode *stmt ) {
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( stmt, branches );
+        assert( branches.size() == 1 );
+
+        std::list< Statement * > init;
+        if ( forctl->init != 0 ) {
+                buildMoveList( forctl->init, init );
         } // if
-        return this;
-}
-
-StatementNode *StatementNode::append_block( StatementNode *stmt ) {
-        if ( stmt != 0 ) {
-                if ( block == 0 )
-                        block = stmt;
-                else
-                        block->set_link( stmt );
-        } // if
-        return this;
-}
-
-StatementNode *StatementNode::append_last_case( StatementNode *stmt ) {
-        if ( stmt != 0 ) {
-                StatementNode *next = ( StatementNode *)get_link();
-                if ( next && ( next->get_type() == StatementNode::Case || next->get_type() == StatementNode::Default ) )
-                        next->append_last_case ( stmt );
-                else
-                        if ( block == 0 )
-                                block = stmt;
-                        else
-                                block->set_link( stmt );
-        } // if
-        return this;
-}
-
-void StatementNode::print( std::ostream &os, int indent ) const {
-        if ( ! labels.empty() ) {
-                std::list<std::string>::const_iterator i;
-
-                os << string( indent, ' ' );
-                for ( i = labels.begin(); i != labels.end(); i++ )
-                        os << *i << ":";
-                os << endl;
-        } // if
-
-        switch ( type ) {
-          case Decl:
-                decl->print( os, indent );
-                break;
-          case Exp:
-                if ( control ) {
-                        os << string( indent, ' ' );
-                        control->print( os, indent );
-                        os << endl;
-                } else
-                        os << string( indent, ' ' ) << "Null Statement" << endl;
-                break;
-          default:
-                os << string( indent, ' ' ) << StatementNode::StType[type] << endl;
-                if ( type == Catch ) {
-                        if ( decl ) {
-                                os << string( indent + ParseNode::indent_by, ' ' ) << "Declaration: " << endl;
-                                decl->print( os, indent + 2 * ParseNode::indent_by );
-                        } else if ( isCatchRest ) {
-                                os << string( indent + ParseNode::indent_by, ' ' ) << "Catches the rest " << endl;
-                        } else {
-                                ; // should never reach here
-                        } // if
-                } // if
-                if ( control ) {
-                        os << string( indent + ParseNode::indent_by, ' ' ) << "Control: " << endl;
-                        control->printList( os, indent + 2 * ParseNode::indent_by );
-                } // if
-                if ( block ) {
-                        os << string( indent + ParseNode::indent_by, ' ' ) << "Cases: " << endl;
-                        block->printList( os, indent + 2 * ParseNode::indent_by );
-                } // if
-                if ( target ) {
-                        os << string( indent + ParseNode::indent_by, ' ' ) << "Target: " << get_target() << endl;
-                } // if
-                break;
-        } // switch
-}
-
-Statement *StatementNode::build() const {
-        std::list<Statement *> branches;
-        std::list<Expression *> exps;
-        std::list<Label> labs;
-
-        if ( ! labels.empty() ) {
-                std::back_insert_iterator< std::list<Label> > lab_it( labs );
-                copy( labels.begin(), labels.end(), lab_it );
-        } // if
-
-        // try {
-        buildList<Statement, StatementNode>( get_block(), branches );
-
-        switch ( type ) {
-          case Decl:
-                return new DeclStmt( labs, maybeBuild< Declaration >( decl ) );
-          case Exp:
-                {
-                        Expression *e = maybeBuild< Expression >( get_control() );
-
-                        if ( e )
-                                return new ExprStmt( labs, e );
-                        else
-                                return new NullStmt( labs );
-                }
-          case If:
-                {
-                        Statement *thenb = 0, *elseb = 0;
-                        assert( branches.size() >= 1 );
-
-                        thenb = branches.front();
-                        branches.pop_front();
-                        if ( ! branches.empty() ) {
-                                elseb = branches.front();
-                                branches.pop_front();
-                        } // if
-                        return new IfStmt( labs, notZeroExpr( maybeBuild<Expression>(get_control()) ), thenb, elseb );
-                }
-          case While:
-                assert( branches.size() == 1 );
-                return new WhileStmt( labs, notZeroExpr( maybeBuild<Expression>(get_control()) ), branches.front() );
-          case Do:
-                assert( branches.size() == 1 );
-                return new WhileStmt( labs, notZeroExpr( maybeBuild<Expression>(get_control()) ), branches.front(), true );
-          case For:
-                {
-                        assert( branches.size() == 1 );
-
-                        ForCtlExprNode *ctl = dynamic_cast<ForCtlExprNode *>( get_control() );
-                        assert( ctl != 0 );
-
-                        std::list<Statement *> init;
-                        if ( ctl->get_init() != 0 ) {
-                                buildList( ctl->get_init(), init );
-                        } // if
-
-                        Expression *cond = 0;
-                        if ( ctl->get_condition() != 0 )
-                                cond = notZeroExpr( maybeBuild<Expression>(ctl->get_condition()) );
-
-                        Expression *incr = 0;
-                        if ( ctl->get_change() != 0 )
-                                incr = maybeBuild<Expression>(ctl->get_change());
-
-                        return new ForStmt( labs, init, cond, incr, branches.front() );
-                }
-          case Switch:
-                return new SwitchStmt( labs, maybeBuild<Expression>(get_control()), branches );
-          case Case:
-                return new CaseStmt( labs, maybeBuild<Expression>(get_control()), branches );
-          case Default:
-                return new CaseStmt( labs, 0, branches, true );
-          case Goto:
-                {
-                        if ( get_target() == "" ) {                                     // computed goto
-                                assert( get_control() != 0 );
-                                return new BranchStmt( labs, maybeBuild<Expression>(get_control()), BranchStmt::Goto );
-                        } // if
-
-                        return new BranchStmt( labs, get_target(), BranchStmt::Goto );
-                }
-          case Break:
-                return new BranchStmt( labs, get_target(), BranchStmt::Break );
-          case Continue:
-                return new BranchStmt( labs, get_target(), BranchStmt::Continue );
-          case Return:
-          case Throw :
-                buildList( get_control(), exps );
-                if ( exps.size() ==0 )
-                        return new ReturnStmt( labs, 0, type == Throw );
-                if ( exps.size() > 0 )
-                        return new ReturnStmt( labs, exps.back(), type == Throw );
-          case Try:
-                {
-                        assert( branches.size() >= 0 );
-                        CompoundStmt *tryBlock = dynamic_cast<CompoundStmt *>( branches.front());
-                        branches.pop_front();
-                        FinallyStmt *finallyBlock = 0;
-                        if ( ( finallyBlock = dynamic_cast<FinallyStmt *>( branches.back())) ) {
-                                branches.pop_back();
-                        } // if
-                        return new TryStmt( labs, tryBlock, branches, finallyBlock );
-                }
-          case Catch:
-                {
-                        assert( branches.size() == 1 );
-
-                        return new CatchStmt( labs, maybeBuild< Declaration >( decl ), branches.front(), isCatchRest );
-                }
-          case Finally:
-                {
-                        assert( branches.size() == 1 );
-                        CompoundStmt *block = dynamic_cast<CompoundStmt *>( branches.front() );
-                        assert( block != 0 );
-
-                        return new FinallyStmt( labs, block );
-                }
-          case Asm:
-                assert( false );
-          default:
-                // shouldn't be here
-                return 0;
-        } // switch
-}
-
-
-CompoundStmtNode::CompoundStmtNode() : first( 0 ), last( 0 ) {}
-
-CompoundStmtNode::CompoundStmtNode( const string *name_ ) : StatementNode( name_ ), first( 0 ), last( 0 ) {}
-
-CompoundStmtNode::CompoundStmtNode( StatementNode *stmt ) : first( stmt ) {
-        if ( first ) {
-                last = ( StatementNode *)( stmt->get_last());
-        } else {
-                last = 0;
-        } // if
-}
-
-CompoundStmtNode::~CompoundStmtNode() {
-        delete first;
-}
-
-void CompoundStmtNode::add_statement( StatementNode *stmt ) {
-        if ( stmt != 0 ) {
-                last->set_link( stmt );
-                last = ( StatementNode *)( stmt->get_link());
-        } // if
-}
-
-void CompoundStmtNode::print( ostream &os, int indent ) const {
-        if ( first ) {
-                first->printList( os, indent+2 );
-        } // if
-}
-
-Statement *CompoundStmtNode::build() const {
-        std::list<Label> labs;
-        const std::list<std::string> &labels = get_labels();
-
-        if ( ! labels.empty() ) {
-                std::back_insert_iterator< std::list<Label> > lab_it( labs );
-                copy( labels.begin(), labels.end(), lab_it );
-        } // if
-
-        CompoundStmt *cs = new CompoundStmt( labs );
-        buildList( first, cs->get_kids() );
+
+        Expression *cond = 0;
+        if ( forctl->condition != 0 )
+                cond = notZeroExpr( maybeMoveBuild< Expression >(forctl->condition) );
+
+        Expression *incr = 0;
+        if ( forctl->change != 0 )
+                incr = maybeMoveBuild< Expression >(forctl->change);
+
+        delete forctl;
+        return new ForStmt( noLabels, init, cond, incr, branches.front() );
+}
+
+Statement *build_branch( std::string identifier, BranchStmt::Type kind ) {
+        return new BranchStmt( noLabels, identifier, kind );
+}
+Statement *build_computedgoto( ExpressionNode *ctl ) {
+        return new BranchStmt( noLabels, maybeMoveBuild< Expression >(ctl), BranchStmt::Goto );
+}
+
+Statement *build_return( ExpressionNode *ctl ) {
+        std::list< Expression * > exps;
+        buildMoveList( ctl, exps );
+        return new ReturnStmt( noLabels, exps.size() > 0 ? exps.back() : nullptr );
+}
+Statement *build_throw( ExpressionNode *ctl ) {
+        std::list< Expression * > exps;
+        buildMoveList( ctl, exps );
+        assertf( exps.size() < 2, "This means we are leaking memory");
+        return new ReturnStmt( noLabels, !exps.empty() ? exps.back() : nullptr, true );
+}
+
+Statement *build_try( StatementNode *try_stmt, StatementNode *catch_stmt, StatementNode *finally_stmt ) {
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( catch_stmt, branches );
+        CompoundStmt *tryBlock = dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(try_stmt));
+        assert( tryBlock );
+        FinallyStmt *finallyBlock = dynamic_cast< FinallyStmt * >(maybeMoveBuild< Statement >(finally_stmt) );
+        return new TryStmt( noLabels, tryBlock, branches, finallyBlock );
+}
+Statement *build_catch( DeclarationNode *decl, StatementNode *stmt, bool catchAny ) {
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( stmt, branches );
+        assert( branches.size() == 1 );
+        return new CatchStmt( noLabels, maybeMoveBuild< Declaration >(decl), branches.front(), catchAny );
+}
+Statement *build_finally( StatementNode *stmt ) {
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( stmt, branches );
+        assert( branches.size() == 1 );
+        return new FinallyStmt( noLabels, dynamic_cast< CompoundStmt * >( branches.front() ) );
+}
+
+Statement *build_compound( StatementNode *first ) {
+        CompoundStmt *cs = new CompoundStmt( noLabels );
+        buildMoveList( first, cs->get_kids() );
         return cs;
 }
 
-
-AsmStmtNode::AsmStmtNode( Type t, bool voltile, ConstantNode *instruction, ExpressionNode *output, ExpressionNode *input, ConstantNode *clobber, LabelNode *gotolabels ) :
-        StatementNode( t ), voltile( voltile ), instruction( instruction ), output( output ), input( input ), clobber( clobber ) {
-        if ( gotolabels ) {
-                this->gotolabels = gotolabels->get_labels();
-                delete gotolabels;
-        } // if
-}
-
-AsmStmtNode::~AsmStmtNode() {
-        delete instruction; delete output; delete input; delete clobber;
-}
-
-void AsmStmtNode::print( std::ostream &os, int indent ) const {
-        StatementNode::print( os, indent );                                     // print statement labels
-        os << string( indent + ParseNode::indent_by, ' ' ) << "volatile:" << voltile << endl;
-        if ( instruction ) {
-                os << string( indent + ParseNode::indent_by, ' ' ) << "Instruction:" << endl;
-                instruction->printList( os, indent + 2 * ParseNode::indent_by );
-        } // if
-        if ( output ) {
-                os << string( indent + ParseNode::indent_by, ' ' ) << "Output:" << endl;
-                output->printList( os, indent + 2 * ParseNode::indent_by );
-        } // if
-        if ( input ) {
-                os << string( indent + ParseNode::indent_by, ' ' ) << "Input:" << endl;
-                input->printList( os, indent + 2 * ParseNode::indent_by );
-        } // if
-        if ( clobber ) {
-                os << string( indent + ParseNode::indent_by, ' ' ) << "Clobber:" << endl;
-                clobber->printList( os, indent + 2 * ParseNode::indent_by );
-        } // if
-        if ( ! gotolabels.empty() ) {
-                os << string( indent + ParseNode::indent_by, ' ' ) << "Goto Labels:" << endl;
-                os << string( indent + 2 * ParseNode::indent_by, ' ' );
-                for ( std::list<Label>::const_iterator i = gotolabels.begin();; ) {
-                        os << *i;
-                        i++;
-                  if ( i == gotolabels.end() ) break;
-                        os << ", ";
-                }
-                os << endl;
-        } // if
-}
-
-Statement *AsmStmtNode::build() const {
-        std::list<Label> labs;
-
-        if ( ! get_labels().empty() ) {
-                std::back_insert_iterator< std::list<Label> > lab_it( labs );
-                copy( get_labels().begin(), get_labels().end(), lab_it );
-        } // if
-
+Statement *build_asmstmt( bool voltile, ConstantExpr *instruction, ExpressionNode *output, ExpressionNode *input, ExpressionNode *clobber, LabelNode *gotolabels ) {
         std::list< Expression * > out, in;
         std::list< ConstantExpr * > clob;
-        buildList( output, out );
-        buildList( input, in );
-        buildList( clobber, clob );
-        std::list< Label > gotolabs = gotolabels;
-        return new AsmStmt( labs, voltile, (ConstantExpr *)maybeBuild< Expression >( instruction ), out, in, clob, gotolabs );
+
+        buildMoveList( output, out );
+        buildMoveList( input, in );
+        buildMoveList( clobber, clob );
+        return new AsmStmt( noLabels, voltile, instruction, out, in, clob, gotolabels ? gotolabels->labels : noLabels );
 }
 

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Aug  7 07:51:48 2016
-// Update Count     : 58
+// Last Modified On : Thu Aug 18 23:48:44 2016
+// Update Count     : 64
 //
 
@@ -182 +182 @@
                 break;
           case Array:
-//PAB           newtype->array->dimension = maybeClone( array->dimension );
                 newtype->array->dimension = array->dimension;
                 newtype->array->isVarLen = array->isVarLen;
@@ -479 +478 @@
 }
 
-Declaration *TypeData::buildDecl( std::string name, DeclarationNode::StorageClass sc, Expression *bitfieldWidth, bool isInline, bool isNoreturn, LinkageSpec::Type linkage, Initializer *init ) const {
+Declaration *TypeData::buildDecl( std::string name, DeclarationNode::StorageClass sc, Expression *bitfieldWidth, bool isInline, bool isNoreturn, LinkageSpec::Spec linkage, Initializer *init ) const {
         if ( kind == TypeData::Function ) {
                 FunctionDecl *decl;
@@ -489 +488 @@
                                 decl = new FunctionDecl( name, sc, linkage, buildFunction(), body, isInline, isNoreturn );
                         } else {
-                                // std::list<Label> ls;
-                                decl = new FunctionDecl( name, sc, linkage, buildFunction(), new CompoundStmt( std::list<Label>() ), isInline, isNoreturn );
+                                // std::list< Label > ls;
+                                decl = new FunctionDecl( name, sc, linkage, buildFunction(), new CompoundStmt( std::list< Label >() ), isInline, isNoreturn );
                         } // if
                 } else {
                         decl = new FunctionDecl( name, sc, linkage, buildFunction(), 0, isInline, isNoreturn );
                 } // if
-                for ( DeclarationNode *cur = function->idList; cur != 0; cur = dynamic_cast< DeclarationNode* >( cur->get_link() ) ) {
+                for ( DeclarationNode *cur = function->idList; cur != 0; cur = dynamic_cast< DeclarationNode* >( cur->get_next() ) ) {
                         if ( cur->get_name() != "" ) {
                                 decl->get_oldIdents().insert( decl->get_oldIdents().end(), cur->get_name() );
@@ -909 +908 @@
         buildList( enumeration->constants, ret->get_members() );
         std::list< Declaration * >::iterator members = ret->get_members().begin();
-        for ( const DeclarationNode *cur = enumeration->constants; cur != NULL; cur = dynamic_cast<DeclarationNode *>( cur->get_link() ), ++members ) {
-                if ( cur->get_enumeratorValue() != NULL ) {
-                        ObjectDecl *member = dynamic_cast<ObjectDecl *>(*members);
+        for ( const DeclarationNode *cur = enumeration->constants; cur != nullptr; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ), ++members ) {
+                if ( cur->get_enumeratorValue() != nullptr ) {
+                        ObjectDecl *member = dynamic_cast< ObjectDecl * >(*members);
                         member->set_init( new SingleInit( maybeBuild< Expression >( cur->get_enumeratorValue() ), std::list< Expression * >() ) );
                 } // if

src/Parser/TypeData.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 20:52:02 2016
-// Update Count     : 20
+// Last Modified On : Thu Aug 18 23:48:52 2016
+// Update Count     : 22
 //
 
@@ -126 +126 @@
         TypeData * extractAggregate( bool toplevel = true ) const;
         // helper function for DeclNodeImpl::build
-        Declaration * buildDecl( std::string name, DeclarationNode::StorageClass sc, Expression * bitfieldWidth, bool isInline, bool isNoreturn, LinkageSpec::Type linkage, Initializer * init = 0 ) const;
+        Declaration * buildDecl( std::string name, DeclarationNode::StorageClass sc, Expression * bitfieldWidth, bool isInline, bool isNoreturn, LinkageSpec::Spec linkage, Initializer * init = 0 ) const;
         // helper functions for build()
         Type::Qualifiers buildQualifiers() const;

src/Parser/TypedefTable.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:20:13 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Apr 13 16:57:30 2016
-// Update Count     : 24
+// Last Modified On : Mon Aug 15 18:24:42 2016
+// Update Count     : 25
 //
 
@@ -64 +64 @@
                 tableType::iterator curPos = table.find( identifier );
                 if ( curPos == table.end()) {
-                        list<Entry> newList;
+                        list< Entry > newList;
                         newList.push_front( newEntry );
                         table[identifier] = newList;
                 } else {
-                        list<Entry>::iterator listPos = (*curPos ).second.begin();
+                        list< Entry >::iterator listPos = (*curPos ).second.begin();
                         while ( listPos != (*curPos ).second.end() && listPos->scope > scope ) {
                                 listPos++;
@@ -127 +127 @@
         debugPrint( "Leaving scope " << currentScope << endl );
         for ( tableType::iterator i = table.begin(); i != table.end(); ) {
-                list<Entry> &declList = (*i).second;
+                list< Entry > &declList = (*i).second;
                 while ( ! declList.empty() && declList.front().scope == currentScope ) {
                         declList.pop_front();
@@ -157 +157 @@
         for ( tableType::const_iterator i = table.begin(); i != table.end(); i++) {
                 debugPrint( (*i ).first << ": " );
-                list<Entry> declList = (*i).second;
-                for ( list<Entry>::const_iterator j = declList.begin(); j != declList.end(); j++ ) {
+                list< Entry > declList = (*i).second;
+                for ( list< Entry >::const_iterator j = declList.begin(); j != declList.end(); j++ ) {
                         debugPrint( "(" << (*j).scope << " " << (*j).kind << ") " );
                 }

src/Parser/TypedefTable.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:24:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Apr 13 16:59:56 2016
-// Update Count     : 27
+// Last Modified On : Mon Aug 15 18:25:04 2016
+// Update Count     : 28
 //
 
@@ -39 +39 @@
         };
 
-        typedef std::map<std::string, std::list<Entry> > tableType;
+        typedef std::map< std::string, std::list< Entry > > tableType;
         tableType table;
 

src/Parser/lex.cc

@@ -1468 +1468 @@
  * Author           : Peter A. Buhr
  * Created On       : Sat Sep 22 08:58:10 2001
- * Last Modified By : 
- * Last Modified On : Sun Jul 31 07:19:36 2016
- * Update Count     : 459
+ * Last Modified By : Peter A. Buhr
+ * Last Modified On : Thu Aug 18 22:17:30 2016
+ * Update Count     : 472
  */
 #line 20 "lex.ll"
@@ -1480 +1480 @@
 
 #include <string>
+#include <cstdio>                                                                               // FILENAME_MAX
 
 #include "lex.h"
@@ -1491 +1492 @@
 #define RETURN_LOCN(x)          yylval.tok.loc.file = yyfilename; yylval.tok.loc.line = yylineno; return( x )
 #define RETURN_VAL(x)           yylval.tok.str = new std::string( yytext ); RETURN_LOCN( x )
-#define RETURN_CHAR(x)          yylval.tok.str = NULL; RETURN_LOCN( x )
+#define RETURN_CHAR(x)          yylval.tok.str = nullptr; RETURN_LOCN( x )
 #define RETURN_STR(x)           yylval.tok.str = strtext; RETURN_LOCN( x )
 
-#define WHITE_RETURN(x)                                                                 // do nothing
+#define WHITE_RETURN(x)         // do nothing
 #define NEWLINE_RETURN()        WHITE_RETURN( '\n' )
 #define ASCIIOP_RETURN()        RETURN_CHAR( (int)yytext[0] ) // single character operator
-#define NAMEDOP_RETURN(x)       RETURN_VAL( x )                         // multichar operator, with a name
+#define NAMEDOP_RETURN(x)       RETURN_CHAR( x )                        // multichar operator, with a name
 #define NUMERIC_RETURN(x)       rm_underscore(); RETURN_VAL( x ) // numeric constant
 #define KEYWORD_RETURN(x)       RETURN_CHAR( x )                        // keyword
@@ -1531 +1532 @@
 
 
-#line 1534 "Parser/lex.cc"
+#line 1535 "Parser/lex.cc"
 
 #define INITIAL 0
@@ -1723 +1724 @@
         register int yy_act;
     
-#line 138 "lex.ll"
+#line 139 "lex.ll"
 
                                    /* line directives */
-#line 1729 "Parser/lex.cc"
+#line 1730 "Parser/lex.cc"
 
         if ( !(yy_init) )
@@ -1823 +1824 @@
 /* rule 1 can match eol */
 YY_RULE_SETUP
-#line 140 "lex.ll"
+#line 141 "lex.ll"
 {
         /* " stop highlighting */
+        static char *filename[FILENAME_MAX];                            // temporarily store current source-file name
         char *end_num;
         char *begin_string, *end_string;
-        char *filename;
         long lineno, length;
         lineno = strtol( yytext + 1, &end_num, 0 );
         begin_string = strchr( end_num, '"' );
-        if ( begin_string ) {
-                end_string = strchr( begin_string + 1, '"' );
-                if ( end_string ) {
-                        length = end_string - begin_string - 1;
-                        filename = new char[ length + 1 ];
-                        memcpy( filename, begin_string + 1, length );
-                        filename[ length ] = '\0';
-                        //std::cout << "file " << filename << " line " << lineno << std::endl;
-                        yylineno = lineno;
-                        yyfilename = filename;
-                } // if
+        if ( begin_string ) {                                                           // file name ?
+                end_string = strchr( begin_string + 1, '"' );   // look for ending delimiter
+                assert( end_string );                                                   // closing quote ?
+                length = end_string - begin_string - 1;                 // file-name length without quotes or sentinel
+                assert( length < FILENAME_MAX );                                // room for sentinel ?
+                memcpy( &filename, begin_string + 1, length );  // copy file name from yytext
+                filename[ length ] = '\0';                                              // terminate string with sentinel
+                //std::cout << "file " << filename << " line " << lineno << std::endl;
+                yylineno = lineno;
+                yyfilename = filename[0];
         } // if
 }

src/Parser/lex.ll

@@ -9 +9 @@
  * Author           : Peter A. Buhr
  * Created On       : Sat Sep 22 08:58:10 2001
- * Last Modified By : 
- * Last Modified On : Sun Jul 31 07:19:36 2016
- * Update Count     : 459
+ * Last Modified By : Peter A. Buhr
+ * Last Modified On : Thu Aug 18 22:17:30 2016
+ * Update Count     : 472
  */
 
@@ -25 +25 @@
 
 #include <string>
+#include <cstdio>                                                                               // FILENAME_MAX
 
 #include "lex.h"
@@ -36 +37 @@
 #define RETURN_LOCN(x)          yylval.tok.loc.file = yyfilename; yylval.tok.loc.line = yylineno; return( x )
 #define RETURN_VAL(x)           yylval.tok.str = new std::string( yytext ); RETURN_LOCN( x )
-#define RETURN_CHAR(x)          yylval.tok.str = NULL; RETURN_LOCN( x )
+#define RETURN_CHAR(x)          yylval.tok.str = nullptr; RETURN_LOCN( x )
 #define RETURN_STR(x)           yylval.tok.str = strtext; RETURN_LOCN( x )
 
-#define WHITE_RETURN(x)                                                                 // do nothing
+#define WHITE_RETURN(x)         // do nothing
 #define NEWLINE_RETURN()        WHITE_RETURN( '\n' )
 #define ASCIIOP_RETURN()        RETURN_CHAR( (int)yytext[0] ) // single character operator
-#define NAMEDOP_RETURN(x)       RETURN_VAL( x )                         // multichar operator, with a name
+#define NAMEDOP_RETURN(x)       RETURN_CHAR( x )                        // multichar operator, with a name
 #define NUMERIC_RETURN(x)       rm_underscore(); RETURN_VAL( x ) // numeric constant
 #define KEYWORD_RETURN(x)       RETURN_CHAR( x )                        // keyword
@@ -140 +141 @@
 ^{h_white}*"#"{h_white}*[0-9]+{h_white}*["][^"\n]+["].*"\n" {
         /* " stop highlighting */
+        static char *filename[FILENAME_MAX];                            // temporarily store current source-file name
         char *end_num;
         char *begin_string, *end_string;
-        char *filename;
         long lineno, length;
         lineno = strtol( yytext + 1, &end_num, 0 );
         begin_string = strchr( end_num, '"' );
-        if ( begin_string ) {
-                end_string = strchr( begin_string + 1, '"' );
-                if ( end_string ) {
-                        length = end_string - begin_string - 1;
-                        filename = new char[ length + 1 ];
-                        memcpy( filename, begin_string + 1, length );
-                        filename[ length ] = '\0';
-                        //std::cout << "file " << filename << " line " << lineno << std::endl;
-                        yylineno = lineno;
-                        yyfilename = filename;
-                } // if
+        if ( begin_string ) {                                                           // file name ?
+                end_string = strchr( begin_string + 1, '"' );   // look for ending delimiter
+                assert( end_string );                                                   // closing quote ?
+                length = end_string - begin_string - 1;                 // file-name length without quotes or sentinel
+                assert( length < FILENAME_MAX );                                // room for sentinel ?
+                memcpy( &filename, begin_string + 1, length );  // copy file name from yytext
+                filename[ length ] = '\0';                                              // terminate string with sentinel
+                //std::cout << "file " << filename << " line " << lineno << std::endl;
+                yylineno = lineno;
+                yyfilename = filename[0];
         } // if
 }

src/Parser/module.mk

@@ -11 +11 @@
 ## Created On       : Sat May 16 15:29:09 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Thu Jan 28 11:57:23 2016
-## Update Count     : 100
+## Last Modified On : Tue Aug 16 17:28:34 2016
+## Update Count     : 101
 ###############################################################################
 
@@ -29 +29 @@
        Parser/TypeData.cc \
        Parser/LinkageSpec.cc \
-       Parser/parseutility.cc \
-       Parser/Parser.cc
+       Parser/parseutility.cc
 
 MAINTAINERCLEANFILES += Parser/parser.output

src/Parser/parser.cc

@@ -1 @@
-/* A Bison parser, made by GNU Bison 2.5.  */
+/* A Bison parser, made by GNU Bison 3.0.2.  */
 
 /* Bison implementation for Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
-   
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
@@ -27 +27 @@
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
@@ -45 +45 @@
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.5"
+#define YYBISON_VERSION "3.0.2"
 
 /* Skeleton name.  */
@@ -59 +59 @@
 #define YYPULL 1
 
-/* Using locations.  */
-#define YYLSP_NEEDED 0
 
 
 
 /* Copy the first part of user declarations.  */
-
-/* Line 268 of yacc.c  */
-#line 42 "parser.yy"
+#line 42 "parser.yy" /* yacc.c:339  */
 
 #define YYDEBUG_LEXER_TEXT (yylval)                                             // lexer loads this up each time
 #define YYDEBUG 1                                                                               // get the pretty debugging code to compile
-extern char *yytext;
 
 #undef __GNUC_MINOR__
@@ -84 +79 @@
 #include "LinkageSpec.h"
 
-DeclarationNode *theTree = 0;                                                   // the resulting parse tree
-LinkageSpec::Type linkage = LinkageSpec::Cforall;
-std::stack< LinkageSpec::Type > linkageStack;
-TypedefTable typedefTable;
+extern DeclarationNode * parseTree;
+extern LinkageSpec::Spec linkage;
+extern TypedefTable typedefTable;
+
+std::stack< LinkageSpec::Spec > linkageStack;
 
 void appendStr( std::string &to, std::string *from ) {
@@ -94 +90 @@
 } // appendStr
 
-
-/* Line 268 of yacc.c  */
-#line 99 "Parser/parser.cc"
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
+#line 93 "Parser/parser.cc" /* yacc.c:339  */
+
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
 
 /* Enabling verbose error messages.  */
@@ -111 +108 @@
 #endif
 
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
+/* In a future release of Bison, this section will be replaced
+   by #include "y.tab.h".  */
+#ifndef YY_YY_Y_TAB_H_INCLUDED
+# define YY_YY_Y_TAB_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
 #endif
-
-
-/* Tokens.  */
+#if YYDEBUG
+extern int yydebug;
+#endif
+
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     TYPEDEF = 258,
-     AUTO = 259,
-     EXTERN = 260,
-     REGISTER = 261,
-     STATIC = 262,
-     INLINE = 263,
-     FORTRAN = 264,
-     CONST = 265,
-     VOLATILE = 266,
-     RESTRICT = 267,
-     FORALL = 268,
-     LVALUE = 269,
-     VOID = 270,
-     CHAR = 271,
-     SHORT = 272,
-     INT = 273,
-     LONG = 274,
-     FLOAT = 275,
-     DOUBLE = 276,
-     SIGNED = 277,
-     UNSIGNED = 278,
-     VALIST = 279,
-     BOOL = 280,
-     COMPLEX = 281,
-     IMAGINARY = 282,
-     TYPEOF = 283,
-     LABEL = 284,
-     ENUM = 285,
-     STRUCT = 286,
-     UNION = 287,
-     OTYPE = 288,
-     FTYPE = 289,
-     DTYPE = 290,
-     TRAIT = 291,
-     SIZEOF = 292,
-     OFFSETOF = 293,
-     ATTRIBUTE = 294,
-     EXTENSION = 295,
-     IF = 296,
-     ELSE = 297,
-     SWITCH = 298,
-     CASE = 299,
-     DEFAULT = 300,
-     DO = 301,
-     WHILE = 302,
-     FOR = 303,
-     BREAK = 304,
-     CONTINUE = 305,
-     GOTO = 306,
-     RETURN = 307,
-     CHOOSE = 308,
-     DISABLE = 309,
-     ENABLE = 310,
-     FALLTHRU = 311,
-     TRY = 312,
-     CATCH = 313,
-     CATCHRESUME = 314,
-     FINALLY = 315,
-     THROW = 316,
-     THROWRESUME = 317,
-     AT = 318,
-     ASM = 319,
-     ALIGNAS = 320,
-     ALIGNOF = 321,
-     ATOMIC = 322,
-     GENERIC = 323,
-     NORETURN = 324,
-     STATICASSERT = 325,
-     THREADLOCAL = 326,
-     IDENTIFIER = 327,
-     QUOTED_IDENTIFIER = 328,
-     TYPEDEFname = 329,
-     TYPEGENname = 330,
-     ATTR_IDENTIFIER = 331,
-     ATTR_TYPEDEFname = 332,
-     ATTR_TYPEGENname = 333,
-     INTEGERconstant = 334,
-     FLOATINGconstant = 335,
-     CHARACTERconstant = 336,
-     STRINGliteral = 337,
-     ZERO = 338,
-     ONE = 339,
-     ARROW = 340,
-     ICR = 341,
-     DECR = 342,
-     LS = 343,
-     RS = 344,
-     LE = 345,
-     GE = 346,
-     EQ = 347,
-     NE = 348,
-     ANDAND = 349,
-     OROR = 350,
-     ELLIPSIS = 351,
-     MULTassign = 352,
-     DIVassign = 353,
-     MODassign = 354,
-     PLUSassign = 355,
-     MINUSassign = 356,
-     LSassign = 357,
-     RSassign = 358,
-     ANDassign = 359,
-     ERassign = 360,
-     ORassign = 361,
-     ATassign = 362,
-     THEN = 363
-   };
+  enum yytokentype
+  {
+    TYPEDEF = 258,
+    AUTO = 259,
+    EXTERN = 260,
+    REGISTER = 261,
+    STATIC = 262,
+    INLINE = 263,
+    FORTRAN = 264,
+    CONST = 265,
+    VOLATILE = 266,
+    RESTRICT = 267,
+    FORALL = 268,
+    LVALUE = 269,
+    VOID = 270,
+    CHAR = 271,
+    SHORT = 272,
+    INT = 273,
+    LONG = 274,
+    FLOAT = 275,
+    DOUBLE = 276,
+    SIGNED = 277,
+    UNSIGNED = 278,
+    VALIST = 279,
+    BOOL = 280,
+    COMPLEX = 281,
+    IMAGINARY = 282,
+    TYPEOF = 283,
+    LABEL = 284,
+    ENUM = 285,
+    STRUCT = 286,
+    UNION = 287,
+    OTYPE = 288,
+    FTYPE = 289,
+    DTYPE = 290,
+    TRAIT = 291,
+    SIZEOF = 292,
+    OFFSETOF = 293,
+    ATTRIBUTE = 294,
+    EXTENSION = 295,
+    IF = 296,
+    ELSE = 297,
+    SWITCH = 298,
+    CASE = 299,
+    DEFAULT = 300,
+    DO = 301,
+    WHILE = 302,
+    FOR = 303,
+    BREAK = 304,
+    CONTINUE = 305,
+    GOTO = 306,
+    RETURN = 307,
+    CHOOSE = 308,
+    DISABLE = 309,
+    ENABLE = 310,
+    FALLTHRU = 311,
+    TRY = 312,
+    CATCH = 313,
+    CATCHRESUME = 314,
+    FINALLY = 315,
+    THROW = 316,
+    THROWRESUME = 317,
+    AT = 318,
+    ASM = 319,
+    ALIGNAS = 320,
+    ALIGNOF = 321,
+    ATOMIC = 322,
+    GENERIC = 323,
+    NORETURN = 324,
+    STATICASSERT = 325,
+    THREADLOCAL = 326,
+    IDENTIFIER = 327,
+    QUOTED_IDENTIFIER = 328,
+    TYPEDEFname = 329,
+    TYPEGENname = 330,
+    ATTR_IDENTIFIER = 331,
+    ATTR_TYPEDEFname = 332,
+    ATTR_TYPEGENname = 333,
+    INTEGERconstant = 334,
+    FLOATINGconstant = 335,
+    CHARACTERconstant = 336,
+    STRINGliteral = 337,
+    ZERO = 338,
+    ONE = 339,
+    ARROW = 340,
+    ICR = 341,
+    DECR = 342,
+    LS = 343,
+    RS = 344,
+    LE = 345,
+    GE = 346,
+    EQ = 347,
+    NE = 348,
+    ANDAND = 349,
+    OROR = 350,
+    ELLIPSIS = 351,
+    MULTassign = 352,
+    DIVassign = 353,
+    MODassign = 354,
+    PLUSassign = 355,
+    MINUSassign = 356,
+    LSassign = 357,
+    RSassign = 358,
+    ANDassign = 359,
+    ERassign = 360,
+    ORassign = 361,
+    ATassign = 362,
+    THEN = 363
+  };
 #endif
 /* Tokens.  */
@@ -339 +341 @@
 #define THEN 363
 
-
-
-
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
+typedef union YYSTYPE YYSTYPE;
+union YYSTYPE
 {
-
-/* Line 293 of yacc.c  */
-#line 115 "parser.yy"
+#line 115 "parser.yy" /* yacc.c:355  */
 
         Token tok;
@@ -356 +355 @@
         DeclarationNode::TypeClass tclass;
         StatementNode *sn;
-        ConstantNode *constant;
+        ConstantExpr *constant;
+        ForCtl *fctl;
         LabelNode *label;
         InitializerNode *in;
@@ -362 +362 @@
         bool flag;
 
-
-
-/* Line 293 of yacc.c  */
-#line 368 "Parser/parser.cc"
-} YYSTYPE;
+#line 365 "Parser/parser.cc" /* yacc.c:355  */
+};
 # define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
 
+extern YYSTYPE yylval;
+
+int yyparse (void);
+
+#endif /* !YY_YY_Y_TAB_H_INCLUDED  */
+
 /* Copy the second part of user declarations.  */
 
-
-/* Line 343 of yacc.c  */
-#line 380 "Parser/parser.cc"
+#line 380 "Parser/parser.cc" /* yacc.c:358  */
 
 #ifdef short
@@ -391 +391 @@
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#else
 typedef signed char yytype_int8;
-#else
-typedef short int yytype_int8;
 #endif
 
@@ -415 +412 @@
 # elif defined size_t
 #  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+# elif ! defined YYSIZE_T
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
@@ -430 +426 @@
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
 #  endif
 # endif
 # ifndef YY_
-#  define YY_(msgid) msgid
+#  define YY_(Msgid) Msgid
 # endif
 #endif
 
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+# endif
+#endif
+
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
+# define YYUSE(E) ((void) (E))
 #else
-# define YYUSE(e) /* empty */
+# define YYUSE(E) /* empty */
 #endif
 
-/* Identity function, used to suppress warnings about constant conditions.  */
-#ifndef lint
-# define YYID(n) (n)
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
 #else
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int yyi)
-#else
-static int
-YYID (yyi)
-    int yyi;
+# define YY_INITIAL_VALUE(Value) Value
 #endif
-{
-  return yyi;
-}
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
 #endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+
 
 #if ! defined yyoverflow || YYERROR_VERBOSE
@@ -480 +505 @@
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
 #     ifndef EXIT_SUCCESS
 #      define EXIT_SUCCESS 0
@@ -492 +517 @@
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
     /* The OS might guarantee only one guard page at the bottom of the stack,
@@ -509 +534 @@
 #  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \
-             && (defined YYFREE || defined free)))
+             && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #   ifndef EXIT_SUCCESS
@@ -517 +542 @@
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined malloc && ! defined EXIT_SUCCESS
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
@@ -524 +548 @@
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined free && ! defined EXIT_SUCCESS
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
@@ -535 +558 @@
 #if (! defined yyoverflow \
      && (! defined __cplusplus \
-         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
@@ -560 +583 @@
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
-    do                                                                  \
-      {                                                                 \
-        YYSIZE_T yynewbytes;                                            \
-        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
-        Stack = &yyptr->Stack_alloc;                                    \
-        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-        yyptr += yynewbytes / sizeof (*yyptr);                          \
-      }                                                                 \
-    while (YYID (0))
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (0)
 
 #endif
 
 #if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-/* Copy COUNT objects from FROM to TO.  The source and destination do
+/* Copy COUNT objects from SRC to DST.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
 #  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
 #  else
-#   define YYCOPY(To, From, Count)              \
-      do                                        \
-        {                                       \
-          YYSIZE_T yyi;                         \
-          for (yyi = 0; yyi < (Count); yyi++)   \
-            (To)[yyi] = (From)[yyi];            \
-        }                                       \
-      while (YYID (0))
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (0)
 #  endif
 # endif
@@ -594 +617 @@
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  251
+#define YYFINAL  250
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   10969
+#define YYLAST   10977
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  133
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  241
+#define YYNNTS  240
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  754
-/* YYNRULES -- Number of states.  */
-#define YYNSTATES  1577
-
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYNRULES  749
+/* YYNSTATES -- Number of states.  */
+#define YYNSTATES  1553
+
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   363
 
-#define YYTRANSLATE(YYX)                                                \
+#define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, without out-of-bounds checking.  */
 static const yytype_uint8 yytranslate[] =
 {
@@ -620 +645 @@
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   122,     2,     2,     2,   125,   119,     2,
-     109,   110,   118,   120,   116,   121,   113,   124,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,   117,   132,
-     126,   131,   127,   130,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,   121,     2,     2,     2,   124,   118,     2,
+     109,   110,   117,   119,   116,   120,   113,   123,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,   130,   132,
+     125,   131,   126,   129,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   111,     2,   112,   128,     2,     2,     2,     2,     2,
+       2,   111,     2,   112,   127,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   114,   129,   115,   123,     2,     2,     2,
+       2,     2,     2,   114,   128,   115,   122,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -657 +682 @@
 
 #if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const yytype_uint16 yyprhs[] =
-{
-       0,     0,     3,     4,     5,     7,     9,    11,    13,    15,
-      17,    19,    21,    23,    25,    27,    29,    31,    34,    36,
-      38,    42,    46,    48,    55,    60,    64,    72,    76,    84,
-      87,    90,    98,   103,   105,   109,   110,   112,   116,   124,
-     134,   136,   140,   142,   146,   154,   158,   166,   168,   170,
-     172,   175,   178,   181,   184,   187,   190,   195,   202,   204,
-     209,   214,   217,   222,   224,   226,   228,   230,   232,   234,
-     236,   241,   246,   248,   252,   256,   260,   262,   266,   270,
-     272,   276,   280,   282,   286,   290,   294,   298,   300,   304,
-     308,   310,   314,   316,   320,   322,   326,   328,   332,   334,
-     338,   340,   346,   351,   357,   359,   361,   365,   368,   369,
-     371,   373,   375,   377,   379,   381,   383,   385,   387,   389,
-     391,   393,   396,   402,   409,   417,   419,   423,   425,   429,
-     430,   432,   434,   436,   438,   440,   442,   444,   446,   448,
-     455,   460,   463,   471,   473,   477,   479,   482,   484,   487,
-     489,   492,   495,   501,   509,   515,   525,   531,   541,   543,
-     547,   549,   551,   555,   559,   562,   564,   567,   570,   571,
-     573,   576,   580,   581,   583,   586,   590,   594,   599,   600,
-     602,   604,   607,   613,   621,   628,   635,   640,   644,   649,
-     652,   656,   659,   663,   667,   671,   675,   681,   685,   689,
-     694,   696,   702,   709,   715,   722,   732,   743,   753,   764,
-     767,   769,   772,   775,   778,   780,   787,   796,   807,   820,
-     835,   836,   838,   839,   841,   843,   847,   852,   860,   861,
-     863,   867,   869,   873,   875,   877,   879,   883,   885,   887,
-     889,   893,   894,   896,   900,   905,   907,   911,   913,   915,
-     919,   923,   927,   931,   935,   938,   942,   949,   953,   957,
-     962,   964,   967,   970,   974,   980,   989,   997,  1005,  1011,
-    1021,  1024,  1027,  1033,  1037,  1043,  1048,  1052,  1057,  1062,
-    1070,  1074,  1078,  1082,  1086,  1091,  1098,  1100,  1102,  1104,
-    1106,  1108,  1110,  1112,  1114,  1115,  1117,  1119,  1122,  1124,
-    1126,  1128,  1130,  1132,  1134,  1136,  1137,  1143,  1145,  1148,
-    1152,  1154,  1157,  1159,  1161,  1163,  1165,  1167,  1169,  1171,
-    1173,  1175,  1177,  1179,  1181,  1183,  1185,  1187,  1189,  1191,
-    1193,  1195,  1197,  1199,  1201,  1203,  1206,  1209,  1213,  1217,
-    1219,  1223,  1225,  1228,  1231,  1234,  1239,  1244,  1249,  1254,
-    1256,  1259,  1262,  1266,  1268,  1271,  1274,  1276,  1279,  1282,
-    1286,  1288,  1291,  1294,  1296,  1298,  1303,  1306,  1307,  1314,
-    1322,  1325,  1328,  1331,  1332,  1335,  1338,  1342,  1345,  1349,
-    1351,  1354,  1358,  1361,  1364,  1369,  1370,  1372,  1375,  1378,
-    1380,  1381,  1383,  1386,  1389,  1395,  1398,  1399,  1407,  1410,
-    1415,  1416,  1419,  1420,  1422,  1424,  1426,  1432,  1438,  1444,
-    1446,  1452,  1458,  1468,  1470,  1476,  1477,  1479,  1481,  1487,
-    1489,  1491,  1497,  1503,  1505,  1509,  1513,  1518,  1520,  1522,
-    1524,  1526,  1529,  1531,  1535,  1539,  1541,  1544,  1546,  1550,
-    1552,  1554,  1556,  1558,  1560,  1562,  1564,  1566,  1568,  1570,
-    1572,  1575,  1577,  1579,  1581,  1584,  1585,  1588,  1591,  1593,
-    1598,  1599,  1601,  1604,  1608,  1613,  1616,  1619,  1621,  1624,
-    1626,  1629,  1635,  1641,  1649,  1656,  1658,  1661,  1664,  1668,
-    1670,  1673,  1676,  1681,  1684,  1689,  1690,  1695,  1698,  1700,
-    1702,  1704,  1705,  1708,  1714,  1720,  1734,  1736,  1738,  1742,
-    1746,  1749,  1753,  1757,  1760,  1765,  1767,  1774,  1784,  1785,
-    1797,  1799,  1803,  1807,  1811,  1813,  1815,  1821,  1824,  1830,
-    1831,  1833,  1835,  1839,  1840,  1842,  1844,  1846,  1848,  1849,
-    1856,  1859,  1861,  1864,  1869,  1872,  1876,  1880,  1884,  1889,
-    1895,  1901,  1907,  1914,  1916,  1918,  1920,  1924,  1925,  1931,
-    1932,  1934,  1936,  1939,  1946,  1948,  1952,  1953,  1955,  1960,
-    1962,  1964,  1966,  1968,  1971,  1973,  1976,  1979,  1981,  1985,
-    1988,  1992,  1996,  1999,  2004,  2009,  2013,  2022,  2026,  2029,
-    2031,  2034,  2041,  2050,  2054,  2057,  2061,  2065,  2070,  2075,
-    2079,  2081,  2083,  2085,  2090,  2097,  2101,  2104,  2108,  2112,
-    2117,  2122,  2126,  2129,  2131,  2134,  2137,  2139,  2143,  2146,
-    2150,  2154,  2157,  2162,  2167,  2171,  2178,  2187,  2191,  2194,
-    2196,  2199,  2202,  2205,  2209,  2213,  2216,  2221,  2226,  2230,
-    2237,  2246,  2250,  2253,  2255,  2258,  2261,  2263,  2265,  2268,
-    2272,  2276,  2279,  2284,  2291,  2300,  2302,  2305,  2308,  2310,
-    2313,  2316,  2320,  2324,  2326,  2331,  2336,  2340,  2346,  2355,
-    2359,  2362,  2366,  2368,  2374,  2380,  2387,  2394,  2396,  2399,
-    2402,  2404,  2407,  2410,  2414,  2418,  2420,  2425,  2430,  2434,
-    2440,  2449,  2453,  2455,  2458,  2460,  2463,  2470,  2476,  2483,
-    2491,  2499,  2501,  2504,  2507,  2509,  2512,  2515,  2519,  2523,
-    2525,  2530,  2535,  2539,  2548,  2552,  2554,  2556,  2559,  2561,
-    2563,  2566,  2570,  2573,  2577,  2580,  2584,  2588,  2591,  2596,
-    2600,  2603,  2607,  2610,  2615,  2619,  2622,  2629,  2636,  2643,
-    2651,  2653,  2656,  2658,  2660,  2662,  2665,  2669,  2672,  2676,
-    2679,  2683,  2687,  2692,  2695,  2699,  2704,  2707,  2713,  2719,
-    2726,  2733,  2734,  2736,  2737
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int16 yyrhs[] =
-{
-     302,     0,    -1,    -1,    -1,    79,    -1,    80,    -1,    81,
-      -1,    72,    -1,    76,    -1,   140,    -1,    72,    -1,    76,
-      -1,    72,    -1,   140,    -1,    83,    -1,    84,    -1,    82,
-      -1,   141,    82,    -1,    72,    -1,   140,    -1,   109,   169,
-     110,    -1,   109,   173,   110,    -1,   142,    -1,   143,   111,
-     134,   164,   135,   112,    -1,   143,   109,   144,   110,    -1,
-     143,   113,   139,    -1,   143,   113,   111,   134,   146,   135,
-     112,    -1,   143,    85,   139,    -1,   143,    85,   111,   134,
-     146,   135,   112,    -1,   143,    86,    -1,   143,    87,    -1,
-     109,   275,   110,   114,   279,   372,   115,    -1,   143,   114,
-     144,   115,    -1,   145,    -1,   144,   116,   145,    -1,    -1,
-     164,    -1,   139,   117,   164,    -1,   111,   134,   164,   135,
-     112,   117,   164,    -1,   111,   134,   164,   116,   168,   135,
-     112,   117,   164,    -1,   147,    -1,   146,   116,   147,    -1,
-     139,    -1,   139,   113,   147,    -1,   139,   113,   111,   134,
-     146,   135,   112,    -1,   139,    85,   147,    -1,   139,    85,
-     111,   134,   146,   135,   112,    -1,   143,    -1,   136,    -1,
-     141,    -1,    40,   151,    -1,   149,   151,    -1,   150,   151,
-      -1,    86,   148,    -1,    87,   148,    -1,    37,   148,    -1,
-      37,   109,   275,   110,    -1,    38,   109,   275,   116,   139,
-     110,    -1,    76,    -1,    76,   109,   276,   110,    -1,    76,
-     109,   145,   110,    -1,    66,   148,    -1,    66,   109,   275,
-     110,    -1,   118,    -1,   119,    -1,   120,    -1,   121,    -1,
-     122,    -1,   123,    -1,   148,    -1,   109,   275,   110,   151,
-      -1,   109,   275,   110,   167,    -1,   151,    -1,   152,   118,
-     151,    -1,   152,   124,   151,    -1,   152,   125,   151,    -1,
-     152,    -1,   153,   120,   152,    -1,   153,   121,   152,    -1,
-     153,    -1,   154,    88,   153,    -1,   154,    89,   153,    -1,
-     154,    -1,   155,   126,   154,    -1,   155,   127,   154,    -1,
-     155,    90,   154,    -1,   155,    91,   154,    -1,   155,    -1,
-     156,    92,   155,    -1,   156,    93,   155,    -1,   156,    -1,
-     157,   119,   156,    -1,   157,    -1,   158,   128,   157,    -1,
-     158,    -1,   159,   129,   158,    -1,   159,    -1,   160,    94,
-     159,    -1,   160,    -1,   161,    95,   160,    -1,   161,    -1,
-     161,   130,   169,   117,   162,    -1,   161,   130,   117,   162,
-      -1,   161,   130,   169,   117,   167,    -1,   162,    -1,   162,
-      -1,   148,   166,   164,    -1,   167,   373,    -1,    -1,   164,
-      -1,   131,    -1,    97,    -1,    98,    -1,    99,    -1,   100,
-      -1,   101,    -1,   102,    -1,   103,    -1,   104,    -1,   105,
-      -1,   106,    -1,   111,   112,    -1,   111,   134,   164,   135,
-     112,    -1,   111,   134,   116,   168,   135,   112,    -1,   111,
-     134,   164,   116,   168,   135,   112,    -1,   165,    -1,   168,
-     116,   165,    -1,   164,    -1,   169,   116,   164,    -1,    -1,
-     169,    -1,   172,    -1,   173,    -1,   177,    -1,   178,    -1,
-     190,    -1,   192,    -1,   193,    -1,   198,    -1,   128,   143,
-     114,   144,   115,   132,    -1,    72,   117,   312,   171,    -1,
-     114,   115,    -1,   114,   134,   134,   209,   174,   135,   115,
-      -1,   175,    -1,   174,   134,   175,    -1,   212,    -1,    40,
-     212,    -1,   308,    -1,   171,   135,    -1,   171,    -1,   176,
-     171,    -1,   170,   132,    -1,    41,   109,   169,   110,   171,
-      -1,    41,   109,   169,   110,   171,    42,   171,    -1,    43,
-     109,   169,   110,   183,    -1,    43,   109,   169,   110,   114,
-     134,   205,   184,   115,    -1,    53,   109,   169,   110,   183,
-      -1,    53,   109,   169,   110,   114,   134,   205,   186,   115,
-      -1,   163,    -1,   163,    96,   163,    -1,   310,    -1,   179,
-      -1,   180,   116,   179,    -1,    44,   180,   117,    -1,    45,
-     117,    -1,   181,    -1,   182,   181,    -1,   182,   171,    -1,
-      -1,   185,    -1,   182,   176,    -1,   185,   182,   176,    -1,
-      -1,   187,    -1,   182,   189,    -1,   182,   176,   188,    -1,
-     187,   182,   189,    -1,   187,   182,   176,   188,    -1,    -1,
-     189,    -1,    56,    -1,    56,   132,    -1,    47,   109,   169,
-     110,   171,    -1,    46,   171,    47,   109,   169,   110,   132,
-      -1,    48,   109,   134,   191,   110,   171,    -1,   170,   135,
-     132,   170,   132,   170,    -1,   212,   170,   132,   170,    -1,
-      51,    72,   132,    -1,    51,   118,   169,   132,    -1,    50,
-     132,    -1,    50,    72,   132,    -1,    49,   132,    -1,    49,
-      72,   132,    -1,    52,   170,   132,    -1,    61,   165,   132,
-      -1,    62,   165,   132,    -1,    62,   165,    63,   164,   132,
-      -1,    57,   173,   194,    -1,    57,   173,   196,    -1,    57,
-     173,   194,   196,    -1,   195,    -1,    58,   109,    96,   110,
-     173,    -1,   195,    58,   109,    96,   110,   173,    -1,    59,
-     109,    96,   110,   173,    -1,   195,    59,   109,    96,   110,
-     173,    -1,    58,   109,   134,   134,   197,   135,   110,   173,
-     135,    -1,   195,    58,   109,   134,   134,   197,   135,   110,
-     173,   135,    -1,    59,   109,   134,   134,   197,   135,   110,
-     173,   135,    -1,   195,    59,   109,   134,   134,   197,   135,
-     110,   173,   135,    -1,    60,   173,    -1,   225,    -1,   225,
-     309,    -1,   225,   357,    -1,   366,   139,    -1,   366,    -1,
-      64,   199,   109,   141,   110,   132,    -1,    64,   199,   109,
-     141,   117,   200,   110,   132,    -1,    64,   199,   109,   141,
-     117,   200,   117,   200,   110,   132,    -1,    64,   199,   109,
-     141,   117,   200,   117,   200,   117,   203,   110,   132,    -1,
-      64,   199,    51,   109,   141,   117,   117,   200,   117,   203,
-     117,   204,   110,   132,    -1,    -1,    11,    -1,    -1,   201,
-      -1,   202,    -1,   201,   116,   202,    -1,   141,   109,   163,
-     110,    -1,   111,   163,   112,   141,   109,   163,   110,    -1,
-      -1,   141,    -1,   203,   116,   141,    -1,   139,    -1,   204,
-     116,   139,    -1,   135,    -1,   206,    -1,   212,    -1,   206,
-     134,   212,    -1,   135,    -1,   208,    -1,   222,    -1,   208,
-     134,   222,    -1,    -1,   210,    -1,    29,   211,   132,    -1,
-     210,    29,   211,   132,    -1,   274,    -1,   211,   116,   274,
-      -1,   213,    -1,   222,    -1,   214,   135,   132,    -1,   219,
-     135,   132,    -1,   216,   135,   132,    -1,   293,   135,   132,
-      -1,   296,   135,   132,    -1,   215,   277,    -1,   231,   215,
-     277,    -1,   214,   135,   116,   134,   272,   277,    -1,   367,
-     272,   311,    -1,   370,   272,   311,    -1,   227,   370,   272,
-     311,    -1,   217,    -1,   227,   217,    -1,   231,   217,    -1,
-     231,   227,   217,    -1,   216,   135,   116,   134,   272,    -1,
-     111,   112,   272,   109,   134,   260,   135,   110,    -1,   370,
-     272,   109,   134,   260,   135,   110,    -1,   218,   272,   109,
-     134,   260,   135,   110,    -1,   111,   134,   262,   135,   112,
-      -1,   111,   134,   262,   135,   116,   134,   263,   135,   112,
-      -1,     3,   215,    -1,     3,   217,    -1,   219,   135,   116,
-     134,   139,    -1,     3,   225,   309,    -1,   220,   135,   116,
-     134,   309,    -1,   227,     3,   225,   309,    -1,   225,     3,
-     309,    -1,   225,     3,   227,   309,    -1,     3,   139,   131,
-     164,    -1,   221,   135,   116,   134,   139,   131,   164,    -1,
-     223,   135,   132,    -1,   220,   135,   132,    -1,   221,   135,
-     132,    -1,   240,   135,   132,    -1,   224,   309,   311,   277,
-      -1,   223,   116,   312,   309,   311,   277,    -1,   236,    -1,
-     240,    -1,   242,    -1,   283,    -1,   237,    -1,   241,    -1,
-     243,    -1,   284,    -1,    -1,   227,    -1,   228,    -1,   227,
-     228,    -1,   229,    -1,   314,    -1,    10,    -1,    12,    -1,
-      11,    -1,    14,    -1,    67,    -1,    -1,    13,   109,   230,
-     286,   110,    -1,   232,    -1,   227,   232,    -1,   231,   227,
-     232,    -1,   233,    -1,   232,   233,    -1,   234,    -1,     5,
-      -1,     7,    -1,     4,    -1,     6,    -1,     8,    -1,     9,
-      -1,    69,    -1,    71,    -1,    16,    -1,    21,    -1,    20,
-      -1,    18,    -1,    19,    -1,    17,    -1,    22,    -1,    23,
-      -1,    15,    -1,    25,    -1,    26,    -1,    27,    -1,    24,
-      -1,   237,    -1,   231,   237,    -1,   236,   233,    -1,   236,
-     233,   227,    -1,   236,   233,   237,    -1,   238,    -1,   226,
-     239,   226,    -1,   235,    -1,   227,   235,    -1,   238,   228,
-      -1,   238,   235,    -1,    28,   109,   276,   110,    -1,    28,
-     109,   169,   110,    -1,    78,   109,   276,   110,    -1,    78,
-     109,   169,   110,    -1,   241,    -1,   231,   241,    -1,   240,
-     233,    -1,   240,   233,   227,    -1,   244,    -1,   227,   244,
-      -1,   241,   228,    -1,   243,    -1,   231,   243,    -1,   242,
-     233,    -1,   242,   233,   227,    -1,    74,    -1,   227,    74,
-      -1,   243,   228,    -1,   245,    -1,   256,    -1,   247,   114,
-     248,   115,    -1,   247,   274,    -1,    -1,   247,   274,   246,
-     114,   248,   115,    -1,   247,   109,   292,   110,   114,   248,
-     115,    -1,   247,   285,    -1,    31,   312,    -1,    32,   312,
-      -1,    -1,   248,   249,    -1,   250,   132,    -1,    40,   250,
-     132,    -1,   251,   132,    -1,    40,   251,   132,    -1,   366,
-      -1,   366,   274,    -1,   250,   116,   274,    -1,   250,   116,
-      -1,   225,   252,    -1,   251,   116,   312,   252,    -1,    -1,
-     254,    -1,   318,   253,    -1,   331,   253,    -1,   357,    -1,
-      -1,   254,    -1,   117,   163,    -1,    30,   312,    -1,   255,
-     114,   258,   372,   115,    -1,   255,   274,    -1,    -1,   255,
-     274,   257,   114,   258,   372,   115,    -1,   274,   259,    -1,
-     258,   116,   274,   259,    -1,    -1,   131,   163,    -1,    -1,
-     261,    -1,   263,    -1,   262,    -1,   262,   135,   116,   134,
-     263,    -1,   263,   135,   116,   134,    96,    -1,   262,   135,
-     116,   134,    96,    -1,   267,    -1,   263,   135,   116,   134,
-     267,    -1,   262,   135,   116,   134,   267,    -1,   262,   135,
-     116,   134,   263,   135,   116,   134,   267,    -1,   268,    -1,
-     263,   135,   116,   134,   268,    -1,    -1,   265,    -1,   266,
-      -1,   266,   135,   116,   134,    96,    -1,   270,    -1,   269,
-      -1,   266,   135,   116,   134,   270,    -1,   266,   135,   116,
-     134,   269,    -1,   269,    -1,   362,   272,   373,    -1,   370,
-     272,   373,    -1,   227,   370,   272,   373,    -1,   217,    -1,
-     270,    -1,   362,    -1,   370,    -1,   227,   370,    -1,   371,
-      -1,   224,   336,   373,    -1,   224,   340,   373,    -1,   224,
-      -1,   224,   351,    -1,   139,    -1,   271,   116,   139,    -1,
-     137,    -1,    74,    -1,    75,    -1,   138,    -1,    74,    -1,
-      75,    -1,   139,    -1,    74,    -1,    75,    -1,   366,    -1,
-     225,    -1,   225,   357,    -1,   366,    -1,   371,    -1,   225,
-      -1,   225,   345,    -1,    -1,   131,   278,    -1,   107,   278,
-      -1,   164,    -1,   114,   279,   372,   115,    -1,    -1,   278,
-      -1,   280,   278,    -1,   279,   116,   278,    -1,   279,   116,
-     280,   278,    -1,   281,   117,    -1,   274,   117,    -1,   282,
-      -1,   281,   282,    -1,    80,    -1,   113,   274,    -1,   111,
-     134,   164,   135,   112,    -1,   111,   134,   310,   135,   112,
-      -1,   111,   134,   163,    96,   163,   135,   112,    -1,   113,
-     111,   134,   146,   135,   112,    -1,   284,    -1,   231,   284,
-      -1,   283,   233,    -1,   283,   233,   227,    -1,   285,    -1,
-     227,   285,    -1,   284,   228,    -1,    75,   109,   292,   110,
-      -1,   287,   373,    -1,   286,   116,   287,   373,    -1,    -1,
-     289,   274,   288,   290,    -1,   225,   336,    -1,    33,    -1,
-      35,    -1,    34,    -1,    -1,   290,   291,    -1,   129,   274,
-     109,   292,   110,    -1,   129,   114,   134,   298,   115,    -1,
-     129,   109,   134,   286,   135,   110,   114,   134,   298,   115,
-     109,   292,   110,    -1,   276,    -1,   164,    -1,   292,   116,
-     276,    -1,   292,   116,   164,    -1,    33,   294,    -1,   232,
-      33,   294,    -1,   293,   116,   294,    -1,   295,   290,    -1,
-     295,   290,   131,   276,    -1,   274,    -1,   273,   109,   134,
-     286,   135,   110,    -1,    36,   274,   109,   134,   286,   135,
-     110,   114,   115,    -1,    -1,    36,   274,   109,   134,   286,
-     135,   110,   114,   297,   298,   115,    -1,   299,    -1,   298,
-     134,   299,    -1,   300,   135,   132,    -1,   301,   135,   132,
-      -1,   215,    -1,   217,    -1,   300,   135,   116,   134,   272,
-      -1,   225,   309,    -1,   301,   135,   116,   134,   309,    -1,
-      -1,   303,    -1,   305,    -1,   303,   134,   305,    -1,    -1,
-     303,    -1,   212,    -1,   307,    -1,   198,    -1,    -1,     5,
-      82,   306,   114,   304,   115,    -1,    40,   305,    -1,   308,
-      -1,   323,   173,    -1,   327,   134,   207,   173,    -1,   216,
-     173,    -1,   224,   323,   173,    -1,   227,   323,   173,    -1,
-     231,   323,   173,    -1,   231,   227,   323,   173,    -1,   224,
-     327,   134,   207,   173,    -1,   227,   327,   134,   207,   173,
-      -1,   231,   327,   134,   207,   173,    -1,   231,   227,   327,
-     134,   207,   173,    -1,   318,    -1,   331,    -1,   323,    -1,
-     163,   123,   163,    -1,    -1,    64,   109,   141,   110,   312,
-      -1,    -1,   313,    -1,   314,    -1,   313,   314,    -1,    39,
-     109,   109,   315,   110,   110,    -1,   316,    -1,   315,   116,
-     316,    -1,    -1,   317,    -1,   317,   109,   170,   110,    -1,
-     272,    -1,   234,    -1,   235,    -1,   228,    -1,   319,   312,
-      -1,   320,    -1,   321,   312,    -1,   322,   312,    -1,   137,
-      -1,   109,   319,   110,    -1,   149,   318,    -1,   149,   227,
-     318,    -1,   109,   320,   110,    -1,   319,   349,    -1,   109,
-     320,   110,   349,    -1,   109,   321,   110,   350,    -1,   109,
-     321,   110,    -1,   109,   320,   110,   109,   134,   264,   135,
-     110,    -1,   109,   322,   110,    -1,   324,   312,    -1,   325,
-      -1,   326,   312,    -1,   319,   109,   134,   264,   135,   110,
-      -1,   109,   325,   110,   109,   134,   264,   135,   110,    -1,
-     109,   324,   110,    -1,   149,   323,    -1,   149,   227,   323,
-      -1,   109,   325,   110,    -1,   109,   325,   110,   349,    -1,
-     109,   326,   110,   350,    -1,   109,   326,   110,    -1,   328,
-      -1,   329,    -1,   330,    -1,   319,   109,   271,   110,    -1,
-     109,   329,   110,   109,   271,   110,    -1,   109,   328,   110,
-      -1,   149,   327,    -1,   149,   227,   327,    -1,   109,   329,
-     110,    -1,   109,   329,   110,   349,    -1,   109,   330,   110,
-     350,    -1,   109,   330,   110,    -1,   332,   312,    -1,   333,
-      -1,   334,   312,    -1,   335,   312,    -1,   341,    -1,   109,
-     332,   110,    -1,   149,   331,    -1,   149,   227,   331,    -1,
-     109,   333,   110,    -1,   332,   349,    -1,   109,   333,   110,
-     349,    -1,   109,   334,   110,   350,    -1,   109,   334,   110,
-      -1,   332,   109,   134,   264,   135,   110,    -1,   109,   333,
-     110,   109,   134,   264,   135,   110,    -1,   109,   335,   110,
-      -1,   319,   312,    -1,   337,    -1,   338,   312,    -1,   339,
-     312,    -1,   149,   336,    -1,   149,   227,   336,    -1,   109,
-     337,   110,    -1,   319,   355,    -1,   109,   337,   110,   349,
-      -1,   109,   338,   110,   350,    -1,   109,   338,   110,    -1,
-     319,   109,   134,   264,   135,   110,    -1,   109,   337,   110,
-     109,   134,   264,   135,   110,    -1,   109,   339,   110,    -1,
-     341,   312,    -1,   342,    -1,   343,   312,    -1,   344,   312,
-      -1,    74,    -1,    75,    -1,   149,   340,    -1,   149,   227,
-     340,    -1,   109,   342,   110,    -1,   341,   355,    -1,   109,
-     342,   110,   355,    -1,   341,   109,   134,   264,   135,   110,
-      -1,   109,   342,   110,   109,   134,   264,   135,   110,    -1,
-     346,    -1,   347,   312,    -1,   348,   312,    -1,   149,    -1,
-     149,   227,    -1,   149,   345,    -1,   149,   227,   345,    -1,
-     109,   346,   110,    -1,   349,    -1,   109,   346,   110,   349,
-      -1,   109,   347,   110,   350,    -1,   109,   347,   110,    -1,
-     109,   134,   264,   135,   110,    -1,   109,   346,   110,   109,
-     134,   264,   135,   110,    -1,   109,   348,   110,    -1,   111,
-     112,    -1,   111,   112,   350,    -1,   350,    -1,   111,   134,
-     164,   135,   112,    -1,   111,   134,   118,   135,   112,    -1,
-     350,   111,   134,   164,   135,   112,    -1,   350,   111,   134,
-     118,   135,   112,    -1,   352,    -1,   353,   312,    -1,   354,
-     312,    -1,   149,    -1,   149,   227,    -1,   149,   351,    -1,
-     149,   227,   351,    -1,   109,   352,   110,    -1,   355,    -1,
-     109,   352,   110,   355,    -1,   109,   353,   110,   350,    -1,
-     109,   353,   110,    -1,   109,   134,   264,   135,   110,    -1,
-     109,   352,   110,   109,   134,   264,   135,   110,    -1,   109,
-     354,   110,    -1,   356,    -1,   356,   350,    -1,   350,    -1,
-     111,   112,    -1,   111,   134,   227,   118,   135,   112,    -1,
-     111,   134,   227,   135,   112,    -1,   111,   134,   227,   164,
-     135,   112,    -1,   111,   134,     7,   226,   164,   135,   112,
-      -1,   111,   134,   227,     7,   164,   135,   112,    -1,   358,
-      -1,   359,   312,    -1,   360,   312,    -1,   149,    -1,   149,
-     227,    -1,   149,   357,    -1,   149,   227,   357,    -1,   109,
-     358,   110,    -1,   349,    -1,   109,   358,   110,   349,    -1,
-     109,   359,   110,   350,    -1,   109,   359,   110,    -1,   109,
-     358,   110,   109,   134,   264,   135,   110,    -1,   109,   360,
-     110,    -1,   362,    -1,   370,    -1,   227,   370,    -1,   363,
-      -1,   364,    -1,   149,   225,    -1,   227,   149,   225,    -1,
-     149,   371,    -1,   227,   149,   371,    -1,   149,   361,    -1,
-     227,   149,   361,    -1,   111,   112,   225,    -1,   365,   225,
-      -1,   111,   112,   350,   225,    -1,   365,   350,   225,    -1,
-     350,   225,    -1,   111,   112,   363,    -1,   365,   363,    -1,
-     111,   112,   350,   363,    -1,   365,   350,   363,    -1,   350,
-     363,    -1,   111,   134,   227,   118,   135,   112,    -1,   111,
-     134,   227,   164,   135,   112,    -1,   111,   134,   231,   164,
-     135,   112,    -1,   111,   134,   231,   227,   164,   135,   112,
-      -1,   370,    -1,   227,   370,    -1,   367,    -1,   368,    -1,
-     369,    -1,   149,   225,    -1,   227,   149,   225,    -1,   149,
-     371,    -1,   227,   149,   371,    -1,   149,   366,    -1,   227,
-     149,   366,    -1,   111,   112,   225,    -1,   111,   112,   350,
-     225,    -1,   350,   225,    -1,   111,   112,   368,    -1,   111,
-     112,   350,   368,    -1,   350,   368,    -1,   111,   134,   263,
-     135,   112,    -1,   111,   112,   109,   260,   110,    -1,   370,
-     109,   134,   260,   135,   110,    -1,   218,   109,   134,   260,
-     135,   110,    -1,    -1,   116,    -1,    -1,   131,   164,    -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   296,   296,   302,   311,   312,   313,   317,   318,   319,
-     323,   324,   328,   329,   333,   334,   338,   339,   350,   352,
-     354,   356,   361,   362,   368,   372,   374,   375,   377,   378,
-     380,   382,   384,   393,   394,   400,   401,   402,   407,   409,
-     414,   415,   419,   423,   425,   427,   429,   434,   437,   439,
-     441,   446,   459,   461,   463,   465,   467,   469,   471,   473,
-     475,   477,   479,   486,   487,   493,   494,   495,   496,   500,
-     501,   503,   508,   509,   511,   513,   518,   519,   521,   526,
-     527,   529,   534,   535,   537,   539,   541,   546,   547,   549,
-     554,   555,   560,   561,   566,   567,   572,   573,   578,   579,
-     584,   585,   588,   590,   595,   600,   601,   603,   609,   610,
-     614,   615,   616,   617,   618,   619,   620,   621,   622,   623,
-     624,   630,   632,   634,   636,   641,   642,   647,   648,   654,
-     655,   661,   662,   663,   664,   665,   666,   667,   668,   669,
-     679,   686,   688,   698,   699,   704,   706,   712,   714,   718,
-     719,   724,   729,   732,   734,   736,   746,   748,   759,   760,
-     762,   766,   768,   772,   773,   778,   779,   783,   788,   789,
-     793,   795,   801,   802,   806,   808,   810,   812,   818,   819,
-     823,   825,   830,   832,   834,   839,   841,   846,   848,   852,
-     855,   859,   862,   866,   868,   872,   874,   881,   883,   885,
-     894,   896,   898,   900,   902,   907,   909,   911,   913,   918,
-     931,   932,   937,   939,   944,   948,   950,   952,   954,   956,
-     962,   963,   969,   970,   974,   975,   980,   982,   988,   989,
-     991,   996,   998,  1005,  1007,  1011,  1012,  1017,  1019,  1023,
-    1024,  1028,  1030,  1034,  1035,  1039,  1040,  1044,  1045,  1060,
-    1061,  1062,  1063,  1064,  1068,  1073,  1080,  1090,  1095,  1100,
-    1108,  1113,  1118,  1123,  1128,  1136,  1158,  1163,  1170,  1172,
-    1179,  1184,  1189,  1200,  1205,  1210,  1215,  1220,  1229,  1234,
-    1242,  1243,  1244,  1245,  1251,  1256,  1264,  1265,  1266,  1267,
-    1271,  1272,  1273,  1274,  1279,  1280,  1289,  1290,  1295,  1296,
-    1301,  1303,  1305,  1307,  1309,  1312,  1311,  1323,  1324,  1326,
-    1336,  1337,  1342,  1346,  1348,  1350,  1352,  1354,  1356,  1358,
-    1360,  1365,  1367,  1369,  1371,  1373,  1375,  1377,  1379,  1381,
-    1383,  1385,  1387,  1389,  1395,  1396,  1398,  1400,  1402,  1407,
-    1408,  1414,  1415,  1417,  1419,  1424,  1426,  1428,  1430,  1435,
-    1436,  1438,  1440,  1445,  1446,  1448,  1453,  1454,  1456,  1458,
-    1463,  1465,  1467,  1472,  1473,  1477,  1479,  1485,  1484,  1488,
-    1490,  1495,  1497,  1503,  1504,  1509,  1510,  1512,  1513,  1522,
-    1523,  1525,  1527,  1532,  1534,  1540,  1541,  1543,  1546,  1549,
-    1554,  1555,  1560,  1565,  1569,  1571,  1577,  1576,  1583,  1585,
-    1591,  1592,  1600,  1601,  1605,  1606,  1607,  1609,  1611,  1618,
-    1619,  1621,  1623,  1628,  1629,  1635,  1636,  1640,  1641,  1646,
-    1647,  1648,  1650,  1658,  1659,  1661,  1664,  1666,  1670,  1671,
-    1672,  1674,  1676,  1680,  1685,  1693,  1694,  1703,  1705,  1710,
-    1711,  1712,  1716,  1717,  1718,  1722,  1723,  1724,  1728,  1729,
-    1730,  1735,  1736,  1737,  1738,  1744,  1745,  1747,  1752,  1753,
-    1758,  1759,  1760,  1761,  1762,  1777,  1778,  1783,  1784,  1792,
-    1794,  1796,  1799,  1801,  1803,  1826,  1827,  1829,  1831,  1836,
-    1837,  1839,  1844,  1849,  1850,  1856,  1855,  1859,  1863,  1865,
-    1867,  1873,  1874,  1879,  1884,  1886,  1891,  1893,  1894,  1896,
-    1901,  1903,  1905,  1910,  1912,  1917,  1922,  1930,  1936,  1935,
-    1949,  1950,  1955,  1956,  1960,  1965,  1970,  1978,  1983,  1994,
-    1995,  2006,  2007,  2013,  2014,  2018,  2019,  2020,  2023,  2022,
-    2033,  2042,  2048,  2054,  2063,  2069,  2075,  2081,  2087,  2095,
-    2101,  2109,  2115,  2124,  2125,  2126,  2130,  2134,  2136,  2141,
-    2142,  2146,  2147,  2152,  2158,  2159,  2162,  2164,  2165,  2169,
-    2170,  2171,  2172,  2206,  2208,  2209,  2211,  2216,  2221,  2226,
-    2228,  2230,  2235,  2237,  2239,  2241,  2246,  2248,  2257,  2259,
-    2260,  2265,  2267,  2269,  2274,  2276,  2278,  2283,  2285,  2287,
-    2296,  2297,  2298,  2302,  2304,  2306,  2311,  2313,  2315,  2320,
-    2322,  2324,  2339,  2341,  2342,  2344,  2349,  2350,  2355,  2357,
-    2359,  2364,  2366,  2368,  2370,  2375,  2377,  2379,  2389,  2391,
-    2392,  2394,  2399,  2401,  2403,  2408,  2410,  2412,  2414,  2419,
-    2421,  2423,  2454,  2456,  2457,  2459,  2464,  2469,  2477,  2479,
-    2481,  2486,  2488,  2493,  2495,  2509,  2510,  2512,  2517,  2519,
-    2521,  2523,  2525,  2530,  2531,  2533,  2535,  2540,  2542,  2544,
-    2550,  2552,  2554,  2558,  2560,  2562,  2564,  2578,  2579,  2581,
-    2586,  2588,  2590,  2592,  2594,  2599,  2600,  2602,  2604,  2609,
-    2611,  2613,  2619,  2620,  2622,  2631,  2634,  2636,  2639,  2641,
-    2643,  2656,  2657,  2659,  2664,  2666,  2668,  2670,  2672,  2677,
-    2678,  2680,  2682,  2687,  2689,  2697,  2698,  2699,  2704,  2705,
-    2709,  2711,  2713,  2715,  2717,  2719,  2726,  2728,  2730,  2732,
-    2734,  2736,  2738,  2740,  2742,  2744,  2749,  2751,  2753,  2758,
-    2784,  2785,  2787,  2791,  2792,  2796,  2798,  2800,  2802,  2804,
-    2806,  2813,  2815,  2817,  2819,  2821,  2823,  2828,  2833,  2835,
-    2837,  2855,  2857,  2862,  2863
+       0,   298,   298,   304,   313,   314,   315,   319,   320,   321,
+     325,   326,   330,   331,   335,   336,   340,   341,   352,   354,
+     356,   358,   363,   364,   370,   374,   376,   377,   379,   380,
+     382,   384,   386,   395,   396,   402,   403,   407,   408,   412,
+     416,   418,   420,   422,   427,   430,   432,   434,   439,   452,
+     454,   456,   458,   460,   462,   464,   466,   468,   470,   472,
+     479,   480,   486,   487,   488,   489,   493,   494,   496,   501,
+     502,   504,   506,   511,   512,   514,   519,   520,   522,   527,
+     528,   530,   532,   534,   539,   540,   542,   547,   548,   553,
+     554,   559,   560,   565,   566,   571,   572,   577,   578,   581,
+     583,   588,   593,   594,   596,   602,   603,   607,   608,   609,
+     610,   611,   612,   613,   614,   615,   616,   617,   623,   625,
+     627,   629,   634,   635,   640,   641,   647,   648,   654,   655,
+     656,   657,   658,   659,   660,   661,   662,   672,   679,   681,
+     691,   692,   697,   699,   705,   707,   711,   712,   717,   722,
+     725,   727,   729,   739,   741,   752,   753,   755,   759,   761,
+     765,   766,   771,   772,   776,   781,   782,   786,   788,   794,
+     795,   799,   801,   803,   805,   811,   812,   816,   818,   823,
+     825,   827,   832,   834,   839,   841,   845,   848,   852,   855,
+     859,   861,   863,   865,   870,   872,   874,   879,   881,   883,
+     885,   887,   892,   894,   896,   898,   903,   915,   916,   921,
+     923,   928,   932,   934,   936,   938,   940,   946,   947,   953,
+     954,   958,   959,   964,   966,   972,   973,   975,   980,   982,
+     989,   991,   995,   996,  1001,  1003,  1007,  1008,  1012,  1014,
+    1018,  1019,  1023,  1024,  1028,  1029,  1044,  1045,  1046,  1047,
+    1048,  1052,  1057,  1064,  1074,  1079,  1084,  1092,  1097,  1102,
+    1107,  1112,  1120,  1142,  1147,  1154,  1156,  1163,  1168,  1173,
+    1184,  1189,  1194,  1199,  1204,  1213,  1218,  1226,  1227,  1228,
+    1229,  1235,  1240,  1248,  1249,  1250,  1251,  1255,  1256,  1257,
+    1258,  1263,  1264,  1273,  1274,  1279,  1280,  1285,  1287,  1289,
+    1291,  1293,  1296,  1295,  1307,  1308,  1310,  1320,  1321,  1326,
+    1328,  1330,  1332,  1334,  1336,  1338,  1340,  1345,  1347,  1349,
+    1351,  1353,  1355,  1357,  1359,  1361,  1363,  1365,  1367,  1369,
+    1375,  1376,  1378,  1380,  1382,  1387,  1388,  1394,  1395,  1397,
+    1399,  1404,  1406,  1408,  1410,  1415,  1416,  1418,  1420,  1425,
+    1426,  1428,  1433,  1434,  1436,  1438,  1443,  1445,  1447,  1452,
+    1453,  1457,  1459,  1465,  1464,  1468,  1470,  1475,  1477,  1483,
+    1484,  1489,  1490,  1492,  1493,  1502,  1503,  1505,  1507,  1512,
+    1514,  1520,  1521,  1523,  1526,  1529,  1534,  1535,  1540,  1545,
+    1549,  1551,  1557,  1556,  1563,  1565,  1571,  1572,  1580,  1581,
+    1585,  1586,  1587,  1589,  1591,  1598,  1599,  1601,  1603,  1608,
+    1609,  1615,  1616,  1620,  1621,  1626,  1627,  1628,  1630,  1638,
+    1639,  1641,  1644,  1646,  1650,  1651,  1652,  1654,  1656,  1660,
+    1665,  1673,  1674,  1683,  1685,  1690,  1691,  1692,  1696,  1697,
+    1698,  1702,  1703,  1704,  1708,  1709,  1710,  1715,  1716,  1717,
+    1718,  1724,  1725,  1727,  1732,  1733,  1738,  1739,  1740,  1741,
+    1742,  1757,  1758,  1763,  1764,  1770,  1772,  1775,  1777,  1779,
+    1802,  1803,  1805,  1807,  1812,  1813,  1815,  1820,  1825,  1826,
+    1832,  1831,  1835,  1839,  1841,  1843,  1849,  1850,  1855,  1860,
+    1862,  1867,  1869,  1870,  1872,  1877,  1879,  1881,  1886,  1888,
+    1893,  1898,  1906,  1912,  1911,  1925,  1926,  1931,  1932,  1936,
+    1941,  1946,  1954,  1959,  1970,  1971,  1976,  1977,  1983,  1984,
+    1988,  1989,  1990,  1993,  1992,  2003,  2012,  2018,  2024,  2033,
+    2039,  2045,  2051,  2057,  2065,  2071,  2079,  2085,  2094,  2095,
+    2096,  2100,  2104,  2106,  2111,  2112,  2116,  2117,  2122,  2128,
+    2129,  2132,  2134,  2135,  2139,  2140,  2141,  2142,  2176,  2178,
+    2179,  2181,  2186,  2191,  2196,  2198,  2200,  2205,  2207,  2209,
+    2211,  2216,  2218,  2227,  2229,  2230,  2235,  2237,  2239,  2244,
+    2246,  2248,  2253,  2255,  2257,  2266,  2267,  2268,  2272,  2274,
+    2276,  2281,  2283,  2285,  2290,  2292,  2294,  2309,  2311,  2312,
+    2314,  2319,  2320,  2325,  2327,  2329,  2334,  2336,  2338,  2340,
+    2345,  2347,  2349,  2359,  2361,  2362,  2364,  2369,  2371,  2373,
+    2378,  2380,  2382,  2384,  2389,  2391,  2393,  2424,  2426,  2427,
+    2429,  2434,  2439,  2447,  2449,  2451,  2456,  2458,  2463,  2465,
+    2479,  2480,  2482,  2487,  2489,  2491,  2493,  2495,  2500,  2501,
+    2503,  2505,  2510,  2512,  2514,  2520,  2522,  2524,  2528,  2530,
+    2532,  2534,  2548,  2549,  2551,  2556,  2558,  2560,  2562,  2564,
+    2569,  2570,  2572,  2574,  2579,  2581,  2583,  2589,  2590,  2592,
+    2601,  2604,  2606,  2609,  2611,  2613,  2626,  2627,  2629,  2634,
+    2636,  2638,  2640,  2642,  2647,  2648,  2650,  2652,  2657,  2659,
+    2667,  2668,  2669,  2674,  2675,  2679,  2681,  2683,  2685,  2687,
+    2689,  2696,  2698,  2700,  2702,  2704,  2706,  2708,  2710,  2712,
+    2714,  2719,  2721,  2723,  2728,  2754,  2755,  2757,  2761,  2762,
+    2766,  2768,  2770,  2772,  2774,  2776,  2783,  2785,  2787,  2789,
+    2791,  2793,  2798,  2803,  2805,  2807,  2825,  2827,  2832,  2833
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || YYERROR_VERBOSE || 0
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
@@ -1122 +785 @@
   "DIVassign", "MODassign", "PLUSassign", "MINUSassign", "LSassign",
   "RSassign", "ANDassign", "ERassign", "ORassign", "ATassign", "THEN",
-  "'('", "')'", "'['", "']'", "'.'", "'{'", "'}'", "','", "':'", "'*'",
-  "'&'", "'+'", "'-'", "'!'", "'~'", "'/'", "'%'", "'<'", "'>'", "'^'",
-  "'|'", "'?'", "'='", "';'", "$accept", "push", "pop", "constant",
+  "'('", "')'", "'['", "']'", "'.'", "'{'", "'}'", "','", "'*'", "'&'",
+  "'+'", "'-'", "'!'", "'~'", "'/'", "'%'", "'<'", "'>'", "'^'", "'|'",
+  "'?'", "':'", "'='", "';'", "$accept", "push", "pop", "constant",
   "identifier", "no_01_identifier", "no_attr_identifier", "zero_one",
   "string_literal_list", "primary_expression", "postfix_expression",
@@ -1157 +820 @@
   "type_qualifier_list", "type_qualifier", "type_qualifier_name", "$@1",
   "declaration_qualifier_list", "storage_class_list", "storage_class",
-  "storage_class_name", "basic_type_name", "basic_declaration_specifier",
-  "basic_type_specifier", "direct_type_name", "indirect_type_name",
-  "sue_declaration_specifier", "sue_type_specifier",
-  "typedef_declaration_specifier", "typedef_type_specifier",
-  "elaborated_type_name", "aggregate_name", "$@2", "aggregate_key",
-  "field_declaration_list", "field_declaration",
+  "basic_type_name", "basic_declaration_specifier", "basic_type_specifier",
+  "direct_type_name", "indirect_type_name", "sue_declaration_specifier",
+  "sue_type_specifier", "typedef_declaration_specifier",
+  "typedef_type_specifier", "elaborated_type_name", "aggregate_name",
+  "$@2", "aggregate_key", "field_declaration_list", "field_declaration",
   "new_field_declaring_list", "field_declaring_list", "field_declarator",
   "bit_subrange_size_opt", "bit_subrange_size", "enum_key", "enum_name",
@@ -1209 +871 @@
   "new_abstract_declarator_no_tuple", "new_abstract_ptr",
   "new_abstract_array", "new_abstract_tuple", "new_abstract_function",
-  "comma_opt", "assignment_opt", 0
+  "comma_opt", "assignment_opt", YY_NULLPTR
 };
 #endif
 
 # ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
 static const yytype_uint16 yytoknum[] =
 {
@@ -1229 +891 @@
      345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
      355,   356,   357,   358,   359,   360,   361,   362,   363,    40,
-      41,    91,    93,    46,   123,   125,    44,    58,    42,    38,
-      43,    45,    33,   126,    47,    37,    60,    62,    94,   124,
-      63,    61,    59
+      41,    91,    93,    46,   123,   125,    44,    42,    38,    43,
+      45,    33,   126,    47,    37,    60,    62,    94,   124,    63,
+      58,    61,    59
 };
 # endif
 
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint16 yyr1[] =
+#define YYPACT_NINF -1317
+
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-1317)))
+
+#define YYTABLE_NINF -520
+
+#define yytable_value_is_error(Yytable_value) \
+  0
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
+static const yytype_int16 yypact[] =
 {
-       0,   133,   134,   135,   136,   136,   136,   137,   137,   137,
-     138,   138,   139,   139,   140,   140,   141,   141,   142,   142,
-     142,   142,   143,   143,   143,   143,   143,   143,   143,   143,
-     143,   143,   143,   144,   144,   145,   145,   145,   145,   145,
-     146,   146,   147,   147,   147,   147,   147,   148,   148,   148,
-     148,   148,   148,   148,   148,   148,   148,   148,   148,   148,
-     148,   148,   148,   149,   149,   150,   150,   150,   150,   151,
-     151,   151,   152,   152,   152,   152,   153,   153,   153,   154,
-     154,   154,   155,   155,   155,   155,   155,   156,   156,   156,
-     157,   157,   158,   158,   159,   159,   160,   160,   161,   161,
-     162,   162,   162,   162,   163,   164,   164,   164,   165,   165,
-     166,   166,   166,   166,   166,   166,   166,   166,   166,   166,
-     166,   167,   167,   167,   167,   168,   168,   169,   169,   170,
-     170,   171,   171,   171,   171,   171,   171,   171,   171,   171,
-     172,   173,   173,   174,   174,   175,   175,   175,   175,   176,
-     176,   177,   178,   178,   178,   178,   178,   178,   179,   179,
-     179,   180,   180,   181,   181,   182,   182,   183,   184,   184,
-     185,   185,   186,   186,   187,   187,   187,   187,   188,   188,
-     189,   189,   190,   190,   190,   191,   191,   192,   192,   192,
-     192,   192,   192,   192,   192,   192,   192,   193,   193,   193,
-     194,   194,   194,   194,   194,   195,   195,   195,   195,   196,
-     197,   197,   197,   197,   197,   198,   198,   198,   198,   198,
-     199,   199,   200,   200,   201,   201,   202,   202,   203,   203,
-     203,   204,   204,   205,   205,   206,   206,   207,   207,   208,
-     208,   209,   209,   210,   210,   211,   211,   212,   212,   213,
-     213,   213,   213,   213,   214,   214,   214,   215,   215,   215,
-     216,   216,   216,   216,   216,   217,   217,   217,   218,   218,
-     219,   219,   219,   220,   220,   220,   220,   220,   221,   221,
-     222,   222,   222,   222,   223,   223,   224,   224,   224,   224,
-     225,   225,   225,   225,   226,   226,   227,   227,   228,   228,
-     229,   229,   229,   229,   229,   230,   229,   231,   231,   231,
-     232,   232,   233,   234,   234,   234,   234,   234,   234,   234,
-     234,   235,   235,   235,   235,   235,   235,   235,   235,   235,
-     235,   235,   235,   235,   236,   236,   236,   236,   236,   237,
-     237,   238,   238,   238,   238,   239,   239,   239,   239,   240,
-     240,   240,   240,   241,   241,   241,   242,   242,   242,   242,
-     243,   243,   243,   244,   244,   245,   245,   246,   245,   245,
-     245,   247,   247,   248,   248,   249,   249,   249,   249,   250,
-     250,   250,   250,   251,   251,   252,   252,   252,   252,   252,
-     253,   253,   254,   255,   256,   256,   257,   256,   258,   258,
-     259,   259,   260,   260,   261,   261,   261,   261,   261,   262,
-     262,   262,   262,   263,   263,   264,   264,   265,   265,   266,
-     266,   266,   266,   267,   267,   267,   267,   267,   268,   268,
-     268,   268,   268,   269,   269,   270,   270,   271,   271,   272,
-     272,   272,   273,   273,   273,   274,   274,   274,   275,   275,
-     275,   276,   276,   276,   276,   277,   277,   277,   278,   278,
-     279,   279,   279,   279,   279,   280,   280,   281,   281,   282,
-     282,   282,   282,   282,   282,   283,   283,   283,   283,   284,
-     284,   284,   285,   286,   286,   288,   287,   287,   289,   289,
-     289,   290,   290,   291,   291,   291,   292,   292,   292,   292,
-     293,   293,   293,   294,   294,   295,   295,   296,   297,   296,
-     298,   298,   299,   299,   300,   300,   300,   301,   301,   302,
-     302,   303,   303,   304,   304,   305,   305,   305,   306,   305,
-     305,   307,   307,   307,   308,   308,   308,   308,   308,   308,
-     308,   308,   308,   309,   309,   309,   310,   311,   311,   312,
-     312,   313,   313,   314,   315,   315,   316,   316,   316,   317,
-     317,   317,   317,   318,   318,   318,   318,   319,   319,   320,
-     320,   320,   321,   321,   321,   321,   322,   322,   323,   323,
-     323,   324,   324,   324,   325,   325,   325,   326,   326,   326,
-     327,   327,   327,   328,   328,   328,   329,   329,   329,   330,
-     330,   330,   331,   331,   331,   331,   332,   332,   333,   333,
-     333,   334,   334,   334,   334,   335,   335,   335,   336,   336,
-     336,   336,   337,   337,   337,   338,   338,   338,   338,   339,
-     339,   339,   340,   340,   340,   340,   341,   341,   342,   342,
-     342,   343,   343,   344,   344,   345,   345,   345,   346,   346,
-     346,   346,   346,   347,   347,   347,   347,   348,   348,   348,
-     349,   349,   349,   350,   350,   350,   350,   351,   351,   351,
-     352,   352,   352,   352,   352,   353,   353,   353,   353,   354,
-     354,   354,   355,   355,   355,   356,   356,   356,   356,   356,
-     356,   357,   357,   357,   358,   358,   358,   358,   358,   359,
-     359,   359,   359,   360,   360,   361,   361,   361,   362,   362,
-     363,   363,   363,   363,   363,   363,   364,   364,   364,   364,
-     364,   364,   364,   364,   364,   364,   365,   365,   365,   365,
-     366,   366,   366,   367,   367,   368,   368,   368,   368,   368,
-     368,   369,   369,   369,   369,   369,   369,   370,   371,   371,
-     371,   372,   372,   373,   373
+    7252,  8635, -1317,    -3, -1317, -1317, -1317, -1317, -1317, -1317,
+   -1317,    23, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317,
+   -1317, -1317, -1317, -1317, -1317, -1317,    81,    81,    81,  1277,
+     970,   104,  7368,   277, -1317, -1317, -1317, -1317, -1317,   201,
+   -1317, -1317, -1317,  1047,   187, -1317, -1317, -1317, -1317,  5370,
+   -1317, -1317, -1317, -1317,    35,    48, -1317,  1328, -1317, -1317,
+   -1317, -1317,   235,  1663,   343,    98,  7484, -1317, -1317,  6174,
+    1066, -1317, -1317,   536,   376,  5540,   978,  1631,   536,  1775,
+   -1317, -1317,   477,   683, -1317,   536,  1892, -1317,   295, -1317,
+     422,   489, -1317, -1317, -1317, -1317,   346,    48,    81, -1317,
+      81, -1317, -1317, -1317, -1317,  9392,  1328, -1317, -1317,  1328,
+   -1317,   321, -1317,  9431, -1317, -1317,  2250,  9501, -1317,   668,
+     668,   668, -1317, -1317, -1317,    81, -1317, -1317, -1317,   373,
+     399,   410, -1317, -1317, -1317,   420, -1317, -1317, -1317, -1317,
+   -1317,   428,   450, -1317, -1317,    59,  8604,  2904,   144,   440,
+     493,   498,   531,   544,   560,  8522,  6772,   510,   580, -1317,
+    9114, -1317, -1317, -1317, -1317,   584, -1317,   153,  4280,  4280,
+   -1317,   570,   283, -1317, -1317, -1317, -1317,   596,   288,   303,
+     332,    81,   583, -1317, -1317,  1663,  2232,   648, -1317,    73,
+   -1317,    81,    81,    48, -1317, -1317,    80, -1317,    81,    81,
+   -1317,  3694,   599,   613,   668,  6565, -1317, -1317,   661,  5370,
+   -1317, -1317,   536, -1317, -1317, -1317,    48, -1317,  1328,    35,
+   -1317,  7675, -1317,   668,   668,   668,    48, -1317,  1277, -1317,
+    5446, -1317, -1317,   620,   668, -1317,   668, -1317,   201,  8604,
+   -1317,   673, -1317,   970,   692,   668, -1317,  1277,   697,   707,
+   -1317,  7368,   576, -1317, -1317, -1317,  4822, -1317, -1317,  9720,
+   -1317,   648,   165, 10347,  9501,  2250,  3694, -1317,   109, -1317,
+   -1317,  9431,  1328,   743,  7515, -1317, -1317,   306, -1317, 10675,
+     770,   800,  2676,   801, 10480, 10499, -1317,   813, -1317, -1317,
+   -1317, -1317, 10556, 10556,  8378,   795, -1317, -1317, -1317, -1317,
+   -1317, -1317,   842, -1317,   685,  1919,  8717, 10480, -1317,   652,
+     325,   507,   317,   581,   826,   820,   823,   861,   111, -1317,
+   -1317,   827,   703, -1317,   452, -1317, -1317,  2904, -1317, -1317,
+     278,   856, -1317,   636,   856,   866,   201, -1317, -1317,   872,
+    9392, -1317,   876,   887,  8830, -1317, -1317,  1020,  2049,  8093,
+    6565,   536, -1317,   536,   668,   668, -1317, -1317, -1317, -1317,
+   -1317, -1317,   668,  9392,  1328, -1317, -1317,  9540,  1233, -1317,
+    7824, -1317, -1317, -1317, -1317, -1317, -1317, -1317,   891,  4627,
+   10480, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317,
+   -1317, -1317, -1317, -1317, -1317,  2250, -1317,   552,   901,   904,
+     912,   862,   920,   922,   924,  2232, -1317, -1317,   932,    35,
+     936, -1317, -1317,   939, -1317, -1317, -1317,  4822, -1317, -1317,
+   -1317, -1317, -1317,  3694, -1317,  8604,  8604, -1317,   668,  2250,
+    6684,  1328,  8166, -1317, -1317, -1317, -1317,  4822,   165, -1317,
+   -1317,   536,    48, -1317, -1317,  4822, -1317,  6449, -1317, -1317,
+     668,   668,   484,  8011,   938,   941,   931,   952,   668, -1317,
+   -1317, -1317, -1317,  9797, -1317,   578,  6327, -1317,    48,   955,
+   -1317,  2250, 10757, 10404, -1317, -1317, -1317, -1317,   881,  3694,
+   -1317,  8239,   648,  3545, -1317, -1317, -1317,  1641,   586,   827,
+     970,  7515,   592,  9431, -1317,  7515, -1317, -1317, -1317, -1317,
+     603, -1317,   967,   800,   215,  8378, -1317,  9570, -1317, -1317,
+    8378, -1317,  8491,  8378, -1317, -1317,   966, -1317,   617,   973,
+     839,   983, -1317, -1317,  9253,  6415, -1317,   247, -1317, -1317,
+   10347, -1317,   330, 10347, -1317, -1317, -1317, -1317, -1317, -1317,
+   -1317, -1317, -1317, -1317, -1317, 10347, -1317, -1317, 10480, 10480,
+   10480, 10480, 10480, 10480, 10480, 10480, 10480, 10480, 10480, 10480,
+   10480, 10480, 10480, 10480, 10480, 10480,  4526, 10347, -1317,   703,
+     751, -1317, -1317,    81,    81, -1317, -1317,  8604, -1317, -1317,
+     939,   576, -1317,   939, 10423, -1317, -1317, -1317,  8975,  6415,
+     968,   976, -1317,  9501, -1317, -1317,   584, -1317,   990,   769,
+     999,  3014,   124,   827, -1317,    81,    81,   827,   125, -1317,
+      81,    81,   939, -1317, -1317,    81,    81, -1317,   856,  9652,
+    1328, 10902,   151,   358,  9652, -1317,  9720, -1317,   827, -1317,
+    9392, -1317,   147,  7790,  7790,  7790,  1328, -1317,  5708,   982,
+     891,  1167,   995,   996, -1317,  1011,  4280,   230, -1317,  1103,
+    1328,  7790,   576,  2250,   576,   648,   671,   856, -1317, -1317,
+     694,   856, -1317, -1317, -1317,   800, -1317,   856,    48,  9797,
+   -1317,   621,  1024,   640,  1026, -1317,  1030,    48, -1317, -1317,
+    4822,    48,  1032,  9570,  1037, -1317,  1585, -1317,   335,   390,
+     970, -1317,   970,  1023, 10480, -1317,   970, 10902, -1317, -1317,
+    1034, -1317, -1317, -1317,   576, -1317, 10830,   887, -1317,  7790,
+     859,  8093, -1317, -1317,   584,  1025,  1036,  1641,  3247, -1317,
+   -1317,  7515, -1317, -1317,  1039, -1317, -1317,  1043, -1317,  1039,
+    1048, 10675, 10347,    67,  1027,   133,  1053,  1061,  1068,  1069,
+   -1317,  1072,  1074,  9362,  6534, -1317, 10347, -1317,   839,  2140,
+   -1317, -1317, -1317,    81,    81, 10290, 10347,  1070, -1317, -1317,
+     675, -1317, 10347, -1317, -1317,   644, -1317, -1317, -1317, -1317,
+     652,   652,   325,   325,   507,   507,   507,   507,   317,   317,
+     581,   826,   820,   823,   861, 10480,   333, -1317,  9797,  1079,
+    1080,  1081,   751, -1317, -1317, -1317, -1317, -1317,  9797,   700,
+    7790, -1317,  9392, -1317,  6891,  8943, -1317,  7824,  6772, -1317,
+   -1317,   769,  9797,   917,  1082,  1083,  1084,  1087,  1088,  1089,
+    1091, -1317,  4955,  3014, -1317, -1317, -1317, -1317, -1317, -1317,
+   -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317,
+   -1317,   939, -1317, -1317, -1317,   827, -1317, -1317, -1317, -1317,
+   -1317, -1317, -1317, -1317,  1098, -1317,  1099,  1101, -1317, -1317,
+      35,  1070,  5708, -1317, -1317, -1317,  4627,  1102, -1317, -1317,
+   -1317, -1317,   970,  5944,  1191, -1317, -1317, -1317, -1317,  1094,
+      35, -1317, -1317,   939, -1317, -1317,   939,    24,   939, -1317,
+   -1317, -1317, -1317, -1317, -1317,  9223, -1317,    48, -1317, -1317,
+     432,   441,  9540,  7010,  2348, 10480,  3377, -1317, -1317,  1092,
+      94,  1092, -1317,   970, -1317,    81, -1317, -1317,  8748,   931,
+   -1317, -1317, -1317,   941,  1116,  1111, -1317, -1317,  1118,  1119,
+   -1317,   859,  2430, -1317,   455, -1317,  3247,   827, -1317,  1122,
+    7515,  9682,  8604,  1125, -1317, -1317,  1130,  1135,  1124, -1317,
+   10480,   166,   222,  1132, -1317,  1138,   576,  1138, -1317, -1317,
+    1138,  1137, -1317,  1145,  1147,  1148,  2140, -1317, -1317, -1317,
+    4627, -1317, -1317, -1317, -1317,  1143, 10347,  1149,   576, -1317,
+   10347, -1317,   576, -1317, -1317, 10347, -1317,   721,   856, -1317,
+   -1317, -1317, -1317, -1317, -1317, -1317,   891,   887,  8830, -1317,
+   -1317,  7129,  1152, -1317,   731,   856, -1317,   745,   763,   856,
+   -1317,   668,  5561, -1317, -1317, -1317,  9797,  9797, -1317,  8166,
+    8166, -1317,  1154,  1156,  1153,  1155, -1317,  1168,   460,   196,
+    1070, -1317,   576, -1317,  4280, -1317, 10347,   474, -1317,  6296,
+    1159,  1170, 10233,  1172,  1175,   -14,     3,    11, 10347,  1179,
+      48, 10347, 10347,  1160,  1177,   282,  1161, -1317, -1317, -1317,
+    1180, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317,
+     970,  1184, 10347, -1317,  9797,  9797,    81,  1188, -1317,  8861,
+   -1317, -1317,   809, -1317,  3377, -1317, -1317, -1317, -1317,  1585,
+   -1317, -1317,  1185, -1317, -1317, -1317, -1317,  1193,  2430, -1317,
+   -1317,  1176, -1317,  1039, -1317, -1317,  2250,  1196, -1317, -1317,
+   -1317,   709,  1198, -1317,   133,  1202, 10480,  1186,   133,   133,
+    1211,  9253,   789,   856, -1317, -1317,  1011, 10347,  1214,  1143,
+     505,   224,  1217, -1317, -1317,  1218,  1217, -1317, -1317,  1226,
+   -1317, -1317,   939,  1228,  1230,  6653,  1231,  1232,  1243, -1317,
+   -1317,  1246, -1317, -1317,   939, -1317, -1317, -1317, -1317,   939,
+   10347, 10347,   887,  1245, -1317, -1317, -1317, -1317, -1317, -1317,
+   -1317, -1317, -1317, -1317, -1317, -1317, 10480, 10480,  1247,  1251,
+    1217, -1317, -1317,   970, -1317, -1317, -1317,  4468,  9682, 10347,
+   10347,  1311, 10347, -1317,  1234, -1317,  1237, -1317,  1239, 10347,
+    1241, 10347,  1049,  1244,    26,    81,  9084,   750, -1317, -1317,
+    5944,  1267,   481, -1317, -1317, -1317, -1317, -1317, -1317, -1317,
+   -1317, -1317, 10053, -1317,  8239,  1274, -1317, -1317,  9682,   482,
+     512, -1317,  1272,  1259,   800,  1280, -1317,   245, -1317, -1317,
+   -1317, -1317,   939,  1279, -1317, -1317,  1287,   385,   444,   576,
+    1293, -1317,  1294, -1317,  9797, -1317, -1317, -1317, -1317, -1317,
+    1295, -1317,  9797,  9797,  9797, -1317, -1317,  1297, -1317,  1298,
+    1282,  1305,   511,  7863,  7978, -1317, -1317,   348, -1317,  1304,
+    1310, -1317,  8312,   712,   734,  1308,   739,  6143, -1317, -1317,
+   -1317,   515, -1317,   765,  1318,  1320,    48,  1371,   879, -1317,
+   -1317, 10347, -1317, 10233, 10347, -1317, -1317, -1317,  1322,  1329,
+   -1317, -1317, -1317,  1324, -1317, -1317, -1317, -1317, -1317, -1317,
+    9682,   800,   265, -1317,  1309,   800,  9797, -1317, -1317, -1317,
+   -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317,
+   -1317,  1330,  1331, -1317, -1317, -1317, -1317, -1317, -1317, -1317,
+    1334, -1317,  1333, -1317, -1317, 10233,   143, 10347, 10233, -1317,
+    1338, 10347, -1317,   259,  1354,  1356, -1317, -1317,  1346,  1347,
+    1326, -1317,   880, -1317, -1317, -1317,  1328,  2250,  1345,   842,
+     364, 10480, -1317,   774, -1317,   576,   576,  1352,  1355,  1357,
+    1360, -1317, -1317,  8166,  1358, -1317,  1436, 10480,  1349, -1317,
+   -1317, 10145, -1317,   783, -1317,  1350, 10233,  1359, -1317, -1317,
+    1378, -1317,  1379, -1317,  1394,  1396, -1317,  1361,  9682, -1317,
+   -1317, -1317,   800,   576,  1386,  1367,  1392,  1217,  1217, -1317,
+   -1317, -1317, -1317, -1317, 10233,   275, -1317,   384, -1317, -1317,
+    7600, -1317, -1317,  1375, 10347, -1317, 10347,  7600,    48,  9570,
+      48,  9570,  1393, -1317,  1398, -1317, -1317,  1395,   842, -1317,
+     798, -1317, -1317, -1317,  1399,  1401, -1317, 10480, 10480, -1317,
+   -1317,   964,   167, -1317, -1317,  1388, -1317,   964, -1317, -1317,
+    2461,   576, -1317, -1317,    48,  9570,    48,  9570,  1409,  1390,
+     576, -1317, -1317, -1317, -1317, 10145,  1410,   964,  5861, 10347,
+   10057,  1412,   964,  1414,  2461,  3613, -1317, -1317, -1317,  1420,
+   -1317, -1317, -1317, -1317,  8604, -1317, -1317, -1317,  9924, -1317,
+   10145, -1317, -1317,  1402,  9836, -1317, -1317, 10057,    48,  3613,
+      48,  1421,  1429,   817, -1317,  9924, -1317, -1317, -1317,  9836,
+   -1317, -1317, -1317,    48,    48, -1317, -1317, -1317, -1317, -1317,
+   -1317, -1317, -1317
 };
 
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
-{
-       0,     2,     0,     0,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     2,     1,     1,
-       3,     3,     1,     6,     4,     3,     7,     3,     7,     2,
-       2,     7,     4,     1,     3,     0,     1,     3,     7,     9,
-       1,     3,     1,     3,     7,     3,     7,     1,     1,     1,
-       2,     2,     2,     2,     2,     2,     4,     6,     1,     4,
-       4,     2,     4,     1,     1,     1,     1,     1,     1,     1,
-       4,     4,     1,     3,     3,     3,     1,     3,     3,     1,
-       3,     3,     1,     3,     3,     3,     3,     1,     3,     3,
-       1,     3,     1,     3,     1,     3,     1,     3,     1,     3,
-       1,     5,     4,     5,     1,     1,     3,     2,     0,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     2,     5,     6,     7,     1,     3,     1,     3,     0,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     6,
-       4,     2,     7,     1,     3,     1,     2,     1,     2,     1,
-       2,     2,     5,     7,     5,     9,     5,     9,     1,     3,
-       1,     1,     3,     3,     2,     1,     2,     2,     0,     1,
-       2,     3,     0,     1,     2,     3,     3,     4,     0,     1,
-       1,     2,     5,     7,     6,     6,     4,     3,     4,     2,
-       3,     2,     3,     3,     3,     3,     5,     3,     3,     4,
-       1,     5,     6,     5,     6,     9,    10,     9,    10,     2,
-       1,     2,     2,     2,     1,     6,     8,    10,    12,    14,
-       0,     1,     0,     1,     1,     3,     4,     7,     0,     1,
-       3,     1,     3,     1,     1,     1,     3,     1,     1,     1,
-       3,     0,     1,     3,     4,     1,     3,     1,     1,     3,
-       3,     3,     3,     3,     2,     3,     6,     3,     3,     4,
-       1,     2,     2,     3,     5,     8,     7,     7,     5,     9,
-       2,     2,     5,     3,     5,     4,     3,     4,     4,     7,
-       3,     3,     3,     3,     4,     6,     1,     1,     1,     1,
-       1,     1,     1,     1,     0,     1,     1,     2,     1,     1,
-       1,     1,     1,     1,     1,     0,     5,     1,     2,     3,
-       1,     2,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     2,     2,     3,     3,     1,
-       3,     1,     2,     2,     2,     4,     4,     4,     4,     1,
-       2,     2,     3,     1,     2,     2,     1,     2,     2,     3,
-       1,     2,     2,     1,     1,     4,     2,     0,     6,     7,
-       2,     2,     2,     0,     2,     2,     3,     2,     3,     1,
-       2,     3,     2,     2,     4,     0,     1,     2,     2,     1,
-       0,     1,     2,     2,     5,     2,     0,     7,     2,     4,
-       0,     2,     0,     1,     1,     1,     5,     5,     5,     1,
-       5,     5,     9,     1,     5,     0,     1,     1,     5,     1,
-       1,     5,     5,     1,     3,     3,     4,     1,     1,     1,
-       1,     2,     1,     3,     3,     1,     2,     1,     3,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       2,     1,     1,     1,     2,     0,     2,     2,     1,     4,
-       0,     1,     2,     3,     4,     2,     2,     1,     2,     1,
-       2,     5,     5,     7,     6,     1,     2,     2,     3,     1,
-       2,     2,     4,     2,     4,     0,     4,     2,     1,     1,
-       1,     0,     2,     5,     5,    13,     1,     1,     3,     3,
-       2,     3,     3,     2,     4,     1,     6,     9,     0,    11,
-       1,     3,     3,     3,     1,     1,     5,     2,     5,     0,
-       1,     1,     3,     0,     1,     1,     1,     1,     0,     6,
-       2,     1,     2,     4,     2,     3,     3,     3,     4,     5,
-       5,     5,     6,     1,     1,     1,     3,     0,     5,     0,
-       1,     1,     2,     6,     1,     3,     0,     1,     4,     1,
-       1,     1,     1,     2,     1,     2,     2,     1,     3,     2,
-       3,     3,     2,     4,     4,     3,     8,     3,     2,     1,
-       2,     6,     8,     3,     2,     3,     3,     4,     4,     3,
-       1,     1,     1,     4,     6,     3,     2,     3,     3,     4,
-       4,     3,     2,     1,     2,     2,     1,     3,     2,     3,
-       3,     2,     4,     4,     3,     6,     8,     3,     2,     1,
-       2,     2,     2,     3,     3,     2,     4,     4,     3,     6,
-       8,     3,     2,     1,     2,     2,     1,     1,     2,     3,
-       3,     2,     4,     6,     8,     1,     2,     2,     1,     2,
-       2,     3,     3,     1,     4,     4,     3,     5,     8,     3,
-       2,     3,     1,     5,     5,     6,     6,     1,     2,     2,
-       1,     2,     2,     3,     3,     1,     4,     4,     3,     5,
-       8,     3,     1,     2,     1,     2,     6,     5,     6,     7,
-       7,     1,     2,     2,     1,     2,     2,     3,     3,     1,
-       4,     4,     3,     8,     3,     1,     1,     2,     1,     1,
-       2,     3,     2,     3,     2,     3,     3,     2,     4,     3,
-       2,     3,     2,     4,     3,     2,     6,     6,     6,     7,
-       1,     2,     1,     1,     1,     2,     3,     2,     3,     2,
-       3,     3,     4,     2,     3,     4,     2,     5,     5,     6,
-       6,     0,     1,     0,     2
-};
-
-/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-     294,   294,   315,   313,   316,   314,   317,   318,   300,   302,
-     301,     0,   303,   329,   321,   326,   324,   325,   323,   322,
-     327,   328,   333,   330,   331,   332,   549,   549,   549,     0,
-       0,     0,   294,   220,   304,   319,   320,     7,   360,     0,
-       8,    14,    15,     0,     2,    63,    64,   567,     9,   294,
-     527,   525,   247,     3,   455,     3,   260,     0,     3,     3,
-       3,   248,     3,     0,     0,     0,   295,   296,   298,   294,
-     307,   310,   312,   341,   286,   334,   339,   287,   349,   288,
-     356,   353,   363,     0,     0,   364,   289,   475,   479,     3,
-       3,     0,     2,   521,   526,   531,   299,     0,     0,   549,
-     579,   549,     2,   590,   591,   592,   294,     0,   733,   734,
-       0,    12,     0,    13,   294,   270,   271,     0,   295,   290,
-     291,   292,   293,   528,   305,   393,   550,   551,   371,   372,
-      12,   446,   447,    11,   442,   445,     0,   505,   500,   491,
-     446,   447,     0,     0,   530,   221,     0,   294,     0,     0,
-       0,     0,     0,     0,     0,     0,   294,   294,     2,     0,
-     735,   295,   584,   596,   739,   732,   730,   737,     0,     0,
-       0,   254,     2,     0,   534,   440,   441,   439,     0,     0,
-       0,     0,   549,     0,   636,   637,     0,     0,   547,   543,
-     549,   564,   549,   549,   545,     2,   544,   549,   603,   549,
-     549,   606,     0,     0,     0,   294,   294,   313,   361,     2,
-     294,   261,   297,   308,   342,   354,   480,     0,     2,     0,
-     455,   262,   295,   335,   350,   357,   476,     0,     2,     0,
-     311,   336,   343,   344,     0,   351,   355,   358,   362,   447,
-     294,   373,   366,   370,     0,   395,   477,   481,     0,     0,
-       0,     1,   294,     2,   532,   578,   580,   294,     2,   743,
-     295,   746,   547,   547,     0,   295,     0,     0,   273,   549,
-     545,     2,   294,     0,     0,   294,   552,     2,   503,     2,
-     556,     0,     0,     0,     0,     0,     0,    18,    58,     4,
-       5,     6,    16,     0,     0,   294,     2,    65,    66,    67,
-      68,    48,    19,    49,    22,    47,    69,   294,     0,    72,
-      76,    79,    82,    87,    90,    92,    94,    96,    98,   100,
-     105,   497,   753,   453,   496,     0,   451,   452,     0,   568,
-     583,   586,   589,   595,   598,   601,   360,     0,     2,   741,
-       0,   294,   744,     2,    63,   294,     3,   427,     0,   435,
-     295,   294,   307,   334,   287,   349,   356,     3,     3,   409,
-     413,   423,   428,   475,   294,   429,   708,   709,   294,   430,
-     432,   294,     2,   585,   597,   731,     2,     2,   249,     2,
-     460,     0,   458,   457,   456,   141,     2,     2,   251,     2,
-       2,   250,     2,   281,     2,   282,     0,   280,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   569,   608,     0,
-     455,     2,   563,   572,   662,   565,   566,   535,   294,     2,
-     602,   611,   604,   605,     0,   276,   294,   294,   340,   295,
-       0,   295,     0,   294,   736,   740,   738,   536,   294,   547,
-     255,   263,   309,     0,     2,   537,   294,   501,   337,   338,
-     283,   352,   359,     0,   294,     0,   751,   400,     0,   478,
-     502,   252,   253,   522,   294,   437,     0,   294,   237,     0,
-       2,   239,     0,   295,     0,   257,     2,   258,   278,     0,
-       0,     2,   294,   547,   294,   488,   490,   489,     0,     0,
-     753,     0,   294,     0,   294,   492,   294,   562,   560,   561,
-     559,     0,   554,   557,     0,     0,   294,    55,   294,    69,
-      50,   294,    61,   294,   294,    53,    54,     2,   127,     0,
-       0,   449,     0,   448,   730,   121,   294,    17,     0,    29,
-      30,    35,     2,     0,    35,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   110,     0,    51,    52,     0,
+     291,   291,   311,   309,   312,   310,   313,   314,   297,   299,
+     298,     0,   300,   325,   317,   322,   320,   321,   319,   318,
+     323,   324,   329,   326,   327,   328,   544,   544,   544,     0,
+       0,     0,   291,   217,   301,   315,   316,     7,   356,     0,
+       8,    14,    15,     0,     2,    60,    61,   562,     9,   291,
+     522,   520,   244,     3,   451,     3,   257,     0,     3,     3,
+       3,   245,     3,     0,     0,     0,   292,   293,   295,   291,
+     304,   307,   337,   283,   330,   335,   284,   345,   285,   352,
+     349,   359,     0,     0,   360,   286,   470,   474,     3,     3,
+       0,     2,   516,   521,   526,   296,     0,     0,   544,   574,
+     544,     2,   585,   586,   587,   291,     0,   728,   729,     0,
+      12,     0,    13,   291,   267,   268,     0,   292,   287,   288,
+     289,   290,   523,   302,   389,   545,   546,   367,   368,    12,
+     442,   443,    11,   438,   441,     0,   500,   495,   486,   442,
+     443,     0,     0,   525,   218,     0,   291,     0,     0,     0,
+       0,     0,     0,     0,     0,   291,   291,     2,     0,   730,
+     292,   579,   591,   734,   727,   725,   732,     0,     0,     0,
+     251,     2,     0,   529,   436,   437,   435,     0,     0,     0,
+       0,   544,     0,   631,   632,     0,     0,   542,   538,   544,
+     559,   544,   544,   540,     2,   539,   544,   598,   544,   544,
+     601,     0,     0,     0,   291,   291,   309,   357,     2,   291,
+     258,   294,   305,   338,   350,   475,     0,     2,     0,   451,
+     259,   292,   331,   346,   353,   471,     0,     2,     0,   308,
+     332,   339,   340,     0,   347,   351,   354,   358,   443,   291,
+     369,   362,   366,     0,   391,   472,   476,     0,     0,     0,
+       1,   291,     2,   527,   573,   575,   291,     2,   738,   292,
+     741,   542,   542,     0,   292,     0,     0,   270,   544,   540,
+       2,   291,     0,     0,   291,   547,     2,   498,     2,   551,
+       0,     0,     0,     0,     0,     0,    18,    57,     4,     5,
+       6,    16,     0,     0,   291,     2,    62,    63,    64,    65,
+      45,    19,    46,    22,    44,    66,   291,     0,    69,    73,
+      76,    79,    84,    87,    89,    91,    93,    95,    97,   102,
+     492,   748,   449,   491,     0,   447,   448,     0,   563,   578,
+     581,   584,   590,   593,   596,   356,     0,     2,   736,     0,
+     291,   739,     2,    60,   291,     3,   423,     0,   431,   292,
+     291,   304,   330,   284,   345,   352,     3,     3,   405,   409,
+     419,   424,   470,   291,   425,   703,   704,   291,   426,   428,
+     291,     2,   580,   592,   726,     2,     2,   246,     2,   456,
+       0,   454,   453,   452,   138,     2,     2,   248,     2,     2,
+     247,     2,   278,     2,   279,     0,   277,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   564,   603,     0,   451,
+       2,   558,   567,   657,   560,   561,   530,   291,     2,   597,
+     606,   599,   600,     0,   273,   291,   291,   336,   292,     0,
+     292,     0,   291,   731,   735,   733,   531,   291,   542,   252,
+     260,   306,     0,     2,   532,   291,   496,   333,   334,   280,
+     348,   355,     0,   291,     0,   746,   396,     0,   473,   497,
+     249,   250,   517,   291,   433,     0,   291,   234,     0,     2,
+     236,     0,   292,     0,   254,     2,   255,   275,     0,     0,
+       2,   291,   542,   291,   483,   485,   484,     0,     0,   748,
+       0,   291,     0,   291,   487,   291,   557,   555,   556,   554,
+       0,   549,   552,     0,     0,   291,    52,   291,    66,    47,
+     291,    54,   291,   291,    50,    51,     2,   124,     0,     0,
+     445,     0,   444,   725,   118,   291,    17,     0,    29,    30,
+      35,     2,     0,    35,   108,   109,   110,   111,   112,   113,
+     114,   115,   116,   117,   107,     0,    48,    49,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   107,
-       2,   648,   454,   645,   549,   549,   653,   482,   294,     2,
-     587,   588,     0,   599,   600,     0,     2,   742,   745,   121,
-     294,     0,     2,   710,   295,   714,   705,   706,   712,     0,
-       2,     2,   670,   549,   753,   619,   549,   549,   753,   549,
-     633,   549,   549,   684,   436,   667,   549,   549,   675,   682,
-     294,   431,   295,     0,     0,   294,   720,   295,   725,   753,
-     717,   294,   722,   753,   294,   294,   294,     0,   121,     0,
-      18,     5,     2,     0,    19,     0,   461,   751,     0,     0,
-     467,   241,     0,   294,     0,     0,     0,   547,   571,   575,
-     577,   607,   610,   614,   617,   570,   609,     0,   284,   660,
-       0,   294,   277,     0,     0,     0,     0,   275,     2,     0,
-     259,   538,   294,     0,     0,   294,     2,   365,   385,   374,
-       0,     0,   379,   373,   752,     0,     0,   398,     0,   295,
-       3,   416,     3,   420,   419,   593,     0,   533,   294,    63,
-       3,   294,   435,   295,     3,   429,   430,     2,     0,     0,
-       0,   487,   306,   294,   483,   485,     3,     2,     2,     0,
-     504,     3,     0,   556,   129,     0,     0,   222,     0,     0,
-       0,     2,     0,     0,    36,     0,     0,   121,   294,    20,
-       0,    21,     0,   694,   699,   450,   691,   549,   549,     0,
-     108,     3,     2,    27,     2,     0,    33,     0,     2,    25,
-       0,   106,    73,    74,    75,    77,    78,    80,    81,    85,
-      86,    83,    84,    88,    89,    91,    93,    95,    97,    99,
-       0,     0,   754,   294,     0,     0,     0,   649,   650,   646,
-     647,   499,   498,   294,     0,   294,   716,   294,   721,   295,
-     294,   664,   294,   294,   707,   663,     2,   294,     0,     0,
-       0,     0,     0,     0,     0,     0,   685,     0,   671,   622,
-     638,   672,     2,   618,   625,   433,   620,   621,   434,     2,
-     632,   641,   634,   635,   668,   669,   683,   711,   715,   713,
-     753,   268,     2,   747,     2,   424,   719,   724,   425,     0,
-     403,     3,     3,     3,     3,   455,     3,     0,     2,   470,
-     466,   752,     0,   462,   469,     2,   465,   468,     0,   294,
-     242,   264,     3,   272,   274,     0,   455,     2,   573,   574,
-       2,   612,   613,     0,   661,   539,     3,   346,   345,   348,
-     347,   294,   540,     0,   541,   373,     0,     0,   294,   294,
-       0,     0,   694,   383,   386,   390,   549,   390,   389,   382,
-     375,   549,   377,   380,   294,   400,   394,   104,   401,   751,
-       0,     0,   438,   240,     0,     0,     3,     2,   670,   431,
-       0,   529,     0,   753,   491,     0,   294,   294,   294,     0,
-     553,   555,   130,     0,     0,   215,     0,     0,     0,   223,
-     224,    56,     0,    62,   294,     0,    60,    59,     0,     2,
-     128,     0,     0,     0,   695,   696,   692,   693,   460,    70,
-      71,   109,   125,     3,   108,     0,     0,     0,    24,    35,
-       3,     0,    32,   102,     0,     3,   652,   656,   659,   651,
-       3,   594,     3,   718,   723,     2,    63,   294,     3,     3,
-     295,     0,     3,   624,   628,   631,   640,   674,   678,   681,
-     294,     3,   623,   639,   673,   294,   294,   426,   294,   294,
-     748,     0,     0,     0,     0,   256,     0,   104,     0,     3,
-       3,     0,   463,     0,   459,     0,     0,   245,   294,     0,
-       0,   129,     0,     0,     0,     0,     0,   129,     0,     0,
-     108,   108,    18,     2,     0,     0,     3,   131,   132,     2,
-     143,   133,   134,   135,   136,   137,   138,   145,   147,     0,
-       0,     0,   285,   294,   294,   549,     0,   542,   294,   376,
-     378,     0,   392,   695,   387,   391,   388,   381,   385,   368,
-     399,     0,   581,     2,   666,   665,     0,   671,     2,   484,
-     486,   506,     3,   514,   515,     0,     2,   510,     3,     3,
-       0,     0,   558,   222,     0,     0,     0,   222,     0,     0,
-       3,    37,   121,   698,   702,   704,   697,   751,   108,     0,
-       3,   663,    42,     3,    40,     3,    34,     0,     3,   101,
-     103,     0,     2,   654,   655,     0,     0,   294,     0,     0,
-       0,     3,   640,     0,     2,   626,   627,     2,   642,     2,
-     676,   677,     0,     0,    63,     0,     3,     3,     3,     3,
-     411,   410,   414,     2,     2,   750,   749,   122,     0,     0,
-       0,     0,     3,   464,     3,     0,   243,   146,     3,   295,
-     294,     0,     0,     0,     0,     2,     0,   191,     0,   189,
-       0,     0,     0,     0,     0,     0,     0,   549,   121,     0,
-     151,   148,   294,     0,     0,   267,   279,     3,     3,   548,
-     615,   369,   384,   397,   294,   266,   294,     0,   517,   494,
-     294,     0,     0,   493,   508,     0,     0,     0,   216,     0,
-     225,    57,   108,     0,     2,   700,   701,     0,   126,   123,
-       0,     0,     0,     0,     0,     0,    23,     0,   657,   294,
-     582,   265,   726,   727,   728,     0,   679,   294,   294,   294,
-       3,     3,     0,   687,     0,     0,     0,     0,   294,   294,
-       3,   546,   471,   472,     0,     0,   246,   295,     0,     0,
-       0,     0,   294,   192,   190,   187,     0,   193,     0,     0,
-       0,     0,   197,   200,   198,   194,     0,   195,   129,    35,
-     144,   142,   244,     0,     0,   418,   422,   421,     0,   511,
-       2,   512,     2,   513,   507,   294,   228,     0,   226,     0,
-     228,     3,   663,   294,    31,   124,     2,    45,     2,    43,
-      41,    28,   122,    26,     3,   729,     3,     3,     3,     0,
-       0,   686,   688,   629,   643,   269,     2,   408,     3,   407,
-       0,   474,   471,   129,     0,     0,   129,     3,     0,   129,
-     188,     0,     2,     2,   209,   199,     0,     0,     0,   140,
-       0,   576,   616,     2,     0,     0,     2,   229,     0,     0,
-     217,     0,     0,     0,     3,     0,     0,     0,     0,     0,
-       0,   689,   690,   294,     0,   473,   152,     0,     0,     2,
-     165,   129,   154,     0,   182,     0,   129,     0,     2,   156,
-       0,     2,     0,     2,     2,     2,   196,    32,   294,   516,
-     518,   509,     0,     0,     0,     0,   124,    38,     0,     3,
-       3,   658,   630,   644,   680,   412,   129,   158,   161,     0,
-     160,   164,     3,   167,   166,     0,   129,   184,   129,     3,
-       0,   294,     0,   294,     0,     2,     0,     2,   139,     2,
-     230,   231,     0,   227,   218,     0,   703,     0,     0,   153,
-       0,     0,   163,   233,   168,     2,   235,   183,     0,   186,
-     172,   201,     3,   210,   214,   203,     3,     0,   294,     0,
-     294,     0,     0,     0,    39,    46,    44,   159,   162,   129,
-       0,   169,   294,   129,   129,     0,   173,     0,     0,   694,
-     211,   212,   213,     0,   202,     3,   204,     3,   294,   219,
-     232,   149,   170,   155,   129,   236,   185,   180,   178,   174,
-     157,   129,     0,   695,     0,     0,     0,     0,   150,   171,
-     181,   175,   179,   178,   176,     3,     3,     0,     0,   495,
-     177,   205,   207,     3,     3,   206,   208
+       0,     0,     0,     0,     0,     0,     0,     0,   104,     2,
+     643,   450,   640,   544,   544,   648,   477,   291,     2,   582,
+     583,     0,   594,   595,     0,     2,   737,   740,   118,   291,
+       0,     2,   705,   292,   709,   700,   701,   707,     0,     2,
+       2,   665,   544,   748,   614,   544,   544,   748,   544,   628,
+     544,   544,   679,   432,   662,   544,   544,   670,   677,   291,
+     427,   292,     0,     0,   291,   715,   292,   720,   748,   712,
+     291,   717,   748,   291,   291,   291,     0,   118,     0,    18,
+       2,     0,    19,     0,   457,   746,     0,     0,   463,   238,
+       0,   291,     0,     0,     0,   542,   566,   570,   572,   602,
+     605,   609,   612,   565,   604,     0,   281,   655,     0,   291,
+     274,     0,     0,     0,     0,   272,     2,     0,   256,   533,
+     291,     0,     0,   291,     2,   361,   381,   370,     0,     0,
+     375,   369,   747,     0,     0,   394,     0,   292,     3,   412,
+       3,   416,   415,   588,     0,   528,   291,    60,     3,   291,
+     431,   292,     3,   425,   426,     2,     0,     0,     0,   482,
+     303,   291,   478,   480,     3,     2,     2,     0,   499,     3,
+       0,   551,   126,     0,     0,   219,     0,     0,     0,     0,
+      36,     0,     0,   118,   291,    20,     0,    21,     0,   689,
+     694,   446,   686,   544,   544,     0,   105,     3,     2,    27,
+       0,    33,     0,     2,    25,     0,   103,    70,    71,    72,
+      74,    75,    77,    78,    82,    83,    80,    81,    85,    86,
+      88,    90,    92,    94,    96,     0,     0,   749,   291,     0,
+       0,     0,   644,   645,   641,   642,   494,   493,   291,     0,
+     291,   711,   291,   716,   292,   291,   659,   291,   291,   702,
+     658,     2,   291,     0,     0,     0,     0,     0,     0,     0,
+       0,   680,     0,   666,   617,   633,   667,     2,   613,   620,
+     429,   615,   616,   430,     2,   627,   636,   629,   630,   663,
+     664,   678,   706,   710,   708,   748,   265,     2,   742,     2,
+     420,   714,   719,   421,     0,   399,     3,     3,     3,     3,
+     451,     3,     0,     2,   465,   462,   747,     0,   458,     2,
+     461,   464,     0,   291,   239,   261,     3,   269,   271,     0,
+     451,     2,   568,   569,     2,   607,   608,     0,   656,   534,
+       3,   342,   341,   344,   343,   291,   535,     0,   536,   369,
+       0,     0,   291,   291,     0,     0,   689,   379,   382,   386,
+     544,   386,   385,   378,   371,   544,   373,   376,   291,   396,
+     390,   101,   397,   746,     0,     0,   434,   237,     0,     0,
+       3,     2,   665,   427,     0,   524,     0,   748,   486,     0,
+     291,   291,   291,     0,   548,   550,   127,     0,     0,   212,
+       0,     0,     0,   220,   221,    53,     0,    55,    58,    59,
+       0,     2,   125,     0,     0,     0,   690,   691,   687,   688,
+     456,    67,    68,   106,   122,     3,   105,     0,     0,    24,
+      35,     3,     0,    32,    99,     0,     3,   647,   651,   654,
+     646,     3,   589,     3,   713,   718,     2,    60,   291,     3,
+       3,   292,     0,     3,   619,   623,   626,   635,   669,   673,
+     676,   291,     3,   618,   634,   668,   291,   291,   422,   291,
+     291,   743,     0,     0,     0,     0,   253,     0,   101,     0,
+       3,     3,     0,   459,     0,   455,     0,     0,   242,   291,
+       0,     0,   126,     0,     0,     0,     0,     0,   126,     0,
+       0,   105,   105,    18,     2,     0,     0,     3,   128,   129,
+       2,   140,   130,   131,   132,   133,   134,   135,   142,   144,
+       0,     0,     0,   282,   291,   291,   544,     0,   537,   291,
+     372,   374,     0,   388,   690,   383,   387,   384,   377,   381,
+     364,   395,     0,   576,     2,   661,   660,     0,   666,     2,
+     479,   481,   501,     3,   509,   510,     0,     2,   505,     3,
+       3,     0,     0,   553,   219,     0,     0,     0,   219,     0,
+       0,   118,   693,   697,   699,   692,   746,   105,     0,     3,
+     658,    39,     3,    37,    34,     0,     3,    98,   100,     0,
+       2,   649,   650,     0,     0,   291,     0,     0,     0,     3,
+     635,     0,     2,   621,   622,     2,   637,     2,   671,   672,
+       0,     0,    60,     0,     3,     3,     3,     3,   407,   406,
+     410,     2,     2,   745,   744,   119,     0,     0,     0,     0,
+       3,   460,     3,     0,   240,   143,     3,   292,   291,     0,
+       0,     0,     0,     2,     0,   188,     0,   186,     0,     0,
+       0,     0,     0,     0,     0,   544,   118,     0,   148,   145,
+     291,     0,     0,   264,   276,     3,     3,   543,   610,   365,
+     380,   393,   291,   263,   291,     0,   512,   489,   291,     0,
+       0,   488,   503,     0,     0,     0,   213,     0,   222,    56,
+       2,   695,   696,     0,   123,   120,     0,     0,     0,     0,
+       0,    23,     0,   652,   291,   577,   262,   721,   722,   723,
+       0,   674,   291,   291,   291,     3,     3,     0,   682,     0,
+       0,     0,     0,   291,   291,     3,   541,   119,   467,     0,
+       0,   243,   292,     0,     0,     0,     0,   291,   189,   187,
+     184,     0,   190,     0,     0,     0,     0,   194,   197,   195,
+     191,     0,   192,   126,    35,   141,   139,   241,     0,     0,
+     414,   418,   417,     0,   506,     2,   507,     2,   508,   502,
+     291,   225,     0,   223,     0,   225,   291,    31,   121,     2,
+      42,     2,    40,    38,    28,    26,     3,   724,     3,     3,
+       3,     0,     0,   681,   683,   624,   638,   266,     2,   404,
+       3,   403,     0,   469,   466,   126,     0,     0,   126,     3,
+       0,   126,   185,     0,     2,     2,   206,   196,     0,     0,
+       0,   137,     0,   571,   611,     2,     0,     0,     2,   226,
+       0,     0,   214,     0,     3,     0,     0,     0,     0,     0,
+       0,   684,   685,   291,     0,   468,   149,     0,     0,     2,
+     162,   126,   151,     0,   179,     0,   126,     0,     2,   153,
+       0,     2,     0,     2,     2,     2,   193,    32,   291,   511,
+     513,   504,     0,     0,     0,     0,     0,     3,     3,   653,
+     625,   639,   675,   408,   126,   155,   158,     0,   157,   161,
+       3,   164,   163,     0,   126,   181,   126,     3,     0,   291,
+       0,   291,     0,     2,     0,     2,   136,     2,   227,   228,
+       0,   224,   215,   698,     0,     0,   150,     0,     0,   160,
+     230,   165,     2,   232,   180,     0,   183,   169,   198,     3,
+     207,   211,   200,     3,     0,   291,     0,   291,     0,     0,
+       0,    43,    41,   156,   159,   126,     0,   166,   291,   126,
+     126,     0,   170,     0,     0,   689,   208,   209,   210,     0,
+     199,     3,   201,     3,   291,   216,   229,   146,   167,   152,
+     126,   233,   182,   177,   175,   171,   154,   126,     0,   690,
+       0,     0,     0,     0,   147,   168,   178,   172,   176,   175,
+     173,     3,     3,     0,     0,   490,   174,   202,   204,     3,
+       3,   203,   205
 };
 
-/* YYDEFGOTO[NTERM-NUM].  */
+  /* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+   -1317,  4344,  3244, -1317,   633, -1317,   172,   896,  -203, -1317,
+     487,  -518,  -482,  -910,  -211,  1511,     0, -1317,  1129,   534,
+     537,   615,   556,   984,   981,   988,   980,   989, -1317,     4,
+    -451,  4784,  -913, -1317,  -702,   571,    13,  -706,   419, -1317,
+     190, -1317,   345,  -964, -1317, -1317,    85, -1317, -1099, -1138,
+     197, -1317, -1317, -1317, -1317,    20, -1281, -1317, -1317, -1317,
+   -1317, -1317, -1317,   266, -1095,    50, -1317,  -472, -1317,   443,
+     239, -1317,   118, -1317,  -294, -1317, -1317, -1317,   496,  -829,
+   -1317, -1317,     8,  -952,    28,  2894, -1317, -1317, -1317,  -214,
+   -1317,   121,  1028,  -198,  1848,  3592, -1317, -1317,   127,   296,
+    1545,  1505, -1317,  1929, -1317, -1317,   137,  2139, -1317,  2574,
+     804, -1317, -1317, -1317,  -637, -1317,   886,   889,   490,   670,
+      52, -1317, -1317, -1317,   893,   666,  -510, -1317,  -116,    40,
+    1073, -1317, -1317,  -889,  -983,   933,  1377,  1006,   -11, -1317,
+    1351,   508,  -322,  -183,  -145,   623,   724, -1317,   944, -1317,
+    2701,   574,  -443,   875, -1317, -1317,   659, -1317,  -228, -1317,
+     -45, -1317, -1317, -1317, -1253,   370, -1317, -1317, -1317,  1120,
+   -1317,    33, -1317, -1317,  -828,  -100, -1316,  -170,  2264, -1317,
+    1914, -1317,   868, -1317,  -155,   129,  -181,  -180,  -175,     7,
+     -41,   -40,   -35,  1507,    37,    53,    57,   -29,  -172,  -163,
+    -158,  -150,  -293,  -500,  -490,  -485,  -542,  -284,  -525, -1317,
+   -1317,  -499,  1035,  1038,  1040,  1486,  4616,  -563,  -531,  -513,
+    -491,  -561, -1317,  -506,  -730,  -727,  -723,  -562,  -311,  -227,
+   -1317, -1317,   378,    19,   -93, -1317,  3633,   159,  -611,  -428
+};
+
+  /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,   817,   468,   301,    47,   134,   135,   302,   303,   304,
-     305,   765,   766,  1143,  1144,   306,   381,   308,   309,   310,
-     311,   312,   313,   314,   315,   316,   317,   318,   319,   320,
-    1038,   518,   982,   546,   322,   983,   952,  1065,  1541,  1067,
-    1068,  1069,  1070,  1542,  1071,  1072,  1458,  1459,  1420,  1421,
-    1422,  1520,  1521,  1525,  1526,  1561,  1562,  1073,  1378,  1074,
-    1075,  1312,  1313,  1314,  1502,  1076,   146,   958,   959,   960,
-    1398,  1482,  1494,  1495,   469,   470,   879,   880,  1046,    51,
-      52,    53,    54,    55,   347,   159,    58,    59,    60,    61,
-      62,   349,    64,    65,   265,    67,    68,   275,   351,   352,
-      71,    72,    73,    74,   119,    76,   205,   354,   120,    79,
-     121,    81,    82,   455,    83,   454,   689,   690,   691,   913,
-    1094,   914,    84,    85,   458,   456,   697,   859,   860,   357,
-     358,   700,   701,   702,   359,   360,   361,   362,   466,   340,
-     136,   137,   522,   324,   171,   646,   647,   648,   649,   650,
-      86,   122,    88,   489,   490,   944,   491,   278,   495,   325,
-      89,   138,   139,    90,  1335,  1116,  1117,  1118,  1119,    91,
-      92,   718,    93,   274,    94,    95,   188,  1040,   680,   412,
-     126,    96,   501,   502,   503,   189,   269,   191,   192,   193,
-     270,    99,   100,   101,   102,   103,   104,   105,   196,   197,
-     198,   199,   200,   829,   605,   606,   607,   608,   201,   610,
-     611,   612,   572,   573,   574,   575,   754,   106,   614,   615,
-     616,   617,   618,   619,   975,   756,   757,   758,   595,   365,
-     366,   367,   368,   326,   165,   108,   109,   110,   370,   695,
-     569
+      -1,   812,   467,   300,    47,   133,   134,   301,   302,   303,
+     304,   760,   761,  1132,  1133,   305,   380,   307,   308,   309,
+     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
+    1029,   517,   974,   545,   321,   975,   946,  1056,  1517,  1058,
+    1059,  1060,  1061,  1518,  1062,  1063,  1436,  1437,  1400,  1401,
+    1402,  1496,  1497,  1501,  1502,  1537,  1538,  1064,  1360,  1065,
+    1066,  1297,  1298,  1299,  1479,  1067,   145,   952,   953,   954,
+    1380,  1460,  1471,  1472,   468,   469,   873,   874,  1037,    51,
+      52,    53,    54,    55,   346,   158,    58,    59,    60,    61,
+      62,   348,    64,    65,   264,    67,    68,   274,   350,   351,
+      71,    72,    73,   118,    75,   204,   353,   119,    78,   120,
+      80,    81,   454,    82,   453,   687,   688,   689,   907,  1085,
+     908,    83,    84,   457,   455,   695,   854,   855,   856,   857,
+     698,   699,   700,   358,   359,   360,   361,   465,   339,   135,
+     136,   521,   323,   170,   644,   645,   646,   647,   648,    85,
+     121,    87,   488,   489,   938,   490,   277,   494,   324,    88,
+     137,   138,    89,  1320,  1107,  1108,  1109,  1110,    90,    91,
+     716,    92,   273,    93,    94,   187,  1031,   678,   411,   125,
+      95,   500,   501,   502,   188,   268,   190,   191,   192,   269,
+      98,    99,   100,   101,   102,   103,   104,   195,   196,   197,
+     198,   199,   824,   604,   605,   606,   607,   200,   609,   610,
+     611,   571,   572,   573,   574,   750,   105,   613,   614,   615,
+     616,   617,   618,   967,   752,   753,   754,   594,   364,   365,
+     366,   367,   325,   164,   107,   108,   109,   369,   693,   568
 };
 
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -1315
-static const yytype_int16 yypact[] =
-{
-    5006,  8237, -1315,    89, -1315, -1315, -1315, -1315, -1315, -1315,
-   -1315,   194, -1315, -1315, -1315, -1315, -1315, -1315, -1315, -1315,
-   -1315, -1315, -1315, -1315, -1315, -1315,   314,   314,   314,   792,
-     787,   234,  7780,   219, -1315, -1315, -1315, -1315, -1315,   257,
-   -1315, -1315, -1315,   912,   264, -1315, -1315, -1315, -1315,  6920,
-   -1315, -1315, -1315, -1315,   120,   272, -1315,   823, -1315, -1315,
-   -1315, -1315,   302,  1619,   420,   112,  3706, -1315, -1315,  9405,
-    1262, -1315, -1315, -1315,   675,   440,  7333,  1133,  1444,   675,
-    1669, -1315, -1315,   482,   771, -1315,   675,  1807, -1315,   386,
-   -1315,   507,   517, -1315, -1315, -1315, -1315,   426,   272,   314,
-   -1315,   314, -1315, -1315, -1315, -1315,  8871,   823, -1315, -1315,
-     823, -1315,   415, -1315,  8985, -1315, -1315,  1777,  9099, -1315,
-     428,   428,   428, -1315, -1315, -1315,   314, -1315, -1315, -1315,
-     454,   468,   490, -1315, -1315, -1315,   500, -1315, -1315, -1315,
-   -1315, -1315,   504,   509, -1315, -1315,    76,  8833,  2235,   669,
-     439,   450,   519,   522,   537,   567,  8121,  7182,   529,   581,
-   -1315,  9443, -1315, -1315, -1315, -1315,   595, -1315,   216,  3771,
-    3771, -1315,   603,   313, -1315, -1315, -1315, -1315,   605,   316,
-     320,   345,   314,   589, -1315, -1315,  1619,  2809,   664, -1315,
-      49, -1315,   314,   314,   272, -1315, -1315,    87, -1315,   314,
-     314, -1315,  3249,   632,   636,   428,  7093, -1315, -1315,   646,
-    6920, -1315, -1315,   675, -1315, -1315, -1315,   272, -1315,   823,
-     120, -1315,  7972, -1315,   428,   428,   428,   272, -1315,   792,
-   -1315,  5155, -1315, -1315,   635,   428, -1315,   428, -1315,   257,
-    8833, -1315,   657, -1315,   787,   660,   428, -1315,   792,   679,
-     704, -1315,  7780,   574, -1315, -1315, -1315,  9296, -1315, -1315,
-    6389, -1315,   664,    74,  5169,  9099,  1777,  3249, -1315,    97,
-   -1315, -1315,  8985,   823,   708,  9849, -1315, -1315,   539, -1315,
-   10667,   680,   762, 10451,   751, 10470, 10528, -1315,   764, -1315,
-   -1315, -1315, -1315, 10547, 10547,  8605,   778, -1315, -1315, -1315,
-   -1315, -1315, -1315,   801, -1315,   969,  2181,  8947, 10470, -1315,
-     339,   731,   846,   265,   890,   795,   797,   810,   836,    33,
-   -1315, -1315,   812,   497, -1315,    59, -1315, -1315,  2235, -1315,
-   -1315,   588,   835, -1315,   622,   835,   847,   257, -1315, -1315,
-     863,  8871, -1315,   854,   878,  9061, -1315, -1315,   765,  1714,
-    8320,  7093,   675, -1315,   675,   428,   428, -1315, -1315, -1315,
-   -1315, -1315, -1315,   428,  8871,   823, -1315, -1315,  9213,   843,
-   -1315,  8757, -1315, -1315, -1315, -1315, -1315, -1315, -1315,   886,
-    3575, 10470, -1315, -1315, -1315, -1315, -1315, -1315, -1315, -1315,
-   -1315, -1315, -1315, -1315, -1315, -1315,  1777, -1315,   793,   865,
-     884,   894,   869,   902,   905,   909,  2809, -1315, -1315,   918,
-     120,   935, -1315, -1315,   927, -1315, -1315, -1315,  9296, -1315,
-   -1315, -1315, -1315, -1315,  3249, -1315,  8833,  8833, -1315,   428,
-    1777,  7213,   823,  8393, -1315, -1315, -1315, -1315,  9296,    74,
-   -1315, -1315,   675,   272, -1315, -1315,  9296, -1315,  6557, -1315,
-   -1315,   428,   428,   295,  9519,   937,   942,   934,   955,   428,
-   -1315, -1315, -1315, -1315,  9927, -1315,   540,  6680, -1315,   272,
-     963, -1315,  1777, 10749,  5888, -1315, -1315, -1315, -1315,   899,
-    3249, -1315,  8466,   664,  7663, -1315, -1315, -1315,  1232,   551,
-     812,   787,  9849,   591,  8985, -1315,  9849, -1315, -1315, -1315,
-   -1315,   576, -1315,   980,   762,   283,  8605, -1315,  9699, -1315,
-   -1315,  8605, -1315,  8719,  8605, -1315, -1315,   987, -1315,   599,
-     996,   706,   999, -1315, -1315,  6048,  6769, -1315,   137, -1315,
-   -1315,  6053, -1315,   286,  6053, -1315, -1315, -1315, -1315, -1315,
-   -1315, -1315, -1315, -1315, -1315, -1315,  5169, -1315, -1315, 10470,
-   10470, 10470, 10470, 10470, 10470, 10470, 10470, 10470, 10470, 10470,
-   10470, 10470, 10470, 10470, 10470, 10470, 10470,  4672,  5169, -1315,
-     497,  1307, -1315, -1315,   314,   314, -1315, -1315,  8833, -1315,
-   -1315,   927,   574, -1315,   927, 10393, -1315, -1315, -1315,  9329,
-    6769,  1002,  1007, -1315,  9099, -1315, -1315,   595, -1315,  1019,
-     941,  1024,  1647,   103,   812, -1315,   314,   314,   812,   133,
-   -1315,   314,   314,   927, -1315, -1315,   314,   314, -1315,   835,
-    9781,   823, 10894,   412,   469,  9781, -1315,  6389, -1315,   812,
-   -1315,  8871, -1315,   191,  5383,  5383,  5383,   823, -1315,  4873,
-     979,   513,   886,   151,  1028,  1030, -1315,  1036,  3771,   531,
-   -1315,  1124,   823,  5383,   574,  1777,   574,   664,   782,   835,
-   -1315, -1315,   802,   835, -1315, -1315, -1315,   762, -1315,   835,
-     272,  9927, -1315,   606,  1050,   616,  1051, -1315,  1052,   272,
-   -1315, -1315,  9296,   272,  1054,  9699,  1053, -1315,  1508, -1315,
-     360,   367,   787, -1315,   787,  1056, 10470, -1315,   787, 10894,
-   -1315, -1315,  1059, -1315, -1315, -1315,   574, -1315, 10822,   878,
-   -1315,  5383,   769,  8320, -1315, -1315,   595,  1057,  1058,  1232,
-    3288, -1315, -1315,  9849, -1315, -1315,  1065, -1315, -1315,  1066,
-   -1315,  1065,  1064, 10667,  5169,   121,  1034,   100,  1074,  1071,
-    1075,   778,  1072,  1078, -1315,  1080,  1082,  9557,  6889, -1315,
-    5169, -1315,   706,  2222, -1315, -1315, -1315,   314,   314,  5021,
-    5169,  1079, -1315, -1315,   886,   619, -1315,  5169, -1315, -1315,
-     971, -1315, -1315, -1315, -1315,   339,   339,   731,   731,   846,
-     846,   846,   846,   265,   265,   890,   795,   797,   810,   836,
-   10470,   975, -1315,  9927,  1084,  1086,  1087,  1307, -1315, -1315,
-   -1315, -1315, -1315,  9927,   639,  5383, -1315,  8871, -1315,  7302,
-    9175, -1315,  8757,  7182, -1315, -1315,   941,  9927,   923,  1093,
-    1097,  1098,  1101,  1104,  1109,  1110, -1315,  3448,  1647, -1315,
-   -1315, -1315, -1315, -1315, -1315, -1315, -1315, -1315, -1315, -1315,
-   -1315, -1315, -1315, -1315, -1315, -1315,   927, -1315, -1315, -1315,
-     812, -1315, -1315, -1315, -1315, -1315, -1315, -1315, -1315,  1111,
-   -1315,  1115,  1116, -1315, -1315,   120,  1079,  4873, -1315, -1315,
-   -1315,  3575,  1113, -1315, -1315, -1315, -1315, -1315,   787,  6479,
-    1200, -1315, -1315, -1315, -1315,  1100,   120, -1315, -1315,   927,
-   -1315, -1315,   927,   146,   927, -1315, -1315, -1315, -1315, -1315,
-   -1315,  9481, -1315,   272, -1315, -1315,   380,   387,  9213,  7422,
-    1947, 10470,  2081, -1315, -1315,  1121,    77,  1121, -1315,   787,
-   -1315,   314, -1315, -1315,  9630,   934, -1315, -1315, -1315,   942,
-    1122,  1117, -1315, -1315,  1129,  1130, -1315,   769,  2444, -1315,
-     476, -1315,  3288,   812, -1315,  1135,  9849,  9811,  8833,  1136,
-   -1315, -1315,  1127,  1137,  1131, -1315, 10470,   134,   293,  1138,
-   -1315,  1142,   574,  1142,  6769,  5169, -1315, -1315,  1142,  1139,
-   -1315,  1150,  1152,  1153,  2222, -1315, -1315, -1315,  3575, -1315,
-   -1315, -1315, -1315,  1156,  5169,  1140,   574,  4873, -1315,  6053,
-   -1315,   574, -1315, -1315,  5169, -1315,   842,   835, -1315, -1315,
-   -1315, -1315, -1315, -1315, -1315,   886,   878,  9061, -1315, -1315,
-    7542,  1163, -1315,   882,   835, -1315,   892,   926,   835, -1315,
-     428,  4553, -1315, -1315, -1315,  9927,  9927, -1315,  8393,  8393,
-   -1315,  1161,  1164,  1169,  1172, -1315,  1171,   527,    41,  1079,
-   -1315,   574, -1315,  3771, -1315,  5169,   423, -1315,  6649,  1175,
-    1177, 10335,  1178,  1181,     9,    73,    48,  5169,  1182,   272,
-    5169,  5169,  1132,  1180,   489,  1162, -1315, -1315, -1315,  1184,
-   -1315, -1315, -1315, -1315, -1315, -1315, -1315, -1315, -1315,   787,
-    1183,  5169, -1315,  9927,  9927,   314,  1186, -1315,  9668, -1315,
-   -1315,   984, -1315,  2081, -1315, -1315, -1315, -1315,  1508, -1315,
-   -1315,  1188, -1315, -1315, -1315, -1315,  1191,  2444, -1315, -1315,
-    1185, -1315,  1065, -1315, -1315,  1777,  1194, -1315, -1315, -1315,
-     640,  1198, -1315,   100,  1201, 10470,  1195,   100,   100,  1213,
-    1214, -1315,  6048,   959,   835, -1315, -1315,  1036,  5169,  1217,
-    1156,   654,    46,  1216, -1315,  1214, -1315,  1222,  1216, -1315,
-   -1315,  1226, -1315, -1315,   927,  1229,  1230,  7062,  1231,  1235,
-    1237, -1315, -1315,  1242, -1315, -1315,   927, -1315, -1315, -1315,
-   -1315,   927,  5169,  5169,   878,  1244, -1315, -1315, -1315, -1315,
-   -1315, -1315, -1315, -1315, -1315, -1315, -1315, -1315, 10470, 10470,
-    1246,  1253,  1216, -1315, -1315,   787, -1315, -1315, -1315,  4813,
-    9811,  5169,  5169,  1321,  5169, -1315,  1239, -1315,  1247, -1315,
-    1248,  5169,  1250,  5169,   986,  1252,    81,   314,  9367,  1069,
-   -1315, -1315,  6479,  1261,   436, -1315, -1315, -1315, -1315, -1315,
-   -1315, -1315, -1315, -1315, 10153, -1315,  8466,  1268, -1315, -1315,
-    9811,   437,   451, -1315,  1270,  1271,   762,  1280, -1315,   352,
-   -1315, -1315,  5169,  1281, -1315, -1315,   927,  1277, -1315, -1315,
-    1284,   301,   375,   574,  1285,  1288, -1315,  1290, -1315,  9927,
-   -1315, -1315, -1315, -1315, -1315,  1291, -1315,  9927,  9927,  9927,
-   -1315, -1315,  1293, -1315,  1295,  1298,  1299,   590,  8088,  8204,
-   -1315, -1315,   304, -1315,  1302,  1303, -1315,  8539,   652,   671,
-    1308,   690,  6255, -1315, -1315, -1315,   471, -1315,   711,  1310,
-    1311,   272,  1363,  1043, -1315, -1315,  5169, -1315, 10335,  6053,
-   -1315, -1315, -1315,  1317,  1318, -1315, -1315, -1315,  1316, -1315,
-   -1315, -1315, -1315, -1315, -1315,  9811,   762,   155, -1315,  1300,
-     762,  1156,   297,  9927, -1315, -1315, -1315, -1315, -1315, -1315,
-   -1315, -1315,  1314, -1315, -1315, -1315, -1315, -1315, -1315,  1323,
-    1324, -1315, -1315, -1315, -1315, -1315, -1315, -1315,  1329, -1315,
-    1330, -1315, -1315, 10335,   135,  5169, 10335, -1315,  1333,  5169,
-   -1315,   281,  1344,  1348, -1315, -1315,  1340,  1343,  1331, -1315,
-     988, -1315, -1315, -1315,   823,  1777,  1338,   801,   995, 10470,
-   -1315,   713,  1349,  5169, -1315,   574,   574,  1350,  1355,  1356,
-    1358, -1315, -1315,  8393,  1359, -1315,  1430, 10470,  1360, -1315,
-   -1315, 10246, -1315,   722, -1315,  1347, 10335,  1352, -1315, -1315,
-    1366, -1315,  1370, -1315,  1385,  1386, -1315,  1354,  9811, -1315,
-   -1315, -1315,   762,   574,  1382,  1364,  1381, -1315,  1389,  1216,
-    1216, -1315, -1315, -1315, -1315, -1315, 10335,   197, -1315,  1000,
-   -1315, -1315,  7897, -1315, -1315,  1368,  5169, -1315,  5169,  7897,
-     272,  9699,   272,  9699,  1391, -1315,  1392, -1315, -1315,  1390,
-     801, -1315,   776, -1315, -1315,  5169, -1315,  1394,  1395, -1315,
-   10470, 10470, -1315, -1315,  1077,    85, -1315, -1315,  1372, -1315,
-    1077, -1315, -1315,  2494,   574, -1315, -1315,   272,  9699,   272,
-    9699,  1403,  1383,   574, -1315, -1315, -1315, -1315, -1315, 10246,
-    1401,  1077,  5739,  5169, 10157,  1402,  1077,  1408,  2494,  2404,
-   -1315, -1315, -1315,  1409, -1315, -1315, -1315, -1315,  8833, -1315,
-   -1315, -1315, 10024, -1315, 10246, -1315, -1315,  1388,  9931, -1315,
-   -1315, 10157,   272,  2404,   272,  1413,  1414,   857, -1315, 10024,
-   -1315, -1315, -1315,  9931, -1315, -1315, -1315,   272,   272, -1315,
-   -1315, -1315, -1315, -1315, -1315, -1315, -1315
-};
-
-/* YYPGOTO[NTERM-NUM].  */
-static const yytype_int16 yypgoto[] =
-{
-   -1315,  4470,  3041, -1315,    39, -1315,  2507,   957,  -207, -1315,
-     461,  -523,  -489,  -955,  -200,  5636,     0, -1315,    72,   572,
-     580,   245,   566,   964,   967,   968,   966,   976, -1315,  1601,
-    -609,  5067,  -949, -1315,  -712,  -938,   430,  -728,   512, -1315,
-    1697, -1315,   311, -1200, -1315, -1315,    43, -1315, -1142, -1154,
-     154, -1315, -1315, -1315, -1315,   -26, -1161, -1315, -1315, -1315,
-   -1315, -1315, -1315,   231, -1202,    53, -1315,  -908, -1315,   416,
-     205, -1315,    78, -1315,  -367, -1315, -1315, -1315,   470,  -824,
-   -1315, -1315,    13,  -940,   465,  2639, -1315, -1315, -1315,  -107,
-   -1315,   102,   269,  -201,  1635,  4179, -1315, -1315,     5,   449,
-     756,  -259,  1489, -1315,  1725, -1315, -1315,    52,  2057, -1315,
-    2147,   612, -1315, -1315, -1315,  -616, -1315,   866,   867,   456,
-     631,   158, -1315, -1315, -1315,   858,   633,  -514, -1315,  -544,
-    -359,  1913, -1315, -1315,  -928,  -991,  1380,  1398,   990,   324,
-   -1315,   171,   457,  -332,  -192,  -147,   584,   695, -1315,   919,
-   -1315,  2794,  1328,  -442,   850, -1315, -1315,   625, -1315,  -238,
-   -1315,   -94, -1315, -1315, -1315, -1246,   330, -1315, -1315, -1315,
-    1091, -1315,    35, -1315, -1315,  -834,   -97, -1314,  -130,  1985,
-   -1315,  3026, -1315,   844, -1315,  -170,  1212,  -183,  -173,  -167,
-       7,   -35,   -34,   -33,   936,    18,    55,    61,  -143,  -159,
-    -156,  -153,  -151,  -323,  -535,  -528,  -526,  -542,  -318,  -520,
-   -1315, -1315,  -512,  1006,  1009,  1011,  2067,  4895,  -560,  -543,
-    -538,  -536,  -484, -1315,  -481,  -740,  -737,  -736,  -586,  -304,
-    -339, -1315, -1315,   856,   707,   -88, -1315,  3848,    29,  -599,
-    -291
-};
-
-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -525
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
-      49,   114,   453,   399,   428,    69,   953,    98,   150,   151,
-     152,   770,   971,   400,   115,   972,   973,   407,   261,   401,
-     268,   498,   383,   384,   743,   628,   604,   402,   440,   632,
-     403,   609,    49,   404,   848,   405,  1148,    69,  1182,    98,
-     755,   596,   831,   148,   408,  1078,  1140,   980,   872,    49,
-     726,   670,    77,    50,   731,  1077,   162,   823,   410,   798,
-     830,   153,   824,   187,   825,   819,   210,   144,   342,    49,
-     194,   679,   820,   217,   821,   505,   227,   924,   167,   683,
-     822,  1206,   220,   399,    77,    50,  1192,   928,    31,  1396,
-     861,   861,   861,   400,   674,   676,   177,   407,   154,   401,
-    1180,  1181,    63,  1460,   155,   425,   114,   402,  1198,   861,
-     403,  1215,  1216,   404,   114,   405,    31,   267,   272,   834,
-    1210,   863,   864,   714,   408,   841,    31,   281,   566,  -234,
-    -234,  1261,   475,   477,    63,   447,    31,  1188,   409,   882,
-     203,  1207,    31,   167,  1316,  1208,   177,   307,   148,   177,
-     471,   150,   151,   152,   460,   162,   114,   345,   253,  1262,
-     411,   210,   730,   567,  1189,   721,  1211,   861,   373,   577,
-     971,   123,    31,   972,   973,   578,   327,  1460,   715,  1417,
-    1418,   745,   292,   476,   819,   282,   187,   187,   411,  1258,
-     204,   820,  1479,   821,   162,   177,   419,   936,   411,   724,
-    -234,   142,   267,   527,   153,  1209,   481,   918,   411,   111,
-      49,   956,   832,  1317,   601,  1245,   527,   162,   668,  1249,
-      41,    42,   210,   111,  1197,   140,   141,   169,   527,   443,
-     145,   150,   151,   152,    41,    42,   665,   527,   954,   436,
-     307,   154,   839,  1125,   601,  1182,   802,   155,   762,  1419,
-     808,   170,    49,   588,   242,   245,  1085,    69,   177,    98,
-     272,   861,   868,   666,  1399,   272,   267,   267,  1024,   327,
-     117,  1506,   114,   823,   162,   862,   862,   862,   824,  1464,
-     825,   819,  1150,   342,   609,   999,  1023,   463,   820,  1088,
-     821,  1002,   857,  1490,   862,   307,  1011,   735,  1182,   657,
-     476,   436,  1092,   124,    77,    50,  1535,   307,  1537,    77,
-     665,   471,   177,   835,  1341,   903,   596,   838,   160,   177,
-    1189,   596,   568,   571,  1548,  1417,  1418,   672,   148,  1212,
-    1101,   471,   377,   677,   834,   373,   167,   666,   855,   471,
-    1519,   114,   858,   143,  1559,   345,  1524,  1124,   378,   602,
-     620,  1563,   862,    31,    63,   556,   557,   510,   111,   472,
-    1180,  1181,  1198,  1549,   625,   527,   147,  1544,   625,    41,
-      42,   114,  1551,   111,   598,   259,   156,  1464,   831,   547,
-     548,   178,  1464,   160,    41,    42,   172,   177,  1078,   714,
-    1564,   558,   559,   736,   823,  1428,   267,   768,  1077,   824,
-     737,   825,  1464,  1126,   177,   684,   187,  -122,   177,  1464,
-    1127,   578,  1346,   373,  1403,   457,   323,   547,   182,  -122,
-    -122,   848,  1182,   202,   267,   339,   307,   307,  -122,   387,
-     267,   262,   390,   625,   263,  -122,   392,   342,     8,     9,
-      10,    11,    12,  -290,   715,   388,   862,   111,   391,    70,
-    1449,  1450,   393,   547,   114,   327,   327,   549,    41,    42,
-     893,   394,  1339,   550,   551,    56,   116,    31,  1004,  1340,
-      77,   177,   267,   808,   498,   430,   919,   395,  1379,   434,
-     267,    70,   625,   921,    49,  1455,  1348,   373,   720,    69,
-      77,    98,   920,  1136,   114,    34,   919,    56,    77,   922,
-    1146,   873,   248,   921,  1112,  1022,   307,   251,   114,   323,
-     609,   307,  1089,   307,   307,   213,  1247,  -520,   915,  1090,
-     472,   753,  1198,   327,   851,   114,   345,   886,   852,  1198,
-     957,   211,  1168,  1170,   221,   253,    77,    50,  1257,  1195,
-     472,   434,   327,   439,   488,   917,   264,  1024,   472,   330,
-     714,   645,  1195,  1330,   111,  1196,   140,   239,   884,  1027,
-     331,   287,   808,   -10,   521,    41,    42,  1332,  1322,  1331,
-     571,   571,    41,    42,  1377,   471,   160,  -443,   307,  1290,
-    1291,   853,  1198,  1333,   712,   854,    63,   750,   853,   625,
-     345,   240,  1108,  -469,   620,   810,   241,   483,   514,  -444,
-     602,   933,   602,  1380,   500,   715,   570,   327,   411,   277,
-     587,   874,  1136,   279,   593,    45,    46,   918,   280,  1022,
-     625,   772,   773,   774,  -469,   625,  -469,   620,   177,   332,
-    -469,   625,   333,   626,   625,   625,   625,   630,  1496,  -105,
-     339,   371,   875,  -105,   643,  1496,   111,   334,   876,   849,
-     705,  1427,  1109,   625,   598,   267,   706,    41,    42,   342,
-     177,   722,   725,   111,   729,   140,   141,   723,   493,  1179,
-     494,   442,   178,  1035,    41,    42,   177,   335,   215,     2,
-     207,     4,     5,     6,     7,   114,   732,   441,   912,   629,
-     372,   177,   733,   633,  1082,   323,   323,   579,  1545,   411,
-     727,    70,  1365,   596,   376,   728,  1366,   107,   107,   749,
-    1120,   625,   938,   620,   389,   750,   897,    56,   385,   720,
-     720,   397,   750,   688,  1042,   519,   899,   399,   409,   988,
-     215,   582,   750,   411,    77,   989,   117,   400,  1498,   107,
-    1499,   426,   407,   401,    35,   427,    36,   114,   345,  1001,
-    1243,   402,   753,   753,   403,   706,   578,   404,   432,   405,
-      77,   488,  1373,   323,  -122,   488,  -122,   450,   750,   408,
-    -122,  -367,   177,   215,  -396,   521,   107,   521,   253,   329,
-     521,  1374,   323,   521,   472,  -122,  -122,   750,   971,   504,
-    1444,   972,   973,   808,   339,  1546,  1390,   571,   714,   213,
-    1376,   779,   780,   781,   782,   625,   750,   625,  1457,  1007,
-     472,   461,   625,   345,   869,   752,   602,   411,   810,  1172,
-     342,  1381,   484,  1445,    45,    46,   230,   750,   602,  1442,
-     231,   979,  1465,   235,   215,   237,   462,    37,   750,   175,
-     176,    40,   246,   111,   292,   140,   141,   323,    41,    42,
-     712,   552,   553,   715,    41,    42,   673,   675,   806,   111,
-     508,   140,   141,   923,   130,   925,   131,   132,   133,   457,
-      41,    42,   215,   513,   372,    41,    42,   215,   937,   307,
-     601,  1517,  1457,   527,    69,   244,  1512,    45,    46,   847,
-     525,   887,  1513,   411,   593,    37,  1193,   175,   176,    40,
-     856,   625,   253,   329,   411,   164,    41,    42,   114,   345,
-     912,   890,   912,   411,   562,    37,   957,   175,   176,    40,
-     957,   957,   213,   665,   114,   563,    41,    42,   915,  1368,
-     565,    77,   715,    70,   554,   555,   519,   938,   938,   564,
-     177,   519,   720,   568,   519,   850,   338,   114,   307,    56,
-     666,  1152,   376,   411,   688,   917,  -440,    48,   113,   107,
-    1113,   865,   215,   738,   345,   739,   589,  1569,   740,   230,
-     164,   746,   586,   578,   753,   658,   881,   327,   419,   661,
-     411,    63,   560,   561,    37,   163,   113,   113,    40,    48,
-      -3,  1164,   488,   411,   659,    41,    42,   791,   638,   195,
-      48,  1167,   218,   601,   660,   228,    48,   345,   481,   329,
-     411,   712,   662,    37,    48,   663,   339,    40,  1238,   664,
-      48,    43,  1531,    48,    41,    42,    48,   667,   625,   625,
-      45,    46,   832,   329,   601,  1169,   849,   601,   258,  1337,
-     113,   113,   645,   215,  1309,  1310,  1311,   669,   307,  1047,
-     816,   693,   601,  1200,   528,   529,   530,   500,   694,    45,
-      46,  1347,  1349,  1350,    48,   696,   435,    48,  1254,   698,
-     411,   442,  1136,  1095,    48,  1095,  1003,  -238,   531,   547,
-     532,   806,   533,   534,   163,   215,   992,   989,   114,   734,
-    1097,   750,   994,   912,   329,   411,   -12,   374,   912,   747,
-      77,  1386,  1387,  1437,   989,    48,   751,   938,   230,   759,
-     235,  1442,  1443,    48,   811,   267,  1491,  1492,    48,   812,
-     510,  1417,  1418,   163,   775,   776,   783,   784,   435,  1397,
-     342,   815,   625,  1397,   777,   778,   826,     2,   207,     4,
-       5,     6,     7,    48,    48,   -13,   163,   870,   213,   645,
-     472,   523,   871,   878,   528,   529,   530,   345,   444,    48,
-     898,   900,   213,   164,   901,   908,   955,    48,   905,  -417,
-     806,   926,  -524,   941,   950,   948,    48,   339,   531,    48,
-     532,   723,   533,  1319,   961,   963,   113,   962,   966,   965,
-     967,   107,   968,   688,   996,   984,   997,   998,   230,   272,
-     114,   113,    35,  1013,    36,   113,   215,  1014,  1015,    48,
-     113,  1016,    97,   220,  1017,   488,  1115,   323,   114,  1018,
-    1019,  1030,   307,    48,    48,  -405,  -404,    69,  1044,  1079,
-      48,  1081,  1102,  1103,   215,  1480,   625,    48,   911,   215,
-     114,  1104,  1105,   750,    97,  1111,  1121,  1122,  1123,  1217,
-    1047,  1132,  1141,  1113,  1128,   149,   978,   177,   213,   712,
-    1133,    97,  1134,  1135,   374,    -3,     2,   207,     4,     5,
-       6,     7,  1138,  1162,    77,   190,   847,  1183,    97,  1185,
-    1184,    97,  1186,  1187,  1201,    48,  1202,  1204,   625,   625,
-    1205,  1213,  1218,  1225,  1220,   229,  1230,   272,  1440,    -3,
-    1557,  1235,   307,  1233,    37,    48,    48,  1200,    40,  1239,
-     692,   215,  1244,  1246,   493,    41,    42,     8,     9,    10,
-      11,    12,    48,  1251,    63,   215,    48,  1248,    70,  1259,
-    1252,    35,  1263,    36,  1266,   114,  1268,   644,   712,  1270,
-    1271,   719,   374,  1272,    56,   399,    31,  1273,  1113,  1274,
-      45,    46,  1276,    48,    77,   400,  1283,   688,  1292,   407,
-      97,   401,   523,    48,   523,  1293,  1296,   523,  1300,   402,
-     523,  1303,   403,    97,    34,   404,  1321,   405,  1328,  1304,
-    1305,    48,  1307,   665,  1315,  1334,   408,    48,  1336,    48,
-    1338,  1066,  1344,  1342,   216,   267,  1345,  1351,   398,   190,
-    1352,   806,  1353,  1355,   472,  1361,  1530,  1362,  1363,  1364,
-     666,   243,  1114,   625,  1371,  1372,   570,  1375,   411,  1382,
-    1383,   215,    97,  1311,   113,    45,    46,  1391,  1392,    48,
-    1393,  1403,  1400,   177,    97,  1411,  1412,    48,   114,  -406,
-    1430,    48,  1415,  1426,  1432,    48,   216,  -291,   113,  1434,
-     113,  1113,  1435,  1441,     8,     9,    10,    11,    12,   442,
-    1451,  1446,   114,  1436,    97,  1452,  1453,  1200,  1454,   114,
-     644,   114,  1456,   114,  1200,  1366,  1470,  1461,   479,  1466,
-    1472,  1474,  1476,    31,  1468,   113,  1478,   339,   644,   216,
-     113,   644,  1483,   150,   151,   152,  1484,    70,  1485,  1486,
-    1497,  1507,  1509,  1529,  1523,  1511,  1515,  1516,   114,  1115,
-     114,    34,  1538,    56,    77,  1539,  1543,  1550,  1552,  1554,
-    1560,    77,   114,  1567,  1568,  1219,   785,  1200,  1529,  1529,
-     786,   788,   787,  1320,  1518,  1429,   162,  1570,   307,   113,
-      97,   692,   789,  1385,  1250,  1401,    48,  1500,  1096,  1224,
-     216,   906,   907,  1529,  1232,   214,   929,    48,  1100,    48,
-     373,   603,  1137,  1203,   472,   233,  1043,   327,   877,  1110,
-    1329,   472,   804,   943,    77,   717,   794,   951,    48,   795,
-      37,   796,   184,   185,    40,     0,   107,     0,   216,     0,
-       0,    41,    42,   216,    48,     0,     0,     0,     0,     0,
-     113,     0,     0,     0,  1115,     0,     0,   214,     0,    48,
-       0,   113,    48,   113,     0,     0,     0,   910,   190,   411,
-       0,     0,   215,     0,   472,   911,    45,    46,     0,     0,
-       0,  1298,  1299,     0,  1301,    66,   118,     0,     0,     0,
-       0,  1306,     0,  1308,     0,    48,     0,     0,   213,   113,
-     214,   113,     0,     0,   107,   113,     0,     8,     9,    10,
-      11,    12,     0,   113,   211,   221,     0,    66,     0,     0,
-       0,    70,  -292,     0,     0,     0,    48,    48,   216,     8,
-       9,    10,    11,    12,   161,     0,    31,    56,     0,     0,
-      48,    37,     0,   184,   185,    40,    97,     0,     0,     0,
-     603,     0,    41,    42,   222,  1114,     0,  1115,    31,     0,
-       0,   214,     0,     0,    34,     0,     0,     0,  1439,    37,
-       0,   184,   185,    40,     0,    75,     0,     0,   186,     0,
-      41,    42,     0,     0,  1066,     0,    34,    45,    46,     0,
-    1503,   260,  1503,     0,     0,     0,   442,     0,     0,   214,
-       0,    70,   174,     0,   214,   107,   600,    75,   601,   216,
-       0,     0,   441,     0,     0,    45,    46,    56,     0,   499,
-       0,     0,     0,    48,     0,     0,     0,  1503,     0,  1503,
-     692,     0,     0,   328,     0,    48,    37,     0,   184,   185,
-      40,   260,   350,     0,   223,   254,     0,    41,    42,     0,
-    1114,   216,     0,     0,     0,  1423,     0,   323,     0,     0,
-    -293,   215,   818,     0,   603,     0,     0,     8,     9,    10,
-      11,    12,   406,   600,     0,   601,     0,     0,   644,     0,
-    1389,     0,    45,    46,     0,   113,     0,   424,     0,   214,
-     429,   431,     0,     0,   703,   161,    31,     0,     0,    37,
-       0,   184,   185,    40,     0,     0,     0,     0,    48,     0,
-      41,    42,   704,     0,     0,     0,   448,    48,     0,    48,
-     451,     0,   452,     0,    34,     0,   113,     0,     0,     0,
-       0,   459,   353,     0,     0,  1416,   266,    66,  1424,     0,
-       0,   417,   473,     0,     0,    45,    46,     0,     0,    48,
-     916,     0,   480,  1114,     0,     0,     0,   107,     0,   215,
-     431,    70,     0,     0,   437,     0,     0,     0,    70,   113,
-     214,     0,   216,     0,   445,     0,     0,    56,     0,   107,
-       0,   818,   603,  1463,    56,   644,     0,   214,  1467,     0,
-       0,     0,     0,   113,   692,     0,   644,   107,   113,     0,
-     216,     0,     0,     0,     0,   216,   449,     0,     0,     0,
-       0,     0,   214,     0,     0,     0,     0,     0,  1489,     0,
-       0,    70,     0,     0,     0,     0,   260,    75,     0,     0,
-     594,     0,    75,     0,     0,     0,   622,    56,     0,     0,
-       0,     0,   520,     0,     0,     0,     0,     0,   113,   627,
-       0,     0,     0,   627,     0,     0,   260,     0,     0,   107,
-       0,   125,   128,   129,     0,     0,     0,     0,     0,    37,
-       0,   184,   185,    40,     0,     0,     0,   216,   818,     0,
-      41,    42,     0,     0,     0,     0,   113,     0,     0,     0,
-     603,   216,   107,     0,     0,     0,     0,     0,     0,     0,
-      48,   703,     0,   473,  1558,    48,   910,    78,   411,     0,
-    1558,     0,     0,     0,     0,    45,    46,     0,   350,   704,
-       0,  1558,    48,   473,     0,  1558,   223,     0,     0,     0,
-       0,   473,     0,   214,   255,     0,   256,     0,     0,    78,
-       0,     8,     9,    10,    11,    12,     0,     0,     0,   699,
-       0,     0,   431,     0,     0,     0,     0,     0,     0,     0,
-       0,   214,     0,     0,     0,     0,   214,   713,     0,    66,
-      31,     0,  1091,     0,   916,     0,   224,   431,     0,     0,
-       0,   431,     0,     0,     0,     0,     0,   216,     0,     0,
-     681,     0,     0,    75,     0,   107,     0,    80,    34,     0,
-       0,     0,   113,    37,   603,   184,   185,    40,   353,     0,
-     260,   350,     0,    75,    41,    42,   707,   396,     0,   107,
-       0,    75,     0,   703,     0,    48,   107,   415,   416,    80,
-       0,     0,   420,   703,   422,   423,     0,     0,   214,   353,
-     910,   704,   411,     0,     0,     0,     0,   703,     0,    45,
-      46,   704,   214,   520,     0,     0,   797,   353,   520,    75,
-       0,   520,     0,     0,   355,   704,   225,     0,   113,   113,
-     113,     0,   499,     0,   627,   809,     0,     0,     0,   107,
-       0,     0,     8,     9,    10,    11,    12,   828,     0,     0,
-       0,     0,     0,     0,     0,     8,     9,    10,    11,    12,
-       0,   353,     0,     0,     0,   594,     0,   413,     0,     0,
-     594,    31,     0,     0,   421,     0,   627,     0,     0,   350,
-     350,   350,     0,     0,    31,     0,   644,     0,   535,   536,
-     537,   538,   539,   540,   541,   542,   543,   544,   350,    34,
-       0,     0,     0,     0,     0,     0,     0,   927,   214,     0,
-       0,     0,    34,     0,   356,   916,   699,    37,     0,    78,
-     916,    40,   545,     0,    78,   353,     0,   473,    41,    42,
-       0,     0,     0,     0,     0,     0,     0,  1504,     0,  1504,
-       0,   752,     0,   411,     0,     0,   413,     0,   216,     0,
-      45,    46,     0,   473,    43,     0,   350,     0,     0,     0,
-       0,    48,    48,    45,    46,   942,     0,     0,   431,   353,
-     353,   353,   113,   113,  1504,     0,  1504,   895,     0,     0,
-       0,     0,     0,     0,     0,     0,   902,     0,   353,     0,
-     904,     0,   260,   713,     0,     0,     0,     0,   974,     0,
-     576,   993,     0,     0,     0,     0,   353,     0,   580,    80,
-     113,   583,     0,     0,    80,   703,   703,    75,   224,     0,
+      49,   113,   149,   150,   398,   399,   427,    97,   151,   114,
+     400,   452,   260,   401,   751,   765,   267,   409,   963,   106,
+     106,   964,   402,   382,   383,   965,   947,   403,    56,   115,
+     739,   406,    49,   595,   867,   404,   439,  1170,   826,    97,
+     356,   829,   470,   147,  1068,  1069,   177,   836,   724,    49,
+      50,   106,   729,   972,   918,   603,   161,   843,  1194,   825,
+      56,   722,   341,   186,   608,   143,   209,  1378,   818,    49,
+     193,   793,  1136,   216,   817,  1196,   226,   219,   504,   122,
+     152,  1438,    50,  1198,   398,   399,   819,  1186,   106,  1301,
+     400,   474,   476,   401,   210,   261,   153,   220,   262,   814,
+     154,   424,   402,   672,   674,   113,   526,   403,   820,   815,
+     280,   406,    31,   113,   816,   404,   266,   271,  1195,    31,
+      31,    63,  1180,   668,   858,   859,   202,    69,  1199,    96,
+    1168,  1169,   123,    31,  1076,  1197,   627,    76,  1203,  1204,
+     631,   876,   168,   677,   149,   150,   306,   147,    31,   526,
+     151,   681,  1438,    63,   161,   113,   344,   407,  1302,    69,
+     209,    96,   171,    31,    31,  1457,   169,   372,   281,    76,
+     713,   728,   148,   111,   963,   830,   203,   964,    96,   833,
+     912,   965,   252,   446,   410,   186,   186,  1397,  1398,   418,
+     741,   410,   189,   161,   719,    96,   357,   948,    96,   930,
+     850,   266,   459,   470,   853,   410,   565,   438,   166,    49,
+    1185,  -231,  -231,   142,  1244,   291,   161,   814,   480,  1525,
+     410,   209,   152,   470,   149,   150,   666,   815,   442,   408,
+     151,   470,   816,   827,   834,   600,   600,   407,   153,   306,
+     566,  1170,   154,   922,   950,   173,  1540,   587,   526,   440,
+     663,    49,   829,   252,   328,   797,   475,  1399,    97,   271,
+    1015,   482,  1079,   846,   271,   266,   266,   847,   499,   376,
+     106,   113,   166,   161,   475,  1116,    96,   341,   567,    56,
+     818,  1014,  -231,  1138,   462,   377,  1002,   253,   144,    96,
+     993,  1170,  1176,   990,   306,   655,    70,   526,   819,   155,
+     733,    50,  1442,  1397,  1398,   326,   306,   518,   595,  1247,
+     146,   814,  1092,   595,   397,   189,   356,   608,  1177,   110,
+     820,   815,   570,   670,   663,   734,   816,   147,    70,   675,
+      41,    42,  1117,  1495,   372,  1186,   177,  1248,    96,  1500,
+     113,   869,  1200,   641,   344,   735,   201,   526,   601,   619,
+      96,   181,  1118,   628,   286,  1324,  1483,   632,   758,  1520,
+     870,   803,   212,   624,  1527,    41,    42,   624,   435,   826,
+     113,  1467,    63,  1408,  1381,  1325,   664,   471,    69,  -287,
+      96,  1068,  1069,   416,  1168,  1169,   897,   578,    76,   410,
+    1511,   513,  1513,    76,   478,   266,  1442,  1177,   326,   386,
+     818,  1442,   110,   852,   389,   186,   436,   555,   556,   356,
+    1170,   247,   372,    41,    42,   387,   444,  1018,   819,   391,
+     390,  1442,   250,   266,   464,   306,   306,   163,  1442,   266,
+     435,   341,   624,   713,   492,   392,   843,   493,   671,   673,
+     820,   763,   557,   558,   551,   552,  1156,  1158,   393,   746,
+     664,   913,   263,   113,  1083,   252,    96,   110,  1361,  -466,
+    1125,  -466,   887,   985,   394,   166,   470,   914,    41,    42,
+     848,   266,   357,   356,   849,  1427,  1428,   602,  -466,   266,
+    1422,   624,   -10,    49,   519,   880,   372,   718,  1186,  -515,
+      97,   163,   927,   113,  1423,  1186,  1329,  1103,  1134,  1115,
+    1468,   868,   106,   597,  1433,   306,   915,   113,  -439,  1100,
+     306,    56,   306,   306,  1469,  1243,   110,   441,   518,  -440,
+     749,   712,   916,   518,   113,   344,   518,    41,    42,   276,
+    1013,   909,   951,    50,   189,  1015,  1524,   278,   471,   608,
+       2,   206,     4,     5,     6,     7,  1186,    70,   913,   110,
+     329,   139,   238,   878,    76,  1331,  1535,   915,   471,   279,
+      41,    42,   576,  1539,  1080,   357,   471,   848,   577,   570,
+     570,  1099,  -102,  1081,    76,   995,  -102,   306,  1125,   786,
+     803,  1359,    76,   912,   326,   326,   239,   434,   624,   344,
+    1183,   240,   713,   619,   682,   553,   554,  1183,  1315,   601,
+     577,   601,   710,   330,    63,    35,  1184,    36,   331,   845,
+      69,  1473,    96,  1307,  1316,  -119,   602,  -119,  1473,   624,
+      76,  -119,   370,  1347,   624,   860,   619,  1348,  1317,   357,
+     624,   746,   679,   624,   624,   624,  -119,  -119,   111,   875,
+     215,   332,  1233,  1013,  1318,   212,  1237,  1362,   110,   434,
+     341,   624,   326,   266,   333,  1407,   242,   911,   705,    41,
+      42,   252,   328,   410,   110,  1235,   139,   140,   803,  1521,
+     334,   326,   522,   559,   560,    41,    42,  1026,     8,     9,
+      10,    11,    12,   113,   163,   384,   906,   595,   703,   371,
+     176,   215,   356,   375,   704,   519,   720,  1073,   921,   759,
+     519,   725,   721,   519,   764,   388,   726,    31,   425,   624,
+     932,   619,   408,   730,  1111,   396,   805,   718,   718,   731,
+     499,  1033,   426,   398,   399,  1275,  1276,   745,   813,   400,
+     602,   891,   401,   746,   215,    34,   326,   746,  1475,   176,
+    1476,   402,   176,   113,   344,   581,   403,   410,   749,   749,
+     893,   406,   449,   464,   404,   110,   746,   139,   140,   983,
+     980,     8,     9,    10,    11,    12,    41,    42,   212,   548,
+     527,   528,   529,   431,   963,   549,   550,   964,   844,    70,
+     881,   965,   410,   597,   712,   979,  1372,  -363,   176,   984,
+      31,   980,   570,  1522,   530,   215,   531,   243,   532,   533,
+     624,   471,   624,   884,   998,   410,  -392,   624,   344,   341,
+     992,   601,   569,  1160,   410,   910,   704,    76,    34,  1231,
+      45,    46,  1355,   601,   877,   577,   879,   471,   746,   460,
+    1140,   690,   410,   215,   713,   527,   528,   529,   215,   461,
+    1152,    37,   410,    76,  1356,    40,   813,   602,   357,  1358,
+     746,   176,    41,    42,  1155,   746,   600,   483,   889,   530,
+     569,   531,   410,   532,  1304,   710,  1028,   896,    45,    46,
+     214,   898,  1157,   306,   600,  1363,   926,   407,   811,   503,
+     600,   746,   291,   522,  1425,   522,    45,    46,   522,  1181,
+    1422,   522,   106,  1443,   803,   624,    48,   112,  1240,   746,
+     410,    56,   113,   344,   906,   176,   906,   524,  1489,   921,
+     507,   951,   176,   713,  1490,   951,   951,   441,   113,   328,
+     410,   214,   512,   215,   526,   112,   112,  1545,    48,   663,
+    1424,   932,   932,   577,   909,   805,   718,  1368,  1369,    48,
+     813,   113,   306,   712,   561,    48,  1435,   562,   748,  1104,
+     410,   563,   602,    48,   921,   564,    45,    46,   567,    48,
+     106,  1086,    48,  1086,   214,    48,   749,   337,   931,  1105,
+     600,   418,   659,   410,  1507,  -436,    45,    46,   112,   112,
+     176,   585,     2,   206,     4,     5,     6,     7,   588,  1137,
+     480,   328,   410,   212,    63,  1417,   980,   176,   344,    -3,
+      69,   176,    48,   637,   215,    48,  1226,   212,  1397,  1398,
+      76,   656,    48,   736,   657,   737,  1493,  1435,   738,   624,
+     624,   742,   658,  1125,   710,   214,   827,   328,   600,   116,
+     660,  1322,   661,  1082,   662,   910,  1330,  1332,  1333,   306,
+    1028,   665,   110,    48,   139,   140,   215,    35,   667,    36,
+     257,    48,   691,    41,    42,   664,    48,   692,   106,  1167,
+     911,   690,   694,   214,   176,   602,   696,    56,   214,  -235,
+       2,   206,     4,     5,     6,     7,   732,   159,   743,   113,
+     806,    48,    48,   747,   906,   770,   771,  1078,   807,   906,
+     772,   773,    37,   755,   174,   175,    40,    48,   932,   228,
+     212,   326,   810,    41,    42,    48,   266,  1294,  1295,  1296,
+      -3,   821,   -12,   341,    48,   778,   779,    48,  1379,    37,
+     921,   624,  1379,    40,   112,   -13,   865,   866,  1120,   371,
+      41,    42,   872,   258,   892,    35,   894,    36,   920,   112,
+    -519,   159,   895,   112,  -413,   344,   899,    48,   112,   902,
+    1131,   935,   942,   214,  1131,   721,    43,   844,   944,   949,
+     471,    48,    48,   955,    45,    46,  1188,   215,    48,    70,
+     774,   775,   776,   777,   322,    48,    76,   956,   957,   958,
+     921,   921,   959,   338,   960,   712,   976,   271,   113,   987,
+     988,   989,  1004,  1005,  1006,   215,   219,  1007,  1008,  1009,
+     215,  1010,  1283,  1284,  1131,  1286,   113,   106,  1021,  -401,
+     306,  -400,  1291,   910,  1293,   210,   220,  1035,   910,  1458,
+    1070,   176,   905,    48,   624,  1072,  1093,  1094,   113,   106,
+    1095,  1096,  1102,   429,   214,  1112,  1104,   433,    56,   110,
+    1202,   139,   140,    48,    48,  1113,   746,   106,  1119,  1121,
+      41,    42,   970,   176,  1114,  1122,  1105,  1123,  1124,  1127,
+      48,  1130,  1150,  1173,    48,  1174,   710,   322,  1189,   176,
+    1171,   215,  1172,   624,   624,   642,   214,  1420,   863,  1190,
+    1175,  1192,   271,   176,  1193,   215,  1533,   306,  1201,  1206,
+    1205,    48,  1057,  1208,  1213,    -3,   690,   441,  1218,   433,
+    1221,    48,   487,  1223,   492,    37,   106,   174,   175,    40,
+     440,  1227,  1232,  1350,  1234,    56,    41,    42,  1236,    48,
+     113,  1239,   520,   398,   399,    48,  1245,    48,  1104,   400,
+    1251,    63,   401,  1249,   159,    70,  1253,    69,  1255,   106,
+    1256,   402,   375,  1257,  1258,   710,   403,    76,  1105,   129,
+     406,   130,   131,   132,   404,  1259,  1261,  1268,  1285,  1277,
+      41,    42,   112,  1278,   176,  1419,  1288,    48,   586,  1289,
+    1403,  1290,   592,  1292,   663,    48,  1300,   266,   215,    48,
+    1506,   141,  1306,    48,  1313,   921,   112,  1319,   112,  1321,
+    1323,   625,  1345,   624,  1327,   629,   701,   214,   338,  1328,
+      37,   921,   174,   175,    40,  1334,  1335,  1337,   471,  1343,
+    1344,    41,    42,   509,  1188,  1346,  1353,  1357,   113,  1131,
+    1131,  1131,  1354,   112,    76,   214,  1104,  1364,   112,  1365,
+     214,  1296,  1373,   241,   244,   546,   547,   106,  1375,  1374,
+     113,  1382,  1391,  1392,  -402,  1395,  1105,   113,  1406,   113,
+    1410,   113,  1412,   322,   322,  1414,  1415,   690,  1416,   106,
+    1421,  1191,  1429,   149,   150,  1430,   106,  1431,    56,   151,
+    1432,   921,   921,   546,  1348,    56,   407,   112,  1434,  1439,
+    1505,   686,  1444,   212,    48,   113,  1366,   113,  1448,  1450,
+    1452,  1446,  1454,  1456,   116,    48,  1461,    48,   113,  1462,
+     664,   214,  1463,  1484,  1505,  1505,    70,  1474,  1486,   546,
+    1488,  1491,   161,  1492,   306,   214,    48,   106,  1514,   487,
+    1499,   322,  1515,   487,  1528,  1519,    56,  1526,   176,  1505,
+    1530,  1543,    48,   520,  1536,   520,   372,   112,   520,  1544,
+     322,   520,  1207,   781,   783,   780,    48,  1129,   112,    48,
+     112,   782,   338,  1494,   784,  1305,   162,  1131,  1131,  1546,
+    1409,   471,  1238,  1367,  1383,  1477,  1212,  1188,   471,   900,
+     194,   213,   901,   217,  1188,   215,   227,    76,   441,  1220,
+     232,  1087,    48,    70,    76,  1091,   112,   799,   112,   923,
+    1034,   871,   112,  1126,   456,  1459,   937,  1101,  1314,   945,
+     112,     0,   701,   715,   789,   322,     0,   790,   214,   791,
+       0,     0,     0,    48,    48,   229,   801,     0,   230,   471,
+       0,   234,   213,   236,     0,  1188,     0,    48,     0,  1057,
+     245,     0,     0,   478,  -288,    76,     0,     0,  1478,     0,
+    1482,     8,     9,    10,    11,    12,     0,   842,     0,     0,
+       0,     0,   592,  1508,   162,     0,     0,    37,   851,   183,
+     184,    40,  1516,     0,     0,   213,     0,   373,    41,    42,
+      31,     0,     0,   326,  1510,   412,  1512,   767,   768,   769,
+       0,     0,   420,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   162,   904,     0,   410,     0,    34,     0,
+       0,     0,    45,    46,     0,     0,     0,    48,     0,     0,
+       0,   686,     0,    37,     0,   905,   162,    40,  1541,    48,
+    1542,   701,  1371,     0,    41,    42,   213,     0,   443,     0,
+     643,   701,     0,  1549,  1550,    37,    70,   183,   184,    40,
+       0,     0,   890,    70,     0,   701,    41,    42,     0,   487,
+     717,     0,     0,     0,   412,     0,     0,   229,    45,    46,
+       0,   215,   642,     0,   213,     0,     0,     0,   112,   213,
+       0,   338,   185,     0,  1396,     0,     0,  1404,  -289,     0,
+      45,    46,     0,     0,   498,     8,     9,    10,    11,    12,
+       0,    48,     0,   506,    70,   508,   511,     0,     0,     0,
+      48,     0,    48,   514,   515,   214,     0,     0,   575,   112,
+       0,     0,     0,     0,    31,     0,   579,   508,   508,   582,
+    1441,     0,     0,     0,   497,  1445,     0,  1481,     0,  1481,
+     994,     0,    48,     0,   373,   801,     0,     0,     0,   176,
+     702,   723,    34,   727,     0,     0,     0,     0,    66,   117,
+       0,     0,   112,  1466,   213,   508,   215,     0,     0,     0,
+       0,   986,     0,  1481,     0,  1481,   642,     0,     0,     0,
+       0,   991,     0,     0,   112,     0,     0,     0,   112,     0,
+      66,     0,     0,   412,   971,  1003,     0,   420,     0,     0,
+       0,   508,     0,     0,     0,  -290,   229,   160,   234,     0,
+       0,     0,     8,     9,    10,    11,    12,     0,     0,     0,
+       0,     0,   373,     0,     0,     0,     0,   221,     0,     0,
+       0,     0,     0,   801,     0,     0,     0,     0,   112,    74,
+     338,    31,     0,     0,     0,   213,     0,  1534,     0,     0,
+     126,   126,   126,  1534,     0,     0,   686,     0,     0,   701,
+     701,     0,   213,   259,  1534,     0,     0,     0,  1534,    34,
+       0,    74,     0,     0,   412,     0,   112,     0,   487,  1106,
+     322,     0,     0,     0,     0,     0,     0,   213,     0,     0,
+      48,     0,     0,     0,     0,    48,   229,     0,     0,     0,
+       0,   214,   864,     0,     0,   327,     0,     0,   222,     0,
+       0,     0,    48,   259,   349,     0,     0,   701,   701,   176,
+       0,     0,   126,     0,   126,     0,   534,   535,   536,   537,
+     538,   539,   540,   541,   542,   543,   842,     0,     0,     0,
+       0,     0,     0,     0,   405,     0,     0,     0,     0,   275,
+       0,   917,     0,   919,     0,     0,   702,   456,     0,   423,
+     544,     0,   428,   430,     0,   575,   575,   160,     0,   508,
+     508,   508,   508,   508,   508,   508,   508,   508,   508,   508,
+     508,   508,   508,   508,   508,   508,   508,     0,   447,   112,
+       0,     0,   450,     0,   451,   352,   214,     0,     0,  1165,
+    1166,     0,     0,   458,     0,   126,     0,     0,   213,    66,
+       0,     0,    48,   126,   472,   126,   126,   686,     0,     0,
+     126,     0,   126,   126,   479,     0,     0,     0,     0,     0,
+       0,    37,   430,   183,   184,    40,   213,   546,     0,     0,
+       0,   213,    41,    42,     0,     0,     0,     0,     0,    77,
+       0,     0,   882,   112,   112,   112,   885,  1215,  1216,   801,
+       8,     9,    10,    11,    12,  1311,     0,     0,   599,   448,
+     600,     0,     0,     0,     0,   702,    45,    46,   509,     0,
+       0,    77,     0,     0,     0,   702,     0,     0,     0,    31,
+      74,     0,   126,     0,     0,    74,     0,   701,   259,   702,
+       0,     0,   593,     0,     0,   701,   701,   701,   621,     0,
+       0,     0,   213,     0,     0,   508,     0,    34,   223,     0,
+       0,   626,     0,     0,     0,   626,   213,   643,   259,     0,
+       0,     0,     0,  1038,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   338,     0,   498,     0,     0,     0,
+       0,     0,     8,     9,    10,    11,    12,     0,     0,   748,
+       0,   410,     0,     0,     0,     0,  1106,    45,    46,   701,
+       0,     0,     0,     0,  1088,   472,   508,     0,     0,     0,
+       0,    31,    48,    48,     0,     0,   497,     0,   575,   222,
+     349,   112,   112,     0,     0,   472,     0,     0,     0,     0,
+     124,   127,   128,   472,     0,   354,   508,     0,     0,    34,
+       0,     0,     0,     0,    37,     0,   183,   184,    40,   213,
+       0,   697,     0,     0,   430,    41,    42,     0,     0,   112,
+       0,   643,    37,     0,   183,   184,    40,  1336,     0,   711,
+       0,    66,     0,    41,    42,  1338,  1339,  1340,     0,   430,
+       0,   185,     0,   430,     0,     0,    74,     0,  1106,    45,
+      46,     0,     0,     0,     0,     0,     0,     0,     0,   265,
+       0,   352,   254,     0,   255,     0,    74,    45,    46,     0,
+       0,     0,   259,   349,    74,     0,    48,   112,     0,     0,
+       0,     0,     0,     0,     0,     0,   112,     0,     0,     0,
+      77,     0,   352,   702,   702,    77,   412,     0,     0,  1384,
+      48,    48,     0,     0,     0,     0,     0,     0,     0,     0,
+     352,     0,    74,     0,     0,     0,   508,     0,   792,     0,
+      37,  1038,   183,   184,    40,    48,     0,     0,     0,     0,
+       0,    41,    42,     0,     0,     0,   626,   804,     0,     0,
+       8,     9,    10,    11,    12,   395,  1106,     0,     0,   823,
+       0,   702,   702,     0,   352,   414,   415,   904,     0,   410,
+     419,   508,   421,   422,     0,    45,    46,   593,     0,    31,
+       0,     0,   593,  1141,     0,     0,     0,  1480,   626,  1480,
+       0,   349,   349,   349,     0,     0,     0,   126,   126,   223,
+    1153,     0,     0,     0,     0,     0,   508,    34,     0,   349,
+       0,     0,     0,     0,     0,     0,   213,     0,     0,   508,
+       0,     0,     0,  1480,     0,  1480,   126,   697,   352,   126,
+     126,     0,   126,     0,   126,   126,     0,     0,   472,   126,
+     126,     0,     0,    37,  1281,   183,   184,    40,     0,   931,
+       0,   600,   322,     0,    41,    42,     0,    45,    46,     0,
+     508,     0,     0,     0,   472,     0,    77,   349,     0,     0,
+       0,     0,   352,   352,   352,     0,   936,     0,   412,   430,
+    1504,   354,   410,     0,    79,     0,    77,     0,    45,    46,
+     352,     0,     0,     0,    77,     0,     0,     0,     0,     0,
+       0,   259,   711,     0,     0,     0,     0,   966,   352,  1312,
+       0,     0,   354,     0,     0,     0,    79,     0,  1241,    74,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     354,     0,    77,     0,     0,     0,     0,   508,     0,     0,
+       0,   702,     0,     0,     0,    74,   697,     0,   352,   702,
+     702,   702,     0,   224,     0,     0,   697,     0,   349,     0,
+     626,     0,     0,  1001,     0,   626,   804,     0,     0,     0,
+     697,     0,     0,     0,   354,     0,     0,   126,   126,     0,
+    1012,     0,     0,   352,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   508,   508,     0,
+       0,     0,   213,     0,     0,     0,     0,     0,     0,     0,
+       0,    86,     0,   702,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   282,   283,     0,   284,   352,     0,     0,
+       0,    66,     0,     0,     0,     0,     0,   352,   354,   352,
+     355,     0,     0,    86,   222,     0,     0,   352,     0,     0,
+       0,   352,   285,   626,     0,     0,     0,     0,   286,     0,
+     259,   711,   287,     0,  1084,   288,   289,   290,   291,    41,
+      42,     0,   292,   293,     0,     0,     0,     0,     0,     0,
+     225,     0,   354,   354,   354,     0,     0,     0,     0,     0,
+    1098,     0,     0,     0,     0,   505,     0,   213,   430,   117,
+     354,     0,     0,    45,    46,   296,   297,   298,   299,     0,
+       0,     0,    74,     0,     0,     0,     0,     0,   354,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    77,
+       0,     0,     0,     0,   126,    79,     0,     0,     0,   126,
+      79,     0,   352,     0,     0,     0,     0,   794,   795,     0,
+       0,     0,     0,     0,     0,    77,   593,     0,   354,     0,
+       0,     0,     0,     0,     0,     0,     0,   362,     0,   428,
+       0,     0,     0,     0,   697,   697,   828,   349,   349,   831,
+     832,     0,   835,     0,   837,   838,     0,     0,     0,   839,
+     840,     0,     0,   354,     0,     0,     0,  1187,     0,     0,
+       0,     0,   508,     0,    57,    57,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   508,     0,
        0,     0,     0,     0,     8,     9,    10,    11,    12,     0,
-       0,     0,     0,   704,   704,     0,     0,     0,   699,     0,
-       0,     0,     0,    75,     0,     0,   353,     0,   699,     0,
-     350,     0,   627,    31,     0,  1010,     0,   627,   809,     0,
-       0,     0,   699,     0,     8,     9,    10,    11,    12,     0,
-      48,   113,  1021,   703,   703,   413,     0,     0,  1037,   421,
-     113,    34,     0,   353,     0,    78,    37,     0,   184,   185,
-      40,   704,   704,    31,     0,    48,    48,    41,    42,     0,
-     355,     0,     0,     0,     0,    78,     0,     0,   225,   214,
-       0,     0,     0,    78,     0,     0,     0,     0,   112,     0,
-      48,    34,   927,  1528,    66,   411,     0,     0,   353,     0,
-       0,   355,    45,    46,     0,     0,     0,   216,   353,     0,
-     353,     0,     0,     0,     0,   223,   627,     0,   353,   355,
-       0,    78,   353,   260,   713,     0,   413,  1093,     0,     0,
-       0,     0,     0,   937,     0,   601,     0,   927,     0,   799,
-     800,     0,    45,    46,     0,    80,    37,     0,   184,   185,
-      40,     0,     0,  1107,     0,     0,     0,    41,    42,     0,
-     356,   431,   118,   355,   896,    80,     0,     0,   833,     0,
-       0,   836,   837,    80,   840,  1149,   842,   843,     0,   350,
-    1087,   844,   845,  1528,    75,   411,     0,     0,     0,     0,
-       0,   356,    45,    46,  1326,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   216,     0,     0,     0,   356,
-       0,    80,  1327,     0,   353,     0,     0,   576,   576,    57,
-      57,     0,   594,     0,     0,     0,  1037,   355,     0,   703,
-       0,     0,     0,     0,     0,   429,     0,   703,   703,   703,
-     699,   699,     0,   350,   350,     0,     0,   704,     0,     0,
-       0,    57,     0,   356,     0,   704,   704,   704,     0,     0,
-       0,     0,     0,  1199,     0,     0,     0,     0,   214,   353,
-       0,   355,   355,   355,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    57,   995,     0,    57,     0,
-     355,     0,     0,     0,     0,     0,  1000,     0,   699,   699,
-       0,     0,     0,   703,     0,   888,   927,     0,   355,   891,
-    1012,     0,     0,     0,     0,     0,     0,   356,     0,    78,
-     479,   704,   976,   977,     0,     0,     0,     0,     0,     0,
-     353,   353,     0,   353,   353,     0,  1214,     0,     0,     0,
-     465,     0,     0,     0,     0,    78,     0,   627,   355,     0,
-       0,     0,     0,    75,     0,     0,     0,     0,     0,     0,
-       0,   356,   356,   356,     0,     0,   214,     0,     0,   927,
-     927,     0,   713,     0,    87,     0,   348,     0,     0,     0,
-     356,     0,     0,     0,     0,   355,     0,     0,   353,   353,
-       0,     0,     0,     0,     0,     0,     0,     0,   356,     8,
-       9,    10,    11,    12,     0,     0,    87,     0,     0,    80,
-       0,     0,     0,     0,     0,  1297,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    31,     0,
-     355,     0,     0,   260,     0,    80,     0,    66,   356,     0,
-     355,    57,   355,   226,   576,     0,     0,   224,     0,   699,
-     355,   713,     0,     0,   355,   118,    34,     0,     0,     0,
-       0,    37,   353,   184,   185,    40,     0,     0,     0,     0,
-       0,    57,    41,    42,     0,   356,     0,     0,     0,     0,
-       0,     0,     0,     0,   699,     0,  1098,     0,     0,     0,
-       0,     0,   699,   699,   699,     0,     0,     0,   186,     0,
-       0,     0,     0,   350,   350,   223,     0,    45,    46,     0,
-       0,     0,     0,     0,     0,     0,    78,  1199,  1177,  1178,
-     356,     0,     0,     0,     0,     0,     0,    75,     0,     0,
-     356,   363,   356,     0,     0,     0,     0,   225,     0,   353,
-     356,   353,     0,     0,   356,     0,   355,     0,     0,     0,
-     118,     0,     0,     0,   112,     0,     0,     0,   699,     0,
-       0,     0,     0,   413,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   353,     0,  1227,  1228,     0,     0,
-     927,     0,   353,   353,   353,     0,     0,     0,  1384,     0,
-       0,     0,     0,   353,   353,     0,     0,     0,   927,     0,
-     742,   355,     0,     0,     0,     0,    80,    75,     0,     0,
-       0,     0,     0,     0,     0,   763,     0,     0,   742,     0,
-     769,   742,     0,     0,     0,     0,    87,     0,   350,     0,
-       0,    87,   127,   127,   127,     0,   356,     0,     0,     0,
-       0,     0,     0,  1153,     0,     0,     0,     0,   353,     0,
-    1229,     0,   348,   118,     0,     0,     0,     0,     0,     0,
-    1165,     0,   355,   355,     0,   355,   355,     0,     0,   465,
-       0,   927,   927,     0,   168,     0,   173,  1199,     0,   179,
-     180,   181,     0,   183,  1199,    78,     0,     0,     0,     0,
-       0,   356,     0,     0,     0,     0,     0,     0,   234,     0,
-       0,     0,     0,    57,     0,   127,     0,   127,     0,     0,
-     249,   250,     0,     0,     0,     0,     0,     0,   353,     0,
-     355,   355,     0,     0,     0,   226,     0,     0,     0,     0,
-       0,     0,   276,     0,     0,     0,     0,  1199,   413,     0,
-       0,   883,     0,   885,  1553,   348,     0,  1501,     0,  1505,
-       0,     0,   356,   356,     0,   356,   356,     0,     0,     0,
-       0,     0,  1354,     0,     0,     0,     0,    75,     0,     0,
-    1356,  1357,  1358,     0,    75,    80,     0,     0,     0,     0,
-    1255,     0,  1318,     0,  1534,     0,  1536,     0,   127,     0,
-       0,     0,    87,   932,   355,     0,   127,     0,   127,   127,
-       0,     0,     0,   127,     0,   127,   127,   363,     0,   348,
-     356,   356,    87,     0,     0,     0,     0,     0,     0,     0,
-      87,     0,     0,     0,     0,     0,     0,    75,     0,  1565,
-       0,  1566,     0,     0,     0,     0,  1404,   224,   363,     8,
-       9,    10,    11,    12,  1573,  1574,     0,     0,     0,     0,
-       0,     0,     0,   348,   348,   348,   363,     0,    87,    78,
-       0,     0,     0,     0,     0,     0,     0,     0,    31,     0,
-       0,   355,   348,   355,     0,   127,     0,     0,     8,     9,
-      10,    11,    12,     0,   356,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    34,     0,     0,     0,
-     363,    37,     0,   184,   185,    40,   355,    31,     0,     0,
-       0,     0,    41,    42,   355,   355,   355,     0,     0,     0,
-       0,     0,     0,     0,     0,   355,   355,   225,     0,     0,
-     348,     0,     0,     0,     0,    34,     0,     0,   266,    78,
-      37,     0,     0,     0,    40,     0,     0,    45,    46,    80,
-       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
-       0,   356,     0,   356,   363,   591,     0,   599,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   719,   623,   624,
-     355,     0,     0,     0,     0,     0,    45,    46,     0,     0,
-       0,     0,     0,     0,     0,     0,   356,     0,     0,     0,
-       0,     0,     0,     0,   356,   356,   356,     0,   363,   363,
-     363,     0,     0,     0,     0,   356,   356,     0,     0,     0,
-       0,     0,     0,     0,   348,     0,     0,   363,     0,    80,
-       0,     0,   348,     0,     0,  1020,     0,     0,     8,     9,
-      10,    11,    12,     0,     0,   363,     0,     0,     0,  1129,
-     355,     0,     0,     0,     0,     0,    87,     0,     0,     0,
-       0,     0,     0,     0,     0,   283,   284,    31,   285,     0,
-     356,     0,     0,  1142,     0,     0,   742,     0,  1142,     0,
-       0,     0,    87,     0,     0,   363,     0,     0,     0,     0,
-       0,     0,     0,     0,   286,    34,     0,     0,    57,    78,
-     287,     0,     0,     0,   288,     0,    78,   289,   290,   291,
-     292,    41,    42,     0,   293,   294,     0,     0,     0,     0,
-       0,     0,   363,     0,     0,     0,     0,     0,  1142,     0,
-       0,     0,     0,     0,     0,     0,     0,   295,     0,   379,
-     356,     0,     0,     0,     0,     0,   344,    46,   297,   298,
-     299,   300,     0,     0,     0,     0,     0,     0,     0,    78,
-       0,     0,     0,     0,     0,     0,    57,   363,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   363,     0,   363,
-     127,   127,     0,   348,   226,     0,     0,   363,     0,    80,
-       0,   363,   283,   284,     0,   285,    80,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   127,
-       0,     0,   127,   127,     0,   127,     0,   127,   127,     0,
-       0,   286,   127,   127,     0,     0,     0,   640,     0,   140,
-     141,   288,     0,     0,   289,   641,   291,   292,    41,    42,
-       0,   293,   294,     0,     0,     0,     0,   348,   348,    80,
-       0,     0,     0,    87,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   295,     0,   642,    57,   643,   380,
-       0,     0,     0,    45,    46,   297,   298,   299,   300,     0,
-       0,     0,     0,   363,     0,     0,     0,     0,     0,   206,
-       2,   207,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,     0,     0,    26,    27,    28,     0,
-       0,   930,     0,   931,     0,    31,     0,     0,     0,     0,
-     934,   935,     0,     0,     0,   940,     0,     0,   363,     0,
-       0,     0,     0,     0,     0,     0,     0,   945,  1142,  1142,
-    1142,     0,   949,    34,     0,    35,     0,    36,    37,     0,
-     208,    39,    40,   127,   127,     0,     0,     0,     0,    41,
-      42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   985,     0,     0,     0,     0,     0,   283,   284,
-       0,   285,     0,     0,     0,    43,     0,   209,     0,   363,
-     363,     0,   363,   363,    45,    46,   742,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   286,    57,    57,
-       0,     0,    87,   287,     0,     0,     0,   288,     0,     0,
-     289,   290,   291,   292,    41,    42,     0,   293,   294,     0,
-       0,    57,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   363,   363,    57,
-     295,     0,   379,     0,     0,   380,     0,     0,     0,    45,
-      46,   297,   298,   299,   300,     0,     0,   166,     0,     0,
-       0,     0,  1031,  1032,  1033,  1034,     0,  1036,     0,     0,
-       0,     0,  1142,  1142,   219,     0,     0,     0,     0,     0,
-       0,     0,     0,  1080,     0,     0,     0,   348,   348,     0,
-       0,     0,     0,     0,     0,     0,    57,  1086,     0,     0,
-       0,    57,   127,     0,     0,     0,     0,   127,     0,     0,
-    1481,   363,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   166,     0,     0,     0,   273,     0,     0,     0,
-       0,     0,     0,     0,    57,     0,     0,  1106,     0,     0,
+       0,     0,   697,   697,   224,     0,    57,   354,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   354,     0,   354,
+       0,     0,     0,    31,   223,   352,   352,   354,   352,   352,
+       0,   354,    86,     0,     0,     0,     0,    86,     0,     0,
+      57,     0,     0,    57,     0,     0,     0,     0,    74,   626,
+       0,    34,     0,     0,     0,     0,    37,     0,   508,   508,
+      40,     0,     0,     0,     0,     0,     0,    41,    42,     0,
+     126,    79,     0,   711,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   352,   352,     0,   355,     0,     0,     0,
+       0,    79,    77,    43,     0,     0,     0,   968,   969,    79,
+       0,    45,    46,     0,     8,     9,    10,    11,    12,     0,
+       0,     0,     0,     0,     0,     0,  1282,   355,     0,     0,
+       0,     0,   354,     0,     0,     0,     0,     0,     0,     0,
+     347,   225,     0,    31,   259,   355,     0,    79,    66,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   226,   166,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   369,     0,     0,     0,   375,
-       0,  1532,     0,     0,     0,     0,    87,     0,     0,     0,
-    1540,     0,     0,     0,  1139,     0,     0,     0,   363,     0,
-     363,  1147,     0,     0,     0,     0,  1151,     0,     0,     0,
-       0,  1155,     0,  1156,     0,     0,     0,  1158,     0,  1159,
-    1160,     0,   348,  1163,     0,     0,     0,     0,   166,     0,
-       0,     0,  1175,   363,     0,     0,     0,     0,     0,     0,
-     219,   363,   363,   363,     0,     0,     0,    57,     0,     0,
-    1190,  1191,   363,   363,     0,     0,     0,     0,   166,     0,
-       0,     0,     0,     0,     0,     0,    87,     0,     0,     0,
-       0,    57,     0,     0,     0,     0,     0,  1221,    57,     0,
-    1223,   127,     0,   375,     0,     0,     0,     0,     0,     0,
-     166,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   363,     0,     0,
-       0,     0,     0,   524,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1237,     0,   166,     0,     0,     0,  1241,
-    1242,    57,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1253,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1260,     0,     0,  1264,     0,  1265,     0,     0,  1267,
-       0,     0,     0,   597,     0,     0,     0,     0,   621,     0,
-       0,     0,  1275,     0,     0,     0,     0,   363,     0,     0,
-       0,     0,     0,     0,     0,  1282,     0,  1284,  1285,  1286,
-    1287,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1294,     0,  1295,     0,     0,     0,   173,
-       0,     0,     0,   127,     0,   212,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   232,    87,   236,     0,   238,
-       0,     0,     0,    87,     0,     0,   247,     0,  1323,  1324,
-       0,     0,     0,     0,   166,   166,     0,     0,     0,     0,
-       0,   369,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   212,     0,   236,
-     238,   247,   524,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    87,     0,     0,     0,
-       0,  1359,  1360,     0,     0,     0,     0,     0,     0,     0,
-     716,  1370,     0,     0,     0,     0,     0,     0,     0,     0,
-     212,     0,   166,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   524,     0,   524,     0,     0,   524,
-       0,   166,   524,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   369,     0,     0,     0,     0,     0,
-       0,     0,  1402,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1407,     0,  1408,  1409,  1410,
-       0,   212,     0,   236,   238,   247,     0,     0,     0,  1414,
-       0,     0,     0,     0,     0,     0,     0,     0,  1425,     0,
-       0,     0,     0,     0,     0,     0,   166,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   369,   212,
-       0,     0,   814,     0,   212,  1448,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   497,
-       0,     0,     0,     0,     0,     0,     0,     0,   597,     0,
-       0,     0,     0,   597,     0,     0,     0,     0,     0,     0,
-       0,     0,   369,   369,   369,     0,     0,     0,     0,     0,
-    1487,  1488,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   369,     0,  1493,     0,     0,     0,   212,     0,     0,
-    1493,     0,     0,     0,   157,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   212,
-       0,     0,     0,   524,   236,   238,     0,     0,     0,     0,
-       0,     0,   247,  1527,     0,     0,     0,  1533,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   369,
-    1173,   939,   252,     8,     9,    10,    11,    12,     0,     0,
-       0,     0,   257,     0,     0,     0,  1555,     0,  1556,     0,
-       0,     0,     0,     0,     0,   212,     0,     0,     0,     0,
-     283,   284,    31,   285,     0,     0,   716,     0,     0,     0,
-       0,     0,     0,   212,     0,     0,  1571,  1572,   212,     0,
-     212,     0,     0,     0,  1575,  1576,     0,     0,     0,   286,
-      34,     0,     0,     0,     0,   287,     0,   212,   157,   288,
-     212,   212,   289,   290,   291,   292,    41,    42,   212,   293,
-     294,     0,   386,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   212,   369,     0,     0,     0,   621,     0,   212,
-       0,   369,   295,     0,   379,   418,     0,     0,     0,     0,
-       0,  1174,    46,   297,   298,   299,   300,     0,     0,   433,
-       0,     0,     0,     0,     0,     0,     0,     0,   438,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   446,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   283,
-     284,     0,   285,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   464,     0,     0,     0,     0,   474,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   286,     0,
-       0,   482,     0,     0,   287,     0,     0,   492,   288,   496,
-       0,   289,   290,   291,   292,    41,    42,   716,   293,   294,
-       0,     0,     0,     0,     0,     0,   526,     0,     0,     0,
-       0,     0,   524,   212,     0,     0,     0,     0,     0,     0,
-       0,   295,     0,   379,     0,     0,     0,     0,     0,   790,
-      45,    46,   297,   298,   299,   300,   166,     0,     0,     0,
-       0,   212,     0,     0,     0,     0,   212,     0,   585,     0,
-       0,     0,   369,   590,     0,     0,   206,     2,   207,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,     0,   635,    26,    27,    28,   636,   637,     0,   639,
-       0,     0,    31,     0,     0,   597,   651,   652,     0,   653,
-     654,     0,   655,     0,   656,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   369,   369,   212,     0,
-      34,   585,    35,     0,    36,     0,     0,   208,    39,   671,
-       0,     0,   212,     0,     0,     0,     0,     0,     0,     0,
+     697,     0,   711,     0,   352,     0,   117,     0,     0,     0,
+       0,    34,     0,     0,     0,     0,    37,     0,   183,   184,
+      40,     0,     0,     0,     0,     0,     0,    41,    42,   355,
+       0,     0,   697,     0,     0,     0,     0,     0,     0,     0,
+     697,   697,   697,     0,     0,    57,     0,   222,    86,   126,
+       0,   349,   349,   599,     0,   600,     0,     0,     0,     0,
+       0,    45,    46,   362,     0,  1187,     0,     0,    86,    74,
+       0,     0,     0,     0,     0,    57,    86,     0,     0,     0,
+       0,   352,     0,   352,     0,   354,   354,     0,   354,   354,
+       0,     0,     0,   355,   362,     0,     0,     0,   117,     0,
+       0,     0,     0,     0,   697,     0,     0,     0,    77,  1089,
+       0,     0,   362,   352,    86,     0,     0,     0,     0,     0,
+       0,   352,   352,   352,     0,     0,     0,     0,     0,     0,
+       0,     0,   352,   352,     0,     0,     0,   355,   355,   355,
+       0,     0,     0,   354,   354,     0,    74,     0,     0,     0,
+       0,     0,     0,     0,     0,   355,   362,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     283,   284,   497,   285,   682,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   209,     0,     0,     0,     0,     0,
-       0,    45,    46,     0,     0,     0,   524,     0,     0,   286,
-     708,     0,     0,     0,     0,   287,   711,     0,     0,   288,
-       0,   464,   289,   290,   291,   292,    41,    42,     0,   293,
-     294,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   212,     0,     0,     0,
-       0,     0,   295,     0,   379,     0,     0,   748,   212,   760,
-       0,    45,    46,   297,   298,   299,   300,     0,     0,     0,
-       0,     0,   767,     0,     0,   716,  -519,   212,     0,     1,
-       2,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,     0,     0,    26,    27,    28,    29,
-     793,     0,    30,     0,     0,    31,    32,   219,     0,   803,
-       0,   341,   364,     0,     0,     0,   805,     0,   283,   284,
-       0,   285,   813,     0,     0,     0,     0,     0,     0,     0,
-      33,   827,     0,    34,     0,    35,     0,    36,    37,     0,
-      38,    39,    40,     0,   716,   414,     0,   286,     0,    41,
-      42,     0,   414,   287,     0,     0,     0,   288,     0,     0,
-     289,   290,   291,   292,    41,    42,     0,   293,   294,     0,
-       0,     0,   867,     0,     0,    43,     0,    44,     0,     0,
-       0,   212,     0,     0,    45,    46,     0,     0,     0,     0,
-     295,     0,   379,     0,     0,   978,   369,   369,     0,    45,
-      46,   297,   298,   299,   300,   219,     0,     0,   813,     0,
-       0,     0,     0,   212,     0,     0,   909,     0,     0,     0,
-       0,     0,     0,     0,   414,     8,     9,    10,    11,    12,
+       0,   349,     0,   355,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    79,   352,     0,     8,     9,    10,
+      11,    12,     0,     0,     0,     0,   117,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      79,     0,     0,   355,   354,     0,    31,     0,  1187,     0,
+     362,     0,     0,     0,     0,  1187,     0,   167,     0,   172,
+       0,     0,   178,   179,   180,     0,   182,     0,     0,     0,
+       0,     0,     0,     0,    34,     0,     0,     0,   355,    37,
+     233,     0,   352,    40,     0,     0,   347,   223,     0,     0,
+      41,    42,   248,   249,   362,   362,   362,     0,     0,     0,
+    1217,     0,     0,     0,     0,     0,  1187,     0,     0,    77,
+       0,     0,   362,  1529,     0,     0,   717,     0,     0,     0,
+       0,   354,   355,   354,    45,    46,     0,     0,     0,    74,
+     362,     0,   355,     0,   355,     0,    74,    57,     0,   224,
+       0,    86,   355,     0,     0,     0,   355,     8,     9,    10,
+      11,    12,     0,   354,     0,     0,     0,     0,     0,     0,
+       0,   354,   354,   354,     0,     0,     0,    86,     0,     0,
+     362,     0,   354,   354,     0,     0,    31,     0,     0,   347,
+       0,     0,     0,     0,     0,     0,    77,    74,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    34,   362,     0,    79,     0,    37,
+       0,   183,   184,    40,     0,     0,     0,     0,     0,     0,
+      41,    42,     0,     0,     0,   354,     0,     0,     0,  1303,
+       0,     0,     0,     0,     0,     0,     0,   355,     0,     0,
+       0,     0,     0,   347,     0,     0,   904,     0,   410,   362,
+       0,     0,     0,     0,    45,    46,     0,     0,     0,   362,
+       0,   362,     0,     0,     0,     0,   225,     0,     0,   362,
+       0,     0,     0,   362,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   347,   347,   347,
+       0,     0,   354,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   347,     0,     0,     1,     2,
+       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
       13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,  -294,     0,     0,     0,   252,     0,   212,
-       0,     0,     0,     0,    31,     0,     0,   946,   947,     0,
-     212,     0,     0,     0,     0,     0,   283,   284,     0,   285,
-       0,   964,     0,     0,   321,     0,     0,     0,   414,     0,
-       0,     0,    34,     0,   346,     0,   414,   581,     0,   414,
-     584,     0,   986,  -294,   987,   286,   382,   382,   991,     0,
-     364,   287,     0,     0,   613,   288,     0,     0,   289,   290,
-     291,   292,    41,    42,     0,   293,   294,     0,     0,     0,
-       0,   369,     0,   631,     0,     0,   341,     0,     0,     0,
-       0,     0,   212,     0,     0,     0,     0,     0,   295,     0,
-     379,     0,     0,     0,     0,     0,   212,    45,    46,   297,
-     298,   299,   300,   414,     0,     0,     0,   414,     0,     0,
-       0,     0,  1025,     0,     0,     0,     0,   321,     0,  1026,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   524,
-       0,   524,  1028,     0,  1029,     0,     0,     0,   364,     0,
-       0,   478,     0,     0,     0,     0,     0,     0,  1041,     0,
-       0,     0,     0,     0,     0,  1045,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   524,  1083,   524,     0,
-    1084,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   414,     0,     0,   364,   212,     0,
-       0,     0,     0,     0,     0,     0,   166,     2,   207,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,     0,     0,    26,    27,    28,   414,     0,     0,     0,
-     341,   364,    31,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   590,
-       0,     0,     0,     0,     0,     0,     0,   382,     0,     0,
-      34,     0,    35,     0,    36,     0,     0,    38,    39,     0,
-       0,     0,     0,     0,     0,   414,   414,     0,     0,     0,
-       0,     0,     0,     0,     0,  1157,   212,     0,     0,     0,
-       0,     0,     0,     0,   807,   364,     0,     0,     0,     0,
-       0,     0,     0,  -402,   678,   613,     0,   613,   613,     0,
-       0,    45,    46,     0,   613,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   846,   364,     0,     0,     0,     0,
-     364,     0,     0,     0,     0,     0,     0,     0,     0,   364,
-     364,   364,     0,   526,     0,     0,     0,     0,     0,  1222,
-       0,   710,     0,     0,     0,     0,     0,     0,   364,     0,
-       0,     0,     0,   414,   889,     0,     0,   414,   892,     0,
-       0,     0,     0,     0,   894,     0,     0,     0,     0,     0,
-       0,     0,     0,  1234,     0,     0,     0,     0,  1236,     0,
-     744,     0,     0,   414,     0,     0,  1240,     0,     0,     0,
-       0,     0,     0,   761,     0,     0,     0,     0,   744,     0,
-       0,   744,     0,     0,     0,     0,   364,   613,     0,     0,
-       0,     0,     0,   771,     0,     0,     0,     0,     0,     0,
-       0,     0,  1269,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1277,   792,     0,  1278,     0,  1279,
-       0,     0,   341,   364,     0,   801,     0,   414,   414,     0,
-       0,     0,   346,  1288,  1289,     0,     0,   761,     0,     0,
+      23,    24,    25,     0,    86,    26,    27,    28,    29,    77,
+       0,    30,     0,     0,    31,    32,    77,   590,     0,   598,
+     355,   355,     0,   355,   355,     0,     0,     0,     0,     0,
+     622,   623,     0,   347,   362,     0,     0,     0,     0,    33,
+       0,     0,    34,    79,    35,     0,    36,    37,     0,    38,
+      39,    40,     0,     8,     9,    10,    11,    12,    41,    42,
+       0,     0,     0,     0,     0,     0,     0,    77,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   355,   355,
+       0,     0,    31,     0,    43,     0,    44,     0,   211,     0,
+    -518,     0,    45,    46,     0,     0,     0,   231,     0,   235,
+       0,   237,     0,     0,     0,     0,     0,     0,   246,     0,
+      34,     0,   165,     0,     0,    37,     0,   183,   184,    40,
+       0,     0,     0,     0,   347,     0,    41,    42,     0,   218,
+       0,     0,   347,     0,     8,     9,    10,    11,    12,   211,
+       0,   235,   237,   246,     0,     0,     0,   362,   362,   355,
+     362,   362,  1504,     0,   410,     0,     0,     0,     0,     0,
+      45,    46,     0,    31,     0,     0,     0,     0,     0,     0,
+      86,     0,     0,     0,     0,     0,   165,     0,     0,     0,
+     272,     0,   211,     0,     0,     0,     0,     0,     0,     0,
+       0,    34,   224,     0,     0,     0,    37,    57,   183,   184,
+      40,     0,     0,     0,     0,   362,   362,    41,    42,   165,
+       0,     0,     0,     0,    79,     0,     0,     0,     0,   368,
+       0,     0,     0,   374,     0,     0,   355,     0,   355,     0,
+       0,     0,     0,   265,     0,     0,     0,     0,     0,     0,
+       0,    45,    46,   211,     0,   235,   237,   246,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   355,     0,
+       0,     0,     0,     0,     0,    57,   355,   355,   355,     0,
+       0,     0,   165,     0,     0,     0,   362,   355,   355,     0,
+       0,   211,     0,     0,   218,     0,   211,     0,     0,     0,
+       0,    79,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   496,   165,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   225,
+       0,     0,     0,     0,     0,     0,     0,   374,     0,     0,
+     355,     0,     0,     0,   165,     0,     0,     0,     0,     0,
+       0,    86,     0,   347,   347,     0,     0,     0,     0,   211,
+       0,     0,     0,   362,     0,   362,     0,   523,     0,     0,
+       0,     0,     0,    57,     0,     0,     0,     0,     0,   165,
+       0,   211,   924,     0,   925,     0,   235,   237,     0,     0,
+       0,   928,   929,     0,   246,   362,   934,     0,     0,     0,
+       0,     0,     0,   362,   362,   362,     0,   355,   939,     0,
+       0,     0,     0,   943,   362,   362,     0,   596,     0,     0,
+       0,     0,   620,     0,     0,     0,     0,     0,    86,     0,
+       0,     0,     0,     0,     0,     0,     0,   211,     0,     0,
+       0,   977,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    79,   211,     0,     0,     0,     0,
+     211,    79,   211,     0,     0,     0,     0,   362,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   211,
+       0,     0,   211,   211,     0,     0,     0,     0,     0,     0,
+     211,     0,     0,     0,     0,     0,     0,     0,   165,   165,
+       0,     0,     0,     0,   211,   368,     0,     0,     0,     0,
+       0,   211,    79,     0,     0,     0,     0,     0,     0,     0,
+       0,    57,    57,     0,     0,     0,   523,     0,     0,     0,
+       0,     0,     0,     0,   362,     0,     0,     0,     0,     0,
+    1022,  1023,  1024,  1025,    57,  1027,     0,     0,     0,     0,
+       0,     0,     0,     0,   714,     0,     0,     0,     0,     0,
+    1071,     0,    57,     0,     0,     0,   165,     0,     0,     0,
+       0,     0,     0,     0,  1077,     0,     0,     0,   523,     0,
+     523,    86,     0,   523,     0,   165,   523,     0,    86,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   368,     0,
+       0,     0,     0,     0,     0,     0,     0,   347,   347,     0,
+       0,     0,     0,     0,  1097,     0,    57,     0,     0,     0,
+       0,    57,     0,     0,     0,   211,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    86,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1302,     0,     0,     0,     0,
+     165,     0,     0,   211,    57,     0,     0,     0,   211,  1128,
+       0,     0,   368,     0,     0,  1135,   809,     0,     0,     0,
+    1139,     0,     0,     0,     0,  1143,     0,  1144,     0,     0,
+       0,  1146,     0,  1147,  1148,     0,     0,  1151,     0,     0,
+       0,     0,   596,     0,     0,     0,  1163,   596,     0,     0,
+       0,     0,     0,     0,     0,     0,   368,   368,   368,     0,
+       0,     0,     0,     0,  1178,  1179,     0,     0,     0,     0,
+       0,     0,     0,     0,   368,     0,     0,   347,     0,   211,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   414,     0,     0,     0,     0,     0,     0,     0,
-     364,     0,     0,     0,     0,     0,   866,   807,   364,     0,
-       0,   613,     0,   613,     0,   382,     0,     0,     0,     0,
-       0,     0,     0,   613,  1343,     0,     0,     0,     0,     0,
-       0,     0,   212,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     1,     2,   207,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,     0,     0,    26,
-      27,    28,    29,     0,     0,    30,     0,     0,    31,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   807,     0,     0,     0,
-    1394,     0,  1395,   341,   364,   414,    34,   414,    35,     0,
-      36,   414,     0,    38,    39,   761,  1405,   970,  1406,     0,
-       0,     0,     0,     0,     0,     0,     0,   981,     0,     0,
-       0,     0,   613,   613,   990,     0,  1413,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      44,     0,  1431,  1433,     0,     0,     0,    45,    46,   364,
-       0,     0,     0,  1438,     0,     0,  1240,     0,     0,   414,
-       0,     0,     0,     0,     0,     0,  1008,  1009,     0,     0,
-     346,     0,     0,     0,     0,     0,     0,     0,     0,  1462,
-       0,   414,  1154,     0,   346,     0,     0,     0,  1469,     0,
-       0,  1471,   364,  1473,  1475,  1477,     0,     0,   414,  1166,
-       0,   613,   613,  1171,     0,     0,     0,     0,     0,   507,
-       0,   509,   512,   364,   364,   283,   284,     0,   285,   515,
-     516,     0,     0,     0,  1039,     0,     0,     0,   382,     0,
-       0,     0,     0,   509,   509,  1508,     0,  1510,     0,  1240,
-       0,     0,     0,     0,   286,     0,     0,     0,     0,     0,
-     287,     0,     0,     0,   288,  1522,     0,   289,   290,   291,
-     292,    41,    42,     0,   293,   294,   346,     0,     0,     0,
-       0,   509,     0,     0,     0,     0,   414,     0,   414,     0,
-       0,     0,     0,   414,     0,     0,     0,   295,     0,   379,
-       0,     0,   613,     0,     0,     0,   709,    46,   297,   298,
-     299,   300,     0,     0,     0,   321,     0,   509,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   807,   414,  1256,
-       0,  1130,  1131,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   382,     0,     0,     0,     0,
-       0,   981,   364,     0,  1145,     0,   744,     0,     8,     9,
+       0,  1209,     0,   211,  1211,     0,     0,     0,     0,     0,
+       0,     0,    57,     0,     0,     0,   523,   282,   283,     0,
+     284,     0,     0,   496,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    57,     0,     0,     0,     0,     0,
+       0,    57,   368,     0,   933,     0,   285,  1225,     0,     0,
+       0,     0,   286,  1229,  1230,     0,   287,     0,     0,   288,
+     289,   290,   291,    41,    42,     0,   292,   293,     0,     0,
+       0,     0,     0,  1246,     0,     0,  1250,   714,     0,     0,
+    1252,     0,     0,     0,   211,     0,     0,     0,   156,   294,
+       0,   378,    57,  1260,   379,     0,   211,    45,    46,   296,
+     297,   298,   299,     0,     0,     0,  1267,     0,  1269,  1270,
+    1271,  1272,     0,     0,     0,   211,     0,     0,     0,     0,
+       0,     0,     0,     0,  1279,     0,  1280,     0,     0,     0,
+     172,     0,     0,   368,     0,   251,     0,   620,     0,     0,
+       0,   368,     0,     0,     0,   256,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1308,
+    1309,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   205,     2,   206,     4,     5,     6,     7,     8,     9,
       10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,  -294,  1161,    26,    27,
-      28,     0,     0,     0,     0,     0,     0,    31,  1176,     0,
-     283,   284,     0,   285,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     382,     0,  1194,   341,     0,    34,     0,     0,     0,   286,
-       0,     0,    38,    39,     0,   640,  -294,   981,   981,   288,
-       0,   364,   289,   290,   291,   292,    41,    42,     0,   293,
-     294,     0,     0,     0,     0,     0,     0,     0,  1226,     0,
-       0,     0,     0,     0,     0,     0,     0,   634,     0,   338,
-       0,     0,   295,     0,   764,     0,    45,    46,     0,     0,
-       0,    45,    46,   297,   298,   299,   300,     0,     0,     0,
-       0,     0,     0,   364,   364,   509,   509,   509,   509,   509,
-     509,   509,   509,   509,   509,   509,   509,   509,   509,   509,
-     509,   509,   509,     0,     0,   981,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   866,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1280,
-    1281,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     1,     2,
-     207,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,     0,     0,    26,    27,    28,    29,     0,
-       0,    30,   283,   284,    31,   285,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   364,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   981,
-       0,   286,    34,     0,    35,     0,    36,   287,     0,    38,
-      39,   288,   509,     0,   289,   290,   291,   292,    41,    42,
-       0,   293,   294,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   295,     0,  1063,     0,     0,     0,
-       0,     0,     0,    45,    46,   297,   298,   299,   300,     0,
-       0,     0,     0,  1388,     0,     0,   744,  -129,     0,     0,
-       0,     0,     0,     0,     0,   509,     0,     0,   414,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,     0,     0,    26,
-      27,    28,     0,   414,   414,     0,   509,     0,    31,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   414,     0,
-       0,     0,     0,     0,     0,     0,    34,     0,     0,     0,
-       0,     0,     0,   208,    39,     0,     0,     0,     0,     0,
-    1447,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     1,     2,   207,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    45,    46,    26,
-      27,    28,    29,     0,     0,    30,   283,   284,    31,  1048,
-    1049,     0,  1050,     0,     0,  1051,  1052,  1053,  1054,  1055,
-    1056,  1057,  1058,     0,     0,     0,  1059,     0,     0,     0,
-    1060,  1061,     0,    33,     0,   286,    34,   509,    35,     0,
-      36,  1062,  1514,    38,    39,   288,     0,     0,   289,   290,
-     291,   292,    41,    42,     0,   293,   294,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,  -295,     0,     0,   295,     0,
-    1063,     0,   509,   172,     0,     0,    31,    45,    46,   297,
-     298,   299,   300,     0,     0,   321,     0,  1064,     0,     0,
-       0,  -129,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    34,     0,     0,     0,     0,     0,
-     509,     0,     0,     0,     0,  -295,     0,     0,     0,     0,
-       0,     0,     0,   509,     0,     0,     0,     0,     0,     0,
-       0,     0,     1,     2,   207,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,     0,     0,    26,
-      27,    28,    29,     0,   509,    30,   283,   284,    31,   285,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,     0,     0,
-      26,    27,    28,     0,     0,   286,    34,     0,    35,    31,
-      36,   287,     0,    38,    39,   288,     0,     0,   289,   290,
-     291,   292,    41,    42,     0,   293,   294,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    34,     0,     0,
-       0,     0,   111,     0,    38,    39,     0,     0,   295,     0,
-      44,   509,     0,    41,    42,     0,     0,    45,    46,   297,
-     298,   299,   300,     2,   207,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,     0,     0,    26,
-      27,    28,     0,     0,     0,     0,   283,   284,    31,   285,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   509,   509,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   286,    34,     0,    35,     0,
-      36,   287,     0,    38,    39,   288,     0,     0,   289,   290,
-     291,   292,    41,    42,     0,   293,   294,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   295,     0,
-     343,     0,     0,     0,     0,   760,     0,   344,    46,   297,
-     298,   299,   300,     2,   207,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,     0,     0,    26,
-      27,    28,     0,     0,     0,     0,   283,   284,    31,   285,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,     0,     0,
-      26,    27,    28,     0,     0,   286,    34,     0,    35,    31,
-      36,   287,     0,    38,    39,   288,     0,     0,   289,   290,
-     291,   292,    41,    42,     0,   293,   294,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    34,     0,     0,
-       0,     0,    37,     0,    38,    39,    40,     0,   295,     0,
-     969,     0,     0,    41,    42,   760,     0,   344,    46,   297,
-     298,   299,   300,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    43,
-       0,   158,     0,     0,     0,   509,     0,     0,    45,    46,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   509,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     2,   207,     4,     5,
+      20,    21,    22,    23,    24,    25,     0,     0,    26,    27,
+      28,   156,     0,     0,     0,     0,     0,    31,     0,  1341,
+    1342,     0,     0,     0,     0,   385,     0,     0,     0,  1352,
+       0,     0,     0,     0,     0,     0,     0,     0,   211,     0,
+       0,     0,     0,     0,     0,    34,   714,    35,   417,    36,
+       0,     0,   207,    39,     0,     0,     0,     0,     0,     0,
+       0,   523,   432,     0,     0,     0,     0,     0,   211,     0,
+       0,   437,     0,   282,   283,     0,   284,     0,     0,     0,
+       0,   445,     0,     0,     0,   165,     0,     0,     0,   208,
+    1387,     0,  1388,  1389,  1390,    45,    46,     0,     0,     0,
+       0,     0,   285,   211,  1394,     0,   463,     0,   286,     0,
+       0,   473,   287,  1405,   211,   288,   289,   290,   291,    41,
+      42,     0,   292,   293,   481,     0,     0,     0,     0,     0,
+     491,     0,   495,     0,     0,     0,     0,     0,  1426,     0,
+       0,   596,     0,     0,     0,   294,     0,   378,     0,   525,
+       0,     0,     0,    45,    46,   296,   297,   298,   299,     0,
+       0,     0,   368,   368,     0,     0,   785,     0,     0,     0,
+       0,     0,     0,     0,   282,   283,     0,   284,     0,     0,
+       0,  1464,  1465,     0,     0,     0,   211,     0,     0,     0,
+       0,   584,     0,     0,  1470,     0,   589,     0,     0,     0,
+     211,  1470,     0,   285,     0,     0,     0,     0,     0,   639,
+       0,   139,   140,   287,     0,     0,   288,   289,   290,   291,
+      41,    42,   523,   292,   293,   634,     0,     0,     0,   635,
+     636,     0,   638,  1503,     0,     0,     0,  1509,     0,   649,
+     650,     0,   651,   652,     0,   653,   294,   654,   640,     0,
+     641,   379,     0,     0,    45,    46,   296,   297,   298,   299,
+       0,     0,     0,     0,   584,  1531,     0,  1532,     0,     0,
+       0,     0,   669,     0,     0,     0,     0,     0,     0,     0,
+       0,   340,   363,     0,     0,     0,     0,     0,   714,   211,
+       0,     0,     0,     0,     0,  1547,  1548,   680,     0,     0,
+       0,     0,     0,  1551,  1552,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   413,     0,     0,     0,     0,
+       0,     0,   413,   706,     0,     0,     0,     0,     0,   709,
+     218,     0,     0,     0,   463,   466,     2,   206,     4,     5,
        6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
       16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-       0,     0,    26,    27,    28,     0,     0,     0,     0,   283,
-     284,    31,   285,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,     0,     0,    26,    27,    28,   509,   509,   286,    34,
-       0,    35,    31,    36,   287,     0,    38,    39,   288,     0,
-       0,   289,   290,   291,   292,    41,    42,     0,   293,   294,
+       0,     0,    26,    27,    28,     0,     0,   714,     0,     0,
+     744,    31,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   211,   762,     0,     0,     0,     0,
+       0,     0,     0,     0,   413,     0,     0,     0,     0,    34,
+       0,    35,     0,    36,     0,     0,    38,    39,     0,     0,
+       0,     0,     0,     0,     0,     0,   368,   368,     0,     0,
+       0,     0,     0,   788,     0,   218,     0,     0,     0,     0,
+       0,     0,   798,     0,     0,     0,     0,     0,     0,   800,
+     320,     0,     0,     0,     0,   808,    -3,     0,   413,     0,
+     345,     0,     0,     0,   822,     0,   413,   580,     0,   413,
+     583,     0,   381,   381,     0,     0,     0,     0,     0,     0,
+     363,     0,  1011,     0,   612,     8,     9,    10,    11,    12,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      34,     0,     0,     0,     0,     0,     0,    38,    39,     0,
-       0,   295,     0,   969,     0,     0,     0,     0,   760,     0,
-      45,    46,   297,   298,   299,   300,     2,   207,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-       0,     0,    26,    27,    28,     0,     0,     0,     0,   283,
-     284,    31,   285,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,     0,     0,    26,    27,    28,     0,     0,   286,    34,
-       0,    35,    31,    36,   287,     0,    38,    39,   288,     0,
-       0,   289,   290,   291,   292,    41,    42,     0,   293,   294,
+       0,     0,     0,   630,   862,     0,   340,     0,     0,     0,
+       0,     0,   282,   283,    31,   284,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      34,     0,     0,     0,     0,     0,     0,   208,    39,     0,
-       0,   295,     0,   343,     0,     0,     0,     0,     0,     0,
-     344,    46,   297,   298,   299,   300,     2,   207,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-       0,     0,    26,    27,    28,     0,     0,     0,     0,   283,
-     284,    31,   285,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,     0,     0,     0,     0,     0,     0,     0,   286,    34,
-       0,    35,    31,    36,   287,     0,   208,    39,   288,     0,
-       0,   289,   290,   291,   292,    41,    42,     0,   293,   294,
+       0,     0,     0,   413,     0,     0,     0,   413,     0,     0,
+     808,   285,    34,   320,     0,     0,   368,   286,   903,     0,
+       0,   287,     0,     0,   288,   289,   290,   291,    41,    42,
+       0,   292,   293,     0,     0,     0,     0,   477,   363,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   251,
+       0,     0,     0,     0,   294,     0,   378,     0,     0,   940,
+     941,     0,   343,    46,   296,   297,   298,   299,     0,     0,
+       0,     0,   523,     0,   523,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   413,     0,     0,   363,     0,     0,
+       0,     0,   978,     0,     0,     0,     0,   982,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   523,     0,
+     523,   211,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   413,     0,     0,     0,
+     340,   363,     0,     0,     0,     0,     0,   165,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      34,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   295,     0,  1005,     0,     0,     0,     0,     0,     0,
-    1006,    46,   297,   298,   299,   300,     2,   207,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-       0,     0,    26,    27,    28,     0,     0,     0,     0,   283,
-     284,    31,   285,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   381,     0,     0,     0,     0,     0,     0,
+       0,  1016,     0,     0,     0,     0,     0,     0,  1017,     0,
+       0,     0,     0,     0,     0,   413,   413,     0,     0,     0,
+       0,  1019,     0,  1020,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   802,   363,     0,  1032,     0,     0,
+       0,     0,     0,  1036,     0,   612,     0,   612,   612,     0,
+       0,     0,     0,     0,   612,  1074,     0,     0,  1075,     0,
+       0,     0,     0,     0,   841,   363,     0,     0,     0,     0,
+     363,     0,     0,     0,     0,     0,     0,     0,     0,   363,
+     363,   363,     0,     0,     0,     0,     0,   708,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   363,     0,     0,
+       0,     0,   413,   883,     0,     0,   413,   886,     0,     0,
+       0,     0,     0,   888,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   740,     0,     0,     0,
+       0,     0,   413,     0,     0,   589,     0,     0,     0,   757,
+       0,     0,     0,     0,   740,     0,     0,   740,     0,     0,
+       0,     0,     0,     0,     0,   363,   612,     0,     0,   766,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   286,    34,
-       0,    35,     0,    36,   287,     0,    38,    39,   288,     0,
-       0,   289,   290,   291,   292,    41,    42,     0,   293,   294,
+    1145,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   787,     0,     0,     0,     0,     0,     0,     0,   340,
+     363,   796,     0,     0,   413,   413,     0,     0,   345,     0,
+       0,     0,     0,   757,     0,     0,     0,     0,     0,     0,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,   525,     0,
+      26,    27,    28,     0,  1210,     0,     0,     0,   413,    31,
+       0,     0,     0,     0,     0,     0,   363,     0,     0,     0,
+       0,     0,   861,   802,   363,     0,     0,   612,     0,   612,
+     381,     0,     0,     0,     0,     0,     0,    34,  1222,   612,
+       0,     0,    37,  1224,    38,    39,    40,     0,     0,     0,
+       0,  1228,     0,    41,    42,     0,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,  -291,     0,     0,     0,     0,    43,
+       0,   157,     0,     0,  1254,    31,     0,    45,    46,     0,
+       0,     0,     0,     0,     0,     0,  1262,     0,     0,  1263,
+       0,  1264,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   802,     0,    34,     0,  1273,  1274,     0,   340,   363,
+     413,     0,   413,     0,  -291,     0,   413,     0,   757,     0,
+     962,     0,     0,     0,     0,     0,     0,  1287,     0,     0,
+     973,     0,     0,     0,     0,     0,   981,   612,   612,     0,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,  1161,     0,
+       0,     8,     9,    10,    11,    12,     0,     0,     0,    31,
+       0,     0,   413,     0,  1326,     0,     0,     0,   999,  1000,
+       0,     0,   345,     0,     0,     0,     0,     0,   282,   283,
+      31,   284,     0,   413,  1142,     0,   345,    34,     0,     0,
+       0,     0,     0,     0,   363,     0,     0,     0,     0,     0,
+     413,  1154,     0,   612,   612,  1159,     0,   285,    34,     0,
+       0,     0,     0,   286,     0,   363,   363,   287,     0,     0,
+     288,   289,   290,   291,    41,    42,  1030,   292,   293,     0,
+     381,     0,     0,     0,     0,     0,     0,     0,     0,  1376,
+       0,  1377,     0,     0,     0,     0,     0,     0,     0,     0,
+     294,     0,   378,  1385,     0,  1386,     0,     0,  1162,    46,
+     296,   297,   298,   299,     0,     0,     0,   345,     0,     0,
+       0,     0,  1393,     0,     0,     0,     0,     0,   413,     0,
+     413,     0,     0,     0,     0,   413,     0,     0,  1411,  1413,
+       0,     0,     0,     0,   612,     0,     0,     0,     0,  1418,
+       0,     0,  1228,     0,     0,     0,   320,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   802,   413,  1242,
+       0,     0,     0,  1440,     0,   282,   283,     0,   284,     0,
+       0,     0,  1447,     0,   381,  1449,     0,  1451,  1453,  1455,
+     973,   363,     0,     0,   740,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   285,     0,     0,     0,     0,     0,
+     286,     0,     0,     0,   287,  1149,     0,   288,   289,   290,
+     291,    41,    42,     0,   292,   293,  1164,  1485,     0,  1487,
+       0,  1228,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1498,   294,   381,   378,
+    1182,     0,   340,     0,   756,    45,    46,   296,   297,   298,
+     299,     0,     0,     0,     0,   973,   973,     0,     0,     0,
+     363,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1214,     0,     0,     0,
+       0,     0,     0,     0,     1,     2,   206,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,   363,
+     363,    26,    27,    28,    29,     0,     0,    30,     0,     0,
+      31,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   973,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    34,   861,
+      35,     0,    36,     0,     0,    38,    39,     0,     0,     0,
+       0,     0,     0,     0,  1265,  1266,     0,     1,     2,   206,
+       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,    44,     0,    26,    27,    28,    29,    45,    46,
+      30,   282,   283,    31,  1039,  1040,     0,  1041,     0,     0,
+    1042,  1043,  1044,  1045,  1046,  1047,  1048,  1049,     0,     0,
+       0,  1050,     0,     0,     0,  1051,  1052,     0,    33,   363,
+     285,    34,     0,    35,     0,    36,  1053,     0,    38,    39,
+     287,     0,     0,   288,   289,   290,   291,    41,    42,     0,
+     292,   293,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   294,     0,  1054,     0,     0,   171,     0,
+       0,    45,    46,   296,   297,   298,   299,     0,     0,     0,
+       0,  1055,     0,     0,     0,     0,  -126,     0,     0,     0,
+       0,     0,     0,     0,     0,  1370,     0,     0,   740,     0,
+       0,     0,     0,     0,     0,     0,   413,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   295,     0,   969,     0,     0,     0,     0,     0,     0,
-     344,    46,   297,   298,   299,   300,     2,   207,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-       0,     0,    26,    27,    28,     0,     0,     0,     0,   283,
-     284,    31,   285,     0,     0,     0,     0,     0,     0,     0,
+     413,   413,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   286,    34,
-       0,    35,     0,    36,   287,     0,   208,    39,   288,     0,
-       0,   289,   290,   291,   292,    41,    42,     0,   293,   294,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   295,     0,   379,     0,     0,     0,     0,     0,     0,
-      45,    46,   297,   298,   299,   300,     1,     2,     3,     4,
+       0,     0,     0,     0,     0,   413,     1,     2,   206,     4,
        5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
       25,     0,     0,    26,    27,    28,    29,     0,     0,    30,
-       0,     0,    31,    32,     0,     0,     0,     0,     0,     0,
+     282,   283,    31,   284,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,     0,     0,    26,    27,    28,     0,     0,   285,
+      34,     0,    35,    31,    36,   286,     0,    38,    39,   287,
+       0,     0,   288,   289,   290,   291,    41,    42,     0,   292,
+     293,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    34,     0,     0,     0,     0,    37,     0,    38,    39,
+      40,     0,   294,     0,  1054,     0,     0,    41,    42,     0,
+      45,    46,   296,   297,   298,   299,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  -126,     0,     0,     0,     0,
+       0,     0,     0,    43,     0,    44,     0,     0,     0,     0,
+       0,    45,    46,     0,     0,     0,     0,     0,   320,     1,
+       2,   206,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,     0,     0,    26,    27,    28,    29,
+       0,     0,    30,   282,   283,    31,   284,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,     0,     0,    26,    27,    28,
+       0,     0,   285,    34,     0,    35,    31,    36,   286,     0,
+      38,    39,   287,     0,     0,   288,   289,   290,   291,    41,
+      42,     0,   292,   293,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    34,     0,     0,     0,     0,   110,
+       0,    38,    39,     0,     0,   294,     0,    44,     0,     0,
+      41,    42,     0,    45,    46,   296,   297,   298,   299,     2,
+     206,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,     0,     0,    26,    27,    28,     0,     0,
+       0,     0,   282,   283,    31,   284,     0,     0,     0,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,  -292,     0,     0,
+       0,   285,    34,     0,    35,     0,    36,   286,    31,    38,
+      39,   287,     0,     0,   288,   289,   290,   291,    41,    42,
+       0,   292,   293,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    34,     0,     0,     0,
+       0,     0,     0,     0,   294,     0,   342,  -292,     0,     0,
+       0,   756,   343,    46,   296,   297,   298,   299,     2,   206,
+       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,     0,     0,    26,    27,    28,     0,     0,     0,
+       0,   282,   283,    31,   284,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,     0,     0,    26,    27,    28,     0,     0,
+     285,    34,     0,    35,    31,    36,   286,     0,    38,    39,
+     287,     0,     0,   288,   289,   290,   291,    41,    42,     0,
+     292,   293,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    34,     0,     0,     0,     0,     0,     0,    38,
+      39,     0,     0,   294,     0,   961,     0,     0,     0,     0,
+     756,   343,    46,   296,   297,   298,   299,     2,   206,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,     0,     0,    26,    27,    28,     0,     0,     0,     0,
+     282,   283,    31,   284,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,     0,     0,    26,    27,    28,     0,     0,   285,
+      34,     0,    35,    31,    36,   286,     0,    38,    39,   287,
+       0,     0,   288,   289,   290,   291,    41,    42,     0,   292,
+     293,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    34,     0,     0,     0,     0,     0,     0,   207,    39,
+       0,     0,   294,     0,   961,     0,     0,     0,     0,   756,
+      45,    46,   296,   297,   298,   299,     2,   206,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+       0,     0,    26,    27,    28,     0,     0,     0,     0,   282,
+     283,    31,   284,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    33,     0,     0,
-      34,     0,    35,     0,    36,    37,     0,    38,    39,    40,
-       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   285,    34,
+       0,    35,     0,    36,   286,     0,    38,    39,   287,     0,
+       0,   288,   289,   290,   291,    41,    42,     0,   292,   293,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    43,     0,    44,     0,     0,     0,  -523,     0,
-       0,    45,    46,     1,     2,     3,     4,     5,     6,     7,
+       0,   294,     0,   342,     0,     0,     0,     0,     0,   343,
+      46,   296,   297,   298,   299,     2,   206,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,     0,
+       0,    26,    27,    28,     0,     0,     0,     0,   282,   283,
+      31,   284,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   285,    34,     0,
+      35,     0,    36,   286,     0,   207,    39,   287,     0,     0,
+     288,   289,   290,   291,    41,    42,     0,   292,   293,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     294,     0,   996,     0,     0,     0,     0,     0,   997,    46,
+     296,   297,   298,   299,     2,   206,     4,     5,     6,     7,
        8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
       18,    19,    20,    21,    22,    23,    24,    25,     0,     0,
-      26,    27,    28,    29,     0,     0,    30,     0,     0,    31,
-      32,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      26,    27,    28,     0,     0,     0,     0,   282,   283,    31,
+     284,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    33,     0,     0,    34,     0,    35,
-       0,    36,    37,     0,    38,    39,    40,     0,     0,     0,
-       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   285,    34,     0,    35,
+       0,    36,   286,     0,    38,    39,   287,     0,     0,   288,
+     289,   290,   291,    41,    42,     0,   292,   293,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    43,
-       0,    44,     0,     0,     0,     0,     0,     0,    45,    46,
-       1,     2,   207,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,  -294,     0,    26,    27,    28,
-      29,     0,     0,    30,     0,     0,    31,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   294,
+       0,   961,     0,     0,     0,     0,     0,   343,    46,   296,
+     297,   298,   299,     2,   206,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,     0,     0,    26,
+      27,    28,     0,     0,     0,     0,   282,   283,    31,   284,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    34,     0,    35,     0,    36,     0,
-       0,    38,    39,     0,     0,  -294,     2,   207,     4,     5,
+       0,     0,     0,     0,     0,   285,    34,     0,    35,     0,
+      36,   286,     0,   207,    39,   287,     0,     0,   288,   289,
+     290,   291,    41,    42,     0,   292,   293,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   294,     0,
+     378,     0,     0,     0,     0,     0,    45,    46,   296,   297,
+     298,   299,  -514,     0,     0,     1,     2,     3,     4,     5,
        6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
       16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-       0,     0,    26,    27,    28,     0,     0,     0,    44,     0,
-       0,    31,     0,     0,     0,    45,    46,     0,     0,     0,
+       0,     0,    26,    27,    28,    29,     0,     0,    30,     0,
+       0,    31,    32,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    34,
-       0,    35,     0,    36,    37,     0,   208,    39,    40,     0,
+       0,     0,     0,     0,     0,     0,    33,     0,     0,    34,
+       0,    35,     0,    36,    37,     0,    38,    39,    40,     0,
        0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    43,     0,   209,     0,     0,     0,     0,     0,     0,
-      45,    46,     2,   207,     4,     5,     6,     7,     8,     9,
+       0,    43,     0,    44,     0,     0,     0,     0,     0,    45,
+      46,     1,     2,     3,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,     0,     0,    26,    27,
+      28,    29,     0,     0,    30,     0,     0,    31,    32,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    33,     0,     0,    34,     0,    35,     0,    36,
+      37,     0,    38,    39,    40,     0,     0,     0,     0,     0,
+       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    43,     0,    44,
+       0,     0,     0,     0,     0,    45,    46,   205,     2,   206,
+       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,     0,     0,    26,    27,    28,     0,     0,     0,
+       0,     0,     0,    31,     0,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,     0,     0,    26,    27,    28,   484,   485,
+     486,    34,     0,    35,    31,    36,    37,     0,   207,    39,
+      40,     0,     0,     0,     0,     0,     0,    41,    42,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    34,     0,     0,     0,     0,     0,     0,    38,
+      39,     0,     0,    43,     0,   208,     0,     0,     0,     0,
+       0,    45,    46,     1,     2,   206,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,  -291,     0,
+      26,    27,    28,    29,     0,     0,    30,     0,     0,    31,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    34,     0,    35,
+       0,    36,     0,     0,    38,    39,     0,     0,  -291,     2,
+     206,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,     0,     0,    26,    27,    28,     0,     0,
+       0,    44,     0,     0,    31,     0,     0,    45,    46,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    34,     0,    35,     0,    36,    37,     0,   207,
+      39,    40,     0,     0,     0,     0,     0,     0,    41,    42,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    43,     0,   208,     0,     0,     0,
+       0,     0,    45,    46,     2,   206,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,     0,     0,
+      26,    27,    28,     0,     0,     0,     0,     0,     0,    31,
+       0,     0,     0,     0,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,     0,     0,    26,    27,    28,    34,     0,    35,
+       0,    36,     0,    31,    38,    39,     0,     2,   206,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    34,     0,    26,    27,    28,     0,     0,    38,    39,
+    -398,   676,    31,     0,     0,     0,     0,    45,    46,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      34,     0,    35,   633,    36,   337,     0,    38,    39,     0,
+       0,    45,    46,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1349,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   676,     0,     0,     0,     0,     0,
+      45,    46,     2,   206,     4,     5,     6,     7,     8,     9,
       10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
       20,    21,    22,    23,    24,    25,     0,     0,    26,    27,
@@ -2609 +2100 @@
       17,    18,    19,    20,    21,    22,    23,    24,    25,     0,
        0,    26,    27,    28,     0,    34,     0,    35,     0,    36,
-      31,     0,    38,    39,     0,     0,     0,     0,     0,     0,
+      31,   683,    38,    39,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1367,     0,     0,     0,    34,     0,
-       0,     0,     0,    37,     0,   336,   337,    40,     0,   678,
-       0,     0,     0,     0,    41,    42,    45,    46,     2,   207,
-       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+       0,     0,     0,     0,  1351,     0,     0,     0,    34,     0,
+       0,     0,     0,     0,     0,    38,    39,     0,     0,   676,
+       0,     0,     0,     0,     0,    45,    46,     2,   206,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,     0,   684,    26,    27,    28,   685,     0,    45,    46,
+       0,     0,    31,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      34,     0,    35,     0,    36,     0,     0,   207,    39,     0,
+       2,   206,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,     0,     0,    26,    27,    28,     0,
+       0,     0,     0,     0,   270,    31,     0,     0,     0,     0,
+      45,    46,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    34,     0,    35,     0,    36,     0,     0,
+      38,    39,     0,     2,   206,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,     0,     0,    26,
+      27,    28,     0,     0,     0,     0,     0,   676,    31,     0,
+       0,     0,     0,    45,    46,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    34,     0,    35,     0,
+      36,     0,     0,    38,    39,     0,     2,   206,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+       0,     0,    26,    27,    28,     0,     0,     0,     0,     0,
+     591,    31,     0,     0,     0,     0,    45,    46,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    34,
+       0,    35,     0,    36,     0,     0,   207,    39,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,     0,     0,    26,    27,
+      28,     0,     0,     0,     0,   282,   283,    31,   284,     0,
+       0,     0,     0,   208,     0,     0,     0,     0,     0,    45,
+      46,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   285,    34,     0,     0,     0,     0,
+     286,     0,    38,    39,   287,     0,     0,   288,   289,   290,
+     291,    41,    42,     0,   292,   293,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   294,     0,   516,
+       0,     0,   171,     0,     0,    45,    46,   296,   297,   298,
+     299,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,     0,
+       0,    26,    27,    28,     0,     0,     0,     0,   282,   283,
+      31,   284,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+       0,     0,    26,    27,    28,     0,     0,   285,    34,     0,
+       0,    31,     0,   286,     0,    38,    39,   287,     0,     0,
+     288,   289,   290,   291,    41,    42,     0,   292,   293,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    34,
+       0,     0,     0,     0,    37,     0,   335,   336,    40,     0,
+     294,   -35,   295,     0,     0,    41,    42,     0,    45,    46,
+     296,   297,   298,   299,     8,     9,    10,    11,    12,    13,
       14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,   338,     0,    26,    27,    28,     0,     0,    45,
-      46,     0,     0,    31,     0,     0,     0,     8,     9,    10,
+      24,    25,     0,   337,    26,    27,    28,     0,     0,    45,
+      46,   282,   283,    31,   284,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,     0,     0,    26,    27,    28,     0,     0,
+     285,    34,     0,     0,    31,     0,   286,     0,    38,    39,
+     287,     0,     0,   288,   289,   290,   291,    41,    42,     0,
+     292,   293,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    34,     0,     0,     0,     0,   110,     0,    38,
+      39,     0,     0,   294,     0,   295,     0,     0,    41,    42,
+       0,    45,    46,   296,   297,   298,   299,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,     0,    44,    26,    27,    28,
+       0,     0,    45,    46,   282,   283,    31,   284,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,     0,     0,    26,    27,
+      28,     0,     0,   285,    34,     0,     0,    31,   683,   286,
+       0,    38,    39,   287,     0,     0,   288,   289,   290,   291,
+      41,    42,     0,   292,   293,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    34,     0,     0,     0,     0,
+       0,     0,    38,    39,     0,     0,   294,     0,   157,     0,
+       0,     0,     0,     0,    45,    46,   296,   297,   298,   299,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,     0,   684,
+      26,    27,    28,  1090,     0,    45,    46,   282,   283,    31,
+     284,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,     0,
+       0,    26,    27,    28,     0,     0,   285,    34,     0,     0,
+      31,   683,   286,     0,    38,    39,   287,     0,     0,   288,
+     289,   290,   291,    41,    42,     0,   292,   293,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    34,     0,
+       0,     0,     0,     0,     0,    38,    39,     0,     0,   294,
+       0,   591,     0,     0,     0,     0,     0,    45,    46,   296,
+     297,   298,   299,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,     0,   684,    26,    27,    28,  1219,     0,    45,    46,
+     282,   283,    31,   284,     0,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,  -291,     0,    26,    27,    28,     0,   285,
+      34,     0,     0,     0,    31,   286,     0,    38,    39,   287,
+       0,     0,   288,   289,   290,   291,    41,    42,     0,   292,
+     293,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    34,     0,     0,     0,     0,    37,     0,   335,
+     336,    40,   294,  -291,   378,     0,     0,     0,    41,    42,
+      45,    46,   296,   297,   298,   299,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   633,     0,   337,     0,     0,     0,
+       0,     0,    45,    46,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,  -291,     0,    26,    27,    28,     0,     0,     0,
+       0,     0,     0,    31,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,     0,     0,    26,    27,    28,     0,     0,     0,
+       0,    34,     0,    31,     0,     0,    37,     0,   335,   336,
+      40,     0,  -291,     0,     0,     0,     0,    41,    42,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    34,     0,     0,     0,     0,    37,     0,   207,    39,
+      40,     0,     0,     0,     0,   337,     0,    41,    42,     0,
+       0,    45,    46,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    43,     0,   270,     0,     0,     0,     0,
+       0,    45,    46,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,     0,     0,    26,    27,    28,     0,     0,     0,     0,
+       0,     0,    31,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,  -291,     0,    26,    27,    28,     0,     0,     0,     0,
+      34,     0,    31,     0,     0,    37,     0,   335,   336,    40,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      34,     0,     0,     0,     0,     0,     0,    38,    39,     0,
+       0,  -291,   633,     0,   337,     0,     0,     0,     0,     0,
+      45,    46,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   633,     0,   337,     0,     0,     0,     0,     0,
+      45,    46,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+    -291,     0,    26,    27,    28,     0,     0,     0,     0,     0,
+       0,    31,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+       0,     0,    26,    27,    28,     0,     0,     0,     0,    34,
+       0,    31,     0,     0,     0,     0,    38,    39,     0,     0,
+    -291,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    34,
+       0,    26,    27,    28,     0,     0,    38,    39,     0,     0,
+      31,     0,     0,   337,     0,     0,     0,     0,     0,    45,
+      46,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    34,     0,
+       0,     0,     0,   257,     0,    38,    39,     0,     0,    45,
+      46,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,     0,
+       0,    26,    27,    28,     0,     0,     0,     0,     0,     0,
+      31,     0,   157,     0,     0,     0,     0,     0,    45,    46,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    34,     0,
+      26,    27,    28,     0,     0,   207,    39,     0,     0,    31,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,     0,     0,
+      26,    27,    28,     0,     0,     0,     0,    34,     0,    31,
+       0,     0,   270,     0,    38,    39,     0,     0,    45,    46,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    34,     0,     0,
+       0,     0,     0,     0,    38,    39,     0,     0,     0,     0,
+       0,   337,     0,     0,     0,     0,     0,    45,    46,     0,
+       0,     0,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+       0,   684,    26,    27,    28,     0,     0,    45,    46,     0,
+       0,    31,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+       0,     0,    26,    27,    28,     0,     0,     0,     0,    34,
+       0,    31,     0,     0,     0,     0,    38,    39,     0,     0,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,     0,    34,
+      26,    27,    28,     0,     0,     0,    38,    39,     0,    31,
+       0,     0,     0,   591,     0,     0,     0,     0,     0,    45,
+      46,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    34,     0,     0,
+       0,     0,     0,    44,   207,    39,     0,     0,     0,    45,
+      46,     2,   206,     4,     5,     6,     7,     8,     9,    10,
       11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
       21,    22,    23,    24,    25,     0,     0,    26,    27,    28,
-       0,    34,     0,    35,     0,    36,    31,     0,    38,    39,
+       0,     0,     0,     0,     0,     0,    31,    45,    46,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1369,     0,     0,     0,    34,     0,     0,     0,     0,   111,
-       0,    38,    39,     0,     0,   678,     0,     0,     0,     0,
-      41,    42,    45,    46,     2,   207,     4,     5,     6,     7,
+       0,     0,     0,     0,    34,     0,    35,     0,    36,     0,
+       0,    38,    39,   282,   283,     0,   284,  1040,     0,  1041,
+       0,     0,  1042,  1043,  1044,  1045,  1046,  1047,  1048,  1049,
+       0,     0,  1523,  1050,     0,     0,     0,  1051,  1052,     0,
+      33,     0,   285,     0,     0,     0,     0,  -411,  1053,     0,
+       0,     0,   287,     0,     0,   288,   289,   290,   291,    41,
+      42,     0,   292,   293,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   294,     0,   378,     0,     0,
+     171,     0,     0,    45,    46,   296,   297,   298,   299,     0,
+       0,   282,   283,  1055,   284,  1040,     0,  1041,  -126,     0,
+    1042,  1043,  1044,  1045,  1046,  1047,  1048,  1049,     0,     0,
+       0,  1050,     0,     0,     0,  1051,  1052,     0,    33,     0,
+     285,     0,     0,     0,     0,     0,  1053,     0,     0,     0,
+     287,     0,     0,   288,   289,   290,   291,    41,    42,     0,
+     292,   293,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   294,     0,   378,     0,     0,   171,     0,
+       0,    45,    46,   296,   297,   298,   299,     0,     0,     0,
+       0,  1055,     0,     0,     0,     0,  -126,     2,   206,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,     0,     0,    26,    27,    28,     0,     0,     0,     0,
+       0,     0,    31,     0,   282,   283,     0,   284,  1040,     0,
+    1041,  1397,  1398,  1042,  1043,  1044,  1045,  1046,  1047,  1048,
+    1049,     0,     0,  1523,  1050,     0,     0,     0,  1051,  1052,
+      34,    33,    35,   285,    36,     0,     0,    38,    39,  1053,
+       0,     0,     0,   287,     0,     0,   288,   289,   290,   291,
+      41,    42,     0,   292,   293,     0,     0,     0,     0,  1310,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   294,     0,   378,     0,
+       0,   171,     0,     0,    45,    46,   296,   297,   298,   299,
+       0,     0,   282,   283,  1055,   284,  1040,     0,  1041,  1397,
+    1398,  1042,  1043,  1044,  1045,  1046,  1047,  1048,  1049,     0,
+       0,     0,  1050,     0,     0,     0,  1051,  1052,     0,    33,
+       0,   285,     0,     0,     0,     0,     0,  1053,     0,     0,
+       0,   287,     0,     0,   288,   289,   290,   291,    41,    42,
+       0,   292,   293,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   294,     0,   378,     0,     0,   171,
+       0,     0,    45,    46,   296,   297,   298,   299,     0,     0,
+     282,   283,  1055,   284,  1040,     0,  1041,     0,     0,  1042,
+    1043,  1044,  1045,  1046,  1047,  1048,  1049,     0,     0,     0,
+    1050,     0,     0,     0,  1051,  1052,     0,    33,     0,   285,
+       0,     0,     0,     0,     0,  1053,     0,     0,     0,   287,
+       0,     0,   288,   289,   290,   291,    41,    42,     0,   292,
+     293,     0,     0,     0,     0,     0,     0,   282,   283,     0,
+     284,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   294,     0,   378,     0,     0,   171,     0,     0,
+      45,    46,   296,   297,   298,   299,   285,     0,     0,     0,
+    1055,     0,   286,     0,     0,     0,   287,     0,     0,   288,
+     289,   290,   291,    41,    42,     0,   292,   293,     0,     0,
+       0,     0,     0,     0,   282,   283,     0,   284,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   294,
+       0,   378,     0,     0,   970,     0,     0,    45,    46,   296,
+     297,   298,   299,   285,     0,     0,     0,     0,     0,   286,
+       0,     0,     0,   287,     0,     0,   288,   289,   290,   291,
+      41,    42,     0,   292,   293,     0,     0,     0,     0,     0,
+       0,   282,   283,     0,   284,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   294,     0,   378,     0,
+     282,   283,     0,   284,    45,    46,   296,   297,   298,   299,
+     285,     0,     0,     0,     0,     0,   286,     0,     0,     0,
+     287,     0,     0,   288,   289,   290,   291,    41,    42,   285,
+     292,   293,     0,     0,     0,   286,     0,     0,     0,   287,
+       0,     0,   288,   289,   290,   291,    41,    42,     0,   292,
+     293,     0,     0,   294,     0,   378,     0,   282,   283,     0,
+     284,   707,    46,   296,   297,   298,   299,     0,     0,     0,
+       0,     0,   294,     0,   378,     0,   282,   283,     0,   284,
+     343,    46,   296,   297,   298,   299,   285,     0,     0,     0,
+       0,     0,   286,     0,     0,     0,   287,     0,     0,   288,
+     289,   290,   291,    41,    42,   285,   292,   293,     0,     0,
+       0,   286,     0,     0,     0,   287,     0,     0,   288,   289,
+     290,   291,    41,    42,     0,   292,   293,     0,     0,   294,
+       0,     0,     0,   282,   283,     0,   284,    45,    46,   296,
+     297,   298,   299,     0,     0,     0,     0,     0,   510,     0,
+       0,     0,     0,     0,     0,     0,    45,    46,   296,   297,
+     298,   299,   285,     0,     0,     0,     0,     0,   286,     0,
+       0,     0,   287,     0,     0,   288,   289,   290,   291,    41,
+      42,     0,   292,   293,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   513,     0,     0,     0,     0,
+       0,     0,     0,    45,    46,   296,   297,   298,   299,     2,
+     206,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    31,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    34,     0,    35,     0,    36,    37,     0,   174,
+     175,    40,     0,     0,     0,     0,     0,     0,    41,    42,
+     205,     2,   206,     4,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,     0,     0,    26,    27,    28,
+       0,     0,     0,     0,     0,     0,    31,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    34,     0,    35,     0,    36,     0,
+       0,   207,    39,   466,     2,   206,     4,     5,     6,     7,
        8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    44,     0,
-      26,    27,    28,     0,     0,    45,    46,     0,     0,    31,
+      18,    19,    20,    21,    22,    23,    24,    25,     0,     0,
+      26,    27,    28,     0,     0,     0,     0,     0,     0,    31,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,    34,     0,    35,
-       0,    36,     0,     0,   208,    39,     0,     2,   207,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,     0,     0,    26,    27,    28,     0,     0,     0,     0,
-       0,   271,    31,     0,     0,     0,     0,     0,    45,    46,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      34,     0,    35,     0,    36,     0,     0,    38,    39,     0,
-       2,   207,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,     0,     0,    26,    27,    28,     0,
-       0,     0,     0,     0,   678,    31,     0,     0,     0,     0,
-       0,    45,    46,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    34,     0,    35,     0,    36,     0,     0,
-      38,    39,     0,     2,   207,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,     0,     0,    26,
-      27,    28,     0,     0,     0,     0,     0,   592,    31,     0,
-       0,     0,     0,     0,    45,    46,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    34,     0,    35,     0,
-      36,     0,     0,   208,    39,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,     0,     0,    26,    27,    28,     0,     0,
-       0,     0,   283,   284,    31,   285,     0,     0,     0,     0,
-     209,     0,     0,     0,     0,     0,     0,    45,    46,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   286,    34,     0,     0,     0,     0,   287,     0,    38,
-      39,   288,     0,     0,   289,   290,   291,   292,    41,    42,
-       0,   293,   294,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   295,     0,   517,     0,     0,   172,
-       0,     0,     0,    45,    46,   297,   298,   299,   300,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,     0,     0,    26,
-      27,    28,     0,     0,     0,     0,   283,   284,    31,   285,
-       0,     0,     0,     0,     0,     0,     0,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,   286,    34,    26,    27,    28,
-       0,   640,     0,    38,    39,   288,    31,     0,   289,   290,
-     291,   292,    41,    42,     0,   293,   294,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    34,     0,     0,     0,   295,   -35,
-     741,    38,    39,     0,     0,     0,     0,    45,    46,   297,
-     298,   299,   300,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,     0,     0,    26,    27,    28,   634,     0,   338,     0,
-     283,   284,    31,   285,     0,    45,    46,     0,     0,     0,
-       0,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,   286,
-      34,    26,    27,    28,     0,   287,     0,    38,    39,   288,
-      31,     0,   289,   290,   291,   292,    41,    42,     0,   293,
-     294,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    34,     0,
-       0,     0,   295,     0,   296,    38,    39,     0,     0,     0,
-       0,    45,    46,   297,   298,   299,   300,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,     0,     0,    26,    27,    28,
-       0,     0,   258,     0,   283,   284,    31,   285,     0,    45,
-      46,     0,     0,     0,     0,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,   286,    34,    26,    27,    28,     0,   287,
-       0,    38,    39,   288,    31,     0,   289,   290,   291,   292,
-      41,    42,     0,   293,   294,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    34,     0,     0,     0,   295,     0,   158,    38,
-      39,     0,     0,     0,     0,    45,    46,   297,   298,   299,
-     300,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,     0,
-       0,    26,    27,    28,     0,     0,   158,     0,   283,   284,
-      31,   285,     0,    45,    46,     0,     0,     0,     0,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,   286,    34,    26,
-      27,    28,     0,   287,     0,    38,    39,   288,    31,     0,
-     289,   290,   291,   292,    41,    42,     0,   293,   294,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    34,     0,     0,     0,
-     295,     0,   592,   208,    39,     0,     0,     0,     0,    45,
-      46,   297,   298,   299,   300,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,     0,     0,    26,    27,    28,     0,     0,
-     271,     0,   283,   284,    31,   285,     0,    45,    46,     0,
-       0,     0,     0,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,   286,    34,    26,    27,    28,     0,   287,     0,    38,
-      39,   288,    31,     0,   289,   290,   291,   292,    41,    42,
-       0,   293,   294,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      34,     0,     0,     0,   295,     0,   379,    38,    39,     0,
-       0,     0,     0,    45,    46,   297,   298,   299,   300,   467,
-       2,   207,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,   338,     0,    26,    27,    28,     0,
-       0,    45,    46,     0,     0,    31,     0,     0,     0,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,  -294,     0,    26,
-      27,    28,     0,    34,     0,    35,     0,    36,    31,     0,
-      38,    39,     0,     0,     0,     0,     0,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,  -294,    34,    26,    27,    28,
-       0,    37,     0,   336,   337,    40,    31,  -294,     0,     0,
-      -3,     0,    41,    42,     0,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,     0,    34,    26,    27,    28,   634,    37,
-     338,   336,   337,    40,    31,  -294,     0,    45,    46,     0,
-      41,    42,     0,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,     0,    34,    26,    27,    28,     0,    37,   338,    38,
-      39,    40,    31,     0,     0,    45,    46,     0,    41,    42,
-       0,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,     0,
-      34,    26,    27,    28,    43,    37,    44,   208,    39,    40,
-      31,     0,     0,    45,    46,     0,    41,    42,     0,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,     0,    34,    26,
-      27,    28,    43,    37,   271,   336,   337,    40,    31,   685,
-       0,    45,    46,     0,    41,    42,     0,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,  -294,    34,    26,    27,    28,
-     634,     0,   338,    38,    39,     0,    31,     0,     0,    45,
-      46,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    34,     0,     0,     0,     0,     0,
-     686,    38,    39,     0,   687,  -294,     0,    45,    46,     0,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,     0,     0,
-      26,    27,    28,     0,     0,     0,     0,     0,   338,    31,
-     685,     0,     0,     0,     0,    45,    46,     0,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,     0,    34,    26,    27,
-      28,     0,     0,     0,    38,    39,     0,    31,   685,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,     0,     0,    26,
-      27,    28,     0,     0,     0,    34,     0,     0,    31,     0,
-       0,   686,    38,    39,     0,  1099,     0,     0,    45,    46,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    34,     0,     0,     0,
-       0,     0,     0,    38,    39,     0,     0,     0,     0,   686,
-       0,     0,     0,  1231,     0,     0,    45,    46,     0,     0,
-       0,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,     0,
-     686,    26,    27,    28,     0,     0,     0,    45,    46,     0,
-      31,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,     0,
-       0,    26,    27,    28,     0,     0,     0,     0,    34,     0,
-      31,     0,     0,     0,     0,    38,    39,     0,     0,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,     0,    34,    26,
-      27,    28,   485,   486,   487,    38,    39,     0,    31,     0,
-       0,     0,   592,     0,     0,     0,     0,     0,     0,    45,
-      46,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    34,     0,     0,     0,
-       0,     0,    44,    38,    39,     0,     0,     0,     0,    45,
-      46,     2,   207,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,     0,     0,    26,    27,    28,
-       0,     0,     0,     0,     0,     0,    31,     0,   283,   284,
-       0,   285,  1049,     0,  1050,     0,     0,  1051,  1052,  1053,
-    1054,  1055,  1056,  1057,  1058,     0,     0,  1547,  1059,     0,
-       0,     0,  1060,  1061,    34,    33,    35,   286,    36,     0,
-       0,    38,    39,  1062,     0,     0,     0,   288,     0,     0,
-     289,   290,   291,   292,    41,    42,     0,   293,   294,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  -415,     0,     0,
-     295,     0,   379,     0,     0,   172,     0,     0,     0,    45,
-      46,   297,   298,   299,   300,     0,     0,     0,     0,  1064,
-       0,   283,   284,  -129,   285,  1049,     0,  1050,     0,     0,
-    1051,  1052,  1053,  1054,  1055,  1056,  1057,  1058,     0,     0,
-       0,  1059,     0,     0,     0,  1060,  1061,     0,    33,     0,
-     286,     0,     0,     0,     0,     0,  1062,     0,     0,     0,
-     288,     0,     0,   289,   290,   291,   292,    41,    42,     0,
-     293,   294,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   295,     0,   379,     0,     0,   172,     0,
-       0,     0,    45,    46,   297,   298,   299,   300,     0,     0,
-       0,     0,  1064,     0,     0,     0,  -129,     2,   207,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,     0,     0,    26,    27,    28,     0,     0,     0,     0,
-       0,     0,    31,     0,   283,   284,     0,   285,  1049,     0,
-    1050,  1417,  1418,  1051,  1052,  1053,  1054,  1055,  1056,  1057,
-    1058,     0,     0,  1547,  1059,     0,     0,     0,  1060,  1061,
-      34,    33,    35,   286,    36,     0,     0,    38,    39,  1062,
-       0,     0,     0,   288,     0,     0,   289,   290,   291,   292,
-      41,    42,     0,   293,   294,     0,     0,     0,     0,  1325,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   295,     0,   379,     0,
-       0,   172,     0,     0,     0,    45,    46,   297,   298,   299,
-     300,     0,     0,   283,   284,  1064,   285,  1049,     0,  1050,
-    1417,  1418,  1051,  1052,  1053,  1054,  1055,  1056,  1057,  1058,
-       0,     0,     0,  1059,     0,     0,     0,  1060,  1061,     0,
-      33,     0,   286,     0,     0,     0,     0,     0,  1062,     0,
-       0,     0,   288,     0,     0,   289,   290,   291,   292,    41,
-      42,     0,   293,   294,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   295,     0,   379,     0,     0,
-     172,     0,     0,     0,    45,    46,   297,   298,   299,   300,
-       0,     0,   283,   284,  1064,   285,  1049,     0,  1050,     0,
-       0,  1051,  1052,  1053,  1054,  1055,  1056,  1057,  1058,     0,
-       0,     0,  1059,     0,     0,     0,  1060,  1061,     0,    33,
-       0,   286,     0,     0,     0,     0,     0,  1062,     0,     0,
-       0,   288,     0,     0,   289,   290,   291,   292,    41,    42,
-       0,   293,   294,     0,     0,     0,     0,     0,     0,     0,
-     283,   284,     0,   285,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   295,     0,   379,     0,     0,   172,
-       0,     0,     0,    45,    46,   297,   298,   299,   300,   286,
-       0,     0,     0,  1064,     0,   287,     0,     0,     0,   288,
-       0,     0,   289,   290,   291,   292,    41,    42,     0,   293,
-     294,     0,     0,     0,     0,     0,     0,     0,   283,   284,
-       0,   285,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   295,     0,   379,     0,     0,   283,   284,     0,
-     285,   344,    46,   297,   298,   299,   300,   286,     0,     0,
-       0,     0,     0,   287,     0,     0,     0,   288,     0,     0,
-     289,   290,   291,   292,    41,    42,   286,   293,   294,     0,
-       0,     0,   287,     0,     0,     0,   288,     0,     0,   289,
-     290,   291,   292,    41,    42,     0,   293,   294,     0,     0,
-     506,     0,     0,     0,     0,   283,   284,     0,   285,    45,
-      46,   297,   298,   299,   300,     0,     0,     0,     0,   295,
-       0,     0,     0,     0,   283,   284,     0,   285,    45,    46,
-     297,   298,   299,   300,   286,     0,     0,     0,     0,     0,
-     287,     0,     0,     0,   288,     0,     0,   289,   290,   291,
-     292,    41,    42,   286,   293,   294,     0,     0,     0,   287,
-       0,     0,     0,   288,     0,     0,   289,   290,   291,   292,
-      41,    42,     0,   293,   294,     0,     0,   511,     0,     0,
-       0,     0,     0,     0,     0,     0,    45,    46,   297,   298,
-     299,   300,     0,     0,     0,     0,   514,     0,     0,     0,
-       0,     0,     0,     0,     0,    45,    46,   297,   298,   299,
-     300,     2,   207,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    31,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    34,     0,    35,     0,    36,    37,
-       0,   175,   176,    40,     0,     0,     0,     0,     0,     0,
-      41,    42,   206,     2,   207,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,     0,     0,    26,
-      27,    28,     0,     0,     0,     0,     0,     0,    31,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    34,     0,    35,     0,
-      36,     0,     0,   208,    39,   467,     2,   207,     4,     5,
+       0,    36,     0,     0,    38,    39,     2,   206,     4,     5,
        6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
       16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
@@ -2882 +2392 @@
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,    34,
-       0,    35,     0,    36,     0,     0,    38,    39,     2,   207,
-       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,     0,     0,    26,    27,    28,     0,     0,     0,
-       0,     0,     0,    31,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    34,     0,    35,     0,    36,     0,     0,   208,    39
+       0,    35,     0,    36,     0,     0,   207,    39
 };
-
-#define yypact_value_is_default(yystate) \
-  ((yystate) == (-1315))
-
-#define yytable_value_is_error(yytable_value) \
-  YYID (0)
 
 static const yytype_int16 yycheck[] =
 {
-       0,     1,   240,   186,   205,     0,   734,     0,    43,    43,
-      43,   534,   752,   186,     1,   752,   752,   187,   106,   186,
-     117,   280,   169,   170,   513,   364,   349,   186,   220,   368,
-     186,   349,    32,   186,   620,   186,   991,    32,  1029,    32,
-     521,   345,   602,    43,   187,   879,   984,   759,   647,    49,
-     492,   418,     0,     0,   496,   879,    49,   600,   188,   571,
-     602,    43,   600,    63,   600,   600,    66,    32,   156,    69,
-      63,   438,   600,    66,   600,   282,    69,   693,    49,   446,
-     600,    72,    69,   266,    32,    32,  1041,   696,    39,  1335,
-     634,   635,   636,   266,   426,   427,    57,   267,    43,   266,
-    1028,  1029,     0,  1417,    43,   202,   106,   266,  1048,   653,
-     266,  1060,  1061,   266,   114,   266,    39,   117,   118,   603,
-      72,   635,   636,   482,   267,   609,    39,    51,    95,    44,
-      45,    85,   262,   263,    32,   229,    39,    96,    64,   653,
-      28,   132,    39,   114,    63,    72,   107,   147,   148,   110,
-     257,   186,   186,   186,   248,   148,   156,   157,   109,   113,
-     111,   161,   494,   130,   123,   488,   118,   711,   161,   110,
-     910,    82,    39,   910,   910,   116,   147,  1491,   482,    44,
-      45,   513,    82,   109,   719,   109,   186,   187,   111,  1138,
-      78,   719,  1438,   719,   187,   156,   109,   711,   111,   490,
-     115,    30,   202,    82,   186,   132,   109,   688,   111,    72,
-     210,   111,   109,   132,   111,  1123,    82,   210,   410,  1127,
-      83,    84,   222,    72,  1048,    74,    75,   107,    82,   222,
-      11,   266,   266,   266,    83,    84,   406,    82,   117,   210,
-     240,   186,   109,   109,   111,  1236,   578,   186,   111,   114,
-     589,   131,   252,   341,    83,    84,   110,   252,   219,   252,
-     260,   805,   111,   406,   109,   265,   266,   267,   828,   240,
-       1,  1473,   272,   816,   267,   634,   635,   636,   816,  1421,
-     816,   816,   994,   371,   602,   797,   828,   252,   816,   905,
-     816,   805,   631,    96,   653,   295,   816,   504,  1289,   396,
-     109,   272,   911,   109,   252,   252,  1508,   307,  1510,   257,
-     480,   418,   273,   604,  1252,   682,   620,   608,    49,   280,
-     123,   625,   131,   323,  1524,    44,    45,   424,   328,  1057,
-     929,   438,   116,   430,   818,   328,   307,   480,   629,   446,
-    1494,   341,   633,   109,  1544,   345,  1500,   956,   132,   349,
-     350,  1551,   711,    39,   252,    90,    91,   285,    72,   257,
-    1288,  1289,  1302,  1524,   364,    82,   109,  1521,   368,    83,
-      84,   371,  1526,    72,   345,   106,   112,  1519,   938,   307,
-     308,    57,  1524,   114,    83,    84,   114,   348,  1222,   748,
-    1551,   126,   127,   110,   937,   114,   396,   111,  1222,   937,
-     117,   937,  1544,   110,   365,   110,   406,   110,   369,  1551,
-     117,   116,   111,   406,   117,   244,   147,   345,   116,   115,
-     116,  1007,  1413,     3,   424,   156,   426,   427,   131,   116,
-     430,   107,   116,   433,   110,   131,   116,   525,    10,    11,
-      12,    13,    14,     3,   748,   132,   805,    72,   132,     0,
-    1405,  1406,   132,   381,   454,   426,   427,   118,    83,    84,
-     667,   116,   110,   124,   125,     0,     1,    39,   807,   117,
-     418,   432,   472,   812,   733,   206,   116,   132,  1302,   210,
-     480,    32,   482,   116,   484,  1413,   111,   480,   488,   484,
-     438,   484,   132,   974,   494,    67,   116,    32,   446,   132,
-     989,   648,   116,   116,   946,   828,   506,     0,   508,   240,
-     828,   511,   132,   513,   514,    66,  1125,     0,   688,   132,
-     418,   521,  1462,   494,   112,   525,   526,   657,   116,  1469,
-     737,    66,  1016,  1017,    69,   109,   484,   484,  1137,   116,
-     438,   272,   513,   219,   275,   688,   131,  1107,   446,   110,
-     909,   380,   116,   116,    72,   132,    74,    75,   655,   850,
-     110,    72,   901,   109,   295,    83,    84,   116,   132,   132,
-     570,   571,    83,    84,  1302,   682,   307,   109,   578,  1188,
-    1189,   112,  1522,   132,   482,   116,   484,   116,   112,   589,
-     590,   109,   116,    80,   594,   590,   114,   273,   109,   109,
-     600,   708,   602,   132,   280,   909,   109,   578,   111,   109,
-     341,    80,  1093,   109,   345,   118,   119,  1098,   109,   942,
-     620,   549,   550,   551,   111,   625,   113,   627,   589,   110,
-     117,   631,   110,   364,   634,   635,   636,   368,  1462,   112,
-     371,   112,   111,   116,   113,  1469,    72,   110,   117,   620,
-     110,  1379,   943,   653,   625,   655,   116,    83,    84,   747,
-     621,   110,   491,    72,   493,    74,    75,   116,   129,  1028,
-     131,   222,   348,   865,    83,    84,   637,   110,    66,     4,
-       5,     6,     7,     8,     9,   685,   110,   222,   688,   365,
-     109,   652,   116,   369,   886,   426,   427,   109,  1522,   111,
-     109,   252,   112,  1007,   109,   114,   116,     0,     1,   110,
-     948,   711,   712,   713,   109,   116,   110,   252,   115,   719,
-     720,   132,   116,   454,   871,   295,   110,   910,    64,   110,
-     118,   109,   116,   111,   682,   116,   467,   910,  1466,    32,
-    1468,   109,   912,   910,    69,   109,    71,   747,   748,   110,
-     110,   910,   752,   753,   910,   116,   116,   910,   112,   910,
-     708,   492,   110,   494,   110,   496,   112,   132,   116,   912,
-     116,   114,   733,   161,   114,   506,    69,   508,   109,   110,
-     511,   110,   513,   514,   682,   131,   132,   116,  1528,   109,
-    1399,  1528,  1528,  1132,   525,  1523,  1319,   797,  1157,   350,
-     110,   556,   557,   558,   559,   805,   116,   807,  1417,   809,
-     708,   132,   812,   813,   643,   109,   816,   111,   813,  1020,
-     908,   110,   114,   110,   118,   119,    70,   116,   828,   116,
-      74,   759,   110,    77,   222,    79,   132,    72,   116,    74,
-      75,    76,    86,    72,    82,    74,    75,   578,    83,    84,
-     748,   120,   121,  1157,    83,    84,   426,   427,   589,    72,
-     109,    74,    75,   692,    72,   694,    74,    75,    76,   698,
-      83,    84,   260,   109,   109,    83,    84,   265,   109,   879,
-     111,  1490,  1491,    82,   879,   114,   110,   118,   119,   620,
-     112,   109,   116,   111,   625,    72,  1043,    74,    75,    76,
-     631,   901,   109,   110,   111,    49,    83,    84,   908,   909,
-     910,   109,   912,   111,   119,    72,  1123,    74,    75,    76,
-    1127,  1128,   473,  1093,   924,   128,    83,    84,  1098,  1288,
-      94,   879,  1236,   484,    88,    89,   506,   937,   938,   129,
-     901,   511,   942,   131,   514,   621,   111,   947,   948,   484,
-    1093,   109,   109,   111,   685,  1098,   109,     0,     1,   252,
-     947,   637,   350,   506,   964,   508,   112,   110,   511,   213,
-     114,   514,   109,   116,   974,   110,   652,   948,   109,   110,
-     111,   879,    92,    93,    72,    49,    29,    30,    76,    32,
-     112,   109,   723,   111,   110,    83,    84,   567,   112,    63,
-      43,   109,    66,   111,   110,    69,    49,  1007,   109,   110,
-     111,   909,   110,    72,    57,   110,   747,    76,  1115,   110,
-      63,   109,  1503,    66,    83,    84,    69,   109,  1028,  1029,
-     118,   119,   109,   110,   111,   109,  1007,   111,   111,  1246,
-      83,    84,   871,   431,    58,    59,    60,   112,  1048,   878,
-     109,   114,   111,  1048,    85,    86,    87,   733,   116,   118,
-     119,  1261,  1262,  1263,   107,   131,   210,   110,   109,   114,
-     111,   622,  1553,   915,   117,   917,   807,   114,   109,  1007,
-     111,   812,   113,   114,   148,   473,   115,   116,  1088,   109,
-     919,   116,   117,  1093,   110,   111,   117,   161,  1098,   112,
-    1048,    58,    59,   115,   116,   148,   110,  1107,   352,   110,
-     354,   116,   117,   156,   112,  1115,   116,   117,   161,   112,
-    1048,    44,    45,   187,   552,   553,   560,   561,   272,  1336,
-    1218,   112,  1132,  1340,   554,   555,   112,     4,     5,     6,
-       7,     8,     9,   186,   187,   117,   210,   117,   699,   978,
-    1048,   295,   116,    29,    85,    86,    87,  1157,   222,   202,
-     110,   110,   713,   307,   112,   112,   132,   210,   114,   110,
-     901,   115,   115,   115,   110,   109,   219,   908,   109,   222,
-     111,   116,   113,   114,   110,   110,   229,   116,   110,   117,
-     110,   484,   110,   924,   110,   116,   110,   110,   442,  1199,
-    1200,   244,    69,   110,    71,   248,   594,   110,   110,   252,
-     253,   110,     0,  1200,   110,   946,   947,   948,  1218,   110,
-     110,   110,  1222,   266,   267,   110,   110,  1222,   115,    29,
-     273,   131,   110,   116,   622,  1442,  1236,   280,   117,   627,
-    1240,   112,   112,   116,    32,   110,   110,   110,   117,   117,
-    1079,   112,   112,  1240,   116,    43,   114,  1218,   809,  1157,
-     110,    49,   110,   110,   328,   132,     4,     5,     6,     7,
-       8,     9,   116,   110,  1222,    63,  1007,   116,    66,   110,
-     116,    69,   110,   112,   109,   328,   109,   109,  1288,  1289,
-     109,   109,   112,   110,   132,    33,   110,  1297,  1395,   115,
-    1538,   110,  1302,   115,    72,   348,   349,  1302,    76,   115,
-     454,   699,   114,   112,   129,    83,    84,    10,    11,    12,
-      13,    14,   365,   110,  1222,   713,   369,   132,   879,   112,
-     116,    69,   116,    71,   112,  1335,   110,   380,  1236,   110,
-     110,   109,   406,   112,   879,  1528,    39,   112,  1335,   112,
-     118,   119,   110,   396,  1302,  1528,   112,  1088,   112,  1529,
-     148,  1528,   506,   406,   508,   112,  1195,   511,    47,  1528,
-     514,   132,  1528,   161,    67,  1528,   115,  1528,   110,   132,
-     132,   424,   132,  1553,   132,   115,  1529,   430,   117,   432,
-     110,   879,   115,   112,    66,  1395,   112,   112,   186,   187,
-     112,  1132,   112,   112,  1302,   112,  1503,   112,   110,   110,
-    1553,    83,   947,  1413,   112,   112,   109,   109,   111,   109,
-     109,   809,   210,    60,   467,   118,   119,   110,   110,   472,
-     114,   117,   132,  1394,   222,   112,   112,   480,  1438,   110,
-      96,   484,   112,   110,    96,   488,   118,     3,   491,   109,
-     493,  1438,   109,   115,    10,    11,    12,    13,    14,  1010,
-     110,   112,  1462,   132,   252,   110,   110,  1462,   110,  1469,
-     513,  1471,    42,  1473,  1469,   116,   110,   117,   266,   132,
-     110,    96,    96,    39,   132,   528,   132,  1218,   531,   161,
-     533,   534,   110,  1528,  1528,  1528,   132,  1048,   117,   110,
-     132,   110,   110,  1503,   132,   115,   112,   112,  1508,  1240,
-    1510,    67,   109,  1048,  1462,   132,   115,   115,   110,   110,
-     132,  1469,  1522,   110,   110,  1064,   562,  1522,  1528,  1529,
-     563,   565,   564,  1222,  1491,  1381,  1529,  1563,  1538,   582,
-     328,   685,   566,  1312,  1128,  1340,   589,  1469,   917,  1079,
-     222,   685,   685,  1553,  1098,    66,   698,   600,   925,   602,
-    1553,   349,   978,  1051,  1462,    76,   871,  1538,   649,   944,
-    1240,  1469,   582,   723,  1522,   484,   570,   733,   621,   570,
-      72,   570,    74,    75,    76,    -1,   879,    -1,   260,    -1,
-      -1,    83,    84,   265,   637,    -1,    -1,    -1,    -1,    -1,
-     643,    -1,    -1,    -1,  1335,    -1,    -1,   118,    -1,   652,
-      -1,   654,   655,   656,    -1,    -1,    -1,   109,   406,   111,
-      -1,    -1,  1010,    -1,  1522,   117,   118,   119,    -1,    -1,
-      -1,  1201,  1202,    -1,  1204,     0,     1,    -1,    -1,    -1,
-      -1,  1211,    -1,  1213,    -1,   688,    -1,    -1,  1199,   692,
-     161,   694,    -1,    -1,   947,   698,    -1,    10,    11,    12,
-      13,    14,    -1,   706,  1199,  1200,    -1,    32,    -1,    -1,
-      -1,  1222,     3,    -1,    -1,    -1,   719,   720,   350,    10,
-      11,    12,    13,    14,    49,    -1,    39,  1222,    -1,    -1,
-     733,    72,    -1,    74,    75,    76,   484,    -1,    -1,    -1,
-     488,    -1,    83,    84,    69,  1240,    -1,  1438,    39,    -1,
-      -1,   222,    -1,    -1,    67,    -1,    -1,    -1,  1394,    72,
-      -1,    74,    75,    76,    -1,     0,    -1,    -1,   109,    -1,
-      83,    84,    -1,    -1,  1222,    -1,    67,   118,   119,    -1,
-    1471,   106,  1473,    -1,    -1,    -1,  1297,    -1,    -1,   260,
-      -1,  1302,    55,    -1,   265,  1048,   109,    32,   111,   431,
-      -1,    -1,  1297,    -1,    -1,   118,   119,  1302,    -1,   280,
-      -1,    -1,    -1,   816,    -1,    -1,    -1,  1508,    -1,  1510,
-     924,    -1,    -1,   148,    -1,   828,    72,    -1,    74,    75,
-      76,   156,   157,    -1,    69,    98,    -1,    83,    84,    -1,
-    1335,   473,    -1,    -1,    -1,  1375,    -1,  1538,    -1,    -1,
-       3,  1199,   600,    -1,   602,    -1,    -1,    10,    11,    12,
-      13,    14,   187,   109,    -1,   111,    -1,    -1,   871,    -1,
-    1318,    -1,   118,   119,    -1,   878,    -1,   202,    -1,   350,
-     205,   206,    -1,    -1,   464,   210,    39,    -1,    -1,    72,
-      -1,    74,    75,    76,    -1,    -1,    -1,    -1,   901,    -1,
-      83,    84,   464,    -1,    -1,    -1,   231,   910,    -1,   912,
-     235,    -1,   237,    -1,    67,    -1,   919,    -1,    -1,    -1,
-      -1,   246,   157,    -1,    -1,  1373,   109,   252,  1376,    -1,
-      -1,   194,   257,    -1,    -1,   118,   119,    -1,    -1,   942,
-     688,    -1,   267,  1438,    -1,    -1,    -1,  1200,    -1,  1297,
-     275,  1462,    -1,    -1,   217,    -1,    -1,    -1,  1469,   962,
-     431,    -1,   594,    -1,   227,    -1,    -1,  1462,    -1,  1222,
-      -1,   719,   720,  1421,  1469,   978,    -1,   448,  1426,    -1,
-      -1,    -1,    -1,   986,  1088,    -1,   989,  1240,   991,    -1,
-     622,    -1,    -1,    -1,    -1,   627,   231,    -1,    -1,    -1,
-      -1,    -1,   473,    -1,    -1,    -1,    -1,    -1,  1456,    -1,
-      -1,  1522,    -1,    -1,    -1,    -1,   341,   252,    -1,    -1,
-     345,    -1,   257,    -1,    -1,    -1,   351,  1522,    -1,    -1,
-      -1,    -1,   295,    -1,    -1,    -1,    -1,    -1,  1041,   364,
-      -1,    -1,    -1,   368,    -1,    -1,   371,    -1,    -1,  1302,
-      -1,    26,    27,    28,    -1,    -1,    -1,    -1,    -1,    72,
-      -1,    74,    75,    76,    -1,    -1,    -1,   699,   816,    -1,
-      83,    84,    -1,    -1,    -1,    -1,  1079,    -1,    -1,    -1,
-     828,   713,  1335,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1093,   671,    -1,   418,  1542,  1098,   109,     0,   111,    -1,
-    1548,    -1,    -1,    -1,    -1,   118,   119,    -1,   433,   671,
-      -1,  1559,  1115,   438,    -1,  1563,   351,    -1,    -1,    -1,
-      -1,   446,    -1,   594,    99,    -1,   101,    -1,    -1,    32,
-      -1,    10,    11,    12,    13,    14,    -1,    -1,    -1,   464,
-      -1,    -1,   467,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   622,    -1,    -1,    -1,    -1,   627,   482,    -1,   484,
-      39,    -1,   910,    -1,   912,    -1,    69,   492,    -1,    -1,
-      -1,   496,    -1,    -1,    -1,    -1,    -1,   809,    -1,    -1,
-     443,    -1,    -1,   418,    -1,  1438,    -1,     0,    67,    -1,
-      -1,    -1,  1195,    72,   942,    74,    75,    76,   433,    -1,
-     525,   526,    -1,   438,    83,    84,   469,   182,    -1,  1462,
-      -1,   446,    -1,   793,    -1,  1218,  1469,   192,   193,    32,
-      -1,    -1,   197,   803,   199,   200,    -1,    -1,   699,   464,
-     109,   793,   111,    -1,    -1,    -1,    -1,   817,    -1,   118,
-     119,   803,   713,   506,    -1,    -1,   571,   482,   511,   484,
-      -1,   514,    -1,    -1,   157,   817,    69,    -1,  1261,  1262,
-    1263,    -1,   733,    -1,   589,   590,    -1,    -1,    -1,  1522,
-      -1,    -1,    10,    11,    12,    13,    14,   602,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    10,    11,    12,    13,    14,
-      -1,   526,    -1,    -1,    -1,   620,    -1,   190,    -1,    -1,
-     625,    39,    -1,    -1,   197,    -1,   631,    -1,    -1,   634,
-     635,   636,    -1,    -1,    39,    -1,  1319,    -1,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   653,    67,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   696,   809,    -1,
-      -1,    -1,    67,    -1,   157,  1093,   671,    72,    -1,   252,
-    1098,    76,   131,    -1,   257,   590,    -1,   682,    83,    84,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1471,    -1,  1473,
-      -1,   109,    -1,   111,    -1,    -1,   269,    -1,  1010,    -1,
-     118,   119,    -1,   708,   109,    -1,   711,    -1,    -1,    -1,
-      -1,  1394,  1395,   118,   119,   720,    -1,    -1,   723,   634,
-     635,   636,  1405,  1406,  1508,    -1,  1510,   670,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   679,    -1,   653,    -1,
-     683,    -1,   747,   748,    -1,    -1,    -1,    -1,   753,    -1,
-     323,   790,    -1,    -1,    -1,    -1,   671,    -1,   331,   252,
-    1443,   334,    -1,    -1,   257,  1025,  1026,   682,   351,    -1,
+       0,     1,    43,    43,   185,   185,   204,     0,    43,     1,
+     185,   239,   105,   185,   520,   533,   116,   187,   748,     0,
+       1,   748,   185,   168,   169,   748,   732,   185,     0,     1,
+     512,   186,    32,   344,   645,   185,   219,  1020,   601,    32,
+     156,   602,   256,    43,   873,   873,    57,   608,   491,    49,
+       0,    32,   495,   755,   691,   348,    49,   619,    72,   601,
+      32,   489,   155,    63,   348,    32,    66,  1320,   599,    69,
+      63,   570,   982,    66,   599,    72,    69,    69,   281,    82,
+      43,  1397,    32,    72,   265,   265,   599,  1039,    69,    63,
+     265,   261,   262,   265,    66,   106,    43,    69,   109,   599,
+      43,   201,   265,   425,   426,   105,    82,   265,   599,   599,
+      51,   266,    39,   113,   599,   265,   116,   117,   132,    39,
+      39,     0,  1032,   417,   634,   635,    28,     0,   117,     0,
+    1019,  1020,   109,    39,   110,   132,   363,     0,  1051,  1052,
+     367,   651,   107,   437,   185,   185,   146,   147,    39,    82,
+     185,   445,  1468,    32,   147,   155,   156,   186,   132,    32,
+     160,    32,   114,    39,    39,  1418,   131,   160,   109,    32,
+     481,   493,    43,     1,   904,   603,    78,   904,    49,   607,
+     686,   904,   109,   228,   111,   185,   186,    44,    45,   109,
+     512,   111,    63,   186,   487,    66,   156,   130,    69,   709,
+     628,   201,   247,   417,   632,   111,    95,   218,    49,   209,
+    1039,    44,    45,   109,  1127,    82,   209,   717,   109,  1500,
+     111,   221,   185,   437,   265,   265,   409,   717,   221,    64,
+     265,   445,   717,   109,   109,   111,   111,   266,   185,   239,
+     129,  1224,   185,   694,   111,    55,  1527,   340,    82,   221,
+     405,   251,   813,   109,   110,   577,   109,   114,   251,   259,
+     823,   272,   899,   112,   264,   265,   266,   116,   279,   116,
+     251,   271,   113,   266,   109,   109,   147,   370,   131,   251,
+     811,   823,   115,   985,   251,   132,   811,    97,    11,   160,
+     800,  1274,    96,   792,   294,   395,     0,    82,   811,   112,
+     503,   251,  1401,    44,    45,   146,   306,   294,   619,    85,
+     109,   811,   923,   624,   185,   186,   432,   601,   122,    72,
+     811,   811,   322,   423,   479,   110,   811,   327,    32,   429,
+      83,    84,   110,  1471,   327,  1287,   347,   113,   209,  1477,
+     340,   111,  1048,   113,   344,   130,     3,    82,   348,   349,
+     221,   116,   130,   364,    72,   110,  1451,   368,   111,  1497,
+     130,   588,    66,   363,  1502,    83,    84,   367,   209,   932,
+     370,    96,   251,   114,   109,   130,   405,   256,   251,     3,
+     251,  1210,  1210,   193,  1273,  1274,   680,   109,   251,   111,
+    1485,   109,  1487,   256,   265,   395,  1495,   122,   239,   116,
+     931,  1500,    72,   630,   116,   405,   216,    90,    91,   525,
+    1393,   116,   405,    83,    84,   132,   226,   845,   931,   116,
+     132,  1520,     0,   423,   252,   425,   426,    49,  1527,   429,
+     271,   524,   432,   744,   128,   132,   998,   131,   425,   426,
+     931,   111,   125,   126,   119,   120,  1007,  1008,   116,   116,
+     479,   116,   131,   453,   905,   109,   327,    72,  1287,   111,
+     966,   113,   665,   130,   132,   306,   680,   132,    83,    84,
+     112,   471,   432,   589,   116,  1385,  1386,   348,   130,   479,
+     116,   481,   109,   483,   294,   655,   479,   487,  1440,     0,
+     483,   113,   706,   493,   130,  1447,   111,   940,   980,   950,
+     116,   646,   483,   344,  1393,   505,   116,   507,   109,   937,
+     510,   483,   512,   513,   130,  1126,    72,   221,   505,   109,
+     520,   481,   132,   510,   524,   525,   513,    83,    84,   109,
+     823,   686,   735,   483,   405,  1098,  1500,   109,   417,   823,
+       4,     5,     6,     7,     8,     9,  1498,   251,   116,    72,
+     110,    74,    75,   653,   417,   111,  1520,   116,   437,   109,
+      83,    84,   110,  1527,   132,   525,   445,   112,   116,   569,
+     570,   116,   112,   132,   437,   802,   116,   577,  1084,   566,
+     807,  1287,   445,  1089,   425,   426,   109,   209,   588,   589,
+     116,   114,   903,   593,   110,    88,    89,   116,   116,   599,
+     116,   601,   481,   110,   483,    69,   132,    71,   110,   620,
+     483,  1440,   483,   132,   132,   110,   487,   112,  1447,   619,
+     483,   116,   112,   112,   624,   636,   626,   116,   116,   589,
+     630,   116,   442,   633,   634,   635,   131,   132,   466,   650,
+      66,   110,  1114,   936,   132,   349,  1118,   132,    72,   271,
+     743,   651,   493,   653,   110,  1361,    82,   686,   468,    83,
+      84,   109,   110,   111,    72,  1116,    74,    75,   895,  1498,
+     110,   512,   294,    92,    93,    83,    84,   860,    10,    11,
+      12,    13,    14,   683,   306,   115,   686,   998,   110,   109,
+      57,   117,   808,   109,   116,   505,   110,   880,   694,   527,
+     510,   109,   116,   513,   532,   109,   114,    39,   109,   709,
+     710,   711,    64,   110,   942,   132,   589,   717,   718,   116,
+     731,   866,   109,   904,   904,  1176,  1177,   110,   599,   904,
+     601,   110,   904,   116,   160,    67,   577,   116,  1444,   106,
+    1446,   904,   109,   743,   744,   109,   904,   111,   748,   749,
+     110,   906,   132,   581,   904,    72,   116,    74,    75,   115,
+     116,    10,    11,    12,    13,    14,    83,    84,   472,   117,
+      85,    86,    87,   112,  1504,   123,   124,  1504,   619,   483,
+     109,  1504,   111,   624,   744,   110,  1304,   114,   155,   785,
+      39,   116,   792,  1499,   109,   221,   111,   114,   113,   114,
+     800,   680,   802,   109,   804,   111,   114,   807,   808,   902,
+     110,   811,   109,  1011,   111,   686,   116,   680,    67,   110,
+     117,   118,   110,   823,   652,   116,   654,   706,   116,   132,
+     109,   453,   111,   259,  1145,    85,    86,    87,   264,   132,
+     109,    72,   111,   706,   110,    76,   717,   718,   808,   110,
+     116,   218,    83,    84,   109,   116,   111,   114,   668,   109,
+     109,   111,   111,   113,   114,   744,   862,   677,   117,   118,
+      66,   681,   109,   873,   111,   110,   704,   906,   109,   109,
+     111,   116,    82,   505,   110,   507,   117,   118,   510,  1034,
+     116,   513,   873,   110,  1121,   895,     0,     1,   109,   116,
+     111,   873,   902,   903,   904,   272,   906,   112,   110,   905,
+     109,  1114,   279,  1224,   116,  1118,  1119,   621,   918,   110,
+     111,   117,   109,   349,    82,    29,    30,   110,    32,  1084,
+    1381,   931,   932,   116,  1089,   808,   936,    58,    59,    43,
+     811,   941,   942,   903,   118,    49,  1397,   127,   109,   941,
+     111,   128,   823,    57,   950,    94,   117,   118,   131,    63,
+     941,   909,    66,   911,   160,    69,   966,   111,   109,   941,
+     111,   109,   110,   111,  1480,   109,   117,   118,    82,    83,
+     347,   109,     4,     5,     6,     7,     8,     9,   112,   985,
+     109,   110,   111,   697,   873,   115,   116,   364,   998,   112,
+     873,   368,   106,   112,   430,   109,  1106,   711,    44,    45,
+     873,   110,   116,   505,   110,   507,  1467,  1468,   510,  1019,
+    1020,   513,   110,  1529,   903,   221,   109,   110,   111,     1,
+     110,  1234,   110,   904,   110,   906,  1247,  1248,  1249,  1039,
+    1036,   109,    72,   147,    74,    75,   472,    69,   112,    71,
+     111,   155,   114,    83,    84,  1084,   160,   116,  1039,  1019,
+    1089,   683,   131,   259,   431,   936,   114,  1039,   264,   114,
+       4,     5,     6,     7,     8,     9,   109,    49,   112,  1079,
+     112,   185,   186,   110,  1084,   551,   552,   897,   112,  1089,
+     553,   554,    72,   110,    74,    75,    76,   201,  1098,    33,
+     804,   942,   112,    83,    84,   209,  1106,    58,    59,    60,
+     132,   112,   130,  1206,   218,   559,   560,   221,  1321,    72,
+    1116,  1121,  1325,    76,   228,   130,   130,   116,   956,   109,
+      83,    84,    29,   105,   110,    69,   110,    71,   115,   243,
+     115,   113,   112,   247,   110,  1145,   114,   251,   252,   112,
+     978,   115,   109,   349,   982,   116,   109,   998,   110,   132,
+    1039,   265,   266,   110,   117,   118,  1039,   593,   272,   873,
+     555,   556,   557,   558,   146,   279,  1039,   116,   110,   110,
+    1176,  1177,   110,   155,   110,  1145,   116,  1187,  1188,   110,
+     110,   110,   110,   110,   110,   621,  1188,   110,   110,   110,
+     626,   110,  1189,  1190,  1032,  1192,  1206,  1188,   110,   110,
+    1210,   110,  1199,  1084,  1201,  1187,  1188,   115,  1089,  1422,
+      29,   588,   130,   327,  1224,   131,   110,   116,  1228,  1210,
+     112,   112,   110,   205,   430,   110,  1228,   209,  1210,    72,
+    1050,    74,    75,   347,   348,   110,   116,  1228,   116,   112,
+      83,    84,   114,   620,   130,   110,  1228,   110,   110,   116,
+     364,   112,   110,   110,   368,   110,  1145,   239,   109,   636,
+     116,   697,   116,  1273,  1274,   379,   472,  1377,   111,   109,
+     112,   109,  1282,   650,   109,   711,  1514,  1287,   109,   112,
+     130,   395,   873,   132,   110,   115,   918,  1001,   110,   271,
+     115,   405,   274,   110,   128,    72,  1287,    74,    75,    76,
+    1282,   115,   114,  1273,   112,  1287,    83,    84,   132,   423,
+    1320,   110,   294,  1504,  1504,   429,   112,   431,  1320,  1504,
+     112,  1210,  1504,   116,   306,  1039,   110,  1210,   110,  1320,
+     110,  1504,   109,   112,   112,  1224,  1504,  1210,  1320,    72,
+    1505,    74,    75,    76,  1504,   112,   110,   112,    47,   112,
+      83,    84,   466,   112,   731,  1376,   132,   471,   340,   132,
+    1357,   132,   344,   132,  1529,   479,   132,  1377,   804,   483,
+    1480,    30,   115,   487,   110,  1381,   490,   115,   492,   130,
+     110,   363,   110,  1393,   115,   367,   463,   593,   370,   112,
+      72,  1397,    74,    75,    76,   112,   112,   112,  1287,   112,
+     112,    83,    84,   284,  1287,   110,   112,   109,  1418,  1247,
+    1248,  1249,   112,   527,  1287,   621,  1418,   109,   532,   109,
+     626,    60,   110,    82,    83,   306,   307,  1418,   114,   110,
+    1440,   132,   112,   112,   110,   112,  1418,  1447,   110,  1449,
+      96,  1451,    96,   425,   426,   109,   109,  1079,   132,  1440,
+     115,  1042,   110,  1504,  1504,   110,  1447,   110,  1440,  1504,
+     110,  1467,  1468,   344,   116,  1447,  1505,   581,    42,   130,
+    1480,   453,   132,  1187,   588,  1485,  1296,  1487,   110,   110,
+      96,   132,    96,   132,   466,   599,   110,   601,  1498,   132,
+    1529,   697,   110,   110,  1504,  1505,  1210,   132,   110,   380,
+     115,   112,  1505,   112,  1514,   711,   620,  1498,   109,   491,
+     132,   493,   132,   495,   110,   115,  1498,   115,   895,  1529,
+     110,   110,   636,   505,   132,   507,  1529,   641,   510,   110,
+     512,   513,  1055,   562,   564,   561,   650,   976,   652,   653,
+     654,   563,   524,  1468,   565,  1210,    49,  1385,  1386,  1539,
+    1363,  1440,  1119,  1297,  1325,  1447,  1070,  1440,  1447,   683,
+      63,    66,   683,    66,  1447,  1001,    69,  1440,  1282,  1089,
+      75,   911,   686,  1287,  1447,   919,   690,   581,   692,   696,
+     866,   647,   696,   970,   243,  1423,   721,   938,  1228,   731,
+     704,    -1,   669,   483,   569,   577,    -1,   569,   804,   569,
+      -1,    -1,    -1,   717,   718,    70,   588,    -1,    73,  1498,
+      -1,    76,   117,    78,    -1,  1498,    -1,   731,    -1,  1210,
+      85,    -1,    -1,  1504,     3,  1498,    -1,    -1,  1448,    -1,
+    1450,    10,    11,    12,    13,    14,    -1,   619,    -1,    -1,
+      -1,    -1,   624,  1481,   147,    -1,    -1,    72,   630,    74,
+      75,    76,  1490,    -1,    -1,   160,    -1,   160,    83,    84,
+      39,    -1,    -1,  1514,  1484,   189,  1486,   548,   549,   550,
+      -1,    -1,   196,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   186,   109,    -1,   111,    -1,    67,    -1,
+      -1,    -1,   117,   118,    -1,    -1,    -1,   811,    -1,    -1,
+      -1,   683,    -1,    72,    -1,   130,   209,    76,  1528,   823,
+    1530,   788,  1303,    -1,    83,    84,   221,    -1,   221,    -1,
+     379,   798,    -1,  1543,  1544,    72,  1440,    74,    75,    76,
+      -1,    -1,   669,  1447,    -1,   812,    83,    84,    -1,   721,
+     109,    -1,    -1,    -1,   268,    -1,    -1,   212,   117,   118,
+      -1,  1187,   866,    -1,   259,    -1,    -1,    -1,   872,   264,
+      -1,   743,   109,    -1,  1355,    -1,    -1,  1358,     3,    -1,
+     117,   118,    -1,    -1,   279,    10,    11,    12,    13,    14,
+      -1,   895,    -1,   282,  1498,   284,   285,    -1,    -1,    -1,
+     904,    -1,   906,   292,   293,  1001,    -1,    -1,   322,   913,
+      -1,    -1,    -1,    -1,    39,    -1,   330,   306,   307,   333,
+    1401,    -1,    -1,    -1,   279,  1406,    -1,  1449,    -1,  1451,
+     802,    -1,   936,    -1,   327,   807,    -1,    -1,    -1,  1206,
+     463,   490,    67,   492,    -1,    -1,    -1,    -1,     0,     1,
+      -1,    -1,   956,  1434,   349,   344,  1282,    -1,    -1,    -1,
+      -1,   788,    -1,  1485,    -1,  1487,   970,    -1,    -1,    -1,
+      -1,   798,    -1,    -1,   978,    -1,    -1,    -1,   982,    -1,
+      32,    -1,    -1,   397,   755,   812,    -1,   401,    -1,    -1,
+      -1,   380,    -1,    -1,    -1,     3,   351,    49,   353,    -1,
+      -1,    -1,    10,    11,    12,    13,    14,    -1,    -1,    -1,
+      -1,    -1,   405,    -1,    -1,    -1,    -1,    69,    -1,    -1,
+      -1,    -1,    -1,   895,    -1,    -1,    -1,    -1,  1032,     0,
+     902,    39,    -1,    -1,    -1,   430,    -1,  1518,    -1,    -1,
+      26,    27,    28,  1524,    -1,    -1,   918,    -1,    -1,  1016,
+    1017,    -1,   447,   105,  1535,    -1,    -1,    -1,  1539,    67,
+      -1,    32,    -1,    -1,   478,    -1,  1070,    -1,   940,   941,
+     942,    -1,    -1,    -1,    -1,    -1,    -1,   472,    -1,    -1,
+    1084,    -1,    -1,    -1,    -1,  1089,   441,    -1,    -1,    -1,
+      -1,  1187,   641,    -1,    -1,   147,    -1,    -1,    69,    -1,
+      -1,    -1,  1106,   155,   156,    -1,    -1,  1074,  1075,  1376,
+      -1,    -1,    98,    -1,   100,    -1,    97,    98,    99,   100,
+     101,   102,   103,   104,   105,   106,   998,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   186,    -1,    -1,    -1,    -1,   125,
+      -1,   690,    -1,   692,    -1,    -1,   669,   696,    -1,   201,
+     131,    -1,   204,   205,    -1,   569,   570,   209,    -1,   548,
+     549,   550,   551,   552,   553,   554,   555,   556,   557,   558,
+     559,   560,   561,   562,   563,   564,   565,    -1,   230,  1183,
+      -1,    -1,   234,    -1,   236,   156,  1282,    -1,    -1,  1016,
+    1017,    -1,    -1,   245,    -1,   181,    -1,    -1,   593,   251,
+      -1,    -1,  1206,   189,   256,   191,   192,  1079,    -1,    -1,
+     196,    -1,   198,   199,   266,    -1,    -1,    -1,    -1,    -1,
+      -1,    72,   274,    74,    75,    76,   621,   998,    -1,    -1,
+      -1,   626,    83,    84,    -1,    -1,    -1,    -1,    -1,     0,
+      -1,    -1,   656,  1247,  1248,  1249,   660,  1074,  1075,  1121,
+      10,    11,    12,    13,    14,  1222,    -1,    -1,   109,   230,
+     111,    -1,    -1,    -1,    -1,   788,   117,   118,  1039,    -1,
+      -1,    32,    -1,    -1,    -1,   798,    -1,    -1,    -1,    39,
+     251,    -1,   268,    -1,    -1,   256,    -1,  1254,   340,   812,
+      -1,    -1,   344,    -1,    -1,  1262,  1263,  1264,   350,    -1,
+      -1,    -1,   697,    -1,    -1,   694,    -1,    67,    69,    -1,
+      -1,   363,    -1,    -1,    -1,   367,   711,   866,   370,    -1,
+      -1,    -1,    -1,   872,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1206,    -1,   731,    -1,    -1,    -1,
+      -1,    -1,    10,    11,    12,    13,    14,    -1,    -1,   109,
+      -1,   111,    -1,    -1,    -1,    -1,  1228,   117,   118,  1326,
+      -1,    -1,    -1,    -1,   913,   417,   755,    -1,    -1,    -1,
+      -1,    39,  1376,  1377,    -1,    -1,   731,    -1,   792,   350,
+     432,  1385,  1386,    -1,    -1,   437,    -1,    -1,    -1,    -1,
+      26,    27,    28,   445,    -1,   156,   785,    -1,    -1,    67,
+      -1,    -1,    -1,    -1,    72,    -1,    74,    75,    76,   804,
+      -1,   463,    -1,    -1,   466,    83,    84,    -1,    -1,  1423,
+      -1,   970,    72,    -1,    74,    75,    76,  1254,    -1,   481,
+      -1,   483,    -1,    83,    84,  1262,  1263,  1264,    -1,   491,
+      -1,   109,    -1,   495,    -1,    -1,   417,    -1,  1320,   117,
+     118,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   109,
+      -1,   432,    98,    -1,   100,    -1,   437,   117,   118,    -1,
+      -1,    -1,   524,   525,   445,    -1,  1480,  1481,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1490,    -1,    -1,    -1,
+     251,    -1,   463,  1016,  1017,   256,   910,    -1,    -1,  1326,
+    1504,  1505,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     481,    -1,   483,    -1,    -1,    -1,   905,    -1,   570,    -1,
+      72,  1070,    74,    75,    76,  1529,    -1,    -1,    -1,    -1,
+      -1,    83,    84,    -1,    -1,    -1,   588,   589,    -1,    -1,
+      10,    11,    12,    13,    14,   181,  1418,    -1,    -1,   601,
+      -1,  1074,  1075,    -1,   525,   191,   192,   109,    -1,   111,
+     196,   950,   198,   199,    -1,   117,   118,   619,    -1,    39,
+      -1,    -1,   624,   987,    -1,    -1,    -1,  1449,   630,  1451,
+      -1,   633,   634,   635,    -1,    -1,    -1,   573,   574,   350,
+    1004,    -1,    -1,    -1,    -1,    -1,   985,    67,    -1,   651,
+      -1,    -1,    -1,    -1,    -1,    -1,  1001,    -1,    -1,   998,
+      -1,    -1,    -1,  1485,    -1,  1487,   602,   669,   589,   605,
+     606,    -1,   608,    -1,   610,   611,    -1,    -1,   680,   615,
+     616,    -1,    -1,    72,  1183,    74,    75,    76,    -1,   109,
+      -1,   111,  1514,    -1,    83,    84,    -1,   117,   118,    -1,
+    1039,    -1,    -1,    -1,   706,    -1,   417,   709,    -1,    -1,
+      -1,    -1,   633,   634,   635,    -1,   718,    -1,  1082,   721,
+     109,   432,   111,    -1,     0,    -1,   437,    -1,   117,   118,
+     651,    -1,    -1,    -1,   445,    -1,    -1,    -1,    -1,    -1,
+      -1,   743,   744,    -1,    -1,    -1,    -1,   749,   669,  1222,
+      -1,    -1,   463,    -1,    -1,    -1,    32,    -1,  1122,   680,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     481,    -1,   483,    -1,    -1,    -1,    -1,  1116,    -1,    -1,
+      -1,  1254,    -1,    -1,    -1,   706,   788,    -1,   709,  1262,
+    1263,  1264,    -1,    69,    -1,    -1,   798,    -1,   800,    -1,
+     802,    -1,    -1,   805,    -1,   807,   808,    -1,    -1,    -1,
+     812,    -1,    -1,    -1,   525,    -1,    -1,   753,   754,    -1,
+     822,    -1,    -1,   744,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1176,  1177,    -1,
+      -1,    -1,  1187,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,     0,    -1,  1326,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    37,    38,    -1,    40,   788,    -1,    -1,
+      -1,   873,    -1,    -1,    -1,    -1,    -1,   798,   589,   800,
+     156,    -1,    -1,    32,   805,    -1,    -1,   808,    -1,    -1,
+      -1,   812,    66,   895,    -1,    -1,    -1,    -1,    72,    -1,
+     902,   903,    76,    -1,   906,    79,    80,    81,    82,    83,
+      84,    -1,    86,    87,    -1,    -1,    -1,    -1,    -1,    -1,
+      69,    -1,   633,   634,   635,    -1,    -1,    -1,    -1,    -1,
+     932,    -1,    -1,    -1,    -1,   109,    -1,  1282,   940,   941,
+     651,    -1,    -1,   117,   118,   119,   120,   121,   122,    -1,
+      -1,    -1,   873,    -1,    -1,    -1,    -1,    -1,   669,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   680,
+      -1,    -1,    -1,    -1,   910,   251,    -1,    -1,    -1,   915,
+     256,    -1,   903,    -1,    -1,    -1,    -1,   573,   574,    -1,
+      -1,    -1,    -1,    -1,    -1,   706,   998,    -1,   709,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   156,    -1,  1011,
+      -1,    -1,    -1,    -1,  1016,  1017,   602,  1019,  1020,   605,
+     606,    -1,   608,    -1,   610,   611,    -1,    -1,    -1,   615,
+     616,    -1,    -1,   744,    -1,    -1,    -1,  1039,    -1,    -1,
+      -1,    -1,  1381,    -1,     0,     1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1397,    -1,
       -1,    -1,    -1,    -1,    10,    11,    12,    13,    14,    -1,
-      -1,    -1,    -1,  1025,  1026,    -1,    -1,    -1,   793,    -1,
-      -1,    -1,    -1,   708,    -1,    -1,   711,    -1,   803,    -1,
-     805,    -1,   807,    39,    -1,   810,    -1,   812,   813,    -1,
-      -1,    -1,   817,    -1,    10,    11,    12,    13,    14,    -1,
-    1503,  1504,   827,  1083,  1084,   398,    -1,    -1,   867,   402,
-    1513,    67,    -1,   748,    -1,   418,    72,    -1,    74,    75,
-      76,  1083,  1084,    39,    -1,  1528,  1529,    83,    84,    -1,
-     433,    -1,    -1,    -1,    -1,   438,    -1,    -1,   351,  1010,
-      -1,    -1,    -1,   446,    -1,    -1,    -1,    -1,     1,    -1,
-    1553,    67,   911,   109,   879,   111,    -1,    -1,   793,    -1,
-      -1,   464,   118,   119,    -1,    -1,    -1,  1199,   803,    -1,
-     805,    -1,    -1,    -1,    -1,   810,   901,    -1,   813,   482,
-      -1,   484,   817,   908,   909,    -1,   479,   912,    -1,    -1,
-      -1,    -1,    -1,   109,    -1,   111,    -1,   956,    -1,   574,
-     575,    -1,   118,   119,    -1,   418,    72,    -1,    74,    75,
-      76,    -1,    -1,   938,    -1,    -1,    -1,    83,    84,    -1,
-     433,   946,   947,   526,   671,   438,    -1,    -1,   603,    -1,
-      -1,   606,   607,   446,   609,   994,   611,   612,    -1,   964,
-     903,   616,   617,   109,   879,   111,    -1,    -1,    -1,    -1,
-      -1,   464,   118,   119,  1234,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1297,    -1,    -1,    -1,   482,
-      -1,   484,  1234,    -1,   909,    -1,    -1,   570,   571,     0,
-       1,    -1,  1007,    -1,    -1,    -1,  1045,   590,    -1,  1269,
-      -1,    -1,    -1,    -1,    -1,  1020,    -1,  1277,  1278,  1279,
-    1025,  1026,    -1,  1028,  1029,    -1,    -1,  1269,    -1,    -1,
-      -1,    32,    -1,   526,    -1,  1277,  1278,  1279,    -1,    -1,
-      -1,    -1,    -1,  1048,    -1,    -1,    -1,    -1,  1199,   964,
-      -1,   634,   635,   636,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    66,   793,    -1,    69,    -1,
-     653,    -1,    -1,    -1,    -1,    -1,   803,    -1,  1083,  1084,
-      -1,    -1,    -1,  1343,    -1,   658,  1125,    -1,   671,   662,
-     817,    -1,    -1,    -1,    -1,    -1,    -1,   590,    -1,   682,
-    1528,  1343,   757,   758,    -1,    -1,    -1,    -1,    -1,    -1,
-    1025,  1026,    -1,  1028,  1029,    -1,  1059,    -1,    -1,    -1,
-     253,    -1,    -1,    -1,    -1,   708,    -1,  1132,   711,    -1,
-      -1,    -1,    -1,  1048,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   634,   635,   636,    -1,    -1,  1297,    -1,    -1,  1188,
-    1189,    -1,  1157,    -1,     0,    -1,   157,    -1,    -1,    -1,
-     653,    -1,    -1,    -1,    -1,   748,    -1,    -1,  1083,  1084,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   671,    10,
-      11,    12,    13,    14,    -1,    -1,    32,    -1,    -1,   682,
-      -1,    -1,    -1,    -1,    -1,  1200,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    39,    -1,
-     793,    -1,    -1,  1218,    -1,   708,    -1,  1222,   711,    -1,
-     803,   222,   805,    69,   797,    -1,    -1,   810,    -1,  1234,
-     813,  1236,    -1,    -1,   817,  1240,    67,    -1,    -1,    -1,
-      -1,    72,  1157,    74,    75,    76,    -1,    -1,    -1,    -1,
-      -1,   252,    83,    84,    -1,   748,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1269,    -1,   921,    -1,    -1,    -1,
-      -1,    -1,  1277,  1278,  1279,    -1,    -1,    -1,   109,    -1,
-      -1,    -1,    -1,  1288,  1289,  1200,    -1,   118,   119,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   879,  1302,  1025,  1026,
-     793,    -1,    -1,    -1,    -1,    -1,    -1,  1222,    -1,    -1,
-     803,   157,   805,    -1,    -1,    -1,    -1,   810,    -1,  1234,
-     813,  1236,    -1,    -1,   817,    -1,   909,    -1,    -1,    -1,
-    1335,    -1,    -1,    -1,   467,    -1,    -1,    -1,  1343,    -1,
-      -1,    -1,    -1,   916,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1269,    -1,  1083,  1084,    -1,    -1,
-    1399,    -1,  1277,  1278,  1279,    -1,    -1,    -1,  1311,    -1,
-      -1,    -1,    -1,  1288,  1289,    -1,    -1,    -1,  1417,    -1,
-     513,   964,    -1,    -1,    -1,    -1,   879,  1302,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   528,    -1,    -1,   531,    -1,
-     533,   534,    -1,    -1,    -1,    -1,   252,    -1,  1413,    -1,
-      -1,   257,    26,    27,    28,    -1,   909,    -1,    -1,    -1,
-      -1,    -1,    -1,   996,    -1,    -1,    -1,    -1,  1343,    -1,
-    1085,    -1,   433,  1438,    -1,    -1,    -1,    -1,    -1,    -1,
-    1013,    -1,  1025,  1026,    -1,  1028,  1029,    -1,    -1,   582,
-      -1,  1490,  1491,    -1,    53,    -1,    55,  1462,    -1,    58,
-      59,    60,    -1,    62,  1469,  1048,    -1,    -1,    -1,    -1,
-      -1,   964,    -1,    -1,    -1,    -1,    -1,    -1,    77,    -1,
-      -1,    -1,    -1,   484,    -1,    99,    -1,   101,    -1,    -1,
-      89,    90,    -1,    -1,    -1,    -1,    -1,    -1,  1413,    -1,
-    1083,  1084,    -1,    -1,    -1,   351,    -1,    -1,    -1,    -1,
-      -1,    -1,   126,    -1,    -1,    -1,    -1,  1522,  1091,    -1,
-      -1,   654,    -1,   656,  1529,   526,    -1,  1470,    -1,  1472,
-      -1,    -1,  1025,  1026,    -1,  1028,  1029,    -1,    -1,    -1,
-      -1,    -1,  1269,    -1,    -1,    -1,    -1,  1462,    -1,    -1,
-    1277,  1278,  1279,    -1,  1469,  1048,    -1,    -1,    -1,    -1,
-    1133,    -1,  1217,    -1,  1507,    -1,  1509,    -1,   182,    -1,
-      -1,    -1,   418,   706,  1157,    -1,   190,    -1,   192,   193,
-      -1,    -1,    -1,   197,    -1,   199,   200,   433,    -1,   590,
-    1083,  1084,   438,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     446,    -1,    -1,    -1,    -1,    -1,    -1,  1522,    -1,  1552,
-      -1,  1554,    -1,    -1,    -1,    -1,  1343,  1200,   464,    10,
-      11,    12,    13,    14,  1567,  1568,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   634,   635,   636,   482,    -1,   484,  1222,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    39,    -1,
-      -1,  1234,   653,  1236,    -1,   269,    -1,    -1,    10,    11,
-      12,    13,    14,    -1,  1157,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,
-     526,    72,    -1,    74,    75,    76,  1269,    39,    -1,    -1,
-      -1,    -1,    83,    84,  1277,  1278,  1279,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1288,  1289,  1200,    -1,    -1,
-     711,    -1,    -1,    -1,    -1,    67,    -1,    -1,   109,  1302,
-      72,    -1,    -1,    -1,    76,    -1,    -1,   118,   119,  1222,
-      -1,    83,    84,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1234,    -1,  1236,   590,   344,    -1,   346,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   109,   357,   358,
-    1343,    -1,    -1,    -1,    -1,    -1,   118,   119,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1269,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1277,  1278,  1279,    -1,   634,   635,
-     636,    -1,    -1,    -1,    -1,  1288,  1289,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   805,    -1,    -1,   653,    -1,  1302,
-      -1,    -1,   813,    -1,    -1,     7,    -1,    -1,    10,    11,
-      12,    13,    14,    -1,    -1,   671,    -1,    -1,    -1,   962,
-    1413,    -1,    -1,    -1,    -1,    -1,   682,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    37,    38,    39,    40,    -1,
-    1343,    -1,    -1,   986,    -1,    -1,   989,    -1,   991,    -1,
-      -1,    -1,   708,    -1,    -1,   711,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    66,    67,    -1,    -1,   879,  1462,
-      72,    -1,    -1,    -1,    76,    -1,  1469,    79,    80,    81,
-      82,    83,    84,    -1,    86,    87,    -1,    -1,    -1,    -1,
-      -1,    -1,   748,    -1,    -1,    -1,    -1,    -1,  1041,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   109,    -1,   111,
-    1413,    -1,    -1,    -1,    -1,    -1,   118,   119,   120,   121,
-     122,   123,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1522,
-      -1,    -1,    -1,    -1,    -1,    -1,   947,   793,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   803,    -1,   805,
-     574,   575,    -1,   964,   810,    -1,    -1,   813,    -1,  1462,
-      -1,   817,    37,    38,    -1,    40,  1469,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   603,
-      -1,    -1,   606,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    66,   616,   617,    -1,    -1,    -1,    72,    -1,    74,
-      75,    76,    -1,    -1,    79,    80,    81,    82,    83,    84,
-      -1,    86,    87,    -1,    -1,    -1,    -1,  1028,  1029,  1522,
-      -1,    -1,    -1,   879,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   109,    -1,   111,  1048,   113,   114,
-      -1,    -1,    -1,   118,   119,   120,   121,   122,   123,    -1,
-      -1,    -1,    -1,   909,    -1,    -1,    -1,    -1,    -1,     3,
-       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      -1,    -1,  1074,  1075,   350,    -1,    32,   788,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   798,    -1,   800,
+      -1,    -1,    -1,    39,   805,  1016,  1017,   808,  1019,  1020,
+      -1,   812,   251,    -1,    -1,    -1,    -1,   256,    -1,    -1,
+      66,    -1,    -1,    69,    -1,    -1,    -1,    -1,  1039,  1121,
+      -1,    67,    -1,    -1,    -1,    -1,    72,    -1,  1467,  1468,
+      76,    -1,    -1,    -1,    -1,    -1,    -1,    83,    84,    -1,
+    1076,   417,    -1,  1145,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1074,  1075,    -1,   432,    -1,    -1,    -1,
+      -1,   437,   873,   109,    -1,    -1,    -1,   753,   754,   445,
+      -1,   117,   118,    -1,    10,    11,    12,    13,    14,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1188,   463,    -1,    -1,
+      -1,    -1,   903,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     156,   350,    -1,    39,  1206,   481,    -1,   483,  1210,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    1222,    -1,  1224,    -1,  1145,    -1,  1228,    -1,    -1,    -1,
+      -1,    67,    -1,    -1,    -1,    -1,    72,    -1,    74,    75,
+      76,    -1,    -1,    -1,    -1,    -1,    -1,    83,    84,   525,
+      -1,    -1,  1254,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    1262,  1263,  1264,    -1,    -1,   221,    -1,  1188,   417,  1205,
+      -1,  1273,  1274,   109,    -1,   111,    -1,    -1,    -1,    -1,
+      -1,   117,   118,   432,    -1,  1287,    -1,    -1,   437,  1210,
+      -1,    -1,    -1,    -1,    -1,   251,   445,    -1,    -1,    -1,
+      -1,  1222,    -1,  1224,    -1,  1016,  1017,    -1,  1019,  1020,
+      -1,    -1,    -1,   589,   463,    -1,    -1,    -1,  1320,    -1,
+      -1,    -1,    -1,    -1,  1326,    -1,    -1,    -1,  1039,   915,
+      -1,    -1,   481,  1254,   483,    -1,    -1,    -1,    -1,    -1,
+      -1,  1262,  1263,  1264,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1273,  1274,    -1,    -1,    -1,   633,   634,   635,
+      -1,    -1,    -1,  1074,  1075,    -1,  1287,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   651,   525,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1393,    -1,   669,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   680,  1326,    -1,    10,    11,    12,
+      13,    14,    -1,    -1,    -1,    -1,  1418,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     706,    -1,    -1,   709,  1145,    -1,    39,    -1,  1440,    -1,
+     589,    -1,    -1,    -1,    -1,  1447,    -1,    53,    -1,    55,
+      -1,    -1,    58,    59,    60,    -1,    62,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,   744,    72,
+      76,    -1,  1393,    76,    -1,    -1,   432,  1188,    -1,    -1,
+      83,    84,    88,    89,   633,   634,   635,    -1,    -1,    -1,
+    1076,    -1,    -1,    -1,    -1,    -1,  1498,    -1,    -1,  1210,
+      -1,    -1,   651,  1505,    -1,    -1,   109,    -1,    -1,    -1,
+      -1,  1222,   788,  1224,   117,   118,    -1,    -1,    -1,  1440,
+     669,    -1,   798,    -1,   800,    -1,  1447,   483,    -1,   805,
+      -1,   680,   808,    -1,    -1,    -1,   812,    10,    11,    12,
+      13,    14,    -1,  1254,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1262,  1263,  1264,    -1,    -1,    -1,   706,    -1,    -1,
+     709,    -1,  1273,  1274,    -1,    -1,    39,    -1,    -1,   525,
+      -1,    -1,    -1,    -1,    -1,    -1,  1287,  1498,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    67,   744,    -1,   873,    -1,    72,
+      -1,    74,    75,    76,    -1,    -1,    -1,    -1,    -1,    -1,
+      83,    84,    -1,    -1,    -1,  1326,    -1,    -1,    -1,  1205,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   903,    -1,    -1,
+      -1,    -1,    -1,   589,    -1,    -1,   109,    -1,   111,   788,
+      -1,    -1,    -1,    -1,   117,   118,    -1,    -1,    -1,   798,
+      -1,   800,    -1,    -1,    -1,    -1,   805,    -1,    -1,   808,
+      -1,    -1,    -1,   812,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   633,   634,   635,
+      -1,    -1,  1393,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   651,    -1,    -1,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    -1,   873,    30,    31,    32,    33,  1440,
+      -1,    36,    -1,    -1,    39,    40,  1447,   343,    -1,   345,
+    1016,  1017,    -1,  1019,  1020,    -1,    -1,    -1,    -1,    -1,
+     356,   357,    -1,   709,   903,    -1,    -1,    -1,    -1,    64,
+      -1,    -1,    67,  1039,    69,    -1,    71,    72,    -1,    74,
+      75,    76,    -1,    10,    11,    12,    13,    14,    83,    84,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1498,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1074,  1075,
+      -1,    -1,    39,    -1,   109,    -1,   111,    -1,    66,    -1,
+     115,    -1,   117,   118,    -1,    -1,    -1,    75,    -1,    77,
+      -1,    79,    -1,    -1,    -1,    -1,    -1,    -1,    86,    -1,
+      67,    -1,    49,    -1,    -1,    72,    -1,    74,    75,    76,
+      -1,    -1,    -1,    -1,   800,    -1,    83,    84,    -1,    66,
+      -1,    -1,   808,    -1,    10,    11,    12,    13,    14,   117,
+      -1,   119,   120,   121,    -1,    -1,    -1,  1016,  1017,  1145,
+    1019,  1020,   109,    -1,   111,    -1,    -1,    -1,    -1,    -1,
+     117,   118,    -1,    39,    -1,    -1,    -1,    -1,    -1,    -1,
+    1039,    -1,    -1,    -1,    -1,    -1,   113,    -1,    -1,    -1,
+     117,    -1,   160,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    67,  1188,    -1,    -1,    -1,    72,   873,    74,    75,
+      76,    -1,    -1,    -1,    -1,  1074,  1075,    83,    84,   146,
+      -1,    -1,    -1,    -1,  1210,    -1,    -1,    -1,    -1,   156,
+      -1,    -1,    -1,   160,    -1,    -1,  1222,    -1,  1224,    -1,
+      -1,    -1,    -1,   109,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   117,   118,   221,    -1,   223,   224,   225,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1254,    -1,
+      -1,    -1,    -1,    -1,    -1,   941,  1262,  1263,  1264,    -1,
+      -1,    -1,   209,    -1,    -1,    -1,  1145,  1273,  1274,    -1,
+      -1,   259,    -1,    -1,   221,    -1,   264,    -1,    -1,    -1,
+      -1,  1287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   279,   239,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1188,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   264,    -1,    -1,
+    1326,    -1,    -1,    -1,   271,    -1,    -1,    -1,    -1,    -1,
+      -1,  1210,    -1,  1019,  1020,    -1,    -1,    -1,    -1,   327,
+      -1,    -1,    -1,  1222,    -1,  1224,    -1,   294,    -1,    -1,
+      -1,    -1,    -1,  1039,    -1,    -1,    -1,    -1,    -1,   306,
+      -1,   349,   698,    -1,   700,    -1,   354,   355,    -1,    -1,
+      -1,   707,   708,    -1,   362,  1254,   712,    -1,    -1,    -1,
+      -1,    -1,    -1,  1262,  1263,  1264,    -1,  1393,   724,    -1,
+      -1,    -1,    -1,   729,  1273,  1274,    -1,   344,    -1,    -1,
+      -1,    -1,   349,    -1,    -1,    -1,    -1,    -1,  1287,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   405,    -1,    -1,
+      -1,   757,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1440,   423,    -1,    -1,    -1,    -1,
+     428,  1447,   430,    -1,    -1,    -1,    -1,  1326,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   447,
+      -1,    -1,   450,   451,    -1,    -1,    -1,    -1,    -1,    -1,
+     458,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   425,   426,
+      -1,    -1,    -1,    -1,   472,   432,    -1,    -1,    -1,    -1,
+      -1,   479,  1498,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1187,  1188,    -1,    -1,    -1,   453,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1393,    -1,    -1,    -1,    -1,    -1,
+     856,   857,   858,   859,  1210,   861,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   481,    -1,    -1,    -1,    -1,    -1,
+     876,    -1,  1228,    -1,    -1,    -1,   493,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   890,    -1,    -1,    -1,   505,    -1,
+     507,  1440,    -1,   510,    -1,   512,   513,    -1,  1447,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   525,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1273,  1274,    -1,
+      -1,    -1,    -1,    -1,   930,    -1,  1282,    -1,    -1,    -1,
+      -1,  1287,    -1,    -1,    -1,   593,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1498,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     577,    -1,    -1,   621,  1320,    -1,    -1,    -1,   626,   975,
+      -1,    -1,   589,    -1,    -1,   981,   593,    -1,    -1,    -1,
+     986,    -1,    -1,    -1,    -1,   991,    -1,   993,    -1,    -1,
+      -1,   997,    -1,   999,  1000,    -1,    -1,  1003,    -1,    -1,
+      -1,    -1,   619,    -1,    -1,    -1,  1012,   624,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   633,   634,   635,    -1,
+      -1,    -1,    -1,    -1,  1030,  1031,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   651,    -1,    -1,  1393,    -1,   697,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1057,    -1,   711,  1060,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1418,    -1,    -1,    -1,   683,    37,    38,    -1,
+      40,    -1,    -1,   731,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1440,    -1,    -1,    -1,    -1,    -1,
+      -1,  1447,   709,    -1,   711,    -1,    66,  1103,    -1,    -1,
+      -1,    -1,    72,  1109,  1110,    -1,    76,    -1,    -1,    79,
+      80,    81,    82,    83,    84,    -1,    86,    87,    -1,    -1,
+      -1,    -1,    -1,  1129,    -1,    -1,  1132,   744,    -1,    -1,
+    1136,    -1,    -1,    -1,   792,    -1,    -1,    -1,    44,   109,
+      -1,   111,  1498,  1149,   114,    -1,   804,   117,   118,   119,
+     120,   121,   122,    -1,    -1,    -1,  1162,    -1,  1164,  1165,
+    1166,  1167,    -1,    -1,    -1,   823,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1180,    -1,  1182,    -1,    -1,    -1,
+    1186,    -1,    -1,   800,    -1,    91,    -1,   804,    -1,    -1,
+      -1,   808,    -1,    -1,    -1,   101,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1215,
+    1216,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,    -1,    -1,    30,    31,
+      32,   157,    -1,    -1,    -1,    -1,    -1,    39,    -1,  1265,
+    1266,    -1,    -1,    -1,    -1,   171,    -1,    -1,    -1,  1275,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   936,    -1,
+      -1,    -1,    -1,    -1,    -1,    67,   903,    69,   194,    71,
+      -1,    -1,    74,    75,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   918,   208,    -1,    -1,    -1,    -1,    -1,   966,    -1,
+      -1,   217,    -1,    37,    38,    -1,    40,    -1,    -1,    -1,
+      -1,   227,    -1,    -1,    -1,   942,    -1,    -1,    -1,   111,
+    1336,    -1,  1338,  1339,  1340,   117,   118,    -1,    -1,    -1,
+      -1,    -1,    66,  1001,  1350,    -1,   252,    -1,    72,    -1,
+      -1,   257,    76,  1359,  1012,    79,    80,    81,    82,    83,
+      84,    -1,    86,    87,   270,    -1,    -1,    -1,    -1,    -1,
+     276,    -1,   278,    -1,    -1,    -1,    -1,    -1,  1384,    -1,
+      -1,   998,    -1,    -1,    -1,   109,    -1,   111,    -1,   295,
+      -1,    -1,    -1,   117,   118,   119,   120,   121,   122,    -1,
+      -1,    -1,  1019,  1020,    -1,    -1,   130,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    37,    38,    -1,    40,    -1,    -1,
+      -1,  1427,  1428,    -1,    -1,    -1,  1084,    -1,    -1,    -1,
+      -1,   337,    -1,    -1,  1440,    -1,   342,    -1,    -1,    -1,
+    1098,  1447,    -1,    66,    -1,    -1,    -1,    -1,    -1,    72,
+      -1,    74,    75,    76,    -1,    -1,    79,    80,    81,    82,
+      83,    84,  1079,    86,    87,   371,    -1,    -1,    -1,   375,
+     376,    -1,   378,  1479,    -1,    -1,    -1,  1483,    -1,   385,
+     386,    -1,   388,   389,    -1,   391,   109,   393,   111,    -1,
+     113,   114,    -1,    -1,   117,   118,   119,   120,   121,   122,
+      -1,    -1,    -1,    -1,   410,  1511,    -1,  1513,    -1,    -1,
+      -1,    -1,   418,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   155,   156,    -1,    -1,    -1,    -1,    -1,  1145,  1187,
+      -1,    -1,    -1,    -1,    -1,  1541,  1542,   443,    -1,    -1,
+      -1,    -1,    -1,  1549,  1550,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   189,    -1,    -1,    -1,    -1,
+      -1,    -1,   196,   469,    -1,    -1,    -1,    -1,    -1,   475,
+    1187,    -1,    -1,    -1,   480,     3,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      -1,    -1,    30,    31,    32,    -1,    -1,  1224,    -1,    -1,
+     516,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1282,   531,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   268,    -1,    -1,    -1,    -1,    67,
+      -1,    69,    -1,    71,    -1,    -1,    74,    75,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1273,  1274,    -1,    -1,
+      -1,    -1,    -1,   569,    -1,  1282,    -1,    -1,    -1,    -1,
+      -1,    -1,   578,    -1,    -1,    -1,    -1,    -1,    -1,   585,
+     146,    -1,    -1,    -1,    -1,   591,   114,    -1,   322,    -1,
+     156,    -1,    -1,    -1,   600,    -1,   330,   331,    -1,   333,
+     334,    -1,   168,   169,    -1,    -1,    -1,    -1,    -1,    -1,
+     344,    -1,     7,    -1,   348,    10,    11,    12,    13,    14,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   367,   640,    -1,   370,    -1,    -1,    -1,
+      -1,    -1,    37,    38,    39,    40,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   397,    -1,    -1,    -1,   401,    -1,    -1,
+     676,    66,    67,   239,    -1,    -1,  1393,    72,   684,    -1,
+      -1,    76,    -1,    -1,    79,    80,    81,    82,    83,    84,
+      -1,    86,    87,    -1,    -1,    -1,    -1,   263,   432,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   715,
+      -1,    -1,    -1,    -1,   109,    -1,   111,    -1,    -1,   725,
+     726,    -1,   117,   118,   119,   120,   121,   122,    -1,    -1,
+      -1,    -1,  1449,    -1,  1451,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   478,    -1,    -1,   481,    -1,    -1,
+      -1,    -1,   758,    -1,    -1,    -1,    -1,   763,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1485,    -1,
+    1487,  1529,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   520,    -1,    -1,    -1,
+     524,   525,    -1,    -1,    -1,    -1,    -1,  1514,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   379,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   827,    -1,    -1,    -1,    -1,    -1,    -1,   834,    -1,
+      -1,    -1,    -1,    -1,    -1,   569,   570,    -1,    -1,    -1,
+      -1,   847,    -1,   849,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   588,   589,    -1,   863,    -1,    -1,
+      -1,    -1,    -1,   869,    -1,   599,    -1,   601,   602,    -1,
+      -1,    -1,    -1,    -1,   608,   881,    -1,    -1,   884,    -1,
+      -1,    -1,    -1,    -1,   618,   619,    -1,    -1,    -1,    -1,
+     624,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   633,
+     634,   635,    -1,    -1,    -1,    -1,    -1,   473,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   651,    -1,    -1,
+      -1,    -1,   656,   657,    -1,    -1,   660,   661,    -1,    -1,
+      -1,    -1,    -1,   667,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   512,    -1,    -1,    -1,
+      -1,    -1,   686,    -1,    -1,   961,    -1,    -1,    -1,   525,
+      -1,    -1,    -1,    -1,   530,    -1,    -1,   533,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   709,   710,    -1,    -1,   545,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     996,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   567,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   743,
+     744,   577,    -1,    -1,   748,   749,    -1,    -1,   584,    -1,
+      -1,    -1,    -1,   589,    -1,    -1,    -1,    -1,    -1,    -1,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,  1054,    -1,
+      30,    31,    32,    -1,  1060,    -1,    -1,    -1,   792,    39,
+      -1,    -1,    -1,    -1,    -1,    -1,   800,    -1,    -1,    -1,
+      -1,    -1,   638,   807,   808,    -1,    -1,   811,    -1,   813,
+     646,    -1,    -1,    -1,    -1,    -1,    -1,    67,  1094,   823,
+      -1,    -1,    72,  1099,    74,    75,    76,    -1,    -1,    -1,
+      -1,  1107,    -1,    83,    84,    -1,    10,    11,    12,    13,
       14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    -1,    -1,    30,    31,    32,    -1,
-      -1,   700,    -1,   702,    -1,    39,    -1,    -1,    -1,    -1,
-     709,   710,    -1,    -1,    -1,   714,    -1,    -1,   964,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   726,  1261,  1262,
-    1263,    -1,   731,    67,    -1,    69,    -1,    71,    72,    -1,
-      74,    75,    76,   757,   758,    -1,    -1,    -1,    -1,    83,
-      84,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   761,    -1,    -1,    -1,    -1,    -1,    37,    38,
-      -1,    40,    -1,    -1,    -1,   109,    -1,   111,    -1,  1025,
-    1026,    -1,  1028,  1029,   118,   119,  1319,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,  1199,  1200,
-      -1,    -1,  1048,    72,    -1,    -1,    -1,    76,    -1,    -1,
-      79,    80,    81,    82,    83,    84,    -1,    86,    87,    -1,
-      -1,  1222,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1083,  1084,  1240,
-     109,    -1,   111,    -1,    -1,   114,    -1,    -1,    -1,   118,
-     119,   120,   121,   122,   123,    -1,    -1,    49,    -1,    -1,
-      -1,    -1,   861,   862,   863,   864,    -1,   866,    -1,    -1,
-      -1,    -1,  1405,  1406,    66,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   882,    -1,    -1,    -1,  1288,  1289,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1297,   896,    -1,    -1,
-      -1,  1302,   916,    -1,    -1,    -1,    -1,   921,    -1,    -1,
-    1443,  1157,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   114,    -1,    -1,    -1,   118,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1335,    -1,    -1,   936,    -1,    -1,
+      24,    25,    26,    27,    28,    -1,    -1,    -1,    -1,   109,
+      -1,   111,    -1,    -1,  1140,    39,    -1,   117,   118,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1152,    -1,    -1,  1155,
+      -1,  1157,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   895,    -1,    67,    -1,  1171,  1172,    -1,   902,   903,
+     904,    -1,   906,    -1,    78,    -1,   910,    -1,   744,    -1,
+     746,    -1,    -1,    -1,    -1,    -1,    -1,  1193,    -1,    -1,
+     756,    -1,    -1,    -1,    -1,    -1,   762,   931,   932,    -1,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,     7,    -1,
+      -1,    10,    11,    12,    13,    14,    -1,    -1,    -1,    39,
+      -1,    -1,   966,    -1,  1240,    -1,    -1,    -1,   804,   805,
+      -1,    -1,   808,    -1,    -1,    -1,    -1,    -1,    37,    38,
+      39,    40,    -1,   987,   988,    -1,   822,    67,    -1,    -1,
+      -1,    -1,    -1,    -1,   998,    -1,    -1,    -1,    -1,    -1,
+    1004,  1005,    -1,  1007,  1008,  1009,    -1,    66,    67,    -1,
+      -1,    -1,    -1,    72,    -1,  1019,  1020,    76,    -1,    -1,
+      79,    80,    81,    82,    83,    84,   862,    86,    87,    -1,
+     866,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1315,
+      -1,  1317,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     109,    -1,   111,  1329,    -1,  1331,    -1,    -1,   117,   118,
+     119,   120,   121,   122,    -1,    -1,    -1,   903,    -1,    -1,
+      -1,    -1,  1348,    -1,    -1,    -1,    -1,    -1,  1082,    -1,
+    1084,    -1,    -1,    -1,    -1,  1089,    -1,    -1,  1364,  1365,
+      -1,    -1,    -1,    -1,  1098,    -1,    -1,    -1,    -1,  1375,
+      -1,    -1,  1378,    -1,    -1,    -1,   942,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1121,  1122,  1123,
+      -1,    -1,    -1,  1399,    -1,    37,    38,    -1,    40,    -1,
+      -1,    -1,  1408,    -1,   970,  1411,    -1,  1413,  1414,  1415,
+     976,  1145,    -1,    -1,   980,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    66,    -1,    -1,    -1,    -1,    -1,
+      72,    -1,    -1,    -1,    76,  1001,    -1,    79,    80,    81,
+      82,    83,    84,    -1,    86,    87,  1012,  1453,    -1,  1455,
+      -1,  1457,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1472,   109,  1034,   111,
+    1036,    -1,  1206,    -1,   116,   117,   118,   119,   120,   121,
+     122,    -1,    -1,    -1,    -1,  1051,  1052,    -1,    -1,    -1,
+    1224,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1072,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,  1273,
+    1274,    30,    31,    32,    33,    -1,    -1,    36,    -1,    -1,
+      39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1127,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    67,  1145,
+      69,    -1,    71,    -1,    -1,    74,    75,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1160,  1161,    -1,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,   111,    -1,    30,    31,    32,    33,   117,   118,
+      36,    37,    38,    39,    40,    41,    -1,    43,    -1,    -1,
+      46,    47,    48,    49,    50,    51,    52,    53,    -1,    -1,
+      -1,    57,    -1,    -1,    -1,    61,    62,    -1,    64,  1393,
+      66,    67,    -1,    69,    -1,    71,    72,    -1,    74,    75,
+      76,    -1,    -1,    79,    80,    81,    82,    83,    84,    -1,
+      86,    87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1200,   147,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   157,    -1,    -1,    -1,   161,
-      -1,  1504,    -1,    -1,    -1,    -1,  1222,    -1,    -1,    -1,
-    1513,    -1,    -1,    -1,   983,    -1,    -1,    -1,  1234,    -1,
-    1236,   990,    -1,    -1,    -1,    -1,   995,    -1,    -1,    -1,
-      -1,  1000,    -1,  1002,    -1,    -1,    -1,  1006,    -1,  1008,
-    1009,    -1,  1413,  1012,    -1,    -1,    -1,    -1,   210,    -1,
-      -1,    -1,  1021,  1269,    -1,    -1,    -1,    -1,    -1,    -1,
-     222,  1277,  1278,  1279,    -1,    -1,    -1,  1438,    -1,    -1,
-    1039,  1040,  1288,  1289,    -1,    -1,    -1,    -1,   240,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1302,    -1,    -1,    -1,
-      -1,  1462,    -1,    -1,    -1,    -1,    -1,  1066,  1469,    -1,
-    1069,  1085,    -1,   265,    -1,    -1,    -1,    -1,    -1,    -1,
-     272,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1343,    -1,    -1,
-      -1,    -1,    -1,   295,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1112,    -1,   307,    -1,    -1,    -1,  1118,
-    1119,  1522,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1130,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1140,    -1,    -1,  1143,    -1,  1145,    -1,    -1,  1148,
-      -1,    -1,    -1,   345,    -1,    -1,    -1,    -1,   350,    -1,
-      -1,    -1,  1161,    -1,    -1,    -1,    -1,  1413,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1174,    -1,  1176,  1177,  1178,
-    1179,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1192,    -1,  1194,    -1,    -1,    -1,  1198,
-      -1,    -1,    -1,  1217,    -1,    66,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    76,  1462,    78,    -1,    80,
-      -1,    -1,    -1,  1469,    -1,    -1,    87,    -1,  1227,  1228,
-      -1,    -1,    -1,    -1,   426,   427,    -1,    -1,    -1,    -1,
-      -1,   433,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   118,    -1,   120,
-     121,   122,   454,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1522,    -1,    -1,    -1,
-      -1,  1280,  1281,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     482,  1290,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     161,    -1,   494,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   506,    -1,   508,    -1,    -1,   511,
-      -1,   513,   514,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   526,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1341,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1354,    -1,  1356,  1357,  1358,
-      -1,   222,    -1,   224,   225,   226,    -1,    -1,    -1,  1368,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1377,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   578,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   590,   260,
-      -1,    -1,   594,    -1,   265,  1404,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   280,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   620,    -1,
-      -1,    -1,    -1,   625,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   634,   635,   636,    -1,    -1,    -1,    -1,    -1,
-    1449,  1450,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   653,    -1,  1462,    -1,    -1,    -1,   328,    -1,    -1,
-    1469,    -1,    -1,    -1,    44,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   350,
-      -1,    -1,    -1,   685,   355,   356,    -1,    -1,    -1,    -1,
-      -1,    -1,   363,  1502,    -1,    -1,    -1,  1506,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   711,
-       7,   713,    92,    10,    11,    12,    13,    14,    -1,    -1,
-      -1,    -1,   102,    -1,    -1,    -1,  1535,    -1,  1537,    -1,
-      -1,    -1,    -1,    -1,    -1,   406,    -1,    -1,    -1,    -1,
-      37,    38,    39,    40,    -1,    -1,   748,    -1,    -1,    -1,
-      -1,    -1,    -1,   424,    -1,    -1,  1565,  1566,   429,    -1,
-     431,    -1,    -1,    -1,  1573,  1574,    -1,    -1,    -1,    66,
-      67,    -1,    -1,    -1,    -1,    72,    -1,   448,   158,    76,
-     451,   452,    79,    80,    81,    82,    83,    84,   459,    86,
-      87,    -1,   172,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   473,   805,    -1,    -1,    -1,   809,    -1,   480,
-      -1,   813,   109,    -1,   111,   195,    -1,    -1,    -1,    -1,
-      -1,   118,   119,   120,   121,   122,   123,    -1,    -1,   209,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   218,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   228,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,
-      38,    -1,    40,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   253,    -1,    -1,    -1,    -1,   258,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,    -1,
-      -1,   271,    -1,    -1,    72,    -1,    -1,   277,    76,   279,
-      -1,    79,    80,    81,    82,    83,    84,   909,    86,    87,
-      -1,    -1,    -1,    -1,    -1,    -1,   296,    -1,    -1,    -1,
-      -1,    -1,   924,   594,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   109,    -1,   111,    -1,    -1,    -1,    -1,    -1,   117,
-     118,   119,   120,   121,   122,   123,   948,    -1,    -1,    -1,
-      -1,   622,    -1,    -1,    -1,    -1,   627,    -1,   338,    -1,
-      -1,    -1,   964,   343,    -1,    -1,     3,     4,     5,     6,
+      -1,    -1,    -1,   109,    -1,   111,    -1,    -1,   114,    -1,
+      -1,   117,   118,   119,   120,   121,   122,    -1,    -1,    -1,
+      -1,   127,    -1,    -1,    -1,    -1,   132,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  1301,    -1,    -1,  1304,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1480,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    1504,  1505,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  1529,     3,     4,     5,     6,
        7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
       17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    -1,   372,    30,    31,    32,   376,   377,    -1,   379,
-      -1,    -1,    39,    -1,    -1,  1007,   386,   387,    -1,   389,
-     390,    -1,   392,    -1,   394,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1028,  1029,   699,    -1,
-      67,   411,    69,    -1,    71,    -1,    -1,    74,    75,   419,
-      -1,    -1,   713,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      37,    38,   733,    40,   444,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   111,    -1,    -1,    -1,    -1,    -1,
-      -1,   118,   119,    -1,    -1,    -1,  1088,    -1,    -1,    66,
-     470,    -1,    -1,    -1,    -1,    72,   476,    -1,    -1,    76,
-      -1,   481,    79,    80,    81,    82,    83,    84,    -1,    86,
+      27,    -1,    -1,    30,    31,    32,    33,    -1,    -1,    36,
+      37,    38,    39,    40,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    -1,    -1,    30,    31,    32,    -1,    -1,    66,
+      67,    -1,    69,    39,    71,    72,    -1,    74,    75,    76,
+      -1,    -1,    79,    80,    81,    82,    83,    84,    -1,    86,
       87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   797,    -1,    -1,    -1,
-      -1,    -1,   109,    -1,   111,    -1,    -1,   517,   809,   116,
-      -1,   118,   119,   120,   121,   122,   123,    -1,    -1,    -1,
-      -1,    -1,   532,    -1,    -1,  1157,     0,   828,    -1,     3,
+      -1,    67,    -1,    -1,    -1,    -1,    72,    -1,    74,    75,
+      76,    -1,   109,    -1,   111,    -1,    -1,    83,    84,    -1,
+     117,   118,   119,   120,   121,   122,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   132,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   109,    -1,   111,    -1,    -1,    -1,    -1,
+      -1,   117,   118,    -1,    -1,    -1,    -1,    -1,  1514,     3,
        4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
       14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
       24,    25,    26,    27,    -1,    -1,    30,    31,    32,    33,
-     570,    -1,    36,    -1,    -1,    39,    40,  1199,    -1,   579,
-      -1,   156,   157,    -1,    -1,    -1,   586,    -1,    37,    38,
-      -1,    40,   592,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      64,   601,    -1,    67,    -1,    69,    -1,    71,    72,    -1,
-      74,    75,    76,    -1,  1236,   190,    -1,    66,    -1,    83,
-      84,    -1,   197,    72,    -1,    -1,    -1,    76,    -1,    -1,
-      79,    80,    81,    82,    83,    84,    -1,    86,    87,    -1,
-      -1,    -1,   642,    -1,    -1,   109,    -1,   111,    -1,    -1,
-      -1,   942,    -1,    -1,   118,   119,    -1,    -1,    -1,    -1,
-     109,    -1,   111,    -1,    -1,   114,  1288,  1289,    -1,   118,
-     119,   120,   121,   122,   123,  1297,    -1,    -1,   678,    -1,
-      -1,    -1,    -1,   974,    -1,    -1,   686,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   269,    10,    11,    12,    13,    14,
+      -1,    -1,    36,    37,    38,    39,    40,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,    26,    27,    -1,    -1,    30,    31,    32,
+      -1,    -1,    66,    67,    -1,    69,    39,    71,    72,    -1,
+      74,    75,    76,    -1,    -1,    79,    80,    81,    82,    83,
+      84,    -1,    86,    87,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,    -1,    72,
+      -1,    74,    75,    -1,    -1,   109,    -1,   111,    -1,    -1,
+      83,    84,    -1,   117,   118,   119,   120,   121,   122,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    -1,    -1,    -1,   717,    -1,  1010,
-      -1,    -1,    -1,    -1,    39,    -1,    -1,   727,   728,    -1,
-    1021,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,    40,
-      -1,   741,    -1,    -1,   147,    -1,    -1,    -1,   323,    -1,
-      -1,    -1,    67,    -1,   157,    -1,   331,   332,    -1,   334,
-     335,    -1,   762,    78,   764,    66,   169,   170,   768,    -1,
-     345,    72,    -1,    -1,   349,    76,    -1,    -1,    79,    80,
-      81,    82,    83,    84,    -1,    86,    87,    -1,    -1,    -1,
-      -1,  1413,    -1,   368,    -1,    -1,   371,    -1,    -1,    -1,
-      -1,    -1,  1093,    -1,    -1,    -1,    -1,    -1,   109,    -1,
-     111,    -1,    -1,    -1,    -1,    -1,  1107,   118,   119,   120,
-     121,   122,   123,   398,    -1,    -1,    -1,   402,    -1,    -1,
-      -1,    -1,   832,    -1,    -1,    -1,    -1,   240,    -1,   839,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1471,
-      -1,  1473,   852,    -1,   854,    -1,    -1,    -1,   433,    -1,
-      -1,   264,    -1,    -1,    -1,    -1,    -1,    -1,   868,    -1,
-      -1,    -1,    -1,    -1,    -1,   875,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1508,   887,  1510,    -1,
-     890,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   479,    -1,    -1,   482,  1199,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1538,     4,     5,     6,
+      25,    26,    27,    -1,    -1,    30,    31,    32,    -1,    -1,
+      -1,    -1,    37,    38,    39,    40,    -1,    -1,    -1,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    27,    28,    -1,    -1,
+      -1,    66,    67,    -1,    69,    -1,    71,    72,    39,    74,
+      75,    76,    -1,    -1,    79,    80,    81,    82,    83,    84,
+      -1,    86,    87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   109,    -1,   111,    78,    -1,    -1,
+      -1,   116,   117,   118,   119,   120,   121,   122,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    -1,    -1,    30,    31,    32,    -1,    -1,    -1,
+      -1,    37,    38,    39,    40,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    -1,    -1,    30,    31,    32,    -1,    -1,
+      66,    67,    -1,    69,    39,    71,    72,    -1,    74,    75,
+      76,    -1,    -1,    79,    80,    81,    82,    83,    84,    -1,
+      86,    87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    67,    -1,    -1,    -1,    -1,    -1,    -1,    74,
+      75,    -1,    -1,   109,    -1,   111,    -1,    -1,    -1,    -1,
+     116,   117,   118,   119,   120,   121,   122,     4,     5,     6,
        7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
       17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    -1,    -1,    30,    31,    32,   521,    -1,    -1,    -1,
-     525,   526,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   969,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   380,    -1,    -1,
-      67,    -1,    69,    -1,    71,    -1,    -1,    74,    75,    -1,
-      -1,    -1,    -1,    -1,    -1,   570,   571,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1005,  1297,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   589,   590,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   110,   111,   600,    -1,   602,   603,    -1,
-      -1,   118,   119,    -1,   609,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   619,   620,    -1,    -1,    -1,    -1,
-     625,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   634,
-     635,   636,    -1,  1063,    -1,    -1,    -1,    -1,    -1,  1069,
-      -1,   474,    -1,    -1,    -1,    -1,    -1,    -1,   653,    -1,
-      -1,    -1,    -1,   658,   659,    -1,    -1,   662,   663,    -1,
-      -1,    -1,    -1,    -1,   669,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1103,    -1,    -1,    -1,    -1,  1108,    -1,
-     513,    -1,    -1,   688,    -1,    -1,  1116,    -1,    -1,    -1,
-      -1,    -1,    -1,   526,    -1,    -1,    -1,    -1,   531,    -1,
-      -1,   534,    -1,    -1,    -1,    -1,   711,   712,    -1,    -1,
-      -1,    -1,    -1,   546,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1152,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1164,   568,    -1,  1167,    -1,  1169,
-      -1,    -1,   747,   748,    -1,   578,    -1,   752,   753,    -1,
-      -1,    -1,   585,  1183,  1184,    -1,    -1,   590,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1205,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   797,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     805,    -1,    -1,    -1,    -1,    -1,   639,   812,   813,    -1,
-      -1,   816,    -1,   818,    -1,   648,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   828,  1254,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  1553,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    -1,    -1,    30,
-      31,    32,    33,    -1,    -1,    36,    -1,    -1,    39,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   901,    -1,    -1,    -1,
-    1330,    -1,  1332,   908,   909,   910,    67,   912,    69,    -1,
-      71,   916,    -1,    74,    75,   748,  1346,   750,  1348,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   760,    -1,    -1,
-      -1,    -1,   937,   938,   767,    -1,  1366,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     111,    -1,  1382,  1383,    -1,    -1,    -1,   118,   119,   964,
-      -1,    -1,    -1,  1393,    -1,    -1,  1396,    -1,    -1,   974,
-      -1,    -1,    -1,    -1,    -1,    -1,   809,   810,    -1,    -1,
-     813,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1419,
-      -1,   996,   997,    -1,   827,    -1,    -1,    -1,  1428,    -1,
-      -1,  1431,  1007,  1433,  1434,  1435,    -1,    -1,  1013,  1014,
-      -1,  1016,  1017,  1018,    -1,    -1,    -1,    -1,    -1,   283,
-      -1,   285,   286,  1028,  1029,    37,    38,    -1,    40,   293,
-     294,    -1,    -1,    -1,   867,    -1,    -1,    -1,   871,    -1,
-      -1,    -1,    -1,   307,   308,  1475,    -1,  1477,    -1,  1479,
-      -1,    -1,    -1,    -1,    66,    -1,    -1,    -1,    -1,    -1,
-      72,    -1,    -1,    -1,    76,  1495,    -1,    79,    80,    81,
-      82,    83,    84,    -1,    86,    87,   909,    -1,    -1,    -1,
-      -1,   345,    -1,    -1,    -1,    -1,  1091,    -1,  1093,    -1,
-      -1,    -1,    -1,  1098,    -1,    -1,    -1,   109,    -1,   111,
-      -1,    -1,  1107,    -1,    -1,    -1,   118,   119,   120,   121,
-     122,   123,    -1,    -1,    -1,   948,    -1,   381,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1132,  1133,  1134,
-      -1,   964,   965,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   978,    -1,    -1,    -1,    -1,
-      -1,   984,  1157,    -1,   987,    -1,   989,    -1,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,  1010,    30,    31,
-      32,    -1,    -1,    -1,    -1,    -1,    -1,    39,  1021,    -1,
-      37,    38,    -1,    40,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1043,    -1,  1045,  1218,    -1,    67,    -1,    -1,    -1,    66,
-      -1,    -1,    74,    75,    -1,    72,    78,  1060,  1061,    76,
-      -1,  1236,    79,    80,    81,    82,    83,    84,    -1,    86,
-      87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1081,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   109,    -1,   111,
-      -1,    -1,   109,    -1,   111,    -1,   118,   119,    -1,    -1,
-      -1,   118,   119,   120,   121,   122,   123,    -1,    -1,    -1,
-      -1,    -1,    -1,  1288,  1289,   549,   550,   551,   552,   553,
-     554,   555,   556,   557,   558,   559,   560,   561,   562,   563,
-     564,   565,   566,    -1,    -1,  1138,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1157,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1172,
-    1173,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    -1,    -1,    30,    31,    32,    33,    -1,
-      -1,    36,    37,    38,    39,    40,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1413,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1252,
-      -1,    66,    67,    -1,    69,    -1,    71,    72,    -1,    74,
-      75,    76,   696,    -1,    79,    80,    81,    82,    83,    84,
-      -1,    86,    87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   109,    -1,   111,    -1,    -1,    -1,
-      -1,    -1,    -1,   118,   119,   120,   121,   122,   123,    -1,
-      -1,    -1,    -1,  1316,    -1,    -1,  1319,   132,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   759,    -1,    -1,  1503,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    -1,    -1,    30,
-      31,    32,    -1,  1528,  1529,    -1,   790,    -1,    39,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1553,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,
-      -1,    -1,    -1,    74,    75,    -1,    -1,    -1,    -1,    -1,
-    1403,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,   118,   119,    30,
-      31,    32,    33,    -1,    -1,    36,    37,    38,    39,    40,
-      41,    -1,    43,    -1,    -1,    46,    47,    48,    49,    50,
-      51,    52,    53,    -1,    -1,    -1,    57,    -1,    -1,    -1,
-      61,    62,    -1,    64,    -1,    66,    67,   911,    69,    -1,
-      71,    72,  1485,    74,    75,    76,    -1,    -1,    79,    80,
-      81,    82,    83,    84,    -1,    86,    87,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    -1,    -1,   109,    -1,
-     111,    -1,   956,   114,    -1,    -1,    39,   118,   119,   120,
-     121,   122,   123,    -1,    -1,  1538,    -1,   128,    -1,    -1,
-      -1,   132,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,    -1,    -1,
-     994,    -1,    -1,    -1,    -1,    78,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1007,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    -1,    -1,    30,
-      31,    32,    33,    -1,  1048,    36,    37,    38,    39,    40,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    -1,    -1,
-      30,    31,    32,    -1,    -1,    66,    67,    -1,    69,    39,
-      71,    72,    -1,    74,    75,    76,    -1,    -1,    79,    80,
-      81,    82,    83,    84,    -1,    86,    87,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,    -1,
-      -1,    -1,    72,    -1,    74,    75,    -1,    -1,   109,    -1,
-     111,  1125,    -1,    83,    84,    -1,    -1,   118,   119,   120,
-     121,   122,   123,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    -1,    -1,    30,
-      31,    32,    -1,    -1,    -1,    -1,    37,    38,    39,    40,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1188,  1189,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    66,    67,    -1,    69,    -1,
-      71,    72,    -1,    74,    75,    76,    -1,    -1,    79,    80,
-      81,    82,    83,    84,    -1,    86,    87,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   109,    -1,
-     111,    -1,    -1,    -1,    -1,   116,    -1,   118,   119,   120,
-     121,   122,   123,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    -1,    -1,    30,
-      31,    32,    -1,    -1,    -1,    -1,    37,    38,    39,    40,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    -1,    -1,
-      30,    31,    32,    -1,    -1,    66,    67,    -1,    69,    39,
-      71,    72,    -1,    74,    75,    76,    -1,    -1,    79,    80,
-      81,    82,    83,    84,    -1,    86,    87,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,    -1,
-      -1,    -1,    72,    -1,    74,    75,    76,    -1,   109,    -1,
-     111,    -1,    -1,    83,    84,   116,    -1,   118,   119,   120,
-     121,   122,   123,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   109,
-      -1,   111,    -1,    -1,    -1,  1399,    -1,    -1,   118,   119,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1417,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      -1,    -1,    30,    31,    32,    -1,    -1,    -1,    -1,    37,
-      38,    39,    40,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    -1,    -1,    30,    31,    32,  1490,  1491,    66,    67,
-      -1,    69,    39,    71,    72,    -1,    74,    75,    76,    -1,
-      -1,    79,    80,    81,    82,    83,    84,    -1,    86,    87,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      67,    -1,    -1,    -1,    -1,    -1,    -1,    74,    75,    -1,
-      -1,   109,    -1,   111,    -1,    -1,    -1,    -1,   116,    -1,
-     118,   119,   120,   121,   122,   123,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      -1,    -1,    30,    31,    32,    -1,    -1,    -1,    -1,    37,
-      38,    39,    40,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    -1,    -1,    30,    31,    32,    -1,    -1,    66,    67,
-      -1,    69,    39,    71,    72,    -1,    74,    75,    76,    -1,
-      -1,    79,    80,    81,    82,    83,    84,    -1,    86,    87,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      67,    -1,    -1,    -1,    -1,    -1,    -1,    74,    75,    -1,
-      -1,   109,    -1,   111,    -1,    -1,    -1,    -1,    -1,    -1,
-     118,   119,   120,   121,   122,   123,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      -1,    -1,    30,    31,    32,    -1,    -1,    -1,    -1,    37,
-      38,    39,    40,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,    67,
-      -1,    69,    39,    71,    72,    -1,    74,    75,    76,    -1,
-      -1,    79,    80,    81,    82,    83,    84,    -1,    86,    87,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      67,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   109,    -1,   111,    -1,    -1,    -1,    -1,    -1,    -1,
-     118,   119,   120,   121,   122,   123,     4,     5,     6,     7,
+      27,    -1,    -1,    30,    31,    32,    -1,    -1,    -1,    -1,
+      37,    38,    39,    40,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    -1,    -1,    30,    31,    32,    -1,    -1,    66,
+      67,    -1,    69,    39,    71,    72,    -1,    74,    75,    76,
+      -1,    -1,    79,    80,    81,    82,    83,    84,    -1,    86,
+      87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    67,    -1,    -1,    -1,    -1,    -1,    -1,    74,    75,
+      -1,    -1,   109,    -1,   111,    -1,    -1,    -1,    -1,   116,
+     117,   118,   119,   120,   121,   122,     4,     5,     6,     7,
        8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
       18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
@@ -3653 +3085 @@
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   109,    -1,   111,    -1,    -1,    -1,    -1,    -1,    -1,
-     118,   119,   120,   121,   122,   123,     4,     5,     6,     7,
+      -1,   109,    -1,   111,    -1,    -1,    -1,    -1,    -1,   117,
+     118,   119,   120,   121,   122,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    -1,
+      -1,    30,    31,    32,    -1,    -1,    -1,    -1,    37,    38,
+      39,    40,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,    67,    -1,
+      69,    -1,    71,    72,    -1,    74,    75,    76,    -1,    -1,
+      79,    80,    81,    82,    83,    84,    -1,    86,    87,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     109,    -1,   111,    -1,    -1,    -1,    -1,    -1,   117,   118,
+     119,   120,   121,   122,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    -1,    -1,
+      30,    31,    32,    -1,    -1,    -1,    -1,    37,    38,    39,
+      40,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    66,    67,    -1,    69,
+      -1,    71,    72,    -1,    74,    75,    76,    -1,    -1,    79,
+      80,    81,    82,    83,    84,    -1,    86,    87,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   109,
+      -1,   111,    -1,    -1,    -1,    -1,    -1,   117,   118,   119,
+     120,   121,   122,     4,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    27,    -1,    -1,    30,
+      31,    32,    -1,    -1,    -1,    -1,    37,    38,    39,    40,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    66,    67,    -1,    69,    -1,
+      71,    72,    -1,    74,    75,    76,    -1,    -1,    79,    80,
+      81,    82,    83,    84,    -1,    86,    87,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   109,    -1,
+     111,    -1,    -1,    -1,    -1,    -1,   117,   118,   119,   120,
+     121,   122,     0,    -1,    -1,     3,     4,     5,     6,     7,
        8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
       18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      -1,    -1,    30,    31,    32,    -1,    -1,    -1,    -1,    37,
-      38,    39,    40,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    30,    31,    32,    33,    -1,    -1,    36,    -1,
+      -1,    39,    40,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,    67,
-      -1,    69,    -1,    71,    72,    -1,    74,    75,    76,    -1,
-      -1,    79,    80,    81,    82,    83,    84,    -1,    86,    87,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   109,    -1,   111,    -1,    -1,    -1,    -1,    -1,    -1,
-     118,   119,   120,   121,   122,   123,     3,     4,     5,     6,
-       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    -1,    -1,    30,    31,    32,    33,    -1,    -1,    36,
-      -1,    -1,    39,    40,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    -1,
-      67,    -1,    69,    -1,    71,    72,    -1,    74,    75,    76,
-      -1,    -1,    -1,    -1,    -1,    -1,    83,    84,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   109,    -1,   111,    -1,    -1,    -1,   115,    -1,
-      -1,   118,   119,     3,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    -1,    -1,
-      30,    31,    32,    33,    -1,    -1,    36,    -1,    -1,    39,
-      40,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    64,    -1,    -1,    67,    -1,    69,
-      -1,    71,    72,    -1,    74,    75,    76,    -1,    -1,    -1,
-      -1,    -1,    -1,    83,    84,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   109,
-      -1,   111,    -1,    -1,    -1,    -1,    -1,    -1,   118,   119,
-       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    -1,    30,    31,    32,
-      33,    -1,    -1,    36,    -1,    -1,    39,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    67,    -1,    69,    -1,    71,    -1,
-      -1,    74,    75,    -1,    -1,    78,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      -1,    -1,    30,    31,    32,    -1,    -1,    -1,   111,    -1,
-      -1,    39,    -1,    -1,    -1,   118,   119,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    67,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    -1,    67,
       -1,    69,    -1,    71,    72,    -1,    74,    75,    76,    -1,
       -1,    -1,    -1,    -1,    -1,    83,    84,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   109,    -1,   111,    -1,    -1,    -1,    -1,    -1,    -1,
-     118,   119,     4,     5,     6,     7,     8,     9,    10,    11,
+      -1,   109,    -1,   111,    -1,    -1,    -1,    -1,    -1,   117,
+     118,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,    -1,    -1,    30,    31,
+      32,    33,    -1,    -1,    36,    -1,    -1,    39,    40,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    -1,    67,    -1,    69,    -1,    71,
+      72,    -1,    74,    75,    76,    -1,    -1,    -1,    -1,    -1,
+      -1,    83,    84,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   109,    -1,   111,
+      -1,    -1,    -1,    -1,    -1,   117,   118,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    -1,    -1,    30,    31,    32,    -1,    -1,    -1,
+      -1,    -1,    -1,    39,    -1,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    -1,    -1,    30,    31,    32,    33,    34,
+      35,    67,    -1,    69,    39,    71,    72,    -1,    74,    75,
+      76,    -1,    -1,    -1,    -1,    -1,    -1,    83,    84,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    67,    -1,    -1,    -1,    -1,    -1,    -1,    74,
+      75,    -1,    -1,   109,    -1,   111,    -1,    -1,    -1,    -1,
+      -1,   117,   118,     3,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    -1,
+      30,    31,    32,    33,    -1,    -1,    36,    -1,    -1,    39,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,    69,
+      -1,    71,    -1,    -1,    74,    75,    -1,    -1,    78,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    -1,    -1,    30,    31,    32,    -1,    -1,
+      -1,   111,    -1,    -1,    39,    -1,    -1,   117,   118,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    67,    -1,    69,    -1,    71,    72,    -1,    74,
+      75,    76,    -1,    -1,    -1,    -1,    -1,    -1,    83,    84,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   109,    -1,   111,    -1,    -1,    -1,
+      -1,    -1,   117,   118,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    -1,    -1,
+      30,    31,    32,    -1,    -1,    -1,    -1,    -1,    -1,    39,
+      -1,    -1,    -1,    -1,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    -1,    -1,    30,    31,    32,    67,    -1,    69,
+      -1,    71,    -1,    39,    74,    75,    -1,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    67,    -1,    30,    31,    32,    -1,    -1,    74,    75,
+     110,   111,    39,    -1,    -1,    -1,    -1,   117,   118,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      67,    -1,    69,   109,    71,   111,    -1,    74,    75,    -1,
+      -1,   117,   118,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    96,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   111,    -1,    -1,    -1,    -1,    -1,
+     117,   118,     4,     5,     6,     7,     8,     9,    10,    11,
       12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
       22,    23,    24,    25,    26,    27,    -1,    -1,    30,    31,
@@ -3716 +3202 @@
       19,    20,    21,    22,    23,    24,    25,    26,    27,    -1,
       -1,    30,    31,    32,    -1,    67,    -1,    69,    -1,    71,
-      39,    -1,    74,    75,    -1,    -1,    -1,    -1,    -1,    -1,
+      39,    40,    74,    75,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    96,    -1,    -1,    -1,    67,    -1,
-      -1,    -1,    -1,    72,    -1,    74,    75,    76,    -1,   111,
-      -1,    -1,    -1,    -1,    83,    84,   118,   119,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,   111,    -1,    30,    31,    32,    -1,    -1,   118,
-     119,    -1,    -1,    39,    -1,    -1,    -1,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    -1,    -1,    30,    31,    32,
-      -1,    67,    -1,    69,    -1,    71,    39,    -1,    74,    75,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      96,    -1,    -1,    -1,    67,    -1,    -1,    -1,    -1,    72,
-      -1,    74,    75,    -1,    -1,   111,    -1,    -1,    -1,    -1,
-      83,    84,   118,   119,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,   111,    -1,
-      30,    31,    32,    -1,    -1,   118,   119,    -1,    -1,    39,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,    69,
-      -1,    71,    -1,    -1,    74,    75,    -1,     4,     5,     6,
+      -1,    -1,    -1,    -1,    -1,    74,    75,    -1,    -1,   111,
+      -1,    -1,    -1,    -1,    -1,   117,   118,     4,     5,     6,
        7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
       17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    -1,    -1,    30,    31,    32,    -1,    -1,    -1,    -1,
-      -1,   111,    39,    -1,    -1,    -1,    -1,    -1,   118,   119,
+      27,    -1,   111,    30,    31,    32,   115,    -1,   117,   118,
+      -1,    -1,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -3751 +3218 @@
       24,    25,    26,    27,    -1,    -1,    30,    31,    32,    -1,
       -1,    -1,    -1,    -1,   111,    39,    -1,    -1,    -1,    -1,
-      -1,   118,   119,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     117,   118,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    67,    -1,    69,    -1,    71,    -1,    -1,
@@ -3758 +3225 @@
       21,    22,    23,    24,    25,    26,    27,    -1,    -1,    30,
       31,    32,    -1,    -1,    -1,    -1,    -1,   111,    39,    -1,
-      -1,    -1,    -1,    -1,   118,   119,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   117,   118,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,    69,    -1,
-      71,    -1,    -1,    74,    75,    10,    11,    12,    13,    14,
+      71,    -1,    -1,    74,    75,    -1,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      -1,    -1,    30,    31,    32,    -1,    -1,    -1,    -1,    -1,
+     111,    39,    -1,    -1,    -1,    -1,   117,   118,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    67,
+      -1,    69,    -1,    71,    -1,    -1,    74,    75,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,    -1,    -1,    30,    31,
+      32,    -1,    -1,    -1,    -1,    37,    38,    39,    40,    -1,
+      -1,    -1,    -1,   111,    -1,    -1,    -1,    -1,    -1,   117,
+     118,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    66,    67,    -1,    -1,    -1,    -1,
+      72,    -1,    74,    75,    76,    -1,    -1,    79,    80,    81,
+      82,    83,    84,    -1,    86,    87,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   109,    -1,   111,
+      -1,    -1,   114,    -1,    -1,   117,   118,   119,   120,   121,
+     122,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    -1,
+      -1,    30,    31,    32,    -1,    -1,    -1,    -1,    37,    38,
+      39,    40,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      -1,    -1,    30,    31,    32,    -1,    -1,    66,    67,    -1,
+      -1,    39,    -1,    72,    -1,    74,    75,    76,    -1,    -1,
+      79,    80,    81,    82,    83,    84,    -1,    86,    87,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    67,
+      -1,    -1,    -1,    -1,    72,    -1,    74,    75,    76,    -1,
+     109,   110,   111,    -1,    -1,    83,    84,    -1,   117,   118,
+     119,   120,   121,   122,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    -1,   111,    30,    31,    32,    -1,    -1,   117,
+     118,    37,    38,    39,    40,    10,    11,    12,    13,    14,
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
       25,    26,    27,    -1,    -1,    30,    31,    32,    -1,    -1,
-      -1,    -1,    37,    38,    39,    40,    -1,    -1,    -1,    -1,
-     111,    -1,    -1,    -1,    -1,    -1,    -1,   118,   119,    -1,
+      66,    67,    -1,    -1,    39,    -1,    72,    -1,    74,    75,
+      76,    -1,    -1,    79,    80,    81,    82,    83,    84,    -1,
+      86,    87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    67,    -1,    -1,    -1,    -1,    72,    -1,    74,
+      75,    -1,    -1,   109,    -1,   111,    -1,    -1,    83,    84,
+      -1,   117,   118,   119,   120,   121,   122,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,    26,    27,    -1,   111,    30,    31,    32,
+      -1,    -1,   117,   118,    37,    38,    39,    40,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,    -1,    -1,    30,    31,
+      32,    -1,    -1,    66,    67,    -1,    -1,    39,    40,    72,
+      -1,    74,    75,    76,    -1,    -1,    79,    80,    81,    82,
+      83,    84,    -1,    86,    87,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,    -1,
+      -1,    -1,    74,    75,    -1,    -1,   109,    -1,   111,    -1,
+      -1,    -1,    -1,    -1,   117,   118,   119,   120,   121,   122,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    -1,   111,
+      30,    31,    32,   115,    -1,   117,   118,    37,    38,    39,
+      40,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    -1,
+      -1,    30,    31,    32,    -1,    -1,    66,    67,    -1,    -1,
+      39,    40,    72,    -1,    74,    75,    76,    -1,    -1,    79,
+      80,    81,    82,    83,    84,    -1,    86,    87,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,
+      -1,    -1,    -1,    -1,    -1,    74,    75,    -1,    -1,   109,
+      -1,   111,    -1,    -1,    -1,    -1,    -1,   117,   118,   119,
+     120,   121,   122,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    -1,   111,    30,    31,    32,   115,    -1,   117,   118,
+      37,    38,    39,    40,    -1,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    -1,    30,    31,    32,    -1,    66,
+      67,    -1,    -1,    -1,    39,    72,    -1,    74,    75,    76,
+      -1,    -1,    79,    80,    81,    82,    83,    84,    -1,    86,
+      87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    67,    -1,    -1,    -1,    -1,    72,    -1,    74,
+      75,    76,   109,    78,   111,    -1,    -1,    -1,    83,    84,
+     117,   118,   119,   120,   121,   122,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    66,    67,    -1,    -1,    -1,    -1,    72,    -1,    74,
-      75,    76,    -1,    -1,    79,    80,    81,    82,    83,    84,
-      -1,    86,    87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   109,    -1,   111,    -1,    -1,    -1,
+      -1,    -1,   117,   118,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,    -1,    30,    31,    32,    -1,    -1,    -1,
+      -1,    -1,    -1,    39,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    -1,    -1,    30,    31,    32,    -1,    -1,    -1,
+      -1,    67,    -1,    39,    -1,    -1,    72,    -1,    74,    75,
+      76,    -1,    78,    -1,    -1,    -1,    -1,    83,    84,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   109,    -1,   111,    -1,    -1,   114,
-      -1,    -1,    -1,   118,   119,   120,   121,   122,   123,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    -1,    -1,    30,
-      31,    32,    -1,    -1,    -1,    -1,    37,    38,    39,    40,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    66,    67,    30,    31,    32,
-      -1,    72,    -1,    74,    75,    76,    39,    -1,    79,    80,
-      81,    82,    83,    84,    -1,    86,    87,    -1,    -1,    -1,
+      -1,    67,    -1,    -1,    -1,    -1,    72,    -1,    74,    75,
+      76,    -1,    -1,    -1,    -1,   111,    -1,    83,    84,    -1,
+      -1,   117,   118,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,   109,   110,
-     111,    74,    75,    -1,    -1,    -1,    -1,   118,   119,   120,
-     121,   122,   123,    10,    11,    12,    13,    14,    15,    16,
+      -1,    -1,    -1,   109,    -1,   111,    -1,    -1,    -1,    -1,
+      -1,   117,   118,    10,    11,    12,    13,    14,    15,    16,
       17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    -1,    -1,    30,    31,    32,   109,    -1,   111,    -1,
-      37,    38,    39,    40,    -1,   118,   119,    -1,    -1,    -1,
-      -1,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    66,
-      67,    30,    31,    32,    -1,    72,    -1,    74,    75,    76,
-      39,    -1,    79,    80,    81,    82,    83,    84,    -1,    86,
-      87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      27,    -1,    -1,    30,    31,    32,    -1,    -1,    -1,    -1,
+      -1,    -1,    39,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    -1,    30,    31,    32,    -1,    -1,    -1,    -1,
+      67,    -1,    39,    -1,    -1,    72,    -1,    74,    75,    76,
+      -1,    -1,    -1,    -1,    -1,    -1,    83,    84,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      67,    -1,    -1,    -1,    -1,    -1,    -1,    74,    75,    -1,
+      -1,    78,   109,    -1,   111,    -1,    -1,    -1,    -1,    -1,
+     117,   118,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   109,    -1,   111,    -1,    -1,    -1,    -1,    -1,
+     117,   118,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      28,    -1,    30,    31,    32,    -1,    -1,    -1,    -1,    -1,
+      -1,    39,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      -1,    -1,    30,    31,    32,    -1,    -1,    -1,    -1,    67,
+      -1,    39,    -1,    -1,    -1,    -1,    74,    75,    -1,    -1,
+      78,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    67,
+      -1,    30,    31,    32,    -1,    -1,    74,    75,    -1,    -1,
+      39,    -1,    -1,   111,    -1,    -1,    -1,    -1,    -1,   117,
+     118,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,
-      -1,    -1,   109,    -1,   111,    74,    75,    -1,    -1,    -1,
-      -1,   118,   119,   120,   121,   122,   123,    10,    11,    12,
+      -1,    -1,    -1,   111,    -1,    74,    75,    -1,    -1,   117,
+     118,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    -1,
+      -1,    30,    31,    32,    -1,    -1,    -1,    -1,    -1,    -1,
+      39,    -1,   111,    -1,    -1,    -1,    -1,    -1,   117,   118,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    67,    -1,
+      30,    31,    32,    -1,    -1,    74,    75,    -1,    -1,    39,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    -1,    -1,
+      30,    31,    32,    -1,    -1,    -1,    -1,    67,    -1,    39,
+      -1,    -1,   111,    -1,    74,    75,    -1,    -1,   117,   118,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,    -1,
+      -1,    -1,    -1,    -1,    74,    75,    -1,    -1,    -1,    -1,
+      -1,   111,    -1,    -1,    -1,    -1,    -1,   117,   118,    -1,
+      -1,    -1,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      -1,   111,    30,    31,    32,    -1,    -1,   117,   118,    -1,
+      -1,    39,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      -1,    -1,    30,    31,    32,    -1,    -1,    -1,    -1,    67,
+      -1,    39,    -1,    -1,    -1,    -1,    74,    75,    -1,    -1,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    -1,    67,
+      30,    31,    32,    -1,    -1,    -1,    74,    75,    -1,    39,
+      -1,    -1,    -1,   111,    -1,    -1,    -1,    -1,    -1,   117,
+     118,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,    -1,
+      -1,    -1,    -1,   111,    74,    75,    -1,    -1,    -1,   117,
+     118,     4,     5,     6,     7,     8,     9,    10,    11,    12,
       13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
       23,    24,    25,    26,    27,    -1,    -1,    30,    31,    32,
-      -1,    -1,   111,    -1,    37,    38,    39,    40,    -1,   118,
-     119,    -1,    -1,    -1,    -1,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    66,    67,    30,    31,    32,    -1,    72,
-      -1,    74,    75,    76,    39,    -1,    79,    80,    81,    82,
-      83,    84,    -1,    86,    87,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    39,   117,   118,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    67,    -1,    -1,    -1,   109,    -1,   111,    74,
-      75,    -1,    -1,    -1,    -1,   118,   119,   120,   121,   122,
-     123,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    -1,
-      -1,    30,    31,    32,    -1,    -1,   111,    -1,    37,    38,
-      39,    40,    -1,   118,   119,    -1,    -1,    -1,    -1,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    66,    67,    30,
-      31,    32,    -1,    72,    -1,    74,    75,    76,    39,    -1,
-      79,    80,    81,    82,    83,    84,    -1,    86,    87,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,
-     109,    -1,   111,    74,    75,    -1,    -1,    -1,    -1,   118,
-     119,   120,   121,   122,   123,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    -1,    -1,    30,    31,    32,    -1,    -1,
-     111,    -1,    37,    38,    39,    40,    -1,   118,   119,    -1,
-      -1,    -1,    -1,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    66,    67,    30,    31,    32,    -1,    72,    -1,    74,
-      75,    76,    39,    -1,    79,    80,    81,    82,    83,    84,
-      -1,    86,    87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    67,    -1,    69,    -1,    71,    -1,
+      -1,    74,    75,    37,    38,    -1,    40,    41,    -1,    43,
+      -1,    -1,    46,    47,    48,    49,    50,    51,    52,    53,
+      -1,    -1,    56,    57,    -1,    -1,    -1,    61,    62,    -1,
+      64,    -1,    66,    -1,    -1,    -1,    -1,   110,    72,    -1,
+      -1,    -1,    76,    -1,    -1,    79,    80,    81,    82,    83,
+      84,    -1,    86,    87,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      67,    -1,    -1,    -1,   109,    -1,   111,    74,    75,    -1,
-      -1,    -1,    -1,   118,   119,   120,   121,   122,   123,     3,
-       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,   111,    -1,    30,    31,    32,    -1,
-      -1,   118,   119,    -1,    -1,    39,    -1,    -1,    -1,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    -1,    30,
-      31,    32,    -1,    67,    -1,    69,    -1,    71,    39,    -1,
-      74,    75,    -1,    -1,    -1,    -1,    -1,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    67,    30,    31,    32,
-      -1,    72,    -1,    74,    75,    76,    39,    78,    -1,    -1,
-     114,    -1,    83,    84,    -1,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    -1,    67,    30,    31,    32,   109,    72,
-     111,    74,    75,    76,    39,    78,    -1,   118,   119,    -1,
-      83,    84,    -1,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    -1,    67,    30,    31,    32,    -1,    72,   111,    74,
-      75,    76,    39,    -1,    -1,   118,   119,    -1,    83,    84,
-      -1,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    -1,
-      67,    30,    31,    32,   109,    72,   111,    74,    75,    76,
-      39,    -1,    -1,   118,   119,    -1,    83,    84,    -1,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    -1,    67,    30,
-      31,    32,   109,    72,   111,    74,    75,    76,    39,    40,
-      -1,   118,   119,    -1,    83,    84,    -1,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    67,    30,    31,    32,
-     109,    -1,   111,    74,    75,    -1,    39,    -1,    -1,   118,
-     119,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,    -1,    -1,
-     111,    74,    75,    -1,   115,    78,    -1,   118,   119,    -1,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    -1,    -1,
-      30,    31,    32,    -1,    -1,    -1,    -1,    -1,   111,    39,
-      40,    -1,    -1,    -1,    -1,   118,   119,    -1,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    -1,    67,    30,    31,
-      32,    -1,    -1,    -1,    74,    75,    -1,    39,    40,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    -1,    -1,    30,
-      31,    32,    -1,    -1,    -1,    67,    -1,    -1,    39,    -1,
-      -1,   111,    74,    75,    -1,   115,    -1,    -1,   118,   119,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,
-      -1,    -1,    -1,    74,    75,    -1,    -1,    -1,    -1,   111,
-      -1,    -1,    -1,   115,    -1,    -1,   118,   119,    -1,    -1,
-      -1,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    -1,
-     111,    30,    31,    32,    -1,    -1,    -1,   118,   119,    -1,
-      39,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    -1,
-      -1,    30,    31,    32,    -1,    -1,    -1,    -1,    67,    -1,
-      39,    -1,    -1,    -1,    -1,    74,    75,    -1,    -1,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    -1,    67,    30,
-      31,    32,    33,    34,    35,    74,    75,    -1,    39,    -1,
-      -1,    -1,   111,    -1,    -1,    -1,    -1,    -1,    -1,   118,
-     119,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,    -1,    -1,
-      -1,    -1,   111,    74,    75,    -1,    -1,    -1,    -1,   118,
-     119,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    -1,    -1,    30,    31,    32,
-      -1,    -1,    -1,    -1,    -1,    -1,    39,    -1,    37,    38,
-      -1,    40,    41,    -1,    43,    -1,    -1,    46,    47,    48,
-      49,    50,    51,    52,    53,    -1,    -1,    56,    57,    -1,
-      -1,    -1,    61,    62,    67,    64,    69,    66,    71,    -1,
-      -1,    74,    75,    72,    -1,    -1,    -1,    76,    -1,    -1,
-      79,    80,    81,    82,    83,    84,    -1,    86,    87,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   110,    -1,    -1,
-     109,    -1,   111,    -1,    -1,   114,    -1,    -1,    -1,   118,
-     119,   120,   121,   122,   123,    -1,    -1,    -1,    -1,   128,
-      -1,    37,    38,   132,    40,    41,    -1,    43,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   109,    -1,   111,    -1,    -1,
+     114,    -1,    -1,   117,   118,   119,   120,   121,   122,    -1,
+      -1,    37,    38,   127,    40,    41,    -1,    43,   132,    -1,
       46,    47,    48,    49,    50,    51,    52,    53,    -1,    -1,
       -1,    57,    -1,    -1,    -1,    61,    62,    -1,    64,    -1,
@@ -3914 +3401 @@
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,   109,    -1,   111,    -1,    -1,   114,    -1,
-      -1,    -1,   118,   119,   120,   121,   122,   123,    -1,    -1,
-      -1,    -1,   128,    -1,    -1,    -1,   132,     4,     5,     6,
+      -1,   117,   118,   119,   120,   121,   122,    -1,    -1,    -1,
+      -1,   127,    -1,    -1,    -1,    -1,   132,     4,     5,     6,
        7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
       17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
@@ -3927 +3414 @@
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,   109,    -1,   111,    -1,
-      -1,   114,    -1,    -1,    -1,   118,   119,   120,   121,   122,
-     123,    -1,    -1,    37,    38,   128,    40,    41,    -1,    43,
-      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
-      -1,    -1,    -1,    57,    -1,    -1,    -1,    61,    62,    -1,
-      64,    -1,    66,    -1,    -1,    -1,    -1,    -1,    72,    -1,
-      -1,    -1,    76,    -1,    -1,    79,    80,    81,    82,    83,
-      84,    -1,    86,    87,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   109,    -1,   111,    -1,    -1,
-     114,    -1,    -1,    -1,   118,   119,   120,   121,   122,   123,
-      -1,    -1,    37,    38,   128,    40,    41,    -1,    43,    -1,
-      -1,    46,    47,    48,    49,    50,    51,    52,    53,    -1,
+      -1,   114,    -1,    -1,   117,   118,   119,   120,   121,   122,
+      -1,    -1,    37,    38,   127,    40,    41,    -1,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    -1,
       -1,    -1,    57,    -1,    -1,    -1,    61,    62,    -1,    64,
       -1,    66,    -1,    -1,    -1,    -1,    -1,    72,    -1,    -1,
       -1,    76,    -1,    -1,    79,    80,    81,    82,    83,    84,
       -1,    86,    87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      37,    38,    -1,    40,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,   109,    -1,   111,    -1,    -1,   114,
-      -1,    -1,    -1,   118,   119,   120,   121,   122,   123,    66,
-      -1,    -1,    -1,   128,    -1,    72,    -1,    -1,    -1,    76,
+      -1,    -1,   117,   118,   119,   120,   121,   122,    -1,    -1,
+      37,    38,   127,    40,    41,    -1,    43,    -1,    -1,    46,
+      47,    48,    49,    50,    51,    52,    53,    -1,    -1,    -1,
+      57,    -1,    -1,    -1,    61,    62,    -1,    64,    -1,    66,
+      -1,    -1,    -1,    -1,    -1,    72,    -1,    -1,    -1,    76,
       -1,    -1,    79,    80,    81,    82,    83,    84,    -1,    86,
-      87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,
-      -1,    40,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   109,    -1,   111,    -1,    -1,    37,    38,    -1,
-      40,   118,   119,   120,   121,   122,   123,    66,    -1,    -1,
-      -1,    -1,    -1,    72,    -1,    -1,    -1,    76,    -1,    -1,
-      79,    80,    81,    82,    83,    84,    66,    86,    87,    -1,
+      87,    -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,
+      40,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   109,    -1,   111,    -1,    -1,   114,    -1,    -1,
+     117,   118,   119,   120,   121,   122,    66,    -1,    -1,    -1,
+     127,    -1,    72,    -1,    -1,    -1,    76,    -1,    -1,    79,
+      80,    81,    82,    83,    84,    -1,    86,    87,    -1,    -1,
+      -1,    -1,    -1,    -1,    37,    38,    -1,    40,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   109,
+      -1,   111,    -1,    -1,   114,    -1,    -1,   117,   118,   119,
+     120,   121,   122,    66,    -1,    -1,    -1,    -1,    -1,    72,
+      -1,    -1,    -1,    76,    -1,    -1,    79,    80,    81,    82,
+      83,    84,    -1,    86,    87,    -1,    -1,    -1,    -1,    -1,
+      -1,    37,    38,    -1,    40,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   109,    -1,   111,    -1,
+      37,    38,    -1,    40,   117,   118,   119,   120,   121,   122,
+      66,    -1,    -1,    -1,    -1,    -1,    72,    -1,    -1,    -1,
+      76,    -1,    -1,    79,    80,    81,    82,    83,    84,    66,
+      86,    87,    -1,    -1,    -1,    72,    -1,    -1,    -1,    76,
+      -1,    -1,    79,    80,    81,    82,    83,    84,    -1,    86,
+      87,    -1,    -1,   109,    -1,   111,    -1,    37,    38,    -1,
+      40,   117,   118,   119,   120,   121,   122,    -1,    -1,    -1,
+      -1,    -1,   109,    -1,   111,    -1,    37,    38,    -1,    40,
+     117,   118,   119,   120,   121,   122,    66,    -1,    -1,    -1,
       -1,    -1,    72,    -1,    -1,    -1,    76,    -1,    -1,    79,
-      80,    81,    82,    83,    84,    -1,    86,    87,    -1,    -1,
-     109,    -1,    -1,    -1,    -1,    37,    38,    -1,    40,   118,
-     119,   120,   121,   122,   123,    -1,    -1,    -1,    -1,   109,
-      -1,    -1,    -1,    -1,    37,    38,    -1,    40,   118,   119,
-     120,   121,   122,   123,    66,    -1,    -1,    -1,    -1,    -1,
-      72,    -1,    -1,    -1,    76,    -1,    -1,    79,    80,    81,
-      82,    83,    84,    66,    86,    87,    -1,    -1,    -1,    72,
-      -1,    -1,    -1,    76,    -1,    -1,    79,    80,    81,    82,
-      83,    84,    -1,    86,    87,    -1,    -1,   109,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   118,   119,   120,   121,
-     122,   123,    -1,    -1,    -1,    -1,   109,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   118,   119,   120,   121,   122,
-     123,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      80,    81,    82,    83,    84,    66,    86,    87,    -1,    -1,
+      -1,    72,    -1,    -1,    -1,    76,    -1,    -1,    79,    80,
+      81,    82,    83,    84,    -1,    86,    87,    -1,    -1,   109,
+      -1,    -1,    -1,    37,    38,    -1,    40,   117,   118,   119,
+     120,   121,   122,    -1,    -1,    -1,    -1,    -1,   109,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   117,   118,   119,   120,
+     121,   122,    66,    -1,    -1,    -1,    -1,    -1,    72,    -1,
+      -1,    -1,    76,    -1,    -1,    79,    80,    81,    82,    83,
+      84,    -1,    86,    87,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   109,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   117,   118,   119,   120,   121,   122,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    39,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    67,    -1,    69,    -1,    71,    72,    -1,    74,
+      75,    76,    -1,    -1,    -1,    -1,    -1,    -1,    83,    84,
+       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
       13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    -1,    -1,    -1,    -1,    -1,
+      23,    24,    25,    26,    27,    -1,    -1,    30,    31,    32,
       -1,    -1,    -1,    -1,    -1,    -1,    39,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    67,    -1,    69,    -1,    71,    72,
-      -1,    74,    75,    76,    -1,    -1,    -1,    -1,    -1,    -1,
-      83,    84,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    -1,    -1,    30,
-      31,    32,    -1,    -1,    -1,    -1,    -1,    -1,    39,    -1,
+      -1,    -1,    -1,    -1,    67,    -1,    69,    -1,    71,    -1,
+      -1,    74,    75,     3,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    -1,    -1,
+      30,    31,    32,    -1,    -1,    -1,    -1,    -1,    -1,    39,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,    69,    -1,
-      71,    -1,    -1,    74,    75,     3,     4,     5,     6,     7,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    67,    -1,    69,
+      -1,    71,    -1,    -1,    74,    75,     4,     5,     6,     7,
        8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
       18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
@@ -3989 +3494 @@
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    67,
-      -1,    69,    -1,    71,    -1,    -1,    74,    75,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    -1,    -1,    30,    31,    32,    -1,    -1,    -1,
-      -1,    -1,    -1,    39,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    67,    -1,    69,    -1,    71,    -1,    -1,    74,    75
+      -1,    69,    -1,    71,    -1,    -1,    74,    75
 };
 
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
 static const yytype_uint16 yystos[] =
 {
@@ -4007 +3505 @@
       22,    23,    24,    25,    26,    27,    30,    31,    32,    33,
       36,    39,    40,    64,    67,    69,    71,    72,    74,    75,
-      76,    83,    84,   109,   111,   118,   119,   137,   140,   149,
+      76,    83,    84,   109,   111,   117,   118,   137,   140,   149,
      198,   212,   213,   214,   215,   216,   217,   218,   219,   220,
      221,   222,   223,   224,   225,   226,   227,   228,   229,   231,
-     232,   233,   234,   235,   236,   237,   238,   240,   241,   242,
-     243,   244,   245,   247,   255,   256,   283,   284,   285,   293,
-     296,   302,   303,   305,   307,   308,   314,   319,   323,   324,
-     325,   326,   327,   328,   329,   330,   350,   367,   368,   369,
-     370,    72,   139,   140,   149,   215,   217,   225,   227,   237,
-     241,   243,   284,    82,   109,   312,   313,   314,   312,   312,
-      72,    74,    75,    76,   138,   139,   273,   274,   294,   295,
-      74,    75,   274,   109,   305,    11,   199,   109,   149,   319,
-     324,   325,   326,   328,   329,   330,   112,   134,   111,   218,
-     225,   227,   323,   327,   366,   367,   370,   371,   135,   107,
-     131,   277,   114,   135,   173,    74,    75,   137,   272,   135,
-     135,   135,   116,   135,    74,    75,   109,   149,   309,   318,
-     319,   320,   321,   322,   323,   327,   331,   332,   333,   334,
-     335,   341,     3,    28,    78,   239,     3,     5,    74,   111,
-     149,   217,   228,   232,   235,   244,   285,   323,   327,   370,
-     215,   217,   227,   237,   241,   243,   284,   323,   327,    33,
-     233,   233,   228,   235,   135,   233,   228,   233,   228,    75,
-     109,   114,   274,   285,   114,   274,   233,   228,   116,   135,
-     135,     0,   134,   109,   173,   312,   312,   134,   111,   225,
-     227,   368,   272,   272,   131,   227,   109,   149,   309,   319,
-     323,   111,   149,   370,   306,   230,   314,   109,   290,   109,
-     109,    51,   109,    37,    38,    40,    66,    72,    76,    79,
-      80,    81,    82,    86,    87,   109,   111,   120,   121,   122,
-     123,   136,   140,   141,   142,   143,   148,   149,   150,   151,
-     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
-     162,   164,   167,   225,   276,   292,   366,   371,   227,   110,
-     110,   110,   110,   110,   110,   110,    74,    75,   111,   225,
-     272,   350,   368,   111,   118,   149,   164,   217,   218,   224,
-     227,   231,   232,   237,   240,   241,   243,   262,   263,   267,
-     268,   269,   270,   284,   350,   362,   363,   364,   365,   370,
-     371,   112,   109,   323,   327,   370,   109,   116,   132,   111,
-     114,   149,   164,   278,   278,   115,   134,   116,   132,   109,
-     116,   132,   116,   132,   116,   132,   312,   132,   319,   320,
-     321,   322,   332,   333,   334,   335,   227,   318,   331,    64,
-     311,   111,   312,   349,   350,   312,   312,   173,   134,   109,
-     312,   349,   312,   312,   227,   309,   109,   109,   226,   227,
-     225,   227,   112,   134,   225,   366,   371,   173,   134,   272,
-     277,   217,   232,   323,   327,   173,   134,   294,   227,   237,
-     132,   227,   227,   292,   248,   246,   258,   274,   257,   227,
-     294,   132,   132,   305,   134,   139,   271,     3,   135,   207,
-     208,   222,   224,   227,   134,   311,   109,   311,   164,   319,
-     227,   109,   134,   272,   114,    33,    34,    35,   225,   286,
-     287,   289,   134,   129,   131,   291,   134,   228,   234,   235,
-     272,   315,   316,   317,   109,   141,   109,   148,   109,   148,
-     151,   109,   148,   109,   109,   148,   148,   111,   164,   169,
-     173,   225,   275,   366,   370,   112,   134,    82,    85,    86,
-      87,   109,   111,   113,   114,    97,    98,    99,   100,   101,
-     102,   103,   104,   105,   106,   131,   166,   151,   151,   118,
-     124,   125,   120,   121,    88,    89,    90,    91,   126,   127,
-      92,    93,   119,   128,   129,    94,    95,   130,   131,   373,
-     109,   149,   345,   346,   347,   348,   349,   110,   116,   109,
-     349,   350,   109,   349,   350,   134,   109,   225,   368,   112,
-     134,   135,   111,   225,   227,   361,   362,   370,   371,   135,
-     109,   111,   149,   319,   336,   337,   338,   339,   340,   341,
-     342,   343,   344,   350,   351,   352,   353,   354,   355,   356,
-     149,   370,   227,   135,   135,   149,   225,   227,   363,   272,
-     225,   350,   363,   272,   109,   134,   134,   134,   112,   134,
-      72,    80,   111,   113,   140,   274,   278,   279,   280,   281,
-     282,   134,   134,   134,   134,   134,   134,   309,   110,   110,
-     110,   110,   110,   110,   110,   318,   331,   109,   277,   112,
-     207,   134,   309,   169,   276,   169,   276,   309,   111,   207,
-     311,   173,   134,   207,   110,    40,   111,   115,   225,   249,
-     250,   251,   366,   114,   116,   372,   131,   259,   114,   227,
-     264,   265,   266,   269,   270,   110,   116,   173,   134,   118,
-     164,   134,   224,   227,   263,   362,   370,   303,   304,   109,
-     149,   336,   110,   116,   373,   274,   286,   109,   114,   274,
-     276,   286,   110,   116,   109,   141,   110,   117,   275,   275,
-     275,   111,   139,   145,   164,   276,   275,   112,   134,   110,
-     116,   110,   109,   149,   349,   357,   358,   359,   360,   110,
-     116,   164,   111,   139,   111,   144,   145,   134,   111,   139,
-     144,   164,   151,   151,   151,   152,   152,   153,   153,   154,
-     154,   154,   154,   155,   155,   156,   157,   158,   159,   160,
-     117,   169,   164,   134,   346,   347,   348,   227,   345,   312,
-     312,   164,   276,   134,   271,   134,   225,   350,   363,   227,
-     231,   112,   112,   134,   370,   112,   109,   134,   319,   337,
-     338,   339,   342,   352,   353,   354,   112,   134,   227,   336,
-     340,   351,   109,   312,   355,   373,   312,   312,   373,   109,
-     312,   355,   312,   312,   312,   312,   350,   225,   361,   371,
-     272,   112,   116,   112,   116,   373,   225,   363,   373,   260,
-     261,   262,   263,   260,   260,   272,   164,   134,   111,   274,
-     117,   116,   372,   278,    80,   111,   117,   282,    29,   209,
-     210,   272,   260,   139,   309,   139,   311,   109,   349,   350,
-     109,   349,   350,   141,   350,   173,   264,   110,   110,   110,
-     110,   112,   173,   207,   173,   114,   250,   251,   112,   134,
-     109,   117,   149,   252,   254,   318,   319,   331,   357,   116,
-     132,   116,   132,   274,   248,   274,   115,   162,   163,   258,
-     135,   135,   139,   222,   135,   135,   260,   109,   149,   370,
-     135,   115,   227,   287,   288,   135,   134,   134,   109,   135,
-     110,   316,   169,   170,   117,   132,   111,   141,   200,   201,
-     202,   110,   116,   110,   134,   117,   110,   110,   110,   111,
-     164,   358,   359,   360,   227,   357,   312,   312,   114,   151,
-     167,   164,   165,   168,   116,   135,   134,   134,   110,   116,
-     164,   134,   115,   162,   117,   264,   110,   110,   110,   345,
-     264,   110,   260,   225,   363,   111,   118,   149,   164,   164,
-     227,   342,   264,   110,   110,   110,   110,   110,   110,   110,
-       7,   227,   336,   340,   351,   134,   134,   373,   134,   134,
-     110,   135,   135,   135,   135,   277,   135,   162,   163,   164,
-     310,   134,   278,   280,   115,   134,   211,   274,    40,    41,
-      43,    46,    47,    48,    49,    50,    51,    52,    53,    57,
-      61,    62,    72,   111,   128,   170,   171,   172,   173,   174,
-     175,   177,   178,   190,   192,   193,   198,   212,   308,    29,
-     135,   131,   277,   134,   134,   110,   135,   173,   248,   132,
-     132,   319,   163,   227,   253,   254,   253,   274,   312,   115,
-     259,   372,   110,   116,   112,   112,   135,   227,   116,   373,
-     290,   110,   286,   215,   217,   225,   298,   299,   300,   301,
-     292,   110,   110,   117,   163,   109,   110,   117,   116,   139,
-     164,   164,   112,   110,   110,   110,   357,   279,   116,   135,
-     168,   112,   139,   146,   147,   164,   145,   135,   146,   162,
-     167,   135,   109,   349,   350,   135,   135,   134,   135,   135,
-     135,   164,   110,   135,   109,   349,   350,   109,   355,   109,
-     355,   350,   226,     7,   118,   135,   164,   264,   264,   263,
-     267,   267,   268,   116,   116,   110,   110,   112,    96,   123,
-     135,   135,   146,   278,   164,   116,   132,   212,   216,   227,
-     231,   109,   109,   171,   109,   109,    72,   132,    72,   132,
-      72,   118,   170,   109,   173,   165,   165,   117,   112,   143,
-     132,   135,   134,   135,   211,   110,   164,   264,   264,   312,
-     110,   115,   252,   115,   134,   110,   134,   135,   309,   115,
-     134,   135,   135,   110,   114,   200,   112,   163,   132,   200,
-     202,   110,   116,   135,   109,   349,   350,   372,   165,   112,
-     135,    85,   113,   116,   135,   135,   112,   135,   110,   134,
-     110,   110,   112,   112,   112,   135,   110,   134,   134,   134,
-     164,   164,   135,   112,   135,   135,   135,   135,   134,   134,
-     163,   163,   112,   112,   135,   135,   274,   227,   169,   169,
-      47,   169,   134,   132,   132,   132,   169,   132,   169,    58,
-      59,    60,   194,   195,   196,   132,    63,   132,   312,   114,
-     175,   115,   132,   135,   135,    96,   269,   270,   110,   299,
-     116,   132,   116,   132,   115,   297,   117,   141,   110,   110,
-     117,   168,   112,   134,   115,   112,   111,   147,   111,   147,
-     147,   112,   112,   112,   264,   112,   264,   264,   264,   135,
-     135,   112,   112,   110,   110,   112,   116,    96,   263,    96,
-     135,   112,   112,   110,   110,   109,   110,   170,   191,   212,
-     132,   110,   109,   109,   173,   196,    58,    59,   164,   171,
-     144,   110,   110,   114,   134,   134,   298,   141,   203,   109,
-     132,   203,   135,   117,   264,   134,   134,   135,   135,   135,
+     232,   233,   234,   235,   236,   237,   239,   240,   241,   242,
+     243,   244,   246,   254,   255,   282,   283,   284,   292,   295,
+     301,   302,   304,   306,   307,   313,   318,   322,   323,   324,
+     325,   326,   327,   328,   329,   349,   366,   367,   368,   369,
+      72,   139,   140,   149,   215,   217,   225,   227,   236,   240,
+     242,   283,    82,   109,   311,   312,   313,   311,   311,    72,
+      74,    75,    76,   138,   139,   272,   273,   293,   294,    74,
+      75,   273,   109,   304,    11,   199,   109,   149,   318,   323,
+     324,   325,   327,   328,   329,   112,   134,   111,   218,   225,
+     227,   322,   326,   365,   366,   369,   370,   135,   107,   131,
+     276,   114,   135,   173,    74,    75,   137,   271,   135,   135,
+     135,   116,   135,    74,    75,   109,   149,   308,   317,   318,
+     319,   320,   321,   322,   326,   330,   331,   332,   333,   334,
+     340,     3,    28,    78,   238,     3,     5,    74,   111,   149,
+     217,   228,   232,   234,   243,   284,   322,   326,   369,   215,
+     217,   227,   236,   240,   242,   283,   322,   326,    33,   233,
+     233,   228,   234,   135,   233,   228,   233,   228,    75,   109,
+     114,   273,   284,   114,   273,   233,   228,   116,   135,   135,
+       0,   134,   109,   173,   311,   311,   134,   111,   225,   227,
+     367,   271,   271,   131,   227,   109,   149,   308,   318,   322,
+     111,   149,   369,   305,   230,   313,   109,   289,   109,   109,
+      51,   109,    37,    38,    40,    66,    72,    76,    79,    80,
+      81,    82,    86,    87,   109,   111,   119,   120,   121,   122,
+     136,   140,   141,   142,   143,   148,   149,   150,   151,   152,
+     153,   154,   155,   156,   157,   158,   159,   160,   161,   162,
+     164,   167,   225,   275,   291,   365,   370,   227,   110,   110,
+     110,   110,   110,   110,   110,    74,    75,   111,   225,   271,
+     349,   367,   111,   117,   149,   164,   217,   218,   224,   227,
+     231,   232,   236,   239,   240,   242,   261,   262,   266,   267,
+     268,   269,   283,   349,   361,   362,   363,   364,   369,   370,
+     112,   109,   322,   326,   369,   109,   116,   132,   111,   114,
+     149,   164,   277,   277,   115,   134,   116,   132,   109,   116,
+     132,   116,   132,   116,   132,   311,   132,   318,   319,   320,
+     321,   331,   332,   333,   334,   227,   317,   330,    64,   310,
+     111,   311,   348,   349,   311,   311,   173,   134,   109,   311,
+     348,   311,   311,   227,   308,   109,   109,   226,   227,   225,
+     227,   112,   134,   225,   365,   370,   173,   134,   271,   276,
+     217,   232,   322,   326,   173,   134,   293,   227,   236,   132,
+     227,   227,   291,   247,   245,   257,   273,   256,   227,   293,
+     132,   132,   304,   134,   139,   270,     3,   135,   207,   208,
+     222,   224,   227,   134,   310,   109,   310,   164,   318,   227,
+     109,   134,   271,   114,    33,    34,    35,   225,   285,   286,
+     288,   134,   128,   131,   290,   134,   228,   233,   234,   271,
+     314,   315,   316,   109,   141,   109,   148,   109,   148,   151,
+     109,   148,   109,   109,   148,   148,   111,   164,   169,   173,
+     225,   274,   365,   369,   112,   134,    82,    85,    86,    87,
+     109,   111,   113,   114,    97,    98,    99,   100,   101,   102,
+     103,   104,   105,   106,   131,   166,   151,   151,   117,   123,
+     124,   119,   120,    88,    89,    90,    91,   125,   126,    92,
+      93,   118,   127,   128,    94,    95,   129,   131,   372,   109,
+     149,   344,   345,   346,   347,   348,   110,   116,   109,   348,
+     349,   109,   348,   349,   134,   109,   225,   367,   112,   134,
+     135,   111,   225,   227,   360,   361,   369,   370,   135,   109,
+     111,   149,   318,   335,   336,   337,   338,   339,   340,   341,
+     342,   343,   349,   350,   351,   352,   353,   354,   355,   149,
+     369,   227,   135,   135,   149,   225,   227,   362,   271,   225,
+     349,   362,   271,   109,   134,   134,   134,   112,   134,    72,
+     111,   113,   140,   273,   277,   278,   279,   280,   281,   134,
+     134,   134,   134,   134,   134,   308,   110,   110,   110,   110,
+     110,   110,   110,   317,   330,   109,   276,   112,   207,   134,
+     308,   169,   275,   169,   275,   308,   111,   207,   310,   173,
+     134,   207,   110,    40,   111,   115,   225,   248,   249,   250,
+     365,   114,   116,   371,   131,   258,   114,   227,   263,   264,
+     265,   268,   269,   110,   116,   173,   134,   117,   164,   134,
+     224,   227,   262,   361,   369,   302,   303,   109,   149,   335,
+     110,   116,   372,   273,   285,   109,   114,   273,   275,   285,
+     110,   116,   109,   141,   110,   130,   274,   274,   274,   145,
+     164,   275,   274,   112,   134,   110,   116,   110,   109,   149,
+     348,   356,   357,   358,   359,   110,   116,   164,   111,   139,
+     144,   145,   134,   111,   139,   144,   164,   151,   151,   151,
+     152,   152,   153,   153,   154,   154,   154,   154,   155,   155,
+     156,   157,   158,   159,   160,   130,   169,   164,   134,   345,
+     346,   347,   227,   344,   311,   311,   164,   275,   134,   270,
+     134,   225,   349,   362,   227,   231,   112,   112,   134,   369,
+     112,   109,   134,   318,   336,   337,   338,   341,   351,   352,
+     353,   112,   134,   227,   335,   339,   350,   109,   311,   354,
+     372,   311,   311,   372,   109,   311,   354,   311,   311,   311,
+     311,   349,   225,   360,   370,   271,   112,   116,   112,   116,
+     372,   225,   362,   372,   259,   260,   261,   262,   259,   259,
+     271,   164,   134,   111,   273,   130,   116,   371,   277,   111,
+     130,   281,    29,   209,   210,   271,   259,   139,   308,   139,
+     310,   109,   348,   349,   109,   348,   349,   141,   349,   173,
+     263,   110,   110,   110,   110,   112,   173,   207,   173,   114,
+     249,   250,   112,   134,   109,   130,   149,   251,   253,   317,
+     318,   330,   356,   116,   132,   116,   132,   273,   247,   273,
+     115,   162,   163,   257,   135,   135,   139,   222,   135,   135,
+     259,   109,   149,   369,   135,   115,   227,   286,   287,   135,
+     134,   134,   109,   135,   110,   315,   169,   170,   130,   132,
+     111,   141,   200,   201,   202,   110,   116,   110,   110,   110,
+     110,   111,   164,   357,   358,   359,   227,   356,   311,   311,
+     114,   151,   167,   164,   165,   168,   116,   135,   134,   110,
+     116,   164,   134,   115,   162,   130,   263,   110,   110,   110,
+     344,   263,   110,   259,   225,   362,   111,   117,   149,   164,
+     164,   227,   341,   263,   110,   110,   110,   110,   110,   110,
+     110,     7,   227,   335,   339,   350,   134,   134,   372,   134,
+     134,   110,   135,   135,   135,   135,   276,   135,   162,   163,
+     164,   309,   134,   277,   279,   115,   134,   211,   273,    40,
+      41,    43,    46,    47,    48,    49,    50,    51,    52,    53,
+      57,    61,    62,    72,   111,   127,   170,   171,   172,   173,
+     174,   175,   177,   178,   190,   192,   193,   198,   212,   307,
+      29,   135,   131,   276,   134,   134,   110,   135,   173,   247,
+     132,   132,   318,   163,   227,   252,   253,   252,   273,   311,
+     115,   258,   371,   110,   116,   112,   112,   135,   227,   116,
+     372,   289,   110,   285,   215,   217,   225,   297,   298,   299,
+     300,   291,   110,   110,   130,   163,   109,   110,   130,   116,
+     139,   112,   110,   110,   110,   356,   278,   116,   135,   168,
+     112,   139,   146,   147,   145,   135,   146,   162,   167,   135,
+     109,   348,   349,   135,   135,   134,   135,   135,   135,   164,
+     110,   135,   109,   348,   349,   109,   354,   109,   354,   349,
+     226,     7,   117,   135,   164,   263,   263,   262,   266,   266,
+     267,   116,   116,   110,   110,   112,    96,   122,   135,   135,
+     146,   277,   164,   116,   132,   212,   216,   227,   231,   109,
+     109,   171,   109,   109,    72,   132,    72,   132,    72,   117,
+     170,   109,   173,   165,   165,   130,   112,   143,   132,   135,
+     134,   135,   211,   110,   164,   263,   263,   311,   110,   115,
+     251,   115,   134,   110,   134,   135,   308,   115,   134,   135,
+     135,   110,   114,   200,   112,   163,   132,   200,   202,   110,
+     109,   348,   349,   371,   165,   112,   135,    85,   113,   116,
+     135,   112,   135,   110,   134,   110,   110,   112,   112,   112,
+     135,   110,   134,   134,   134,   164,   164,   135,   112,   135,
+     135,   135,   135,   134,   134,   163,   163,   112,   112,   135,
+     135,   273,   227,   169,   169,    47,   169,   134,   132,   132,
+     132,   169,   132,   169,    58,    59,    60,   194,   195,   196,
+     132,    63,   132,   311,   114,   175,   115,   132,   135,   135,
+      96,   268,   269,   110,   298,   116,   132,   116,   132,   115,
+     296,   130,   141,   110,   110,   130,   134,   115,   112,   111,
+     147,   111,   147,   147,   112,   112,   263,   112,   263,   263,
+     263,   135,   135,   112,   112,   110,   110,   112,   116,    96,
+     262,    96,   135,   112,   112,   110,   110,   109,   110,   170,
+     191,   212,   132,   110,   109,   109,   173,   196,    58,    59,
+     164,   171,   144,   110,   110,   114,   134,   134,   297,   141,
+     203,   109,   132,   203,   263,   134,   134,   135,   135,   135,
      135,   112,   112,   134,   135,   112,   171,    44,    45,   114,
      181,   182,   183,   169,   171,   135,   110,   170,   114,   183,
-      96,   134,    96,   134,   109,   109,   132,   115,   134,   272,
-     309,   115,   116,   117,   163,   110,   112,   164,   135,   146,
-     146,   110,   110,   110,   110,   267,    42,   163,   179,   180,
-     310,   117,   134,   171,   181,   110,   132,   171,   132,   134,
-     110,   134,   110,   134,    96,   134,    96,   134,   132,   298,
-     141,   139,   204,   110,   132,   117,   110,   135,   135,   171,
-      96,   116,   117,   135,   205,   206,   212,   132,   170,   170,
-     205,   173,   197,   225,   366,   173,   197,   110,   134,   110,
-     134,   115,   110,   116,   164,   112,   112,   163,   179,   182,
-     184,   185,   134,   132,   182,   186,   187,   135,   109,   149,
-     309,   357,   139,   135,   173,   197,   173,   197,   109,   132,
-     139,   171,   176,   115,   182,   212,   170,    56,   176,   189,
-     115,   182,   110,   227,   110,   135,   135,   292,   171,   176,
-     132,   188,   189,   176,   189,   173,   173,   110,   110,   110,
-     188,   135,   135,   173,   173,   135,   135
+      96,   134,    96,   134,   109,   109,   132,   115,   134,   271,
+     308,   115,   116,   130,   163,   110,   135,   146,   146,   110,
+     110,   110,   110,   266,    42,   163,   179,   180,   309,   130,
+     134,   171,   181,   110,   132,   171,   132,   134,   110,   134,
+     110,   134,    96,   134,    96,   134,   132,   297,   141,   139,
+     204,   110,   132,   110,   135,   135,   171,    96,   116,   130,
+     135,   205,   206,   212,   132,   170,   170,   205,   173,   197,
+     225,   365,   173,   197,   110,   134,   110,   134,   115,   110,
+     116,   112,   112,   163,   179,   182,   184,   185,   134,   132,
+     182,   186,   187,   135,   109,   149,   308,   356,   139,   135,
+     173,   197,   173,   197,   109,   132,   139,   171,   176,   115,
+     182,   212,   170,    56,   176,   189,   115,   182,   110,   227,
+     110,   135,   135,   291,   171,   176,   132,   188,   189,   176,
+     189,   173,   173,   110,   110,   110,   188,   135,   135,   173,
+     173,   135,   135
 };
 
-#define yyerrok         (yyerrstatus = 0)
-#define yyclearin       (yychar = YYEMPTY)
-#define YYEMPTY         (-2)
-#define YYEOF           0
-
-#define YYACCEPT        goto yyacceptlab
-#define YYABORT         goto yyabortlab
-#define YYERROR         goto yyerrorlab
-
-
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  However,
-   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
-   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-   discussed.  */
-
-#define YYFAIL          goto yyerrlab
-#if defined YYFAIL
-  /* This is here to suppress warnings from the GCC cpp's
-     -Wunused-macros.  Normally we don't worry about that warning, but
-     some users do, and we want to make it easy for users to remove
-     YYFAIL uses, which will produce warnings from Bison 2.5.  */
-#endif
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint16 yyr1[] =
+{
+       0,   133,   134,   135,   136,   136,   136,   137,   137,   137,
+     138,   138,   139,   139,   140,   140,   141,   141,   142,   142,
+     142,   142,   143,   143,   143,   143,   143,   143,   143,   143,
+     143,   143,   143,   144,   144,   145,   145,   146,   146,   147,
+     147,   147,   147,   147,   148,   148,   148,   148,   148,   148,
+     148,   148,   148,   148,   148,   148,   148,   148,   148,   148,
+     149,   149,   150,   150,   150,   150,   151,   151,   151,   152,
+     152,   152,   152,   153,   153,   153,   154,   154,   154,   155,
+     155,   155,   155,   155,   156,   156,   156,   157,   157,   158,
+     158,   159,   159,   160,   160,   161,   161,   162,   162,   162,
+     162,   163,   164,   164,   164,   165,   165,   166,   166,   166,
+     166,   166,   166,   166,   166,   166,   166,   166,   167,   167,
+     167,   167,   168,   168,   169,   169,   170,   170,   171,   171,
+     171,   171,   171,   171,   171,   171,   171,   172,   173,   173,
+     174,   174,   175,   175,   175,   175,   176,   176,   177,   178,
+     178,   178,   178,   178,   178,   179,   179,   179,   180,   180,
+     181,   181,   182,   182,   183,   184,   184,   185,   185,   186,
+     186,   187,   187,   187,   187,   188,   188,   189,   189,   190,
+     190,   190,   191,   191,   192,   192,   192,   192,   192,   192,
+     192,   192,   192,   192,   193,   193,   193,   194,   194,   194,
+     194,   194,   195,   195,   195,   195,   196,   197,   197,   197,
+     197,   197,   198,   198,   198,   198,   198,   199,   199,   200,
+     200,   201,   201,   202,   202,   203,   203,   203,   204,   204,
+     205,   205,   206,   206,   207,   207,   208,   208,   209,   209,
+     210,   210,   211,   211,   212,   212,   213,   213,   213,   213,
+     213,   214,   214,   214,   215,   215,   215,   216,   216,   216,
+     216,   216,   217,   217,   217,   218,   218,   219,   219,   219,
+     220,   220,   220,   220,   220,   221,   221,   222,   222,   222,
+     222,   223,   223,   224,   224,   224,   224,   225,   225,   225,
+     225,   226,   226,   227,   227,   228,   228,   229,   229,   229,
+     229,   229,   230,   229,   231,   231,   231,   232,   232,   233,
+     233,   233,   233,   233,   233,   233,   233,   234,   234,   234,
+     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
+     235,   235,   235,   235,   235,   236,   236,   237,   237,   237,
+     237,   238,   238,   238,   238,   239,   239,   239,   239,   240,
+     240,   240,   241,   241,   241,   241,   242,   242,   242,   243,
+     243,   244,   244,   245,   244,   244,   244,   246,   246,   247,
+     247,   248,   248,   248,   248,   249,   249,   249,   249,   250,
+     250,   251,   251,   251,   251,   251,   252,   252,   253,   254,
+     255,   255,   256,   255,   257,   257,   258,   258,   259,   259,
+     260,   260,   260,   260,   260,   261,   261,   261,   261,   262,
+     262,   263,   263,   264,   264,   265,   265,   265,   265,   266,
+     266,   266,   266,   266,   267,   267,   267,   267,   267,   268,
+     268,   269,   269,   270,   270,   271,   271,   271,   272,   272,
+     272,   273,   273,   273,   274,   274,   274,   275,   275,   275,
+     275,   276,   276,   276,   277,   277,   278,   278,   278,   278,
+     278,   279,   279,   280,   280,   281,   281,   281,   281,   281,
+     282,   282,   282,   282,   283,   283,   283,   284,   285,   285,
+     287,   286,   286,   288,   288,   288,   289,   289,   290,   290,
+     290,   291,   291,   291,   291,   292,   292,   292,   293,   293,
+     294,   294,   295,   296,   295,   297,   297,   298,   298,   299,
+     299,   299,   300,   300,   301,   301,   302,   302,   303,   303,
+     304,   304,   304,   305,   304,   304,   306,   306,   306,   307,
+     307,   307,   307,   307,   307,   307,   307,   307,   308,   308,
+     308,   309,   310,   310,   311,   311,   312,   312,   313,   314,
+     314,   315,   315,   315,   316,   316,   316,   316,   317,   317,
+     317,   317,   318,   318,   319,   319,   319,   320,   320,   320,
+     320,   321,   321,   322,   322,   322,   323,   323,   323,   324,
+     324,   324,   325,   325,   325,   326,   326,   326,   327,   327,
+     327,   328,   328,   328,   329,   329,   329,   330,   330,   330,
+     330,   331,   331,   332,   332,   332,   333,   333,   333,   333,
+     334,   334,   334,   335,   335,   335,   335,   336,   336,   336,
+     337,   337,   337,   337,   338,   338,   338,   339,   339,   339,
+     339,   340,   340,   341,   341,   341,   342,   342,   343,   343,
+     344,   344,   344,   345,   345,   345,   345,   345,   346,   346,
+     346,   346,   347,   347,   347,   348,   348,   348,   349,   349,
+     349,   349,   350,   350,   350,   351,   351,   351,   351,   351,
+     352,   352,   352,   352,   353,   353,   353,   354,   354,   354,
+     355,   355,   355,   355,   355,   355,   356,   356,   356,   357,
+     357,   357,   357,   357,   358,   358,   358,   358,   359,   359,
+     360,   360,   360,   361,   361,   362,   362,   362,   362,   362,
+     362,   363,   363,   363,   363,   363,   363,   363,   363,   363,
+     363,   364,   364,   364,   364,   365,   365,   365,   366,   366,
+     367,   367,   367,   367,   367,   367,   368,   368,   368,   368,
+     368,   368,   369,   370,   370,   370,   371,   371,   372,   372
+};
+
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     0,     0,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     2,     1,     1,
+       3,     3,     1,     6,     4,     3,     7,     3,     7,     2,
+       2,     7,     4,     1,     3,     0,     1,     1,     3,     1,
+       3,     7,     3,     7,     1,     1,     1,     2,     2,     2,
+       2,     2,     2,     4,     2,     4,     6,     1,     4,     4,
+       1,     1,     1,     1,     1,     1,     1,     4,     4,     1,
+       3,     3,     3,     1,     3,     3,     1,     3,     3,     1,
+       3,     3,     3,     3,     1,     3,     3,     1,     3,     1,
+       3,     1,     3,     1,     3,     1,     3,     1,     5,     4,
+       5,     1,     1,     3,     2,     0,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     2,     5,
+       6,     7,     1,     3,     1,     3,     0,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     6,     4,     2,     7,
+       1,     3,     1,     2,     1,     2,     1,     2,     2,     5,
+       7,     5,     9,     5,     9,     1,     3,     1,     1,     3,
+       3,     2,     1,     2,     2,     0,     1,     2,     3,     0,
+       1,     2,     3,     3,     4,     0,     1,     1,     2,     5,
+       7,     6,     6,     4,     3,     4,     2,     3,     2,     3,
+       3,     3,     3,     5,     3,     3,     4,     1,     5,     6,
+       5,     6,     9,    10,     9,    10,     2,     1,     2,     2,
+       2,     1,     6,     8,    10,    12,    14,     0,     1,     0,
+       1,     1,     3,     4,     7,     0,     1,     3,     1,     3,
+       1,     1,     1,     3,     1,     1,     1,     3,     0,     1,
+       3,     4,     1,     3,     1,     1,     3,     3,     3,     3,
+       3,     2,     3,     6,     3,     3,     4,     1,     2,     2,
+       3,     5,     8,     7,     7,     5,     9,     2,     2,     5,
+       3,     5,     4,     3,     4,     4,     7,     3,     3,     3,
+       3,     4,     6,     1,     1,     1,     1,     1,     1,     1,
+       1,     0,     1,     1,     2,     1,     1,     1,     1,     1,
+       1,     1,     0,     5,     1,     2,     3,     1,     2,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     2,     2,     3,     3,     1,     3,     1,     2,     2,
+       2,     4,     4,     4,     4,     1,     2,     2,     3,     1,
+       2,     2,     1,     2,     2,     3,     1,     2,     2,     1,
+       1,     4,     2,     0,     6,     7,     2,     2,     2,     0,
+       2,     2,     3,     2,     3,     1,     2,     3,     2,     2,
+       4,     0,     1,     2,     2,     1,     0,     1,     2,     2,
+       5,     2,     0,     7,     2,     4,     0,     2,     0,     1,
+       1,     1,     5,     5,     5,     1,     5,     5,     9,     1,
+       5,     0,     1,     1,     5,     1,     1,     5,     5,     1,
+       3,     3,     4,     1,     1,     1,     1,     2,     1,     3,
+       3,     1,     2,     1,     3,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     2,     1,     1,     1,
+       2,     0,     2,     2,     1,     4,     0,     1,     2,     3,
+       4,     2,     2,     1,     2,     2,     5,     5,     7,     6,
+       1,     2,     2,     3,     1,     2,     2,     4,     2,     4,
+       0,     4,     2,     1,     1,     1,     0,     2,     5,     5,
+      13,     1,     1,     3,     3,     2,     3,     3,     2,     4,
+       1,     6,     9,     0,    11,     1,     3,     3,     3,     1,
+       1,     5,     2,     5,     0,     1,     1,     3,     0,     1,
+       1,     1,     1,     0,     6,     2,     1,     2,     4,     2,
+       3,     3,     3,     4,     5,     5,     5,     6,     1,     1,
+       1,     3,     0,     5,     0,     1,     1,     2,     6,     1,
+       3,     0,     1,     4,     1,     1,     1,     1,     2,     1,
+       2,     2,     1,     3,     2,     3,     3,     2,     4,     4,
+       3,     8,     3,     2,     1,     2,     6,     8,     3,     2,
+       3,     3,     4,     4,     3,     1,     1,     1,     4,     6,
+       3,     2,     3,     3,     4,     4,     3,     2,     1,     2,
+       2,     1,     3,     2,     3,     3,     2,     4,     4,     3,
+       6,     8,     3,     2,     1,     2,     2,     2,     3,     3,
+       2,     4,     4,     3,     6,     8,     3,     2,     1,     2,
+       2,     1,     1,     2,     3,     3,     2,     4,     6,     8,
+       1,     2,     2,     1,     2,     2,     3,     3,     1,     4,
+       4,     3,     5,     8,     3,     2,     3,     1,     5,     5,
+       6,     6,     1,     2,     2,     1,     2,     2,     3,     3,
+       1,     4,     4,     3,     5,     8,     3,     1,     2,     1,
+       2,     6,     5,     6,     7,     7,     1,     2,     2,     1,
+       2,     2,     3,     3,     1,     4,     4,     3,     8,     3,
+       1,     1,     2,     1,     1,     2,     3,     2,     3,     2,
+       3,     3,     2,     4,     3,     2,     3,     2,     4,     3,
+       2,     6,     6,     6,     7,     1,     2,     1,     1,     1,
+       2,     3,     2,     3,     2,     3,     3,     4,     2,     3,
+       4,     2,     5,     5,     6,     6,     0,     1,     0,     2
+};
+
+
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
+
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)                                  \
-do                                                              \
-  if (yychar == YYEMPTY && yylen == 1)                          \
-    {                                                           \
-      yychar = (Token);                                         \
-      yylval = (Value);                                         \
-      YYPOPSTACK (1);                                           \
-      goto yybackup;                                            \
-    }                                                           \
-  else                                                          \
-    {                                                           \
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
       yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;                                                  \
-    }                                                           \
-while (YYID (0))
-
-
-#define YYTERROR        1
-#define YYERRCODE       256
-
-
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
-   If N is 0, then set CURRENT to the empty location which ends
-   the previous symbol: RHS[0] (always defined).  */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)                                \
-    do                                                                  \
-      if (YYID (N))                                                    \
-        {                                                               \
-          (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
-          (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
-          (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
-          (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
-        }                                                               \
-      else                                                              \
-        {                                                               \
-          (Current).first_line   = (Current).last_line   =              \
-            YYRHSLOC (Rhs, 0).last_line;                                \
-          (Current).first_column = (Current).last_column =              \
-            YYRHSLOC (Rhs, 0).last_column;                              \
-        }                                                               \
-    while (YYID (0))
-#endif
-
-
-/* This macro is provided for backward compatibility. */
-
-#ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-#endif
-
-
-/* YYLEX -- calling `yylex' with the right arguments.  */
-
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (YYLEX_PARAM)
-#else
-# define YYLEX yylex ()
-#endif
+      YYERROR;                                                  \
+    }                                                           \
+while (0)
+
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256
+
+
 
 /* Enable debugging if requested.  */
@@ -4260 +3863 @@
 # endif
 
-# define YYDPRINTF(Args)                        \
-do {                                            \
-  if (yydebug)                                  \
-    YYFPRINTF Args;                             \
-} while (YYID (0))
-
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
-do {                                                                      \
-  if (yydebug)                                                            \
-    {                                                                     \
-      YYFPRINTF (stderr, "%s ", Title);                                   \
-      yy_symbol_print (stderr,                                            \
-                  Type, Value); \
-      YYFPRINTF (stderr, "\n");                                           \
-    }                                                                     \
-} while (YYID (0))
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
+
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
+
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
+
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT.  |
+`----------------------------------------*/
+
 static void
 yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
 {
+  FILE *yyo = yyoutput;
+  YYUSE (yyo);
   if (!yyvaluep)
     return;
@@ -4300 +3901 @@
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
-  YYUSE (yyoutput);
 # endif
-  switch (yytype)
-    {
-      default:
-        break;
-    }
+  YYUSE (yytype);
 }
 
@@ -4315 +3910 @@
 `--------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
 {
-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+  YYFPRINTF (yyoutput, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
 
   yy_symbol_value_print (yyoutput, yytype, yyvaluep);
@@ -4341 +3925 @@
 `------------------------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-#else
-static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
-#endif
 {
   YYFPRINTF (stderr, "Stack now");
@@ -4361 +3937 @@
 }
 
-# define YY_STACK_PRINT(Bottom, Top)                            \
-do {                                                            \
-  if (yydebug)                                                  \
-    yy_stack_print ((Bottom), (Top));                           \
-} while (YYID (0))
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
 
 
@@ -4372 +3948 @@
 `------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-#else
-static void
-yy_reduce_print (yyvsp, yyrule)
-    YYSTYPE *yyvsp;
-    int yyrule;
-#endif
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
 {
+  unsigned long int yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
   int yyi;
-  unsigned long int yylno = yyrline[yyrule];
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-             yyrule - 1, yylno);
+             yyrule - 1, yylno);
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-                       &(yyvsp[(yyi + 1) - (yynrhs)])
-                                       );
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                                              );
       YYFPRINTF (stderr, "\n");
     }
 }
 
-# define YY_REDUCE_PRINT(Rule)          \
-do {                                    \
-  if (yydebug)                          \
-    yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule); \
+} while (0)
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
@@ -4417 +3986 @@
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef YYINITDEPTH
+#ifndef YYINITDEPTH
 # define YYINITDEPTH 200
 #endif
@@ -4440 +4009 @@
 #  else
 /* Return the length of YYSTR.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
 yystrlen (const char *yystr)
-#else
-static YYSIZE_T
-yystrlen (yystr)
-    const char *yystr;
-#endif
 {
   YYSIZE_T yylen;
@@ -4464 +4026 @@
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static char *
 yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
-yystpcpy (yydest, yysrc)
-    char *yydest;
-    const char *yysrc;
-#endif
 {
   char *yyd = yydest;
@@ -4503 +4057 @@
 
       for (;;)
-        switch (*++yyp)
-          {
-          case '\'':
-          case ',':
-            goto do_not_strip_quotes;
-
-          case '\\':
-            if (*++yyp != '\\')
-              goto do_not_strip_quotes;
-            /* Fall through.  */
-          default:
-            if (yyres)
-              yyres[yyn] = *yyp;
-            yyn++;
-            break;
-
-          case '"':
-            if (yyres)
-              yyres[yyn] = '\0';
-            return yyn;
-          }
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
     do_not_strip_quotes: ;
     }
@@ -4546 +4100 @@
                 yytype_int16 *yyssp, int yytoken)
 {
-  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
   YYSIZE_T yysize = yysize0;
-  YYSIZE_T yysize1;
   enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
   /* Internationalized format string. */
-  const char *yyformat = 0;
+  const char *yyformat = YY_NULLPTR;
   /* Arguments of yyformat. */
   char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
@@ -4559 +4112 @@
 
   /* There are many possibilities here to consider:
-     - Assume YYFAIL is not used.  It's too flawed to consider.  See
-       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
-       for details.  YYERROR is fine as it does not invoke this
-       function.
      - If this state is a consistent state with a default action, then
        the only way this function was invoked is if the default action
@@ -4611 +4160 @@
                   }
                 yyarg[yycount++] = yytname[yyx];
-                yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-                if (! (yysize <= yysize1
-                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                  return 2;
-                yysize = yysize1;
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
               }
         }
@@ -4635 +4186 @@
     }
 
-  yysize1 = yysize + yystrlen (yyformat);
-  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-    return 2;
-  yysize = yysize1;
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
 
   if (*yymsg_alloc < yysize)
@@ -4675 +4228 @@
 `-----------------------------------------------*/
 
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
 {
   YYUSE (yyvaluep);
-
   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
-  switch (yytype)
-    {
-
-      default:
-        break;
-    }
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
 
-/* Prevent warnings from -Wmissing-prototypes.  */
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
 
 
@@ -4724 +4249 @@
 /* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
-
 /* Number of syntax errors so far.  */
 int yynerrs;
@@ -4733 +4257 @@
 `----------*/
 
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
-    void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 int
 yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
 {
     int yystate;
@@ -4760 +4265 @@
 
     /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
-
-       Refer to the stacks thru separate pointers, to allow yyoverflow
+       'yyss': related to states.
+       'yyvs': related to semantic values.
+
+       Refer to the stacks through separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
@@ -4781 +4286 @@
   int yyresult;
   /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
+  int yytoken = 0;
   /* The variables used to return semantic value and location from the
      action routines.  */
@@ -4799 +4304 @@
   int yylen = 0;
 
-  yytoken = 0;
-  yyss = yyssa;
-  yyvs = yyvsa;
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
   yystacksize = YYINITDEPTH;
 
@@ -4810 +4314 @@
   yynerrs = 0;
   yychar = YYEMPTY; /* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-  yyssp = yyss;
-  yyvsp = yyvs;
-
   goto yysetstate;
 
@@ -4838 +4334 @@
 #ifdef yyoverflow
       {
-        /* Give user a chance to reallocate the stack.  Use copies of
-           these so that the &'s don't force the real ones into
-           memory.  */
-        YYSTYPE *yyvs1 = yyvs;
-        yytype_int16 *yyss1 = yyss;
-
-        /* Each stack pointer address is followed by the size of the
-           data in use in that stack, in bytes.  This used to be a
-           conditional around just the two extra args, but that might
-           be undefined if yyoverflow is a macro.  */
-        yyoverflow (YY_("memory exhausted"),
-                    &yyss1, yysize * sizeof (*yyssp),
-                    &yyvs1, yysize * sizeof (*yyvsp),
-                    &yystacksize);
-
-        yyss = yyss1;
-        yyvs = yyvs1;
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
       }
 #else /* no yyoverflow */
@@ -4862 +4358 @@
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-        goto yyexhaustedlab;
+        goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
-        yystacksize = YYMAXDEPTH;
+        yystacksize = YYMAXDEPTH;
 
       {
-        yytype_int16 *yyss1 = yyss;
-        union yyalloc *yyptr =
-          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-        if (! yyptr)
-          goto yyexhaustedlab;
-        YYSTACK_RELOCATE (yyss_alloc, yyss);
-        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
-        if (yyss1 != yyssa)
-          YYSTACK_FREE (yyss1);
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
       }
 # endif
@@ -4886 +4382 @@
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long int) yystacksize));
+                  (unsigned long int) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
-        YYABORT;
+        YYABORT;
     }
 
@@ -4918 +4414 @@
     {
       YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
+      yychar = yylex ();
     }
 
@@ -4958 +4454 @@
 
   yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
   goto yynewstate;
@@ -4981 +4479 @@
 
   /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
+     '$$ = $1'.
 
      Otherwise, the following line sets YYVAL to garbage.
@@ -4995 +4493 @@
     {
         case 2:
-
-/* Line 1806 of yacc.c  */
-#line 296 "parser.yy"
+#line 298 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.enterScope();
                 }
+#line 4500 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 3:
-
-/* Line 1806 of yacc.c  */
-#line 302 "parser.yy"
+#line 304 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.leaveScope();
                 }
+#line 4508 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 4:
-
-/* Line 1806 of yacc.c  */
-#line 311 "parser.yy"
-    { (yyval.constant) = build_constantInteger( *(yyvsp[(1) - (1)].tok) ); }
+#line 313 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_constantInteger( assign_strptr((yyvsp[0].tok)) ) ); }
+#line 4514 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 5:
-
-/* Line 1806 of yacc.c  */
-#line 312 "parser.yy"
-    { (yyval.constant) = build_constantFloat( *(yyvsp[(1) - (1)].tok) ); }
+#line 314 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_constantFloat( assign_strptr((yyvsp[0].tok)) ) ); }
+#line 4520 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 6:
-
-/* Line 1806 of yacc.c  */
-#line 313 "parser.yy"
-    { (yyval.constant) = build_constantChar( *(yyvsp[(1) - (1)].tok) ); }
+#line 315 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_constantChar( assign_strptr((yyvsp[0].tok)) ) ); }
+#line 4526 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 16:
-
-/* Line 1806 of yacc.c  */
-#line 338 "parser.yy"
-    { (yyval.constant) = build_constantStr( *(yyvsp[(1) - (1)].tok) ); }
+#line 340 "parser.yy" /* yacc.c:1646  */
+    { (yyval.constant) = build_constantStr( assign_strptr((yyvsp[0].tok)) ); }
+#line 4532 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 17:
-
-/* Line 1806 of yacc.c  */
-#line 340 "parser.yy"
-    {
-                        appendStr( (yyvsp[(1) - (2)].constant)->get_expr()->get_constant()->get_value(), (yyvsp[(2) - (2)].tok) );
-                        delete (yyvsp[(2) - (2)].tok);                                                                  // allocated by lexer
-                        (yyval.constant) = (yyvsp[(1) - (2)].constant);
+#line 342 "parser.yy" /* yacc.c:1646  */
+    {
+                        appendStr( (yyvsp[-1].constant)->get_constant()->get_value(), (yyvsp[0].tok) );
+                        delete (yyvsp[0].tok);                                                                  // allocated by lexer
+                        (yyval.constant) = (yyvsp[-1].constant);
                 }
+#line 4542 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 18:
-
-/* Line 1806 of yacc.c  */
-#line 351 "parser.yy"
-    { (yyval.en) = new VarRefNode( (yyvsp[(1) - (1)].tok) ); }
+#line 353 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[0].tok) ) ); }
+#line 4548 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 19:
-
-/* Line 1806 of yacc.c  */
-#line 353 "parser.yy"
-    { (yyval.en) = new VarRefNode( (yyvsp[(1) - (1)].tok) ); }
+#line 355 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[0].tok) ) ); }
+#line 4554 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 20:
-
-/* Line 1806 of yacc.c  */
-#line 355 "parser.yy"
-    { (yyval.en) = (yyvsp[(2) - (3)].en); }
+#line 357 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (yyvsp[-1].en); }
+#line 4560 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 21:
-
-/* Line 1806 of yacc.c  */
-#line 357 "parser.yy"
-    { (yyval.en) = new ValofExprNode( (yyvsp[(2) - (3)].sn) ); }
+#line 359 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_valexpr( (yyvsp[-1].sn) ) ); }
+#line 4566 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 23:
-
-/* Line 1806 of yacc.c  */
-#line 367 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_binary_val( OperKinds::Index, (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en) ) ); }
+#line 369 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Index, (yyvsp[-5].en), (yyvsp[-2].en) ) ); }
+#line 4572 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 24:
-
-/* Line 1806 of yacc.c  */
-#line 369 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_func( (yyvsp[(1) - (4)].en), (yyvsp[(3) - (4)].en) ) ); }
+#line 371 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_func( (yyvsp[-3].en), (yyvsp[-1].en) ) ); }
+#line 4578 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 25:
-
-/* Line 1806 of yacc.c  */
-#line 373 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_fieldSel( (yyvsp[(1) - (3)].en), new VarRefNode( (yyvsp[(3) - (3)].tok) ) ) ); }
+#line 375 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[-2].en), build_varref( (yyvsp[0].tok) ) ) ); }
+#line 4584 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 27:
-
-/* Line 1806 of yacc.c  */
-#line 376 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_pfieldSel( (yyvsp[(1) - (3)].en), new VarRefNode( (yyvsp[(3) - (3)].tok) ) ) ); }
+#line 378 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[-2].en), build_varref( (yyvsp[0].tok) ) ) ); }
+#line 4590 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 29:
-
-/* Line 1806 of yacc.c  */
-#line 379 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_unary_ptr( OperKinds::IncrPost, (yyvsp[(1) - (2)].en) ) ); }
+#line 381 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::IncrPost, (yyvsp[-1].en) ) ); }
+#line 4596 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 30:
-
-/* Line 1806 of yacc.c  */
-#line 381 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_unary_ptr( OperKinds::DecrPost, (yyvsp[(1) - (2)].en) ) ); }
+#line 383 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::DecrPost, (yyvsp[-1].en) ) ); }
+#line 4602 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 31:
-
-/* Line 1806 of yacc.c  */
-#line 383 "parser.yy"
-    { (yyval.en) = new CompoundLiteralNode( (yyvsp[(2) - (7)].decl), new InitializerNode( (yyvsp[(5) - (7)].in), true ) ); }
+#line 385 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_compoundLiteral( (yyvsp[-5].decl), new InitializerNode( (yyvsp[-2].in), true ) ) ); }
+#line 4608 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 32:
-
-/* Line 1806 of yacc.c  */
-#line 385 "parser.yy"
+#line 387 "parser.yy" /* yacc.c:1646  */
     {
                         Token fn;
                         fn.str = new std::string( "?{}" ); // location undefined
-                        (yyval.en) = new CompositeExprNode( build_func( new VarRefNode( fn ), (ExpressionNode *)( (yyvsp[(1) - (4)].en) )->set_link( (yyvsp[(3) - (4)].en) ) ) );
+                        (yyval.en) = new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( (yyvsp[-3].en) )->set_last( (yyvsp[-1].en) ) ) );
                 }
+#line 4618 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 34:
-
-/* Line 1806 of yacc.c  */
-#line 395 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) )); }
+#line 397 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (ExpressionNode *)( (yyvsp[-2].en)->set_last( (yyvsp[0].en) )); }
+#line 4624 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 35:
-
-/* Line 1806 of yacc.c  */
-#line 400 "parser.yy"
+#line 402 "parser.yy" /* yacc.c:1646  */
     { (yyval.en) = 0; }
-    break;
-
-  case 37:
-
-/* Line 1806 of yacc.c  */
-#line 403 "parser.yy"
-    { (yyval.en) = (yyvsp[(3) - (3)].en)->set_argName( (yyvsp[(1) - (3)].tok) ); }
+#line 4630 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 38:
-
-/* Line 1806 of yacc.c  */
-#line 408 "parser.yy"
-    { (yyval.en) = (yyvsp[(7) - (7)].en)->set_argName( (yyvsp[(3) - (7)].en) ); }
+#line 408 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (ExpressionNode *)(yyvsp[-2].en)->set_last( (yyvsp[0].en) ); }
+#line 4636 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 39:
-
-/* Line 1806 of yacc.c  */
-#line 410 "parser.yy"
-    { (yyval.en) = (yyvsp[(9) - (9)].en)->set_argName( new CompositeExprNode( build_tuple( (ExpressionNode *)(yyvsp[(3) - (9)].en)->set_link( (yyvsp[(5) - (9)].en) ) ) ) ); }
+#line 413 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[0].tok) ) ); }
+#line 4642 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 40:
+#line 417 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[0].en), build_varref( (yyvsp[-2].tok) ) ) ); }
+#line 4648 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 41:
-
-/* Line 1806 of yacc.c  */
-#line 415 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
+#line 419 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[-2].en), build_varref( (yyvsp[-6].tok) ) ) ); }
+#line 4654 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 42:
-
-/* Line 1806 of yacc.c  */
-#line 420 "parser.yy"
-    { (yyval.en) = new VarRefNode( (yyvsp[(1) - (1)].tok) ); }
+#line 421 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[0].en), build_varref( (yyvsp[-2].tok) ) ) ); }
+#line 4660 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 43:
-
-/* Line 1806 of yacc.c  */
-#line 424 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_fieldSel( (yyvsp[(3) - (3)].en), new VarRefNode( (yyvsp[(1) - (3)].tok) ) ) ); }
-    break;
-
-  case 44:
-
-/* Line 1806 of yacc.c  */
-#line 426 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_fieldSel( (yyvsp[(5) - (7)].en), new VarRefNode( (yyvsp[(1) - (7)].tok) ) ) ); }
+#line 423 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[-2].en), build_varref( (yyvsp[-6].tok) ) ) ); }
+#line 4666 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 45:
-
-/* Line 1806 of yacc.c  */
-#line 428 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_pfieldSel( (yyvsp[(3) - (3)].en), new VarRefNode( (yyvsp[(1) - (3)].tok) ) ) ); }
+#line 431 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (yyvsp[0].en); }
+#line 4672 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 46:
-
-/* Line 1806 of yacc.c  */
-#line 430 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_pfieldSel( (yyvsp[(5) - (7)].en), new VarRefNode( (yyvsp[(1) - (7)].tok) ) ) ); }
+#line 433 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( (yyvsp[0].constant) ); }
+#line 4678 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 47:
+#line 435 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (yyvsp[0].en)->set_extension( true ); }
+#line 4684 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 48:
-
-/* Line 1806 of yacc.c  */
-#line 438 "parser.yy"
-    { (yyval.en) = (yyvsp[(1) - (1)].constant); }
-    break;
-
-  case 49:
-
-/* Line 1806 of yacc.c  */
-#line 440 "parser.yy"
-    { (yyval.en) = (yyvsp[(1) - (1)].constant); }
-    break;
-
-  case 50:
-
-/* Line 1806 of yacc.c  */
-#line 442 "parser.yy"
-    { (yyval.en) = (yyvsp[(2) - (2)].en)->set_extension( true ); }
-    break;
-
-  case 51:
-
-/* Line 1806 of yacc.c  */
-#line 447 "parser.yy"
-    {
-                        switch ( (yyvsp[(1) - (2)].op) ) {
+#line 440 "parser.yy" /* yacc.c:1646  */
+    {
+                        switch ( (yyvsp[-1].op) ) {
                           case OperKinds::AddressOf:
-                                (yyval.en) = new CompositeExprNode( build_addressOf( (yyvsp[(2) - (2)].en) ) );
+                                (yyval.en) = new ExpressionNode( build_addressOf( (yyvsp[0].en) ) );
                                 break;
                           case OperKinds::PointTo:
-                                (yyval.en) = new CompositeExprNode( build_unary_val( (yyvsp[(1) - (2)].op), (yyvsp[(2) - (2)].en) ) );
+                                (yyval.en) = new ExpressionNode( build_unary_val( (yyvsp[-1].op), (yyvsp[0].en) ) );
                                 break;
                           default:
@@ -5253 +4698 @@
                         }
                 }
+#line 4701 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 49:
+#line 453 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_unary_val( (yyvsp[-1].op), (yyvsp[0].en) ) ); }
+#line 4707 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 50:
+#line 455 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::Incr, (yyvsp[0].en) ) ); }
+#line 4713 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 51:
+#line 457 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::Decr, (yyvsp[0].en) ) ); }
+#line 4719 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 52:
-
-/* Line 1806 of yacc.c  */
-#line 460 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_unary_val( (yyvsp[(1) - (2)].op), (yyvsp[(2) - (2)].en) ) ); }
+#line 459 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_sizeOfexpr( (yyvsp[0].en) ) ); }
+#line 4725 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 53:
-
-/* Line 1806 of yacc.c  */
-#line 462 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_unary_ptr( OperKinds::Incr, (yyvsp[(2) - (2)].en) ) ); }
+#line 461 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_sizeOftype( (yyvsp[-1].decl) ) ); }
+#line 4731 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 54:
-
-/* Line 1806 of yacc.c  */
-#line 464 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_unary_ptr( OperKinds::Decr, (yyvsp[(2) - (2)].en) ) ); }
+#line 463 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_alignOfexpr( (yyvsp[0].en) ) ); }
+#line 4737 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 55:
-
-/* Line 1806 of yacc.c  */
-#line 466 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_sizeOf( (yyvsp[(2) - (2)].en) ) ); }
+#line 465 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_alignOftype( (yyvsp[-1].decl) ) ); }
+#line 4743 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 56:
-
-/* Line 1806 of yacc.c  */
-#line 468 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_sizeOf( new TypeValueNode( (yyvsp[(3) - (4)].decl) ) ) ); }
+#line 467 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_offsetOf( (yyvsp[-3].decl), build_varref( (yyvsp[-1].tok) ) ) ); }
+#line 4749 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 57:
-
-/* Line 1806 of yacc.c  */
-#line 470 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_offsetOf( new TypeValueNode( (yyvsp[(3) - (6)].decl) ), new VarRefNode( (yyvsp[(5) - (6)].tok) ) ) ); }
+#line 469 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_attrexpr( build_varref( (yyvsp[0].tok) ), nullptr ) ); }
+#line 4755 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 58:
-
-/* Line 1806 of yacc.c  */
-#line 472 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_attr( new VarRefNode( (yyvsp[(1) - (1)].tok) ) ) ); }
+#line 471 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_attrexpr( build_varref( (yyvsp[-3].tok) ), (yyvsp[-1].en) ) ); }
+#line 4761 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 59:
-
-/* Line 1806 of yacc.c  */
-#line 474 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_attr( new VarRefNode( (yyvsp[(1) - (4)].tok) ), new TypeValueNode( (yyvsp[(3) - (4)].decl) ) ) ); }
+#line 473 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_attrtype( build_varref( (yyvsp[-3].tok) ), (yyvsp[-1].decl) ) ); }
+#line 4767 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 60:
-
-/* Line 1806 of yacc.c  */
-#line 476 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_attr( new VarRefNode( (yyvsp[(1) - (4)].tok) ), (yyvsp[(3) - (4)].en) ) ); }
+#line 479 "parser.yy" /* yacc.c:1646  */
+    { (yyval.op) = OperKinds::PointTo; }
+#line 4773 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 61:
-
-/* Line 1806 of yacc.c  */
-#line 478 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_alignOf( (yyvsp[(2) - (2)].en) ) ); }
+#line 480 "parser.yy" /* yacc.c:1646  */
+    { (yyval.op) = OperKinds::AddressOf; }
+#line 4779 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 62:
-
-/* Line 1806 of yacc.c  */
-#line 480 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_alignOf( new TypeValueNode( (yyvsp[(3) - (4)].decl) ) ) ); }
+#line 486 "parser.yy" /* yacc.c:1646  */
+    { (yyval.op) = OperKinds::UnPlus; }
+#line 4785 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 63:
-
-/* Line 1806 of yacc.c  */
-#line 486 "parser.yy"
-    { (yyval.op) = OperKinds::PointTo; }
+#line 487 "parser.yy" /* yacc.c:1646  */
+    { (yyval.op) = OperKinds::UnMinus; }
+#line 4791 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 64:
-
-/* Line 1806 of yacc.c  */
-#line 487 "parser.yy"
-    { (yyval.op) = OperKinds::AddressOf; }
+#line 488 "parser.yy" /* yacc.c:1646  */
+    { (yyval.op) = OperKinds::Neg; }
+#line 4797 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 65:
-
-/* Line 1806 of yacc.c  */
-#line 493 "parser.yy"
-    { (yyval.op) = OperKinds::UnPlus; }
-    break;
-
-  case 66:
-
-/* Line 1806 of yacc.c  */
-#line 494 "parser.yy"
-    { (yyval.op) = OperKinds::UnMinus; }
+#line 489 "parser.yy" /* yacc.c:1646  */
+    { (yyval.op) = OperKinds::BitNeg; }
+#line 4803 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 67:
-
-/* Line 1806 of yacc.c  */
-#line 495 "parser.yy"
-    { (yyval.op) = OperKinds::Neg; }
+#line 495 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_cast( (yyvsp[-2].decl), (yyvsp[0].en) ) ); }
+#line 4809 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 68:
-
-/* Line 1806 of yacc.c  */
-#line 496 "parser.yy"
-    { (yyval.op) = OperKinds::BitNeg; }
+#line 497 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_cast( (yyvsp[-2].decl), (yyvsp[0].en) ) ); }
+#line 4815 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 70:
-
-/* Line 1806 of yacc.c  */
-#line 502 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_cast( new TypeValueNode( (yyvsp[(2) - (4)].decl) ), (yyvsp[(4) - (4)].en) ) ); }
+#line 503 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Mul, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4821 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 71:
-
-/* Line 1806 of yacc.c  */
-#line 504 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_cast( new TypeValueNode( (yyvsp[(2) - (4)].decl) ), (yyvsp[(4) - (4)].en) ) ); }
-    break;
-
-  case 73:
-
-/* Line 1806 of yacc.c  */
-#line 510 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_binary_val( OperKinds::Mul, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 505 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Div, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4827 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 72:
+#line 507 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Mod, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4833 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 74:
-
-/* Line 1806 of yacc.c  */
-#line 512 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_binary_val( OperKinds::Div, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 513 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Plus, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4839 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 75:
-
-/* Line 1806 of yacc.c  */
-#line 514 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_binary_val( OperKinds::Mod, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 515 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Minus, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4845 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 77:
-
-/* Line 1806 of yacc.c  */
-#line 520 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_binary_val( OperKinds::Plus, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 521 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LShift, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4851 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 78:
-
-/* Line 1806 of yacc.c  */
-#line 522 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_binary_val( OperKinds::Minus, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 523 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::RShift, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4857 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 80:
-
-/* Line 1806 of yacc.c  */
-#line 528 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_binary_val( OperKinds::LShift, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 529 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LThan, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4863 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 81:
-
-/* Line 1806 of yacc.c  */
-#line 530 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_binary_val( OperKinds::RShift, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 531 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::GThan, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4869 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 82:
+#line 533 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LEThan, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4875 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 83:
-
-/* Line 1806 of yacc.c  */
-#line 536 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_binary_val( OperKinds::LThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 84:
-
-/* Line 1806 of yacc.c  */
-#line 538 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_binary_val( OperKinds::GThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 535 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::GEThan, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4881 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 85:
-
-/* Line 1806 of yacc.c  */
-#line 540 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_binary_val( OperKinds::LEThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 541 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Eq, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4887 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 86:
-
-/* Line 1806 of yacc.c  */
-#line 542 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_binary_val( OperKinds::GEThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 543 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Neq, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4893 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 88:
-
-/* Line 1806 of yacc.c  */
-#line 548 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_binary_val( OperKinds::Eq, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 89:
-
-/* Line 1806 of yacc.c  */
-#line 550 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_binary_val( OperKinds::Neq, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 91:
-
-/* Line 1806 of yacc.c  */
-#line 556 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_binary_val( OperKinds::BitAnd, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 93:
-
-/* Line 1806 of yacc.c  */
-#line 562 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_binary_val( OperKinds::Xor, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 95:
-
-/* Line 1806 of yacc.c  */
-#line 568 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_binary_val( OperKinds::BitOr, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 97:
-
-/* Line 1806 of yacc.c  */
-#line 574 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_and_or( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en), true ) ); }
+#line 549 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::BitAnd, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4899 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 90:
+#line 555 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Xor, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4905 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 92:
+#line 561 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::BitOr, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4911 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 94:
+#line 567 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_and_or( (yyvsp[-2].en), (yyvsp[0].en), true ) ); }
+#line 4917 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 96:
+#line 573 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_and_or( (yyvsp[-2].en), (yyvsp[0].en), false ) ); }
+#line 4923 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 98:
+#line 579 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[-4].en), (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4929 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 99:
-
-/* Line 1806 of yacc.c  */
-#line 580 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_and_or( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en), false ) ); }
-    break;
-
-  case 101:
-
-/* Line 1806 of yacc.c  */
-#line 586 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_cond( (yyvsp[(1) - (5)].en), (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].en) ) ); }
-    break;
-
-  case 102:
-
-/* Line 1806 of yacc.c  */
-#line 589 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_cond( (yyvsp[(1) - (4)].en), (yyvsp[(1) - (4)].en), (yyvsp[(4) - (4)].en) ) ); }
+#line 582 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[-3].en), (yyvsp[-3].en), (yyvsp[0].en) ) ); }
+#line 4935 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 100:
+#line 584 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[-4].en), (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4941 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 103:
-
-/* Line 1806 of yacc.c  */
-#line 591 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_cond( (yyvsp[(1) - (5)].en), (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].en) ) ); }
-    break;
-
-  case 106:
-
-/* Line 1806 of yacc.c  */
-#line 602 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_binary_ptr( (yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 595 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_ptr( (yyvsp[-1].op), (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4947 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 104:
+#line 597 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = ( (yyvsp[0].en) == 0 ) ? (yyvsp[-1].en) : new ExpressionNode( build_binary_ptr( OperKinds::Assign, (yyvsp[-1].en), (yyvsp[0].en) ) ); }
+#line 4953 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 105:
+#line 602 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = nullptr; }
+#line 4959 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 107:
-
-/* Line 1806 of yacc.c  */
-#line 604 "parser.yy"
-    { (yyval.en) = ( (yyvsp[(2) - (2)].en) == 0 ) ? (yyvsp[(1) - (2)].en) : new CompositeExprNode( build_binary_ptr( OperKinds::Assign, (yyvsp[(1) - (2)].en), (yyvsp[(2) - (2)].en) ) ); }
+#line 607 "parser.yy" /* yacc.c:1646  */
+    { (yyval.op) = OperKinds::Assign; }
+#line 4965 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 108:
-
-/* Line 1806 of yacc.c  */
-#line 609 "parser.yy"
-    { (yyval.en) = new NullExprNode; }
+#line 608 "parser.yy" /* yacc.c:1646  */
+    { (yyval.op) = OperKinds::MulAssn; }
+#line 4971 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 109:
+#line 609 "parser.yy" /* yacc.c:1646  */
+    { (yyval.op) = OperKinds::DivAssn; }
+#line 4977 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 110:
-
-/* Line 1806 of yacc.c  */
-#line 614 "parser.yy"
-    { (yyval.op) = OperKinds::Assign; }
+#line 610 "parser.yy" /* yacc.c:1646  */
+    { (yyval.op) = OperKinds::ModAssn; }
+#line 4983 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 111:
-
-/* Line 1806 of yacc.c  */
-#line 615 "parser.yy"
-    { (yyval.op) = OperKinds::MulAssn; }
+#line 611 "parser.yy" /* yacc.c:1646  */
+    { (yyval.op) = OperKinds::PlusAssn; }
+#line 4989 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 112:
-
-/* Line 1806 of yacc.c  */
-#line 616 "parser.yy"
-    { (yyval.op) = OperKinds::DivAssn; }
+#line 612 "parser.yy" /* yacc.c:1646  */
+    { (yyval.op) = OperKinds::MinusAssn; }
+#line 4995 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 113:
-
-/* Line 1806 of yacc.c  */
-#line 617 "parser.yy"
-    { (yyval.op) = OperKinds::ModAssn; }
+#line 613 "parser.yy" /* yacc.c:1646  */
+    { (yyval.op) = OperKinds::LSAssn; }
+#line 5001 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 114:
-
-/* Line 1806 of yacc.c  */
-#line 618 "parser.yy"
-    { (yyval.op) = OperKinds::PlusAssn; }
+#line 614 "parser.yy" /* yacc.c:1646  */
+    { (yyval.op) = OperKinds::RSAssn; }
+#line 5007 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 115:
-
-/* Line 1806 of yacc.c  */
-#line 619 "parser.yy"
-    { (yyval.op) = OperKinds::MinusAssn; }
+#line 615 "parser.yy" /* yacc.c:1646  */
+    { (yyval.op) = OperKinds::AndAssn; }
+#line 5013 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 116:
-
-/* Line 1806 of yacc.c  */
-#line 620 "parser.yy"
-    { (yyval.op) = OperKinds::LSAssn; }
+#line 616 "parser.yy" /* yacc.c:1646  */
+    { (yyval.op) = OperKinds::ERAssn; }
+#line 5019 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 117:
-
-/* Line 1806 of yacc.c  */
-#line 621 "parser.yy"
-    { (yyval.op) = OperKinds::RSAssn; }
+#line 617 "parser.yy" /* yacc.c:1646  */
+    { (yyval.op) = OperKinds::OrAssn; }
+#line 5025 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 118:
-
-/* Line 1806 of yacc.c  */
-#line 622 "parser.yy"
-    { (yyval.op) = OperKinds::AndAssn; }
+#line 624 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_tuple() ); }
+#line 5031 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 119:
-
-/* Line 1806 of yacc.c  */
-#line 623 "parser.yy"
-    { (yyval.op) = OperKinds::ERAssn; }
+#line 626 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_tuple( (yyvsp[-2].en) ) ); }
+#line 5037 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 120:
-
-/* Line 1806 of yacc.c  */
-#line 624 "parser.yy"
-    { (yyval.op) = OperKinds::OrAssn; }
+#line 628 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_tuple( (ExpressionNode *)(new ExpressionNode( nullptr ) )->set_last( (yyvsp[-2].en) ) ) ); }
+#line 5043 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 121:
-
-/* Line 1806 of yacc.c  */
-#line 631 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_tuple() ); }
-    break;
-
-  case 122:
-
-/* Line 1806 of yacc.c  */
-#line 633 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_tuple( (yyvsp[(3) - (5)].en) ) ); }
+#line 630 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_tuple( (ExpressionNode *)(yyvsp[-4].en)->set_last( (yyvsp[-2].en) ) ) ); }
+#line 5049 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 123:
-
-/* Line 1806 of yacc.c  */
-#line 635 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_tuple( (ExpressionNode *)(new NullExprNode)->set_link( (yyvsp[(4) - (6)].en) ) ) ); }
-    break;
-
-  case 124:
-
-/* Line 1806 of yacc.c  */
-#line 637 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_tuple( (ExpressionNode *)(yyvsp[(3) - (7)].en)->set_link( (yyvsp[(5) - (7)].en) ) ) ); }
+#line 636 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (ExpressionNode *)(yyvsp[-2].en)->set_last( (yyvsp[0].en) ); }
+#line 5055 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 125:
+#line 642 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_comma( (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 5061 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 126:
-
-/* Line 1806 of yacc.c  */
-#line 643 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 128:
-
-/* Line 1806 of yacc.c  */
-#line 649 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_comma( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 129:
-
-/* Line 1806 of yacc.c  */
-#line 654 "parser.yy"
+#line 647 "parser.yy" /* yacc.c:1646  */
     { (yyval.en) = 0; }
-    break;
-
-  case 133:
-
-/* Line 1806 of yacc.c  */
-#line 663 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (1)].sn); }
-    break;
-
-  case 139:
-
-/* Line 1806 of yacc.c  */
-#line 670 "parser.yy"
+#line 5067 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 130:
+#line 656 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (yyvsp[0].sn); }
+#line 5073 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 136:
+#line 663 "parser.yy" /* yacc.c:1646  */
     {
                         Token fn;
                         fn.str = new std::string( "^?{}" ); // location undefined
-                        (yyval.sn) = new StatementNode( StatementNode::Exp, new CompositeExprNode( build_func( new VarRefNode( fn ), (ExpressionNode *)( (yyvsp[(2) - (6)].en) )->set_link( (yyvsp[(4) - (6)].en) ) ) ), 0 );
+                        (yyval.sn) = new StatementNode( build_expr( new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( (yyvsp[-4].en) )->set_last( (yyvsp[-2].en) ) ) ) ) );
                 }
-    break;
-
-  case 140:
-
-/* Line 1806 of yacc.c  */
-#line 680 "parser.yy"
-    {
-                        (yyval.sn) = (yyvsp[(4) - (4)].sn)->add_label( (yyvsp[(1) - (4)].tok) );
+#line 5083 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 137:
+#line 673 "parser.yy" /* yacc.c:1646  */
+    {
+                        (yyval.sn) = (yyvsp[0].sn)->add_label( (yyvsp[-3].tok) );
                 }
+#line 5091 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 138:
+#line 680 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_compound( (StatementNode *)0 ) ); }
+#line 5097 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 139:
+#line 687 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_compound( (yyvsp[-2].sn) ) ); }
+#line 5103 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 141:
-
-/* Line 1806 of yacc.c  */
-#line 687 "parser.yy"
-    { (yyval.sn) = new CompoundStmtNode( (StatementNode *)0 ); }
+#line 693 "parser.yy" /* yacc.c:1646  */
+    { if ( (yyvsp[-2].sn) != 0 ) { (yyvsp[-2].sn)->set_last( (yyvsp[0].sn) ); (yyval.sn) = (yyvsp[-2].sn); } }
+#line 5109 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 142:
-
-/* Line 1806 of yacc.c  */
-#line 694 "parser.yy"
-    { (yyval.sn) = new CompoundStmtNode( (yyvsp[(5) - (7)].sn) ); }
+#line 698 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( (yyvsp[0].decl) ); }
+#line 5115 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 143:
+#line 700 "parser.yy" /* yacc.c:1646  */
+    {   // mark all fields in list
+                        for ( DeclarationNode *iter = (yyvsp[0].decl); iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
+                                iter->set_extension( true );
+                        (yyval.sn) = new StatementNode( (yyvsp[0].decl) );
+                }
+#line 5125 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 144:
-
-/* Line 1806 of yacc.c  */
-#line 700 "parser.yy"
-    { if ( (yyvsp[(1) - (3)].sn) != 0 ) { (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(3) - (3)].sn) ); (yyval.sn) = (yyvsp[(1) - (3)].sn); } }
-    break;
-
-  case 145:
-
-/* Line 1806 of yacc.c  */
-#line 705 "parser.yy"
-    { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
-    break;
-
-  case 146:
-
-/* Line 1806 of yacc.c  */
-#line 707 "parser.yy"
-    {   // mark all fields in list
-                        for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_link() )
-                                iter->set_extension( true );
-                        (yyval.sn) = new StatementNode( (yyvsp[(2) - (2)].decl) );
-                }
+#line 706 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( (yyvsp[0].decl) ); }
+#line 5131 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 147:
-
-/* Line 1806 of yacc.c  */
-#line 713 "parser.yy"
-    { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
+#line 713 "parser.yy" /* yacc.c:1646  */
+    { if ( (yyvsp[-1].sn) != 0 ) { (yyvsp[-1].sn)->set_last( (yyvsp[0].sn) ); (yyval.sn) = (yyvsp[-1].sn); } }
+#line 5137 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 148:
+#line 718 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_expr( (yyvsp[-1].en) ) ); }
+#line 5143 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 149:
+#line 724 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_if( (yyvsp[-2].en), (yyvsp[0].sn), nullptr ) ); }
+#line 5149 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 150:
-
-/* Line 1806 of yacc.c  */
-#line 720 "parser.yy"
-    { if ( (yyvsp[(1) - (2)].sn) != 0 ) { (yyvsp[(1) - (2)].sn)->set_link( (yyvsp[(2) - (2)].sn) ); (yyval.sn) = (yyvsp[(1) - (2)].sn); } }
+#line 726 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_if( (yyvsp[-4].en), (yyvsp[-2].sn), (yyvsp[0].sn) ) ); }
+#line 5155 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 151:
-
-/* Line 1806 of yacc.c  */
-#line 725 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Exp, (yyvsp[(1) - (2)].en), 0 ); }
+#line 728 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_switch( (yyvsp[-2].en), (yyvsp[0].sn) ) ); }
+#line 5161 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 152:
-
-/* Line 1806 of yacc.c  */
-#line 731 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::If, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
-    break;
-
-  case 153:
-
-/* Line 1806 of yacc.c  */
-#line 733 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::If, (yyvsp[(3) - (7)].en), (StatementNode *)mkList((*(yyvsp[(5) - (7)].sn), *(yyvsp[(7) - (7)].sn) )) ); }
-    break;
-
-  case 154:
-
-/* Line 1806 of yacc.c  */
-#line 735 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
-    break;
-
-  case 155:
-
-/* Line 1806 of yacc.c  */
-#line 737 "parser.yy"
-    {
-                        StatementNode *sw = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) );
+#line 730 "parser.yy" /* yacc.c:1646  */
+    {
+                        StatementNode *sw = new StatementNode( build_switch( (yyvsp[-6].en), (yyvsp[-1].sn) ) );
                         // The semantics of the declaration list is changed to include associated initialization, which is performed
                         // *before* the transfer to the appropriate case clause by hoisting the declarations into a compound
@@ -5801 +5170 @@
                         // therefore, are removed from the grammar even though C allows it. The change also applies to choose
                         // statement.
-                        (yyval.sn) = (yyvsp[(7) - (9)].decl) != 0 ? new CompoundStmtNode( (StatementNode *)((new StatementNode( (yyvsp[(7) - (9)].decl) ))->set_link( sw )) ) : sw;
+                        (yyval.sn) = (yyvsp[-2].decl) != 0 ? new StatementNode( build_compound( (StatementNode *)((new StatementNode( (yyvsp[-2].decl) ))->set_last( sw )) ) ) : sw;
                 }
+#line 5175 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 153:
+#line 740 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_switch( (yyvsp[-2].en), (yyvsp[0].sn) ) ); }
+#line 5181 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 154:
+#line 742 "parser.yy" /* yacc.c:1646  */
+    {
+                        StatementNode *sw = new StatementNode( build_switch( (yyvsp[-6].en), (yyvsp[-1].sn) ) );
+                        (yyval.sn) = (yyvsp[-2].decl) != 0 ? new StatementNode( build_compound( (StatementNode *)((new StatementNode( (yyvsp[-2].decl) ))->set_last( sw )) ) ) : sw;
+                }
+#line 5190 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 155:
+#line 752 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (yyvsp[0].en); }
+#line 5196 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 156:
-
-/* Line 1806 of yacc.c  */
-#line 747 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
-    break;
-
-  case 157:
-
-/* Line 1806 of yacc.c  */
-#line 749 "parser.yy"
-    {
-                        StatementNode *sw = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) );
-                        (yyval.sn) = (yyvsp[(7) - (9)].decl) != 0 ? new CompoundStmtNode( (StatementNode *)((new StatementNode( (yyvsp[(7) - (9)].decl) ))->set_link( sw )) ) : sw;
+#line 754 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_range( (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 5202 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 158:
+#line 759 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_case( (yyvsp[0].en) ) ); }
+#line 5208 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 159:
+#line 761 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (StatementNode *)((yyvsp[-2].sn)->set_last( new StatementNode( build_case( (yyvsp[0].en) ) ) ) ); }
+#line 5214 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 160:
+#line 765 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (yyvsp[-1].sn); }
+#line 5220 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 161:
+#line 766 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_default() ); }
+#line 5226 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 163:
+#line 772 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (StatementNode *)( (yyvsp[-1].sn)->set_last( (yyvsp[0].sn) )); }
+#line 5232 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 164:
+#line 776 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (yyvsp[-1].sn)->append_last_case( new StatementNode( build_compound( (yyvsp[0].sn) ) ) ); }
+#line 5238 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 165:
+#line 781 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = 0; }
+#line 5244 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 167:
+#line 787 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (yyvsp[-1].sn)->append_last_case( new StatementNode( build_compound( (yyvsp[0].sn) ) ) ); }
+#line 5250 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 168:
+#line 789 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (StatementNode *)( (yyvsp[-2].sn)->set_last( (yyvsp[-1].sn)->append_last_case( new StatementNode( build_compound( (yyvsp[0].sn) ) ) ) ) ); }
+#line 5256 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 169:
+#line 794 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = 0; }
+#line 5262 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 171:
+#line 800 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (yyvsp[-1].sn)->append_last_case( (yyvsp[0].sn) ); }
+#line 5268 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 172:
+#line 802 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (yyvsp[-2].sn)->append_last_case( new StatementNode( build_compound( (StatementNode *)(yyvsp[-1].sn)->set_last( (yyvsp[0].sn) ) ) ) ); }
+#line 5274 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 173:
+#line 804 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (StatementNode *)( (yyvsp[-2].sn)->set_last( (yyvsp[-1].sn)->append_last_case( (yyvsp[0].sn) ))); }
+#line 5280 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 174:
+#line 806 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (StatementNode *)( (yyvsp[-3].sn)->set_last( (yyvsp[-2].sn)->append_last_case( new StatementNode( build_compound( (StatementNode *)(yyvsp[-1].sn)->set_last( (yyvsp[0].sn) ) ) ) ) ) ); }
+#line 5286 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 175:
+#line 811 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_branch( "", BranchStmt::Break ) ); }
+#line 5292 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 177:
+#line 817 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = 0; }
+#line 5298 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 178:
+#line 819 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = 0; }
+#line 5304 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 179:
+#line 824 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_while( (yyvsp[-2].en), (yyvsp[0].sn) ) ); }
+#line 5310 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 180:
+#line 826 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_while( (yyvsp[-2].en), (yyvsp[-5].sn) ) ); }
+#line 5316 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 181:
+#line 828 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_for( (yyvsp[-2].fctl), (yyvsp[0].sn) ) ); }
+#line 5322 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 182:
+#line 833 "parser.yy" /* yacc.c:1646  */
+    { (yyval.fctl) = new ForCtl( (yyvsp[-5].en), (yyvsp[-2].en), (yyvsp[0].en) ); }
+#line 5328 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 183:
+#line 835 "parser.yy" /* yacc.c:1646  */
+    { (yyval.fctl) = new ForCtl( (yyvsp[-3].decl), (yyvsp[-2].en), (yyvsp[0].en) ); }
+#line 5334 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 184:
+#line 840 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_branch( assign_strptr((yyvsp[-1].tok)), BranchStmt::Goto ) ); }
+#line 5340 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 185:
+#line 844 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_computedgoto( (yyvsp[-1].en) ) ); }
+#line 5346 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 186:
+#line 847 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_branch( "", BranchStmt::Continue ) ); }
+#line 5352 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 187:
+#line 851 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_branch( assign_strptr((yyvsp[-1].tok)), BranchStmt::Continue ) ); }
+#line 5358 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 188:
+#line 854 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_branch( "", BranchStmt::Break ) ); }
+#line 5364 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 189:
+#line 858 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_branch( assign_strptr((yyvsp[-1].tok)), BranchStmt::Break ) ); }
+#line 5370 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 190:
+#line 860 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_return( (yyvsp[-1].en) ) ); }
+#line 5376 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 191:
+#line 862 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_throw( (yyvsp[-1].en) ) ); }
+#line 5382 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 192:
+#line 864 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_throw( (yyvsp[-1].en) ) ); }
+#line 5388 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 193:
+#line 866 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_throw( (yyvsp[-3].en) ) ); }
+#line 5394 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 194:
+#line 871 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_try( (yyvsp[-1].sn), (yyvsp[0].sn), 0 ) ); }
+#line 5400 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 195:
+#line 873 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_try( (yyvsp[-1].sn), 0, (yyvsp[0].sn) ) ); }
+#line 5406 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 196:
+#line 875 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_try( (yyvsp[-2].sn), (yyvsp[-1].sn), (yyvsp[0].sn) ) ); }
+#line 5412 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 198:
+#line 882 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_catch( 0, (yyvsp[0].sn), true ) ); }
+#line 5418 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 199:
+#line 884 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (StatementNode *)(yyvsp[-5].sn)->set_last( new StatementNode( build_catch( 0, (yyvsp[0].sn), true ) ) ); }
+#line 5424 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 200:
+#line 886 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_catch( 0, (yyvsp[0].sn), true ) ); }
+#line 5430 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 201:
+#line 888 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (StatementNode *)(yyvsp[-5].sn)->set_last( new StatementNode( build_catch( 0, (yyvsp[0].sn), true ) ) ); }
+#line 5436 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 202:
+#line 893 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_catch( (yyvsp[-4].decl), (yyvsp[-1].sn) ) ); }
+#line 5442 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 203:
+#line 895 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (StatementNode *)(yyvsp[-9].sn)->set_last( new StatementNode( build_catch( (yyvsp[-4].decl), (yyvsp[-1].sn) ) ) ); }
+#line 5448 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 204:
+#line 897 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_catch( (yyvsp[-4].decl), (yyvsp[-1].sn) ) ); }
+#line 5454 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 205:
+#line 899 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (StatementNode *)(yyvsp[-9].sn)->set_last( new StatementNode( build_catch( (yyvsp[-4].decl), (yyvsp[-1].sn) ) ) ); }
+#line 5460 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 206:
+#line 904 "parser.yy" /* yacc.c:1646  */
+    {
+                        (yyval.sn) = new StatementNode( build_finally( (yyvsp[0].sn) ) );
                 }
-    break;
-
-  case 158:
-
-/* Line 1806 of yacc.c  */
-#line 759 "parser.yy"
-    { (yyval.en) = (yyvsp[(1) - (1)].en); }
-    break;
-
-  case 159:
-
-/* Line 1806 of yacc.c  */
-#line 761 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_range( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 161:
-
-/* Line 1806 of yacc.c  */
-#line 766 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Case, (yyvsp[(1) - (1)].en), 0 ); }
-    break;
-
-  case 162:
-
-/* Line 1806 of yacc.c  */
-#line 768 "parser.yy"
-    { (yyval.sn) = (StatementNode *)((yyvsp[(1) - (3)].sn)->set_link( new StatementNode( StatementNode::Case, (yyvsp[(3) - (3)].en), 0 ) ) ); }
-    break;
-
-  case 163:
-
-/* Line 1806 of yacc.c  */
-#line 772 "parser.yy"
-    { (yyval.sn) = (yyvsp[(2) - (3)].sn); }
-    break;
-
-  case 164:
-
-/* Line 1806 of yacc.c  */
-#line 773 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Default ); }
-    break;
-
-  case 166:
-
-/* Line 1806 of yacc.c  */
-#line 779 "parser.yy"
-    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (2)].sn)->set_link( (yyvsp[(2) - (2)].sn) )); }
-    break;
-
-  case 167:
-
-/* Line 1806 of yacc.c  */
-#line 783 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( new CompoundStmtNode( (yyvsp[(2) - (2)].sn) ) ); }
-    break;
-
-  case 168:
-
-/* Line 1806 of yacc.c  */
-#line 788 "parser.yy"
-    { (yyval.sn) = 0; }
-    break;
-
-  case 170:
-
-/* Line 1806 of yacc.c  */
-#line 794 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( new CompoundStmtNode( (yyvsp[(2) - (2)].sn) ) ); }
-    break;
-
-  case 171:
-
-/* Line 1806 of yacc.c  */
-#line 796 "parser.yy"
-    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(2) - (3)].sn)->append_last_case( new CompoundStmtNode( (yyvsp[(3) - (3)].sn) ) ) ) ); }
-    break;
-
-  case 172:
-
-/* Line 1806 of yacc.c  */
-#line 801 "parser.yy"
-    { (yyval.sn) = 0; }
-    break;
-
-  case 174:
-
-/* Line 1806 of yacc.c  */
-#line 807 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
-    break;
-
-  case 175:
-
-/* Line 1806 of yacc.c  */
-#line 809 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (3)].sn)->append_last_case( new CompoundStmtNode( (StatementNode *)mkList( (*(yyvsp[(2) - (3)].sn), *(yyvsp[(3) - (3)].sn) ) ) ) ); }
-    break;
-
-  case 176:
-
-/* Line 1806 of yacc.c  */
-#line 811 "parser.yy"
-    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
-    break;
-
-  case 177:
-
-/* Line 1806 of yacc.c  */
-#line 813 "parser.yy"
-    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (4)].sn)->set_link( (yyvsp[(2) - (4)].sn)->append_last_case( new CompoundStmtNode( (StatementNode *)mkList( (*(yyvsp[(3) - (4)].sn), *(yyvsp[(4) - (4)].sn) ) ) ) ) ) ); }
-    break;
-
-  case 178:
-
-/* Line 1806 of yacc.c  */
-#line 818 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Break ); }
-    break;
-
-  case 180:
-
-/* Line 1806 of yacc.c  */
-#line 824 "parser.yy"
-    { (yyval.sn) = 0; }
-    break;
-
-  case 181:
-
-/* Line 1806 of yacc.c  */
-#line 826 "parser.yy"
-    { (yyval.sn) = 0; }
-    break;
-
-  case 182:
-
-/* Line 1806 of yacc.c  */
-#line 831 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::While, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
-    break;
-
-  case 183:
-
-/* Line 1806 of yacc.c  */
-#line 833 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Do, (yyvsp[(5) - (7)].en), (yyvsp[(2) - (7)].sn) ); }
-    break;
-
-  case 184:
-
-/* Line 1806 of yacc.c  */
-#line 835 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::For, (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].sn) ); }
-    break;
-
-  case 185:
-
-/* Line 1806 of yacc.c  */
-#line 840 "parser.yy"
-    { (yyval.en) = new ForCtlExprNode( (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].en) ); }
-    break;
-
-  case 186:
-
-/* Line 1806 of yacc.c  */
-#line 842 "parser.yy"
-    { (yyval.en) = new ForCtlExprNode( (yyvsp[(1) - (4)].decl), (yyvsp[(2) - (4)].en), (yyvsp[(4) - (4)].en) ); }
-    break;
-
-  case 187:
-
-/* Line 1806 of yacc.c  */
-#line 847 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Goto, (yyvsp[(2) - (3)].tok) ); }
-    break;
-
-  case 188:
-
-/* Line 1806 of yacc.c  */
-#line 851 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Goto, (yyvsp[(3) - (4)].en) ); }
-    break;
-
-  case 189:
-
-/* Line 1806 of yacc.c  */
-#line 854 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Continue ); }
-    break;
-
-  case 190:
-
-/* Line 1806 of yacc.c  */
-#line 858 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Continue, (yyvsp[(2) - (3)].tok) ); }
-    break;
-
-  case 191:
-
-/* Line 1806 of yacc.c  */
-#line 861 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Break ); }
-    break;
-
-  case 192:
-
-/* Line 1806 of yacc.c  */
-#line 865 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Break, (yyvsp[(2) - (3)].tok) ); }
-    break;
-
-  case 193:
-
-/* Line 1806 of yacc.c  */
-#line 867 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Return, (yyvsp[(2) - (3)].en), 0 ); }
-    break;
-
-  case 194:
-
-/* Line 1806 of yacc.c  */
-#line 869 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Throw, (yyvsp[(2) - (3)].en), 0 ); }
-    break;
-
-  case 195:
-
-/* Line 1806 of yacc.c  */
-#line 873 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Throw, (yyvsp[(2) - (3)].en), 0 ); }
-    break;
-
-  case 196:
-
-/* Line 1806 of yacc.c  */
-#line 875 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Throw, (yyvsp[(2) - (5)].en), 0 ); }
-    break;
-
-  case 197:
-
-/* Line 1806 of yacc.c  */
-#line 882 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].pn) )))); }
-    break;
-
-  case 198:
-
-/* Line 1806 of yacc.c  */
-#line 884 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].pn) )))); }
-    break;
-
-  case 199:
-
-/* Line 1806 of yacc.c  */
-#line 886 "parser.yy"
-    {
-                        (yyvsp[(3) - (4)].pn)->set_link( (yyvsp[(4) - (4)].pn) );
-                        (yyval.sn) = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (4)].sn),*(yyvsp[(3) - (4)].pn) ))));
+#line 5468 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 208:
+#line 917 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        (yyval.decl) = (yyvsp[0].decl)->addType( (yyvsp[-1].decl) );
                 }
-    break;
-
-  case 201:
-
-/* Line 1806 of yacc.c  */
-#line 897 "parser.yy"
-    { (yyval.pn) = StatementNode::newCatchStmt( 0, (yyvsp[(5) - (5)].sn), true ); }
-    break;
-
-  case 202:
-
-/* Line 1806 of yacc.c  */
-#line 899 "parser.yy"
-    { (yyval.pn) = (yyvsp[(1) - (6)].pn)->set_link( StatementNode::newCatchStmt( 0, (yyvsp[(6) - (6)].sn), true ) ); }
-    break;
-
-  case 203:
-
-/* Line 1806 of yacc.c  */
-#line 901 "parser.yy"
-    { (yyval.pn) = StatementNode::newCatchStmt( 0, (yyvsp[(5) - (5)].sn), true ); }
-    break;
-
-  case 204:
-
-/* Line 1806 of yacc.c  */
-#line 903 "parser.yy"
-    { (yyval.pn) = (yyvsp[(1) - (6)].pn)->set_link( StatementNode::newCatchStmt( 0, (yyvsp[(6) - (6)].sn), true ) ); }
-    break;
-
-  case 205:
-
-/* Line 1806 of yacc.c  */
-#line 908 "parser.yy"
-    { (yyval.pn) = StatementNode::newCatchStmt( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ); }
-    break;
-
-  case 206:
-
-/* Line 1806 of yacc.c  */
-#line 910 "parser.yy"
-    { (yyval.pn) = (yyvsp[(1) - (10)].pn)->set_link( StatementNode::newCatchStmt( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ); }
-    break;
-
-  case 207:
-
-/* Line 1806 of yacc.c  */
-#line 912 "parser.yy"
-    { (yyval.pn) = StatementNode::newCatchStmt( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ); }
-    break;
-
-  case 208:
-
-/* Line 1806 of yacc.c  */
-#line 914 "parser.yy"
-    { (yyval.pn) = (yyvsp[(1) - (10)].pn)->set_link( StatementNode::newCatchStmt( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ); }
+#line 5477 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 209:
-
-/* Line 1806 of yacc.c  */
-#line 919 "parser.yy"
-    {
-                        (yyval.pn) = new StatementNode( StatementNode::Finally, 0, (yyvsp[(2) - (2)].sn) );
-                        std::cout << "Just created a finally node" << std::endl;
+#line 922 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addType( (yyvsp[-1].decl) ); }
+#line 5483 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 210:
+#line 924 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        (yyval.decl) = (yyvsp[-1].decl)->addName( (yyvsp[0].tok) );
                 }
-    break;
-
-  case 211:
-
-/* Line 1806 of yacc.c  */
-#line 933 "parser.yy"
+#line 5492 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 212:
+#line 933 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[-4].flag), (yyvsp[-2].constant), 0 ) ); }
+#line 5498 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 213:
+#line 935 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[-6].flag), (yyvsp[-4].constant), (yyvsp[-2].en) ) ); }
+#line 5504 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 214:
+#line 937 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[-8].flag), (yyvsp[-6].constant), (yyvsp[-4].en), (yyvsp[-2].en) ) ); }
+#line 5510 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 215:
+#line 939 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[-10].flag), (yyvsp[-8].constant), (yyvsp[-6].en), (yyvsp[-4].en), (yyvsp[-2].en) ) ); }
+#line 5516 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 216:
+#line 941 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[-12].flag), (yyvsp[-9].constant), 0, (yyvsp[-6].en), (yyvsp[-4].en), (yyvsp[-2].label) ) ); }
+#line 5522 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 217:
+#line 946 "parser.yy" /* yacc.c:1646  */
+    { (yyval.flag) = false; }
+#line 5528 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 218:
+#line 948 "parser.yy" /* yacc.c:1646  */
+    { (yyval.flag) = true; }
+#line 5534 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 219:
+#line 953 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = 0; }
+#line 5540 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 222:
+#line 960 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (ExpressionNode *)(yyvsp[-2].en)->set_last( (yyvsp[0].en) ); }
+#line 5546 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 223:
+#line 965 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_asmexpr( 0, (yyvsp[-3].constant), (yyvsp[-1].en) ) ); }
+#line 5552 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 224:
+#line 967 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_asmexpr( (yyvsp[-5].en), (yyvsp[-3].constant), (yyvsp[-1].en) ) ); }
+#line 5558 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 225:
+#line 972 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = 0; }
+#line 5564 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 226:
+#line 974 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( (yyvsp[0].constant) ); }
+#line 5570 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 227:
+#line 976 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (ExpressionNode *)(yyvsp[-2].en)->set_last( new ExpressionNode( (yyvsp[0].constant) ) ); }
+#line 5576 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 228:
+#line 981 "parser.yy" /* yacc.c:1646  */
+    { (yyval.label) = new LabelNode(); (yyval.label)->labels.push_back( assign_strptr((yyvsp[0].tok)) ); }
+#line 5582 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 229:
+#line 983 "parser.yy" /* yacc.c:1646  */
+    { (yyval.label) = (yyvsp[-2].label); (yyvsp[-2].label)->labels.push_back( assign_strptr((yyvsp[0].tok)) ); }
+#line 5588 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 230:
+#line 990 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = 0; }
+#line 5594 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 233:
+#line 997 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->appendList( (yyvsp[0].decl) ); }
+#line 5600 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 234:
+#line 1002 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = 0; }
+#line 5606 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 237:
+#line 1009 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->appendList( (yyvsp[0].decl) ); }
+#line 5612 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 242:
+#line 1023 "parser.yy" /* yacc.c:1646  */
+    {}
+#line 5618 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 243:
+#line 1024 "parser.yy" /* yacc.c:1646  */
+    {}
+#line 5624 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 251:
+#line 1053 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) );
+                        (yyval.decl) = (yyvsp[-1].decl)->addInitializer( (yyvsp[0].in) );
                 }
-    break;
-
-  case 212:
-
-/* Line 1806 of yacc.c  */
-#line 938 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 213:
-
-/* Line 1806 of yacc.c  */
-#line 940 "parser.yy"
+#line 5633 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 252:
+#line 1060 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(1) - (2)].decl)->addName( (yyvsp[(2) - (2)].tok) );
+                        (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[-2].decl) )->addInitializer( (yyvsp[0].in) );;
                 }
-    break;
-
-  case 215:
-
-/* Line 1806 of yacc.c  */
-#line 949 "parser.yy"
-    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (6)].flag), (yyvsp[(4) - (6)].constant), 0 ); }
-    break;
-
-  case 216:
-
-/* Line 1806 of yacc.c  */
-#line 951 "parser.yy"
-    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (8)].flag), (yyvsp[(4) - (8)].constant), (yyvsp[(6) - (8)].en) ); }
-    break;
-
-  case 217:
-
-/* Line 1806 of yacc.c  */
-#line 953 "parser.yy"
-    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (10)].flag), (yyvsp[(4) - (10)].constant), (yyvsp[(6) - (10)].en), (yyvsp[(8) - (10)].en) ); }
-    break;
-
-  case 218:
-
-/* Line 1806 of yacc.c  */
-#line 955 "parser.yy"
-    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (12)].flag), (yyvsp[(4) - (12)].constant), (yyvsp[(6) - (12)].en), (yyvsp[(8) - (12)].en), (yyvsp[(10) - (12)].constant) ); }
-    break;
-
-  case 219:
-
-/* Line 1806 of yacc.c  */
-#line 957 "parser.yy"
-    { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (14)].flag), (yyvsp[(5) - (14)].constant), 0, (yyvsp[(8) - (14)].en), (yyvsp[(10) - (14)].constant), (yyvsp[(12) - (14)].label) ); }
-    break;
-
-  case 220:
-
-/* Line 1806 of yacc.c  */
-#line 962 "parser.yy"
-    { (yyval.flag) = false; }
-    break;
-
-  case 221:
-
-/* Line 1806 of yacc.c  */
-#line 964 "parser.yy"
-    { (yyval.flag) = true; }
-    break;
-
-  case 222:
-
-/* Line 1806 of yacc.c  */
-#line 969 "parser.yy"
-    { (yyval.en) = 0; }
-    break;
-
-  case 225:
-
-/* Line 1806 of yacc.c  */
-#line 976 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
-    break;
-
-  case 226:
-
-/* Line 1806 of yacc.c  */
-#line 981 "parser.yy"
-    { (yyval.en) = new AsmExprNode( 0, (yyvsp[(1) - (4)].constant), (yyvsp[(3) - (4)].en) ); }
-    break;
-
-  case 227:
-
-/* Line 1806 of yacc.c  */
-#line 983 "parser.yy"
-    { (yyval.en) = new AsmExprNode( (yyvsp[(2) - (7)].en), (yyvsp[(4) - (7)].constant), (yyvsp[(6) - (7)].en) ); }
-    break;
-
-  case 228:
-
-/* Line 1806 of yacc.c  */
-#line 988 "parser.yy"
-    { (yyval.constant) = 0; }
-    break;
-
-  case 229:
-
-/* Line 1806 of yacc.c  */
-#line 990 "parser.yy"
-    { (yyval.constant) = (yyvsp[(1) - (1)].constant); }
-    break;
-
-  case 230:
-
-/* Line 1806 of yacc.c  */
-#line 992 "parser.yy"
-    { (yyval.constant) = (ConstantNode *)(yyvsp[(1) - (3)].constant)->set_link( (yyvsp[(3) - (3)].constant) ); }
-    break;
-
-  case 231:
-
-/* Line 1806 of yacc.c  */
-#line 997 "parser.yy"
-    { (yyval.label) = new LabelNode(); (yyval.label)->append_label( (yyvsp[(1) - (1)].tok) ); }
-    break;
-
-  case 232:
-
-/* Line 1806 of yacc.c  */
-#line 999 "parser.yy"
-    { (yyval.label) = (yyvsp[(1) - (3)].label); (yyvsp[(1) - (3)].label)->append_label( (yyvsp[(3) - (3)].tok) ); }
-    break;
-
-  case 233:
-
-/* Line 1806 of yacc.c  */
-#line 1006 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
-  case 236:
-
-/* Line 1806 of yacc.c  */
-#line 1013 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 237:
-
-/* Line 1806 of yacc.c  */
-#line 1018 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
-  case 240:
-
-/* Line 1806 of yacc.c  */
-#line 1025 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 245:
-
-/* Line 1806 of yacc.c  */
-#line 1039 "parser.yy"
-    {}
-    break;
-
-  case 246:
-
-/* Line 1806 of yacc.c  */
-#line 1040 "parser.yy"
-    {}
+#line 5642 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 253:
+#line 1065 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope( *(yyvsp[-1].tok), TypedefTable::ID );
+                        (yyval.decl) = (yyvsp[-5].decl)->appendList( (yyvsp[-5].decl)->cloneType( (yyvsp[-1].tok) )->addInitializer( (yyvsp[0].in) ) );
+                }
+#line 5651 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 254:
-
-/* Line 1806 of yacc.c  */
-#line 1069 "parser.yy"
+#line 1075 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.setNextIdentifier( *(yyvsp[-1].tok) );
+                        (yyval.decl) = (yyvsp[-2].decl)->addName( (yyvsp[-1].tok) );
+                }
+#line 5660 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 255:
+#line 1080 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.setNextIdentifier( *(yyvsp[-1].tok) );
+                        (yyval.decl) = (yyvsp[-2].decl)->addName( (yyvsp[-1].tok) );
+                }
+#line 5669 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 256:
+#line 1085 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.setNextIdentifier( *(yyvsp[-1].tok) );
+                        (yyval.decl) = (yyvsp[-2].decl)->addQualifiers( (yyvsp[-3].decl) )->addName( (yyvsp[-1].tok) );
+                }
+#line 5678 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 257:
+#line 1093 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(1) - (2)].decl)->addInitializer( (yyvsp[(2) - (2)].in) );
+                        (yyval.decl) = (yyvsp[0].decl);
                 }
-    break;
-
-  case 255:
-
-/* Line 1806 of yacc.c  */
-#line 1076 "parser.yy"
+#line 5687 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 258:
+#line 1098 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(2) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) )->addInitializer( (yyvsp[(3) - (3)].in) );;
+                        (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-1].decl) );
                 }
-    break;
-
-  case 256:
-
-/* Line 1806 of yacc.c  */
-#line 1081 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( *(yyvsp[(5) - (6)].tok), TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(1) - (6)].decl)->appendList( (yyvsp[(1) - (6)].decl)->cloneType( (yyvsp[(5) - (6)].tok) )->addInitializer( (yyvsp[(6) - (6)].in) ) );
+#line 5696 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 259:
+#line 1103 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-1].decl) );
                 }
-    break;
-
-  case 257:
-
-/* Line 1806 of yacc.c  */
-#line 1091 "parser.yy"
-    {
-                        typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
-                        (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) );
+#line 5705 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 260:
+#line 1108 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-2].decl) )->addQualifiers( (yyvsp[-1].decl) );
                 }
-    break;
-
-  case 258:
-
-/* Line 1806 of yacc.c  */
-#line 1096 "parser.yy"
-    {
-                        typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
-                        (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) );
+#line 5714 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 261:
+#line 1113 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope( *(yyvsp[0].tok), TypedefTable::ID );
+                        (yyval.decl) = (yyvsp[-4].decl)->appendList( (yyvsp[-4].decl)->cloneType( (yyvsp[0].tok) ) );
                 }
-    break;
-
-  case 259:
-
-/* Line 1806 of yacc.c  */
-#line 1101 "parser.yy"
-    {
-                        typedefTable.setNextIdentifier( *(yyvsp[(3) - (4)].tok) );
-                        (yyval.decl) = (yyvsp[(2) - (4)].decl)->addQualifiers( (yyvsp[(1) - (4)].decl) )->addName( (yyvsp[(3) - (4)].tok) );
+#line 5723 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 262:
+#line 1121 "parser.yy" /* yacc.c:1646  */
+    {
+                        (yyval.decl) = DeclarationNode::newFunction( (yyvsp[-5].tok), DeclarationNode::newTuple( 0 ), (yyvsp[-2].decl), 0, true );
                 }
-    break;
-
-  case 260:
-
-/* Line 1806 of yacc.c  */
-#line 1109 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(1) - (1)].decl);
+#line 5731 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 263:
+#line 1144 "parser.yy" /* yacc.c:1646  */
+    {
+                        (yyval.decl) = DeclarationNode::newFunction( (yyvsp[-5].tok), (yyvsp[-6].decl), (yyvsp[-2].decl), 0, true );
                 }
-    break;
-
-  case 261:
-
-/* Line 1806 of yacc.c  */
-#line 1114 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) );
+#line 5739 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 264:
+#line 1148 "parser.yy" /* yacc.c:1646  */
+    {
+                        (yyval.decl) = DeclarationNode::newFunction( (yyvsp[-5].tok), (yyvsp[-6].decl), (yyvsp[-2].decl), 0, true );
                 }
-    break;
-
-  case 262:
-
-/* Line 1806 of yacc.c  */
-#line 1119 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) );
+#line 5747 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 265:
+#line 1155 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[-2].decl) ); }
+#line 5753 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 266:
+#line 1159 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[-6].decl)->appendList( (yyvsp[-2].decl) ) ); }
+#line 5759 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 267:
+#line 1164 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope( TypedefTable::TD );
+                        (yyval.decl) = (yyvsp[0].decl)->addTypedef();
                 }
-    break;
-
-  case 263:
-
-/* Line 1806 of yacc.c  */
-#line 1124 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) )->addQualifiers( (yyvsp[(2) - (3)].decl) );
+#line 5768 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 268:
+#line 1169 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope( TypedefTable::TD );
+                        (yyval.decl) = (yyvsp[0].decl)->addTypedef();
                 }
-    break;
-
-  case 264:
-
-/* Line 1806 of yacc.c  */
-#line 1129 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(1) - (5)].decl)->cloneType( (yyvsp[(5) - (5)].tok) ) );
+#line 5777 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 269:
+#line 1174 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope( *(yyvsp[0].tok), TypedefTable::TD );
+                        (yyval.decl) = (yyvsp[-4].decl)->appendList( (yyvsp[-4].decl)->cloneType( (yyvsp[0].tok) ) );
                 }
-    break;
-
-  case 265:
-
-/* Line 1806 of yacc.c  */
-#line 1137 "parser.yy"
-    {
-                        (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(3) - (8)].tok), DeclarationNode::newTuple( 0 ), (yyvsp[(6) - (8)].decl), 0, true );
+#line 5786 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 270:
+#line 1185 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope( TypedefTable::TD );
+                        (yyval.decl) = (yyvsp[0].decl)->addType( (yyvsp[-1].decl) )->addTypedef();
                 }
-    break;
-
-  case 266:
-
-/* Line 1806 of yacc.c  */
-#line 1160 "parser.yy"
-    {
-                        (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
+#line 5795 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 271:
+#line 1190 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope( TypedefTable::TD );
+                        (yyval.decl) = (yyvsp[-4].decl)->appendList( (yyvsp[-4].decl)->cloneBaseType( (yyvsp[0].decl) )->addTypedef() );
                 }
-    break;
-
-  case 267:
-
-/* Line 1806 of yacc.c  */
-#line 1164 "parser.yy"
-    {
-                        (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
+#line 5804 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 272:
+#line 1195 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope( TypedefTable::TD );
+                        (yyval.decl) = (yyvsp[0].decl)->addType( (yyvsp[-1].decl) )->addQualifiers( (yyvsp[-3].decl) )->addTypedef();
                 }
-    break;
-
-  case 268:
-
-/* Line 1806 of yacc.c  */
-#line 1171 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
-    break;
-
-  case 269:
-
-/* Line 1806 of yacc.c  */
-#line 1175 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (9)].decl)->appendList( (yyvsp[(7) - (9)].decl) ) ); }
-    break;
-
-  case 270:
-
-/* Line 1806 of yacc.c  */
-#line 1180 "parser.yy"
+#line 5813 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 273:
+#line 1200 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
-                        (yyval.decl) = (yyvsp[(2) - (2)].decl)->addTypedef();
+                        (yyval.decl) = (yyvsp[0].decl)->addType( (yyvsp[-2].decl) )->addTypedef();
                 }
-    break;
-
-  case 271:
-
-/* Line 1806 of yacc.c  */
-#line 1185 "parser.yy"
+#line 5822 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 274:
+#line 1205 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
-                        (yyval.decl) = (yyvsp[(2) - (2)].decl)->addTypedef();
+                        (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-3].decl) )->addTypedef()->addType( (yyvsp[-3].decl) );
                 }
-    break;
-
-  case 272:
-
-/* Line 1806 of yacc.c  */
-#line 1190 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::TD );
-                        (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(1) - (5)].decl)->cloneType( (yyvsp[(5) - (5)].tok) ) );
-                }
-    break;
-
-  case 273:
-
-/* Line 1806 of yacc.c  */
-#line 1201 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( TypedefTable::TD );
-                        (yyval.decl) = (yyvsp[(3) - (3)].decl)->addType( (yyvsp[(2) - (3)].decl) )->addTypedef();
-                }
-    break;
-
-  case 274:
-
-/* Line 1806 of yacc.c  */
-#line 1206 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( TypedefTable::TD );
-                        (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(1) - (5)].decl)->cloneBaseType( (yyvsp[(5) - (5)].decl) )->addTypedef() );
-                }
+#line 5831 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 275:
-
-/* Line 1806 of yacc.c  */
-#line 1211 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( TypedefTable::TD );
-                        (yyval.decl) = (yyvsp[(4) - (4)].decl)->addType( (yyvsp[(3) - (4)].decl) )->addQualifiers( (yyvsp[(1) - (4)].decl) )->addTypedef();
-                }
-    break;
-
-  case 276:
-
-/* Line 1806 of yacc.c  */
-#line 1216 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( TypedefTable::TD );
-                        (yyval.decl) = (yyvsp[(3) - (3)].decl)->addType( (yyvsp[(1) - (3)].decl) )->addTypedef();
-                }
-    break;
-
-  case 277:
-
-/* Line 1806 of yacc.c  */
-#line 1221 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( TypedefTable::TD );
-                        (yyval.decl) = (yyvsp[(4) - (4)].decl)->addQualifiers( (yyvsp[(1) - (4)].decl) )->addTypedef()->addType( (yyvsp[(1) - (4)].decl) );
-                }
-    break;
-
-  case 278:
-
-/* Line 1806 of yacc.c  */
-#line 1230 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( *(yyvsp[(2) - (4)].tok), TypedefTable::TD );
+#line 1214 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope( *(yyvsp[-2].tok), TypedefTable::TD );
                         (yyval.decl) = DeclarationNode::newName( 0 ); // XXX
                 }
-    break;
-
-  case 279:
-
-/* Line 1806 of yacc.c  */
-#line 1235 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( *(yyvsp[(5) - (7)].tok), TypedefTable::TD );
+#line 5840 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 276:
+#line 1219 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope( *(yyvsp[-2].tok), TypedefTable::TD );
                         (yyval.decl) = DeclarationNode::newName( 0 ); // XXX
                 }
-    break;
-
-  case 284:
-
-/* Line 1806 of yacc.c  */
-#line 1252 "parser.yy"
+#line 5849 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 281:
+#line 1236 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        (yyval.decl) = ( (yyvsp[(2) - (4)].decl)->addType( (yyvsp[(1) - (4)].decl) ))->addInitializer( (yyvsp[(4) - (4)].in) );
+                        (yyval.decl) = ( (yyvsp[-2].decl)->addType( (yyvsp[-3].decl) ))->addInitializer( (yyvsp[0].in) );
                 }
-    break;
-
-  case 285:
-
-/* Line 1806 of yacc.c  */
-#line 1257 "parser.yy"
+#line 5858 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 282:
+#line 1241 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(1) - (6)].decl)->appendList( (yyvsp[(1) - (6)].decl)->cloneBaseType( (yyvsp[(4) - (6)].decl)->addInitializer( (yyvsp[(6) - (6)].in) ) ) );
+                        (yyval.decl) = (yyvsp[-5].decl)->appendList( (yyvsp[-5].decl)->cloneBaseType( (yyvsp[-2].decl)->addInitializer( (yyvsp[0].in) ) ) );
                 }
+#line 5867 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 291:
+#line 1263 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = 0; }
+#line 5873 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 294:
-
-/* Line 1806 of yacc.c  */
-#line 1279 "parser.yy"
-    { (yyval.decl) = 0; }
+#line 1275 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 5879 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 297:
-
-/* Line 1806 of yacc.c  */
-#line 1291 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+#line 1286 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Const ); }
+#line 5885 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 298:
+#line 1288 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Restrict ); }
+#line 5891 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 299:
+#line 1290 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Volatile ); }
+#line 5897 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 300:
-
-/* Line 1806 of yacc.c  */
-#line 1302 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Const ); }
+#line 1292 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Lvalue ); }
+#line 5903 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 301:
-
-/* Line 1806 of yacc.c  */
-#line 1304 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Restrict ); }
+#line 1294 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Atomic ); }
+#line 5909 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 302:
-
-/* Line 1806 of yacc.c  */
-#line 1306 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Volatile ); }
-    break;
-
-  case 303:
-
-/* Line 1806 of yacc.c  */
-#line 1308 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Lvalue ); }
-    break;
-
-  case 304:
-
-/* Line 1806 of yacc.c  */
-#line 1310 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Atomic ); }
-    break;
-
-  case 305:
-
-/* Line 1806 of yacc.c  */
-#line 1312 "parser.yy"
+#line 1296 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.enterScope();
                 }
+#line 5917 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 303:
+#line 1300 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.leaveScope();
+                        (yyval.decl) = DeclarationNode::newForall( (yyvsp[-1].decl) );
+                }
+#line 5926 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 305:
+#line 1309 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 5932 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 306:
-
-/* Line 1806 of yacc.c  */
-#line 1316 "parser.yy"
-    {
-                        typedefTable.leaveScope();
-                        (yyval.decl) = DeclarationNode::newForall( (yyvsp[(4) - (5)].decl) );
+#line 1311 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addQualifiers( (yyvsp[-1].decl) )->addQualifiers( (yyvsp[0].decl) ); }
+#line 5938 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 308:
+#line 1322 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 5944 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 309:
+#line 1327 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Extern ); }
+#line 5950 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 310:
+#line 1329 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Static ); }
+#line 5956 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 311:
+#line 1331 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Auto ); }
+#line 5962 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 312:
+#line 1333 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Register ); }
+#line 5968 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 313:
+#line 1335 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Inline ); }
+#line 5974 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 314:
+#line 1337 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Fortran ); }
+#line 5980 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 315:
+#line 1339 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Noreturn ); }
+#line 5986 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 316:
+#line 1341 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Threadlocal ); }
+#line 5992 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 317:
+#line 1346 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Char ); }
+#line 5998 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 318:
+#line 1348 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Double ); }
+#line 6004 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 319:
+#line 1350 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Float ); }
+#line 6010 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 320:
+#line 1352 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Int ); }
+#line 6016 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 321:
+#line 1354 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Long ); }
+#line 6022 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 322:
+#line 1356 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Short ); }
+#line 6028 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 323:
+#line 1358 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Signed ); }
+#line 6034 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 324:
+#line 1360 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Unsigned ); }
+#line 6040 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 325:
+#line 1362 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Void ); }
+#line 6046 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 326:
+#line 1364 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Bool ); }
+#line 6052 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 327:
+#line 1366 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Complex ); }
+#line 6058 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 328:
+#line 1368 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Imaginary ); }
+#line 6064 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 329:
+#line 1370 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
+#line 6070 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 331:
+#line 1377 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-1].decl) ); }
+#line 6076 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 332:
+#line 1379 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 6082 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 333:
+#line 1381 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addQualifiers( (yyvsp[-1].decl) )->addQualifiers( (yyvsp[0].decl) ); }
+#line 6088 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 334:
+#line 1383 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-1].decl) )->addType( (yyvsp[-2].decl) ); }
+#line 6094 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 336:
+#line 1389 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[-2].decl) )->addQualifiers( (yyvsp[0].decl) ); }
+#line 6100 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 338:
+#line 1396 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-1].decl) ); }
+#line 6106 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 339:
+#line 1398 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 6112 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 340:
+#line 1400 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addType( (yyvsp[0].decl) ); }
+#line 6118 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 341:
+#line 1405 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 6124 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 342:
+#line 1407 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newTypeof( (yyvsp[-1].en) ); }
+#line 6130 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 343:
+#line 1409 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[-3].tok), (yyvsp[-1].decl) ); }
+#line 6136 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 344:
+#line 1411 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[-3].tok), (yyvsp[-1].en) ); }
+#line 6142 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 346:
+#line 1417 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-1].decl) ); }
+#line 6148 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 347:
+#line 1419 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 6154 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 348:
+#line 1421 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addQualifiers( (yyvsp[-1].decl) )->addQualifiers( (yyvsp[0].decl) ); }
+#line 6160 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 350:
+#line 1427 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-1].decl) ); }
+#line 6166 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 351:
+#line 1429 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 6172 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 353:
+#line 1435 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-1].decl) ); }
+#line 6178 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 354:
+#line 1437 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 6184 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 355:
+#line 1439 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addQualifiers( (yyvsp[-1].decl) )->addQualifiers( (yyvsp[0].decl) ); }
+#line 6190 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 356:
+#line 1444 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[0].tok) ); }
+#line 6196 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 357:
+#line 1446 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[0].tok) )->addQualifiers( (yyvsp[-1].decl) ); }
+#line 6202 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 358:
+#line 1448 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 6208 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 361:
+#line 1458 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[-3].aggKey), 0, 0, (yyvsp[-1].decl), true ); }
+#line 6214 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 362:
+#line 1460 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.makeTypedef( *(yyvsp[0].tok) );
+                        (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[-1].aggKey), (yyvsp[0].tok), 0, 0, false );
                 }
-    break;
-
-  case 308:
-
-/* Line 1806 of yacc.c  */
-#line 1325 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 309:
-
-/* Line 1806 of yacc.c  */
-#line 1327 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 311:
-
-/* Line 1806 of yacc.c  */
-#line 1338 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 313:
-
-/* Line 1806 of yacc.c  */
-#line 1347 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Extern ); }
-    break;
-
-  case 314:
-
-/* Line 1806 of yacc.c  */
-#line 1349 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Static ); }
-    break;
-
-  case 315:
-
-/* Line 1806 of yacc.c  */
-#line 1351 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Auto ); }
-    break;
-
-  case 316:
-
-/* Line 1806 of yacc.c  */
-#line 1353 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Register ); }
-    break;
-
-  case 317:
-
-/* Line 1806 of yacc.c  */
-#line 1355 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Inline ); }
-    break;
-
-  case 318:
-
-/* Line 1806 of yacc.c  */
-#line 1357 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Fortran ); }
-    break;
-
-  case 319:
-
-/* Line 1806 of yacc.c  */
-#line 1359 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Noreturn ); }
-    break;
-
-  case 320:
-
-/* Line 1806 of yacc.c  */
-#line 1361 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Threadlocal ); }
-    break;
-
-  case 321:
-
-/* Line 1806 of yacc.c  */
-#line 1366 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Char ); }
-    break;
-
-  case 322:
-
-/* Line 1806 of yacc.c  */
-#line 1368 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Double ); }
-    break;
-
-  case 323:
-
-/* Line 1806 of yacc.c  */
-#line 1370 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Float ); }
-    break;
-
-  case 324:
-
-/* Line 1806 of yacc.c  */
-#line 1372 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Int ); }
-    break;
-
-  case 325:
-
-/* Line 1806 of yacc.c  */
-#line 1374 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Long ); }
-    break;
-
-  case 326:
-
-/* Line 1806 of yacc.c  */
-#line 1376 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Short ); }
-    break;
-
-  case 327:
-
-/* Line 1806 of yacc.c  */
-#line 1378 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Signed ); }
-    break;
-
-  case 328:
-
-/* Line 1806 of yacc.c  */
-#line 1380 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Unsigned ); }
-    break;
-
-  case 329:
-
-/* Line 1806 of yacc.c  */
-#line 1382 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Void ); }
-    break;
-
-  case 330:
-
-/* Line 1806 of yacc.c  */
-#line 1384 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Bool ); }
-    break;
-
-  case 331:
-
-/* Line 1806 of yacc.c  */
-#line 1386 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Complex ); }
-    break;
-
-  case 332:
-
-/* Line 1806 of yacc.c  */
-#line 1388 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Imaginary ); }
-    break;
-
-  case 333:
-
-/* Line 1806 of yacc.c  */
-#line 1390 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
-    break;
-
-  case 335:
-
-/* Line 1806 of yacc.c  */
-#line 1397 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 336:
-
-/* Line 1806 of yacc.c  */
-#line 1399 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 337:
-
-/* Line 1806 of yacc.c  */
-#line 1401 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 338:
-
-/* Line 1806 of yacc.c  */
-#line 1403 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addType( (yyvsp[(1) - (3)].decl) ); }
-    break;
-
-  case 340:
-
-/* Line 1806 of yacc.c  */
-#line 1409 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 342:
-
-/* Line 1806 of yacc.c  */
-#line 1416 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 343:
-
-/* Line 1806 of yacc.c  */
-#line 1418 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 344:
-
-/* Line 1806 of yacc.c  */
-#line 1420 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addType( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 345:
-
-/* Line 1806 of yacc.c  */
-#line 1425 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (4)].decl); }
-    break;
-
-  case 346:
-
-/* Line 1806 of yacc.c  */
-#line 1427 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newTypeof( (yyvsp[(3) - (4)].en) ); }
-    break;
-
-  case 347:
-
-/* Line 1806 of yacc.c  */
-#line 1429 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].decl) ); }
-    break;
-
-  case 348:
-
-/* Line 1806 of yacc.c  */
-#line 1431 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
-    break;
-
-  case 350:
-
-/* Line 1806 of yacc.c  */
-#line 1437 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 351:
-
-/* Line 1806 of yacc.c  */
-#line 1439 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 352:
-
-/* Line 1806 of yacc.c  */
-#line 1441 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 354:
-
-/* Line 1806 of yacc.c  */
-#line 1447 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 355:
-
-/* Line 1806 of yacc.c  */
-#line 1449 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 357:
-
-/* Line 1806 of yacc.c  */
-#line 1455 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 358:
-
-/* Line 1806 of yacc.c  */
-#line 1457 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 359:
-
-/* Line 1806 of yacc.c  */
-#line 1459 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 360:
-
-/* Line 1806 of yacc.c  */
-#line 1464 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(1) - (1)].tok) ); }
-    break;
-
-  case 361:
-
-/* Line 1806 of yacc.c  */
-#line 1466 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(2) - (2)].tok) )->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 362:
-
-/* Line 1806 of yacc.c  */
-#line 1468 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+#line 6223 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 363:
+#line 1465 "parser.yy" /* yacc.c:1646  */
+    { typedefTable.makeTypedef( *(yyvsp[0].tok) ); }
+#line 6229 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 364:
+#line 1467 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[-5].aggKey), (yyvsp[-4].tok), 0, (yyvsp[-1].decl), true ); }
+#line 6235 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 365:
-
-/* Line 1806 of yacc.c  */
-#line 1478 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (4)].aggKey), 0, 0, (yyvsp[(3) - (4)].decl), true ); }
+#line 1469 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[-6].aggKey), 0, (yyvsp[-4].en), (yyvsp[-1].decl), false ); }
+#line 6241 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 366:
-
-/* Line 1806 of yacc.c  */
-#line 1480 "parser.yy"
-    {
-                        typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
-                        (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (2)].aggKey), (yyvsp[(2) - (2)].tok), 0, 0, false );
+#line 1471 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl); }
+#line 6247 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 367:
+#line 1476 "parser.yy" /* yacc.c:1646  */
+    { (yyval.aggKey) = DeclarationNode::Struct; }
+#line 6253 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 368:
+#line 1478 "parser.yy" /* yacc.c:1646  */
+    { (yyval.aggKey) = DeclarationNode::Union; }
+#line 6259 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 369:
+#line 1483 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = 0; }
+#line 6265 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 370:
+#line 1485 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl) != 0 ? (yyvsp[-1].decl)->appendList( (yyvsp[0].decl) ) : (yyvsp[0].decl); }
+#line 6271 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 372:
+#line 1491 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->set_extension( true ); }
+#line 6277 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 374:
+#line 1494 "parser.yy" /* yacc.c:1646  */
+    {   // mark all fields in list
+                        for ( DeclarationNode *iter = (yyvsp[-1].decl); iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
+                                iter->set_extension( true );
+                        (yyval.decl) = (yyvsp[-1].decl);
                 }
-    break;
-
-  case 367:
-
-/* Line 1806 of yacc.c  */
-#line 1485 "parser.yy"
-    { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
-    break;
-
-  case 368:
-
-/* Line 1806 of yacc.c  */
-#line 1487 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (6)].aggKey), (yyvsp[(2) - (6)].tok), 0, (yyvsp[(5) - (6)].decl), true ); }
-    break;
-
-  case 369:
-
-/* Line 1806 of yacc.c  */
-#line 1489 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (7)].aggKey), 0, (yyvsp[(3) - (7)].en), (yyvsp[(6) - (7)].decl), false ); }
-    break;
-
-  case 370:
-
-/* Line 1806 of yacc.c  */
-#line 1491 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
-    break;
-
-  case 371:
-
-/* Line 1806 of yacc.c  */
-#line 1496 "parser.yy"
-    { (yyval.aggKey) = DeclarationNode::Struct; }
-    break;
-
-  case 372:
-
-/* Line 1806 of yacc.c  */
-#line 1498 "parser.yy"
-    { (yyval.aggKey) = DeclarationNode::Union; }
-    break;
-
-  case 373:
-
-/* Line 1806 of yacc.c  */
-#line 1503 "parser.yy"
+#line 6287 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 376:
+#line 1504 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addName( (yyvsp[0].tok) ); }
+#line 6293 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 377:
+#line 1506 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->appendList( (yyvsp[-2].decl)->cloneType( (yyvsp[0].tok) ) ); }
+#line 6299 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 378:
+#line 1508 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->appendList( (yyvsp[-1].decl)->cloneType( 0 ) ); }
+#line 6305 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 379:
+#line 1513 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addType( (yyvsp[-1].decl) ); }
+#line 6311 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 380:
+#line 1515 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-3].decl)->appendList( (yyvsp[-3].decl)->cloneBaseType( (yyvsp[0].decl) ) ); }
+#line 6317 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 381:
+#line 1520 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newName( 0 ); /* XXX */ }
+#line 6323 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 382:
+#line 1522 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newBitfield( (yyvsp[0].en) ); }
+#line 6329 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 383:
+#line 1525 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addBitfield( (yyvsp[0].en) ); }
+#line 6335 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 384:
+#line 1528 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addBitfield( (yyvsp[0].en) ); }
+#line 6341 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 386:
+#line 1534 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = 0; }
+#line 6347 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 387:
+#line 1536 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (yyvsp[0].en); }
+#line 6353 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 388:
+#line 1541 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (yyvsp[0].en); }
+#line 6359 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 390:
+#line 1550 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newEnum( 0, (yyvsp[-2].decl) ); }
+#line 6365 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 391:
+#line 1552 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.makeTypedef( *(yyvsp[0].tok) );
+                        (yyval.decl) = DeclarationNode::newEnum( (yyvsp[0].tok), 0 );
+                }
+#line 6374 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 392:
+#line 1557 "parser.yy" /* yacc.c:1646  */
+    { typedefTable.makeTypedef( *(yyvsp[0].tok) ); }
+#line 6380 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 393:
+#line 1559 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newEnum( (yyvsp[-5].tok), (yyvsp[-2].decl) ); }
+#line 6386 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 394:
+#line 1564 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newEnumConstant( (yyvsp[-1].tok), (yyvsp[0].en) ); }
+#line 6392 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 395:
+#line 1566 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-3].decl)->appendList( DeclarationNode::newEnumConstant( (yyvsp[-1].tok), (yyvsp[0].en) ) ); }
+#line 6398 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 396:
+#line 1571 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = 0; }
+#line 6404 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 397:
+#line 1573 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (yyvsp[0].en); }
+#line 6410 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 398:
+#line 1580 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = 0; }
-    break;
-
-  case 374:
-
-/* Line 1806 of yacc.c  */
-#line 1505 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl) != 0 ? (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ) : (yyvsp[(2) - (2)].decl); }
-    break;
-
-  case 376:
-
-/* Line 1806 of yacc.c  */
-#line 1511 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl)->set_extension( true ); }
-    break;
-
-  case 378:
-
-/* Line 1806 of yacc.c  */
-#line 1514 "parser.yy"
-    {   // mark all fields in list
-                        for ( DeclarationNode *iter = (yyvsp[(2) - (3)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_link() )
-                                iter->set_extension( true );
-                        (yyval.decl) = (yyvsp[(2) - (3)].decl);
+#line 6416 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 402:
+#line 1588 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-4].decl)->appendList( (yyvsp[0].decl) ); }
+#line 6422 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 403:
+#line 1590 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-4].decl)->addVarArgs(); }
+#line 6428 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 404:
+#line 1592 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-4].decl)->addVarArgs(); }
+#line 6434 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 406:
+#line 1600 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-4].decl)->appendList( (yyvsp[0].decl) ); }
+#line 6440 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 407:
+#line 1602 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-4].decl)->appendList( (yyvsp[0].decl) ); }
+#line 6446 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 408:
+#line 1604 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-8].decl)->appendList( (yyvsp[-4].decl) )->appendList( (yyvsp[0].decl) ); }
+#line 6452 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 410:
+#line 1610 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-4].decl)->appendList( (yyvsp[0].decl) ); }
+#line 6458 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 411:
+#line 1615 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = 0; }
+#line 6464 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 414:
+#line 1622 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-4].decl)->addVarArgs(); }
+#line 6470 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 417:
+#line 1629 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-4].decl)->appendList( (yyvsp[0].decl) ); }
+#line 6476 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 418:
+#line 1631 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-4].decl)->appendList( (yyvsp[0].decl) ); }
+#line 6482 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 420:
+#line 1640 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addName( (yyvsp[-1].tok) ); }
+#line 6488 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 421:
+#line 1643 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addName( (yyvsp[-1].tok) ); }
+#line 6494 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 422:
+#line 1645 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addName( (yyvsp[-1].tok) )->addQualifiers( (yyvsp[-3].decl) ); }
+#line 6500 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 427:
+#line 1655 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-1].decl) ); }
+#line 6506 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 429:
+#line 1661 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        (yyval.decl) = (yyvsp[-1].decl)->addType( (yyvsp[-2].decl) )->addInitializer( new InitializerNode( (yyvsp[0].en) ) );
                 }
-    break;
-
-  case 380:
-
-/* Line 1806 of yacc.c  */
-#line 1524 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addName( (yyvsp[(2) - (2)].tok) ); }
-    break;
-
-  case 381:
-
-/* Line 1806 of yacc.c  */
-#line 1526 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(1) - (3)].decl)->cloneType( (yyvsp[(3) - (3)].tok) ) ); }
-    break;
-
-  case 382:
-
-/* Line 1806 of yacc.c  */
-#line 1528 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(1) - (2)].decl)->cloneType( 0 ) ); }
-    break;
-
-  case 383:
-
-/* Line 1806 of yacc.c  */
-#line 1533 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 384:
-
-/* Line 1806 of yacc.c  */
-#line 1535 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(1) - (4)].decl)->cloneBaseType( (yyvsp[(4) - (4)].decl) ) ); }
-    break;
-
-  case 385:
-
-/* Line 1806 of yacc.c  */
-#line 1540 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newName( 0 ); /* XXX */ }
-    break;
-
-  case 386:
-
-/* Line 1806 of yacc.c  */
-#line 1542 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBitfield( (yyvsp[(1) - (1)].en) ); }
-    break;
-
-  case 387:
-
-/* Line 1806 of yacc.c  */
-#line 1545 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
-    break;
-
-  case 388:
-
-/* Line 1806 of yacc.c  */
-#line 1548 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
-    break;
-
-  case 390:
-
-/* Line 1806 of yacc.c  */
-#line 1554 "parser.yy"
-    { (yyval.en) = 0; }
-    break;
-
-  case 391:
-
-/* Line 1806 of yacc.c  */
-#line 1556 "parser.yy"
-    { (yyval.en) = (yyvsp[(1) - (1)].en); }
-    break;
-
-  case 392:
-
-/* Line 1806 of yacc.c  */
-#line 1561 "parser.yy"
-    { (yyval.en) = (yyvsp[(2) - (2)].en); }
-    break;
-
-  case 394:
-
-/* Line 1806 of yacc.c  */
-#line 1570 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newEnum( 0, (yyvsp[(3) - (5)].decl) ); }
-    break;
-
-  case 395:
-
-/* Line 1806 of yacc.c  */
-#line 1572 "parser.yy"
-    {
-                        typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
-                        (yyval.decl) = DeclarationNode::newEnum( (yyvsp[(2) - (2)].tok), 0 );
+#line 6515 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 430:
+#line 1666 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        (yyval.decl) = (yyvsp[-1].decl)->addType( (yyvsp[-2].decl) )->addInitializer( new InitializerNode( (yyvsp[0].en) ) );
                 }
-    break;
-
-  case 396:
-
-/* Line 1806 of yacc.c  */
-#line 1577 "parser.yy"
-    { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
-    break;
-
-  case 397:
-
-/* Line 1806 of yacc.c  */
-#line 1579 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newEnum( (yyvsp[(2) - (7)].tok), (yyvsp[(5) - (7)].decl) ); }
-    break;
-
-  case 398:
-
-/* Line 1806 of yacc.c  */
-#line 1584 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newEnumConstant( (yyvsp[(1) - (2)].tok), (yyvsp[(2) - (2)].en) ); }
-    break;
-
-  case 399:
-
-/* Line 1806 of yacc.c  */
-#line 1586 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( DeclarationNode::newEnumConstant( (yyvsp[(3) - (4)].tok), (yyvsp[(4) - (4)].en) ) ); }
-    break;
-
-  case 400:
-
-/* Line 1806 of yacc.c  */
-#line 1591 "parser.yy"
-    { (yyval.en) = 0; }
-    break;
-
-  case 401:
-
-/* Line 1806 of yacc.c  */
-#line 1593 "parser.yy"
-    { (yyval.en) = (yyvsp[(2) - (2)].en); }
-    break;
-
-  case 402:
-
-/* Line 1806 of yacc.c  */
-#line 1600 "parser.yy"
+#line 6524 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 432:
+#line 1675 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addType( (yyvsp[-1].decl) ); }
+#line 6530 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 433:
+#line 1684 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newName( (yyvsp[0].tok) ); }
+#line 6536 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 434:
+#line 1686 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->appendList( DeclarationNode::newName( (yyvsp[0].tok) ) ); }
+#line 6542 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 446:
+#line 1711 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addType( (yyvsp[-1].decl) ); }
+#line 6548 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 450:
+#line 1719 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addType( (yyvsp[-1].decl) ); }
+#line 6554 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 451:
+#line 1724 "parser.yy" /* yacc.c:1646  */
+    { (yyval.in) = 0; }
+#line 6560 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 452:
+#line 1726 "parser.yy" /* yacc.c:1646  */
+    { (yyval.in) = (yyvsp[0].in); }
+#line 6566 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 453:
+#line 1728 "parser.yy" /* yacc.c:1646  */
+    { (yyval.in) = (yyvsp[0].in)->set_maybeConstructed( false ); }
+#line 6572 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 454:
+#line 1732 "parser.yy" /* yacc.c:1646  */
+    { (yyval.in) = new InitializerNode( (yyvsp[0].en) ); }
+#line 6578 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 455:
+#line 1733 "parser.yy" /* yacc.c:1646  */
+    { (yyval.in) = new InitializerNode( (yyvsp[-2].in), true ); }
+#line 6584 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 456:
+#line 1738 "parser.yy" /* yacc.c:1646  */
+    { (yyval.in) = 0; }
+#line 6590 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 458:
+#line 1740 "parser.yy" /* yacc.c:1646  */
+    { (yyval.in) = (yyvsp[0].in)->set_designators( (yyvsp[-1].en) ); }
+#line 6596 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 459:
+#line 1741 "parser.yy" /* yacc.c:1646  */
+    { (yyval.in) = (InitializerNode *)( (yyvsp[-2].in)->set_last( (yyvsp[0].in) ) ); }
+#line 6602 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 460:
+#line 1743 "parser.yy" /* yacc.c:1646  */
+    { (yyval.in) = (InitializerNode *)( (yyvsp[-3].in)->set_last( (yyvsp[0].in)->set_designators( (yyvsp[-1].en) ) ) ); }
+#line 6608 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 462:
+#line 1759 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[-1].tok) ) ); }
+#line 6614 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 464:
+#line 1765 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (ExpressionNode *)( (yyvsp[-1].en)->set_last( (yyvsp[0].en) ) ); }
+#line 6620 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 465:
+#line 1771 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[0].tok) ) ); }
+#line 6626 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 466:
+#line 1774 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (yyvsp[-2].en); }
+#line 6632 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 467:
+#line 1776 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (yyvsp[-2].en); }
+#line 6638 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 468:
+#line 1778 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_range( (yyvsp[-4].en), (yyvsp[-2].en) ) ); }
+#line 6644 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 469:
+#line 1780 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (yyvsp[-2].en); }
+#line 6650 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 471:
+#line 1804 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-1].decl) ); }
+#line 6656 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 472:
+#line 1806 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 6662 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 473:
+#line 1808 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addQualifiers( (yyvsp[-1].decl) )->addQualifiers( (yyvsp[0].decl) ); }
+#line 6668 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 475:
+#line 1814 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-1].decl) ); }
+#line 6674 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 476:
+#line 1816 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 6680 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 477:
+#line 1821 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newFromTypeGen( (yyvsp[-3].tok), (yyvsp[-1].en) ); }
+#line 6686 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 479:
+#line 1827 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-3].decl)->appendList( (yyvsp[-1].decl) ); }
+#line 6692 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 480:
+#line 1832 "parser.yy" /* yacc.c:1646  */
+    { typedefTable.addToEnclosingScope( *(yyvsp[0].tok), TypedefTable::TD ); }
+#line 6698 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 481:
+#line 1834 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newTypeParam( (yyvsp[-3].tclass), (yyvsp[-2].tok) )->addAssertions( (yyvsp[0].decl) ); }
+#line 6704 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 483:
+#line 1840 "parser.yy" /* yacc.c:1646  */
+    { (yyval.tclass) = DeclarationNode::Type; }
+#line 6710 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 484:
+#line 1842 "parser.yy" /* yacc.c:1646  */
+    { (yyval.tclass) = DeclarationNode::Ftype; }
+#line 6716 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 485:
+#line 1844 "parser.yy" /* yacc.c:1646  */
+    { (yyval.tclass) = DeclarationNode::Dtype; }
+#line 6722 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 486:
+#line 1849 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = 0; }
-    break;
-
-  case 406:
-
-/* Line 1806 of yacc.c  */
-#line 1608 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
-    break;
-
-  case 407:
-
-/* Line 1806 of yacc.c  */
-#line 1610 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
-    break;
-
-  case 408:
-
-/* Line 1806 of yacc.c  */
-#line 1612 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
-    break;
-
-  case 410:
-
-/* Line 1806 of yacc.c  */
-#line 1620 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
-    break;
-
-  case 411:
-
-/* Line 1806 of yacc.c  */
-#line 1622 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
-    break;
-
-  case 412:
-
-/* Line 1806 of yacc.c  */
-#line 1624 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (9)].decl)->appendList( (yyvsp[(5) - (9)].decl) )->appendList( (yyvsp[(9) - (9)].decl) ); }
-    break;
-
-  case 414:
-
-/* Line 1806 of yacc.c  */
-#line 1630 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
-    break;
-
-  case 415:
-
-/* Line 1806 of yacc.c  */
-#line 1635 "parser.yy"
+#line 6728 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 487:
+#line 1851 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl) != 0 ? (yyvsp[-1].decl)->appendList( (yyvsp[0].decl) ) : (yyvsp[0].decl); }
+#line 6734 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 488:
+#line 1856 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.openTrait( *(yyvsp[-3].tok) );
+                        (yyval.decl) = DeclarationNode::newTraitUse( (yyvsp[-3].tok), (yyvsp[-1].en) );
+                }
+#line 6743 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 489:
+#line 1861 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 6749 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 490:
+#line 1863 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = 0; }
-    break;
-
-  case 418:
-
-/* Line 1806 of yacc.c  */
-#line 1642 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
-    break;
-
-  case 421:
-
-/* Line 1806 of yacc.c  */
-#line 1649 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
-    break;
-
-  case 422:
-
-/* Line 1806 of yacc.c  */
-#line 1651 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
-    break;
-
-  case 424:
-
-/* Line 1806 of yacc.c  */
-#line 1660 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
-    break;
-
-  case 425:
-
-/* Line 1806 of yacc.c  */
-#line 1663 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
-    break;
-
-  case 426:
-
-/* Line 1806 of yacc.c  */
-#line 1665 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addName( (yyvsp[(3) - (4)].tok) )->addQualifiers( (yyvsp[(1) - (4)].decl) ); }
-    break;
-
-  case 431:
-
-/* Line 1806 of yacc.c  */
-#line 1675 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 433:
-
-/* Line 1806 of yacc.c  */
-#line 1681 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(2) - (3)].decl)->addType( (yyvsp[(1) - (3)].decl) )->addInitializer( new InitializerNode( (yyvsp[(3) - (3)].en) ) );
+#line 6755 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 491:
+#line 1868 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_typevalue( (yyvsp[0].decl) ) ); }
+#line 6761 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 493:
+#line 1871 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (ExpressionNode *)( (yyvsp[-2].en)->set_last( new ExpressionNode( build_typevalue( (yyvsp[0].decl) ) ) ) ); }
+#line 6767 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 494:
+#line 1873 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (ExpressionNode *)( (yyvsp[-2].en)->set_last( (yyvsp[0].en) )); }
+#line 6773 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 495:
+#line 1878 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl); }
+#line 6779 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 496:
+#line 1880 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-2].decl) ); }
+#line 6785 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 497:
+#line 1882 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->appendList( (yyvsp[0].decl)->copyStorageClasses( (yyvsp[-2].decl) ) ); }
+#line 6791 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 498:
+#line 1887 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addAssertions( (yyvsp[0].decl) ); }
+#line 6797 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 499:
+#line 1889 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-3].decl)->addAssertions( (yyvsp[-2].decl) )->addType( (yyvsp[0].decl) ); }
+#line 6803 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 500:
+#line 1894 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope( *(yyvsp[0].tok), TypedefTable::TD );
+                        (yyval.decl) = DeclarationNode::newTypeDecl( (yyvsp[0].tok), 0 );
                 }
-    break;
-
-  case 434:
-
-/* Line 1806 of yacc.c  */
-#line 1686 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(2) - (3)].decl)->addType( (yyvsp[(1) - (3)].decl) )->addInitializer( new InitializerNode( (yyvsp[(3) - (3)].en) ) );
+#line 6812 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 501:
+#line 1899 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope( *(yyvsp[-5].tok), TypedefTable::TG );
+                        (yyval.decl) = DeclarationNode::newTypeDecl( (yyvsp[-5].tok), (yyvsp[-2].decl) );
                 }
-    break;
-
-  case 436:
-
-/* Line 1806 of yacc.c  */
-#line 1695 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 437:
-
-/* Line 1806 of yacc.c  */
-#line 1704 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newName( (yyvsp[(1) - (1)].tok) ); }
-    break;
-
-  case 438:
-
-/* Line 1806 of yacc.c  */
-#line 1706 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( DeclarationNode::newName( (yyvsp[(3) - (3)].tok) ) ); }
-    break;
-
-  case 450:
-
-/* Line 1806 of yacc.c  */
-#line 1731 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 454:
-
-/* Line 1806 of yacc.c  */
-#line 1739 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 455:
-
-/* Line 1806 of yacc.c  */
-#line 1744 "parser.yy"
-    { (yyval.in) = 0; }
-    break;
-
-  case 456:
-
-/* Line 1806 of yacc.c  */
-#line 1746 "parser.yy"
-    { (yyval.in) = (yyvsp[(2) - (2)].in); }
-    break;
-
-  case 457:
-
-/* Line 1806 of yacc.c  */
-#line 1748 "parser.yy"
-    { (yyval.in) = (yyvsp[(2) - (2)].in)->set_maybeConstructed( false ); }
-    break;
-
-  case 458:
-
-/* Line 1806 of yacc.c  */
-#line 1752 "parser.yy"
-    { (yyval.in) = new InitializerNode( (yyvsp[(1) - (1)].en) ); }
-    break;
-
-  case 459:
-
-/* Line 1806 of yacc.c  */
-#line 1753 "parser.yy"
-    { (yyval.in) = new InitializerNode( (yyvsp[(2) - (4)].in), true ); }
-    break;
-
-  case 460:
-
-/* Line 1806 of yacc.c  */
-#line 1758 "parser.yy"
-    { (yyval.in) = 0; }
-    break;
-
-  case 462:
-
-/* Line 1806 of yacc.c  */
-#line 1760 "parser.yy"
-    { (yyval.in) = (yyvsp[(2) - (2)].in)->set_designators( (yyvsp[(1) - (2)].en) ); }
-    break;
-
-  case 463:
-
-/* Line 1806 of yacc.c  */
-#line 1761 "parser.yy"
-    { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (3)].in)->set_link( (yyvsp[(3) - (3)].in) ) ); }
-    break;
-
-  case 464:
-
-/* Line 1806 of yacc.c  */
-#line 1763 "parser.yy"
-    { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (4)].in)->set_link( (yyvsp[(4) - (4)].in)->set_designators( (yyvsp[(3) - (4)].en) ) ) ); }
-    break;
-
-  case 466:
-
-/* Line 1806 of yacc.c  */
-#line 1779 "parser.yy"
-    { (yyval.en) = new VarRefNode( (yyvsp[(1) - (2)].tok) ); }
-    break;
-
-  case 468:
-
-/* Line 1806 of yacc.c  */
-#line 1785 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (2)].en)->set_link( (yyvsp[(2) - (2)].en) )); }
-    break;
-
-  case 469:
-
-/* Line 1806 of yacc.c  */
-#line 1793 "parser.yy"
-    { (yyval.en) = new DesignatorNode( new VarRefNode( (yyvsp[(1) - (1)].tok) ) ); }
-    break;
-
-  case 470:
-
-/* Line 1806 of yacc.c  */
-#line 1795 "parser.yy"
-    { (yyval.en) = new DesignatorNode( new VarRefNode( (yyvsp[(2) - (2)].tok) ) ); }
-    break;
-
-  case 471:
-
-/* Line 1806 of yacc.c  */
-#line 1798 "parser.yy"
-    { (yyval.en) = new DesignatorNode( (yyvsp[(3) - (5)].en), true ); }
-    break;
-
-  case 472:
-
-/* Line 1806 of yacc.c  */
-#line 1800 "parser.yy"
-    { (yyval.en) = new DesignatorNode( (yyvsp[(3) - (5)].en), true ); }
-    break;
-
-  case 473:
-
-/* Line 1806 of yacc.c  */
-#line 1802 "parser.yy"
-    { (yyval.en) = new DesignatorNode( new CompositeExprNode( build_range( (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].en) ) ), true ); }
-    break;
-
-  case 474:
-
-/* Line 1806 of yacc.c  */
-#line 1804 "parser.yy"
-    { (yyval.en) = new DesignatorNode( (yyvsp[(4) - (6)].en) ); }
-    break;
-
-  case 476:
-
-/* Line 1806 of yacc.c  */
-#line 1828 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 477:
-
-/* Line 1806 of yacc.c  */
-#line 1830 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 478:
-
-/* Line 1806 of yacc.c  */
-#line 1832 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 480:
-
-/* Line 1806 of yacc.c  */
-#line 1838 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 481:
-
-/* Line 1806 of yacc.c  */
-#line 1840 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 482:
-
-/* Line 1806 of yacc.c  */
-#line 1845 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFromTypeGen( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
-    break;
-
-  case 484:
-
-/* Line 1806 of yacc.c  */
-#line 1851 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(3) - (4)].decl) ); }
-    break;
-
-  case 485:
-
-/* Line 1806 of yacc.c  */
-#line 1856 "parser.yy"
-    { typedefTable.addToEnclosingScope( *(yyvsp[(2) - (2)].tok), TypedefTable::TD ); }
-    break;
-
-  case 486:
-
-/* Line 1806 of yacc.c  */
-#line 1858 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newTypeParam( (yyvsp[(1) - (4)].tclass), (yyvsp[(2) - (4)].tok) )->addAssertions( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 488:
-
-/* Line 1806 of yacc.c  */
-#line 1864 "parser.yy"
-    { (yyval.tclass) = DeclarationNode::Type; }
-    break;
-
-  case 489:
-
-/* Line 1806 of yacc.c  */
-#line 1866 "parser.yy"
-    { (yyval.tclass) = DeclarationNode::Ftype; }
-    break;
-
-  case 490:
-
-/* Line 1806 of yacc.c  */
-#line 1868 "parser.yy"
-    { (yyval.tclass) = DeclarationNode::Dtype; }
-    break;
-
-  case 491:
-
-/* Line 1806 of yacc.c  */
-#line 1873 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
-  case 492:
-
-/* Line 1806 of yacc.c  */
-#line 1875 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl) != 0 ? (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ) : (yyvsp[(2) - (2)].decl); }
-    break;
-
-  case 493:
-
-/* Line 1806 of yacc.c  */
-#line 1880 "parser.yy"
-    {
-                        typedefTable.openTrait( *(yyvsp[(2) - (5)].tok) );
-                        (yyval.decl) = DeclarationNode::newTraitUse( (yyvsp[(2) - (5)].tok), (yyvsp[(4) - (5)].en) );
+#line 6821 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 502:
+#line 1907 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope( *(yyvsp[-7].tok), TypedefTable::ID );
+                        (yyval.decl) = DeclarationNode::newTrait( (yyvsp[-7].tok), (yyvsp[-4].decl), 0 );
                 }
-    break;
-
-  case 494:
-
-/* Line 1806 of yacc.c  */
-#line 1885 "parser.yy"
-    { (yyval.decl) = (yyvsp[(4) - (5)].decl); }
-    break;
-
-  case 495:
-
-/* Line 1806 of yacc.c  */
-#line 1887 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
-  case 496:
-
-/* Line 1806 of yacc.c  */
-#line 1892 "parser.yy"
-    { (yyval.en) = new TypeValueNode( (yyvsp[(1) - (1)].decl) ); }
-    break;
-
-  case 498:
-
-/* Line 1806 of yacc.c  */
-#line 1895 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( new TypeValueNode( (yyvsp[(3) - (3)].decl) ))); }
-    break;
-
-  case 499:
-
-/* Line 1806 of yacc.c  */
-#line 1897 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) )); }
-    break;
-
-  case 500:
-
-/* Line 1806 of yacc.c  */
-#line 1902 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
-    break;
-
-  case 501:
-
-/* Line 1806 of yacc.c  */
-#line 1904 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) ); }
-    break;
-
-  case 502:
-
-/* Line 1806 of yacc.c  */
-#line 1906 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl)->copyStorageClasses( (yyvsp[(1) - (3)].decl) ) ); }
+#line 6830 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 503:
-
-/* Line 1806 of yacc.c  */
-#line 1911 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addAssertions( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 504:
-
-/* Line 1806 of yacc.c  */
-#line 1913 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addAssertions( (yyvsp[(2) - (4)].decl) )->addType( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 505:
-
-/* Line 1806 of yacc.c  */
-#line 1918 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( *(yyvsp[(1) - (1)].tok), TypedefTable::TD );
-                        (yyval.decl) = DeclarationNode::newTypeDecl( (yyvsp[(1) - (1)].tok), 0 );
-                }
-    break;
-
-  case 506:
-
-/* Line 1806 of yacc.c  */
-#line 1923 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( *(yyvsp[(1) - (6)].tok), TypedefTable::TG );
-                        (yyval.decl) = DeclarationNode::newTypeDecl( (yyvsp[(1) - (6)].tok), (yyvsp[(4) - (6)].decl) );
-                }
-    break;
-
-  case 507:
-
-/* Line 1806 of yacc.c  */
-#line 1931 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( *(yyvsp[(2) - (9)].tok), TypedefTable::ID );
-                        (yyval.decl) = DeclarationNode::newTrait( (yyvsp[(2) - (9)].tok), (yyvsp[(5) - (9)].decl), 0 );
-                }
-    break;
-
-  case 508:
-
-/* Line 1806 of yacc.c  */
-#line 1936 "parser.yy"
-    {
-                        typedefTable.enterTrait( *(yyvsp[(2) - (8)].tok) );
+#line 1912 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.enterTrait( *(yyvsp[-6].tok) );
                         typedefTable.enterScope();
                 }
+#line 6839 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 504:
+#line 1917 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.leaveTrait();
+                        typedefTable.addToEnclosingScope( *(yyvsp[-9].tok), TypedefTable::ID );
+                        (yyval.decl) = DeclarationNode::newTrait( (yyvsp[-9].tok), (yyvsp[-6].decl), (yyvsp[-1].decl) );
+                }
+#line 6849 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 506:
+#line 1927 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->appendList( (yyvsp[0].decl) ); }
+#line 6855 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 509:
-
-/* Line 1806 of yacc.c  */
-#line 1941 "parser.yy"
-    {
-                        typedefTable.leaveTrait();
-                        typedefTable.addToEnclosingScope( *(yyvsp[(2) - (11)].tok), TypedefTable::ID );
-                        (yyval.decl) = DeclarationNode::newTrait( (yyvsp[(2) - (11)].tok), (yyvsp[(5) - (11)].decl), (yyvsp[(10) - (11)].decl) );
+#line 1937 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope2( TypedefTable::ID );
+                        (yyval.decl) = (yyvsp[0].decl);
                 }
+#line 6864 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 510:
+#line 1942 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope2( TypedefTable::ID );
+                        (yyval.decl) = (yyvsp[0].decl);
+                }
+#line 6873 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 511:
-
-/* Line 1806 of yacc.c  */
-#line 1951 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
+#line 1947 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope2( *(yyvsp[0].tok), TypedefTable::ID );
+                        (yyval.decl) = (yyvsp[-4].decl)->appendList( (yyvsp[-4].decl)->cloneType( (yyvsp[0].tok) ) );
+                }
+#line 6882 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 512:
+#line 1955 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope2( TypedefTable::ID );
+                        (yyval.decl) = (yyvsp[0].decl)->addType( (yyvsp[-1].decl) );
+                }
+#line 6891 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 513:
+#line 1960 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope2( TypedefTable::ID );
+                        (yyval.decl) = (yyvsp[-4].decl)->appendList( (yyvsp[-4].decl)->cloneBaseType( (yyvsp[0].decl) ) );
+                }
+#line 6900 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 514:
-
-/* Line 1806 of yacc.c  */
-#line 1961 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope2( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(1) - (1)].decl);
+#line 1970 "parser.yy" /* yacc.c:1646  */
+    {}
+#line 6906 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 515:
+#line 1972 "parser.yy" /* yacc.c:1646  */
+    { parseTree = parseTree != nullptr ? parseTree->appendList( (yyvsp[0].decl) ) : (yyvsp[0].decl);    }
+#line 6912 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 517:
+#line 1978 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl) != nullptr ? (yyvsp[-2].decl)->appendList( (yyvsp[0].decl) ) : (yyvsp[0].decl); }
+#line 6918 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 518:
+#line 1983 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = 0; }
+#line 6924 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 522:
+#line 1991 "parser.yy" /* yacc.c:1646  */
+    {}
+#line 6930 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 523:
+#line 1993 "parser.yy" /* yacc.c:1646  */
+    {
+                        linkageStack.push( linkage );                           // handle nested extern "C"/"Cforall"
+                        linkage = LinkageSpec::fromString( assign_strptr((yyvsp[0].tok)) );
                 }
-    break;
-
-  case 515:
-
-/* Line 1806 of yacc.c  */
-#line 1966 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope2( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(1) - (1)].decl);
-                }
-    break;
-
-  case 516:
-
-/* Line 1806 of yacc.c  */
-#line 1971 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope2( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(1) - (5)].decl)->cloneType( (yyvsp[(5) - (5)].tok) ) );
-                }
-    break;
-
-  case 517:
-
-/* Line 1806 of yacc.c  */
-#line 1979 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope2( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) );
-                }
-    break;
-
-  case 518:
-
-/* Line 1806 of yacc.c  */
-#line 1984 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope2( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(1) - (5)].decl)->cloneBaseType( (yyvsp[(5) - (5)].decl) ) );
-                }
-    break;
-
-  case 519:
-
-/* Line 1806 of yacc.c  */
-#line 1994 "parser.yy"
-    {}
-    break;
-
-  case 520:
-
-/* Line 1806 of yacc.c  */
-#line 1996 "parser.yy"
-    {
-                        if ( theTree ) {
-                                theTree->appendList( (yyvsp[(1) - (1)].decl) );
-                        } else {
-                                theTree = (yyvsp[(1) - (1)].decl);
-                        }
-                }
-    break;
-
-  case 522:
-
-/* Line 1806 of yacc.c  */
-#line 2008 "parser.yy"
-    { (yyval.decl) = ( (yyvsp[(1) - (3)].decl) != NULL ) ? (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ) : (yyvsp[(3) - (3)].decl); }
-    break;
-
-  case 523:
-
-/* Line 1806 of yacc.c  */
-#line 2013 "parser.yy"
-    { (yyval.decl) = 0; }
-    break;
-
-  case 527:
-
-/* Line 1806 of yacc.c  */
-#line 2021 "parser.yy"
-    {}
-    break;
-
-  case 528:
-
-/* Line 1806 of yacc.c  */
-#line 2023 "parser.yy"
-    {
-                        linkageStack.push( linkage );
-                        linkage = LinkageSpec::fromString( *(yyvsp[(2) - (2)].tok) );
-                }
-    break;
-
-  case 529:
-
-/* Line 1806 of yacc.c  */
-#line 2028 "parser.yy"
+#line 6939 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 524:
+#line 1998 "parser.yy" /* yacc.c:1646  */
     {
                         linkage = linkageStack.top();
                         linkageStack.pop();
-                        (yyval.decl) = (yyvsp[(5) - (6)].decl);
+                        (yyval.decl) = (yyvsp[-1].decl);
                 }
-    break;
-
-  case 530:
-
-/* Line 1806 of yacc.c  */
-#line 2034 "parser.yy"
+#line 6949 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 525:
+#line 2004 "parser.yy" /* yacc.c:1646  */
     {   // mark all fields in list
-                        for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_link() )
+                        for ( DeclarationNode *iter = (yyvsp[0].decl); iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
                                 iter->set_extension( true );
-                        (yyval.decl) = (yyvsp[(2) - (2)].decl);
+                        (yyval.decl) = (yyvsp[0].decl);
                 }
-    break;
-
-  case 532:
-
-/* Line 1806 of yacc.c  */
-#line 2049 "parser.yy"
+#line 6959 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 527:
+#line 2019 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        (yyval.decl) = (yyvsp[(1) - (2)].decl)->addFunctionBody( (yyvsp[(2) - (2)].sn) );
+                        (yyval.decl) = (yyvsp[-1].decl)->addFunctionBody( (yyvsp[0].sn) );
                 }
-    break;
-
-  case 533:
-
-/* Line 1806 of yacc.c  */
-#line 2055 "parser.yy"
+#line 6969 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 528:
+#line 2025 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        (yyval.decl) = (yyvsp[(1) - (4)].decl)->addOldDeclList( (yyvsp[(3) - (4)].decl) )->addFunctionBody( (yyvsp[(4) - (4)].sn) );
+                        (yyval.decl) = (yyvsp[-3].decl)->addOldDeclList( (yyvsp[-1].decl) )->addFunctionBody( (yyvsp[0].sn) );
                 }
-    break;
-
-  case 534:
-
-/* Line 1806 of yacc.c  */
-#line 2064 "parser.yy"
+#line 6979 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 529:
+#line 2034 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        (yyval.decl) = (yyvsp[(1) - (2)].decl)->addFunctionBody( (yyvsp[(2) - (2)].sn) );
+                        (yyval.decl) = (yyvsp[-1].decl)->addFunctionBody( (yyvsp[0].sn) );
                 }
-    break;
-
-  case 535:
-
-/* Line 1806 of yacc.c  */
-#line 2070 "parser.yy"
+#line 6989 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 530:
+#line 2040 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        (yyval.decl) = (yyvsp[(2) - (3)].decl)->addFunctionBody( (yyvsp[(3) - (3)].sn) )->addType( (yyvsp[(1) - (3)].decl) );
+                        (yyval.decl) = (yyvsp[-1].decl)->addFunctionBody( (yyvsp[0].sn) )->addType( (yyvsp[-2].decl) );
                 }
-    break;
-
-  case 536:
-
-/* Line 1806 of yacc.c  */
-#line 2076 "parser.yy"
+#line 6999 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 531:
+#line 2046 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        (yyval.decl) = (yyvsp[(2) - (3)].decl)->addFunctionBody( (yyvsp[(3) - (3)].sn) )->addQualifiers( (yyvsp[(1) - (3)].decl) );
+                        (yyval.decl) = (yyvsp[-1].decl)->addFunctionBody( (yyvsp[0].sn) )->addQualifiers( (yyvsp[-2].decl) );
                 }
-    break;
-
-  case 537:
-
-/* Line 1806 of yacc.c  */
-#line 2082 "parser.yy"
+#line 7009 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 532:
+#line 2052 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        (yyval.decl) = (yyvsp[(2) - (3)].decl)->addFunctionBody( (yyvsp[(3) - (3)].sn) )->addQualifiers( (yyvsp[(1) - (3)].decl) );
+                        (yyval.decl) = (yyvsp[-1].decl)->addFunctionBody( (yyvsp[0].sn) )->addQualifiers( (yyvsp[-2].decl) );
                 }
-    break;
-
-  case 538:
-
-/* Line 1806 of yacc.c  */
-#line 2088 "parser.yy"
+#line 7019 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 533:
+#line 2058 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        (yyval.decl) = (yyvsp[(3) - (4)].decl)->addFunctionBody( (yyvsp[(4) - (4)].sn) )->addQualifiers( (yyvsp[(2) - (4)].decl) )->addQualifiers( (yyvsp[(1) - (4)].decl) );
+                        (yyval.decl) = (yyvsp[-1].decl)->addFunctionBody( (yyvsp[0].sn) )->addQualifiers( (yyvsp[-2].decl) )->addQualifiers( (yyvsp[-3].decl) );
                 }
-    break;
-
-  case 539:
-
-/* Line 1806 of yacc.c  */
-#line 2096 "parser.yy"
+#line 7029 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 534:
+#line 2066 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        (yyval.decl) = (yyvsp[(2) - (5)].decl)->addOldDeclList( (yyvsp[(4) - (5)].decl) )->addFunctionBody( (yyvsp[(5) - (5)].sn) )->addType( (yyvsp[(1) - (5)].decl) );
+                        (yyval.decl) = (yyvsp[-3].decl)->addOldDeclList( (yyvsp[-1].decl) )->addFunctionBody( (yyvsp[0].sn) )->addType( (yyvsp[-4].decl) );
                 }
-    break;
-
-  case 540:
-
-/* Line 1806 of yacc.c  */
-#line 2102 "parser.yy"
+#line 7039 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 535:
+#line 2072 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        (yyval.decl) = (yyvsp[(2) - (5)].decl)->addOldDeclList( (yyvsp[(4) - (5)].decl) )->addFunctionBody( (yyvsp[(5) - (5)].sn) )->addQualifiers( (yyvsp[(1) - (5)].decl) );
+                        (yyval.decl) = (yyvsp[-3].decl)->addOldDeclList( (yyvsp[-1].decl) )->addFunctionBody( (yyvsp[0].sn) )->addQualifiers( (yyvsp[-4].decl) );
                 }
-    break;
-
-  case 541:
-
-/* Line 1806 of yacc.c  */
-#line 2110 "parser.yy"
+#line 7049 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 536:
+#line 2080 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        (yyval.decl) = (yyvsp[(2) - (5)].decl)->addOldDeclList( (yyvsp[(4) - (5)].decl) )->addFunctionBody( (yyvsp[(5) - (5)].sn) )->addQualifiers( (yyvsp[(1) - (5)].decl) );
+                        (yyval.decl) = (yyvsp[-3].decl)->addOldDeclList( (yyvsp[-1].decl) )->addFunctionBody( (yyvsp[0].sn) )->addQualifiers( (yyvsp[-4].decl) );
                 }
-    break;
-
-  case 542:
-
-/* Line 1806 of yacc.c  */
-#line 2116 "parser.yy"
+#line 7059 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 537:
+#line 2086 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        (yyval.decl) = (yyvsp[(3) - (6)].decl)->addOldDeclList( (yyvsp[(5) - (6)].decl) )->addFunctionBody( (yyvsp[(6) - (6)].sn) )->addQualifiers( (yyvsp[(2) - (6)].decl) )->addQualifiers( (yyvsp[(1) - (6)].decl) );
+                        (yyval.decl) = (yyvsp[-3].decl)->addOldDeclList( (yyvsp[-1].decl) )->addFunctionBody( (yyvsp[0].sn) )->addQualifiers( (yyvsp[-4].decl) )->addQualifiers( (yyvsp[-5].decl) );
                 }
-    break;
-
-  case 546:
-
-/* Line 1806 of yacc.c  */
-#line 2131 "parser.yy"
-    { (yyval.en) = new CompositeExprNode( build_range( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
-    break;
-
-  case 549:
-
-/* Line 1806 of yacc.c  */
-#line 2141 "parser.yy"
+#line 7069 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 541:
+#line 2101 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_range( (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 7075 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 544:
+#line 2111 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = 0; }
-    break;
-
-  case 552:
-
-/* Line 1806 of yacc.c  */
-#line 2148 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 553:
-
-/* Line 1806 of yacc.c  */
-#line 2154 "parser.yy"
+#line 7081 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 547:
+#line 2118 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-1].decl) ); }
+#line 7087 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 548:
+#line 2124 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = 0; }
-    break;
-
-  case 559:
-
-/* Line 1806 of yacc.c  */
-#line 2169 "parser.yy"
+#line 7093 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 554:
+#line 2139 "parser.yy" /* yacc.c:1646  */
     {}
+#line 7099 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 555:
+#line 2140 "parser.yy" /* yacc.c:1646  */
+    {}
+#line 7105 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 556:
+#line 2141 "parser.yy" /* yacc.c:1646  */
+    {}
+#line 7111 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 557:
+#line 2142 "parser.yy" /* yacc.c:1646  */
+    {}
+#line 7117 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 558:
+#line 2177 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7123 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 560:
-
-/* Line 1806 of yacc.c  */
-#line 2170 "parser.yy"
-    {}
+#line 2180 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7129 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 561:
-
-/* Line 1806 of yacc.c  */
-#line 2171 "parser.yy"
-    {}
+#line 2182 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7135 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 562:
-
-/* Line 1806 of yacc.c  */
-#line 2172 "parser.yy"
-    {}
+#line 2187 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.setNextIdentifier( *(yyvsp[0].tok) );
+                        (yyval.decl) = DeclarationNode::newName( (yyvsp[0].tok) );
+                }
+#line 7144 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 563:
-
-/* Line 1806 of yacc.c  */
-#line 2207 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+#line 2192 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7150 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 564:
+#line 2197 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 7156 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 565:
-
-/* Line 1806 of yacc.c  */
-#line 2210 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+#line 2199 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
+#line 7162 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 566:
-
-/* Line 1806 of yacc.c  */
-#line 2212 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+#line 2201 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7168 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 567:
-
-/* Line 1806 of yacc.c  */
-#line 2217 "parser.yy"
-    {
-                        typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
-                        (yyval.decl) = DeclarationNode::newName( (yyvsp[(1) - (1)].tok) );
+#line 2206 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7174 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 568:
+#line 2208 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7180 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 569:
+#line 2210 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7186 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 570:
+#line 2212 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7192 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 571:
+#line 2217 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
+#line 7198 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 572:
+#line 2219 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7204 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 573:
+#line 2228 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7210 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 575:
+#line 2231 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7216 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 576:
+#line 2236 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-5].decl)->addParamList( (yyvsp[-2].decl) ); }
+#line 7222 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 577:
+#line 2238 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
+#line 7228 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 578:
+#line 2240 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7234 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 579:
+#line 2245 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 7240 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 580:
+#line 2247 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
+#line 7246 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 581:
+#line 2249 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7252 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 582:
+#line 2254 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7258 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 583:
+#line 2256 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7264 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 584:
+#line 2258 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7270 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 588:
+#line 2273 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-3].decl)->addIdList( (yyvsp[-1].decl) ); }
+#line 7276 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 589:
+#line 2275 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-4].decl)->addIdList( (yyvsp[-1].decl) ); }
+#line 7282 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 590:
+#line 2277 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7288 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 591:
+#line 2282 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 7294 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 592:
+#line 2284 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
+#line 7300 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 593:
+#line 2286 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7306 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 594:
+#line 2291 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7312 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 595:
+#line 2293 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7318 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 596:
+#line 2295 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7324 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 597:
+#line 2310 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7330 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 599:
+#line 2313 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7336 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 600:
+#line 2315 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7342 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 602:
+#line 2321 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7348 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 603:
+#line 2326 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 7354 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 604:
+#line 2328 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
+#line 7360 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 605:
+#line 2330 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7366 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 606:
+#line 2335 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7372 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 607:
+#line 2337 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7378 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 608:
+#line 2339 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7384 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 609:
+#line 2341 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7390 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 610:
+#line 2346 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-5].decl)->addParamList( (yyvsp[-2].decl) ); }
+#line 7396 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 611:
+#line 2348 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
+#line 7402 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 612:
+#line 2350 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7408 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 613:
+#line 2360 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7414 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 615:
+#line 2363 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7420 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 616:
+#line 2365 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7426 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 617:
+#line 2370 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 7432 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 618:
+#line 2372 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
+#line 7438 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 619:
+#line 2374 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7444 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 620:
+#line 2379 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7450 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 621:
+#line 2381 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7456 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 622:
+#line 2383 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7462 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 623:
+#line 2385 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7468 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 624:
+#line 2390 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-5].decl)->addParamList( (yyvsp[-2].decl) ); }
+#line 7474 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 625:
+#line 2392 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
+#line 7480 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 626:
+#line 2394 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7486 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 627:
+#line 2425 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7492 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 629:
+#line 2428 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7498 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 630:
+#line 2430 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7504 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 631:
+#line 2435 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.setNextIdentifier( *(yyvsp[0].tok) );
+                        (yyval.decl) = DeclarationNode::newName( (yyvsp[0].tok) );
                 }
-    break;
-
-  case 568:
-
-/* Line 1806 of yacc.c  */
-#line 2222 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 569:
-
-/* Line 1806 of yacc.c  */
-#line 2227 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 570:
-
-/* Line 1806 of yacc.c  */
-#line 2229 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 571:
-
-/* Line 1806 of yacc.c  */
-#line 2231 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 572:
-
-/* Line 1806 of yacc.c  */
-#line 2236 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 573:
-
-/* Line 1806 of yacc.c  */
-#line 2238 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 574:
-
-/* Line 1806 of yacc.c  */
-#line 2240 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 575:
-
-/* Line 1806 of yacc.c  */
-#line 2242 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 576:
-
-/* Line 1806 of yacc.c  */
-#line 2247 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 577:
-
-/* Line 1806 of yacc.c  */
-#line 2249 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 578:
-
-/* Line 1806 of yacc.c  */
-#line 2258 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 580:
-
-/* Line 1806 of yacc.c  */
-#line 2261 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 581:
-
-/* Line 1806 of yacc.c  */
-#line 2266 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-
-  case 582:
-
-/* Line 1806 of yacc.c  */
-#line 2268 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 583:
-
-/* Line 1806 of yacc.c  */
-#line 2270 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 584:
-
-/* Line 1806 of yacc.c  */
-#line 2275 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 585:
-
-/* Line 1806 of yacc.c  */
-#line 2277 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 586:
-
-/* Line 1806 of yacc.c  */
-#line 2279 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 587:
-
-/* Line 1806 of yacc.c  */
-#line 2284 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 588:
-
-/* Line 1806 of yacc.c  */
-#line 2286 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 589:
-
-/* Line 1806 of yacc.c  */
-#line 2288 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 593:
-
-/* Line 1806 of yacc.c  */
-#line 2303 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addIdList( (yyvsp[(3) - (4)].decl) ); }
-    break;
-
-  case 594:
-
-/* Line 1806 of yacc.c  */
-#line 2305 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (6)].decl)->addIdList( (yyvsp[(5) - (6)].decl) ); }
-    break;
-
-  case 595:
-
-/* Line 1806 of yacc.c  */
-#line 2307 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 596:
-
-/* Line 1806 of yacc.c  */
-#line 2312 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 597:
-
-/* Line 1806 of yacc.c  */
-#line 2314 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 598:
-
-/* Line 1806 of yacc.c  */
-#line 2316 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 599:
-
-/* Line 1806 of yacc.c  */
-#line 2321 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 600:
-
-/* Line 1806 of yacc.c  */
-#line 2323 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 601:
-
-/* Line 1806 of yacc.c  */
-#line 2325 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 602:
-
-/* Line 1806 of yacc.c  */
-#line 2340 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 604:
-
-/* Line 1806 of yacc.c  */
-#line 2343 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 605:
-
-/* Line 1806 of yacc.c  */
-#line 2345 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 607:
-
-/* Line 1806 of yacc.c  */
-#line 2351 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 608:
-
-/* Line 1806 of yacc.c  */
-#line 2356 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 609:
-
-/* Line 1806 of yacc.c  */
-#line 2358 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 610:
-
-/* Line 1806 of yacc.c  */
-#line 2360 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 611:
-
-/* Line 1806 of yacc.c  */
-#line 2365 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 612:
-
-/* Line 1806 of yacc.c  */
-#line 2367 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 613:
-
-/* Line 1806 of yacc.c  */
-#line 2369 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 614:
-
-/* Line 1806 of yacc.c  */
-#line 2371 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 615:
-
-/* Line 1806 of yacc.c  */
-#line 2376 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-
-  case 616:
-
-/* Line 1806 of yacc.c  */
-#line 2378 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 617:
-
-/* Line 1806 of yacc.c  */
-#line 2380 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 618:
-
-/* Line 1806 of yacc.c  */
-#line 2390 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 620:
-
-/* Line 1806 of yacc.c  */
-#line 2393 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 621:
-
-/* Line 1806 of yacc.c  */
-#line 2395 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 622:
-
-/* Line 1806 of yacc.c  */
-#line 2400 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 623:
-
-/* Line 1806 of yacc.c  */
-#line 2402 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 624:
-
-/* Line 1806 of yacc.c  */
-#line 2404 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 625:
-
-/* Line 1806 of yacc.c  */
-#line 2409 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 626:
-
-/* Line 1806 of yacc.c  */
-#line 2411 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 627:
-
-/* Line 1806 of yacc.c  */
-#line 2413 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 628:
-
-/* Line 1806 of yacc.c  */
-#line 2415 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 629:
-
-/* Line 1806 of yacc.c  */
-#line 2420 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-
-  case 630:
-
-/* Line 1806 of yacc.c  */
-#line 2422 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 631:
-
-/* Line 1806 of yacc.c  */
-#line 2424 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+#line 7513 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 632:
-
-/* Line 1806 of yacc.c  */
-#line 2455 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+#line 2440 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.setNextIdentifier( *(yyvsp[0].tok) );
+                        (yyval.decl) = DeclarationNode::newName( (yyvsp[0].tok) );
+                }
+#line 7522 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 633:
+#line 2448 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 7528 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 634:
-
-/* Line 1806 of yacc.c  */
-#line 2458 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+#line 2450 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
+#line 7534 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 635:
-
-/* Line 1806 of yacc.c  */
-#line 2460 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+#line 2452 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7540 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 636:
-
-/* Line 1806 of yacc.c  */
-#line 2465 "parser.yy"
-    {
-                        typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
-                        (yyval.decl) = DeclarationNode::newName( (yyvsp[(1) - (1)].tok) );
-                }
+#line 2457 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7546 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 637:
-
-/* Line 1806 of yacc.c  */
-#line 2470 "parser.yy"
-    {
-                        typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
-                        (yyval.decl) = DeclarationNode::newName( (yyvsp[(1) - (1)].tok) );
-                }
+#line 2459 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7552 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 638:
-
-/* Line 1806 of yacc.c  */
-#line 2478 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 2464 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-5].decl)->addParamList( (yyvsp[-2].decl) ); }
+#line 7558 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 639:
-
-/* Line 1806 of yacc.c  */
-#line 2480 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 640:
-
-/* Line 1806 of yacc.c  */
-#line 2482 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+#line 2466 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
+#line 7564 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 641:
-
-/* Line 1806 of yacc.c  */
-#line 2487 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
+#line 2481 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7570 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 642:
-
-/* Line 1806 of yacc.c  */
-#line 2489 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+#line 2483 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7576 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 643:
-
-/* Line 1806 of yacc.c  */
-#line 2494 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
+#line 2488 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
+#line 7582 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 644:
-
-/* Line 1806 of yacc.c  */
-#line 2496 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+#line 2490 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[0].decl) ); }
+#line 7588 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 645:
+#line 2492 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 7594 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 646:
-
-/* Line 1806 of yacc.c  */
-#line 2511 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+#line 2494 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
+#line 7600 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 647:
-
-/* Line 1806 of yacc.c  */
-#line 2513 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 648:
-
-/* Line 1806 of yacc.c  */
-#line 2518 "parser.yy"
+#line 2496 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7606 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 649:
+#line 2502 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7612 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 650:
+#line 2504 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7618 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 651:
+#line 2506 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7624 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 652:
+#line 2511 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[-2].decl), 0 ); }
+#line 7630 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 653:
+#line 2513 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
+#line 7636 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 654:
+#line 2515 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7642 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 655:
+#line 2521 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
+#line 7648 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 656:
+#line 2523 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false )->addArray( (yyvsp[0].decl) ); }
+#line 7654 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 658:
+#line 2529 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[-2].en), 0, false ); }
+#line 7660 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 659:
+#line 2531 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newVarArray( 0 ); }
+#line 7666 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 660:
+#line 2533 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-5].decl)->addArray( DeclarationNode::newArray( (yyvsp[-2].en), 0, false ) ); }
+#line 7672 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 661:
+#line 2535 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-5].decl)->addArray( DeclarationNode::newVarArray( 0 ) ); }
+#line 7678 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 663:
+#line 2550 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7684 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 664:
+#line 2552 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7690 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 665:
+#line 2557 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
-    break;
-
-  case 649:
-
-/* Line 1806 of yacc.c  */
-#line 2520 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 650:
-
-/* Line 1806 of yacc.c  */
-#line 2522 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 651:
-
-/* Line 1806 of yacc.c  */
-#line 2524 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 652:
-
-/* Line 1806 of yacc.c  */
-#line 2526 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 654:
-
-/* Line 1806 of yacc.c  */
-#line 2532 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 655:
-
-/* Line 1806 of yacc.c  */
-#line 2534 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 656:
-
-/* Line 1806 of yacc.c  */
-#line 2536 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 657:
-
-/* Line 1806 of yacc.c  */
-#line 2541 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
-    break;
-
-  case 658:
-
-/* Line 1806 of yacc.c  */
-#line 2543 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 659:
-
-/* Line 1806 of yacc.c  */
-#line 2545 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 660:
-
-/* Line 1806 of yacc.c  */
-#line 2551 "parser.yy"
+#line 7696 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 666:
+#line 2559 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[0].decl) ); }
+#line 7702 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 667:
+#line 2561 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 7708 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 668:
+#line 2563 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
+#line 7714 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 669:
+#line 2565 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7720 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 671:
+#line 2571 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7726 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 672:
+#line 2573 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7732 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 673:
+#line 2575 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7738 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 674:
+#line 2580 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[-2].decl), 0 ); }
+#line 7744 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 675:
+#line 2582 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
+#line 7750 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 676:
+#line 2584 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7756 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 678:
+#line 2591 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7762 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 680:
+#line 2602 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
-    break;
-
-  case 661:
-
-/* Line 1806 of yacc.c  */
-#line 2553 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false )->addArray( (yyvsp[(3) - (3)].decl) ); }
-    break;
-
-  case 663:
-
-/* Line 1806 of yacc.c  */
-#line 2559 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(3) - (5)].en), 0, false ); }
-    break;
-
-  case 664:
-
-/* Line 1806 of yacc.c  */
-#line 2561 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newVarArray( 0 ); }
-    break;
-
-  case 665:
-
-/* Line 1806 of yacc.c  */
-#line 2563 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newArray( (yyvsp[(4) - (6)].en), 0, false ) ); }
-    break;
-
-  case 666:
-
-/* Line 1806 of yacc.c  */
-#line 2565 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newVarArray( 0 ) ); }
-    break;
-
-  case 668:
-
-/* Line 1806 of yacc.c  */
-#line 2580 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 669:
-
-/* Line 1806 of yacc.c  */
-#line 2582 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 670:
-
-/* Line 1806 of yacc.c  */
-#line 2587 "parser.yy"
+#line 7768 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 681:
+#line 2605 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[-3].decl) ); }
+#line 7774 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 682:
+#line 2607 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newArray( 0, (yyvsp[-2].decl), false ); }
+#line 7780 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 683:
+#line 2610 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[-2].en), (yyvsp[-3].decl), false ); }
+#line 7786 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 684:
+#line 2612 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[-2].en), (yyvsp[-3].decl), true ); }
+#line 7792 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 685:
+#line 2614 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[-2].en), (yyvsp[-4].decl), true ); }
+#line 7798 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 687:
+#line 2628 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7804 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 688:
+#line 2630 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7810 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 689:
+#line 2635 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
-    break;
-
-  case 671:
-
-/* Line 1806 of yacc.c  */
-#line 2589 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 672:
-
-/* Line 1806 of yacc.c  */
-#line 2591 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-
-  case 673:
-
-/* Line 1806 of yacc.c  */
-#line 2593 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-
-  case 674:
-
-/* Line 1806 of yacc.c  */
-#line 2595 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 676:
-
-/* Line 1806 of yacc.c  */
-#line 2601 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 677:
-
-/* Line 1806 of yacc.c  */
-#line 2603 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 678:
-
-/* Line 1806 of yacc.c  */
-#line 2605 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 679:
-
-/* Line 1806 of yacc.c  */
-#line 2610 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
-    break;
-
-  case 680:
-
-/* Line 1806 of yacc.c  */
-#line 2612 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 681:
-
-/* Line 1806 of yacc.c  */
-#line 2614 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 683:
-
-/* Line 1806 of yacc.c  */
-#line 2621 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 685:
-
-/* Line 1806 of yacc.c  */
-#line 2632 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
-    break;
-
-  case 686:
-
-/* Line 1806 of yacc.c  */
-#line 2635 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
-    break;
-
-  case 687:
-
-/* Line 1806 of yacc.c  */
-#line 2637 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( 0, (yyvsp[(3) - (5)].decl), false ); }
-    break;
-
-  case 688:
-
-/* Line 1806 of yacc.c  */
-#line 2640 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
-    break;
-
-  case 689:
-
-/* Line 1806 of yacc.c  */
-#line 2642 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl), true ); }
+#line 7816 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 690:
-
-/* Line 1806 of yacc.c  */
-#line 2644 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(3) - (7)].decl), true ); }
+#line 2637 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[0].decl) ); }
+#line 7822 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 691:
+#line 2639 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 7828 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 692:
-
-/* Line 1806 of yacc.c  */
-#line 2658 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
+#line 2641 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
+#line 7834 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 693:
-
-/* Line 1806 of yacc.c  */
-#line 2660 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
-    break;
-
-  case 694:
-
-/* Line 1806 of yacc.c  */
-#line 2665 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
+#line 2643 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7840 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 695:
-
-/* Line 1806 of yacc.c  */
-#line 2667 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
+#line 2649 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7846 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 696:
-
-/* Line 1806 of yacc.c  */
-#line 2669 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 2651 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7852 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 697:
-
-/* Line 1806 of yacc.c  */
-#line 2671 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+#line 2653 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7858 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 698:
-
-/* Line 1806 of yacc.c  */
-#line 2673 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 700:
-
-/* Line 1806 of yacc.c  */
-#line 2679 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
-    break;
-
-  case 701:
-
-/* Line 1806 of yacc.c  */
-#line 2681 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+#line 2658 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
+#line 7864 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 699:
+#line 2660 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7870 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 702:
-
-/* Line 1806 of yacc.c  */
-#line 2683 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-
-  case 703:
-
-/* Line 1806 of yacc.c  */
-#line 2688 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-
-  case 704:
-
-/* Line 1806 of yacc.c  */
-#line 2690 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+#line 2670 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-1].decl) ); }
+#line 7876 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 705:
+#line 2680 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 7882 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 706:
+#line 2682 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[-2].decl) ) ); }
+#line 7888 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 707:
-
-/* Line 1806 of yacc.c  */
-#line 2700 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+#line 2684 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 7894 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 708:
+#line 2686 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[-2].decl) ) ); }
+#line 7900 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 709:
+#line 2688 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 7906 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 710:
-
-/* Line 1806 of yacc.c  */
-#line 2710 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 2690 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[-2].decl) ) ); }
+#line 7912 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 711:
-
-/* Line 1806 of yacc.c  */
-#line 2712 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+#line 2697 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+#line 7918 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 712:
-
-/* Line 1806 of yacc.c  */
-#line 2714 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 2699 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) ); }
+#line 7924 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 713:
-
-/* Line 1806 of yacc.c  */
-#line 2716 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+#line 2701 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+#line 7930 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 714:
-
-/* Line 1806 of yacc.c  */
-#line 2718 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 2703 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) )->addNewArray( (yyvsp[-2].decl) ); }
+#line 7936 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 715:
-
-/* Line 1806 of yacc.c  */
-#line 2720 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+#line 2705 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) ); }
+#line 7942 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 716:
-
-/* Line 1806 of yacc.c  */
-#line 2727 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+#line 2707 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+#line 7948 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 717:
-
-/* Line 1806 of yacc.c  */
-#line 2729 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+#line 2709 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) ); }
+#line 7954 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 718:
-
-/* Line 1806 of yacc.c  */
-#line 2731 "parser.yy"
-    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+#line 2711 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+#line 7960 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 719:
-
-/* Line 1806 of yacc.c  */
-#line 2733 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
+#line 2713 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) )->addNewArray( (yyvsp[-2].decl) ); }
+#line 7966 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 720:
-
-/* Line 1806 of yacc.c  */
-#line 2735 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+#line 2715 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) ); }
+#line 7972 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 721:
-
-/* Line 1806 of yacc.c  */
-#line 2737 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+#line 2720 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[-3].decl) ); }
+#line 7978 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 722:
-
-/* Line 1806 of yacc.c  */
-#line 2739 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+#line 2722 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[-2].en), (yyvsp[-3].decl), false ); }
+#line 7984 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 723:
-
-/* Line 1806 of yacc.c  */
-#line 2741 "parser.yy"
-    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+#line 2727 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[-2].en), (yyvsp[-3].decl), true ); }
+#line 7990 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 724:
-
-/* Line 1806 of yacc.c  */
-#line 2743 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
-    break;
-
-  case 725:
-
-/* Line 1806 of yacc.c  */
-#line 2745 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+#line 2729 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[-2].en), (yyvsp[-3].decl)->addQualifiers( (yyvsp[-4].decl) ), true ); }
+#line 7996 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 726:
-
-/* Line 1806 of yacc.c  */
-#line 2750 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
-    break;
-
-  case 727:
-
-/* Line 1806 of yacc.c  */
-#line 2752 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
-    break;
-
-  case 728:
-
-/* Line 1806 of yacc.c  */
-#line 2757 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), true ); }
-    break;
-
-  case 729:
-
-/* Line 1806 of yacc.c  */
-#line 2759 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl)->addQualifiers( (yyvsp[(3) - (7)].decl) ), true ); }
+#line 2756 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-1].decl) ); }
+#line 8002 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 730:
+#line 2767 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 8008 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 731:
-
-/* Line 1806 of yacc.c  */
-#line 2786 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
+#line 2769 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[-2].decl) ) ); }
+#line 8014 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 732:
+#line 2771 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 8020 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 733:
+#line 2773 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[-2].decl) ) ); }
+#line 8026 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 734:
+#line 2775 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 8032 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 735:
-
-/* Line 1806 of yacc.c  */
-#line 2797 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 2777 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[-2].decl) ) ); }
+#line 8038 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 736:
-
-/* Line 1806 of yacc.c  */
-#line 2799 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+#line 2784 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+#line 8044 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 737:
-
-/* Line 1806 of yacc.c  */
-#line 2801 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 2786 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+#line 8050 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 738:
-
-/* Line 1806 of yacc.c  */
-#line 2803 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+#line 2788 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) ); }
+#line 8056 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 739:
-
-/* Line 1806 of yacc.c  */
-#line 2805 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 2790 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+#line 8062 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 740:
-
-/* Line 1806 of yacc.c  */
-#line 2807 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
+#line 2792 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+#line 8068 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 741:
-
-/* Line 1806 of yacc.c  */
-#line 2814 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+#line 2794 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) ); }
+#line 8074 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 742:
-
-/* Line 1806 of yacc.c  */
-#line 2816 "parser.yy"
-    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+#line 2799 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[-2].decl) ); }
+#line 8080 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 743:
-
-/* Line 1806 of yacc.c  */
-#line 2818 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
+#line 2804 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newFunction( 0, DeclarationNode::newTuple( 0 ), (yyvsp[-1].decl), 0 ); }
+#line 8086 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 744:
-
-/* Line 1806 of yacc.c  */
-#line 2820 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+#line 2806 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[-5].decl), (yyvsp[-2].decl), 0 ); }
+#line 8092 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 745:
-
-/* Line 1806 of yacc.c  */
-#line 2822 "parser.yy"
-    { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-    break;
-
-  case 746:
-
-/* Line 1806 of yacc.c  */
-#line 2824 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 747:
-
-/* Line 1806 of yacc.c  */
-#line 2829 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
+#line 2808 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[-5].decl), (yyvsp[-2].decl), 0 ); }
+#line 8098 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 748:
-
-/* Line 1806 of yacc.c  */
-#line 2834 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFunction( 0, DeclarationNode::newTuple( 0 ), (yyvsp[(4) - (5)].decl), 0 ); }
+#line 2832 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = 0; }
+#line 8104 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 749:
-
-/* Line 1806 of yacc.c  */
-#line 2836 "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 2838 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), 0 ); }
-    break;
-
-  case 753:
-
-/* Line 1806 of yacc.c  */
-#line 2862 "parser.yy"
-    { (yyval.en) = 0; }
-    break;
-
-  case 754:
-
-/* Line 1806 of yacc.c  */
-#line 2864 "parser.yy"
-    { (yyval.en) = (yyvsp[(2) - (2)].en); }
-    break;
-
-
-
-/* Line 1806 of yacc.c  */
-#line 9218 "Parser/parser.cc"
+#line 2834 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (yyvsp[0].en); }
+#line 8110 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+
+#line 8114 "Parser/parser.cc" /* yacc.c:1646  */
       default: break;
     }
@@ -9237 +8133 @@
   *++yyvsp = yyval;
 
-  /* Now `shift' the result of the reduction.  Determine what state
+  /* Now 'shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
@@ -9252 +8148 @@
 
 
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
+/*--------------------------------------.
+| yyerrlab -- here on detecting error.  |
+`--------------------------------------*/
 yyerrlab:
   /* Make sure we have latest lookahead translation.  See comments at
@@ -9305 +8201 @@
     {
       /* If just tried and failed to reuse lookahead token after an
-         error, discard it.  */
+         error, discard it.  */
 
       if (yychar <= YYEOF)
-        {
-          /* Return failure if at end of input.  */
-          if (yychar == YYEOF)
-            YYABORT;
-        }
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
       else
-        {
-          yydestruct ("Error: discarding",
-                      yytoken, &yylval);
-          yychar = YYEMPTY;
-        }
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval);
+          yychar = YYEMPTY;
+        }
     }
 
@@ -9337 +8233 @@
      goto yyerrorlab;
 
-  /* Do not reclaim the symbols of the rule which action triggered
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);
@@ -9350 +8246 @@
 `-------------------------------------------------------------*/
 yyerrlab1:
-  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
 
   for (;;)
@@ -9356 +8252 @@
       yyn = yypact[yystate];
       if (!yypact_value_is_default (yyn))
-        {
-          yyn += YYTERROR;
-          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-            {
-              yyn = yytable[yyn];
-              if (0 < yyn)
-                break;
-            }
-        }
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }
 
       /* Pop the current state because it cannot handle the error token.  */
       if (yyssp == yyss)
-        YYABORT;
+        YYABORT;
 
 
       yydestruct ("Error: popping",
-                  yystos[yystate], yyvsp);
+                  yystos[yystate], yyvsp);
       YYPOPSTACK (1);
       yystate = *yyssp;
@@ -9378 +8274 @@
     }
 
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
 
@@ -9402 +8300 @@
   goto yyreturn;
 
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#if !defined yyoverflow || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
@@ -9421 +8319 @@
                   yytoken, &yylval);
     }
-  /* Do not reclaim the symbols of the rule which action triggered
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
@@ -9428 +8326 @@
     {
       yydestruct ("Cleanup: popping",
-                  yystos[*yyssp], yyvsp);
+                  yystos[*yyssp], yyvsp);
       YYPOPSTACK (1);
     }
@@ -9439 +8337 @@
     YYSTACK_FREE (yymsg);
 #endif
-  /* Make sure YYID is used.  */
-  return YYID (yyresult);
+  return yyresult;
 }
-
-
-
-/* Line 2067 of yacc.c  */
-#line 2867 "parser.yy"
+#line 2837 "parser.yy" /* yacc.c:1906  */
 
 // ----end of grammar----
+
+extern char *yytext;
 
 void yyerror( const char * ) {
@@ -9463 +8358 @@
 // compile-command: "make install" //
 // End: //
-

src/Parser/parser.h

@@ -1 @@
-/* A Bison parser, made by GNU Bison 2.5.  */
+/* A Bison parser, made by GNU Bison 3.0.2.  */
 
 /* Bison interface for Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
-   
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
@@ -27 +27 @@
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-
-/* Tokens.  */
+#ifndef YY_YY_PARSER_PARSER_H_INCLUDED
+# define YY_YY_PARSER_PARSER_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
+
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     TYPEDEF = 258,
-     AUTO = 259,
-     EXTERN = 260,
-     REGISTER = 261,
-     STATIC = 262,
-     INLINE = 263,
-     FORTRAN = 264,
-     CONST = 265,
-     VOLATILE = 266,
-     RESTRICT = 267,
-     FORALL = 268,
-     LVALUE = 269,
-     VOID = 270,
-     CHAR = 271,
-     SHORT = 272,
-     INT = 273,
-     LONG = 274,
-     FLOAT = 275,
-     DOUBLE = 276,
-     SIGNED = 277,
-     UNSIGNED = 278,
-     VALIST = 279,
-     BOOL = 280,
-     COMPLEX = 281,
-     IMAGINARY = 282,
-     TYPEOF = 283,
-     LABEL = 284,
-     ENUM = 285,
-     STRUCT = 286,
-     UNION = 287,
-     OTYPE = 288,
-     FTYPE = 289,
-     DTYPE = 290,
-     TRAIT = 291,
-     SIZEOF = 292,
-     OFFSETOF = 293,
-     ATTRIBUTE = 294,
-     EXTENSION = 295,
-     IF = 296,
-     ELSE = 297,
-     SWITCH = 298,
-     CASE = 299,
-     DEFAULT = 300,
-     DO = 301,
-     WHILE = 302,
-     FOR = 303,
-     BREAK = 304,
-     CONTINUE = 305,
-     GOTO = 306,
-     RETURN = 307,
-     CHOOSE = 308,
-     DISABLE = 309,
-     ENABLE = 310,
-     FALLTHRU = 311,
-     TRY = 312,
-     CATCH = 313,
-     CATCHRESUME = 314,
-     FINALLY = 315,
-     THROW = 316,
-     THROWRESUME = 317,
-     AT = 318,
-     ASM = 319,
-     ALIGNAS = 320,
-     ALIGNOF = 321,
-     ATOMIC = 322,
-     GENERIC = 323,
-     NORETURN = 324,
-     STATICASSERT = 325,
-     THREADLOCAL = 326,
-     IDENTIFIER = 327,
-     QUOTED_IDENTIFIER = 328,
-     TYPEDEFname = 329,
-     TYPEGENname = 330,
-     ATTR_IDENTIFIER = 331,
-     ATTR_TYPEDEFname = 332,
-     ATTR_TYPEGENname = 333,
-     INTEGERconstant = 334,
-     FLOATINGconstant = 335,
-     CHARACTERconstant = 336,
-     STRINGliteral = 337,
-     ZERO = 338,
-     ONE = 339,
-     ARROW = 340,
-     ICR = 341,
-     DECR = 342,
-     LS = 343,
-     RS = 344,
-     LE = 345,
-     GE = 346,
-     EQ = 347,
-     NE = 348,
-     ANDAND = 349,
-     OROR = 350,
-     ELLIPSIS = 351,
-     MULTassign = 352,
-     DIVassign = 353,
-     MODassign = 354,
-     PLUSassign = 355,
-     MINUSassign = 356,
-     LSassign = 357,
-     RSassign = 358,
-     ANDassign = 359,
-     ERassign = 360,
-     ORassign = 361,
-     ATassign = 362,
-     THEN = 363
-   };
+  enum yytokentype
+  {
+    TYPEDEF = 258,
+    AUTO = 259,
+    EXTERN = 260,
+    REGISTER = 261,
+    STATIC = 262,
+    INLINE = 263,
+    FORTRAN = 264,
+    CONST = 265,
+    VOLATILE = 266,
+    RESTRICT = 267,
+    FORALL = 268,
+    LVALUE = 269,
+    VOID = 270,
+    CHAR = 271,
+    SHORT = 272,
+    INT = 273,
+    LONG = 274,
+    FLOAT = 275,
+    DOUBLE = 276,
+    SIGNED = 277,
+    UNSIGNED = 278,
+    VALIST = 279,
+    BOOL = 280,
+    COMPLEX = 281,
+    IMAGINARY = 282,
+    TYPEOF = 283,
+    LABEL = 284,
+    ENUM = 285,
+    STRUCT = 286,
+    UNION = 287,
+    OTYPE = 288,
+    FTYPE = 289,
+    DTYPE = 290,
+    TRAIT = 291,
+    SIZEOF = 292,
+    OFFSETOF = 293,
+    ATTRIBUTE = 294,
+    EXTENSION = 295,
+    IF = 296,
+    ELSE = 297,
+    SWITCH = 298,
+    CASE = 299,
+    DEFAULT = 300,
+    DO = 301,
+    WHILE = 302,
+    FOR = 303,
+    BREAK = 304,
+    CONTINUE = 305,
+    GOTO = 306,
+    RETURN = 307,
+    CHOOSE = 308,
+    DISABLE = 309,
+    ENABLE = 310,
+    FALLTHRU = 311,
+    TRY = 312,
+    CATCH = 313,
+    CATCHRESUME = 314,
+    FINALLY = 315,
+    THROW = 316,
+    THROWRESUME = 317,
+    AT = 318,
+    ASM = 319,
+    ALIGNAS = 320,
+    ALIGNOF = 321,
+    ATOMIC = 322,
+    GENERIC = 323,
+    NORETURN = 324,
+    STATICASSERT = 325,
+    THREADLOCAL = 326,
+    IDENTIFIER = 327,
+    QUOTED_IDENTIFIER = 328,
+    TYPEDEFname = 329,
+    TYPEGENname = 330,
+    ATTR_IDENTIFIER = 331,
+    ATTR_TYPEDEFname = 332,
+    ATTR_TYPEGENname = 333,
+    INTEGERconstant = 334,
+    FLOATINGconstant = 335,
+    CHARACTERconstant = 336,
+    STRINGliteral = 337,
+    ZERO = 338,
+    ONE = 339,
+    ARROW = 340,
+    ICR = 341,
+    DECR = 342,
+    LS = 343,
+    RS = 344,
+    LE = 345,
+    GE = 346,
+    EQ = 347,
+    NE = 348,
+    ANDAND = 349,
+    OROR = 350,
+    ELLIPSIS = 351,
+    MULTassign = 352,
+    DIVassign = 353,
+    MODassign = 354,
+    PLUSassign = 355,
+    MINUSassign = 356,
+    LSassign = 357,
+    RSassign = 358,
+    ANDassign = 359,
+    ERassign = 360,
+    ORassign = 361,
+    ATassign = 362,
+    THEN = 363
+  };
 #endif
 /* Tokens.  */
@@ -254 +262 @@
 #define THEN 363
 
-
-
-
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
+typedef union YYSTYPE YYSTYPE;
+union YYSTYPE
 {
-
-/* Line 2068 of yacc.c  */
-#line 115 "parser.yy"
+#line 115 "parser.yy" /* yacc.c:1909  */
 
         Token tok;
@@ -271 +276 @@
         DeclarationNode::TypeClass tclass;
         StatementNode *sn;
-        ConstantNode *constant;
+        ConstantExpr *constant;
+        ForCtl *fctl;
         LabelNode *label;
         InitializerNode *in;
@@ -277 +283 @@
         bool flag;
 
-
-
-/* Line 2068 of yacc.c  */
-#line 283 "Parser/parser.h"
-} YYSTYPE;
+#line 286 "Parser/parser.h" /* yacc.c:1909  */
+};
 # define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
+
 extern YYSTYPE yylval;
 
-
+int yyparse (void);
+
+#endif /* !YY_YY_PARSER_PARSER_H_INCLUDED  */

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Aug  7 09:37:48 2016
-// Update Count     : 1764
+// Last Modified On : Thu Aug 18 23:49:10 2016
+// Update Count     : 1909
 //
 
@@ -43 +43 @@
 #define YYDEBUG_LEXER_TEXT (yylval)                                             // lexer loads this up each time
 #define YYDEBUG 1                                                                               // get the pretty debugging code to compile
-extern char *yytext;
 
 #undef __GNUC_MINOR__
@@ -56 +55 @@
 #include "LinkageSpec.h"
 
-DeclarationNode *theTree = 0;                                                   // the resulting parse tree
-LinkageSpec::Type linkage = LinkageSpec::Cforall;
-std::stack< LinkageSpec::Type > linkageStack;
-TypedefTable typedefTable;
+extern DeclarationNode * parseTree;
+extern LinkageSpec::Spec linkage;
+extern TypedefTable typedefTable;
+
+std::stack< LinkageSpec::Spec > linkageStack;
 
 void appendStr( std::string &to, std::string *from ) {
@@ -121 +121 @@
         DeclarationNode::TypeClass tclass;
         StatementNode *sn;
-        ConstantNode *constant;
+        ConstantExpr *constant;
+        ForCtl *fctl;
         LabelNode *label;
         InitializerNode *in;
@@ -133 +134 @@
 
 // expressions
-%type<constant> constant
+%type<en> constant
 %type<en> tuple                                                 tuple_expression_list
 %type<op> ptrref_operator                               unary_operator                          assignment_operator
@@ -142 +143 @@
 %type<en> constant_expression                   assignment_expression           assignment_expression_opt
 %type<en> comma_expression                              comma_expression_opt
-%type<en> argument_expression_list              argument_expression                     for_control_expression          assignment_opt
+%type<en> argument_expression_list              argument_expression                     assignment_opt
+%type<fctl> for_control_expression
 %type<en> subrange
 %type<en> asm_operands_opt asm_operands_list asm_operand
 %type<label> label_list
-%type<constant> asm_clobbers_list_opt
+%type<en> asm_clobbers_list_opt
 %type<flag> asm_volatile_opt
 
@@ -159 +161 @@
 %type<sn> case_value_list                               case_label                                      case_label_list
 %type<sn> switch_clause_list_opt                switch_clause_list                      choose_clause_list_opt          choose_clause_list
-%type<pn> handler_list                                  handler_clause                          finally_clause
+%type<sn> handler_list                                  handler_clause                          finally_clause
 
 // declarations
@@ -221 +223 @@
 %type<decl> paren_identifier paren_type
 
-%type<decl> storage_class storage_class_name storage_class_list
+%type<decl> storage_class storage_class_list
 
 %type<decl> sue_declaration_specifier sue_type_specifier
@@ -309 +311 @@
 constant:
                 // ENUMERATIONconstant is not included here; it is treated as a variable with type "enumeration constant".
-INTEGERconstant                                                                 { $$ = build_constantInteger( *$1 ); }
-        | FLOATINGconstant                                                      { $$ = build_constantFloat( *$1 ); }
-        | CHARACTERconstant                                                     { $$ = build_constantChar( *$1 ); }
+        INTEGERconstant                                                                 { $$ = new ExpressionNode( build_constantInteger( assign_strptr($1) ) ); }
+        | FLOATINGconstant                                                      { $$ = new ExpressionNode( build_constantFloat( assign_strptr($1) ) ); }
+        | CHARACTERconstant                                                     { $$ = new ExpressionNode( build_constantChar( assign_strptr($1) ) ); }
         ;
 
@@ -336 +338 @@
 
 string_literal_list:                                                                    // juxtaposed strings are concatenated
-        STRINGliteral                                                           { $$ = build_constantStr( *$1 ); }
+        STRINGliteral                                                           { $$ = build_constantStr( assign_strptr($1) ); }
         | string_literal_list STRINGliteral
                 {
-                        appendStr( $1->get_expr()->get_constant()->get_value(), $2 );
+                        appendStr( $1->get_constant()->get_value(), $2 );
                         delete $2;                                                                      // allocated by lexer
                         $$ = $1;
@@ -349 +351 @@
 primary_expression:
         IDENTIFIER                                                                                      // typedef name cannot be used as a variable name
-                { $$ = new VarRefNode( $1 ); }
+                { $$ = new ExpressionNode( build_varref( $1 ) ); }
         | zero_one
-                { $$ = new VarRefNode( $1 ); }
+                { $$ = new ExpressionNode( build_varref( $1 ) ); }
         | '(' comma_expression ')'
                 { $$ = $2; }
         | '(' compound_statement ')'                                            // GCC, lambda expression
-                { $$ = new ValofExprNode( $2 ); }
+        { $$ = new ExpressionNode( build_valexpr( $2 ) ); }
         ;
 
@@ -365 +367 @@
                 // little advantage to this feature and many disadvantages. It is possible to write x[(i,j)] in CFA, which is
                 // equivalent to the old x[i,j].
-                { $$ = new CompositeExprNode( build_binary_val( OperKinds::Index, $1, $4 ) ); }
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::Index, $1, $4 ) ); }
         | postfix_expression '(' argument_expression_list ')'
-                { $$ = new CompositeExprNode( build_func( $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_func( $1, $3 ) ); }
         // ambiguity with .0 so space required after field-selection, e.g.
                 //   struct S { int 0, 1; } s; s. 0 = 0; s. 1 = 1;
         | postfix_expression '.' no_attr_identifier
-                { $$ = new CompositeExprNode( build_fieldSel( $1, new VarRefNode( $3 ) ) ); }
+                { $$ = new ExpressionNode( build_fieldSel( $1, build_varref( $3 ) ) ); }
         | postfix_expression '.' '[' push field_list pop ']' // CFA, tuple field selector
         | postfix_expression ARROW no_attr_identifier
-                { $$ = new CompositeExprNode( build_pfieldSel( $1, new VarRefNode( $3 ) ) ); }
+                { $$ = new ExpressionNode( build_pfieldSel( $1, build_varref( $3 ) ) ); }
         | postfix_expression ARROW '[' push field_list pop ']' // CFA, tuple field selector
         | postfix_expression ICR
-                { $$ = new CompositeExprNode( build_unary_ptr( OperKinds::IncrPost, $1 ) ); }
+                { $$ = new ExpressionNode( build_unary_ptr( OperKinds::IncrPost, $1 ) ); }
         | postfix_expression DECR
-                { $$ = new CompositeExprNode( build_unary_ptr( OperKinds::DecrPost, $1 ) ); }
+                { $$ = new ExpressionNode( build_unary_ptr( OperKinds::DecrPost, $1 ) ); }
         | '(' type_name_no_function ')' '{' initializer_list comma_opt '}' // C99
-                { $$ = new CompoundLiteralNode( $2, new InitializerNode( $5, true ) ); }
+                { $$ = new ExpressionNode( build_compoundLiteral( $2, new InitializerNode( $5, true ) ) ); }
         | postfix_expression '{' argument_expression_list '}' // CFA
                 {
                         Token fn;
                         fn.str = new std::string( "?{}" ); // location undefined
-                        $$ = new CompositeExprNode( build_func( new VarRefNode( fn ), (ExpressionNode *)( $1 )->set_link( $3 ) ) );
+                        $$ = new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( $1 )->set_last( $3 ) ) );
                 }
         ;
@@ -393 +395 @@
         argument_expression
         | argument_expression_list ',' argument_expression
-                { $$ = (ExpressionNode *)( $1->set_link( $3 )); }
+                { $$ = (ExpressionNode *)( $1->set_last( $3 )); }
         ;
 
@@ -400 +402 @@
                 { $$ = 0; }                                                                             // use default argument
         | assignment_expression
-        | no_attr_identifier ':' assignment_expression
-                { $$ = $3->set_argName( $1 ); }
-                // Only a list of no_attr_identifier_or_type_name is allowed in this context. However, there is insufficient
-                // look ahead to distinguish between this list of parameter names and a tuple, so the tuple form must be used
-                // with an appropriate semantic check.
-        | '[' push assignment_expression pop ']' ':' assignment_expression
-                { $$ = $7->set_argName( $3 ); }
-        | '[' push assignment_expression ',' tuple_expression_list pop ']' ':' assignment_expression
-                { $$ = $9->set_argName( new CompositeExprNode( build_tuple( (ExpressionNode *)$3->set_link( $5 ) ) ) ); }
         ;
 
 field_list:                                                                                             // CFA, tuple field selector
         field
-        | field_list ',' field                                          { $$ = (ExpressionNode *)$1->set_link( $3 ); }
+        | field_list ',' field                                          { $$ = (ExpressionNode *)$1->set_last( $3 ); }
         ;
 
 field:                                                                                                  // CFA, tuple field selector
         no_attr_identifier
-                { $$ = new VarRefNode( $1 ); }
+                { $$ = new ExpressionNode( build_varref( $1 ) ); }
         // ambiguity with .0 so space required after field-selection, e.g.
                 //   struct S { int 0, 1; } s; s. 0 = 0; s. 1 = 1;
         | no_attr_identifier '.' field
-                { $$ = new CompositeExprNode( build_fieldSel( $3, new VarRefNode( $1 ) ) ); }
+                { $$ = new ExpressionNode( build_fieldSel( $3, build_varref( $1 ) ) ); }
         | no_attr_identifier '.' '[' push field_list pop ']'
-                { $$ = new CompositeExprNode( build_fieldSel( $5, new VarRefNode( $1 ) ) ); }
+                { $$ = new ExpressionNode( build_fieldSel( $5, build_varref( $1 ) ) ); }
         | no_attr_identifier ARROW field
-                { $$ = new CompositeExprNode( build_pfieldSel( $3, new VarRefNode( $1 ) ) ); }
+                { $$ = new ExpressionNode( build_pfieldSel( $3, build_varref( $1 ) ) ); }
         | no_attr_identifier ARROW '[' push field_list pop ']'
-                { $$ = new CompositeExprNode( build_pfieldSel( $5, new VarRefNode( $1 ) ) ); }
+                { $$ = new ExpressionNode( build_pfieldSel( $5, build_varref( $1 ) ) ); }
         ;
 
@@ -438 +431 @@
                 { $$ = $1; }
         | string_literal_list
-                { $$ = $1; }
+                { $$ = new ExpressionNode( $1 ); }
         | EXTENSION cast_expression                                                     // GCC
                 { $$ = $2->set_extension( true ); }
@@ -448 +441 @@
                         switch ( $1 ) {
                           case OperKinds::AddressOf:
-                                $$ = new CompositeExprNode( build_addressOf( $2 ) );
+                                $$ = new ExpressionNode( build_addressOf( $2 ) );
                                 break;
                           case OperKinds::PointTo:
-                                $$ = new CompositeExprNode( build_unary_val( $1, $2 ) );
+                                $$ = new ExpressionNode( build_unary_val( $1, $2 ) );
                                 break;
                           default:
@@ -458 +451 @@
                 }
         | unary_operator cast_expression
-                        { $$ = new CompositeExprNode( build_unary_val( $1, $2 ) ); }
+                { $$ = new ExpressionNode( build_unary_val( $1, $2 ) ); }
         | ICR unary_expression
-                { $$ = new CompositeExprNode( build_unary_ptr( OperKinds::Incr, $2 ) ); }
+                { $$ = new ExpressionNode( build_unary_ptr( OperKinds::Incr, $2 ) ); }
         | DECR unary_expression
-                { $$ = new CompositeExprNode( build_unary_ptr( OperKinds::Decr, $2 ) ); }
+                { $$ = new ExpressionNode( build_unary_ptr( OperKinds::Decr, $2 ) ); }
         | SIZEOF unary_expression
-                { $$ = new CompositeExprNode( build_sizeOf( $2 ) ); }
+                { $$ = new ExpressionNode( build_sizeOfexpr( $2 ) ); }
         | SIZEOF '(' type_name_no_function ')'
-                { $$ = new CompositeExprNode( build_sizeOf( new TypeValueNode( $3 ) ) ); }
+                { $$ = new ExpressionNode( build_sizeOftype( $3 ) ); }
+        | ALIGNOF unary_expression                                                      // GCC, variable alignment
+                { $$ = new ExpressionNode( build_alignOfexpr( $2 ) ); }
+        | ALIGNOF '(' type_name_no_function ')'                         // GCC, type alignment
+                { $$ = new ExpressionNode( build_alignOftype( $3 ) ); }
         | OFFSETOF '(' type_name_no_function ',' no_attr_identifier ')'
-                { $$ = new CompositeExprNode( build_offsetOf( new TypeValueNode( $3 ), new VarRefNode( $5 ) ) ); }
+                { $$ = new ExpressionNode( build_offsetOf( $3, build_varref( $5 ) ) ); }
         | ATTR_IDENTIFIER
-                { $$ = new CompositeExprNode( build_attr( new VarRefNode( $1 ) ) ); }
+                { $$ = new ExpressionNode( build_attrexpr( build_varref( $1 ), nullptr ) ); }
+        | ATTR_IDENTIFIER '(' argument_expression ')'
+                { $$ = new ExpressionNode( build_attrexpr( build_varref( $1 ), $3 ) ); }
         | ATTR_IDENTIFIER '(' type_name ')'
-                { $$ = new CompositeExprNode( build_attr( new VarRefNode( $1 ), new TypeValueNode( $3 ) ) ); }
-        | ATTR_IDENTIFIER '(' argument_expression ')'
-                { $$ = new CompositeExprNode( build_attr( new VarRefNode( $1 ), $3 ) ); }
-        | ALIGNOF unary_expression                                                      // GCC, variable alignment
-                { $$ = new CompositeExprNode( build_alignOf( $2 ) ); }
-        | ALIGNOF '(' type_name_no_function ')'                         // GCC, type alignment
-                { $$ = new CompositeExprNode( build_alignOf( new TypeValueNode( $3 ) ) ); }
+                { $$ = new ExpressionNode( build_attrtype( build_varref( $1 ), $3 ) ); }
 //      | ANDAND IDENTIFIER                                                                     // GCC, address of label
-//              { $$ = new CompositeExprNode( new OperatorNode( OperKinds::LabelAddress ), new VarRefNode( $2, true ) ); }
+//              { $$ = new ExpressionNode( new OperatorNode( OperKinds::LabelAddress ), new ExpressionNode( build_varref( $2, true ) ); }
         ;
 
@@ -500 +493 @@
         unary_expression
         | '(' type_name_no_function ')' cast_expression
-                { $$ = new CompositeExprNode( build_cast( new TypeValueNode( $2 ), $4 ) ); }
+                { $$ = new ExpressionNode( build_cast( $2, $4 ) ); }
         | '(' type_name_no_function ')' tuple
-                { $$ = new CompositeExprNode( build_cast( new TypeValueNode( $2 ), $4 ) ); }
+                { $$ = new ExpressionNode( build_cast( $2, $4 ) ); }
         ;
 
@@ -508 +501 @@
         cast_expression
         | multiplicative_expression '*' cast_expression
-                { $$ = new CompositeExprNode( build_binary_val( OperKinds::Mul, $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::Mul, $1, $3 ) ); }
         | multiplicative_expression '/' cast_expression
-                { $$ = new CompositeExprNode( build_binary_val( OperKinds::Div, $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::Div, $1, $3 ) ); }
         | multiplicative_expression '%' cast_expression
-                { $$ = new CompositeExprNode( build_binary_val( OperKinds::Mod, $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::Mod, $1, $3 ) ); }
         ;
 
@@ -518 +511 @@
         multiplicative_expression
         | additive_expression '+' multiplicative_expression
-                { $$ = new CompositeExprNode( build_binary_val( OperKinds::Plus, $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::Plus, $1, $3 ) ); }
         | additive_expression '-' multiplicative_expression
-                { $$ = new CompositeExprNode( build_binary_val( OperKinds::Minus, $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::Minus, $1, $3 ) ); }
         ;
 
@@ -526 +519 @@
         additive_expression
         | shift_expression LS additive_expression
-                { $$ = new CompositeExprNode( build_binary_val( OperKinds::LShift, $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::LShift, $1, $3 ) ); }
         | shift_expression RS additive_expression
-                { $$ = new CompositeExprNode( build_binary_val( OperKinds::RShift, $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::RShift, $1, $3 ) ); }
         ;
 
@@ -534 +527 @@
         shift_expression
         | relational_expression '<' shift_expression
-                { $$ = new CompositeExprNode( build_binary_val( OperKinds::LThan, $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::LThan, $1, $3 ) ); }
         | relational_expression '>' shift_expression
-                { $$ = new CompositeExprNode( build_binary_val( OperKinds::GThan, $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::GThan, $1, $3 ) ); }
         | relational_expression LE shift_expression
-                { $$ = new CompositeExprNode( build_binary_val( OperKinds::LEThan, $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::LEThan, $1, $3 ) ); }
         | relational_expression GE shift_expression
-                { $$ = new CompositeExprNode( build_binary_val( OperKinds::GEThan, $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::GEThan, $1, $3 ) ); }
         ;
 
@@ -546 +539 @@
         relational_expression
         | equality_expression EQ relational_expression
-                { $$ = new CompositeExprNode( build_binary_val( OperKinds::Eq, $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::Eq, $1, $3 ) ); }
         | equality_expression NE relational_expression
-                { $$ = new CompositeExprNode( build_binary_val( OperKinds::Neq, $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::Neq, $1, $3 ) ); }
         ;
 
@@ -554 +547 @@
         equality_expression
         | AND_expression '&' equality_expression
-                { $$ = new CompositeExprNode( build_binary_val( OperKinds::BitAnd, $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::BitAnd, $1, $3 ) ); }
         ;
 
@@ -560 +553 @@
         AND_expression
         | exclusive_OR_expression '^' AND_expression
-                { $$ = new CompositeExprNode( build_binary_val( OperKinds::Xor, $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::Xor, $1, $3 ) ); }
         ;
 
@@ -566 +559 @@
         exclusive_OR_expression
         | inclusive_OR_expression '|' exclusive_OR_expression
-                { $$ = new CompositeExprNode( build_binary_val( OperKinds::BitOr, $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::BitOr, $1, $3 ) ); }
         ;
 
@@ -572 +565 @@
         inclusive_OR_expression
         | logical_AND_expression ANDAND inclusive_OR_expression
-                { $$ = new CompositeExprNode( build_and_or( $1, $3, true ) ); }
+                { $$ = new ExpressionNode( build_and_or( $1, $3, true ) ); }
         ;
 
@@ -578 +571 @@
         logical_AND_expression
         | logical_OR_expression OROR logical_AND_expression
-                { $$ = new CompositeExprNode( build_and_or( $1, $3, false ) ); }
+                { $$ = new ExpressionNode( build_and_or( $1, $3, false ) ); }
         ;
 
@@ -584 +577 @@
         logical_OR_expression
         | logical_OR_expression '?' comma_expression ':' conditional_expression
-                { $$ = new CompositeExprNode( build_cond( $1, $3, $5 ) ); }
+                { $$ = new ExpressionNode( build_cond( $1, $3, $5 ) ); }
                 // FIX ME: this hack computes $1 twice
         | logical_OR_expression '?' /* empty */ ':' conditional_expression // GCC, omitted first operand
-                { $$ = new CompositeExprNode( build_cond( $1, $1, $4 ) ); }
+                { $$ = new ExpressionNode( build_cond( $1, $1, $4 ) ); }
         | logical_OR_expression '?' comma_expression ':' tuple // CFA, tuple expression
-                { $$ = new CompositeExprNode( build_cond( $1, $3, $5 ) ); }
+                { $$ = new ExpressionNode( build_cond( $1, $3, $5 ) ); }
         ;
 
@@ -600 +593 @@
         conditional_expression
         | unary_expression assignment_operator assignment_expression
-                { $$ = new CompositeExprNode( build_binary_ptr( $2, $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_binary_ptr( $2, $1, $3 ) ); }
         | tuple assignment_opt                                                          // CFA, tuple expression
-                { $$ = ( $2 == 0 ) ? $1 : new CompositeExprNode( build_binary_ptr( OperKinds::Assign, $1, $2 ) ); }
+                { $$ = ( $2 == 0 ) ? $1 : new ExpressionNode( build_binary_ptr( OperKinds::Assign, $1, $2 ) ); }
         ;
 
 assignment_expression_opt:
         // empty
-                { $$ = new NullExprNode; }
+                { $$ = nullptr; }
         | assignment_expression
         ;
@@ -629 +622 @@
                 // comma_expression in new_identifier_parameter_array and new_abstract_array
         '[' ']'
-                { $$ = new CompositeExprNode( build_tuple() ); }
+                { $$ = new ExpressionNode( build_tuple() ); }
         | '[' push assignment_expression pop ']'
-                { $$ = new CompositeExprNode( build_tuple( $3 ) ); }
+                { $$ = new ExpressionNode( build_tuple( $3 ) ); }
         | '[' push ',' tuple_expression_list pop ']'
-                { $$ = new CompositeExprNode( build_tuple( (ExpressionNode *)(new NullExprNode)->set_link( $4 ) ) ); }
+                { $$ = new ExpressionNode( build_tuple( (ExpressionNode *)(new ExpressionNode( nullptr ) )->set_last( $4 ) ) ); }
         | '[' push assignment_expression ',' tuple_expression_list pop ']'
-                { $$ = new CompositeExprNode( build_tuple( (ExpressionNode *)$3->set_link( $5 ) ) ); }
+                { $$ = new ExpressionNode( build_tuple( (ExpressionNode *)$3->set_last( $5 ) ) ); }
         ;
 
@@ -641 +634 @@
         assignment_expression_opt
         | tuple_expression_list ',' assignment_expression_opt
-                { $$ = (ExpressionNode *)$1->set_link( $3 ); }
+                { $$ = (ExpressionNode *)$1->set_last( $3 ); }
         ;
 
@@ -647 +640 @@
         assignment_expression
         | comma_expression ',' assignment_expression
-                { $$ = new CompositeExprNode( build_comma( $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_comma( $1, $3 ) ); }
         ;
 
@@ -671 +664 @@
                         Token fn;
                         fn.str = new std::string( "^?{}" ); // location undefined
-                        $$ = new StatementNode( StatementNode::Exp, new CompositeExprNode( build_func( new VarRefNode( fn ), (ExpressionNode *)( $2 )->set_link( $4 ) ) ), 0 );
+                        $$ = new StatementNode( build_expr( new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( $2 )->set_last( $4 ) ) ) ) );
                 }
         ;
@@ -685 +678 @@
 compound_statement:
         '{' '}'
-                { $$ = new CompoundStmtNode( (StatementNode *)0 ); }
+                { $$ = new StatementNode( build_compound( (StatementNode *)0 ) ); }
         | '{'
                 // Two scopes are necessary because the block itself has a scope, but every declaration within the block also
@@ -692 +685 @@
           local_label_declaration_opt                                           // GCC, local labels
           block_item_list pop '}'                                                       // C99, intermix declarations and statements
-                { $$ = new CompoundStmtNode( $5 ); }
+                { $$ = new StatementNode( build_compound( $5 ) ); }
         ;
 
@@ -698 +691 @@
         block_item
         | block_item_list push block_item
-                { if ( $1 != 0 ) { $1->set_link( $3 ); $$ = $1; } }
+                { if ( $1 != 0 ) { $1->set_last( $3 ); $$ = $1; } }
         ;
 
@@ -706 +699 @@
         | EXTENSION declaration                                                         // GCC
                 {       // mark all fields in list
-                        for ( DeclarationNode *iter = $2; iter != NULL; iter = (DeclarationNode *)iter->get_link() )
+                        for ( DeclarationNode *iter = $2; iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
                                 iter->set_extension( true );
                         $$ = new StatementNode( $2 );
@@ -718 +711 @@
         statement
         | statement_list statement
-                { if ( $1 != 0 ) { $1->set_link( $2 ); $$ = $1; } }
+                { if ( $1 != 0 ) { $1->set_last( $2 ); $$ = $1; } }
         ;
 
 expression_statement:
         comma_expression_opt ';'
-                { $$ = new StatementNode( StatementNode::Exp, $1, 0 ); }
+                { $$ = new StatementNode( build_expr( $1 ) ); }
         ;
 
@@ -729 +722 @@
         IF '(' comma_expression ')' statement                           %prec THEN
                 // explicitly deal with the shift/reduce conflict on if/else
-                { $$ = new StatementNode( StatementNode::If, $3, $5 ); }
+                { $$ = new StatementNode( build_if( $3, $5, nullptr ) ); }
         | IF '(' comma_expression ')' statement ELSE statement
-                { $$ = new StatementNode( StatementNode::If, $3, (StatementNode *)mkList((*$5, *$7 )) ); }
+                { $$ = new StatementNode( build_if( $3, $5, $7 ) ); }
         | SWITCH '(' comma_expression ')' case_clause           // CFA
-                { $$ = new StatementNode( StatementNode::Switch, $3, $5 ); }
+                { $$ = new StatementNode( build_switch( $3, $5 ) ); }
         | SWITCH '(' comma_expression ')' '{' push declaration_list_opt switch_clause_list_opt '}' // CFA
                 {
-                        StatementNode *sw = new StatementNode( StatementNode::Switch, $3, $8 );
+                        StatementNode *sw = new StatementNode( build_switch( $3, $8 ) );
                         // The semantics of the declaration list is changed to include associated initialization, which is performed
                         // *before* the transfer to the appropriate case clause by hoisting the declarations into a compound
@@ -742 +735 @@
                         // therefore, are removed from the grammar even though C allows it. The change also applies to choose
                         // statement.
-                        $$ = $7 != 0 ? new CompoundStmtNode( (StatementNode *)((new StatementNode( $7 ))->set_link( sw )) ) : sw;
+                        $$ = $7 != 0 ? new StatementNode( build_compound( (StatementNode *)((new StatementNode( $7 ))->set_last( sw )) ) ) : sw;
                 }
         | CHOOSE '(' comma_expression ')' case_clause           // CFA
-                { $$ = new StatementNode( StatementNode::Switch, $3, $5 ); }
+                { $$ = new StatementNode( build_switch( $3, $5 ) ); }
         | CHOOSE '(' comma_expression ')' '{' push declaration_list_opt choose_clause_list_opt '}' // CFA
                 {
-                        StatementNode *sw = new StatementNode( StatementNode::Switch, $3, $8 );
-                        $$ = $7 != 0 ? new CompoundStmtNode( (StatementNode *)((new StatementNode( $7 ))->set_link( sw )) ) : sw;
+                        StatementNode *sw = new StatementNode( build_switch( $3, $8 ) );
+                        $$ = $7 != 0 ? new StatementNode( build_compound( (StatementNode *)((new StatementNode( $7 ))->set_last( sw )) ) ) : sw;
                 }
         ;
@@ -759 +752 @@
         constant_expression                                                     { $$ = $1; }
         | constant_expression ELLIPSIS constant_expression      // GCC, subrange
-                { $$ = new CompositeExprNode( build_range( $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_range( $1, $3 ) ); }
         | subrange                                                                                      // CFA, subrange
         ;
 
 case_value_list:                                                                                // CFA
-        case_value                                                                      { $$ = new StatementNode( StatementNode::Case, $1, 0 ); }
+        case_value                                                                      { $$ = new StatementNode( build_case( $1 ) ); }
                 // convert case list, e.g., "case 1, 3, 5:" into "case 1: case 3: case 5"
-        | case_value_list ',' case_value                        { $$ = (StatementNode *)($1->set_link( new StatementNode( StatementNode::Case, $3, 0 ) ) ); }
+        | case_value_list ',' case_value                        { $$ = (StatementNode *)($1->set_last( new StatementNode( build_case( $3 ) ) ) ); }
         ;
 
 case_label:                                                                                             // CFA
         CASE case_value_list ':'                                        { $$ = $2; }
-        | DEFAULT ':'                                                           { $$ = new StatementNode( StatementNode::Default ); }
+        | DEFAULT ':'                                                           { $$ = new StatementNode( build_default() ); }
                 // A semantic check is required to ensure only one default clause per switch/choose statement.
         ;
@@ -777 +770 @@
 case_label_list:                                                                                // CFA
         case_label
-        | case_label_list case_label                            { $$ = (StatementNode *)( $1->set_link( $2 )); }
+        | case_label_list case_label                            { $$ = (StatementNode *)( $1->set_last( $2 )); }
         ;
 
 case_clause:                                                                                    // CFA
-        case_label_list statement                                       { $$ = $1->append_last_case( new CompoundStmtNode( $2 ) ); }
+        case_label_list statement                                       { $$ = $1->append_last_case( new StatementNode( build_compound( $2 ) ) ); }
         ;
 
@@ -792 +785 @@
 switch_clause_list:                                                                             // CFA
         case_label_list statement_list
-                { $$ = $1->append_last_case( new CompoundStmtNode( $2 ) ); }
+                { $$ = $1->append_last_case( new StatementNode( build_compound( $2 ) ) ); }
         | switch_clause_list case_label_list statement_list
-                { $$ = (StatementNode *)( $1->set_link( $2->append_last_case( new CompoundStmtNode( $3 ) ) ) ); }
+                { $$ = (StatementNode *)( $1->set_last( $2->append_last_case( new StatementNode( build_compound( $3 ) ) ) ) ); }
         ;
 
@@ -807 +800 @@
                 { $$ = $1->append_last_case( $2 ); }
         | case_label_list statement_list fall_through_opt
-                { $$ = $1->append_last_case( new CompoundStmtNode( (StatementNode *)mkList( (*$2, *$3 ) ) ) ); }
+                { $$ = $1->append_last_case( new StatementNode( build_compound( (StatementNode *)$2->set_last( $3 ) ) ) ); }
         | choose_clause_list case_label_list fall_through
-                { $$ = (StatementNode *)( $1->set_link( $2->append_last_case( $3 ))); }
+                { $$ = (StatementNode *)( $1->set_last( $2->append_last_case( $3 ))); }
         | choose_clause_list case_label_list statement_list fall_through_opt
-                { $$ = (StatementNode *)( $1->set_link( $2->append_last_case( new CompoundStmtNode( (StatementNode *)mkList( (*$3, *$4 ) ) ) ) ) ); }
+                { $$ = (StatementNode *)( $1->set_last( $2->append_last_case( new StatementNode( build_compound( (StatementNode *)$3->set_last( $4 ) ) ) ) ) ); }
         ;
 
 fall_through_opt:                                                                               // CFA
         // empty
-                { $$ = new StatementNode( StatementNode::Break ); }     // insert implicit break
+                { $$ = new StatementNode( build_branch( "", BranchStmt::Break ) ); } // insert implicit break
         | fall_through
         ;
@@ -829 +822 @@
 iteration_statement:
         WHILE '(' comma_expression ')' statement
-                { $$ = new StatementNode( StatementNode::While, $3, $5 ); }
+                { $$ = new StatementNode( build_while( $3, $5 ) ); }
         | DO statement WHILE '(' comma_expression ')' ';'
-                { $$ = new StatementNode( StatementNode::Do, $5, $2 ); }
+                { $$ = new StatementNode( build_while( $5, $2 ) ); }
         | FOR '(' push for_control_expression ')' statement
-                { $$ = new StatementNode( StatementNode::For, $4, $6 ); }
+                { $$ = new StatementNode( build_for( $4, $6 ) ); }
         ;
 
 for_control_expression:
         comma_expression_opt pop ';' comma_expression_opt ';' comma_expression_opt
-                { $$ = new ForCtlExprNode( $1, $4, $6 ); }
+                { $$ = new ForCtl( $1, $4, $6 ); }
         | declaration comma_expression_opt ';' comma_expression_opt // C99
-                { $$ = new ForCtlExprNode( $1, $2, $4 ); }
-        ;
+                { $$ = new ForCtl( $1, $2, $4 ); }
+        ;
 
 jump_statement:
         GOTO IDENTIFIER ';'
-                { $$ = new StatementNode( StatementNode::Goto, $2 ); }
+                { $$ = new StatementNode( build_branch( assign_strptr($2), BranchStmt::Goto ) ); }
         | GOTO '*' comma_expression ';'                                         // GCC, computed goto
                 // The syntax for the GCC computed goto violates normal expression precedence, e.g., goto *i+3; => goto *(i+3);
                 // whereas normal operator precedence yields goto (*i)+3;
-                { $$ = new StatementNode( StatementNode::Goto, $3 ); }
+                { $$ = new StatementNode( build_computedgoto( $3 ) ); }
         | CONTINUE ';'
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement.
-                { $$ = new StatementNode( StatementNode::Continue ); }
+                { $$ = new StatementNode( build_branch( "", BranchStmt::Continue ) ); }
         | CONTINUE IDENTIFIER ';'                                                       // CFA, multi-level continue
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement, and
                 // the target of the transfer appears only at the start of an iteration statement.
-                { $$ = new StatementNode( StatementNode::Continue, $2 ); }
+                { $$ = new StatementNode( build_branch( assign_strptr($2), BranchStmt::Continue ) ); }
         | BREAK ';'
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement.
-                { $$ = new StatementNode( StatementNode::Break ); }
+                { $$ = new StatementNode( build_branch( "", BranchStmt::Break ) ); }
         | BREAK IDENTIFIER ';'                                                          // CFA, multi-level exit
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement, and
                 // the target of the transfer appears only at the start of an iteration statement.
-                { $$ = new StatementNode( StatementNode::Break, $2 ); }
+                { $$ = new StatementNode( build_branch( assign_strptr($2), BranchStmt::Break ) ); }
         | RETURN comma_expression_opt ';'
-                { $$ = new StatementNode( StatementNode::Return, $2, 0 ); }
-        | THROW assignment_expression_opt ';'
-                { $$ = new StatementNode( StatementNode::Throw, $2, 0 ); }
-//      | THROW ';'
-//              { $$ = new StatementNode( StatementNode::Throw ); }
-        | THROWRESUME assignment_expression_opt ';'
-                { $$ = new StatementNode( StatementNode::Throw, $2, 0 ); }
-        | THROWRESUME assignment_expression_opt AT assignment_expression ';'
-                { $$ = new StatementNode( StatementNode::Throw, $2, 0 ); }
-//      | THROWRESUME ';'
-//              { $$ = new StatementNode( StatementNode::Throw ); }
+                { $$ = new StatementNode( build_return( $2 ) ); }
+        | THROW assignment_expression_opt ';'                           // handles rethrow
+                { $$ = new StatementNode( build_throw( $2 ) ); }
+        | THROWRESUME assignment_expression_opt ';'                     // handles reresume
+                { $$ = new StatementNode( build_throw( $2 ) ); }
+        | THROWRESUME assignment_expression_opt AT assignment_expression ';' // handles reresume
+                { $$ = new StatementNode( build_throw( $2 ) ); }
         ;
 
 exception_statement:
         TRY compound_statement handler_list
-                { $$ = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*$2,*$3 )))); }
+                { $$ = new StatementNode( build_try( $2, $3, 0 ) ); }
         | TRY compound_statement finally_clause
-                { $$ = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*$2,*$3 )))); }
+                { $$ = new StatementNode( build_try( $2, 0, $3 ) ); }
         | TRY compound_statement handler_list finally_clause
-                {
-                        $3->set_link( $4 );
-                        $$ = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*$2,*$3 ))));
-                }
+                { $$ = new StatementNode( build_try( $2, $3, $4 ) ); }
         ;
 
 handler_list:
-                // There must be at least one catch clause
         handler_clause
                 // ISO/IEC 9899:1999 Section 15.3(6 ) If present, a "..." handler shall be the last handler for its try block.
         | CATCH '(' ELLIPSIS ')' compound_statement
-                { $$ = StatementNode::newCatchStmt( 0, $5, true ); }
+                { $$ = new StatementNode( build_catch( 0, $5, true ) ); }
         | handler_clause CATCH '(' ELLIPSIS ')' compound_statement
-                { $$ = $1->set_link( StatementNode::newCatchStmt( 0, $6, true ) ); }
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( 0, $6, true ) ) ); }
         | CATCHRESUME '(' ELLIPSIS ')' compound_statement
-                { $$ = StatementNode::newCatchStmt( 0, $5, true ); }
+                { $$ = new StatementNode( build_catch( 0, $5, true ) ); }
         | handler_clause CATCHRESUME '(' ELLIPSIS ')' compound_statement
-                { $$ = $1->set_link( StatementNode::newCatchStmt( 0, $6, true ) ); }
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( 0, $6, true ) ) ); }
         ;
 
 handler_clause:
         CATCH '(' push push exception_declaration pop ')' compound_statement pop
-                { $$ = StatementNode::newCatchStmt( $5, $8 ); }
+                { $$ = new StatementNode( build_catch( $5, $8 ) ); }
         | handler_clause CATCH '(' push push exception_declaration pop ')' compound_statement pop
-                { $$ = $1->set_link( StatementNode::newCatchStmt( $6, $9 ) ); }
+        { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $6, $9 ) ) ); }
         | CATCHRESUME '(' push push exception_declaration pop ')' compound_statement pop
-                { $$ = StatementNode::newCatchStmt( $5, $8 ); }
+                { $$ = new StatementNode( build_catch( $5, $8 ) ); }
         | handler_clause CATCHRESUME '(' push push exception_declaration pop ')' compound_statement pop
-                { $$ = $1->set_link( StatementNode::newCatchStmt( $6, $9 ) ); }
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $6, $9 ) ) ); }
         ;
 
@@ -918 +903 @@
         FINALLY compound_statement
                 {
-                        $$ = new StatementNode( StatementNode::Finally, 0, $2 );
-                        std::cout << "Just created a finally node" << std::endl;
+                        $$ = new StatementNode( build_finally( $2 ) );
                 }
         ;
@@ -947 +931 @@
 asm_statement:
         ASM asm_volatile_opt '(' string_literal_list ')' ';'
-                { $$ = new AsmStmtNode( StatementNode::Asm, $2, $4, 0 ); }
+                { $$ = new StatementNode( build_asmstmt( $2, $4, 0 ) ); }
         | ASM asm_volatile_opt '(' string_literal_list ':' asm_operands_opt ')' ';' // remaining GCC
-                { $$ = new AsmStmtNode( StatementNode::Asm, $2, $4, $6 ); }
+                { $$ = new StatementNode( build_asmstmt( $2, $4, $6 ) ); }
         | ASM asm_volatile_opt '(' string_literal_list ':' asm_operands_opt ':' asm_operands_opt ')' ';'
-                { $$ = new AsmStmtNode( StatementNode::Asm, $2, $4, $6, $8 ); }
+                { $$ = new StatementNode( build_asmstmt( $2, $4, $6, $8 ) ); }
         | ASM asm_volatile_opt '(' string_literal_list ':' asm_operands_opt ':' asm_operands_opt ':' asm_clobbers_list_opt ')' ';'
-                { $$ = new AsmStmtNode( StatementNode::Asm, $2, $4, $6, $8, $10 ); }
+                { $$ = new StatementNode( build_asmstmt( $2, $4, $6, $8, $10 ) ); }
         | ASM asm_volatile_opt GOTO '(' string_literal_list ':' ':' asm_operands_opt ':' asm_clobbers_list_opt ':' label_list ')' ';'
-        { $$ = new AsmStmtNode( StatementNode::Asm, $2, $5, 0, $8, $10, $12 ); }
+                { $$ = new StatementNode( build_asmstmt( $2, $5, 0, $8, $10, $12 ) ); }
         ;
 
@@ -974 +958 @@
         asm_operand
         | asm_operands_list ',' asm_operand
-                { $$ = (ExpressionNode *)$1->set_link( $3 ); }
+                { $$ = (ExpressionNode *)$1->set_last( $3 ); }
         ;
 
 asm_operand:                                                                                    // GCC
         string_literal_list '(' constant_expression ')'
-                { $$ = new AsmExprNode( 0, $1, $3 ); }
+                { $$ = new ExpressionNode( build_asmexpr( 0, $1, $3 ) ); }
         | '[' constant_expression ']' string_literal_list '(' constant_expression ')'
-                { $$ = new AsmExprNode( $2, $4, $6 ); }
+        { $$ = new ExpressionNode( build_asmexpr( $2, $4, $6 ) ); }
         ;
 
@@ -988 +972 @@
                 { $$ = 0; }                                                                             // use default argument
         | string_literal_list
-                { $$ = $1; }
+                { $$ = new ExpressionNode( $1 ); }
         | asm_clobbers_list_opt ',' string_literal_list
-                { $$ = (ConstantNode *)$1->set_link( $3 ); }
+                { $$ = (ExpressionNode *)$1->set_last( new ExpressionNode( $3 ) ); }
         ;
 
 label_list:
         no_attr_identifier
-                { $$ = new LabelNode(); $$->append_label( $1 ); }
+                { $$ = new LabelNode(); $$->labels.push_back( assign_strptr($1) ); }
         | label_list ',' no_attr_identifier
-                { $$ = $1; $1->append_label( $3 ); }
+                { $$ = $1; $1->labels.push_back( assign_strptr($3) ); }
         ;
 
@@ -1340 +1324 @@
 
 storage_class:
-        storage_class_name
-        ;
-
-storage_class_name:
         EXTERN
                 { $$ = DeclarationNode::newStorageClass( DeclarationNode::Extern ); }
@@ -1513 +1493 @@
         | EXTENSION field_declaring_list ';'                            // GCC
                 {       // mark all fields in list
-                        for ( DeclarationNode *iter = $2; iter != NULL; iter = (DeclarationNode *)iter->get_link() )
+                        for ( DeclarationNode *iter = $2; iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
                                 iter->set_extension( true );
                         $$ = $2;
@@ -1759 +1739 @@
         | initializer
         | designation initializer                                       { $$ = $2->set_designators( $1 ); }
-        | initializer_list ',' initializer                      { $$ = (InitializerNode *)( $1->set_link( $3 ) ); }
+        | initializer_list ',' initializer                      { $$ = (InitializerNode *)( $1->set_last( $3 ) ); }
         | initializer_list ',' designation initializer
-                { $$ = (InitializerNode *)( $1->set_link( $4->set_designators( $3 ) ) ); }
+                { $$ = (InitializerNode *)( $1->set_last( $4->set_designators( $3 ) ) ); }
         ;
 
@@ -1777 +1757 @@
         designator_list ':'                                                                     // C99, CFA uses ":" instead of "="
         | no_attr_identifier_or_type_name ':'                           // GCC, field name
-                { $$ = new VarRefNode( $1 ); }
+                { $$ = new ExpressionNode( build_varref( $1 ) ); }
         ;
 
@@ -1783 +1763 @@
         designator
         | designator_list designator
-                { $$ = (ExpressionNode *)( $1->set_link( $2 )); }
-        //| designator_list designator                                          { $$ = new CompositeExprNode( $1, $2 ); }
+                { $$ = (ExpressionNode *)( $1->set_last( $2 ) ); }
+        //| designator_list designator                                          { $$ = new ExpressionNode( $1, $2 ); }
         ;
 
 designator:
-                // lexer ambiguity: designator ".0" is floating-point constant or designator for name 0 only ".0" and ".1"
-                // allowed => semantic check
-        FLOATINGconstant
-                { $$ = new DesignatorNode( new VarRefNode( $1 ) ); }
-        | '.' no_attr_identifier_or_type_name                           // C99, field name
-                { $$ = new DesignatorNode( new VarRefNode( $2 ) ); }
+        '.' no_attr_identifier_or_type_name                                     // C99, field name
+                { $$ = new ExpressionNode( build_varref( $2 ) ); }
         | '[' push assignment_expression pop ']'                        // C99, single array element
                 // assignment_expression used instead of constant_expression because of shift/reduce conflicts with tuple.
-                { $$ = new DesignatorNode( $3, true ); }
+                { $$ = $3; }
         | '[' push subrange pop ']'                                                     // CFA, multiple array elements
-                { $$ = new DesignatorNode( $3, true ); }
+                { $$ = $3; }
         | '[' push constant_expression ELLIPSIS constant_expression pop ']' // GCC, multiple array elements
-                { $$ = new DesignatorNode( new CompositeExprNode( build_range( $3, $5 ) ), true ); }
+                { $$ = new ExpressionNode( build_range( $3, $5 ) ); }
         | '.' '[' push field_list pop ']'                                       // CFA, tuple field selector
-                { $$ = new DesignatorNode( $4 ); }
+                { $$ = $4; }
         ;
 
@@ -1890 +1866 @@
 type_name_list:                                                                                 // CFA
         type_name
-                { $$ = new TypeValueNode( $1 ); }
+                { $$ = new ExpressionNode( build_typevalue( $1 ) ); }
         | assignment_expression
         | type_name_list ',' type_name
-                { $$ = (ExpressionNode *)( $1->set_link( new TypeValueNode( $3 ))); }
+                { $$ = (ExpressionNode *)( $1->set_last( new ExpressionNode( build_typevalue( $3 ) ) ) ); }
         | type_name_list ',' assignment_expression
-                { $$ = (ExpressionNode *)( $1->set_link( $3 )); }
+                { $$ = (ExpressionNode *)( $1->set_last( $3 )); }
         ;
 
@@ -1994 +1970 @@
                 {}                                                                                              // empty input file
         | external_definition_list
-                {
-                        if ( theTree ) {
-                                theTree->appendList( $1 );
-                        } else {
-                                theTree = $1;
-                        }
-                }
+                { parseTree = parseTree != nullptr ? parseTree->appendList( $1 ) : $1;  }
         ;
 
@@ -2006 +1976 @@
         external_definition
         | external_definition_list push external_definition
-                { $$ = ( $1 != NULL ) ? $1->appendList( $3 ) : $3; }
+                { $$ = $1 != nullptr ? $1->appendList( $3 ) : $3; }
         ;
 
@@ -2022 +1992 @@
         | EXTERN STRINGliteral
                 {
-                        linkageStack.push( linkage );
-                        linkage = LinkageSpec::fromString( *$2 );
+                        linkageStack.push( linkage );                           // handle nested extern "C"/"Cforall"
+                        linkage = LinkageSpec::fromString( assign_strptr($2) );
                 }
           '{' external_definition_list_opt '}'                          // C++-style linkage specifier
@@ -2033 +2003 @@
         | EXTENSION external_definition
                 {       // mark all fields in list
-                        for ( DeclarationNode *iter = $2; iter != NULL; iter = (DeclarationNode *)iter->get_link() )
+                        for ( DeclarationNode *iter = $2; iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
                                 iter->set_extension( true );
                         $$ = $2;
@@ -2129 +2099 @@
 subrange:
         constant_expression '~' constant_expression                     // CFA, integer subrange
-                { $$ = new CompositeExprNode( build_range( $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_range( $1, $3 ) ); }
         ;
 
@@ -2168 +2138 @@
 any_word:                                                                                               // GCC
         identifier_or_type_name {}
-        | storage_class_name {}
+        | storage_class {}
         | basic_type_name {}
         | type_qualifier {}
@@ -2868 +2838 @@
 // ----end of grammar----
 
+extern char *yytext;
+
 void yyerror( const char * ) {
         std::cout << "Error ";

src/Parser/parseutility.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:30:39 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 16 15:31:33 2015
-// Update Count     : 2
+// Last Modified On : Sun Aug 14 23:45:03 2016
+// Update Count     : 3
 // 
 
@@ -17 +17 @@
 #include "SynTree/Type.h"
 #include "SynTree/Expression.h"
+
+// rewrite
+//    if ( x ) ...
+// as
+//    if ( (int)(x != 0) ) ...
 
 Expression *notZeroExpr( Expression *orig ) {

src/SymTab/Autogen.cc

@@ -174 +174 @@
 
         void makeStructMemberOp( ObjectDecl * dstParam, Expression * src, DeclarationWithType * field, FunctionDecl * func, TypeSubstitution & genericSubs, bool isDynamicLayout, bool forward = true ) {
-                if ( isDynamicLayout && src ) {
-                        genericSubs.apply( src );
-                }
+//              if ( isDynamicLayout && src ) {
+//                      genericSubs.apply( src );
+//              }
 
                 ObjectDecl * returnVal = NULL;

src/SynTree/Declaration.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Dec 09 14:08:29 2015
-// Update Count     : 12
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 18 23:49:57 2016
+// Update Count     : 13
 //
 
@@ -27 +27 @@
 static IdMapType idMap;
 
-Declaration::Declaration( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage )
+Declaration::Declaration( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage )
                 : name( name ), storageClass( sc ), linkage( linkage ), isInline( false ), isNoreturn( false ), uniqueId( 0 ) {
 }

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 21:03:17 2016
-// Update Count     : 39
+// Last Modified On : Thu Aug 18 23:50:24 2016
+// Update Count     : 40
 //
 
@@ -26 +26 @@
 class Declaration {
   public:
-        Declaration( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage );
+        Declaration( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage );
         Declaration( const Declaration &other );
         virtual ~Declaration();
@@ -34 +34 @@
         DeclarationNode::StorageClass get_storageClass() const { return storageClass; }
         void set_storageClass( DeclarationNode::StorageClass newValue ) { storageClass = newValue; }
-        LinkageSpec::Type get_linkage() const { return linkage; }
-        void set_linkage( LinkageSpec::Type newValue ) { linkage = newValue; }
+        LinkageSpec::Spec get_linkage() const { return linkage; }
+        void set_linkage( LinkageSpec::Spec newValue ) { linkage = newValue; }
         bool get_isInline() const { return isInline; }
         void set_isInline( bool newValue ) { isInline = newValue; }
@@ -56 +56 @@
         std::string name;
         DeclarationNode::StorageClass storageClass;
-        LinkageSpec::Type linkage;
+        LinkageSpec::Spec linkage;
         bool isInline, isNoreturn;
         UniqueId uniqueId;
@@ -64 +64 @@
 class DeclarationWithType : public Declaration {
   public:
-        DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, const std::list< Attribute * > & attributes );
+        DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes );
         DeclarationWithType( const DeclarationWithType &other );
         virtual ~DeclarationWithType();
@@ -97 +97 @@
         typedef DeclarationWithType Parent;
   public:
-        ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes = std::list< Attribute * >(), bool isInline = false, bool isNoreturn = false );
+        ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes = std::list< Attribute * >(), bool isInline = false, bool isNoreturn = false );
         ObjectDecl( const ObjectDecl &other );
         virtual ~ObjectDecl();
@@ -123 +123 @@
         typedef DeclarationWithType Parent;
   public:
-        FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, const std::list< Attribute * > attributes = std::list< Attribute * >() );
+        FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, const std::list< Attribute * > attributes = std::list< Attribute * >() );
         FunctionDecl( const FunctionDecl &other );
         virtual ~FunctionDecl();

src/SynTree/DeclarationWithType.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Mon Apr 11 15:35:27 2016
-// Update Count     : 3
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 18 23:50:41 2016
+// Update Count     : 4
 //
 
@@ -19 +19 @@
 #include "Common/utility.h"
 
-DeclarationWithType::DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, const std::list< Attribute * > & attributes )
+DeclarationWithType::DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes )
                 : Declaration( name, sc, linkage ), attributes( attributes ) {
 }

src/SynTree/Expression.cc

@@ -383 +383 @@
                 Expression( _aname ), function(_function), args(_args) {}
 
-UntypedExpr::~UntypedExpr() {}
+UntypedExpr::~UntypedExpr() {
+        delete function;
+}
 
 void UntypedExpr::print( std::ostream &os, int indent ) const {

src/SynTree/FunctionDecl.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 06 15:59:48 2016
-// Update Count     : 19
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 18 23:50:14 2016
+// Update Count     : 20
 //
 
@@ -22 +22 @@
 #include "Common/utility.h"
 
-FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, std::list< Attribute * > attributes )
+FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, std::list< Attribute * > attributes )
                 : Parent( name, sc, linkage, attributes ), type( type ), statements( statements ) {
         set_isInline( isInline );

src/SynTree/Label.h

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Wed Jun 8 12:53:12 2016
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jun 8 12:53:28 2016
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Aug  7 14:44:29 2016
+// Update Count     : 2
 //
 

src/SynTree/ObjectDecl.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 13 13:23:32 2016
-// Update Count     : 30
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 18 23:50:33 2016
+// Update Count     : 31
 //
 
@@ -22 +22 @@
 #include "Statement.h"
 
-ObjectDecl::ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes, bool isInline, bool isNoreturn )
+ObjectDecl::ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes, bool isInline, bool isNoreturn )
         : Parent( name, sc, linkage, attributes ), type( type ), init( init ), bitfieldWidth( bitfieldWidth ) {
         set_isInline( isInline );

src/SynTree/Statement.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:25:20 2016
-// Update Count     : 61
+// Last Modified On : Fri Aug 12 13:58:48 2016
+// Update Count     : 62
 //
 
@@ -124 +124 @@
         Statement( other ), condition( maybeClone( other.condition ) ), thenPart( maybeClone( other.thenPart ) ), elsePart( maybeClone( other.elsePart ) ) {}
 
-IfStmt::~IfStmt() {}
+IfStmt::~IfStmt() {
+        delete condition;
+        delete thenPart;
+        delete elsePart;
+}
 
 void IfStmt::print( std::ostream &os, int indent ) const {
@@ -309 +313 @@
 }
 
-CatchStmt::CatchStmt( std::list<Label> labels, Declaration *_decl, Statement *_body, bool isCatchRest ) :
-        Statement( labels ), decl ( _decl ), body( _body ), catchRest ( isCatchRest ) {
+CatchStmt::CatchStmt( std::list<Label> labels, Declaration *_decl, Statement *_body, bool catchAny ) :
+        Statement( labels ), decl ( _decl ), body( _body ), catchRest ( catchAny ) {
 }
 

src/SynTree/Statement.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:26:02 2016
-// Update Count     : 64
+// Last Modified On : Fri Aug 12 13:57:46 2016
+// Update Count     : 65
 //
 
@@ -314 +314 @@
 class CatchStmt : public Statement {
   public:
-        CatchStmt( std::list<Label> labels, Declaration *decl, Statement *body, bool isCatchRest = false );
+        CatchStmt( std::list<Label> labels, Declaration *decl, Statement *body, bool catchAny = false );
         CatchStmt( const CatchStmt &other );
         virtual ~CatchStmt();

src/examples/gc_no_raii/premake4.lua

@@ -6 +6 @@
         "src/",
         "../",
+        "containers/"
 }
 
@@ -48 +49 @@
                 linkoptions (linkOptionList)
                 includedirs (includeDirList)
-                files { "src/**.c" }
+                files { "src/**.c", "containers/**.c" }
 
         configuration "debug"

src/examples/gc_no_raii/src/gc.h

@@ -4 +4 @@
 #include "internal/collector.h"
 
+// forall(otype T)
+// static inline gcpointer(T) gcmalloc()
+// {
+//     gcpointer(T) ptr = { gc_allocate(sizeof(T)) };
+//     ptr{};
+//     gc_conditional_collect();
+//     return ptr;
+// }
+
 forall(otype T)
-static inline gcpointer(T) gcmalloc()
+static inline void gcmalloc(gcpointer(T)* ptr)
 {
-    gcpointer(T) ptr;
-    void* address = gc_allocate(sizeof(T));
-    (&ptr){ address };
-    ctor(&ptr, address);
-    gc_conditional_collect();
-    return ptr;
+        ptr { gc_allocate(sizeof(T)) };
+        get(ptr) {};
+      gc_conditional_collect();
 }

src/examples/gc_no_raii/src/gcpointers.c

@@ -42 +42 @@
 }
 
-void gcpointer_ctor(gcpointer_t* this)
+void ?{}(gcpointer_t* this)
 {
         this->ptr = (intptr_t)NULL;
@@ -48 +48 @@
 }
 
-void gcpointer_ctor(gcpointer_t* this, void* address)
+void ?{}(gcpointer_t* this, void* address)
 {
         this->ptr = (intptr_t)address;
@@ -56 +56 @@
 }
 
-void gcpointer_ctor(gcpointer_t* this, gcpointer_t* other)
+void ?{}(gcpointer_t* this, gcpointer_t other)
 {
-        this->ptr = other->ptr;
+        this->ptr = other.ptr;
         this->next = NULL;
 
@@ -64 +64 @@
 }
 
-void gcpointer_dtor(gcpointer_t* this)
+void ^?{}(gcpointer_t* this)
 {
         unregister_ptr(this);
@@ -98 +98 @@
         return this->ptr == (intptr_t)NULL;
 }
+
+forall(otype T) void ?{}(gcpointer(T)* this) {
+        (&this->internal) {};
+}
+
+forall(otype T) void ?{}(gcpointer(T)* this, void* address) {
+        (&this->internal) { address };
+}
+
+forall(otype T) void ?{}(gcpointer(T)* this, gcpointer(T)* other) {
+        (&this->internal) { other->internal };
+}
+
+forall(otype T) void ^?{}(gcpointer(T)* this) {
+        ^?{}(&this->internal);
+}
+
+// forall(otype T) gcpointer(T) ?=?(gcpointer(T) this, gcpointer(T) rhs);
+//
+// forall(otype T) T *?(gcpointer(T) this);
+
+forall(otype T) T* get(gcpointer(T)* this) {
+        return (T*)this->internal.ptr;
+}
+//
+// //Logical operators
+// forall(otype T) int ?!=?(gcpointer(T) this, gcpointer(T) rhs);
+// forall(otype T) int ?==?(gcpointer(T) this, gcpointer(T) rhs);

src/examples/gc_no_raii/src/gcpointers.h

@@ -30 +30 @@
 forall(otype T) void ?{}(gcpointer(T)* this);
 forall(otype T) void ?{}(gcpointer(T)* this, void* address);
-forall(otype T) void ctor(gcpointer(T)* this, void* address);
 forall(otype T) void ?{}(gcpointer(T)* this, gcpointer(T)* other);
 forall(otype T) void ^?{}(gcpointer(T)* this);
@@ -37 +36 @@
 
 forall(otype T) T *?(gcpointer(T) this);
+forall(otype T) T* get(gcpointer(T)* this);
 
 //Logical operators

src/examples/gc_no_raii/src/internal/collector.c

@@ -8 +8 @@
 }
 #endif
+
+#include <fstream>
 
 #include "state.h"
@@ -36 +38 @@
 void* gc_allocate(size_t target_size)
 {
+        sout | "Allocating " | target_size | " bytes" | endl;
+
         size_t size = gc_compute_size(target_size + sizeof(gc_object_header));
+
+        sout | "Object header size: " | sizeof(gc_object_header) | " bytes" | endl;
+        sout | "Actual allocation size: " | size | " bytes" | endl;
 
         check(size < POOL_SIZE_BYTES);

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

@@ -9 +9 @@
 }
 #endif
+#include <fstream>
 #include <vector>
 
@@ -37 +38 @@
 static inline bool gc_needs_collect(gc_state* state)
 {
+        sout | "Used Space: " | state->used_space | " bytes" | endl;
         return state->used_space * 2 > state->total_space;
 }

src/examples/gc_no_raii/test/gctest.c

@@ -2 +2 @@
 
 #include "gc.h"
+#include "internal/collector.h"
 
 #warning default test
@@ -8 +9 @@
         sout | "Bonjour au monde!\n";
 
-        gcpointer(int) anInt = gcmalloc();
+        gcpointer(int) theInt;
+        gcmalloc(&theInt);
+
+        for(int i = 0; i < 10; i++) {
+                int a;
+                {
+                        gcpointer(int) anInt;
+                        gcmalloc(&anInt);
+                }
+                int p;
+        }
+
+        gc_collect(gc_get_state());
+        gc_conditional_collect();
 }

src/libcfa/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Sat Aug  6 16:15:15 2016
-## Update Count     : 197
+## Last Modified On : Thu Aug 11 15:36:32 2016
+## Update Count     : 198
 ###############################################################################
 
@@ -56 +56 @@
 CC = ${abs_top_srcdir}/src/driver/cfa
 
-headers = limits stdlib math iostream fstream iterator rational containers/vector
+headers = limits stdlib math iostream fstream iterator rational # containers/vector
 libobjs = ${headers:=.o}
 

src/libcfa/Makefile.in

@@ -89 +89 @@
 libcfa_a_AR = $(AR) $(ARFLAGS)
 libcfa_a_LIBADD =
-am__dirstamp = $(am__leading_dot)dirstamp
 am__objects_1 = limits.$(OBJEXT) stdlib.$(OBJEXT) math.$(OBJEXT) \
         iostream.$(OBJEXT) fstream.$(OBJEXT) iterator.$(OBJEXT) \
-        rational.$(OBJEXT) containers/vector.$(OBJEXT)
+        rational.$(OBJEXT)
 am_libcfa_a_OBJECTS = libcfa-prelude.$(OBJEXT) $(am__objects_1)
 libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
@@ -234 +233 @@
 cfalib_DATA = builtins.cf extras.cf prelude.cf
 MAINTAINERCLEANFILES = builtins.cf extras.cf ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
-headers = limits stdlib math iostream fstream iterator rational containers/vector
+headers = limits stdlib math iostream fstream iterator rational # containers/vector
 libobjs = ${headers:=.o}
 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
@@ -304 +303 @@
 clean-libLIBRARIES:
         -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
-containers/$(am__dirstamp):
-        @$(MKDIR_P) containers
-        @: > containers/$(am__dirstamp)
-containers/$(DEPDIR)/$(am__dirstamp):
-        @$(MKDIR_P) containers/$(DEPDIR)
-        @: > containers/$(DEPDIR)/$(am__dirstamp)
-containers/vector.$(OBJEXT): containers/$(am__dirstamp) \
-        containers/$(DEPDIR)/$(am__dirstamp)
 libcfa.a: $(libcfa_a_OBJECTS) $(libcfa_a_DEPENDENCIES) $(EXTRA_libcfa_a_DEPENDENCIES) 
         $(AM_V_at)-rm -f libcfa.a
@@ -319 +310 @@
 mostlyclean-compile:
         -rm -f *.$(OBJEXT)
-        -rm -f containers/vector.$(OBJEXT)
 
 distclean-compile:
@@ -332 +322 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rational.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdlib.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@containers/$(DEPDIR)/vector.Po@am__quote@
 
 .c.o:
@@ -505 +494 @@
         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
         -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-        -rm -f containers/$(DEPDIR)/$(am__dirstamp)
-        -rm -f containers/$(am__dirstamp)
 
 maintainer-clean-generic:
@@ -517 +504 @@
 
 distclean: distclean-am
-        -rm -rf ./$(DEPDIR) containers/$(DEPDIR)
+        -rm -rf ./$(DEPDIR)
         -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
@@ -563 +550 @@
 
 maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR) containers/$(DEPDIR)
+        -rm -rf ./$(DEPDIR)
         -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic \

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug  6 16:17:41 2016
-// Update Count     : 210
+// Last Modified On : Fri Aug 19 08:31:22 2016
+// Update Count     : 350
 //
 
 #include <iostream>
 #include <fstream>
-#include <cstdlib>
-#include <cstdio>
 #include <getopt.h>
-#include "Parser/Parser.h"
-#include "Parser/ParseNode.h"
-#include "Parser/LinkageSpec.h"
-#include "SynTree/Declaration.h"
-#include "SynTree/Visitor.h"
+#include "Parser/lex.h"
+#include "Parser/parser.h"
+#include "Parser/TypedefTable.h"
 #include "GenPoly/Lvalue.h"
 #include "GenPoly/Specialize.h"
@@ -32 +28 @@
 #include "CodeGen/FixNames.h"
 #include "ControlStruct/Mutate.h"
-#include "Tuples/Mutate.h"
-#include "Tuples/FunctionChecker.h"
-#include "SymTab/Mangler.h"
-#include "SymTab/Indexer.h"
 #include "SymTab/Validate.h"
 #include "ResolvExpr/AlternativePrinter.h"
 #include "ResolvExpr/Resolver.h"
 #include "MakeLibCfa.h"
-#include "InitTweak/Mutate.h"
 #include "InitTweak/GenInit.h"
 #include "InitTweak/FixInit.h"
-//#include "Explain/GenProlog.h"
-//#include "Try/Visit.h"
-
-#include "Common/SemanticError.h"
 #include "Common/UnimplementedError.h"
 
@@ -53 +40 @@
 using namespace std;
 
-#define OPTPRINT(x) \
-        if ( errorp ) std::cerr << x << std::endl;
-
-static void parse( FILE * input, LinkageSpec::Type t, bool shouldExit = false );
-static void dump( std::list< Declaration * > & translationUnit, std::ostream & out = std::cout );
-
+#define OPTPRINT(x) if ( errorp ) std::cerr << x << std::endl;
+
+
+LinkageSpec::Spec linkage = LinkageSpec::Cforall;
+TypedefTable typedefTable;
+DeclarationNode * parseTree = nullptr;                                  // program parse tree
+
+extern int yydebug;                                                                             // set for -g flag (Grammar)
 bool
         astp = false,
@@ -66 +55 @@
         exprp = false,
         expraltp = false,
-        grammarp = false,
         libcfap = false,
         nopreludep = false,
@@ -78 +66 @@
         codegenp = false;
 
-enum { Ast, Bbox, Bresolver, CtorInitFix, Expr, ExprAlt, Grammar, LibCFA, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, Validate, };
-
-static struct option long_opts[] = {
-        { "ast", no_argument, 0, Ast },
-        { "before-box", no_argument, 0, Bbox },
-        { "before-resolver", no_argument, 0, Bresolver },
-        { "ctorinitfix", no_argument, 0, CtorInitFix },
-        { "expr", no_argument, 0, Expr },
-        { "expralt", no_argument, 0, ExprAlt },
-        { "grammar", no_argument, 0, Grammar },
-        { "libcfa", no_argument, 0, LibCFA },
-        { "no-preamble", no_argument, 0, Nopreamble },
-        { "parse", no_argument, 0, Parse },
-        { "no-prototypes", no_argument, 0, Prototypes },
-        { "resolver", no_argument, 0, Resolver },
-        { "symbol", no_argument, 0, Symbol },
-        { "tree", no_argument, 0, Tree },
-        { "validate", no_argument, 0, Validate },
-        { 0, 0, 0, 0 }
-};
-
-int main( int argc, char *argv[] ) {
-        FILE *input;
-        std::ostream *output = &std::cout;
-        int long_index;
+static void parse_cmdline( int argc, char *argv[], const char *& filename );
+static void parse( FILE * input, LinkageSpec::Spec linkage, bool shouldExit = false );
+static void dump( std::list< Declaration * > & translationUnit, std::ostream & out = std::cout );
+
+int main( int argc, char * argv[] ) {
+        FILE * input;                                                                           // use FILE rather than istream because yyin is FILE
+        std::ostream *output = & std::cout;
         std::list< Declaration * > translationUnit;
-        const char *filename = NULL;
-
-        opterr = 0;                                                                                     // prevent getopt from printing error messages
-
-        int c;
-        while ( (c = getopt_long( argc, argv, "abBcefglnpqrstvyzD:F:", long_opts, &long_index )) != -1 ) {
-                switch ( c ) {
-                  case Ast:
-                  case 'a':                                                                             // dump AST
-                        astp = true;
-                        break;
-                  case Bresolver:
-                  case 'b':                                                                             // print before resolver steps
-                        bresolvep = true;
-                        break;
-                  case 'B':                                                                             // print before resolver steps
-                        bboxp = true;
-                        break;
-                  case CtorInitFix:
-                  case 'c':
-                        ctorinitp = true;
-                        break;
-                  case Expr:
-                  case 'e':                                                                             // dump AST after expression analysis
-                        exprp = true;
-                        break;
-                  case ExprAlt:
-                  case 'f':                                                                             // print alternatives for expressions
-                        expraltp = true;
-                        break;
-                  case Grammar:
-                  case 'g':                                                                             // bison debugging info (grammar rules)
-                        grammarp = true;
-                        break;
-                  case LibCFA:
-                  case 'l':                                                                             // generate libcfa.c
-                        libcfap = true;
-                        break;
-                  case Nopreamble:
-                  case 'n':                                                                             // do not read preamble
-                        nopreludep = true;
-                        break;
-                  case Prototypes:
-                  case 'p':                                                                             // generate prototypes for preamble functions
-                        noprotop = true;
-                        break;
-                  case Parse:
-                  case 'q':                                                                             // dump parse tree
-                        parsep = true;
-                        break;
-                  case Resolver:
-                  case 'r':                                                                             // print resolver steps
-                        resolvep = true;
-                        break;
-                  case Symbol:
-                  case 's':                                                                             // print symbol table events
-                        symtabp = true;
-                        break;
-                  case Tree:
-                  case 't':                                                                             // build in tree
-                        treep = true;
-                        break;
-                  case 'v':                                                                             // dump AST after decl validation pass
-                        validp = true;
-                        break;
-                  case 'y':
-                        errorp = true;
-                        break;
-                  case 'z':
-                        codegenp = true;
-                        break;
-                  case 'D':                                                                             // ignore -Dxxx
-                        break;
-                  case 'F':                                                                             // source file-name without suffix
-                        filename = optarg;
-                        break;
-                  case '?':
-                        cout << "Unknown option: '" << (char)optopt << "'" << endl;
-                        exit( EXIT_FAILURE );
-                  default:
-                        abort();
-                } // switch
-        } // while
+        const char *filename = nullptr;
+
+        parse_cmdline( argc, argv, filename );                          // process command-line arguments
 
         try {
                 // choose to read the program from a file or stdin
-                if ( optind < argc ) {
+                if ( optind < argc ) {                                                  // any commands after the flags ? => input file name
                         input = fopen( argv[ optind ], "r" );
-                        if ( ! input ) {
-                                std::cout << "Error: cannot open " << argv[ optind ] << std::endl;
-                                exit( EXIT_FAILURE );
-                        } // if
+                        assertf( input, "cannot open %s\n", argv[ optind ] );
                         // if running cfa-cpp directly, might forget to pass -F option (and really shouldn't have to)
-                        if ( filename == NULL ) filename = argv[ optind ];
+                        if ( filename == nullptr ) filename = argv[ optind ];
                         // prelude filename comes in differently
                         if ( libcfap ) filename = "prelude.cf";
                         optind += 1;
-                } else {
+                } else {                                                                                // no input file name
                         input = stdin;
                         // if running cfa-cpp directly, might forget to pass -F option. Since this takes from stdin, pass
                         // a fake name along
-                        if ( filename == NULL ) filename = "stdin";
-                } // if
-
-                if ( optind < argc ) {
+                        if ( filename == nullptr ) filename = "stdin";
+                } // if
+
+                if ( optind < argc ) {                                                  // any commands after the flags and input file ? => output file name
                         output = new ofstream( argv[ optind ] );
                 } // if
-
-                Parser::get_parser().set_debug( grammarp );
 
                 // read in the builtins, extras, and the prelude
@@ -218 +103 @@
                         // -l is for initial build ONLY and builtins.cf is not in the lib directory so access it here.
                         FILE * builtins = fopen( libcfap | treep ? "builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
-                        if ( builtins == NULL ) {
-                                std::cerr << "Error: cannot open builtins.cf" << std::endl;
-                                exit( EXIT_FAILURE );
-                        } // if
+                        assertf( builtins, "cannot open builtins.cf\n" );
                         parse( builtins, LinkageSpec::Compiler );
 
                         // read the extra prelude in, if not generating the cfa library
                         FILE * extras = fopen( libcfap | treep ? "extras.cf" : CFA_LIBDIR "/extras.cf", "r" );
-                        if ( extras == NULL ) {
-                                std::cerr << "Error: cannot open extras.cf" << std::endl;
-                                exit( EXIT_FAILURE );
-                        } // if
+                        assertf( extras, "cannot open extras.cf\n" );
                         parse( extras, LinkageSpec::C );
 
@@ -235 +114 @@
                                 // read the prelude in, if not generating the cfa library
                                 FILE * prelude = fopen( treep ? "prelude.cf" : CFA_LIBDIR "/prelude.cf", "r" );
-                                if ( prelude == NULL ) {
-                                        std::cerr << "Error: cannot open prelude.cf" << std::endl;
-                                        exit( EXIT_FAILURE );
-                                } // if
-
+                                assertf( prelude, "cannot open prelude.cf\n" );
                                 parse( prelude, LinkageSpec::Intrinsic );
                         } // if
                 } // if
 
-                parse( input, libcfap ? LinkageSpec::Intrinsic : LinkageSpec::Cforall, grammarp );
+                parse( input, libcfap ? LinkageSpec::Intrinsic : LinkageSpec::Cforall, yydebug );
 
                 if ( parsep ) {
-                        Parser::get_parser().get_parseTree()->printList( std::cout );
-                        Parser::get_parser().freeTree();
-                        return 0;
-                } // if
-
-                buildList( Parser::get_parser().get_parseTree(), translationUnit );
-
-                Parser::get_parser().freeTree();
+                        parseTree->printList( std::cout );
+                        delete parseTree;
+                        return 0;
+                } // if
+
+                buildList( parseTree, translationUnit );
+                delete parseTree;
+                parseTree = nullptr;
+
                 if ( astp ) {
                         dump( translationUnit );
@@ -300 +176 @@
                         dump( translationUnit );
                         return 0;
-                }
+                } // if
 
                 // fix ObjectDecl - replaces ConstructorInit nodes
@@ -308 +184 @@
                         dump ( translationUnit );
                         return 0;
-                }
+                } // if
 
                 OPTPRINT("instantiateGenerics")
@@ -322 +198 @@
                         dump( translationUnit );
                         return 0;
-                }
+                } // if
                 OPTPRINT( "box" )
                 GenPoly::box( translationUnit );
@@ -342 +218 @@
                         dump( translationUnit, std::cerr );
                         std::cerr << std::endl << "---End of AST, begin error message:---\n" << std::endl;
-                }
+                } // if
                 e.print( std::cerr );
                 if ( output != &std::cout ) {
@@ -367 +243 @@
 } // main
 
-static void parse( FILE * input, LinkageSpec::Type linkage, bool shouldExit ) {
-        Parser::get_parser().set_linkage( linkage );
-        Parser::get_parser().parse( input );
+void parse_cmdline( int argc, char * argv[], const char *& filename ) {
+        enum { Ast, Bbox, Bresolver, CtorInitFix, Expr, ExprAlt, Grammar, LibCFA, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, Validate, };
+
+        static struct option long_opts[] = {
+                { "ast", no_argument, 0, Ast },
+                { "before-box", no_argument, 0, Bbox },
+                { "before-resolver", no_argument, 0, Bresolver },
+                { "ctorinitfix", no_argument, 0, CtorInitFix },
+                { "expr", no_argument, 0, Expr },
+                { "expralt", no_argument, 0, ExprAlt },
+                { "grammar", no_argument, 0, Grammar },
+                { "libcfa", no_argument, 0, LibCFA },
+                { "no-preamble", no_argument, 0, Nopreamble },
+                { "parse", no_argument, 0, Parse },
+                { "no-prototypes", no_argument, 0, Prototypes },
+                { "resolver", no_argument, 0, Resolver },
+                { "symbol", no_argument, 0, Symbol },
+                { "tree", no_argument, 0, Tree },
+                { "validate", no_argument, 0, Validate },
+                { 0, 0, 0, 0 }
+        }; // long_opts
+        int long_index;
+
+        opterr = 0;                                                                                     // (global) prevent getopt from printing error messages
+
+        int c;
+        while ( (c = getopt_long( argc, argv, "abBcefglnpqrstvyzD:F:", long_opts, &long_index )) != -1 ) {
+                switch ( c ) {
+                  case Ast:
+                  case 'a':                                                                             // dump AST
+                        astp = true;
+                        break;
+                  case Bresolver:
+                  case 'b':                                                                             // print before resolver steps
+                        bresolvep = true;
+                        break;
+                  case 'B':                                                                             // print before resolver steps
+                        bboxp = true;
+                        break;
+                  case CtorInitFix:
+                  case 'c':
+                        ctorinitp = true;
+                        break;
+                  case Expr:
+                  case 'e':                                                                             // dump AST after expression analysis
+                        exprp = true;
+                        break;
+                  case ExprAlt:
+                  case 'f':                                                                             // print alternatives for expressions
+                        expraltp = true;
+                        break;
+                  case Grammar:
+                  case 'g':                                                                             // bison debugging info (grammar rules)
+                        yydebug = true;
+                        break;
+                  case LibCFA:
+                  case 'l':                                                                             // generate libcfa.c
+                        libcfap = true;
+                        break;
+                  case Nopreamble:
+                  case 'n':                                                                             // do not read preamble
+                        nopreludep = true;
+                        break;
+                  case Prototypes:
+                  case 'p':                                                                             // generate prototypes for preamble functions
+                        noprotop = true;
+                        break;
+                  case Parse:
+                  case 'q':                                                                             // dump parse tree
+                        parsep = true;
+                        break;
+                  case Resolver:
+                  case 'r':                                                                             // print resolver steps
+                        resolvep = true;
+                        break;
+                  case Symbol:
+                  case 's':                                                                             // print symbol table events
+                        symtabp = true;
+                        break;
+                  case Tree:
+                  case 't':                                                                             // build in tree
+                        treep = true;
+                        break;
+                  case 'v':                                                                             // dump AST after decl validation pass
+                        validp = true;
+                        break;
+                  case 'y':
+                        errorp = true;
+                        break;
+                  case 'z':
+                        codegenp = true;
+                        break;
+                  case 'D':                                                                             // ignore -Dxxx
+                        break;
+                  case 'F':                                                                             // source file-name without suffix
+                        filename = optarg;
+                        break;
+                  case '?':
+                        assertf( false, "Unknown option: '%c'\n", (char)optopt );
+                  default:
+                        abort();
+                } // switch
+        } // while
+} // parse_cmdline
+
+static void parse( FILE * input, LinkageSpec::Spec linkage, bool shouldExit ) {
+        extern int yyparse( void );
+        extern FILE * yyin;
+        extern int yylineno;
+
+        ::linkage = linkage;                                                            // set globals
+        yyin = input;
+        yylineno = 1;
+        typedefTable.enterScope();
+        int parseStatus = yyparse();
 
         fclose( input );
-        if ( shouldExit || Parser::get_parser().get_parseStatus() != 0 ) {
-                exit( Parser::get_parser().get_parseStatus() );
+        if ( shouldExit || parseStatus != 0 ) {
+                exit( parseStatus );
         } // if
-}
+} // parse
 
 static bool notPrelude( Declaration * decl ) {
         return ! LinkageSpec::isBuiltin( decl->get_linkage() );
-}
+} // notPrelude
 
 static void dump( std::list< Declaration * > & translationUnit, std::ostream & out ) {
         std::list< Declaration * > decls;
+
         if ( noprotop ) {
-                filter( translationUnit.begin(), translationUnit.end(),
-                                std::back_inserter( decls ), notPrelude );
+                filter( translationUnit.begin(), translationUnit.end(), std::back_inserter( decls ), notPrelude );
         } else {
                 decls = translationUnit;
-        }
+        } // if
 
         printAll( decls, out );
         deleteAll( translationUnit );
-}
-
+} // dump
 
 // Local Variables: //

src/tests/.expect/32/gccExtensions.txt

@@ -5 +5 @@
 extern void exit(int __status);
 extern int printf(const char *__restrict __format, ...);
+extern int __x__i_1;
 int main(int __argc__i_1, const char **__argv__PPCc_1){
     asm ( "nop" :  :  :  );
     asm ( "nop" :  :  :  );
     asm ( "nop" :  :  :  );
+    static int __y__i_2;
+    static int *__z__Pi_2;
+    int __src__i_2;
+    int __dst__i_2;
+    asm volatile ( "mov %1, %0\n\tadd $1, %0" :  :  :  );
+    asm volatile ( "mov %1, %0\n\tadd $1, %0" : "=r" ( __dst__i_2 ) :  :  );
+    asm volatile ( "mov %1, %0\n\tadd $1, %0" : "=r" ( __dst__i_2 ) : "r" ( __src__i_2 ) :  );
+    asm ( "mov %1, %0\n\tadd $1, %0" : "=r" ( __dst__i_2 ), "=r" ( __src__i_2 ) : [ __src__i_2 ] "r" ( __dst__i_2 ) : "r0" );
+    L2: L1: asm goto ( "frob %%r5, %1; jc %l[L1]; mov (%2), %%r5" :  : "r" ( __src__i_2 ), "r" ( (&__dst__i_2) ) : "r5", "memory" : L1, L2 );
     double _Complex __c1__Xd_2;
     double _Complex __c2__Xd_2;
@@ -14 +24 @@
     const int __i2__Ci_2;
     const int __i3__Ci_2;
+    inline int __f1__Fi___2(){
+    }
+    inline int __f2__Fi___2(){
+    }
+    int __s1__i_2;
+    int __s2__i_2;
+    volatile int __v1__Vi_2;
+    volatile int __v2__Vi_2;
+    int __t1___2;
+    int __t2___2;
     __extension__ const int __ex__Ci_2;
     struct S {
@@ -64 +84 @@
     ((void)(__extension__ __a__i_2=(__extension__ __b__i_2+__extension__ __c__i_2)));
     ((void)(__extension__ __a__i_2=__extension__ (__extension__ __b__i_2+__extension__ __c__i_2)));
-    inline int __f1__Fi___2(){
-    }
-    inline int __f2__Fi___2(){
-    }
-    int __s1__i_2;
-    int __s2__i_2;
-    int __t1___2;
-    int __t2___2;
-    volatile int __v1__Vi_2;
-    volatile int __v2__Vi_2;
     int __a1__i_2;
     const int __a2__Ci_2;
@@ -151 +161 @@
     struct s4 __y2__3ss4_2;
     ((void)___constructor__F_P3ss4_autogen___2(((struct s4 *)(&__y2__3ss4_2))));
-    int __m1__A0i_2[((long unsigned int )10)];
-    int __m2__A0A0i_2[((long unsigned int )10)][((long unsigned int )10)];
-    int __m3__A0A0i_2[((long unsigned int )10)][((long unsigned int )10)];
+    int __m1__A0i_2[((unsigned int )10)];
+    int __m2__A0A0i_2[((unsigned int )10)][((unsigned int )10)];
+    int __m3__A0A0i_2[((unsigned int )10)][((unsigned int )10)];
     int _retVal0 = { 0 };
     ((void)(_retVal0=0) /* ?{} */);

src/tests/.expect/64/gccExtensions.txt

@@ -5 +5 @@
 extern void exit(int __status);
 extern int printf(const char *__restrict __format, ...);
+extern int __x__i_1;
 int main(int __argc__i_1, const char **__argv__PPCc_1){
     asm ( "nop" :  :  :  );
     asm ( "nop" :  :  :  );
     asm ( "nop" :  :  :  );
+    static int __y__i_2;
+    static int *__z__Pi_2;
+    int __src__i_2;
+    int __dst__i_2;
+    asm volatile ( "mov %1, %0\n\tadd $1, %0" :  :  :  );
+    asm volatile ( "mov %1, %0\n\tadd $1, %0" : "=r" ( __dst__i_2 ) :  :  );
+    asm volatile ( "mov %1, %0\n\tadd $1, %0" : "=r" ( __dst__i_2 ) : "r" ( __src__i_2 ) :  );
+    asm ( "mov %1, %0\n\tadd $1, %0" : "=r" ( __dst__i_2 ), "=r" ( __src__i_2 ) : [ __src__i_2 ] "r" ( __dst__i_2 ) : "r0" );
+    L2: L1: asm goto ( "frob %%r5, %1; jc %l[L1]; mov (%2), %%r5" :  : "r" ( __src__i_2 ), "r" ( (&__dst__i_2) ) : "r5", "memory" : L1, L2 );
     double _Complex __c1__Xd_2;
     double _Complex __c2__Xd_2;
@@ -14 +24 @@
     const int __i2__Ci_2;
     const int __i3__Ci_2;
+    inline int __f1__Fi___2(){
+    }
+    inline int __f2__Fi___2(){
+    }
+    int __s1__i_2;
+    int __s2__i_2;
+    volatile int __v1__Vi_2;
+    volatile int __v2__Vi_2;
+    int __t1___2;
+    int __t2___2;
     __extension__ const int __ex__Ci_2;
     struct S {
@@ -64 +84 @@
     ((void)(__extension__ __a__i_2=(__extension__ __b__i_2+__extension__ __c__i_2)));
     ((void)(__extension__ __a__i_2=__extension__ (__extension__ __b__i_2+__extension__ __c__i_2)));
-    inline int __f1__Fi___2(){
-    }
-    inline int __f2__Fi___2(){
-    }
-    int __s1__i_2;
-    int __s2__i_2;
-    int __t1___2;
-    int __t2___2;
-    volatile int __v1__Vi_2;
-    volatile int __v2__Vi_2;
     int __a1__i_2;
     const int __a2__Ci_2;

src/tests/.expect/declarationErrors.txt

@@ -1 +1 @@
 CFA Version 1.0.0 (debug)
-Error: invalid combination of storage classes in declaration of x9: static static volatile const short int 
+Error: invalid combination of storage classes in declaration of x9: static volatile const short int 
 
-Error: invalid combination of storage classes in declaration of x18: static static const volatile instance of struct __anonymous0
+Error: invalid combination of storage classes in declaration of x18: static const volatile instance of struct __anonymous0
   with members 
-    i: int 
    with body 
 
 
-Error: invalid combination of storage classes in declaration of x19: static static const volatile volatile instance of struct __anonymous1
+Error: invalid combination of storage classes in declaration of x19: static const volatile volatile instance of struct __anonymous1
   with members 
-    i: int 
    with body 
 
 
-Error: invalid combination of storage classes in declaration of x28: static static volatile const instance of type Int
+Error: invalid combination of storage classes in declaration of x28: static volatile const instance of type Int
 
 make: *** [declarationErrors] Error 1

src/tests/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Sat Jul  9 11:23:24 2016
-## Update Count     : 35
+## Last Modified On : Mon Aug 15 12:24:54 2016
+## Update Count     : 39
 ###############################################################################
 
@@ -27 +27 @@
 
 all-local :
-        +python test.py vector_test avl_test operators numericConstants expression enum asmName array typeof cast dtor-early-exit init_once
+        @+python test.py vector_test avl_test operators numericConstants expression enum array typeof cast dtor-early-exit init_once
 
 all-tests :
-        +python test.py --all
+        @+python test.py --all          # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :
-        -rm -f ${EXTRA_PROGRAMS}
+        rm -f ${EXTRA_PROGRAMS}
 
 list :
-        +python test.py --list
+        @+python test.py --list
 
 constant0-1DP : constant0-1.c
@@ -53 +53 @@
         ${CC} ${CFLAGS} -DERR2 ${<} -o ${@}
 
+declarationSpecifier: declarationSpecifier.c
+        ${CC} ${CFALGS} -CFA -XCFA -p ${<} -o ${@}
+
 gccExtensions : gccExtensions.c
         ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}

src/tests/Makefile.in

@@ -635 +635 @@
 
 all-local :
-        +python test.py vector_test avl_test operators numericConstants expression enum asmName array typeof cast dtor-early-exit init_once
+        @+python test.py vector_test avl_test operators numericConstants expression enum array typeof cast dtor-early-exit init_once
 
 all-tests :
-        +python test.py --all
+        @+python test.py --all          # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :
-        -rm -f ${EXTRA_PROGRAMS}
+        rm -f ${EXTRA_PROGRAMS}
 
 list :
-        +python test.py --list
+        @+python test.py --list
 
 constant0-1DP : constant0-1.c
@@ -660 +660 @@
 dtor-early-exit-ERR2: dtor-early-exit.c
         ${CC} ${CFLAGS} -DERR2 ${<} -o ${@}
+
+declarationSpecifier: declarationSpecifier.c
+        ${CC} ${CFALGS} -CFA -XCFA -p ${<} -o ${@}
 
 gccExtensions : gccExtensions.c

src/tests/declarationErrors.c

@@ -1 @@
-static short int volatile static const x9;              // duplicate static
-struct { int i; } const static volatile static x18;     // duplicate static
+// 
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// declarationErrors.c -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Wed Aug 17 08:23:43 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Aug 17 08:27:15 2016
+// Update Count     : 2
+// 
+
+const short static int volatile x4;
+const static volatile short int x4;
+static short int volatile static const x9;                              // duplicate static
+struct { int i; } const static volatile static x18;             // duplicate static
 struct { int i; } const static volatile static volatile x19; // duplicate static & volatile
 typedef int Int;
-static Int volatile static const x28;                   // duplicate static
+static Int volatile static const x28;                                   // duplicate static
+
+const static inline const volatile int f01();                   // duplicate const
+volatile inline const volatile static int f02();                // duplicate volatile
+const inline const volatile int static f03();                   // duplicate const
+volatile inline static const volatile int f04();                // duplicate volatile
+const static const inline volatile int f05();                   // duplicate const
+volatile static const volatile inline int f06();                // duplicate volatile
+const static const volatile int inline f07();                   // duplicate const
+volatile static const int inline volatile f08();                // duplicate volatile
 
 //Dummy main
@@ -10 +36 @@
         return 0;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa declarationErrors.c" //
+// End: //

src/tests/declarationSpecifier.c

@@ +1 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// declarationSpecifier.c -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Wed Aug 17 08:21:04 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Aug 17 08:24:33 2016
+// Update Count     : 2
+// 
+
 typedef short int Int;
-
 
 const short int volatile x1;
 static const short int volatile x2;
 const static short int volatile x3;
-const short static int volatile x4;
 const static volatile short int x4;
 const short int static volatile x5;
@@ -11 +24 @@
 const short volatile int static x7;
 short int volatile static const x8;
-static short int volatile static const x9;              // duplicate static
 
 const volatile struct { int i; } x10;
@@ -21 +33 @@
 struct { int i; } const static volatile x16;
 struct { int i; } const volatile static x17;
-struct { int i; } const static volatile static x18;     // duplicate static
-struct { int i; } const static volatile static volatile x19; // duplicate static & volatile
 
 const Int volatile x20;
@@ -32 +42 @@
 const volatile Int static x26;
 Int volatile static const x27;
-static Int volatile static const x28;                   // duplicate static
 
 const volatile struct { Int i; } x29;
@@ -42 +51 @@
 struct { Int i; } const static volatile x35;
 struct { Int i; } const volatile static x36;
-
-
-const static inline const volatile int f01();           // duplicate const
-volatile inline const volatile static int f02();        // duplicate volatile
-const inline const volatile int static f03();           // duplicate const
-volatile inline static const volatile int f04();        // duplicate volatile
-const static const inline volatile int f05();           // duplicate const
-volatile static const volatile inline int f06();        // duplicate volatile
-const static const volatile int inline f07();           // duplicate const
-volatile static const int inline volatile f08();        // duplicate volatile
 
 static inline const volatile int f11();
@@ -94 +93 @@
         return 0;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa declarationSpecifier.c" //
+// End: //

src/tests/dtor-early-exit.c

@@ +1 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// dtor-early-exit.c -- 
+// 
+// Author           : Rob Schluntz
+// Created On       : Wed Aug 17 08:26:25 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Aug 17 08:29:37 2016
+// Update Count     : 2
+// 
+
 #include <fstream>
 #include <stdlib>
@@ -215 +230 @@
         h();
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa dtor-early-exit" //
+// End: //

src/tests/exception.c

@@ -11 +11 @@
         x/4;
     } catch( int ) {
-    } catch( int x ) {
+    } catch( float x ) {
     } catch( struct { int i; } ) {
     } catch( struct { int i; } x ) {
@@ -21 +21 @@
     } catch( * struct { int i; } x ) {
     } catch( ... ) {
-//    } finally {
+    } finally {
     } // try
 }

src/tests/functions.c

@@ +1 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// functions.c -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Wed Aug 17 08:39:58 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Aug 17 08:40:52 2016
+// Update Count     : 1
+// 
+
 // ANSI function definitions
 
@@ -165 +180 @@
 // Local Variables: //
 // tab-width: 4 //
+// compile-command: "cfa functions.c" //
 // End: //

src/tests/gccExtensions.c

@@ +1 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// gccExtensions.c -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Sun Aug 14 17:28:17 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Aug 17 09:26:50 2016
+// Update Count     : 10
+// 
+
+extern int x asm( "xx" );
+
 int main(int argc, char const *argv[]) {
+        // asm extensions
+
         asm( "nop" );
         __asm( "nop" );
         __asm__( "nop" );
+
+        static int y asm( "yy" );
+#ifdef __CFA__
+        static * int z asm( "zz" );                                                     // CFA declaration
+#endif // __CFA__
+
+        int src;
+        int dst;
+
+        asm volatile ( "mov %1, %0\n\t"
+                                   "add $1, %0" : : : );
+
+        asm volatile ( "mov %1, %0\n\t"
+                                   "add $1, %0"
+                                   : "=" "r" (dst));
+
+        asm volatile ( "mov %1, %0\n\t"
+                                   "add $1, %0"
+                                   : "=r" (dst)
+                                   : "r" (src));
+
+        asm ( "mov %1, %0\n\t"
+                  "add $1, %0"
+                  : "=r" (dst), "=r" (src)
+                  : [src] "r" (dst)
+                  : "r0");
+
+  L1: L2:
+        asm goto ( "frob %%r5, %1; jc %l[L1]; mov (%2), %%r5"
+                           : /* No outputs. */
+                           : "r"(src), "r"(&dst)
+                           : "r5", "memory"
+                           : L1, L2 );
+
+        // alternative type/qualifer names
 
         __complex__ c1;
@@ -10 +64 @@
         __const int i2;
         __const__ int i3;
+
+        __inline int f1() {}
+        __inline__ int f2() {}
+
+        __signed s1;
+        __signed s2;
+
+        __volatile int v1;
+        __volatile__ int v2;
+
+        // symbol table attributes
+
+        __typeof(s1) t1;
+        __typeof__(s1) t2;
+
+        // strange extension qualifier
 
         __extension__ const int ex;
@@ -21 +91 @@
         __extension__ a = __extension__ ( __extension__ b + __extension__ c );
 
-        __inline int f1() {}
-        __inline__ int f2() {}
-
-        __signed s1;
-        __signed s2;
-
-        __typeof(s1) t1;
-        __typeof__(s1) t2;
-
-        __volatile int v1;
-        __volatile__ int v2;
+        // attributes
 
         __attribute__(()) int a1;
@@ -57 +117 @@
         return 0;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa gccExtensions.c" //
+// End: //

src/tests/identFuncDeclarator.c

@@ +1 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// identFuncDeclarator.c -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Wed Aug 17 08:36:34 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Aug 17 08:37:06 2016
+// Update Count     : 1
+// 
+
 int main() {
         int f1;
@@ -97 +112 @@
         int (* const(* const f81)(int))();
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa identFuncDeclarator.c" //
+// End: //

src/tests/identParamDeclarator.c

@@ +1 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// identParamDeclarator.c -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Wed Aug 17 08:37:56 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Aug 17 08:38:42 2016
+// Update Count     : 1
+// 
+
 int fred(
         int f1,
@@ -147 +162 @@
         return 0;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa identParamDeclarator.c" //
+// End: //

src/tests/labelledExit.c

@@ +1 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// labelledExit.c -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Wed Aug 10 07:29:39 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Aug 10 07:30:15 2016
+// Update Count     : 1
+// 
+
 int foo() {
         int i;
@@ -136 +151 @@
         else
                 i += 1;
-
 }
 
-int main(int argc, char const *argv[]) {
+int main( int argc, char const *argv[] ) {
         /* code */
-        return 0;
 }
 
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa LabelledExit.c" //
+// compile-command: "cfa labelledExit.c" //
 // End: //

src/tests/test.py

@@ -99 +99 @@
                 return False
 
-# find the test data for a given test name
-def filterTests(testname) :
-        found = [test for test in allTests if test.name == testname]
-        return (found[0] if len(found) == 1 else Test(testname, testname) )
-
 ################################################################################
 #               running test functions
@@ -141 +136 @@
                 if not dry_run and fileContainsOnly(out_file, "make: *** No rule to make target `%s'.  Stop." % test.name) :
                         retcode = 1;
-                        error = "\t\tNo make target for test %s!" % test
+                        error = "\t\tNo make target for test %s!" % test.name
                         sh("rm %s" % out_file, False)
 
@@ -252 +247 @@
         # already existing tests and create new info for the new tests
         if options.regenerate_expected :
-                tests = map(filterTests, options.tests)
+                for testname in options.tests :
+                        if testname.endswith(".c") or testname.endswith(".cc") or testname.endswith(".cpp") :
+                                print('ERROR: "%s", tests are not allowed to end with a C/C++/CFA extension, ignoring it' % testname, file=sys.stderr)
+                        else :
+                                found = [test for test in allTests if test.name == testname]
+                                tests.append( found[0] if len(found) == 1 else Test(testname, testname) )
 
         else :

src/tests/variableDeclarator.c

@@ -1 @@
-//Variable declarations test
+// 
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// variableDeclarator.c -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Wed Aug 17 08:41:42 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Aug 17 08:42:21 2016
+// Update Count     : 1
+// 
+
+// Variable declarations test
 int f1;
 int (f2);
@@ -164 +179 @@
         return 0;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa variableDeclarator.c" //
+// End: //