Changeset fa463f1

Timestamp:

Aug 30, 2016, 4:26:01 PM (7 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:

c8dfcd3

Parents:

3906301 (diff), 32a2a99 (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

Files:

• doc/aaron_comp_II/conversion_dag.eps (modified) (previous)
• doc/aaron_comp_II/conversion_dag.odg (modified) (previous)
• doc/aaron_comp_II/resolution_dag.eps (modified) (previous)
• doc/aaron_comp_II/resolution_dag.odg (modified) (previous)
• src/ArgTweak/FunctionFixer.cc (deleted)
• src/ArgTweak/FunctionFixer.h (deleted)
• src/ArgTweak/Mutate.cc (deleted)
• src/ArgTweak/Mutate.h (deleted)
• src/ArgTweak/module.mk (deleted)
• src/Designators/Processor.cc (deleted)
• src/Designators/Processor.h (deleted)
• src/Designators/module.mk (deleted)
• src/GenPoly/ScopedMap.h (modified) (8 diffs)
• src/InitTweak/Association.cc (deleted)
• src/InitTweak/Association.h (deleted)
• src/InitTweak/BasicInit.cc (deleted)
• src/InitTweak/BasicInit.h (deleted)
• src/InitTweak/DeclarationHoister.cc (deleted)
• src/InitTweak/DeclarationHoister.h (deleted)
• src/InitTweak/InitExpander.cc (deleted)
• src/InitTweak/InitExpander.h (deleted)
• src/InitTweak/InitModel.cc (deleted)
• src/InitTweak/InitModel.h (deleted)
• src/InitTweak/InitTweak.cc (modified) (2 diffs)
• src/InitTweak/Mutate.cc (deleted)
• src/InitTweak/Mutate.h (deleted)
• src/InitTweak/diet_map.h (deleted)
• src/Makefile.am (modified) (1 diff)
• src/Makefile.in (modified) (21 diffs)
• src/Parser/DeclarationNode.cc (modified) (18 diffs)
• src/Parser/ExpressionNode.cc (modified) (2 diffs)
• src/Parser/LinkageSpec.cc (modified) (3 diffs)
• src/Parser/ParseNode.h (modified) (11 diffs)
• src/Parser/TypeData.cc (modified) (25 diffs)
• src/Parser/TypeData.h (modified) (5 diffs)
• src/Parser/lex.cc (modified) (9 diffs)
• src/Parser/lex.ll (modified) (4 diffs)
• src/Parser/parser.cc (modified) (162 diffs)
• src/Parser/parser.h (modified) (1 diff)
• src/Parser/parser.yy (modified) (7 diffs)
• src/ResolvExpr/AlternativeFinder.cc (modified) (1 diff)
• src/SymTab/Autogen.cc (modified) (3 diffs)
• src/SymTab/Validate.cc (modified) (9 diffs)
• src/SynTree/Declaration.h (modified) (1 diff)
• src/SynTree/NamedTypeDecl.cc (modified) (4 diffs)
• src/SynTree/ReferenceToType.cc (modified) (4 diffs)
• src/SynTree/Type.h (modified) (1 diff)
• src/Tuples/AssignExpand.cc (deleted)
• src/Tuples/AssignExpand.h (deleted)
• src/Tuples/FlattenTuple.cc (deleted)
• src/Tuples/FlattenTuple.h (deleted)
• src/Tuples/FunctionChecker.cc (deleted)
• src/Tuples/FunctionChecker.h (deleted)
• src/Tuples/FunctionFixer.cc (deleted)
• src/Tuples/FunctionFixer.h (deleted)
• src/Tuples/MultRet.cc (deleted)
• src/Tuples/MultRet.h (deleted)
• src/Tuples/Mutate.cc (deleted)
• src/Tuples/Mutate.h (deleted)
• src/Tuples/module.mk (modified) (1 diff)
• src/examples/gc_no_raii/containers/vector (deleted)
• src/examples/gc_no_raii/containers/vector.c (deleted)
• src/examples/gc_no_raii/premake4.lua (modified) (1 diff)
• src/libcfa/Makefile.am (modified) (2 diffs)
• src/libcfa/Makefile.in (modified) (8 diffs)
• src/libcfa/containers/vector (modified) (5 diffs)
• src/libcfa/containers/vector.c (modified) (4 diffs)
• src/main.cc (modified) (4 diffs)
• src/tests/.expect/declarationErrors.txt (modified) (1 diff)
• src/tests/declarationErrors.c (modified) (2 diffs)
• src/tests/test.py (modified) (5 diffs)

src/GenPoly/ScopedMap.h

@@ -42 +42 @@
                 typedef typename Scope::pointer pointer;
                 typedef typename Scope::const_pointer const_pointer;
-                
+
                 class iterator : public std::iterator< std::bidirectional_iterator_tag,
                                                        value_type > {
@@ -68 +68 @@
                         }
 
-                        iterator(scope_list const &_scopes, const wrapped_iterator &_it, size_type _i)
+                        iterator(scope_list &_scopes, const wrapped_iterator &_it, size_type _i)
                                 : scopes(&_scopes), it(_it), i(_i) {}
                 public:
@@ -76 +76 @@
                                 return *this;
                         }
-                        
+
                         reference operator* () { return *it; }
                         pointer operator-> () { return it.operator->(); }
@@ -109 +109 @@
 
                 private:
-                        scope_list const *scopes;
+                        scope_list *scopes;
                         wrapped_iterator it;
                         size_type i;
@@ -189 +189 @@
                         size_type i;
                 };
-                
+
                 /// Starts a new scope
                 void beginScope() {
-                        Scope scope;
-                        scopes.push_back(scope);
+                        scopes.emplace_back();
                 }
 
@@ -227 +226 @@
                                 return const_iterator( const_cast< ScopedMap< Key, Value >* >(this)->find( key ) );
                 }
-                
+
                 /// Finds the given key in the outermost scope inside the given scope where it occurs
                 iterator findNext( const_iterator &it, const Key &key ) {
@@ -247 +246 @@
                         return std::make_pair( iterator(scopes, res.first, scopes.size()-1), res.second );
                 }
+
+                std::pair< iterator, bool > insert( value_type &&value ) {
+                        std::pair< typename Scope::iterator, bool > res = scopes.back().insert( std::move( value ) );
+                        return std::make_pair( iterator(scopes, std::move( res.first ), scopes.size()-1), std::move( res.second ) );
+                }
+
                 std::pair< iterator, bool > insert( const Key &key, const Value &value ) { return insert( std::make_pair( key, value ) ); }
+                std::pair< iterator, bool > insert( const Key &key, Value &&value ) { return insert( std::make_pair( key, std::move( value ) ) ); }
 
                 Value& operator[] ( const Key &key ) {
@@ -254 +260 @@
                         return insert( key, Value() ).first->second;
                 }
+
+                iterator erase( iterator pos ) {
+                        Scope& scope = (*pos.scopes) [ pos.i ];
+                        const typename iterator::wrapped_iterator& new_it = scope.erase( pos.it );
+                        iterator it( *pos.scopes, new_it, pos.i );
+                        return it.next_valid();
+                }
+
+                size_type count( const Key &key ) const {
+                        size_type c = 0;
+                        auto it = find( key );
+                        auto end = cend();
+
+                        while(it != end) {
+                                c++;
+                                it = findNext(it, key);
+                        }
+
+                        return c;
+                }
+
         };
 } // namespace GenPoly

src/InitTweak/InitTweak.cc

@@ -79 +79 @@
         public:
                 ExprImpl( Expression * expr ) : arg( expr ) {}
+
+                ~ExprImpl() { delete arg; }
 
                 virtual std::list< Expression * > next( std::list< Expression * > & indices ) {
@@ -122 +124 @@
 
         void InitExpander::clearArrayIndices() {
+                deleteAll( indices );
                 indices.clear();
         }

src/Makefile.am

@@ -25 +25 @@
 # Is there a way to use a variable for the directory names?
 
-include ArgTweak/module.mk
 include CodeGen/module.mk
 include Common/module.mk
 include ControlStruct/module.mk
-include Designators/module.mk
 include GenPoly/module.mk
 include InitTweak/module.mk

src/Makefile.in

@@ -22 +22 @@
 ###############################################################################
 
-######################### -*- Mode: Makefile-Gmake -*- ########################
-###############################################################################
-
 #SRC +=  ArgTweak/Rewriter.cc \
 #       ArgTweak/Mutate.cc
-
-######################### -*- Mode: Makefile-Gmake -*- ########################
-###############################################################################
 
 ######################### -*- Mode: Makefile-Gmake -*- ########################
@@ -75 +69 @@
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/ArgTweak/module.mk $(srcdir)/CodeGen/module.mk \
-        $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk \
-        $(srcdir)/Designators/module.mk $(srcdir)/GenPoly/module.mk \
+DIST_COMMON = $(srcdir)/CodeGen/module.mk $(srcdir)/Common/module.mk \
+        $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk \
         $(srcdir)/InitTweak/module.mk $(srcdir)/Makefile.am \
         $(srcdir)/Makefile.in $(srcdir)/Parser/module.mk \
@@ -112 +105 @@
         ControlStruct/driver_cfa_cpp-ForExprMutator.$(OBJEXT) \
         ControlStruct/driver_cfa_cpp-LabelTypeChecker.$(OBJEXT) \
-        Designators/driver_cfa_cpp-Processor.$(OBJEXT) \
         GenPoly/driver_cfa_cpp-Box.$(OBJEXT) \
         GenPoly/driver_cfa_cpp-GenPoly.$(OBJEXT) \
@@ -196 +188 @@
         SynTree/driver_cfa_cpp-TypeSubstitution.$(OBJEXT) \
         SynTree/driver_cfa_cpp-Attribute.$(OBJEXT) \
-        Tuples/driver_cfa_cpp-Mutate.$(OBJEXT) \
-        Tuples/driver_cfa_cpp-AssignExpand.$(OBJEXT) \
-        Tuples/driver_cfa_cpp-FunctionFixer.$(OBJEXT) \
         Tuples/driver_cfa_cpp-TupleAssignment.$(OBJEXT) \
-        Tuples/driver_cfa_cpp-FunctionChecker.$(OBJEXT) \
         Tuples/driver_cfa_cpp-NameMatcher.$(OBJEXT)
 am_driver_cfa_cpp_OBJECTS = $(am__objects_1)
@@ -374 +362 @@
         ControlStruct/MLEMutator.cc ControlStruct/Mutate.cc \
         ControlStruct/ForExprMutator.cc \
-        ControlStruct/LabelTypeChecker.cc Designators/Processor.cc \
-        GenPoly/Box.cc GenPoly/GenPoly.cc GenPoly/PolyMutator.cc \
+        ControlStruct/LabelTypeChecker.cc GenPoly/Box.cc \
+        GenPoly/GenPoly.cc GenPoly/PolyMutator.cc \
         GenPoly/ScrubTyVars.cc GenPoly/Lvalue.cc GenPoly/Specialize.cc \
         GenPoly/CopyParams.cc GenPoly/FindFunction.cc \
@@ -413 +401 @@
         SynTree/Initializer.cc SynTree/Visitor.cc SynTree/Mutator.cc \
         SynTree/AddStmtVisitor.cc SynTree/TypeSubstitution.cc \
-        SynTree/Attribute.cc Tuples/Mutate.cc Tuples/AssignExpand.cc \
-        Tuples/FunctionFixer.cc Tuples/TupleAssignment.cc \
-        Tuples/FunctionChecker.cc Tuples/NameMatcher.cc
+        SynTree/Attribute.cc Tuples/TupleAssignment.cc \
+        Tuples/NameMatcher.cc
 MAINTAINERCLEANFILES = Parser/parser.output ${libdir}/${notdir \
         ${cfa_cpplib_PROGRAMS}}
@@ -433 +420 @@
 .SUFFIXES:
 .SUFFIXES: .cc .ll .o .obj .yy
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/ArgTweak/module.mk $(srcdir)/CodeGen/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/Designators/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/CodeGen/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
@@ -454 +441 @@
             cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
         esac;
-$(srcdir)/ArgTweak/module.mk $(srcdir)/CodeGen/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/Designators/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk:
+$(srcdir)/CodeGen/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -553 +540 @@
         ControlStruct/$(am__dirstamp) \
         ControlStruct/$(DEPDIR)/$(am__dirstamp)
-Designators/$(am__dirstamp):
-        @$(MKDIR_P) Designators
-        @: > Designators/$(am__dirstamp)
-Designators/$(DEPDIR)/$(am__dirstamp):
-        @$(MKDIR_P) Designators/$(DEPDIR)
-        @: > Designators/$(DEPDIR)/$(am__dirstamp)
-Designators/driver_cfa_cpp-Processor.$(OBJEXT):  \
-        Designators/$(am__dirstamp) \
-        Designators/$(DEPDIR)/$(am__dirstamp)
 GenPoly/$(am__dirstamp):
         @$(MKDIR_P) GenPoly
@@ -789 +767 @@
         @$(MKDIR_P) Tuples/$(DEPDIR)
         @: > Tuples/$(DEPDIR)/$(am__dirstamp)
-Tuples/driver_cfa_cpp-Mutate.$(OBJEXT): Tuples/$(am__dirstamp) \
-        Tuples/$(DEPDIR)/$(am__dirstamp)
-Tuples/driver_cfa_cpp-AssignExpand.$(OBJEXT): Tuples/$(am__dirstamp) \
-        Tuples/$(DEPDIR)/$(am__dirstamp)
-Tuples/driver_cfa_cpp-FunctionFixer.$(OBJEXT): Tuples/$(am__dirstamp) \
-        Tuples/$(DEPDIR)/$(am__dirstamp)
 Tuples/driver_cfa_cpp-TupleAssignment.$(OBJEXT):  \
-        Tuples/$(am__dirstamp) Tuples/$(DEPDIR)/$(am__dirstamp)
-Tuples/driver_cfa_cpp-FunctionChecker.$(OBJEXT):  \
         Tuples/$(am__dirstamp) Tuples/$(DEPDIR)/$(am__dirstamp)
 Tuples/driver_cfa_cpp-NameMatcher.$(OBJEXT): Tuples/$(am__dirstamp) \
@@ -824 +794 @@
         -rm -f ControlStruct/driver_cfa_cpp-MLEMutator.$(OBJEXT)
         -rm -f ControlStruct/driver_cfa_cpp-Mutate.$(OBJEXT)
-        -rm -f Designators/driver_cfa_cpp-Processor.$(OBJEXT)
         -rm -f GenPoly/driver_cfa_cpp-Box.$(OBJEXT)
         -rm -f GenPoly/driver_cfa_cpp-CopyParams.$(OBJEXT)
@@ -908 +877 @@
         -rm -f SynTree/driver_cfa_cpp-Visitor.$(OBJEXT)
         -rm -f SynTree/driver_cfa_cpp-VoidType.$(OBJEXT)
-        -rm -f Tuples/driver_cfa_cpp-AssignExpand.$(OBJEXT)
-        -rm -f Tuples/driver_cfa_cpp-FunctionChecker.$(OBJEXT)
-        -rm -f Tuples/driver_cfa_cpp-FunctionFixer.$(OBJEXT)
-        -rm -f Tuples/driver_cfa_cpp-Mutate.$(OBJEXT)
         -rm -f Tuples/driver_cfa_cpp-NameMatcher.$(OBJEXT)
         -rm -f Tuples/driver_cfa_cpp-TupleAssignment.$(OBJEXT)
@@ -934 +899 @@
 @AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-MLEMutator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-Mutate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@Designators/$(DEPDIR)/driver_cfa_cpp-Processor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/driver_cfa_cpp-Box.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/driver_cfa_cpp-CopyParams.Po@am__quote@
@@ -1018 +982 @@
 @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-Visitor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-VoidType.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/driver_cfa_cpp-AssignExpand.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionChecker.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionFixer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/driver_cfa_cpp-Mutate.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/driver_cfa_cpp-NameMatcher.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/driver_cfa_cpp-TupleAssignment.Po@am__quote@
@@ -1265 +1225 @@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-LabelTypeChecker.obj `if test -f 'ControlStruct/LabelTypeChecker.cc'; then $(CYGPATH_W) 'ControlStruct/LabelTypeChecker.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/LabelTypeChecker.cc'; fi`
 
-Designators/driver_cfa_cpp-Processor.o: Designators/Processor.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Designators/driver_cfa_cpp-Processor.o -MD -MP -MF Designators/$(DEPDIR)/driver_cfa_cpp-Processor.Tpo -c -o Designators/driver_cfa_cpp-Processor.o `test -f 'Designators/Processor.cc' || echo '$(srcdir)/'`Designators/Processor.cc
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Designators/$(DEPDIR)/driver_cfa_cpp-Processor.Tpo Designators/$(DEPDIR)/driver_cfa_cpp-Processor.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Designators/Processor.cc' object='Designators/driver_cfa_cpp-Processor.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 Designators/driver_cfa_cpp-Processor.o `test -f 'Designators/Processor.cc' || echo '$(srcdir)/'`Designators/Processor.cc
-
-Designators/driver_cfa_cpp-Processor.obj: Designators/Processor.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Designators/driver_cfa_cpp-Processor.obj -MD -MP -MF Designators/$(DEPDIR)/driver_cfa_cpp-Processor.Tpo -c -o Designators/driver_cfa_cpp-Processor.obj `if test -f 'Designators/Processor.cc'; then $(CYGPATH_W) 'Designators/Processor.cc'; else $(CYGPATH_W) '$(srcdir)/Designators/Processor.cc'; fi`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Designators/$(DEPDIR)/driver_cfa_cpp-Processor.Tpo Designators/$(DEPDIR)/driver_cfa_cpp-Processor.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Designators/Processor.cc' object='Designators/driver_cfa_cpp-Processor.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 Designators/driver_cfa_cpp-Processor.obj `if test -f 'Designators/Processor.cc'; then $(CYGPATH_W) 'Designators/Processor.cc'; else $(CYGPATH_W) '$(srcdir)/Designators/Processor.cc'; fi`
-
 GenPoly/driver_cfa_cpp-Box.o: GenPoly/Box.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT GenPoly/driver_cfa_cpp-Box.o -MD -MP -MF GenPoly/$(DEPDIR)/driver_cfa_cpp-Box.Tpo -c -o GenPoly/driver_cfa_cpp-Box.o `test -f 'GenPoly/Box.cc' || echo '$(srcdir)/'`GenPoly/Box.cc
@@ -2441 +2387 @@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SynTree/driver_cfa_cpp-Attribute.obj `if test -f 'SynTree/Attribute.cc'; then $(CYGPATH_W) 'SynTree/Attribute.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Attribute.cc'; fi`
 
-Tuples/driver_cfa_cpp-Mutate.o: Tuples/Mutate.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-Mutate.o -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-Mutate.Tpo -c -o Tuples/driver_cfa_cpp-Mutate.o `test -f 'Tuples/Mutate.cc' || echo '$(srcdir)/'`Tuples/Mutate.cc
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-Mutate.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-Mutate.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/Mutate.cc' object='Tuples/driver_cfa_cpp-Mutate.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Tuples/driver_cfa_cpp-Mutate.o `test -f 'Tuples/Mutate.cc' || echo '$(srcdir)/'`Tuples/Mutate.cc
-
-Tuples/driver_cfa_cpp-Mutate.obj: Tuples/Mutate.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-Mutate.obj -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-Mutate.Tpo -c -o Tuples/driver_cfa_cpp-Mutate.obj `if test -f 'Tuples/Mutate.cc'; then $(CYGPATH_W) 'Tuples/Mutate.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/Mutate.cc'; fi`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-Mutate.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-Mutate.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/Mutate.cc' object='Tuples/driver_cfa_cpp-Mutate.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Tuples/driver_cfa_cpp-Mutate.obj `if test -f 'Tuples/Mutate.cc'; then $(CYGPATH_W) 'Tuples/Mutate.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/Mutate.cc'; fi`
-
-Tuples/driver_cfa_cpp-AssignExpand.o: Tuples/AssignExpand.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-AssignExpand.o -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-AssignExpand.Tpo -c -o Tuples/driver_cfa_cpp-AssignExpand.o `test -f 'Tuples/AssignExpand.cc' || echo '$(srcdir)/'`Tuples/AssignExpand.cc
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-AssignExpand.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-AssignExpand.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/AssignExpand.cc' object='Tuples/driver_cfa_cpp-AssignExpand.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Tuples/driver_cfa_cpp-AssignExpand.o `test -f 'Tuples/AssignExpand.cc' || echo '$(srcdir)/'`Tuples/AssignExpand.cc
-
-Tuples/driver_cfa_cpp-AssignExpand.obj: Tuples/AssignExpand.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-AssignExpand.obj -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-AssignExpand.Tpo -c -o Tuples/driver_cfa_cpp-AssignExpand.obj `if test -f 'Tuples/AssignExpand.cc'; then $(CYGPATH_W) 'Tuples/AssignExpand.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/AssignExpand.cc'; fi`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-AssignExpand.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-AssignExpand.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/AssignExpand.cc' object='Tuples/driver_cfa_cpp-AssignExpand.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Tuples/driver_cfa_cpp-AssignExpand.obj `if test -f 'Tuples/AssignExpand.cc'; then $(CYGPATH_W) 'Tuples/AssignExpand.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/AssignExpand.cc'; fi`
-
-Tuples/driver_cfa_cpp-FunctionFixer.o: Tuples/FunctionFixer.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-FunctionFixer.o -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionFixer.Tpo -c -o Tuples/driver_cfa_cpp-FunctionFixer.o `test -f 'Tuples/FunctionFixer.cc' || echo '$(srcdir)/'`Tuples/FunctionFixer.cc
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionFixer.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionFixer.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/FunctionFixer.cc' object='Tuples/driver_cfa_cpp-FunctionFixer.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Tuples/driver_cfa_cpp-FunctionFixer.o `test -f 'Tuples/FunctionFixer.cc' || echo '$(srcdir)/'`Tuples/FunctionFixer.cc
-
-Tuples/driver_cfa_cpp-FunctionFixer.obj: Tuples/FunctionFixer.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-FunctionFixer.obj -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionFixer.Tpo -c -o Tuples/driver_cfa_cpp-FunctionFixer.obj `if test -f 'Tuples/FunctionFixer.cc'; then $(CYGPATH_W) 'Tuples/FunctionFixer.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/FunctionFixer.cc'; fi`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionFixer.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionFixer.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/FunctionFixer.cc' object='Tuples/driver_cfa_cpp-FunctionFixer.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Tuples/driver_cfa_cpp-FunctionFixer.obj `if test -f 'Tuples/FunctionFixer.cc'; then $(CYGPATH_W) 'Tuples/FunctionFixer.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/FunctionFixer.cc'; fi`
-
 Tuples/driver_cfa_cpp-TupleAssignment.o: Tuples/TupleAssignment.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-TupleAssignment.o -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-TupleAssignment.Tpo -c -o Tuples/driver_cfa_cpp-TupleAssignment.o `test -f 'Tuples/TupleAssignment.cc' || echo '$(srcdir)/'`Tuples/TupleAssignment.cc
@@ -2496 +2400 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Tuples/driver_cfa_cpp-TupleAssignment.obj `if test -f 'Tuples/TupleAssignment.cc'; then $(CYGPATH_W) 'Tuples/TupleAssignment.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/TupleAssignment.cc'; fi`
-
-Tuples/driver_cfa_cpp-FunctionChecker.o: Tuples/FunctionChecker.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-FunctionChecker.o -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionChecker.Tpo -c -o Tuples/driver_cfa_cpp-FunctionChecker.o `test -f 'Tuples/FunctionChecker.cc' || echo '$(srcdir)/'`Tuples/FunctionChecker.cc
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionChecker.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionChecker.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/FunctionChecker.cc' object='Tuples/driver_cfa_cpp-FunctionChecker.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Tuples/driver_cfa_cpp-FunctionChecker.o `test -f 'Tuples/FunctionChecker.cc' || echo '$(srcdir)/'`Tuples/FunctionChecker.cc
-
-Tuples/driver_cfa_cpp-FunctionChecker.obj: Tuples/FunctionChecker.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-FunctionChecker.obj -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionChecker.Tpo -c -o Tuples/driver_cfa_cpp-FunctionChecker.obj `if test -f 'Tuples/FunctionChecker.cc'; then $(CYGPATH_W) 'Tuples/FunctionChecker.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/FunctionChecker.cc'; fi`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionChecker.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionChecker.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/FunctionChecker.cc' object='Tuples/driver_cfa_cpp-FunctionChecker.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Tuples/driver_cfa_cpp-FunctionChecker.obj `if test -f 'Tuples/FunctionChecker.cc'; then $(CYGPATH_W) 'Tuples/FunctionChecker.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/FunctionChecker.cc'; fi`
 
 Tuples/driver_cfa_cpp-NameMatcher.o: Tuples/NameMatcher.cc
@@ -2654 +2544 @@
         -rm -f ControlStruct/$(DEPDIR)/$(am__dirstamp)
         -rm -f ControlStruct/$(am__dirstamp)
-        -rm -f Designators/$(DEPDIR)/$(am__dirstamp)
-        -rm -f Designators/$(am__dirstamp)
         -rm -f GenPoly/$(DEPDIR)/$(am__dirstamp)
         -rm -f GenPoly/$(am__dirstamp)
@@ -2685 +2573 @@
 
 distclean: distclean-am
-        -rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) Common/$(DEPDIR) ControlStruct/$(DEPDIR) Designators/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR)
+        -rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) Common/$(DEPDIR) ControlStruct/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR)
         -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
@@ -2731 +2619 @@
 
 maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) Common/$(DEPDIR) ControlStruct/$(DEPDIR) Designators/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR)
+        -rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) Common/$(DEPDIR) ControlStruct/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR)
         -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -2766 +2654 @@
 
 
-#SRC +=  ArgTweak/Rewriter.cc \
-#       ArgTweak/Mutate.cc
-
-#       Tuples/MultipleAssign.cc \
-#       Tuples/FlattenTuple.cc \
-#       Tuples/MultRet.cc \
-#       Tuples/FixReturn.cc \
-#       Tuples/MassAssignment.cc \
-#       Tuples/TupleFixer.cc
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 18 23:48:23 2016
-// Update Count     : 182
+// Last Modified On : Sun Aug 28 22:12:44 2016
+// Update Count     : 278
 //
 
@@ -93 +93 @@
         } // if
 
-        if(storageClass != NoStorageClass) os << DeclarationNode::storageName[storageClass] << ' ';
-        if(isInline) os << DeclarationNode::storageName[Inline] << ' ';
-        if(isNoreturn) os << DeclarationNode::storageName[Noreturn] << ' ';
+        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 );
@@ -147 +147 @@
 } // DeclarationNode::newFunction
 
-DeclarationNode *DeclarationNode::newQualifier( Qualifier q ) {
+DeclarationNode * DeclarationNode::newQualifier( Qualifier q ) {
         DeclarationNode *newnode = new DeclarationNode;
         newnode->type = new TypeData();
-        newnode->type->qualifiers.push_back( q );
+        newnode->type->qualifiers[ q ] = 1;
         return newnode;
 } // DeclarationNode::newQualifier
 
-DeclarationNode *DeclarationNode::newStorageClass( DeclarationNode::StorageClass sc ) {
-        DeclarationNode *newnode = new DeclarationNode;
-        switch (sc) {
-                case Inline: newnode->isInline = true; break;
-                case Noreturn: newnode->isNoreturn = true; break;
-                default: newnode->storageClass = sc; break;
-        }
+DeclarationNode * DeclarationNode::newForall( DeclarationNode *forall ) {
+        DeclarationNode *newnode = new DeclarationNode;
+        newnode->type = new TypeData( TypeData::Unknown );
+        newnode->type->forall = forall;
+        return newnode;
+} // DeclarationNode::newForall
+
+DeclarationNode * DeclarationNode::newStorageClass( DeclarationNode::StorageClass sc ) {
+        DeclarationNode *newnode = new DeclarationNode;
+        //switch (sc) {
+        //      case Inline: newnode->isInline = true; break;
+        //      case Noreturn: newnode->isNoreturn = true; break;
+        //      default: newnode->storageClass = sc; break;
+        //}
+        newnode->storageClass = sc;
         return newnode;
 } // DeclarationNode::newStorageClass
 
-DeclarationNode *DeclarationNode::newBasicType( BasicType bt ) {
+DeclarationNode * DeclarationNode::newBasicType( BasicType bt ) {
         DeclarationNode *newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::Basic );
@@ -171 +179 @@
 } // DeclarationNode::newBasicType
 
-DeclarationNode *DeclarationNode::newBuiltinType( BuiltinType bt ) {
+DeclarationNode * DeclarationNode::newModifier( Modifier mod ) {
+        DeclarationNode *newnode = new DeclarationNode;
+        newnode->type = new TypeData( TypeData::Basic );
+        newnode->type->basic->modifiers.push_back( mod );
+        return newnode;
+} // DeclarationNode::newModifier
+
+DeclarationNode * DeclarationNode::newBuiltinType( BuiltinType bt ) {
         DeclarationNode *newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::Builtin );
@@ -178 +193 @@
 } // DeclarationNode::newBuiltinType
 
-DeclarationNode *DeclarationNode::newModifier( Modifier mod ) {
-        DeclarationNode *newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::Basic );
-        newnode->type->basic->modifiers.push_back( mod );
-        return newnode;
-} // DeclarationNode::newModifier
-
-DeclarationNode *DeclarationNode::newForall( DeclarationNode *forall ) {
-        DeclarationNode *newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::Unknown );
-        newnode->type->forall = forall;
-        return newnode;
-} // DeclarationNode::newForall
-
-DeclarationNode *DeclarationNode::newFromTypedef( std::string *name ) {
+DeclarationNode * DeclarationNode::newFromTypedef( std::string *name ) {
         DeclarationNode *newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::SymbolicInst );
@@ -201 +202 @@
 } // DeclarationNode::newFromTypedef
 
-DeclarationNode *DeclarationNode::newAggregate( Aggregate kind, const std::string *name, ExpressionNode *actuals, DeclarationNode *fields, bool body ) {
+DeclarationNode * DeclarationNode::newAggregate( Aggregate kind, const std::string *name, ExpressionNode *actuals, DeclarationNode *fields, bool body ) {
         DeclarationNode *newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::Aggregate );
@@ -369 +370 @@
                         src = 0;
                 } else {
-                        dst->qualifiers.splice( dst->qualifiers.end(), src->qualifiers );
-                } // if
-        } // if
-}
+                        dst->qualifiers |= src->qualifiers;
+                } // if
+        } // if
+}
+
+void DeclarationNode::checkQualifiers( const TypeData *src, const TypeData *dst ) {
+        TypeData::Qualifiers qsrc = src->qualifiers, qdst = dst->qualifiers;
+
+        if ( (qsrc & qdst).any() ) {                                            // common bits between qualifier masks ?
+                error = "duplicate qualifier ";
+                int j = 0;                                                                              // separator detector
+                for ( int i = 0; i < DeclarationNode::NoOfQualifier; i += 1 ) {
+                        if ( qsrc[i] & qdst[i] ) {                                      // find specific qualifiers in common
+                                if ( j > 0 ) error += ", ";
+                                error += DeclarationNode::qualifierName[i];
+                                j += 1;
+                        } // if
+                } // for
+                error += " in declaration of ";
+        } // if
+} // DeclarationNode::checkQualifiers
 
 DeclarationNode *DeclarationNode::addQualifiers( DeclarationNode *q ) {
@@ -380 +398 @@
                         if ( ! type ) {
                                 type = new TypeData;
+                        } else {
+                                checkQualifiers( q->type, type );
                         } // if
                         addQualifiersToType( q->type, type );
@@ -405 +425 @@
         isInline = isInline || q->isInline;
         isNoreturn = isNoreturn || q->isNoreturn;
-        if(storageClass == NoStorageClass) {
+        if ( storageClass == NoStorageClass ) {
                 storageClass = q->storageClass;
-        }
-        else if (q->storageClass != NoStorageClass) {
+        } else if ( q->storageClass != NoStorageClass ) {
                 q->error = "invalid combination of storage classes in declaration of ";
-        }
-        if(error.empty()) error = q->error;
+        } // if
+        if ( error.empty() ) error = q->error;
         return this;
 }
@@ -430 +449 @@
                         switch ( dst->kind ) {
                           case TypeData::Unknown:
-                                src->qualifiers.splice( src->qualifiers.end(), dst->qualifiers );
+                                src->qualifiers |= dst->qualifiers;
                                 dst = src;
                                 src = 0;
                                 break;
                           case TypeData::Basic:
-                                dst->qualifiers.splice( dst->qualifiers.end(), src->qualifiers );
+                                dst->qualifiers |= src->qualifiers;
                                 if ( src->kind != TypeData::Unknown ) {
                                         assert( src->kind == TypeData::Basic );
@@ -451 +470 @@
                                                 dst->base->aggInst->params = maybeClone( src->aggregate->actuals );
                                         } // if
-                                        dst->base->qualifiers.splice( dst->base->qualifiers.end(), src->qualifiers );
+                                        dst->base->qualifiers |= src->qualifiers;
                                         src = 0;
                                         break;
@@ -480 +499 @@
                                                 type->aggInst->params = maybeClone( o->type->aggregate->actuals );
                                         } // if
-                                        type->qualifiers.splice( type->qualifiers.end(), o->type->qualifiers );
+                                        type->qualifiers |= o->type->qualifiers;
                                 } else {
                                         type = o->type;
@@ -615 +634 @@
                                         p->type->base->aggInst->params = maybeClone( type->aggregate->actuals );
                                 } // if
-                                p->type->base->qualifiers.splice( p->type->base->qualifiers.end(), type->qualifiers );
+                                p->type->base->qualifiers |= type->qualifiers;
                                 break;
 
@@ -652 +671 @@
                                         lastArray->base->aggInst->params = maybeClone( type->aggregate->actuals );
                                 } // if
-                                lastArray->base->qualifiers.splice( lastArray->base->qualifiers.end(), type->qualifiers );
+                                lastArray->base->qualifiers |= type->qualifiers;
                                 break;
                           default:
@@ -782 +801 @@
 DeclarationNode *DeclarationNode::extractAggregate() const {
         if ( type ) {
-                TypeData *ret = type->extractAggregate();
+                TypeData *ret = typeextractAggregate( type );
                 if ( ret ) {
                         DeclarationNode *newnode = new DeclarationNode;
@@ -875 +894 @@
 
 Declaration *DeclarationNode::build() const {
-        if( !error.empty() ) throw SemanticError( error, this );
+        if ( ! error.empty() ) throw SemanticError( error, this );
         if ( type ) {
-                return type->buildDecl( name, storageClass, maybeBuild< Expression >( bitfieldWidth ), isInline, isNoreturn, linkage, maybeBuild< Initializer >(initializer) )->set_extension( extension );
+                return buildDecl( type, name, storageClass, maybeBuild< Expression >( bitfieldWidth ), isInline, isNoreturn, linkage, maybeBuild< Initializer >(initializer) )->set_extension( extension );
         } // if
         if ( ! isInline && ! isNoreturn ) {
@@ -890 +909 @@
         switch ( type->kind ) {
           case TypeData::Enum:
-                return new EnumInstType( type->buildQualifiers(), type->enumeration->name );
+                return new EnumInstType( buildQualifiers( type ), type->enumeration->name );
           case TypeData::Aggregate: {
                   ReferenceToType *ret;
                   switch ( type->aggregate->kind ) {
                         case DeclarationNode::Struct:
-                          ret = new StructInstType( type->buildQualifiers(), type->aggregate->name );
+                          ret = new StructInstType( buildQualifiers( type ), type->aggregate->name );
                           break;
                         case DeclarationNode::Union:
-                          ret = new UnionInstType( type->buildQualifiers(), type->aggregate->name );
+                          ret = new UnionInstType( buildQualifiers( type ), type->aggregate->name );
                           break;
                         case DeclarationNode::Trait:
-                          ret = new TraitInstType( type->buildQualifiers(), type->aggregate->name );
+                          ret = new TraitInstType( buildQualifiers( type ), type->aggregate->name );
                           break;
                         default:
@@ -910 +929 @@
           }
           case TypeData::Symbolic: {
-                  TypeInstType *ret = new TypeInstType( type->buildQualifiers(), type->symbolic->name, false );
+                  TypeInstType *ret = new TypeInstType( buildQualifiers( type ), type->symbolic->name, false );
                   buildList( type->symbolic->actuals, ret->get_parameters() );
                   return ret;
           }
           default:
-                return type->build();
+                return typebuild( type );
         } // switch
 }

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 21 09:43:31 2016
-// Update Count     : 501
+// Last Modified On : Thu Aug 25 21:39:40 2016
+// Update Count     : 503
 //
 
@@ -184 +184 @@
         "SizeOf", "AlignOf", "OffsetOf", "?+?", "?-?", "?*?", "?/?", "?%?", "||", "&&",
         "?|?", "?&?", "?^?", "Cast", "?<<?", "?>>?", "?<?", "?>?", "?<=?", "?>=?", "?==?", "?!=?",
-        "?=?", "?*=?", "?/=?", "?%=?", "?+=?", "?-=?", "?<<=?", "?>>=?", "?&=?", "?^=?", "?|=?",
+        "?=?", "?@=?", "?*=?", "?/=?", "?%=?", "?+=?", "?-=?", "?<<=?", "?>>=?", "?&=?", "?^=?", "?|=?",
         "?[?]", "...",
         // monadic

src/Parser/LinkageSpec.cc

@@ -14 +14 @@
 //
 
+#include <memory>
 #include <string>
 #include <cassert>
@@ -21 +22 @@
 
 LinkageSpec::Spec LinkageSpec::fromString( const std::string &spec ) {
+        std::unique_ptr<const std::string> guard(&spec);                // allocated by lexer
         if ( spec == "\"Cforall\"" ) {
                 return Cforall;
@@ -28 +30 @@
                 throw SemanticError( "Invalid linkage specifier " + spec );
         } // if
-        delete &spec;                                                                           // allocated by lexer
 }
 

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 21 11:53:59 2016
-// Update Count     : 546
+// Last Modified On : Sun Aug 28 21:14:51 2016
+// Update Count     : 575
 //
 
@@ -99 +99 @@
         InitializerNode *kids;
         bool maybeConstructed;
-};
+}; // InitializerNode
 
 //##############################################################################
@@ -126 +126 @@
         bool extension = false;
         std::unique_ptr<Expression> expr;
-};
+}; // ExpressionNode
 
 template< typename T >
@@ -145 +145 @@
         SizeOf, AlignOf, OffsetOf, Plus, Minus, Mul, Div, Mod, Or, And,
         BitOr, BitAnd, Xor, Cast, LShift, RShift, LThan, GThan, LEThan, GEThan, Eq, Neq,
-        Assign, MulAssn, DivAssn, ModAssn, PlusAssn, MinusAssn, LSAssn, RSAssn, AndAssn, ERAssn, OrAssn,
+        Assign, AtAssn, MulAssn, DivAssn, ModAssn, PlusAssn, MinusAssn, LSAssn, RSAssn, AndAssn, ERAssn, OrAssn,
         Index, Range,
         // monadic
         UnPlus, UnMinus, AddressOf, PointTo, Neg, BitNeg, Incr, IncrPost, Decr, DecrPost, LabelAddress,
         Ctor, Dtor,
-};
+}; // OperKinds
 
 struct LabelNode {
@@ -196 +196 @@
 class DeclarationNode : public ParseNode {
   public:
-        enum Qualifier { Const, Restrict, Volatile, Lvalue, Atomic };
+        enum Qualifier { Const, Restrict, Volatile, Lvalue, Atomic, NoOfQualifier };
         enum StorageClass { Extern, Static, Auto, Register, Inline, Fortran, Noreturn, Threadlocal, NoStorageClass, };
         enum BasicType { Char, Int, Float, Double, Void, Bool, Complex, Imaginary };
@@ -204 +204 @@
         enum BuiltinType { Valist };
 
+        static const char *qualifierName[];
         static const char *storageName[];
-        static const char *qualifierName[];
         static const char *basicTypeName[];
         static const char *modifierName[];
@@ -214 +214 @@
         static DeclarationNode *newFunction( std::string *name, DeclarationNode *ret, DeclarationNode *param, StatementNode *body, bool newStyle = false );
         static DeclarationNode *newQualifier( Qualifier );
+        static DeclarationNode *newForall( DeclarationNode *);
         static DeclarationNode *newStorageClass( StorageClass );
         static DeclarationNode *newBasicType( BasicType );
         static DeclarationNode *newModifier( Modifier );
-        static DeclarationNode *newForall( DeclarationNode *);
+        static DeclarationNode *newBuiltinType( BuiltinType );
         static DeclarationNode *newFromTypedef( std::string *);
         static DeclarationNode *newAggregate( Aggregate kind, const std::string *name, ExpressionNode *actuals, DeclarationNode *fields, bool body );
@@ -236 +237 @@
         static DeclarationNode *newAttr( std::string *, ExpressionNode *expr );
         static DeclarationNode *newAttr( std::string *, DeclarationNode *type );
-        static DeclarationNode *newBuiltinType( BuiltinType );
 
         DeclarationNode();
@@ -243 +243 @@
 
         DeclarationNode *addQualifiers( DeclarationNode *);
+        void checkQualifiers( const TypeData *, const TypeData * );
         DeclarationNode *copyStorageClasses( DeclarationNode *);
         DeclarationNode *addType( DeclarationNode *);
@@ -285 +286 @@
         bool get_extension() const { return extension; }
         DeclarationNode *set_extension( bool exten ) { extension = exten; return this; }
-  private:
+  public:
         // StorageClass buildStorageClass() const;
         // bool buildFuncSpecifier( StorageClass key ) const;
@@ -307 +308 @@
 
 Type *buildType( TypeData *type );
+//Type::Qualifiers buildQualifiers( const TypeData::Qualifiers & qualifiers );
 
 static inline Type * maybeMoveBuildType( const DeclarationNode *orig ) {

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 18 23:48:44 2016
-// Update Count     : 64
+// Last Modified On : Sun Aug 28 18:28:58 2016
+// Update Count     : 223
 //
 
@@ -94 +94 @@
                 break;
         } // switch
-}
+} // TypeData::TypeData
 
 TypeData::~TypeData() {
@@ -163 +163 @@
                 break;
         } // switch
-}
-
-TypeData *TypeData::clone() const {
-        TypeData *newtype = new TypeData( kind );
+} // TypeData::~TypeData
+
+TypeData * TypeData::clone() const {
+        TypeData * newtype = new TypeData( kind );
         newtype->qualifiers = qualifiers;
         newtype->base = maybeClone( base );
@@ -238 +238 @@
         } // switch
         return newtype;
-}
+} // TypeData::clone
 
 void TypeData::print( std::ostream &os, int indent ) const {
@@ -244 +244 @@
         using std::string;
 
-        printEnums( qualifiers.begin(), qualifiers.end(), DeclarationNode::qualifierName, os );
+        for ( int i = 0; i < DeclarationNode::NoOfQualifier; i += 1 ) {
+                if ( qualifiers[i] ) os << DeclarationNode::qualifierName[ i ] << ' ';
+        } // for
 
         if ( forall ) {
@@ -416 +418 @@
                 assert( false );
         } // switch
-}
-
-TypeData *TypeData::extractAggregate( bool toplevel ) const {
-        TypeData *ret = 0;
-
-        switch ( kind ) {
-          case Aggregate:
-                if ( ! toplevel && aggregate->fields ) {
-                        ret = clone();
-                        ret->qualifiers.clear();
-                } // if
-                break;
-          case Enum:
-                if ( ! toplevel && enumeration->constants ) {
-                        ret = clone();
-                        ret->qualifiers.clear();
-                } // if
-                break;
-          case AggregateInst:
-                if ( aggInst->aggregate ) {
-                        ret = aggInst->aggregate->extractAggregate( false );
-                } // if
-                break;
-          default:
-                if ( base ) {
-                        ret = base->extractAggregate( false );
-                } // if
-        } // switch
-        return ret;
-}
-
-void buildForall( const DeclarationNode *firstNode, std::list< TypeDecl* > &outputList ) {
+} // TypeData::print
+
+void buildForall( const DeclarationNode * firstNode, std::list< TypeDecl* > &outputList ) {
         buildList( firstNode, outputList );
         for ( std::list< TypeDecl* >::iterator i = outputList.begin(); i != outputList.end(); ++i ) {
@@ -453 +426 @@
                         // add assertion parameters to `type' tyvars in reverse order
                         // add dtor:  void ^?{}(T *)
-                        FunctionType *dtorType = new FunctionType( Type::Qualifiers(), false );
+                        FunctionType * dtorType = new FunctionType( Type::Qualifiers(), false );
                         dtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) );
                         (*i)->get_assertions().push_front( new FunctionDecl( "^?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, dtorType, 0, false, false ) );
 
                         // add copy ctor:  void ?{}(T *, T)
-                        FunctionType *copyCtorType = new FunctionType( Type::Qualifiers(), false );
+                        FunctionType * copyCtorType = new FunctionType( Type::Qualifiers(), false );
                         copyCtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) );
                         copyCtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ), 0 ) );
@@ -464 +437 @@
 
                         // add default ctor:  void ?{}(T *)
-                        FunctionType *ctorType = new FunctionType( Type::Qualifiers(), false );
+                        FunctionType * ctorType = new FunctionType( Type::Qualifiers(), false );
                         ctorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) );
                         (*i)->get_assertions().push_front( new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, ctorType, 0, false, false ) );
 
                         // add assignment operator:  T * ?=?(T *, T)
-                        FunctionType *assignType = new FunctionType( Type::Qualifiers(), false );
+                        FunctionType * assignType = new FunctionType( Type::Qualifiers(), false );
                         assignType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) );
                         assignType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ), 0 ) );
@@ -478 +451 @@
 }
 
-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;
-                if ( function->hasBody ) {
-                        if ( function->body ) {
-                                Statement *stmt = function->body->build();
-                                CompoundStmt *body = dynamic_cast< CompoundStmt* >( stmt );
-                                assert( body );
-                                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 );
-                        } // 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_next() ) ) {
-                        if ( cur->get_name() != "" ) {
-                                decl->get_oldIdents().insert( decl->get_oldIdents().end(), cur->get_name() );
-                        } // if
-                } // for
-                buildList( function->oldDeclList, decl->get_oldDecls() );
-                return decl;
-        } else if ( kind == TypeData::Aggregate ) {
-                return buildAggregate();
-        } else if ( kind == TypeData::Enum ) {
-                return buildEnum();
-        } else if ( kind == TypeData::Symbolic ) {
-                return buildSymbolic( name, sc );
-        } else if ( kind == TypeData::Variable ) {
-                return buildVariable();
-        } else {
-                return new ObjectDecl( name, sc, linkage, bitfieldWidth, build(), init, std::list< Attribute * >(),  isInline, isNoreturn );
-        } // if
-        return 0;
-}
-
-Type *TypeData::build() const {
-        switch ( kind ) {
-          case Unknown:
+Type * typebuild( const TypeData * td ) {
+        assert( td );
+        switch ( td->kind ) {
+          case TypeData::Unknown:
                 // fill in implicit int
-                return new BasicType( buildQualifiers(), BasicType::SignedInt );
-          case Basic:
-                return buildBasicType();
-          case Pointer:
-                return buildPointer();
-          case Array:
-                return buildArray();
-          case Function:
-                return buildFunction();
-          case AggregateInst:
-                return buildAggInst();
-          case EnumConstant:
+                return new BasicType( buildQualifiers( td ), BasicType::SignedInt );
+          case TypeData::Basic:
+                return buildBasicType( td );
+          case TypeData::Pointer:
+                return buildPointer( td );
+          case TypeData::Array:
+                return buildArray( td );
+          case TypeData::Function:
+                return buildFunction( td );
+          case TypeData::AggregateInst:
+                return buildAggInst( td );
+          case TypeData::EnumConstant:
                 // the name gets filled in later -- by SymTab::Validate
-                return new EnumInstType( buildQualifiers(), "" );
-          case SymbolicInst:
-                return buildSymbolicInst();;
-          case Tuple:
-                return buildTuple();
-          case Typeof:
-                return buildTypeof();
-          case Builtin:
-                return new VarArgsType( buildQualifiers() );
-          case Attr:
-                return buildAttr();
-          case Symbolic:
-          case Enum:
-          case Aggregate:
-          case Variable:
+                return new EnumInstType( buildQualifiers( td ), "" );
+          case TypeData::SymbolicInst:
+                return buildSymbolicInst( td );;
+          case TypeData::Tuple:
+                return buildTuple( td );
+          case TypeData::Typeof:
+                return buildTypeof( td );
+          case TypeData::Builtin:
+                return new VarArgsType( buildQualifiers( td ) );
+          case TypeData::Attr:
+                return buildAttr( td );
+          case TypeData::Symbolic:
+          case TypeData::Enum:
+          case TypeData::Aggregate:
+          case TypeData::Variable:
                 assert( false );
         } // switch
         return 0;
-}
-
-Type::Qualifiers TypeData::buildQualifiers() const {
+} // typebuild
+
+TypeData * typeextractAggregate( const TypeData * td, bool toplevel ) {
+        TypeData * ret = 0;
+
+        switch ( td->kind ) {
+          case TypeData::Aggregate:
+                if ( ! toplevel && td->aggregate->fields ) {
+                        ret = td->clone();
+                } // if
+                break;
+          case TypeData::Enum:
+                if ( ! toplevel && td->enumeration->constants ) {
+                        ret = td->clone();
+                } // if
+                break;
+          case TypeData::AggregateInst:
+                if ( td->aggInst->aggregate ) {
+                        ret = typeextractAggregate( td->aggInst->aggregate, false );
+                } // if
+                break;
+          default:
+                if ( td->base ) {
+                        ret = typeextractAggregate( td->base, false );
+                } // if
+        } // switch
+        return ret;
+} // typeextractAggregate
+
+Type::Qualifiers buildQualifiers( const TypeData * td ) {
         Type::Qualifiers q;
-        for ( std::list< DeclarationNode::Qualifier >::const_iterator i = qualifiers.begin(); i != qualifiers.end(); ++i ) {
-                switch ( *i ) {
-                  case DeclarationNode::Const:
-                        q.isConst = true;
-                        break;
-                  case DeclarationNode::Volatile:
-                        q.isVolatile = true;
-                        break;
-                  case DeclarationNode::Restrict:
-                        q.isRestrict = true;
-                        break;
-                  case DeclarationNode::Lvalue:
-                        q.isLvalue = true;
-                        break;
-                  case DeclarationNode::Atomic:
-                        q.isAtomic = true;
-                        break;
-                } // switch
-        } // for
+        q.isConst = td->qualifiers[ DeclarationNode::Const ];
+        q.isVolatile = td->qualifiers[ DeclarationNode::Volatile ];
+        q.isRestrict = td->qualifiers[ DeclarationNode::Restrict ];
+        q.isLvalue = td->qualifiers[ DeclarationNode::Lvalue ];
+        q.isAtomic = td->qualifiers[ DeclarationNode::Atomic ];;
         return q;
-}
-
-Type *TypeData::buildBasicType() const {
+} // buildQualifiers
+
+Type * buildBasicType( const TypeData * td ) {
         static const BasicType::Kind kindMap[] = { BasicType::Char, BasicType::SignedInt, BasicType::Float, BasicType::Double,
                                                                                            BasicType::Char /* void */, BasicType::Bool, BasicType::DoubleComplex,
@@ -585 +535 @@
         BasicType::Kind ret;
 
-        for ( std::list< DeclarationNode::BasicType >::const_iterator i = basic->typeSpec.begin(); i != basic->typeSpec.end(); ++i ) {
+        for ( std::list< DeclarationNode::BasicType >::const_iterator i = td->basic->typeSpec.begin(); i != td->basic->typeSpec.end(); ++i ) {
                 if ( ! init ) {
                         init = true;
                         if ( *i == DeclarationNode::Void ) {
-                                if ( basic->typeSpec.size() != 1 || ! basic->modifiers.empty() ) {
-                                        throw SemanticError( "invalid type specifier \"void\" in type: ", this );
+                                if ( td->basic->typeSpec.size() != 1 || ! td->basic->modifiers.empty() ) {
+                                        throw SemanticError( "invalid type specifier \"void\" in type: ", td );
                                 } else {
-                                        return new VoidType( buildQualifiers() );
+                                        return new VoidType( buildQualifiers( td ) );
                                 } // if
                         } else {
@@ -601 +551 @@
                           case DeclarationNode::Float:
                                 if ( sawDouble ) {
-                                        throw SemanticError( "invalid type specifier \"float\" in type: ", this );
+                                        throw SemanticError( "invalid type specifier \"float\" in type: ", td );
                                 } else {
                                         switch ( ret ) {
@@ -611 +561 @@
                                                 break;
                                           default:
-                                                throw SemanticError( "invalid type specifier \"float\" in type: ", this );
+                                                throw SemanticError( "invalid type specifier \"float\" in type: ", td );
                                         } // switch
                                 } // if
@@ -617 +567 @@
                           case DeclarationNode::Double:
                                 if ( sawDouble ) {
-                                        throw SemanticError( "duplicate type specifier \"double\" in type: ", this );
+                                        throw SemanticError( "duplicate type specifier \"double\" in type: ", td );
                                 } else {
                                         switch ( ret ) {
@@ -624 +574 @@
                                                 break;
                                           default:
-                                                throw SemanticError( "invalid type specifier \"double\" in type: ", this );
+                                                throw SemanticError( "invalid type specifier \"double\" in type: ", td );
                                         } // switch
                                 } // if
@@ -637 +587 @@
                                         break;
                                   default:
-                                        throw SemanticError( "invalid type specifier \"_Complex\" in type: ", this );
+                                        throw SemanticError( "invalid type specifier \"_Complex\" in type: ", td );
                                 } // switch
                                 break;
@@ -649 +599 @@
                                         break;
                                   default:
-                                        throw SemanticError( "invalid type specifier \"_Imaginary\" in type: ", this );
+                                        throw SemanticError( "invalid type specifier \"_Imaginary\" in type: ", td );
                                 } // switch
                                 break;
                           default:
-                                throw SemanticError( std::string( "invalid type specifier \"" ) + DeclarationNode::basicTypeName[ *i ] + "\" in type: ", this );
+                                throw SemanticError( std::string( "invalid type specifier \"" ) + DeclarationNode::basicTypeName[ *i ] + "\" in type: ", td );
                         } // switch
                 } // if
@@ -661 +611 @@
         } // for
 
-        for ( std::list< DeclarationNode::Modifier >::const_iterator i = basic->modifiers.begin(); i != basic->modifiers.end(); ++i ) {
+        for ( std::list< DeclarationNode::Modifier >::const_iterator i = td->basic->modifiers.begin(); i != td->basic->modifiers.end(); ++i ) {
                 switch ( *i ) {
                   case DeclarationNode::Long:
@@ -691 +641 @@
                                         break;
                                   default:
-                                        throw SemanticError( "invalid type modifier \"long\" in type: ", this );
+                                        throw SemanticError( "invalid type modifier \"long\" in type: ", td );
                                 } // switch
                         } // if
@@ -708 +658 @@
                                         break;
                                   default:
-                                        throw SemanticError( "invalid type modifier \"short\" in type: ", this );
+                                        throw SemanticError( "invalid type modifier \"short\" in type: ", td );
                                 } // switch
                         } // if
@@ -717 +667 @@
                                 ret = BasicType::SignedInt;
                         } else if ( sawSigned ) {
-                                throw SemanticError( "duplicate type modifer \"signed\" in type: ", this );
+                                throw SemanticError( "duplicate type modifer \"signed\" in type: ", td );
                         } else {
                                 switch ( ret ) {
@@ -733 +683 @@
                                         break;
                                   default:
-                                        throw SemanticError( "invalid type modifer \"signed\" in type: ", this );
+                                        throw SemanticError( "invalid type modifer \"signed\" in type: ", td );
                                 } // switch
                         } // if
@@ -742 +692 @@
                                 ret = BasicType::UnsignedInt;
                         } else if ( sawSigned ) {
-                                throw SemanticError( "invalid type modifer \"unsigned\" in type: ", this );
+                                throw SemanticError( "invalid type modifer \"unsigned\" in type: ", td );
                         } else {
                                 switch ( ret ) {
@@ -761 +711 @@
                                         break;
                                   default:
-                                        throw SemanticError( "invalid type modifer \"unsigned\" in type: ", this );
+                                        throw SemanticError( "invalid type modifer \"unsigned\" in type: ", td );
                                 } // switch
                         } // if
@@ -772 +722 @@
         } // for
 
-        BasicType *bt;
+        BasicType * bt;
         if ( ! init ) {
-                bt = new BasicType( buildQualifiers(), BasicType::SignedInt );
+                bt = new BasicType( buildQualifiers( td ), BasicType::SignedInt );
         } else {
-                bt = new BasicType( buildQualifiers(), ret );
+                bt = new BasicType( buildQualifiers( td ), ret );
         } // if
-        buildForall( forall, bt->get_forall() );
+        buildForall( td->forall, bt->get_forall() );
         return bt;
-}
-
-
-PointerType *TypeData::buildPointer() const {
-        PointerType *pt;
-        if ( base ) {
-                pt = new PointerType( buildQualifiers(), base->build() );
+} // buildBasicType
+
+PointerType * buildPointer( const TypeData * td ) {
+        PointerType * pt;
+        if ( td->base ) {
+                pt = new PointerType( buildQualifiers( td ), typebuild( td->base ) );
         } else {
-                pt = new PointerType( buildQualifiers(), new BasicType( Type::Qualifiers(), BasicType::SignedInt ) );
+                pt = new PointerType( buildQualifiers( td ), new BasicType( Type::Qualifiers(), BasicType::SignedInt ) );
         } // if
-        buildForall( forall, pt->get_forall() );
+        buildForall( td->forall, pt->get_forall() );
         return pt;
-}
-
-ArrayType *TypeData::buildArray() const {
-        ArrayType *at;
-        if ( base ) {
-                at = new ArrayType( buildQualifiers(), base->build(), maybeBuild< Expression >( array->dimension ),
-                                                        array->isVarLen, array->isStatic );
+} // buildPointer
+
+ArrayType * buildArray( const TypeData * td ) {
+        ArrayType * at;
+        if ( td->base ) {
+                at = new ArrayType( buildQualifiers( td ), typebuild( td->base ), maybeBuild< Expression >( td->array->dimension ),
+                                                        td->array->isVarLen, td->array->isStatic );
         } else {
-                at = new ArrayType( buildQualifiers(), new BasicType( Type::Qualifiers(), BasicType::SignedInt ),
-                                                        maybeBuild< Expression >( array->dimension ), array->isVarLen, array->isStatic );
+                at = new ArrayType( buildQualifiers( td ), new BasicType( Type::Qualifiers(), BasicType::SignedInt ),
+                                                        maybeBuild< Expression >( td->array->dimension ), td->array->isVarLen, td->array->isStatic );
         } // if
-        buildForall( forall, at->get_forall() );
+        buildForall( td->forall, at->get_forall() );
         return at;
-}
-
-FunctionType *TypeData::buildFunction() const {
-        assert( kind == Function );
-        bool hasEllipsis = function->params ? function->params->get_hasEllipsis() : true;
-        if ( ! function->params ) hasEllipsis = ! function->newStyle;
-        FunctionType *ft = new FunctionType( buildQualifiers(), hasEllipsis );
-        buildList( function->params, ft->get_parameters() );
-        buildForall( forall, ft->get_forall() );
-        if ( base ) {
-                switch ( base->kind ) {
-                  case Tuple:
-                        buildList( base->tuple->members, ft->get_returnVals() );
+} // buildPointer
+
+AggregateDecl * buildAggregate( const TypeData * td ) {
+        assert( td->kind == TypeData::Aggregate );
+        AggregateDecl * at;
+        switch ( td->aggregate->kind ) {
+          case DeclarationNode::Struct:
+                at = new StructDecl( td->aggregate->name );
+                buildForall( td->aggregate->params, at->get_parameters() );
+                break;
+          case DeclarationNode::Union:
+                at = new UnionDecl( td->aggregate->name );
+                buildForall( td->aggregate->params, at->get_parameters() );
+                break;
+          case DeclarationNode::Trait:
+                at = new TraitDecl( td->aggregate->name );
+                buildList( td->aggregate->params, at->get_parameters() );
+                break;
+          default:
+                assert( false );
+        } // switch
+
+        buildList( td->aggregate->fields, at->get_members() );
+        at->set_body( td->aggregate->body );
+
+        return at;
+} // buildAggregate
+
+ReferenceToType * buildAggInst( const TypeData * td ) {
+        assert( td->kind == TypeData::AggregateInst );
+
+        ReferenceToType * ret;
+        if ( td->aggInst->aggregate->kind == TypeData::Enum ) {
+                ret = new EnumInstType( buildQualifiers( td ), td->aggInst->aggregate->enumeration->name );
+        } else {
+                assert( td->aggInst->aggregate->kind == TypeData::Aggregate );
+                switch ( td->aggInst->aggregate->aggregate->kind ) {
+                  case DeclarationNode::Struct:
+                        ret = new StructInstType( buildQualifiers( td ), td->aggInst->aggregate->aggregate->name );
+                        break;
+                  case DeclarationNode::Union:
+                        ret = new UnionInstType( buildQualifiers( td ), td->aggInst->aggregate->aggregate->name );
+                        break;
+                  case DeclarationNode::Trait:
+                        ret = new TraitInstType( buildQualifiers( td ), td->aggInst->aggregate->aggregate->name );
                         break;
                   default:
-                        ft->get_returnVals().push_back( dynamic_cast< DeclarationWithType* >( base->buildDecl( "", DeclarationNode::NoStorageClass, 0, false, false, LinkageSpec::Cforall ) ) );
+                        assert( false );
+                } // switch
+        } // if
+        buildList( td->aggInst->params, ret->get_parameters() );
+        buildForall( td->forall, ret->get_forall() );
+        return ret;
+} // buildAggInst
+
+NamedTypeDecl * buildSymbolic( const TypeData * td, const std::string & name, DeclarationNode::StorageClass sc ) {
+        assert( td->kind == TypeData::Symbolic );
+        NamedTypeDecl * ret;
+        assert( td->base );
+        if ( td->symbolic->isTypedef ) {
+                ret = new TypedefDecl( name, sc, typebuild( td->base ) );
+        } else {
+                ret = new TypeDecl( name, sc, typebuild( td->base ), TypeDecl::Any );
+        } // if
+        buildList( td->symbolic->params, ret->get_parameters() );
+        buildList( td->symbolic->assertions, ret->get_assertions() );
+        return ret;
+} // buildSymbolic
+
+TypeDecl * buildVariable( const TypeData * td ) {
+        assert( td->kind == TypeData::Variable );
+        static const TypeDecl::Kind kindMap[] = { TypeDecl::Any, TypeDecl::Ftype, TypeDecl::Dtype };
+
+        TypeDecl * ret = new TypeDecl( td->variable->name, DeclarationNode::NoStorageClass, 0, kindMap[ td->variable->tyClass ] );
+        buildList( td->variable->assertions, ret->get_assertions() );
+        return ret;
+} // buildSymbolic
+
+EnumDecl * buildEnum( const TypeData * td ) {
+        assert( td->kind == TypeData::Enum );
+        EnumDecl * ret = new EnumDecl( td->enumeration->name );
+        buildList( td->enumeration->constants, ret->get_members() );
+        std::list< Declaration * >::iterator members = ret->get_members().begin();
+        for ( const DeclarationNode * cur = td->enumeration-> constants; cur != nullptr; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ), ++members ) {
+                if ( cur->has_enumeratorValue() ) {
+                        ObjectDecl * member = dynamic_cast< ObjectDecl * >(* members);
+                        member->set_init( new SingleInit( maybeMoveBuild< Expression >( cur->consume_enumeratorValue() ), std::list< Expression * >() ) );
+                } // if
+        } // for
+        return ret;
+} // buildEnum
+
+TypeInstType * buildSymbolicInst( const TypeData * td ) {
+        assert( td->kind == TypeData::SymbolicInst );
+        TypeInstType * ret = new TypeInstType( buildQualifiers( td ), td->symbolic->name, false );
+        buildList( td->symbolic->actuals, ret->get_parameters() );
+        buildForall( td->forall, ret->get_forall() );
+        return ret;
+} // buildSymbolicInst
+
+TupleType * buildTuple( const TypeData * td ) {
+        assert( td->kind == TypeData::Tuple );
+        TupleType * ret = new TupleType( buildQualifiers( td ) );
+        buildTypeList( td->tuple->members, ret->get_types() );
+        buildForall( td->forall, ret->get_forall() );
+        return ret;
+} // buildTuple
+
+TypeofType * buildTypeof( const TypeData * td ) {
+        assert( td->kind == TypeData::Typeof );
+        assert( td->typeexpr );
+        assert( td->typeexpr->expr );
+        return new TypeofType( buildQualifiers( td ), td->typeexpr->expr->build() );
+} // buildTypeof
+
+AttrType * buildAttr( const TypeData * td ) {
+        assert( td->kind == TypeData::Attr );
+        assert( td->attr );
+        AttrType * ret;
+        if ( td->attr->expr ) {
+                ret = new AttrType( buildQualifiers( td ), td->attr->name, td->attr->expr->build() );
+        } else {
+                assert( td->attr->type );
+                ret = new AttrType( buildQualifiers( td ), td->attr->name, td->attr->type->buildType() );
+        } // if
+        return ret;
+} // buildAttr
+
+Declaration * buildDecl( const TypeData * td, std::string name, DeclarationNode::StorageClass sc, Expression * bitfieldWidth, bool isInline, bool isNoreturn, LinkageSpec::Spec linkage, Initializer * init ) {
+        if ( td->kind == TypeData::Function ) {
+                FunctionDecl * decl;
+                if ( td->function->hasBody ) {
+                        if ( td->function->body ) {
+                                Statement * stmt = td->function->body->build();
+                                CompoundStmt * body = dynamic_cast< CompoundStmt* >( stmt );
+                                assert( body );
+                                decl = new FunctionDecl( name, sc, linkage, buildFunction( td ), body, isInline, isNoreturn );
+                        } else {
+                                // std::list< Label > ls;
+                                decl = new FunctionDecl( name, sc, linkage, buildFunction( td ), new CompoundStmt( std::list< Label >() ), isInline, isNoreturn );
+                        } // if
+                } else {
+                        decl = new FunctionDecl( name, sc, linkage, buildFunction( td ), 0, isInline, isNoreturn );
+                } // if
+                for ( DeclarationNode * cur = td->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() );
+                        } // if
+                } // for
+                buildList( td->function->oldDeclList, decl->get_oldDecls() );
+                return decl;
+        } else if ( td->kind == TypeData::Aggregate ) {
+                return buildAggregate( td );
+        } else if ( td->kind == TypeData::Enum ) {
+                return buildEnum( td );
+        } else if ( td->kind == TypeData::Symbolic ) {
+                return buildSymbolic( td, name, sc );
+        } else if ( td->kind == TypeData::Variable ) {
+                return buildVariable( td );
+        } else {
+                return new ObjectDecl( name, sc, linkage, bitfieldWidth, typebuild( td ), init, std::list< Attribute * >(), isInline, isNoreturn );
+        } // if
+        return 0;
+} // buildDecl
+
+FunctionType * buildFunction( const TypeData * td ) {
+        assert( td->kind == TypeData::Function );
+        bool hasEllipsis = td->function->params ? td->function->params->get_hasEllipsis() : true;
+        if ( ! td->function->params ) hasEllipsis = ! td->function->newStyle;
+        FunctionType * ft = new FunctionType( buildQualifiers( td ), hasEllipsis );
+        buildList( td->function->params, ft->get_parameters() );
+        buildForall( td->forall, ft->get_forall() );
+        if ( td->base ) {
+                switch ( td->base->kind ) {
+                  case TypeData::Tuple:
+                        buildList( td->base->tuple->members, ft->get_returnVals() );
+                        break;
+                  default:
+                        ft->get_returnVals().push_back( dynamic_cast< DeclarationWithType* >( buildDecl( td->base,  "", DeclarationNode::NoStorageClass, 0, false, false, LinkageSpec::Cforall ) ) );
                 } // switch
         } else {
@@ -826 +938 @@
         } // if
         return ft;
-}
-
-AggregateDecl *TypeData::buildAggregate() const {
-        assert( kind == Aggregate );
-        AggregateDecl *at;
-        switch ( aggregate->kind ) {
-          case DeclarationNode::Struct:
-                at = new StructDecl( aggregate->name );
-                buildForall( aggregate->params, at->get_parameters() );
-                break;
-          case DeclarationNode::Union:
-                at = new UnionDecl( aggregate->name );
-                buildForall( aggregate->params, at->get_parameters() );
-                break;
-          case DeclarationNode::Trait:
-                at = new TraitDecl( aggregate->name );
-                buildList( aggregate->params, at->get_parameters() );
-                break;
-          default:
-                assert( false );
-        } // switch
-
-        buildList( aggregate->fields, at->get_members() );
-        at->set_body( aggregate->body );
-
-        return at;
-}
-
-ReferenceToType *TypeData::buildAggInst() const {
-        assert( kind == AggregateInst );
-
-        ReferenceToType *ret;
-        if ( aggInst->aggregate->kind == Enum ) {
-                ret = new EnumInstType( buildQualifiers(), aggInst->aggregate->enumeration->name );
-        } else {
-                assert( aggInst->aggregate->kind == Aggregate );
-                switch ( aggInst->aggregate->aggregate->kind ) {
-                  case DeclarationNode::Struct:
-                        ret = new StructInstType( buildQualifiers(), aggInst->aggregate->aggregate->name );
-                        break;
-                  case DeclarationNode::Union:
-                        ret = new UnionInstType( buildQualifiers(), aggInst->aggregate->aggregate->name );
-                        break;
-                  case DeclarationNode::Trait:
-                        ret = new TraitInstType( buildQualifiers(), aggInst->aggregate->aggregate->name );
-                        break;
-                  default:
-                        assert( false );
-                } // switch
-        } // if
-        buildList( aggInst->params, ret->get_parameters() );
-        buildForall( forall, ret->get_forall() );
-        return ret;
-}
-
-NamedTypeDecl *TypeData::buildSymbolic( const std::string &name, DeclarationNode::StorageClass sc ) const {
-        assert( kind == Symbolic );
-        NamedTypeDecl *ret;
-        if ( symbolic->isTypedef ) {
-                ret = new TypedefDecl( name, sc, maybeBuild< Type >( base ) );
-        } else {
-                ret = new TypeDecl( name, sc, maybeBuild< Type >( base ), TypeDecl::Any );
-        } // if
-        buildList( symbolic->params, ret->get_parameters() );
-        buildList( symbolic->assertions, ret->get_assertions() );
-        return ret;
-}
-
-TypeDecl *TypeData::buildVariable() const {
-        assert( kind == Variable );
-        static const TypeDecl::Kind kindMap[] = { TypeDecl::Any, TypeDecl::Ftype, TypeDecl::Dtype };
-
-        TypeDecl *ret = new TypeDecl( variable->name, DeclarationNode::NoStorageClass, 0, kindMap[ variable->tyClass ] );
-        buildList( variable->assertions, ret->get_assertions() );
-        return ret;
-}
-
-EnumDecl *TypeData::buildEnum() const {
-        assert( kind == Enum );
-        EnumDecl *ret = new EnumDecl( enumeration->name );
-        buildList( enumeration->constants, ret->get_members() );
-        std::list< Declaration * >::iterator members = ret->get_members().begin();
-        for ( const DeclarationNode *cur = enumeration->constants; cur != nullptr; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ), ++members ) {
-                if ( cur->has_enumeratorValue() ) {
-                        ObjectDecl *member = dynamic_cast< ObjectDecl * >(*members);
-                        member->set_init( new SingleInit( maybeMoveBuild< Expression >( cur->consume_enumeratorValue() ), std::list< Expression * >() ) );
-                } // if
-        } // for
-        return ret;
-}
-
-TypeInstType *TypeData::buildSymbolicInst() const {
-        assert( kind == SymbolicInst );
-        TypeInstType *ret = new TypeInstType( buildQualifiers(), symbolic->name, false );
-        buildList( symbolic->actuals, ret->get_parameters() );
-        buildForall( forall, ret->get_forall() );
-        return ret;
-}
-
-TupleType *TypeData::buildTuple() const {
-        assert( kind == Tuple );
-        TupleType *ret = new TupleType( buildQualifiers() );
-        buildTypeList( tuple->members, ret->get_types() );
-        buildForall( forall, ret->get_forall() );
-        return ret;
-}
-
-TypeofType *TypeData::buildTypeof() const {
-        assert( kind == Typeof );
-        assert( typeexpr );
-        assert( typeexpr->expr );
-        TypeofType *ret = new TypeofType( buildQualifiers(), typeexpr->expr->build() );
-        return ret;
-}
-
-AttrType *TypeData::buildAttr() const {
-        assert( kind == Attr );
-        assert( attr );
-        AttrType *ret;
-        if ( attr->expr ) {
-                ret = new AttrType( buildQualifiers(), attr->name, attr->expr->build() );
-        } else {
-                assert( attr->type );
-                ret = new AttrType( buildQualifiers(), attr->name, attr->type->buildType() );
-        } // if
-        return ret;
-}
+} // buildFunction
 
 // Local Variables: //

src/Parser/TypeData.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 18 23:48:52 2016
-// Update Count     : 22
+// Last Modified On : Sun Aug 28 22:39:00 2016
+// Update Count     : 85
 //
 
@@ -17 +17 @@
 #define TYPEDATA_H
 
-#include <list>
+#include <bitset>
 
 #include "ParseNode.h"
@@ -25 +25 @@
         enum Kind { Unknown, Basic, Pointer, Array, Function, Aggregate, AggregateInst,
                                 Enum, EnumConstant, Symbolic, SymbolicInst, Variable, Tuple, Typeof, Builtin, Attr } kind;
-
-        TypeData( Kind k = Unknown );
-        ~TypeData();
-        void print( std::ostream &, int indent = 0 ) const;
-        TypeData * clone() const;
-
-        Type * build() const;
-        FunctionType * buildFunction() const;
-
-        TypeData * base;
-        std::list< DeclarationNode::Qualifier > qualifiers;
-        DeclarationNode * forall;
 
         struct Basic_t {
@@ -109 +97 @@
         };
 
+        TypeData * base;
+        typedef std::bitset< DeclarationNode::NoOfQualifier > Qualifiers;
+        Qualifiers qualifiers;
+        DeclarationNode * forall;
+
         union {
                 Basic_t * basic;
@@ -124 +117 @@
         };
 
-        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::Spec linkage, Initializer * init = 0 ) const;
-        // helper functions for build()
-        Type::Qualifiers buildQualifiers() const;
-        Type * buildBasicType() const;
-        PointerType * buildPointer() const;
-        ArrayType * buildArray() const;
-        AggregateDecl * buildAggregate() const;
-        ReferenceToType * buildAggInst() const;
-        NamedTypeDecl * buildSymbolic( const std::string &name, DeclarationNode::StorageClass sc ) const;
-        TypeDecl* buildVariable() const;
-        EnumDecl* buildEnum() const;
-        TypeInstType * buildSymbolicInst() const;
-        TupleType * buildTuple() const;
-        TypeofType * buildTypeof() const;
-        AttrType * buildAttr() const;
+        TypeData( Kind k = Unknown );
+        ~TypeData();
+        void print( std::ostream &, int indent = 0 ) const;
+        TypeData * clone() const;
 };
+
+Type * typebuild( const TypeData * );
+TypeData * typeextractAggregate( const TypeData * td, bool toplevel = true );
+Type::Qualifiers buildQualifiers( const TypeData * td );
+Type * buildBasicType( const TypeData * );
+PointerType * buildPointer( const TypeData * );
+ArrayType * buildArray( const TypeData * );
+AggregateDecl * buildAggregate( const TypeData * );
+ReferenceToType * buildAggInst( const TypeData * );
+NamedTypeDecl * buildSymbolic( const TypeData *, const std::string &name, DeclarationNode::StorageClass sc );
+TypeDecl * buildVariable( const TypeData * );
+EnumDecl * buildEnum( const TypeData * );
+TypeInstType * buildSymbolicInst( const TypeData * );
+TupleType * buildTuple( const TypeData * );
+TypeofType * buildTypeof( const TypeData * );
+AttrType * buildAttr( const TypeData * );
+Declaration * buildDecl( const TypeData *, std::string, DeclarationNode::StorageClass, Expression *, bool isInline, bool isNoreturn, LinkageSpec::Spec, Initializer * init = 0 );
+FunctionType * buildFunction( const TypeData * );
 
 #endif // TYPEDATA_H

src/Parser/lex.cc

@@ -1469 +1469 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Thu Aug 18 22:17:30 2016
- * Update Count     : 472
+ * Last Modified On : Wed Aug 24 13:27:04 2016
+ * Update Count     : 487
  */
 #line 20 "lex.ll"
@@ -1827 +1827 @@
 {
         /* " stop highlighting */
-        static char *filename[FILENAME_MAX];                            // temporarily store current source-file name
+        static char filename[FILENAME_MAX];                                     // temporarily store current source-file name
         char *end_num;
         char *begin_string, *end_string;
@@ -1842 +1842 @@
                 //std::cout << "file " << filename << " line " << lineno << std::endl;
                 yylineno = lineno;
-                yyfilename = filename[0];
+                yyfilename = filename;
         } // if
 }
@@ -2426 +2426 @@
 YY_RULE_SETUP
 #line 290 "lex.ll"
-{ BEGIN QUOTE; rm_underscore(); strtext = new std::string; *strtext += std::string( yytext ); }
+{ BEGIN QUOTE; rm_underscore(); strtext = new std::string( yytext, yyleng ); }
         YY_BREAK
 case 116:
 YY_RULE_SETUP
 #line 291 "lex.ll"
-{ *strtext += std::string( yytext ); }
+{ strtext->append( yytext, yyleng ); }
         YY_BREAK
 case 117:
@@ -2437 +2437 @@
 YY_RULE_SETUP
 #line 292 "lex.ll"
-{ BEGIN 0; *strtext += std::string( yytext); RETURN_STR(CHARACTERconstant); }
+{ BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(CHARACTERconstant); }
         YY_BREAK
 /* ' stop highlighting */
@@ -2444 +2444 @@
 YY_RULE_SETUP
 #line 296 "lex.ll"
-{ BEGIN STRING; rm_underscore(); strtext = new std::string; *strtext += std::string( yytext ); }
+{ BEGIN STRING; rm_underscore(); strtext = new std::string( yytext, yyleng ); }
         YY_BREAK
 case 119:
 YY_RULE_SETUP
 #line 297 "lex.ll"
-{ *strtext += std::string( yytext ); }
+{ strtext->append( yytext, yyleng ); }
         YY_BREAK
 case 120:
@@ -2455 +2455 @@
 YY_RULE_SETUP
 #line 298 "lex.ll"
-{ BEGIN 0; *strtext += std::string( yytext ); RETURN_STR(STRINGliteral); }
+{ BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(STRINGliteral); }
         YY_BREAK
 /* " stop highlighting */
@@ -2462 +2462 @@
 YY_RULE_SETUP
 #line 302 "lex.ll"
-{ rm_underscore(); *strtext += std::string( yytext ); }
+{ rm_underscore(); strtext->append( yytext, yyleng ); }
         YY_BREAK
 case 122:
@@ -2473 +2473 @@
 YY_RULE_SETUP
 #line 304 "lex.ll"
-{ *strtext += std::string( yytext ); } // unknown escape character
+{ strtext->append( yytext, yyleng ); } // unknown escape character
         YY_BREAK
 /* punctuation */

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Thu Aug 18 22:17:30 2016
- * Update Count     : 472
+ * Last Modified On : Wed Aug 24 13:27:04 2016
+ * Update Count     : 487
  */
 
@@ -141 +141 @@
 ^{h_white}*"#"{h_white}*[0-9]+{h_white}*["][^"\n]+["].*"\n" {
         /* " stop highlighting */
-        static char *filename[FILENAME_MAX];                            // temporarily store current source-file name
+        static char filename[FILENAME_MAX];                                     // temporarily store current source-file name
         char *end_num;
         char *begin_string, *end_string;
@@ -156 +156 @@
                 //std::cout << "file " << filename << " line " << lineno << std::endl;
                 yylineno = lineno;
-                yyfilename = filename[0];
+                yyfilename = filename;
         } // if
 }
@@ -288 +288 @@
 
                                 /* character constant, allows empty value */
-({cwide_prefix}[_]?)?['] { BEGIN QUOTE; rm_underscore(); strtext = new std::string; *strtext += std::string( yytext ); }
-<QUOTE>[^'\\\n]* { *strtext += std::string( yytext ); }
-<QUOTE>['\n]    { BEGIN 0; *strtext += std::string( yytext); RETURN_STR(CHARACTERconstant); }
+({cwide_prefix}[_]?)?['] { BEGIN QUOTE; rm_underscore(); strtext = new std::string( yytext, yyleng ); }
+<QUOTE>[^'\\\n]* { strtext->append( yytext, yyleng ); }
+<QUOTE>['\n]    { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(CHARACTERconstant); }
                                 /* ' stop highlighting */
 
                                 /* string constant */
-({swide_prefix}[_]?)?["] { BEGIN STRING; rm_underscore(); strtext = new std::string; *strtext += std::string( yytext ); }
-<STRING>[^"\\\n]* { *strtext += std::string( yytext ); }
-<STRING>["\n]   { BEGIN 0; *strtext += std::string( yytext ); RETURN_STR(STRINGliteral); }
+({swide_prefix}[_]?)?["] { BEGIN STRING; rm_underscore(); strtext = new std::string( yytext, yyleng ); }
+<STRING>[^"\\\n]* { strtext->append( yytext, yyleng ); }
+<STRING>["\n]   { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(STRINGliteral); }
                                 /* " stop highlighting */
 
                                 /* common character/string constant */
-<QUOTE,STRING>{escape_seq} { rm_underscore(); *strtext += std::string( yytext ); }
+<QUOTE,STRING>{escape_seq} { rm_underscore(); strtext->append( yytext, yyleng ); }
 <QUOTE,STRING>"\\"{h_white}*"\n" {}                                             // continuation (ALSO HANDLED BY CPP)
-<QUOTE,STRING>"\\" { *strtext += std::string( yytext ); } // unknown escape character
+<QUOTE,STRING>"\\" { strtext->append( yytext, yyleng ); } // unknown escape character
 
                                 /* punctuation */

src/Parser/parser.cc

@@ -83 +83 @@
 #include "LinkageSpec.h"
 
-union DeclQualifiers {
-        unsigned int value;                                                                     // assume 32-bits
-        struct {
-                bool Extern : 1;
-                bool Static : 1;
-                bool Auto : 1;
-                bool Register : 1;
-                bool Inline : 1;
-                bool Fortran : 1;
-                bool Noreturn : 1;
-                bool Threadlocal : 1;
-                bool Extension : 1;
-                bool Lvalue : 1;
-                bool Const : 1;
-                bool Volatile : 1;
-                bool Restrict : 1;
-                bool Atomic : 1;
-        } qual;
-}; // DeclQualifiers
-DeclQualifiers declQualifiers = { 0 };
-
-union DeclType {
-        unsigned int value;                                                                     // assume 32-bits
-        struct {
-                bool Char : 1;
-                bool Bool : 1;
-                bool Short : 1;
-                bool Int : 1;
-                bool Float : 1;
-                bool Double : 1;
-                bool Long : 1;
-                bool Signed : 1;
-                bool Unsigned : 1;
-                bool Void : 1;
-                bool Complex : 1;
-                bool Imaginary : 1;
-                bool Valist : 1;
-        } type;
-}; // DeclType
-DeclType declTypes = { 0 };
-
 extern DeclarationNode * parseTree;
 extern LinkageSpec::Spec linkage;
@@ -137 +96 @@
 
 /* Line 268 of yacc.c  */
-#line 140 "Parser/parser.cc"
+#line 99 "Parser/parser.cc"
 
 /* Enabling traces.  */
@@ -388 +347 @@
 
 /* Line 293 of yacc.c  */
-#line 156 "parser.yy"
+#line 115 "parser.yy"
 
         Token tok;
@@ -408 +367 @@
 
 /* Line 293 of yacc.c  */
-#line 411 "Parser/parser.cc"
+#line 370 "Parser/parser.cc"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
@@ -420 +379 @@
 
 /* Line 343 of yacc.c  */
-#line 423 "Parser/parser.cc"
+#line 382 "Parser/parser.cc"
 
 #ifdef short
@@ -639 +598 @@
 #define YYFINAL  250
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   10841
+#define YYLAST   10863
 
 /* YYNTOKENS -- Number of terminals.  */
@@ -646 +605 @@
 #define YYNNTS  241
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  750
+#define YYNRULES  751
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  1554
+#define YYNSTATES  1555
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
@@ -716 +675 @@
      326,   331,   337,   339,   341,   345,   348,   349,   351,   353,
      355,   357,   359,   361,   363,   365,   367,   369,   371,   373,
-     376,   382,   389,   397,   399,   403,   405,   409,   410,   412,
-     414,   416,   418,   420,   422,   424,   426,   428,   435,   440,
-     443,   451,   453,   457,   459,   462,   464,   467,   469,   472,
-     475,   481,   489,   495,   505,   511,   521,   523,   527,   529,
-     531,   535,   539,   542,   544,   547,   550,   551,   553,   556,
-     560,   561,   563,   566,   570,   574,   579,   580,   582,   584,
-     587,   593,   601,   608,   615,   620,   624,   629,   632,   636,
-     639,   643,   647,   651,   655,   661,   665,   669,   674,   676,
-     682,   689,   695,   702,   712,   723,   733,   744,   747,   749,
-     752,   755,   758,   760,   767,   776,   787,   800,   815,   816,
-     818,   819,   821,   823,   827,   832,   840,   841,   843,   847,
-     849,   853,   855,   857,   859,   863,   865,   867,   869,   873,
-     874,   876,   880,   885,   887,   891,   893,   895,   899,   903,
-     907,   911,   915,   918,   922,   929,   933,   937,   942,   944,
-     947,   950,   954,   960,   969,   977,   985,   991,  1001,  1004,
-    1007,  1013,  1017,  1023,  1028,  1032,  1037,  1042,  1050,  1054,
-    1058,  1062,  1066,  1071,  1078,  1080,  1082,  1084,  1086,  1088,
-    1090,  1092,  1094,  1095,  1097,  1099,  1102,  1104,  1106,  1108,
-    1110,  1112,  1114,  1116,  1117,  1123,  1125,  1128,  1132,  1134,
-    1137,  1139,  1141,  1143,  1145,  1147,  1149,  1151,  1153,  1155,
+     375,   378,   384,   391,   399,   401,   405,   407,   411,   412,
+     414,   416,   418,   420,   422,   424,   426,   428,   430,   437,
+     442,   445,   453,   455,   459,   461,   464,   466,   469,   471,
+     474,   477,   483,   491,   497,   507,   513,   523,   525,   529,
+     531,   533,   537,   541,   544,   546,   549,   552,   553,   555,
+     558,   562,   563,   565,   568,   572,   576,   581,   582,   584,
+     586,   589,   595,   603,   610,   617,   622,   626,   631,   634,
+     638,   641,   645,   649,   653,   657,   663,   667,   671,   676,
+     678,   684,   691,   697,   704,   714,   725,   735,   746,   749,
+     751,   754,   757,   760,   762,   769,   778,   789,   802,   817,
+     818,   820,   821,   823,   825,   829,   834,   842,   843,   845,
+     849,   851,   855,   857,   859,   861,   865,   867,   869,   871,
+     875,   876,   878,   882,   887,   889,   893,   895,   897,   901,
+     905,   909,   913,   917,   920,   924,   931,   935,   939,   944,
+     946,   949,   952,   956,   962,   971,   979,   987,   993,  1003,
+    1006,  1009,  1015,  1019,  1025,  1030,  1034,  1039,  1044,  1052,
+    1056,  1060,  1064,  1068,  1073,  1080,  1082,  1084,  1086,  1088,
+    1090,  1092,  1094,  1096,  1097,  1099,  1101,  1104,  1106,  1108,
+    1110,  1112,  1114,  1116,  1118,  1119,  1125,  1127,  1130,  1134,
+    1136,  1139,  1141,  1143,  1145,  1147,  1149,  1151,  1153,  1155,
     1157,  1159,  1161,  1163,  1165,  1167,  1169,  1171,  1173,  1175,
-    1177,  1179,  1181,  1184,  1187,  1191,  1195,  1197,  1201,  1203,
-    1206,  1209,  1212,  1217,  1222,  1227,  1232,  1234,  1237,  1240,
-    1244,  1246,  1249,  1252,  1254,  1257,  1260,  1264,  1266,  1269,
-    1272,  1274,  1276,  1281,  1284,  1285,  1292,  1300,  1303,  1306,
-    1309,  1310,  1313,  1316,  1320,  1323,  1327,  1329,  1332,  1336,
-    1339,  1342,  1347,  1348,  1350,  1353,  1356,  1358,  1359,  1361,
-    1364,  1367,  1373,  1376,  1377,  1385,  1388,  1393,  1394,  1397,
-    1398,  1400,  1402,  1404,  1410,  1416,  1422,  1424,  1430,  1436,
-    1446,  1448,  1454,  1455,  1457,  1459,  1465,  1467,  1469,  1475,
-    1481,  1483,  1487,  1491,  1496,  1498,  1500,  1502,  1504,  1507,
-    1509,  1513,  1517,  1519,  1522,  1524,  1528,  1530,  1532,  1534,
-    1536,  1538,  1540,  1542,  1544,  1546,  1548,  1550,  1553,  1555,
-    1557,  1559,  1562,  1563,  1566,  1569,  1571,  1576,  1577,  1579,
-    1582,  1586,  1591,  1594,  1597,  1599,  1602,  1605,  1611,  1617,
-    1625,  1632,  1634,  1637,  1640,  1644,  1646,  1649,  1652,  1657,
-    1660,  1665,  1666,  1671,  1674,  1676,  1678,  1680,  1681,  1684,
-    1690,  1696,  1710,  1712,  1714,  1718,  1722,  1725,  1729,  1733,
-    1736,  1741,  1743,  1750,  1760,  1761,  1773,  1775,  1779,  1783,
-    1787,  1789,  1791,  1797,  1800,  1806,  1807,  1809,  1811,  1815,
-    1816,  1818,  1820,  1822,  1824,  1825,  1832,  1835,  1837,  1840,
-    1845,  1848,  1852,  1856,  1860,  1865,  1871,  1877,  1883,  1890,
-    1892,  1894,  1896,  1900,  1901,  1907,  1908,  1910,  1912,  1915,
-    1922,  1924,  1928,  1929,  1931,  1936,  1938,  1940,  1942,  1944,
-    1947,  1949,  1952,  1955,  1957,  1961,  1964,  1968,  1972,  1975,
-    1980,  1985,  1989,  1998,  2002,  2005,  2007,  2010,  2017,  2026,
-    2030,  2033,  2037,  2041,  2046,  2051,  2055,  2057,  2059,  2061,
-    2066,  2073,  2077,  2080,  2084,  2088,  2093,  2098,  2102,  2105,
-    2107,  2110,  2113,  2115,  2119,  2122,  2126,  2130,  2133,  2138,
-    2143,  2147,  2154,  2163,  2167,  2170,  2172,  2175,  2178,  2181,
-    2185,  2189,  2192,  2197,  2202,  2206,  2213,  2222,  2226,  2229,
-    2231,  2234,  2237,  2239,  2241,  2244,  2248,  2252,  2255,  2260,
-    2267,  2276,  2278,  2281,  2284,  2286,  2289,  2292,  2296,  2300,
-    2302,  2307,  2312,  2316,  2322,  2331,  2335,  2338,  2342,  2344,
-    2350,  2356,  2363,  2370,  2372,  2375,  2378,  2380,  2383,  2386,
-    2390,  2394,  2396,  2401,  2406,  2410,  2416,  2425,  2429,  2431,
-    2434,  2436,  2439,  2446,  2452,  2459,  2467,  2475,  2477,  2480,
-    2483,  2485,  2488,  2491,  2495,  2499,  2501,  2506,  2511,  2515,
-    2524,  2528,  2530,  2532,  2535,  2537,  2539,  2542,  2546,  2549,
-    2553,  2556,  2560,  2564,  2567,  2572,  2576,  2579,  2583,  2586,
-    2591,  2595,  2598,  2605,  2612,  2619,  2627,  2629,  2632,  2634,
-    2636,  2638,  2641,  2645,  2648,  2652,  2655,  2659,  2663,  2668,
-    2671,  2675,  2680,  2683,  2689,  2695,  2702,  2709,  2710,  2712,
-    2713
+    1177,  1179,  1181,  1183,  1186,  1189,  1193,  1197,  1199,  1203,
+    1205,  1208,  1211,  1214,  1219,  1224,  1229,  1234,  1236,  1239,
+    1242,  1246,  1248,  1251,  1254,  1256,  1259,  1262,  1266,  1268,
+    1271,  1274,  1276,  1278,  1283,  1286,  1287,  1294,  1302,  1305,
+    1308,  1311,  1312,  1315,  1318,  1322,  1325,  1329,  1331,  1334,
+    1338,  1341,  1344,  1349,  1350,  1352,  1355,  1358,  1360,  1361,
+    1363,  1366,  1369,  1375,  1378,  1379,  1387,  1390,  1395,  1396,
+    1399,  1400,  1402,  1404,  1406,  1412,  1418,  1424,  1426,  1432,
+    1438,  1448,  1450,  1456,  1457,  1459,  1461,  1467,  1469,  1471,
+    1477,  1483,  1485,  1489,  1493,  1498,  1500,  1502,  1504,  1506,
+    1509,  1511,  1515,  1519,  1521,  1524,  1526,  1530,  1532,  1534,
+    1536,  1538,  1540,  1542,  1544,  1546,  1548,  1550,  1552,  1555,
+    1557,  1559,  1561,  1564,  1565,  1568,  1571,  1573,  1578,  1579,
+    1581,  1584,  1588,  1593,  1596,  1599,  1601,  1604,  1607,  1613,
+    1619,  1627,  1634,  1636,  1639,  1642,  1646,  1648,  1651,  1654,
+    1659,  1662,  1667,  1668,  1673,  1676,  1678,  1680,  1682,  1683,
+    1686,  1692,  1698,  1712,  1714,  1716,  1720,  1724,  1727,  1731,
+    1735,  1738,  1743,  1745,  1752,  1762,  1763,  1775,  1777,  1781,
+    1785,  1789,  1791,  1793,  1799,  1802,  1808,  1809,  1811,  1813,
+    1817,  1818,  1820,  1822,  1824,  1826,  1827,  1834,  1837,  1839,
+    1842,  1847,  1850,  1854,  1858,  1862,  1867,  1873,  1879,  1885,
+    1892,  1894,  1896,  1898,  1902,  1903,  1909,  1910,  1912,  1914,
+    1917,  1924,  1926,  1930,  1931,  1933,  1938,  1940,  1942,  1944,
+    1946,  1949,  1951,  1954,  1957,  1959,  1963,  1966,  1970,  1974,
+    1977,  1982,  1987,  1991,  2000,  2004,  2007,  2009,  2012,  2019,
+    2028,  2032,  2035,  2039,  2043,  2048,  2053,  2057,  2059,  2061,
+    2063,  2068,  2075,  2079,  2082,  2086,  2090,  2095,  2100,  2104,
+    2107,  2109,  2112,  2115,  2117,  2121,  2124,  2128,  2132,  2135,
+    2140,  2145,  2149,  2156,  2165,  2169,  2172,  2174,  2177,  2180,
+    2183,  2187,  2191,  2194,  2199,  2204,  2208,  2215,  2224,  2228,
+    2231,  2233,  2236,  2239,  2241,  2243,  2246,  2250,  2254,  2257,
+    2262,  2269,  2278,  2280,  2283,  2286,  2288,  2291,  2294,  2298,
+    2302,  2304,  2309,  2314,  2318,  2324,  2333,  2337,  2340,  2344,
+    2346,  2352,  2358,  2365,  2372,  2374,  2377,  2380,  2382,  2385,
+    2388,  2392,  2396,  2398,  2403,  2408,  2412,  2418,  2427,  2431,
+    2433,  2436,  2438,  2441,  2448,  2454,  2461,  2469,  2477,  2479,
+    2482,  2485,  2487,  2490,  2493,  2497,  2501,  2503,  2508,  2513,
+    2517,  2526,  2530,  2532,  2534,  2537,  2539,  2541,  2544,  2548,
+    2551,  2555,  2558,  2562,  2566,  2569,  2574,  2578,  2581,  2585,
+    2588,  2593,  2597,  2600,  2607,  2614,  2621,  2629,  2631,  2634,
+    2636,  2638,  2640,  2643,  2647,  2650,  2654,  2657,  2661,  2665,
+    2670,  2673,  2677,  2682,  2685,  2691,  2697,  2704,  2711,  2712,
+    2714,  2715
 };
 
@@ -820 +779 @@
       -1,   162,   129,   170,   130,   168,    -1,   163,    -1,   163,
       -1,   149,   167,   165,    -1,   168,   373,    -1,    -1,   165,
-      -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,   165,   135,
-     112,    -1,   111,   134,   116,   169,   135,   112,    -1,   111,
-     134,   165,   116,   169,   135,   112,    -1,   166,    -1,   169,
-     116,   166,    -1,   165,    -1,   170,   116,   165,    -1,    -1,
-     170,    -1,   173,    -1,   174,    -1,   178,    -1,   179,    -1,
-     191,    -1,   193,    -1,   194,    -1,   199,    -1,   127,   144,
-     114,   145,   115,   132,    -1,    72,   130,   312,   172,    -1,
-     114,   115,    -1,   114,   134,   134,   210,   175,   135,   115,
-      -1,   176,    -1,   175,   134,   176,    -1,   213,    -1,    40,
-     213,    -1,   308,    -1,   172,   135,    -1,   172,    -1,   177,
-     172,    -1,   171,   132,    -1,    41,   109,   170,   110,   172,
-      -1,    41,   109,   170,   110,   172,    42,   172,    -1,    43,
-     109,   170,   110,   184,    -1,    43,   109,   170,   110,   114,
-     134,   206,   185,   115,    -1,    53,   109,   170,   110,   184,
-      -1,    53,   109,   170,   110,   114,   134,   206,   187,   115,
-      -1,   164,    -1,   164,    96,   164,    -1,   310,    -1,   180,
-      -1,   181,   116,   180,    -1,    44,   181,   130,    -1,    45,
-     130,    -1,   182,    -1,   183,   182,    -1,   183,   172,    -1,
-      -1,   186,    -1,   183,   177,    -1,   186,   183,   177,    -1,
-      -1,   188,    -1,   183,   190,    -1,   183,   177,   189,    -1,
-     188,   183,   190,    -1,   188,   183,   177,   189,    -1,    -1,
-     190,    -1,    56,    -1,    56,   132,    -1,    47,   109,   170,
-     110,   172,    -1,    46,   172,    47,   109,   170,   110,   132,
-      -1,    48,   109,   134,   192,   110,   172,    -1,   171,   135,
-     132,   171,   132,   171,    -1,   213,   171,   132,   171,    -1,
-      51,    72,   132,    -1,    51,   117,   170,   132,    -1,    50,
-     132,    -1,    50,    72,   132,    -1,    49,   132,    -1,    49,
-      72,   132,    -1,    52,   171,   132,    -1,    61,   166,   132,
-      -1,    62,   166,   132,    -1,    62,   166,    63,   165,   132,
-      -1,    57,   174,   195,    -1,    57,   174,   197,    -1,    57,
-     174,   195,   197,    -1,   196,    -1,    58,   109,    96,   110,
-     174,    -1,   196,    58,   109,    96,   110,   174,    -1,    59,
-     109,    96,   110,   174,    -1,   196,    59,   109,    96,   110,
-     174,    -1,    58,   109,   134,   134,   198,   135,   110,   174,
-     135,    -1,   196,    58,   109,   134,   134,   198,   135,   110,
-     174,   135,    -1,    59,   109,   134,   134,   198,   135,   110,
-     174,   135,    -1,   196,    59,   109,   134,   134,   198,   135,
-     110,   174,   135,    -1,    60,   174,    -1,   226,    -1,   226,
-     309,    -1,   226,   357,    -1,   366,   139,    -1,   366,    -1,
-      64,   200,   109,   141,   110,   132,    -1,    64,   200,   109,
-     141,   130,   201,   110,   132,    -1,    64,   200,   109,   141,
-     130,   201,   130,   201,   110,   132,    -1,    64,   200,   109,
-     141,   130,   201,   130,   201,   130,   204,   110,   132,    -1,
-      64,   200,    51,   109,   141,   130,   130,   201,   130,   204,
-     130,   205,   110,   132,    -1,    -1,    11,    -1,    -1,   202,
-      -1,   203,    -1,   202,   116,   203,    -1,   141,   109,   164,
-     110,    -1,   111,   164,   112,   141,   109,   164,   110,    -1,
-      -1,   141,    -1,   204,   116,   141,    -1,   139,    -1,   205,
-     116,   139,    -1,   135,    -1,   207,    -1,   213,    -1,   207,
-     134,   213,    -1,   135,    -1,   209,    -1,   223,    -1,   209,
-     134,   223,    -1,    -1,   211,    -1,    29,   212,   132,    -1,
-     211,    29,   212,   132,    -1,   274,    -1,   212,   116,   274,
-      -1,   214,    -1,   223,    -1,   215,   135,   132,    -1,   220,
-     135,   132,    -1,   217,   135,   132,    -1,   293,   135,   132,
-      -1,   296,   135,   132,    -1,   216,   277,    -1,   232,   216,
-     277,    -1,   215,   135,   116,   134,   272,   277,    -1,   367,
-     272,   311,    -1,   370,   272,   311,    -1,   228,   370,   272,
-     311,    -1,   218,    -1,   228,   218,    -1,   232,   218,    -1,
-     232,   228,   218,    -1,   217,   135,   116,   134,   272,    -1,
-     111,   112,   272,   109,   134,   260,   135,   110,    -1,   370,
-     272,   109,   134,   260,   135,   110,    -1,   219,   272,   109,
-     134,   260,   135,   110,    -1,   111,   134,   262,   135,   112,
-      -1,   111,   134,   262,   135,   116,   134,   263,   135,   112,
-      -1,     3,   216,    -1,     3,   218,    -1,   220,   135,   116,
-     134,   139,    -1,     3,   226,   309,    -1,   221,   135,   116,
-     134,   309,    -1,   228,     3,   226,   309,    -1,   226,     3,
-     309,    -1,   226,     3,   228,   309,    -1,     3,   139,   131,
-     165,    -1,   222,   135,   116,   134,   139,   131,   165,    -1,
-     224,   135,   132,    -1,   221,   135,   132,    -1,   222,   135,
-     132,    -1,   240,   135,   132,    -1,   225,   309,   311,   277,
-      -1,   224,   116,   312,   309,   311,   277,    -1,   236,    -1,
-     240,    -1,   242,    -1,   283,    -1,   237,    -1,   241,    -1,
-     243,    -1,   284,    -1,    -1,   228,    -1,   229,    -1,   228,
-     229,    -1,   230,    -1,   314,    -1,    10,    -1,    12,    -1,
-      11,    -1,    14,    -1,    67,    -1,    -1,    13,   109,   231,
-     286,   110,    -1,   233,    -1,   228,   233,    -1,   232,   228,
-     233,    -1,   234,    -1,   233,   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,   232,   237,    -1,   236,   234,    -1,   236,   234,   228,
-      -1,   236,   234,   237,    -1,   238,    -1,   227,   239,   227,
-      -1,   235,    -1,   228,   235,    -1,   238,   229,    -1,   238,
-     235,    -1,    28,   109,   276,   110,    -1,    28,   109,   170,
-     110,    -1,    78,   109,   276,   110,    -1,    78,   109,   170,
-     110,    -1,   241,    -1,   232,   241,    -1,   240,   234,    -1,
-     240,   234,   228,    -1,   244,    -1,   228,   244,    -1,   241,
-     229,    -1,   243,    -1,   232,   243,    -1,   242,   234,    -1,
-     242,   234,   228,    -1,    74,    -1,   228,    74,    -1,   243,
-     229,    -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,   226,
-     252,    -1,   251,   116,   312,   252,    -1,    -1,   254,    -1,
-     318,   253,    -1,   331,   253,    -1,   357,    -1,    -1,   254,
-      -1,   130,   164,    -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,   164,    -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,   228,   370,   272,   373,    -1,   218,    -1,   270,    -1,
-     362,    -1,   370,    -1,   228,   370,    -1,   371,    -1,   225,
-     336,   373,    -1,   225,   340,   373,    -1,   225,    -1,   225,
-     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,   226,    -1,
-     226,   357,    -1,   366,    -1,   371,    -1,   226,    -1,   226,
-     345,    -1,    -1,   131,   278,    -1,   107,   278,    -1,   165,
-      -1,   114,   279,   372,   115,    -1,    -1,   278,    -1,   280,
-     278,    -1,   279,   116,   278,    -1,   279,   116,   280,   278,
-      -1,   281,   130,    -1,   274,   130,    -1,   282,    -1,   281,
-     282,    -1,   113,   274,    -1,   111,   134,   165,   135,   112,
-      -1,   111,   134,   310,   135,   112,    -1,   111,   134,   164,
-      96,   164,   135,   112,    -1,   113,   111,   134,   147,   135,
-     112,    -1,   284,    -1,   232,   284,    -1,   283,   234,    -1,
-     283,   234,   228,    -1,   285,    -1,   228,   285,    -1,   284,
-     229,    -1,    75,   109,   292,   110,    -1,   287,   373,    -1,
-     286,   116,   287,   373,    -1,    -1,   289,   274,   288,   290,
-      -1,   226,   336,    -1,    33,    -1,    35,    -1,    34,    -1,
-      -1,   290,   291,    -1,   128,   274,   109,   292,   110,    -1,
-     128,   114,   134,   298,   115,    -1,   128,   109,   134,   286,
-     135,   110,   114,   134,   298,   115,   109,   292,   110,    -1,
-     276,    -1,   165,    -1,   292,   116,   276,    -1,   292,   116,
-     165,    -1,    33,   294,    -1,   233,    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,   216,    -1,   218,
-      -1,   300,   135,   116,   134,   272,    -1,   226,   309,    -1,
-     301,   135,   116,   134,   309,    -1,    -1,   303,    -1,   305,
-      -1,   303,   134,   305,    -1,    -1,   303,    -1,   213,    -1,
-     307,    -1,   199,    -1,    -1,     5,    82,   306,   114,   304,
-     115,    -1,    40,   305,    -1,   308,    -1,   323,   174,    -1,
-     327,   134,   208,   174,    -1,   217,   174,    -1,   225,   323,
-     174,    -1,   228,   323,   174,    -1,   232,   323,   174,    -1,
-     232,   228,   323,   174,    -1,   225,   327,   134,   208,   174,
-      -1,   228,   327,   134,   208,   174,    -1,   232,   327,   134,
-     208,   174,    -1,   232,   228,   327,   134,   208,   174,    -1,
-     318,    -1,   331,    -1,   323,    -1,   164,   122,   164,    -1,
-      -1,    64,   109,   142,   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,   171,   110,    -1,   272,    -1,   234,    -1,
-     235,    -1,   229,    -1,   319,   312,    -1,   320,    -1,   321,
-     312,    -1,   322,   312,    -1,   137,    -1,   109,   319,   110,
-      -1,   150,   318,    -1,   150,   228,   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,
-     150,   323,    -1,   150,   228,   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,   150,   327,    -1,
-     150,   228,   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,   150,
-     331,    -1,   150,   228,   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,   150,   336,
-      -1,   150,   228,   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,   150,   340,    -1,   150,   228,   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,   150,    -1,   150,   228,    -1,   150,
-     345,    -1,   150,   228,   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,   165,   135,   112,    -1,
-     111,   134,   117,   135,   112,    -1,   350,   111,   134,   165,
-     135,   112,    -1,   350,   111,   134,   117,   135,   112,    -1,
-     352,    -1,   353,   312,    -1,   354,   312,    -1,   150,    -1,
-     150,   228,    -1,   150,   351,    -1,   150,   228,   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,   228,   117,   135,   112,    -1,   111,   134,   228,   135,
-     112,    -1,   111,   134,   228,   165,   135,   112,    -1,   111,
-     134,     7,   227,   165,   135,   112,    -1,   111,   134,   228,
-       7,   165,   135,   112,    -1,   358,    -1,   359,   312,    -1,
-     360,   312,    -1,   150,    -1,   150,   228,    -1,   150,   357,
-      -1,   150,   228,   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,   228,   370,    -1,   363,    -1,   364,    -1,   150,
-     226,    -1,   228,   150,   226,    -1,   150,   371,    -1,   228,
-     150,   371,    -1,   150,   361,    -1,   228,   150,   361,    -1,
-     111,   112,   226,    -1,   365,   226,    -1,   111,   112,   350,
-     226,    -1,   365,   350,   226,    -1,   350,   226,    -1,   111,
-     112,   363,    -1,   365,   363,    -1,   111,   112,   350,   363,
-      -1,   365,   350,   363,    -1,   350,   363,    -1,   111,   134,
-     228,   117,   135,   112,    -1,   111,   134,   228,   165,   135,
-     112,    -1,   111,   134,   232,   165,   135,   112,    -1,   111,
-     134,   232,   228,   165,   135,   112,    -1,   370,    -1,   228,
-     370,    -1,   367,    -1,   368,    -1,   369,    -1,   150,   226,
-      -1,   228,   150,   226,    -1,   150,   371,    -1,   228,   150,
-     371,    -1,   150,   366,    -1,   228,   150,   366,    -1,   111,
-     112,   226,    -1,   111,   112,   350,   226,    -1,   350,   226,
-      -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,   219,   109,   134,   260,   135,   110,    -1,    -1,
-     116,    -1,    -1,   131,   165,    -1
+      -1,   131,    -1,   107,    -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,
+     165,   135,   112,    -1,   111,   134,   116,   169,   135,   112,
+      -1,   111,   134,   165,   116,   169,   135,   112,    -1,   166,
+      -1,   169,   116,   166,    -1,   165,    -1,   170,   116,   165,
+      -1,    -1,   170,    -1,   173,    -1,   174,    -1,   178,    -1,
+     179,    -1,   191,    -1,   193,    -1,   194,    -1,   199,    -1,
+     127,   144,   114,   145,   115,   132,    -1,    72,   130,   312,
+     172,    -1,   114,   115,    -1,   114,   134,   134,   210,   175,
+     135,   115,    -1,   176,    -1,   175,   134,   176,    -1,   213,
+      -1,    40,   213,    -1,   308,    -1,   172,   135,    -1,   172,
+      -1,   177,   172,    -1,   171,   132,    -1,    41,   109,   170,
+     110,   172,    -1,    41,   109,   170,   110,   172,    42,   172,
+      -1,    43,   109,   170,   110,   184,    -1,    43,   109,   170,
+     110,   114,   134,   206,   185,   115,    -1,    53,   109,   170,
+     110,   184,    -1,    53,   109,   170,   110,   114,   134,   206,
+     187,   115,    -1,   164,    -1,   164,    96,   164,    -1,   310,
+      -1,   180,    -1,   181,   116,   180,    -1,    44,   181,   130,
+      -1,    45,   130,    -1,   182,    -1,   183,   182,    -1,   183,
+     172,    -1,    -1,   186,    -1,   183,   177,    -1,   186,   183,
+     177,    -1,    -1,   188,    -1,   183,   190,    -1,   183,   177,
+     189,    -1,   188,   183,   190,    -1,   188,   183,   177,   189,
+      -1,    -1,   190,    -1,    56,    -1,    56,   132,    -1,    47,
+     109,   170,   110,   172,    -1,    46,   172,    47,   109,   170,
+     110,   132,    -1,    48,   109,   134,   192,   110,   172,    -1,
+     171,   135,   132,   171,   132,   171,    -1,   213,   171,   132,
+     171,    -1,    51,    72,   132,    -1,    51,   117,   170,   132,
+      -1,    50,   132,    -1,    50,    72,   132,    -1,    49,   132,
+      -1,    49,    72,   132,    -1,    52,   171,   132,    -1,    61,
+     166,   132,    -1,    62,   166,   132,    -1,    62,   166,    63,
+     165,   132,    -1,    57,   174,   195,    -1,    57,   174,   197,
+      -1,    57,   174,   195,   197,    -1,   196,    -1,    58,   109,
+      96,   110,   174,    -1,   196,    58,   109,    96,   110,   174,
+      -1,    59,   109,    96,   110,   174,    -1,   196,    59,   109,
+      96,   110,   174,    -1,    58,   109,   134,   134,   198,   135,
+     110,   174,   135,    -1,   196,    58,   109,   134,   134,   198,
+     135,   110,   174,   135,    -1,    59,   109,   134,   134,   198,
+     135,   110,   174,   135,    -1,   196,    59,   109,   134,   134,
+     198,   135,   110,   174,   135,    -1,    60,   174,    -1,   226,
+      -1,   226,   309,    -1,   226,   357,    -1,   366,   139,    -1,
+     366,    -1,    64,   200,   109,   141,   110,   132,    -1,    64,
+     200,   109,   141,   130,   201,   110,   132,    -1,    64,   200,
+     109,   141,   130,   201,   130,   201,   110,   132,    -1,    64,
+     200,   109,   141,   130,   201,   130,   201,   130,   204,   110,
+     132,    -1,    64,   200,    51,   109,   141,   130,   130,   201,
+     130,   204,   130,   205,   110,   132,    -1,    -1,    11,    -1,
+      -1,   202,    -1,   203,    -1,   202,   116,   203,    -1,   141,
+     109,   164,   110,    -1,   111,   164,   112,   141,   109,   164,
+     110,    -1,    -1,   141,    -1,   204,   116,   141,    -1,   139,
+      -1,   205,   116,   139,    -1,   135,    -1,   207,    -1,   213,
+      -1,   207,   134,   213,    -1,   135,    -1,   209,    -1,   223,
+      -1,   209,   134,   223,    -1,    -1,   211,    -1,    29,   212,
+     132,    -1,   211,    29,   212,   132,    -1,   274,    -1,   212,
+     116,   274,    -1,   214,    -1,   223,    -1,   215,   135,   132,
+      -1,   220,   135,   132,    -1,   217,   135,   132,    -1,   293,
+     135,   132,    -1,   296,   135,   132,    -1,   216,   277,    -1,
+     232,   216,   277,    -1,   215,   135,   116,   134,   272,   277,
+      -1,   367,   272,   311,    -1,   370,   272,   311,    -1,   228,
+     370,   272,   311,    -1,   218,    -1,   228,   218,    -1,   232,
+     218,    -1,   232,   228,   218,    -1,   217,   135,   116,   134,
+     272,    -1,   111,   112,   272,   109,   134,   260,   135,   110,
+      -1,   370,   272,   109,   134,   260,   135,   110,    -1,   219,
+     272,   109,   134,   260,   135,   110,    -1,   111,   134,   262,
+     135,   112,    -1,   111,   134,   262,   135,   116,   134,   263,
+     135,   112,    -1,     3,   216,    -1,     3,   218,    -1,   220,
+     135,   116,   134,   139,    -1,     3,   226,   309,    -1,   221,
+     135,   116,   134,   309,    -1,   228,     3,   226,   309,    -1,
+     226,     3,   309,    -1,   226,     3,   228,   309,    -1,     3,
+     139,   131,   165,    -1,   222,   135,   116,   134,   139,   131,
+     165,    -1,   224,   135,   132,    -1,   221,   135,   132,    -1,
+     222,   135,   132,    -1,   240,   135,   132,    -1,   225,   309,
+     311,   277,    -1,   224,   116,   312,   309,   311,   277,    -1,
+     236,    -1,   240,    -1,   242,    -1,   283,    -1,   237,    -1,
+     241,    -1,   243,    -1,   284,    -1,    -1,   228,    -1,   229,
+      -1,   228,   229,    -1,   230,    -1,   314,    -1,    10,    -1,
+      12,    -1,    11,    -1,    14,    -1,    67,    -1,    -1,    13,
+     109,   231,   286,   110,    -1,   233,    -1,   228,   233,    -1,
+     232,   228,   233,    -1,   234,    -1,   233,   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,   232,   237,    -1,   236,   234,    -1,   236,
+     234,   228,    -1,   236,   234,   237,    -1,   238,    -1,   227,
+     239,   227,    -1,   235,    -1,   228,   235,    -1,   238,   229,
+      -1,   238,   235,    -1,    28,   109,   276,   110,    -1,    28,
+     109,   170,   110,    -1,    78,   109,   276,   110,    -1,    78,
+     109,   170,   110,    -1,   241,    -1,   232,   241,    -1,   240,
+     234,    -1,   240,   234,   228,    -1,   244,    -1,   228,   244,
+      -1,   241,   229,    -1,   243,    -1,   232,   243,    -1,   242,
+     234,    -1,   242,   234,   228,    -1,    74,    -1,   228,    74,
+      -1,   243,   229,    -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,   226,   252,    -1,   251,   116,   312,   252,    -1,    -1,
+     254,    -1,   318,   253,    -1,   331,   253,    -1,   357,    -1,
+      -1,   254,    -1,   130,   164,    -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,   164,    -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,   228,   370,   272,   373,    -1,   218,    -1,
+     270,    -1,   362,    -1,   370,    -1,   228,   370,    -1,   371,
+      -1,   225,   336,   373,    -1,   225,   340,   373,    -1,   225,
+      -1,   225,   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,
+     226,    -1,   226,   357,    -1,   366,    -1,   371,    -1,   226,
+      -1,   226,   345,    -1,    -1,   131,   278,    -1,   107,   278,
+      -1,   165,    -1,   114,   279,   372,   115,    -1,    -1,   278,
+      -1,   280,   278,    -1,   279,   116,   278,    -1,   279,   116,
+     280,   278,    -1,   281,   130,    -1,   274,   130,    -1,   282,
+      -1,   281,   282,    -1,   113,   274,    -1,   111,   134,   165,
+     135,   112,    -1,   111,   134,   310,   135,   112,    -1,   111,
+     134,   164,    96,   164,   135,   112,    -1,   113,   111,   134,
+     147,   135,   112,    -1,   284,    -1,   232,   284,    -1,   283,
+     234,    -1,   283,   234,   228,    -1,   285,    -1,   228,   285,
+      -1,   284,   229,    -1,    75,   109,   292,   110,    -1,   287,
+     373,    -1,   286,   116,   287,   373,    -1,    -1,   289,   274,
+     288,   290,    -1,   226,   336,    -1,    33,    -1,    35,    -1,
+      34,    -1,    -1,   290,   291,    -1,   128,   274,   109,   292,
+     110,    -1,   128,   114,   134,   298,   115,    -1,   128,   109,
+     134,   286,   135,   110,   114,   134,   298,   115,   109,   292,
+     110,    -1,   276,    -1,   165,    -1,   292,   116,   276,    -1,
+     292,   116,   165,    -1,    33,   294,    -1,   233,    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,   216,
+      -1,   218,    -1,   300,   135,   116,   134,   272,    -1,   226,
+     309,    -1,   301,   135,   116,   134,   309,    -1,    -1,   303,
+      -1,   305,    -1,   303,   134,   305,    -1,    -1,   303,    -1,
+     213,    -1,   307,    -1,   199,    -1,    -1,     5,    82,   306,
+     114,   304,   115,    -1,    40,   305,    -1,   308,    -1,   323,
+     174,    -1,   327,   134,   208,   174,    -1,   217,   174,    -1,
+     225,   323,   174,    -1,   228,   323,   174,    -1,   232,   323,
+     174,    -1,   232,   228,   323,   174,    -1,   225,   327,   134,
+     208,   174,    -1,   228,   327,   134,   208,   174,    -1,   232,
+     327,   134,   208,   174,    -1,   232,   228,   327,   134,   208,
+     174,    -1,   318,    -1,   331,    -1,   323,    -1,   164,   122,
+     164,    -1,    -1,    64,   109,   142,   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,   171,   110,    -1,   272,    -1,
+     234,    -1,   235,    -1,   229,    -1,   319,   312,    -1,   320,
+      -1,   321,   312,    -1,   322,   312,    -1,   137,    -1,   109,
+     319,   110,    -1,   150,   318,    -1,   150,   228,   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,   150,   323,    -1,   150,   228,   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,   150,
+     327,    -1,   150,   228,   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,   150,   331,    -1,   150,   228,   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,
+     150,   336,    -1,   150,   228,   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,   150,   340,    -1,   150,   228,   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,   150,    -1,   150,   228,
+      -1,   150,   345,    -1,   150,   228,   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,   165,   135,
+     112,    -1,   111,   134,   117,   135,   112,    -1,   350,   111,
+     134,   165,   135,   112,    -1,   350,   111,   134,   117,   135,
+     112,    -1,   352,    -1,   353,   312,    -1,   354,   312,    -1,
+     150,    -1,   150,   228,    -1,   150,   351,    -1,   150,   228,
+     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,   228,   117,   135,   112,    -1,   111,   134,
+     228,   135,   112,    -1,   111,   134,   228,   165,   135,   112,
+      -1,   111,   134,     7,   227,   165,   135,   112,    -1,   111,
+     134,   228,     7,   165,   135,   112,    -1,   358,    -1,   359,
+     312,    -1,   360,   312,    -1,   150,    -1,   150,   228,    -1,
+     150,   357,    -1,   150,   228,   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,   228,   370,    -1,   363,    -1,   364,
+      -1,   150,   226,    -1,   228,   150,   226,    -1,   150,   371,
+      -1,   228,   150,   371,    -1,   150,   361,    -1,   228,   150,
+     361,    -1,   111,   112,   226,    -1,   365,   226,    -1,   111,
+     112,   350,   226,    -1,   365,   350,   226,    -1,   350,   226,
+      -1,   111,   112,   363,    -1,   365,   363,    -1,   111,   112,
+     350,   363,    -1,   365,   350,   363,    -1,   350,   363,    -1,
+     111,   134,   228,   117,   135,   112,    -1,   111,   134,   228,
+     165,   135,   112,    -1,   111,   134,   232,   165,   135,   112,
+      -1,   111,   134,   232,   228,   165,   135,   112,    -1,   370,
+      -1,   228,   370,    -1,   367,    -1,   368,    -1,   369,    -1,
+     150,   226,    -1,   228,   150,   226,    -1,   150,   371,    -1,
+     228,   150,   371,    -1,   150,   366,    -1,   228,   150,   366,
+      -1,   111,   112,   226,    -1,   111,   112,   350,   226,    -1,
+     350,   226,    -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,   219,   109,   134,   260,   135,   110,
+      -1,    -1,   116,    -1,    -1,   131,   165,    -1
 };
 
@@ -1062 +1021 @@
 static const yytype_uint16 yyrline[] =
 {
-       0,   341,   341,   345,   352,   353,   354,   358,   359,   360,
-     364,   365,   369,   370,   374,   375,   379,   383,   384,   395,
-     397,   399,   401,   406,   407,   413,   417,   419,   420,   422,
-     423,   425,   427,   429,   438,   439,   445,   446,   450,   451,
-     455,   459,   461,   463,   465,   470,   473,   475,   477,   482,
-     495,   497,   499,   501,   503,   505,   507,   509,   511,   513,
-     515,   522,   523,   529,   530,   531,   532,   536,   537,   539,
-     544,   545,   547,   549,   554,   555,   557,   562,   563,   565,
-     570,   571,   573,   575,   577,   582,   583,   585,   590,   591,
-     596,   597,   602,   603,   608,   609,   614,   615,   620,   621,
-     624,   626,   631,   636,   637,   639,   645,   646,   650,   651,
-     652,   653,   654,   655,   656,   657,   658,   659,   660,   666,
-     668,   670,   672,   677,   678,   683,   684,   690,   691,   697,
-     698,   699,   700,   701,   702,   703,   704,   705,   715,   722,
-     724,   734,   735,   740,   742,   748,   750,   754,   755,   760,
-     765,   768,   770,   772,   782,   784,   795,   796,   798,   802,
-     804,   808,   809,   814,   815,   819,   824,   825,   829,   831,
-     837,   838,   842,   844,   846,   848,   854,   855,   859,   861,
-     866,   868,   870,   875,   877,   882,   884,   888,   891,   895,
-     898,   902,   904,   906,   908,   913,   915,   917,   922,   924,
-     926,   928,   930,   935,   937,   939,   941,   946,   958,   959,
-     964,   966,   971,   975,   977,   979,   981,   983,   989,   990,
-     996,   997,  1001,  1002,  1007,  1009,  1015,  1016,  1018,  1023,
-    1028,  1038,  1040,  1044,  1045,  1050,  1052,  1056,  1057,  1061,
-    1063,  1067,  1068,  1072,  1073,  1077,  1078,  1093,  1094,  1095,
-    1096,  1097,  1101,  1106,  1113,  1123,  1128,  1133,  1141,  1146,
-    1151,  1156,  1161,  1169,  1191,  1196,  1203,  1205,  1212,  1217,
-    1222,  1233,  1238,  1243,  1248,  1253,  1262,  1267,  1275,  1276,
-    1277,  1278,  1284,  1289,  1297,  1298,  1299,  1300,  1304,  1305,
-    1306,  1307,  1312,  1313,  1322,  1323,  1328,  1329,  1334,  1336,
-    1338,  1340,  1342,  1345,  1344,  1356,  1357,  1359,  1369,  1370,
-    1375,  1377,  1379,  1381,  1383,  1385,  1387,  1389,  1394,  1396,
-    1398,  1400,  1402,  1404,  1406,  1408,  1410,  1412,  1414,  1416,
-    1418,  1424,  1425,  1427,  1429,  1431,  1436,  1437,  1443,  1444,
-    1446,  1448,  1453,  1455,  1457,  1459,  1464,  1465,  1467,  1469,
-    1474,  1475,  1477,  1482,  1483,  1485,  1487,  1492,  1494,  1496,
-    1501,  1502,  1506,  1508,  1514,  1513,  1517,  1519,  1524,  1526,
-    1532,  1533,  1538,  1539,  1541,  1542,  1551,  1552,  1554,  1556,
-    1561,  1563,  1569,  1570,  1572,  1575,  1578,  1583,  1584,  1589,
-    1594,  1598,  1600,  1606,  1605,  1612,  1614,  1620,  1621,  1629,
-    1630,  1634,  1635,  1636,  1638,  1640,  1647,  1648,  1650,  1652,
-    1657,  1658,  1664,  1665,  1669,  1670,  1675,  1676,  1677,  1679,
-    1687,  1688,  1690,  1693,  1695,  1699,  1700,  1701,  1703,  1705,
-    1709,  1714,  1722,  1723,  1732,  1734,  1739,  1740,  1741,  1745,
-    1746,  1747,  1751,  1752,  1753,  1757,  1758,  1759,  1764,  1765,
-    1766,  1767,  1773,  1774,  1776,  1781,  1782,  1787,  1788,  1789,
-    1790,  1791,  1806,  1807,  1812,  1813,  1819,  1821,  1824,  1826,
-    1828,  1851,  1852,  1854,  1856,  1861,  1862,  1864,  1869,  1874,
-    1875,  1881,  1880,  1884,  1888,  1890,  1892,  1898,  1899,  1904,
-    1909,  1911,  1916,  1918,  1919,  1921,  1926,  1928,  1930,  1935,
-    1937,  1942,  1947,  1955,  1961,  1960,  1974,  1975,  1980,  1981,
-    1985,  1990,  1995,  2003,  2008,  2019,  2020,  2025,  2026,  2032,
-    2033,  2037,  2038,  2039,  2042,  2041,  2052,  2061,  2067,  2073,
-    2082,  2088,  2094,  2100,  2106,  2114,  2120,  2128,  2134,  2143,
-    2144,  2145,  2149,  2153,  2155,  2161,  2162,  2166,  2167,  2172,
-    2178,  2179,  2182,  2184,  2185,  2190,  2191,  2192,  2193,  2227,
-    2229,  2230,  2232,  2237,  2242,  2247,  2249,  2251,  2256,  2258,
-    2260,  2262,  2267,  2269,  2278,  2280,  2281,  2286,  2288,  2290,
-    2295,  2297,  2299,  2304,  2306,  2308,  2317,  2318,  2319,  2323,
-    2325,  2327,  2332,  2334,  2336,  2341,  2343,  2345,  2360,  2362,
-    2363,  2365,  2370,  2371,  2376,  2378,  2380,  2385,  2387,  2389,
-    2391,  2396,  2398,  2400,  2410,  2412,  2413,  2415,  2420,  2422,
-    2424,  2429,  2431,  2433,  2435,  2440,  2442,  2444,  2475,  2477,
-    2478,  2480,  2485,  2490,  2498,  2500,  2502,  2507,  2509,  2514,
-    2516,  2530,  2531,  2533,  2538,  2540,  2542,  2544,  2546,  2551,
-    2552,  2554,  2556,  2561,  2563,  2565,  2571,  2573,  2575,  2579,
-    2581,  2583,  2585,  2599,  2600,  2602,  2607,  2609,  2611,  2613,
-    2615,  2620,  2621,  2623,  2625,  2630,  2632,  2634,  2640,  2641,
-    2643,  2652,  2655,  2657,  2660,  2662,  2664,  2677,  2678,  2680,
-    2685,  2687,  2689,  2691,  2693,  2698,  2699,  2701,  2703,  2708,
-    2710,  2718,  2719,  2720,  2725,  2726,  2730,  2732,  2734,  2736,
-    2738,  2740,  2747,  2749,  2751,  2753,  2755,  2757,  2759,  2761,
-    2763,  2765,  2770,  2772,  2774,  2779,  2805,  2806,  2808,  2812,
-    2813,  2817,  2819,  2821,  2823,  2825,  2827,  2834,  2836,  2838,
-    2840,  2842,  2844,  2849,  2854,  2856,  2858,  2876,  2878,  2883,
-    2884
+       0,   300,   300,   304,   311,   312,   313,   317,   318,   319,
+     323,   324,   328,   329,   333,   334,   338,   342,   343,   354,
+     356,   358,   360,   365,   366,   372,   376,   378,   379,   381,
+     382,   384,   386,   388,   397,   398,   404,   405,   409,   410,
+     414,   418,   420,   422,   424,   429,   432,   434,   436,   441,
+     454,   456,   458,   460,   462,   464,   466,   468,   470,   472,
+     474,   481,   482,   488,   489,   490,   491,   495,   496,   498,
+     503,   504,   506,   508,   513,   514,   516,   521,   522,   524,
+     529,   530,   532,   534,   536,   541,   542,   544,   549,   550,
+     555,   556,   561,   562,   567,   568,   573,   574,   579,   580,
+     583,   585,   590,   595,   596,   598,   604,   605,   609,   610,
+     611,   612,   613,   614,   615,   616,   617,   618,   619,   620,
+     626,   628,   630,   632,   637,   638,   643,   644,   650,   651,
+     657,   658,   659,   660,   661,   662,   663,   664,   665,   675,
+     682,   684,   694,   695,   700,   702,   708,   710,   714,   715,
+     720,   725,   728,   730,   732,   742,   744,   755,   756,   758,
+     762,   764,   768,   769,   774,   775,   779,   784,   785,   789,
+     791,   797,   798,   802,   804,   806,   808,   814,   815,   819,
+     821,   826,   828,   830,   835,   837,   842,   844,   848,   851,
+     855,   858,   862,   864,   866,   868,   873,   875,   877,   882,
+     884,   886,   888,   890,   895,   897,   899,   901,   906,   918,
+     919,   924,   926,   931,   935,   937,   939,   941,   943,   949,
+     950,   956,   957,   961,   962,   967,   969,   975,   976,   978,
+     983,   988,   998,  1000,  1004,  1005,  1010,  1012,  1016,  1017,
+    1021,  1023,  1027,  1028,  1032,  1033,  1037,  1038,  1053,  1054,
+    1055,  1056,  1057,  1061,  1066,  1073,  1083,  1088,  1093,  1101,
+    1106,  1111,  1116,  1121,  1129,  1151,  1156,  1163,  1165,  1172,
+    1177,  1182,  1193,  1198,  1203,  1208,  1213,  1222,  1227,  1235,
+    1236,  1237,  1238,  1244,  1249,  1257,  1258,  1259,  1260,  1264,
+    1265,  1266,  1267,  1272,  1273,  1282,  1283,  1288,  1289,  1294,
+    1296,  1298,  1300,  1302,  1305,  1304,  1316,  1317,  1319,  1329,
+    1330,  1335,  1337,  1339,  1341,  1343,  1346,  1348,  1351,  1356,
+    1358,  1360,  1362,  1364,  1366,  1368,  1370,  1372,  1374,  1376,
+    1378,  1380,  1386,  1387,  1389,  1391,  1393,  1398,  1399,  1405,
+    1406,  1408,  1410,  1415,  1417,  1419,  1421,  1426,  1427,  1429,
+    1431,  1436,  1437,  1439,  1444,  1445,  1447,  1449,  1454,  1456,
+    1458,  1463,  1464,  1468,  1470,  1476,  1475,  1479,  1481,  1486,
+    1488,  1494,  1495,  1500,  1501,  1503,  1504,  1513,  1514,  1516,
+    1518,  1523,  1525,  1531,  1532,  1534,  1537,  1540,  1545,  1546,
+    1551,  1556,  1560,  1562,  1568,  1567,  1574,  1576,  1582,  1583,
+    1591,  1592,  1596,  1597,  1598,  1600,  1602,  1609,  1610,  1612,
+    1614,  1619,  1620,  1626,  1627,  1631,  1632,  1637,  1638,  1639,
+    1641,  1649,  1650,  1652,  1655,  1657,  1661,  1662,  1663,  1665,
+    1667,  1671,  1676,  1684,  1685,  1694,  1696,  1701,  1702,  1703,
+    1707,  1708,  1709,  1713,  1714,  1715,  1719,  1720,  1721,  1726,
+    1727,  1728,  1729,  1735,  1736,  1738,  1743,  1744,  1749,  1750,
+    1751,  1752,  1753,  1768,  1769,  1774,  1775,  1781,  1783,  1786,
+    1788,  1790,  1813,  1814,  1816,  1818,  1823,  1824,  1826,  1831,
+    1836,  1837,  1843,  1842,  1846,  1850,  1852,  1854,  1860,  1861,
+    1866,  1871,  1873,  1878,  1880,  1881,  1883,  1888,  1890,  1892,
+    1897,  1899,  1904,  1909,  1917,  1923,  1922,  1936,  1937,  1942,
+    1943,  1947,  1952,  1957,  1965,  1970,  1981,  1982,  1987,  1988,
+    1994,  1995,  1999,  2000,  2001,  2004,  2003,  2014,  2023,  2029,
+    2035,  2044,  2050,  2056,  2062,  2068,  2076,  2082,  2090,  2096,
+    2105,  2106,  2107,  2111,  2115,  2117,  2122,  2123,  2127,  2128,
+    2133,  2139,  2140,  2143,  2145,  2146,  2150,  2151,  2152,  2153,
+    2187,  2189,  2190,  2192,  2197,  2202,  2207,  2209,  2211,  2216,
+    2218,  2220,  2222,  2227,  2229,  2238,  2240,  2241,  2246,  2248,
+    2250,  2255,  2257,  2259,  2264,  2266,  2268,  2277,  2278,  2279,
+    2283,  2285,  2287,  2292,  2294,  2296,  2301,  2303,  2305,  2320,
+    2322,  2323,  2325,  2330,  2331,  2336,  2338,  2340,  2345,  2347,
+    2349,  2351,  2356,  2358,  2360,  2370,  2372,  2373,  2375,  2380,
+    2382,  2384,  2389,  2391,  2393,  2395,  2400,  2402,  2404,  2435,
+    2437,  2438,  2440,  2445,  2450,  2458,  2460,  2462,  2467,  2469,
+    2474,  2476,  2490,  2491,  2493,  2498,  2500,  2502,  2504,  2506,
+    2511,  2512,  2514,  2516,  2521,  2523,  2525,  2531,  2533,  2535,
+    2539,  2541,  2543,  2545,  2559,  2560,  2562,  2567,  2569,  2571,
+    2573,  2575,  2580,  2581,  2583,  2585,  2590,  2592,  2594,  2600,
+    2601,  2603,  2612,  2615,  2617,  2620,  2622,  2624,  2637,  2638,
+    2640,  2645,  2647,  2649,  2651,  2653,  2658,  2659,  2661,  2663,
+    2668,  2670,  2678,  2679,  2680,  2685,  2686,  2690,  2692,  2694,
+    2696,  2698,  2700,  2707,  2709,  2711,  2713,  2715,  2717,  2719,
+    2721,  2723,  2725,  2730,  2732,  2734,  2739,  2765,  2766,  2768,
+    2772,  2773,  2777,  2779,  2781,  2783,  2785,  2787,  2794,  2796,
+    2798,  2800,  2802,  2804,  2809,  2814,  2816,  2818,  2836,  2838,
+    2843,  2844
 };
 #endif
@@ -1290 +1249 @@
      159,   159,   160,   160,   161,   161,   162,   162,   163,   163,
      163,   163,   164,   165,   165,   165,   166,   166,   167,   167,
-     167,   167,   167,   167,   167,   167,   167,   167,   167,   168,
-     168,   168,   168,   169,   169,   170,   170,   171,   171,   172,
-     172,   172,   172,   172,   172,   172,   172,   172,   173,   174,
-     174,   175,   175,   176,   176,   176,   176,   177,   177,   178,
-     179,   179,   179,   179,   179,   179,   180,   180,   180,   181,
-     181,   182,   182,   183,   183,   184,   185,   185,   186,   186,
-     187,   187,   188,   188,   188,   188,   189,   189,   190,   190,
-     191,   191,   191,   192,   192,   193,   193,   193,   193,   193,
-     193,   193,   193,   193,   193,   194,   194,   194,   195,   195,
-     195,   195,   195,   196,   196,   196,   196,   197,   198,   198,
-     198,   198,   198,   199,   199,   199,   199,   199,   200,   200,
-     201,   201,   202,   202,   203,   203,   204,   204,   204,   205,
-     205,   206,   206,   207,   207,   208,   208,   209,   209,   210,
-     210,   211,   211,   212,   212,   213,   213,   214,   214,   214,
-     214,   214,   215,   215,   215,   216,   216,   216,   217,   217,
-     217,   217,   217,   218,   218,   218,   219,   219,   220,   220,
-     220,   221,   221,   221,   221,   221,   222,   222,   223,   223,
-     223,   223,   224,   224,   225,   225,   225,   225,   226,   226,
-     226,   226,   227,   227,   228,   228,   229,   229,   230,   230,
-     230,   230,   230,   231,   230,   232,   232,   232,   233,   233,
-     234,   234,   234,   234,   234,   234,   234,   234,   235,   235,
+     167,   167,   167,   167,   167,   167,   167,   167,   167,   167,
+     168,   168,   168,   168,   169,   169,   170,   170,   171,   171,
+     172,   172,   172,   172,   172,   172,   172,   172,   172,   173,
+     174,   174,   175,   175,   176,   176,   176,   176,   177,   177,
+     178,   179,   179,   179,   179,   179,   179,   180,   180,   180,
+     181,   181,   182,   182,   183,   183,   184,   185,   185,   186,
+     186,   187,   187,   188,   188,   188,   188,   189,   189,   190,
+     190,   191,   191,   191,   192,   192,   193,   193,   193,   193,
+     193,   193,   193,   193,   193,   193,   194,   194,   194,   195,
+     195,   195,   195,   195,   196,   196,   196,   196,   197,   198,
+     198,   198,   198,   198,   199,   199,   199,   199,   199,   200,
+     200,   201,   201,   202,   202,   203,   203,   204,   204,   204,
+     205,   205,   206,   206,   207,   207,   208,   208,   209,   209,
+     210,   210,   211,   211,   212,   212,   213,   213,   214,   214,
+     214,   214,   214,   215,   215,   215,   216,   216,   216,   217,
+     217,   217,   217,   217,   218,   218,   218,   219,   219,   220,
+     220,   220,   221,   221,   221,   221,   221,   222,   222,   223,
+     223,   223,   223,   224,   224,   225,   225,   225,   225,   226,
+     226,   226,   226,   227,   227,   228,   228,   229,   229,   230,
+     230,   230,   230,   230,   231,   230,   232,   232,   232,   233,
+     233,   234,   234,   234,   234,   234,   234,   234,   234,   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,   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
+     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,   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
 };
 
@@ -1371 +1330 @@
        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,
+       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,     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,     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,     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
+       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
 };
 
@@ -1443 +1402 @@
 static const yytype_uint16 yydefact[] =
 {
-     292,   292,   312,   310,   313,   311,   314,   315,   298,   300,
-     299,     0,   301,   326,   318,   323,   321,   322,   320,   319,
-     324,   325,   330,   327,   328,   329,   545,   545,   545,     0,
-       0,     0,   292,   218,   302,   316,   317,     7,   357,     0,
-       8,    14,    15,     0,     2,    61,    62,   563,     9,   292,
-     523,   521,   245,     3,   452,     3,   258,     0,     3,     3,
-       3,   246,     3,     0,     0,     0,   293,   294,   296,   292,
-     305,   308,   338,   284,   331,   336,   285,   346,   286,   353,
-     350,   360,     0,     0,   361,   287,   471,   475,     3,     3,
-       0,     2,   517,   522,   527,   297,     0,     0,   545,   575,
-     545,     2,   586,   587,   588,   292,     0,   729,   730,     0,
-      12,     0,    13,   292,   268,   269,     0,   293,   288,   289,
-     290,   291,   524,   303,   390,   546,   547,   368,   369,    12,
-     443,   444,    11,   439,   442,     0,   501,   496,   487,   443,
-     444,     0,     0,   526,   219,     0,   292,     0,     0,     0,
-       0,     0,     0,     0,     0,   292,   292,     2,     0,   731,
-     293,   580,   592,   735,   728,   726,   733,     0,     0,     0,
-     252,     2,     0,   530,   437,   438,   436,     0,     0,     0,
-       0,   545,     0,   632,   633,     0,     0,   543,   539,   545,
-     560,   545,   545,   541,     2,   540,   545,   599,   545,   545,
-     602,     0,     0,     0,   292,   292,   310,   358,     2,   292,
-     259,   295,   306,   339,   351,   476,     0,     2,     0,   452,
-     260,   293,   332,   347,   354,   472,     0,     2,     0,   309,
-     333,   340,   341,     0,   348,   352,   355,   359,   444,   292,
-     370,   363,   367,     0,   392,   473,   477,     0,     0,     0,
-       1,   292,     2,   528,   574,   576,   292,     2,   739,   293,
-     742,   543,   543,     0,   293,     0,     0,   271,   545,   541,
-       2,   292,     0,     0,   292,   548,     2,   499,     2,   552,
+     293,   293,   313,   311,   314,   312,   315,   316,   299,   301,
+     300,     0,   302,   327,   319,   324,   322,   323,   321,   320,
+     325,   326,   331,   328,   329,   330,   546,   546,   546,     0,
+       0,     0,   293,   219,   303,   317,   318,     7,   358,     0,
+       8,    14,    15,     0,     2,    61,    62,   564,     9,   293,
+     524,   522,   246,     3,   453,     3,   259,     0,     3,     3,
+       3,   247,     3,     0,     0,     0,   294,   295,   297,   293,
+     306,   309,   339,   285,   332,   337,   286,   347,   287,   354,
+     351,   361,     0,     0,   362,   288,   472,   476,     3,     3,
+       0,     2,   518,   523,   528,   298,     0,     0,   546,   576,
+     546,     2,   587,   588,   589,   293,     0,   730,   731,     0,
+      12,     0,    13,   293,   269,   270,     0,   294,   289,   290,
+     291,   292,   525,   304,   391,   547,   548,   369,   370,    12,
+     444,   445,    11,   440,   443,     0,   502,   497,   488,   444,
+     445,     0,     0,   527,   220,     0,   293,     0,     0,     0,
+       0,     0,     0,     0,     0,   293,   293,     2,     0,   732,
+     294,   581,   593,   736,   729,   727,   734,     0,     0,     0,
+     253,     2,     0,   531,   438,   439,   437,     0,     0,     0,
+       0,   546,     0,   633,   634,     0,     0,   544,   540,   546,
+     561,   546,   546,   542,     2,   541,   546,   600,   546,   546,
+     603,     0,     0,     0,   293,   293,   311,   359,     2,   293,
+     260,   296,   307,   340,   352,   477,     0,     2,     0,   453,
+     261,   294,   333,   348,   355,   473,     0,     2,     0,   310,
+     334,   341,   342,     0,   349,   353,   356,   360,   445,   293,
+     371,   364,   368,     0,   393,   474,   478,     0,     0,     0,
+       1,   293,     2,   529,   575,   577,   293,     2,   740,   294,
+     743,   544,   544,     0,   294,     0,     0,   272,   546,   542,
+       2,   293,     0,     0,   293,   549,     2,   500,     2,   553,
        0,     0,     0,     0,     0,     0,    19,    58,     4,     5,
-       6,    17,     0,     0,   292,     2,    63,    64,    65,    66,
-      46,    20,    47,    16,    23,    45,    67,   292,     0,    70,
+       6,    17,     0,     0,   293,     2,    63,    64,    65,    66,
+      46,    20,    47,    16,    23,    45,    67,   293,     0,    70,
       74,    77,    80,    85,    88,    90,    92,    94,    96,    98,
-     103,   493,   749,   450,   492,     0,   448,   449,     0,   564,
-     579,   582,   585,   591,   594,   597,   357,     0,     2,   737,
-       0,   292,   740,     2,    61,   292,     3,   424,     0,   432,
-     293,   292,   305,   331,   285,   346,   353,     3,     3,   406,
-     410,   420,   425,   471,   292,   426,   704,   705,   292,   427,
-     429,   292,     2,   581,   593,   727,     2,     2,   247,     2,
-     457,     0,   455,   454,   453,   139,     2,     2,   249,     2,
-       2,   248,     2,   279,     2,   280,     0,   278,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   565,   604,     0,
-     452,     2,   559,   568,   658,   561,   562,   531,   292,     2,
-     598,   607,   600,   601,     0,   274,   292,   292,   337,   293,
-       0,   293,     0,   292,   732,   736,   734,   532,   292,   543,
-     253,   261,   307,     0,     2,   533,   292,   497,   334,   335,
-     281,   349,   356,     0,   292,     0,   747,   397,     0,   474,
-     498,   250,   251,   518,   292,   434,     0,   292,   235,     0,
-       2,   237,     0,   293,     0,   255,     2,   256,   276,     0,
-       0,     2,   292,   543,   292,   484,   486,   485,     0,     0,
-     749,     0,   292,     0,   292,   488,   292,   558,   556,   557,
-     555,     0,   550,   553,     0,     0,   292,    53,   292,    67,
-      48,   292,    55,   292,   292,    51,    52,     2,   125,     0,
-       0,   446,     0,   445,   726,   119,   292,    18,     0,    30,
-      31,    36,     2,     0,    36,   109,   110,   111,   112,   113,
-     114,   115,   116,   117,   118,   108,     0,    49,    50,     0,
+     103,   494,   750,   451,   493,     0,   449,   450,     0,   565,
+     580,   583,   586,   592,   595,   598,   358,     0,     2,   738,
+       0,   293,   741,     2,    61,   293,     3,   425,     0,   433,
+     294,   293,   306,   332,   286,   347,   354,     3,     3,   407,
+     411,   421,   426,   472,   293,   427,   705,   706,   293,   428,
+     430,   293,     2,   582,   594,   728,     2,     2,   248,     2,
+     458,     0,   456,   455,   454,   140,     2,     2,   250,     2,
+       2,   249,     2,   280,     2,   281,     0,   279,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   566,   605,     0,
+     453,     2,   560,   569,   659,   562,   563,   532,   293,     2,
+     599,   608,   601,   602,     0,   275,   293,   293,   338,   294,
+       0,   294,     0,   293,   733,   737,   735,   533,   293,   544,
+     254,   262,   308,     0,     2,   534,   293,   498,   335,   336,
+     282,   350,   357,     0,   293,     0,   748,   398,     0,   475,
+     499,   251,   252,   519,   293,   435,     0,   293,   236,     0,
+       2,   238,     0,   294,     0,   256,     2,   257,   277,     0,
+       0,     2,   293,   544,   293,   485,   487,   486,     0,     0,
+     750,     0,   293,     0,   293,   489,   293,   559,   557,   558,
+     556,     0,   551,   554,     0,     0,   293,    53,   293,    67,
+      48,   293,    55,   293,   293,    51,    52,     2,   126,     0,
+       0,   447,     0,   446,   727,   120,   293,    18,     0,    30,
+      31,    36,     2,     0,    36,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   109,   108,     0,    49,    50,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   105,
-       2,   644,   451,   641,   545,   545,   649,   478,   292,     2,
-     583,   584,     0,   595,   596,     0,     2,   738,   741,   119,
-     292,     0,     2,   706,   293,   710,   701,   702,   708,     0,
-       2,     2,   666,   545,   749,   615,   545,   545,   749,   545,
-     629,   545,   545,   680,   433,   663,   545,   545,   671,   678,
-     292,   428,   293,     0,     0,   292,   716,   293,   721,   749,
-     713,   292,   718,   749,   292,   292,   292,     0,   119,     0,
-      19,     2,     0,    20,     0,   458,   747,     0,     0,   464,
-     239,     0,   292,     0,     0,     0,   543,   567,   571,   573,
-     603,   606,   610,   613,   566,   605,     0,   282,   656,     0,
-     292,   275,     0,     0,     0,     0,   273,     2,     0,   257,
-     534,   292,     0,     0,   292,     2,   362,   382,   371,     0,
-       0,   376,   370,   748,     0,     0,   395,     0,   293,     3,
-     413,     3,   417,   416,   589,     0,   529,   292,    61,     3,
-     292,   432,   293,     3,   426,   427,     2,     0,     0,     0,
-     483,   304,   292,   479,   481,     3,     2,     2,     0,   500,
-       3,     0,   552,   127,     0,     0,   220,     0,     0,     0,
-       0,    37,     0,     0,   119,   292,    21,     0,    22,     0,
-     690,   695,   447,   687,   545,   545,     0,   106,     3,     2,
-      28,     0,    34,     0,     2,    26,     0,   104,    71,    72,
-      73,    75,    76,    78,    79,    83,    84,    81,    82,    86,
-      87,    89,    91,    93,    95,    97,     0,     0,   750,   292,
-       0,     0,     0,   645,   646,   642,   643,   495,   494,   292,
-       0,   292,   712,   292,   717,   293,   292,   660,   292,   292,
-     703,   659,     2,   292,     0,     0,     0,     0,     0,     0,
-       0,     0,   681,     0,   667,   618,   634,   668,     2,   614,
-     621,   430,   616,   617,   431,     2,   628,   637,   630,   631,
-     664,   665,   679,   707,   711,   709,   749,   266,     2,   743,
-       2,   421,   715,   720,   422,     0,   400,     3,     3,     3,
-       3,   452,     3,     0,     2,   466,   463,   748,     0,   459,
-       2,   462,   465,     0,   292,   240,   262,     3,   270,   272,
-       0,   452,     2,   569,   570,     2,   608,   609,     0,   657,
-     535,     3,   343,   342,   345,   344,   292,   536,     0,   537,
-     370,     0,     0,   292,   292,     0,     0,   690,   380,   383,
-     387,   545,   387,   386,   379,   372,   545,   374,   377,   292,
-     397,   391,   102,   398,   747,     0,     0,   435,   238,     0,
-       0,     3,     2,   666,   428,     0,   525,     0,   749,   487,
-       0,   292,   292,   292,     0,   549,   551,   128,     0,     0,
-     213,     0,     0,     0,   221,   222,    54,     0,    56,    59,
-      60,     0,     2,   126,     0,     0,     0,   691,   692,   688,
-     689,   457,    68,    69,   107,   123,     3,   106,     0,     0,
-      25,    36,     3,     0,    33,   100,     0,     3,   648,   652,
-     655,   647,     3,   590,     3,   714,   719,     2,    61,   292,
-       3,     3,   293,     0,     3,   620,   624,   627,   636,   670,
-     674,   677,   292,     3,   619,   635,   669,   292,   292,   423,
-     292,   292,   744,     0,     0,     0,     0,   254,     0,   102,
-       0,     3,     3,     0,   460,     0,   456,     0,     0,   243,
-     292,     0,     0,   127,     0,     0,     0,     0,     0,   127,
-       0,     0,   106,   106,    19,     2,     0,     0,     3,   129,
-     130,     2,   141,   131,   132,   133,   134,   135,   136,   143,
-     145,     0,     0,     0,   283,   292,   292,   545,     0,   538,
-     292,   373,   375,     0,   389,   691,   384,   388,   385,   378,
-     382,   365,   396,     0,   577,     2,   662,   661,     0,   667,
-       2,   480,   482,   502,     3,   510,   511,     0,     2,   506,
-       3,     3,     0,     0,   554,   220,     0,     0,     0,   220,
-       0,     0,   119,   694,   698,   700,   693,   747,   106,     0,
-       3,   659,    40,     3,    38,    35,     0,     3,    99,   101,
-       0,     2,   650,   651,     0,     0,   292,     0,     0,     0,
-       3,   636,     0,     2,   622,   623,     2,   638,     2,   672,
-     673,     0,     0,    61,     0,     3,     3,     3,     3,   408,
-     407,   411,     2,     2,   746,   745,   120,     0,     0,     0,
-       0,     3,   461,     3,     0,   241,   144,     3,   293,   292,
-       0,     0,     0,     0,     2,     0,   189,     0,   187,     0,
-       0,     0,     0,     0,     0,     0,   545,   119,     0,   149,
-     146,   292,     0,     0,   265,   277,     3,     3,   544,   611,
-     366,   381,   394,   292,   264,   292,     0,   513,   490,   292,
-       0,     0,   489,   504,     0,     0,     0,   214,     0,   223,
-      57,     2,   696,   697,     0,   124,   121,     0,     0,     0,
-       0,     0,    24,     0,   653,   292,   578,   263,   722,   723,
-     724,     0,   675,   292,   292,   292,     3,     3,     0,   683,
-       0,     0,     0,     0,   292,   292,     3,   542,   120,   468,
-       0,     0,   244,   293,     0,     0,     0,     0,   292,   190,
-     188,   185,     0,   191,     0,     0,     0,     0,   195,   198,
-     196,   192,     0,   193,   127,    36,   142,   140,   242,     0,
-       0,   415,   419,   418,     0,   507,     2,   508,     2,   509,
-     503,   292,   226,     0,   224,     0,   226,   292,    32,   122,
-       2,    43,     2,    41,    39,    29,    27,     3,   725,     3,
-       3,     3,     0,     0,   682,   684,   625,   639,   267,     2,
-     405,     3,   404,     0,   470,   467,   127,     0,     0,   127,
-       3,     0,   127,   186,     0,     2,     2,   207,   197,     0,
-       0,     0,   138,     0,   572,   612,     2,     0,     0,     2,
-     227,     0,     0,   215,     0,     3,     0,     0,     0,     0,
-       0,     0,   685,   686,   292,     0,   469,   150,     0,     0,
-       2,   163,   127,   152,     0,   180,     0,   127,     0,     2,
-     154,     0,     2,     0,     2,     2,     2,   194,    33,   292,
-     512,   514,   505,     0,     0,     0,     0,     0,     3,     3,
-     654,   626,   640,   676,   409,   127,   156,   159,     0,   158,
-     162,     3,   165,   164,     0,   127,   182,   127,     3,     0,
-     292,     0,   292,     0,     2,     0,     2,   137,     2,   228,
-     229,     0,   225,   216,   699,     0,     0,   151,     0,     0,
-     161,   231,   166,     2,   233,   181,     0,   184,   170,   199,
-       3,   208,   212,   201,     3,     0,   292,     0,   292,     0,
-       0,     0,    44,    42,   157,   160,   127,     0,   167,   292,
-     127,   127,     0,   171,     0,     0,   690,   209,   210,   211,
-       0,   200,     3,   202,     3,   292,   217,   230,   147,   168,
-     153,   127,   234,   183,   178,   176,   172,   155,   127,     0,
-     691,     0,     0,     0,     0,   148,   169,   179,   173,   177,
-     176,   174,     3,     3,     0,     0,   491,   175,   203,   205,
-       3,     3,   204,   206
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     105,     2,   645,   452,   642,   546,   546,   650,   479,   293,
+       2,   584,   585,     0,   596,   597,     0,     2,   739,   742,
+     120,   293,     0,     2,   707,   294,   711,   702,   703,   709,
+       0,     2,     2,   667,   546,   750,   616,   546,   546,   750,
+     546,   630,   546,   546,   681,   434,   664,   546,   546,   672,
+     679,   293,   429,   294,     0,     0,   293,   717,   294,   722,
+     750,   714,   293,   719,   750,   293,   293,   293,     0,   120,
+       0,    19,     2,     0,    20,     0,   459,   748,     0,     0,
+     465,   240,     0,   293,     0,     0,     0,   544,   568,   572,
+     574,   604,   607,   611,   614,   567,   606,     0,   283,   657,
+       0,   293,   276,     0,     0,     0,     0,   274,     2,     0,
+     258,   535,   293,     0,     0,   293,     2,   363,   383,   372,
+       0,     0,   377,   371,   749,     0,     0,   396,     0,   294,
+       3,   414,     3,   418,   417,   590,     0,   530,   293,    61,
+       3,   293,   433,   294,     3,   427,   428,     2,     0,     0,
+       0,   484,   305,   293,   480,   482,     3,     2,     2,     0,
+     501,     3,     0,   553,   128,     0,     0,   221,     0,     0,
+       0,     0,    37,     0,     0,   120,   293,    21,     0,    22,
+       0,   691,   696,   448,   688,   546,   546,     0,   106,     3,
+       2,    28,     0,    34,     0,     2,    26,     0,   104,    71,
+      72,    73,    75,    76,    78,    79,    83,    84,    81,    82,
+      86,    87,    89,    91,    93,    95,    97,     0,     0,   751,
+     293,     0,     0,     0,   646,   647,   643,   644,   496,   495,
+     293,     0,   293,   713,   293,   718,   294,   293,   661,   293,
+     293,   704,   660,     2,   293,     0,     0,     0,     0,     0,
+       0,     0,     0,   682,     0,   668,   619,   635,   669,     2,
+     615,   622,   431,   617,   618,   432,     2,   629,   638,   631,
+     632,   665,   666,   680,   708,   712,   710,   750,   267,     2,
+     744,     2,   422,   716,   721,   423,     0,   401,     3,     3,
+       3,     3,   453,     3,     0,     2,   467,   464,   749,     0,
+     460,     2,   463,   466,     0,   293,   241,   263,     3,   271,
+     273,     0,   453,     2,   570,   571,     2,   609,   610,     0,
+     658,   536,     3,   344,   343,   346,   345,   293,   537,     0,
+     538,   371,     0,     0,   293,   293,     0,     0,   691,   381,
+     384,   388,   546,   388,   387,   380,   373,   546,   375,   378,
+     293,   398,   392,   102,   399,   748,     0,     0,   436,   239,
+       0,     0,     3,     2,   667,   429,     0,   526,     0,   750,
+     488,     0,   293,   293,   293,     0,   550,   552,   129,     0,
+       0,   214,     0,     0,     0,   222,   223,    54,     0,    56,
+      59,    60,     0,     2,   127,     0,     0,     0,   692,   693,
+     689,   690,   458,    68,    69,   107,   124,     3,   106,     0,
+       0,    25,    36,     3,     0,    33,   100,     0,     3,   649,
+     653,   656,   648,     3,   591,     3,   715,   720,     2,    61,
+     293,     3,     3,   294,     0,     3,   621,   625,   628,   637,
+     671,   675,   678,   293,     3,   620,   636,   670,   293,   293,
+     424,   293,   293,   745,     0,     0,     0,     0,   255,     0,
+     102,     0,     3,     3,     0,   461,     0,   457,     0,     0,
+     244,   293,     0,     0,   128,     0,     0,     0,     0,     0,
+     128,     0,     0,   106,   106,    19,     2,     0,     0,     3,
+     130,   131,     2,   142,   132,   133,   134,   135,   136,   137,
+     144,   146,     0,     0,     0,   284,   293,   293,   546,     0,
+     539,   293,   374,   376,     0,   390,   692,   385,   389,   386,
+     379,   383,   366,   397,     0,   578,     2,   663,   662,     0,
+     668,     2,   481,   483,   503,     3,   511,   512,     0,     2,
+     507,     3,     3,     0,     0,   555,   221,     0,     0,     0,
+     221,     0,     0,   120,   695,   699,   701,   694,   748,   106,
+       0,     3,   660,    40,     3,    38,    35,     0,     3,    99,
+     101,     0,     2,   651,   652,     0,     0,   293,     0,     0,
+       0,     3,   637,     0,     2,   623,   624,     2,   639,     2,
+     673,   674,     0,     0,    61,     0,     3,     3,     3,     3,
+     409,   408,   412,     2,     2,   747,   746,   121,     0,     0,
+       0,     0,     3,   462,     3,     0,   242,   145,     3,   294,
+     293,     0,     0,     0,     0,     2,     0,   190,     0,   188,
+       0,     0,     0,     0,     0,     0,     0,   546,   120,     0,
+     150,   147,   293,     0,     0,   266,   278,     3,     3,   545,
+     612,   367,   382,   395,   293,   265,   293,     0,   514,   491,
+     293,     0,     0,   490,   505,     0,     0,     0,   215,     0,
+     224,    57,     2,   697,   698,     0,   125,   122,     0,     0,
+       0,     0,     0,    24,     0,   654,   293,   579,   264,   723,
+     724,   725,     0,   676,   293,   293,   293,     3,     3,     0,
+     684,     0,     0,     0,     0,   293,   293,     3,   543,   121,
+     469,     0,     0,   245,   294,     0,     0,     0,     0,   293,
+     191,   189,   186,     0,   192,     0,     0,     0,     0,   196,
+     199,   197,   193,     0,   194,   128,    36,   143,   141,   243,
+       0,     0,   416,   420,   419,     0,   508,     2,   509,     2,
+     510,   504,   293,   227,     0,   225,     0,   227,   293,    32,
+     123,     2,    43,     2,    41,    39,    29,    27,     3,   726,
+       3,     3,     3,     0,     0,   683,   685,   626,   640,   268,
+       2,   406,     3,   405,     0,   471,   468,   128,     0,     0,
+     128,     3,     0,   128,   187,     0,     2,     2,   208,   198,
+       0,     0,     0,   139,     0,   573,   613,     2,     0,     0,
+       2,   228,     0,     0,   216,     0,     3,     0,     0,     0,
+       0,     0,     0,   686,   687,   293,     0,   470,   151,     0,
+       0,     2,   164,   128,   153,     0,   181,     0,   128,     0,
+       2,   155,     0,     2,     0,     2,     2,     2,   195,    33,
+     293,   513,   515,   506,     0,     0,     0,     0,     0,     3,
+       3,   655,   627,   641,   677,   410,   128,   157,   160,     0,
+     159,   163,     3,   166,   165,     0,   128,   183,   128,     3,
+       0,   293,     0,   293,     0,     2,     0,     2,   138,     2,
+     229,   230,     0,   226,   217,   700,     0,     0,   152,     0,
+       0,   162,   232,   167,     2,   234,   182,     0,   185,   171,
+     200,     3,   209,   213,   202,     3,     0,   293,     0,   293,
+       0,     0,     0,    44,    42,   158,   161,   128,     0,   168,
+     293,   128,   128,     0,   172,     0,     0,   691,   210,   211,
+     212,     0,   201,     3,   203,     3,   293,   218,   231,   148,
+     169,   154,   128,   235,   184,   179,   177,   173,   156,   128,
+       0,   692,     0,     0,     0,     0,   149,   170,   180,   174,
+     178,   177,   175,     3,     3,     0,     0,   492,   176,   204,
+     206,     3,     3,   205,   207
 };
 
@@ -1604 +1563 @@
 static const yytype_int16 yydefgoto[] =
 {
-      -1,   813,   468,   300,    47,   133,   134,   301,   302,   303,
-     304,   305,   761,   762,  1133,  1134,   306,   381,   308,   309,
+      -1,   814,   468,   300,    47,   133,   134,   301,   302,   303,
+     304,   305,   762,   763,  1134,  1135,   306,   381,   308,   309,
      310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
-     320,  1030,   518,   975,   546,   322,   976,   947,  1057,  1518,
-    1059,  1060,  1061,  1062,  1519,  1063,  1064,  1437,  1438,  1401,
-    1402,  1403,  1497,  1498,  1502,  1503,  1538,  1539,  1065,  1361,
-    1066,  1067,  1298,  1299,  1300,  1480,  1068,   145,   953,   954,
-     955,  1381,  1461,  1472,  1473,   469,   470,   874,   875,  1038,
+     320,  1031,   518,   976,   547,   322,   977,   948,  1058,  1519,
+    1060,  1061,  1062,  1063,  1520,  1064,  1065,  1438,  1439,  1402,
+    1403,  1404,  1498,  1499,  1503,  1504,  1539,  1540,  1066,  1362,
+    1067,  1068,  1299,  1300,  1301,  1481,  1069,   145,   954,   955,
+     956,  1382,  1462,  1473,  1474,   469,   470,   875,   876,  1039,
       51,    52,    53,    54,    55,   347,   158,    58,    59,    60,
       61,    62,   349,    64,    65,   264,    67,    68,   274,   351,
      352,    71,    72,    73,   118,    75,   204,   354,   119,    78,
-     120,    80,    81,   455,    82,   454,   688,   689,   690,   908,
-    1086,   909,    83,    84,   458,   456,   696,   855,   856,   857,
-     858,   699,   700,   701,   359,   360,   361,   362,   466,   340,
-     135,   136,   522,   324,   170,   645,   646,   647,   648,   649,
-      85,   121,    87,   489,   490,   939,   491,   277,   495,   325,
-      88,   137,   138,    89,  1321,  1108,  1109,  1110,  1111,    90,
-      91,   717,    92,   273,    93,    94,   187,  1032,   679,   412,
+     120,    80,    81,   455,    82,   454,   689,   690,   691,   909,
+    1087,   910,    83,    84,   458,   456,   697,   856,   857,   858,
+     859,   700,   701,   702,   359,   360,   361,   362,   466,   340,
+     135,   136,   522,   324,   170,   646,   647,   648,   649,   650,
+      85,   121,    87,   489,   490,   940,   491,   277,   495,   325,
+      88,   137,   138,    89,  1322,  1109,  1110,  1111,  1112,    90,
+      91,   718,    92,   273,    93,    94,   187,  1033,   680,   412,
      125,    95,   501,   502,   503,   188,   268,   190,   191,   192,
      269,    98,    99,   100,   101,   102,   103,   104,   195,   196,
-     197,   198,   199,   825,   605,   606,   607,   608,   200,   610,
-     611,   612,   572,   573,   574,   575,   751,   105,   614,   615,
-     616,   617,   618,   619,   968,   753,   754,   755,   595,   365,
-     366,   367,   368,   326,   164,   107,   108,   109,   370,   694,
-     569
+     197,   198,   199,   826,   606,   607,   608,   609,   200,   611,
+     612,   613,   573,   574,   575,   576,   752,   105,   615,   616,
+     617,   618,   619,   620,   969,   754,   755,   756,   596,   365,
+     366,   367,   368,   326,   164,   107,   108,   109,   370,   695,
+     570
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -1282
+#define YYPACT_NINF -1323
 static const yytype_int16 yypact[] =
 {
-    7429,  6461, -1282,    36, -1282, -1282, -1282, -1282, -1282, -1282,
-   -1282,    83, -1282, -1282, -1282, -1282, -1282, -1282, -1282, -1282,
-   -1282, -1282, -1282, -1282, -1282, -1282,   131,   131,   131,  1844,
-     994,   124,  7661,   230, -1282, -1282, -1282, -1282, -1282,   175,
-   -1282, -1282, -1282,   965,   193, -1282, -1282, -1282, -1282,  5932,
-   -1282, -1282, -1282, -1282,   122,   216, -1282,  1880, -1282, -1282,
-   -1282, -1282,   251,  1298,   387,    61,  7777, -1282, -1282,  9536,
-    1247, -1282, -1282,   557,   425,  3682,   886,   409,   557,  1203,
-   -1282, -1282,   744,   941, -1282,   557,  1708, -1282,   342, -1282,
-     478,   483, -1282, -1282, -1282, -1282,   384,   216,   131, -1282,
-     131, -1282, -1282, -1282, -1282,  2963,  1880, -1282, -1282,  1880,
-   -1282,   381, -1282,  8264, -1282, -1282,  1830,  9075, -1282,   713,
-     713,   713, -1282, -1282, -1282,   131, -1282, -1282, -1282,   410,
-     433,   443, -1282, -1282, -1282,   470, -1282, -1282, -1282, -1282,
-   -1282,   487,   492, -1282, -1282,    90,  9044,  2201,   567,   421,
-     477,   513,   520,   554,   575,  5546,  6949,   504,   495, -1282,
-    9574, -1282, -1282, -1282, -1282,   558, -1282,   116,  4885,  4885,
-   -1282,   577,   253, -1282, -1282, -1282, -1282,   613,   284,   302,
-     335,   131,   616, -1282, -1282,  1298,  2031,   692, -1282,    65,
-   -1282,   131,   131,   216, -1282, -1282,   103, -1282,   131,   131,
-   -1282,  3459,   673,   678,   713,  6742, -1282, -1282,   702,  5932,
-   -1282, -1282,   557, -1282, -1282, -1282,   216, -1282,  1880,   122,
-   -1282,  8115, -1282,   713,   713,   713,   216, -1282,  1844, -1282,
-    4853, -1282, -1282,   627,   713, -1282,   713, -1282,   175,  9044,
-   -1282,   738, -1282,   994,   742,   713, -1282,  1844,   706,   717,
-   -1282,  7661,   598, -1282, -1282, -1282,  9503, -1282, -1282,  5769,
-   -1282,   692,    43, 10287,  9075,  1830,  3459, -1282,   197, -1282,
-   -1282,  8264,  1880,   745,  7808, -1282, -1282,   441, -1282, 10539,
-     754,   784,  3526,   766,  3896,  4720, -1282,   770, -1282, -1282,
-   -1282, -1282, 10420, 10420,  8818,   772, -1282, -1282, -1282, -1282,
-   -1282, -1282, -1282,   805, -1282,  1317,  2104,  9157,  3896, -1282,
-     619,   651,   733,   206,   860,   791,   775,   785,   823,   -65,
-   -1282, -1282,   794,   596, -1282,   337, -1282, -1282,  2201, -1282,
-   -1282,   290,   810, -1282,   298,   810,   819,   175, -1282, -1282,
-     836,  2963, -1282,   844,   858,  9270, -1282, -1282,  1515,  1616,
-    8533,  6742,   557, -1282,   557,   713,   713, -1282, -1282, -1282,
-   -1282, -1282, -1282,   713,  2963,  1880, -1282, -1282,  9188,  1765,
-   -1282,  4463, -1282, -1282, -1282, -1282, -1282, -1282, -1282,   869,
-    6164,  3896, -1282, -1282, -1282, -1282, -1282, -1282, -1282, -1282,
-   -1282, -1282, -1282, -1282, -1282, -1282,  1830, -1282,   592,   881,
-     887,   907,   977,   913,   918,   926,  2031, -1282, -1282,   917,
-     122,   952, -1282, -1282,   968, -1282, -1282, -1282,  9503, -1282,
-   -1282, -1282, -1282, -1282,  3459, -1282,  9044,  9044, -1282,   713,
-    1830,  6861,  1880,  8606, -1282, -1282, -1282, -1282,  9503,    43,
-   -1282, -1282,   557,   216, -1282, -1282,  9503, -1282,  5584, -1282,
-   -1282,   713,   713,   429,  4617,   967,   975,   972,   982,   713,
-   -1282, -1282, -1282, -1282,  9803, -1282,   430,  6623, -1282,   216,
-     991, -1282,  1830, 10621, 10344, -1282, -1282, -1282, -1282,   984,
-    3459, -1282,  8679,   692,  7545, -1282, -1282, -1282,  1025,   534,
-     794,   994,  7808,  1044,  8264, -1282,  7808, -1282, -1282, -1282,
-   -1282,   539, -1282,   997,   784,    70,  8818, -1282,  9301, -1282,
-   -1282,  8818, -1282,  8931,  8818, -1282, -1282,   999, -1282,   564,
-    1000,   689,  1003, -1282, -1282,  9650,  6592, -1282,   291, -1282,
-   -1282, 10287, -1282,   331, 10287, -1282, -1282, -1282, -1282, -1282,
-   -1282, -1282, -1282, -1282, -1282, -1282, 10287, -1282, -1282,  3896,
-    3896,  3896,  3896,  3896,  3896,  3896,  3896,  3896,  3896,  3896,
-    3896,  3896,  3896,  3896,  3896,  3896,  3896,  5176, 10287, -1282,
-     596,  1665, -1282, -1282,   131,   131, -1282, -1282,  9044, -1282,
-   -1282,   968,   598, -1282,   968, 10363, -1282, -1282, -1282,  5001,
-    6592,  1005,  1011, -1282,  9075, -1282, -1282,   558, -1282,  1017,
-     501,  1020,  3131,   211,   794, -1282,   131,   131,   794,   231,
-   -1282,   131,   131,   968, -1282, -1282,   131,   131, -1282,   810,
-    9421,  1880, 10766,    79,   605,  9421, -1282,  5769, -1282,   794,
-   -1282,  2963, -1282,   183,  8230,  8230,  8230,  1880, -1282, 10173,
-    1006,   869,   840,  1015,  1018, -1282,  1008,  4885,   242, -1282,
-    1104,  1880,  8230,   598,  1830,   598,   692,   448,   810, -1282,
-   -1282,   771,   810, -1282, -1282, -1282,   784, -1282,   810,   216,
-    9803, -1282,   637,  1041,   647,  1049, -1282,  1023,   216, -1282,
-   -1282,  9503,   216,  1046,  9301,  1053, -1282,   759, -1282,   357,
-     422,   994, -1282,   994,  1051,  3896, -1282,   994, 10766, -1282,
-   -1282,  1057, -1282, -1282, -1282,   598, -1282, 10694,   858, -1282,
-    8230,   851,  8533, -1282, -1282,   558,  1055,  1056,  1025,  2498,
-   -1282, -1282,  7808, -1282, -1282,  1062, -1282, -1282,  1070, -1282,
-    1062,  1072, 10539, 10287,  1060,  1061,   100,  1073,  1071,  1088,
-    1090, -1282,  1094,  1095,  9688,  6711, -1282, 10287, -1282,   689,
-    1753, -1282, -1282, -1282,   131,   131, 10230, 10287,  1080, -1282,
-   -1282,   650, -1282, 10287, -1282, -1282,   885, -1282, -1282, -1282,
-   -1282,   619,   619,   651,   651,   733,   733,   733,   733,   206,
-     206,   860,   791,   775,   785,   823,  3896,    14, -1282,  9803,
-    1099,  1100,  1102,  1665, -1282, -1282, -1282, -1282, -1282,  9803,
-     657,  8230, -1282,  2963, -1282,  7068,  9383, -1282,  4463,  6949,
-   -1282, -1282,   501,  9803,  1030,  1108,  1109,  1110,  1111,  1112,
-    1114,  1117, -1282,  3725,  3131, -1282, -1282, -1282, -1282, -1282,
-   -1282, -1282, -1282, -1282, -1282, -1282, -1282, -1282, -1282, -1282,
-   -1282, -1282,   968, -1282, -1282, -1282,   794, -1282, -1282, -1282,
-   -1282, -1282, -1282, -1282, -1282,  1118, -1282,  1120,  1122, -1282,
-   -1282,   122,  1080, 10173, -1282, -1282, -1282,  6164,  1123, -1282,
-   -1282, -1282, -1282,   994,  6295,  1204, -1282, -1282, -1282, -1282,
-    1116,   122, -1282, -1282,   968, -1282, -1282,   968,   125,   968,
-   -1282, -1282, -1282, -1282, -1282, -1282,  9612, -1282,   216, -1282,
-   -1282,   460,   467,  9188,  7187,  1951,  3896,  3145, -1282, -1282,
-    1105,    87,  1105, -1282,   994, -1282,   131, -1282, -1282,  8451,
-     972, -1282, -1282, -1282,   975,  1133,  1129, -1282, -1282,  1137,
-    1146, -1282,   851,  1870, -1282,   683, -1282,  2498,   794, -1282,
-    1149,  7808,  9721,  9044,  1151, -1282, -1282,  1150,  1152,  1138,
-   -1282,  3896,  1158,   250,  1153, -1282,  1157,   598,  1157, -1282,
-   -1282,  1157,  1160, -1282,  1166,  1169,  1172,  1753, -1282, -1282,
-   -1282,  6164, -1282, -1282, -1282, -1282,  1168, 10287,  1175,   598,
-   -1282, 10287, -1282,   598, -1282, -1282, 10287, -1282,   809,   810,
-   -1282, -1282, -1282, -1282, -1282, -1282, -1282,   869,   858,  9270,
-   -1282, -1282,  7306,  1180, -1282,   829,   810, -1282,   854,   868,
-     810, -1282,   713,  4154, -1282, -1282, -1282,  9803,  9803, -1282,
-    8606,  8606, -1282,  1176,  1181,  1183,  1189, -1282,  1179,   724,
-     -22,  1080, -1282,   598, -1282,  4885, -1282, 10287,   475, -1282,
-    6430,  1191,  1192, 10116,  1193,  1195,    21,    55,   195, 10287,
-    1196,   216, 10287, 10287,  1182,  1205,   579,  1209, -1282, -1282,
-   -1282,  1200, -1282, -1282, -1282, -1282, -1282, -1282, -1282, -1282,
-   -1282,   994,  1213, 10287, -1282,  9803,  9803,   131,  1214, -1282,
-    8962, -1282, -1282,   893, -1282,  3145, -1282, -1282, -1282, -1282,
-     759, -1282, -1282,  1218, -1282, -1282, -1282, -1282,  1227,  1870,
-   -1282, -1282,  1215, -1282,  1062, -1282, -1282,  1830,  1231, -1282,
-   -1282, -1282,   669,  1234, -1282,   100,  1237,  3896,  1220,   100,
-     100,  1248,  9650,   876,   810, -1282, -1282,  1008, 10287,  1251,
-    1168,   563,   204,  1250, -1282, -1282,  1255,  1250, -1282, -1282,
-    1258, -1282, -1282,   968,  1259,  1261,  6830,  1263,  1265,  1267,
-   -1282, -1282,  1273, -1282, -1282,   968, -1282, -1282, -1282, -1282,
-     968, 10287, 10287,   858,  1275, -1282, -1282, -1282, -1282, -1282,
-   -1282, -1282, -1282, -1282, -1282, -1282, -1282,  3896,  3896,  1278,
-    1279,  1250, -1282, -1282,   994, -1282, -1282, -1282,  8042,  9721,
-   10287, 10287,  1345, 10287, -1282,  1266, -1282,  1268, -1282,  1276,
-   10287,  1282, 10287,  1096,  1293,    49,   131,  5155,  1347, -1282,
-   -1282,  6295,  1280,   482, -1282, -1282, -1282, -1282, -1282, -1282,
-   -1282, -1282, -1282,  9936, -1282,  8679,  1287, -1282, -1282,  9721,
-     490,   497, -1282,  1290,  1281,   784,  1319, -1282,   334, -1282,
-   -1282, -1282, -1282,   968,  1323, -1282, -1282,  1327,   444,   549,
-     598,  1332, -1282,  1333, -1282,  9803, -1282, -1282, -1282, -1282,
-   -1282,  1334, -1282,  9803,  9803,  9803, -1282, -1282,  1335, -1282,
-    1337,  1341,  1343,   735,  8303,  8418, -1282, -1282,   248, -1282,
-    1351,  1356, -1282,  8752,   676,   686,  1350,   707,  6096, -1282,
-   -1282, -1282,   537, -1282,   716,  1365,  1367,   216,  1419,   951,
-   -1282, -1282, 10287, -1282, 10116, 10287, -1282, -1282, -1282,  1370,
-    1372, -1282, -1282, -1282,  1369, -1282, -1282, -1282, -1282, -1282,
-   -1282,  9721,   784,  1375, -1282,  1353,   784,  9803, -1282, -1282,
-   -1282, -1282, -1282, -1282, -1282, -1282, -1282, -1282, -1282, -1282,
-   -1282, -1282,  1378,  1379, -1282, -1282, -1282, -1282, -1282, -1282,
-   -1282,  1377, -1282,  1382, -1282, -1282, 10116,   104, 10287, 10116,
-   -1282,  1387, 10287, -1282,   243,  1402,  1405, -1282, -1282,  1393,
-    1394,  1388, -1282,   916, -1282, -1282, -1282,  1880,  1830,  1389,
-   -1282,   246,  3896, -1282,   729, -1282,   598,   598,  1399,  1400,
-    1404,  1409, -1282, -1282,  8606,  1407, -1282,  1479,  3896,  1395,
-   -1282, -1282, 10028, -1282,   757, -1282,  1401, 10116,  1403, -1282,
-   -1282,  1416, -1282,  1417, -1282,  1436,  1440, -1282,  1408,  9721,
-   -1282, -1282, -1282,   784,   598,  1429,  1411,  1431,  1250,  1250,
-   -1282, -1282, -1282, -1282, -1282, 10116,    10, -1282,   370, -1282,
-   -1282,  7893, -1282, -1282,  1412, 10287, -1282, 10287,  7893,   216,
-    9301,   216,  9301,  1437, -1282,  1438, -1282, -1282,  1434, -1282,
-   -1282,   790, -1282, -1282, -1282,  1441,  1442, -1282,  3896,  3896,
-   -1282, -1282,   998,    93, -1282, -1282,  1424, -1282,   998, -1282,
-   -1282,  2145,   598, -1282, -1282,   216,  9301,   216,  9301,  1446,
-    1425,   598, -1282, -1282, -1282, -1282, 10028,  1443,   998,  7969,
-   10287,  9940,  1455,   998,  1463,  2145,  3286, -1282, -1282, -1282,
-    1465, -1282, -1282, -1282, -1282,  9044, -1282, -1282, -1282,  9807,
-   -1282, 10028, -1282, -1282,  1453,  5404, -1282, -1282,  9940,   216,
-    3286,   216,  1476,  1478,   831, -1282,  9807, -1282, -1282, -1282,
-    5404, -1282, -1282, -1282,   216,   216, -1282, -1282, -1282, -1282,
-   -1282, -1282, -1282, -1282
+    7329,  8828, -1323,    37, -1323, -1323, -1323, -1323, -1323, -1323,
+   -1323,   109, -1323, -1323, -1323, -1323, -1323, -1323, -1323, -1323,
+   -1323, -1323, -1323, -1323, -1323, -1323,    85,    85,    85,   873,
+     733,   178,  7561,   370, -1323, -1323, -1323, -1323, -1323,   191,
+   -1323, -1323, -1323,   614,   225, -1323, -1323, -1323, -1323,  4615,
+   -1323, -1323, -1323, -1323,   229,   285, -1323,   934, -1323, -1323,
+   -1323, -1323,   435,  1196,   579,   110,  7677, -1323, -1323,  4858,
+    1038, -1323, -1323,   580,   596,  6761,  1021,   875,   580,  1103,
+   -1323, -1323,  1317,   308, -1323,   580,  1224, -1323,   495, -1323,
+     616,   623, -1323, -1323, -1323, -1323,   547,   285,    85, -1323,
+      85, -1323, -1323, -1323, -1323,  9174,   934, -1323, -1323,   934,
+   -1323,   551, -1323,  9403, -1323, -1323,  1899,  9436, -1323,   844,
+     844,   844, -1323, -1323, -1323,    85, -1323, -1323, -1323,   584,
+     608,   632, -1323, -1323, -1323,   646, -1323, -1323, -1323, -1323,
+   -1323,   664,   687, -1323, -1323,   -28,  8797,  2908,   117,   701,
+     717,   726,   771,   786,   799,  8715,  6849,   731,   757, -1323,
+    5600, -1323, -1323, -1323, -1323,   804, -1323,   223,  5225,  5225,
+   -1323,   802,   365, -1323, -1323, -1323, -1323,   816,   443,   480,
+     534,    85,   827, -1323, -1323,  1196,  4341,   868, -1323,    50,
+   -1323,    85,    85,   285, -1323, -1323,    61, -1323,    85,    85,
+   -1323,  4647,   857,   864,   844,  6523, -1323, -1323,   869,  4615,
+   -1323, -1323,   580, -1323, -1323, -1323,   285, -1323,   934,   229,
+   -1323,  7868, -1323,   844,   844,   844,   285, -1323,   873, -1323,
+    5676, -1323, -1323,   852,   844, -1323,   844, -1323,   191,  8797,
+   -1323,   884, -1323,   733,   890,   844, -1323,   873,   888,   892,
+   -1323,  7561,   631, -1323, -1323, -1323,  9256, -1323, -1323,  9621,
+   -1323,   868,   151, 10214,  9436,  1899,  4647, -1323,    88, -1323,
+   -1323,  9403,   934,   891,  7708, -1323, -1323,   347, -1323, 10561,
+     922,   956, 10347,   945, 10366, 10423, -1323,   954, -1323, -1323,
+   -1323, -1323, 10442, 10442,  8571,   952, -1323, -1323, -1323, -1323,
+   -1323, -1323, -1323,   988, -1323,   966,  1946,  8910, 10366, -1323,
+     756,   338,   485,   411,   635,   955,   947,   957,   984,   237,
+   -1323, -1323,   962,   647, -1323,   302, -1323, -1323,  2908, -1323,
+   -1323,   235,   985, -1323,   312,   985,   989,   191, -1323, -1323,
+     990,  9174, -1323,   999,  1006,  9023, -1323, -1323,  1335,  2030,
+    8286,  6523,   580, -1323,   580,   844,   844, -1323, -1323, -1323,
+   -1323, -1323, -1323,   844,  9174,   934, -1323, -1323,  9474,  1575,
+   -1323,  8017, -1323, -1323, -1323, -1323, -1323, -1323, -1323,  1008,
+    5958, 10366, -1323, -1323, -1323, -1323, -1323, -1323, -1323, -1323,
+   -1323, -1323, -1323, -1323, -1323, -1323,  1899, -1323,   973,   991,
+     992,  1012,   978,  1017,  1018,  1020,  4341, -1323, -1323,  1029,
+     229,  1031, -1323, -1323,  1033, -1323, -1323, -1323,  9256, -1323,
+   -1323, -1323, -1323, -1323,  4647, -1323,  8797,  8797, -1323,   844,
+    1899,  6642,   934,  8359, -1323, -1323, -1323, -1323,  9256,   151,
+   -1323, -1323,   580,   285, -1323, -1323,  9256, -1323,  5770, -1323,
+   -1323,   844,   844,   337,  8204,  1032,  1036,  1023,  1042,   844,
+   -1323, -1323, -1323, -1323,  9660, -1323,   367,  6404, -1323,   285,
+    1044, -1323,  1899, 10643, 10271, -1323, -1323, -1323, -1323,  1015,
+    4647, -1323,  8432,   868,  7445, -1323, -1323, -1323,   843,   436,
+     962,   733,  7708,  1341,  9403, -1323,  7708, -1323, -1323, -1323,
+   -1323,   508, -1323,  1051,   956,   248,  8571, -1323,  9512, -1323,
+   -1323,  8571, -1323,  8684,  8571, -1323, -1323,  1049, -1323,   606,
+    1057,   682,  1059, -1323, -1323,  3527,  6492, -1323,   362, -1323,
+   -1323, 10214, -1323,   368, 10214, -1323, -1323, -1323, -1323, -1323,
+   -1323, -1323, -1323, -1323, -1323, -1323, -1323, 10214, -1323, -1323,
+   10366, 10366, 10366, 10366, 10366, 10366, 10366, 10366, 10366, 10366,
+   10366, 10366, 10366, 10366, 10366, 10366, 10366, 10366,  3593, 10214,
+   -1323,   647,  1677, -1323, -1323,    85,    85, -1323, -1323,  8797,
+   -1323, -1323,  1033,   631, -1323,  1033, 10290, -1323, -1323, -1323,
+    5046,  6492,  1060,  1063, -1323,  9436, -1323, -1323,   804, -1323,
+    1067,   750,  1068,  2627,   125,   962, -1323,    85,    85,   962,
+     132, -1323,    85,    85,  1033, -1323, -1323,    85,    85, -1323,
+     985,  9545,   934, 10788,   532,   656,  9545, -1323,  9621, -1323,
+     962, -1323,  9174, -1323,   238,  7983,  7983,  7983,   934, -1323,
+    5791,  1047,  1008,   493,  1058,  1061, -1323,  1076,  5225,   528,
+   -1323,  1165,   934,  7983,   631,  1899,   631,   868,   430,   985,
+   -1323, -1323,   536,   985, -1323, -1323, -1323,   956, -1323,   985,
+     285,  9660, -1323,   619,  1086,   633,  1088, -1323,  1087,   285,
+   -1323, -1323,  9256,   285,  1089,  9512,  1092, -1323,  1065, -1323,
+     538,   552,   733, -1323,   733,  1085, 10366, -1323,   733, 10788,
+   -1323, -1323,  1096, -1323, -1323, -1323,   631, -1323, 10716,  1006,
+   -1323,  7983,   703,  8286, -1323, -1323,   804,  1095,  1098,   843,
+    5016, -1323, -1323,  7708, -1323, -1323,  1091, -1323, -1323,  1102,
+   -1323,  1091,  1104, 10561, 10214,  1090,  1093,    94,  1109,  1107,
+    1111,  1114, -1323,  1118,  1129,  9365,  6611, -1323, 10214, -1323,
+     682,  1717, -1323, -1323, -1323,    85,    85, 10157, 10214,  1125,
+   -1323, -1323,   653, -1323, 10214, -1323, -1323,   736, -1323, -1323,
+   -1323, -1323,   756,   756,   338,   338,   485,   485,   485,   485,
+     411,   411,   635,   955,   947,   957,   984, 10366,   260, -1323,
+    9660,  1132,  1136,  1137,  1677, -1323, -1323, -1323, -1323, -1323,
+    9660,   708,  7983, -1323,  9174, -1323,  6968,  9136, -1323,  8017,
+    6849, -1323, -1323,   750,  9660,  1022,  1140,  1141,  1142,  1143,
+    1146,  1149,  1154, -1323,  3715,  2627, -1323, -1323, -1323, -1323,
+   -1323, -1323, -1323, -1323, -1323, -1323, -1323, -1323, -1323, -1323,
+   -1323, -1323, -1323,  1033, -1323, -1323, -1323,   962, -1323, -1323,
+   -1323, -1323, -1323, -1323, -1323, -1323,  1155, -1323,  1157,  1159,
+   -1323, -1323,   229,  1125,  5791, -1323, -1323, -1323,  5958,  1158,
+   -1323, -1323, -1323, -1323,   733,  6174,  1248, -1323, -1323, -1323,
+   -1323,  1151,   229, -1323, -1323,  1033, -1323, -1323,  1033,    84,
+    1033, -1323, -1323, -1323, -1323, -1323, -1323,  9327, -1323,   285,
+   -1323, -1323,   559,   562,  9474,  7087,  2137, 10366,  3114, -1323,
+   -1323,  1156,    51,  1156, -1323,   733, -1323,    85, -1323, -1323,
+    8941,  1023, -1323, -1323, -1323,  1036,  1175,  1171, -1323, -1323,
+    1178,  1181, -1323,   703,  1901, -1323,   672, -1323,  5016,   962,
+   -1323,  1184,  7708,  9583,  8797,  1185, -1323, -1323,  1180,  1187,
+    1170, -1323, 10366,  1197,   326,  1194, -1323,  1202,   631,  1202,
+   -1323, -1323,  1202,  1199, -1323,  1208,  1210,  1211,  1717, -1323,
+   -1323, -1323,  5958, -1323, -1323, -1323, -1323,  1209, 10214,  1212,
+     631, -1323, 10214, -1323,   631, -1323, -1323, 10214, -1323,   558,
+     985, -1323, -1323, -1323, -1323, -1323, -1323, -1323,  1008,  1006,
+    9023, -1323, -1323,  7206,  1218, -1323,   674,   985, -1323,   813,
+     861,   985, -1323,   844,  4029, -1323, -1323, -1323,  9660,  9660,
+   -1323,  8359,  8359, -1323,  1215,  1216,  1225,  1230, -1323,  1232,
+     685,    82,  1125, -1323,   631, -1323,  5225, -1323, 10214,   564,
+   -1323,  6373,  1236,  1240, 10100,  1242,  1243,    70,    79,    96,
+   10214,  1244,   285, 10214, 10214,  1227,  1249,   522,  1222, -1323,
+   -1323, -1323,  1250, -1323, -1323, -1323, -1323, -1323, -1323, -1323,
+   -1323, -1323,   733,  1254, 10214, -1323,  9660,  9660,    85,  1257,
+   -1323,  9054, -1323, -1323,   752, -1323,  3114, -1323, -1323, -1323,
+   -1323,  1065, -1323, -1323,  1255, -1323, -1323, -1323, -1323,  1258,
+    1901, -1323, -1323,  1245, -1323,  1091, -1323, -1323,  1899,  1260,
+   -1323, -1323, -1323,   713,  1264, -1323,    94,  1269, 10366,  1252,
+      94,    94,  1262,  3527,   879,   985, -1323, -1323,  1076, 10214,
+    1273,  1209,   358,   204,  1270, -1323, -1323,  1275,  1270, -1323,
+   -1323,  1278, -1323, -1323,  1033,  1280,  1284,  6730,  1285,  1290,
+    1291, -1323, -1323,  1286, -1323, -1323,  1033, -1323, -1323, -1323,
+   -1323,  1033, 10214, 10214,  1006,  1294, -1323, -1323, -1323, -1323,
+   -1323, -1323, -1323, -1323, -1323, -1323, -1323, -1323, 10366, 10366,
+    1300,  1302,  1270, -1323, -1323,   733, -1323, -1323, -1323,  5213,
+    9583, 10214, 10214,  1374, 10214, -1323,  1295, -1323,  1296, -1323,
+    1297, 10214,  1301, 10214,  1105,  1304,    12,    85,  9289,  1625,
+   -1323, -1323,  6174,  1322,   573, -1323, -1323, -1323, -1323, -1323,
+   -1323, -1323, -1323, -1323,  9920, -1323,  8432,  1330, -1323, -1323,
+    9583,   576,   602, -1323,  1331,  1315,   956,  1337, -1323,   329,
+   -1323, -1323, -1323, -1323,  1033,  1339, -1323, -1323,  1320,   486,
+     509,   631,  1340, -1323,  1344, -1323,  9660, -1323, -1323, -1323,
+   -1323, -1323,  1347, -1323,  9660,  9660,  9660, -1323, -1323,  1348,
+   -1323,  1351,  1354,  1355,   716,  8056,  8171, -1323, -1323,   529,
+   -1323,  1357,  1362, -1323,  8505,   721,   730,  1358,   761,  3837,
+   -1323, -1323, -1323,   605, -1323,   766,  1366,  1367,   285,  1419,
+     834, -1323, -1323, 10214, -1323, 10100, 10214, -1323, -1323, -1323,
+    1370,  1375, -1323, -1323, -1323,  1372, -1323, -1323, -1323, -1323,
+   -1323, -1323,  9583,   956,  1379, -1323,  1352,   956,  9660, -1323,
+   -1323, -1323, -1323, -1323, -1323, -1323, -1323, -1323, -1323, -1323,
+   -1323, -1323, -1323,  1378,  1382, -1323, -1323, -1323, -1323, -1323,
+   -1323, -1323,  1387, -1323,  1386, -1323, -1323, 10100,   289, 10214,
+   10100, -1323,  1389, 10214, -1323,   318,  1405,  1406, -1323, -1323,
+    1399,  1400,  1380, -1323,   821, -1323, -1323, -1323,   934,  1899,
+    1396, -1323,   402, 10366, -1323,   785, -1323,   631,   631,  1407,
+    1408,  1413,  1415, -1323, -1323,  8359,  1414, -1323,  1490, 10366,
+    1385, -1323, -1323, 10012, -1323,   800, -1323,  1402, 10100,  1403,
+   -1323, -1323,  1426, -1323,  1427, -1323,  1445,  1446, -1323,  1411,
+    9583, -1323, -1323, -1323,   956,   631,  1434,  1417,  1435,  1270,
+    1270, -1323, -1323, -1323, -1323, -1323, 10100,   107, -1323,   433,
+   -1323, -1323,  7793, -1323, -1323,  1418, 10214, -1323, 10214,  7793,
+     285,  9512,   285,  9512,  1436, -1323,  1442, -1323, -1323,  1440,
+   -1323, -1323,   825, -1323, -1323, -1323,  1444,  1449, -1323, 10366,
+   10366, -1323, -1323,   909,   211, -1323, -1323,  1425, -1323,   909,
+   -1323, -1323,  2166,   631, -1323, -1323,   285,  9512,   285,  9512,
+    1453,  1431,   631, -1323, -1323, -1323, -1323, 10012,  1443,   909,
+    6091, 10214,  9924,  1452,   909,  1454,  2166,  3344, -1323, -1323,
+   -1323,  1458, -1323, -1323, -1323, -1323,  8797, -1323, -1323, -1323,
+    9791, -1323, 10012, -1323, -1323,  1438,  9703, -1323, -1323,  9924,
+     285,  3344,   285,  1464,  1466,   853, -1323,  9791, -1323, -1323,
+   -1323,  9703, -1323, -1323, -1323,   285,   285, -1323, -1323, -1323,
+   -1323, -1323, -1323, -1323, -1323
 };
 
@@ -1797 +1756 @@
 static const yytype_int16 yypgoto[] =
 {
-   -1282,  4519,  3402, -1282,   393, -1282,   353,   929,  -255,   927,
-   -1282,   536,  -524,  -496,  -864,   -86,  4763,     0, -1282,  1012,
-     494,   506,   417,   512,  1032,  1034,  1040,  1042,  1039, -1282,
-    -348,  -520,  3026,  -967, -1282,  -684,   629,   -16,  -590,   453,
-   -1282,   172, -1282,   397, -1192, -1282, -1282,   141, -1282, -1281,
-   -1043,   247, -1282, -1282, -1282, -1282,    72, -1149, -1282, -1282,
-   -1282, -1282, -1282, -1282,   315,  -843,    50, -1282,  -384, -1282,
-     498,   288, -1282,   167, -1282,  -343, -1282, -1282, -1282,   546,
-    -651, -1282, -1282,     8, -1002,    97,  1423, -1282, -1282, -1282,
-    -125, -1282,    23,  1201,  -202,  1925,  4332, -1282, -1282,    52,
-     224,   459,  1086, -1282,  1865, -1282, -1282,    25,  2362, -1282,
-    2640,  1529, -1282, -1282, -1282,  -646, -1282,   935,   945,   535,
-     718,    78, -1282, -1282, -1282,   934,   722,  -464, -1282,   -94,
-     -89,   313, -1282, -1282,  -870,  -942,   -24,  1177,  1054,   368,
-   -1282,  1732,   548,  -317,  -213,  -127,   662,   776, -1282,   990,
-   -1282,  3077,  1178,  -438,   923, -1282, -1282,   710, -1282,  -234,
-   -1282,    99, -1282, -1282, -1282, -1240,   423, -1282, -1282, -1282,
-    1170, -1282,   -20, -1282, -1282,  -853,  -105, -1239,  -126,  2286,
-   -1282,  2146, -1282,   921, -1282,  -146,    59,  -177,  -171,  -166,
-       7,   -40,   -28,   -27,   725,     4,    28,    37,   -63,  -154,
-    -151,  -150,  -141,  -271,  -540,  -513,  -508,  -569,  -320,  -517,
-   -1282, -1282,  -518,  1092,  1093,  1097,  1371,  5065,  -582,  -555,
-    -549,  -535,  -441, -1282,  -497,  -722,  -721,  -701,  -607,  -309,
-    -346, -1282, -1282,   185,   133,   -15, -1282,  3702,   -45,  -609,
-    -238
+   -1323,  4572,  3263, -1323,   197, -1323,   601,   950,  -251,   910,
+   -1323,   521,  -520,  -467,  -853,   -64,  3183,     0, -1323,  -150,
+     423,   446,   477,   450,  1016,  1025,  1019,  1026,  1028, -1323,
+    -622,  -408,  5012,  -745, -1323,  -735,   604,   472,  -656,   413,
+   -1323,  1279, -1323,   374, -1058, -1323, -1323,   126, -1323,  -823,
+   -1106,   222, -1323, -1323, -1323, -1323,    58, -1209, -1323, -1323,
+   -1323, -1323, -1323, -1323,   301, -1149,    35, -1323,  -933, -1323,
+     482,   274, -1323,   159, -1323,  -303, -1323, -1323, -1323,   535,
+    -827, -1323, -1323,    15, -1007,    71,    28, -1323, -1323, -1323,
+     -21, -1323,   357,  1253,  -198,  1636,  4113, -1323, -1323,    80,
+      54,   422,  1473, -1323,  1886, -1323, -1323,   192,  2183, -1323,
+    2495,   898, -1323, -1323, -1323,  -638, -1323,   924,   925,   524,
+     699,    83, -1323, -1323, -1323,   915,   695,  -339, -1323,  -106,
+      34,  1281, -1323, -1323,  -847,  -986,  1046,  1127,  1039,     5,
+   -1323,  1536,   481,  -165,  -210,  -124,   651,   758, -1323,   979,
+   -1323,  2789,  1548,  -413,   904, -1323, -1323,   689, -1323,  -235,
+   -1323,   158, -1323, -1323, -1323, -1257,   401, -1323, -1323, -1323,
+    1148, -1323,    21, -1323, -1323,  -858,  -105, -1322,  -129,  2267,
+   -1323,  2391, -1323,   906, -1323,  -184,    59,  -180,  -173,  -170,
+       7,   -40,   -35,   -33,    60,    -6,    25,    93,  -168,  -164,
+    -158,  -147,  -144,  -292,  -471,  -462,  -452,  -551,  -302,  -537,
+   -1323, -1323,  -511,  1069,  1072,  1074,  2608,  4844,  -578,  -514,
+    -502,  -495,  -500, -1323,  -508,  -724,  -717,  -708,  -590,  -305,
+    -195, -1323, -1323,   246,    19,    36, -1323,  3865,   104,  -623,
+    -397
 };
 
@@ -1827 +1786 @@
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -521
+#define YYTABLE_NINF -522
 static const yytype_int16 yytable[] =
 {
-      49,   113,   428,   149,   166,   453,   440,    97,   399,   114,
-     766,   267,   143,   844,   400,   150,   151,   740,   628,   401,
-     827,  1070,   632,    63,   752,    76,   505,   964,   965,   609,
-     566,   402,    49,   826,   403,   404,   596,   868,  1187,    97,
-     407,   383,   384,   147,   405,   819,   919,   152,   966,    49,
-      50,   820,    69,   794,   725,    63,   161,    76,   730,    96,
-     815,   410,   357,   186,   567,   821,   209,   358,   166,    49,
-     193,   153,   973,   216,  1177,   669,   226,   219,   604,  1171,
-     154,  1379,    50,   818,    69,  1204,  1205,   816,   399,   202,
-     260,    96,   817,  1195,   400,   678,   425,    56,   115,   401,
-    1178,   327,   148,   682,    31,   113,  1468,   409,    96,   673,
-     675,   402,  1302,   113,   403,   404,   266,   271,   122,  1137,
-     407,  1443,   189,   408,   405,    96,    31,  1197,    96,    56,
-     747,   471,  1178,   106,   106,   475,   477,  -232,  -232,   203,
-     342,   280,    31,   948,   986,   149,   307,   147,  1398,  1399,
-    1169,  1170,   476,  1196,   161,   113,   345,   150,   151,  1439,
-     209,  1245,   830,   210,   436,   106,   220,   373,   837,  1181,
-      31,   859,   860,   714,   252,   923,   411,   729,   815,  1458,
-     735,  1303,   291,   964,   965,   186,   186,  1198,   877,   152,
-     913,   847,   123,   161,   327,   848,   742,   667,   411,   281,
-     736,   266,   106,   408,   966,   816,    96,   527,  -232,    49,
-     817,   951,   419,   153,   411,  1443,   161,   720,  1400,    96,
-    1443,   209,   154,  1069,    70,   149,   436,   173,   443,   168,
-    1439,   463,   377,   142,   163,  1077,    31,   150,   151,   307,
-    1443,   144,  1016,   804,   398,   189,   931,  1443,   378,   734,
-      31,    49,   723,   169,  1080,  1015,    70,   819,    97,   271,
-     664,   798,   166,   820,   271,   266,   266,  1199,    96,   253,
-      31,   113,   815,   161,    63,   991,    76,   821,   519,   472,
-      96,    76,   609,  1171,   146,   853,  1187,  1398,  1399,  1248,
-     212,   656,   476,   471,   307,  1003,   556,   557,   163,   816,
-     598,    50,  1139,    69,   817,   155,   481,   307,   411,  1525,
-      96,   596,  1200,   471,   568,  1093,   596,  1249,   441,   671,
-     828,   471,   601,   571,   479,   676,   588,   447,   147,  1536,
-     171,   558,   559,  1171,   664,   373,  1540,   994,   898,   357,
-     835,   113,   601,   665,   358,   345,   460,   922,    56,   602,
-     620,   827,  1526,   870,   111,   642,   342,  1409,  1070,  -467,
-    1118,  -467,  1423,   110,   625,   417,   831,   181,   625,   387,
-     834,   113,   871,   830,    41,    42,  1424,   819,  -467,  1541,
-    1119,   327,   327,   820,   106,   388,  1084,    96,   437,  1186,
-     201,   851,   844,   713,   435,   854,   266,   821,   445,   579,
-     390,   411,   759,   110,  1169,  1170,   186,   582,   603,   411,
-     672,   674,  -289,   373,    41,    42,   391,   665,   392,     8,
-       9,    10,    11,    12,   266,   177,   307,   307,  -288,  1496,
-     266,  1116,   357,   625,   393,  1501,   714,   358,   985,  1187,
-     702,   472,   764,    76,  1325,   442,  1187,   577,    31,   327,
-     176,   394,  1171,   578,   113,  1521,   435,   996,   247,  1201,
-    1528,   472,   804,    76,  1326,   189,   520,   395,   327,   472,
-    1126,    76,   266,   914,   261,    70,    34,   262,   250,   523,
-     266,   952,   625,  -516,    49,  1135,  1469,   373,   719,   915,
-     519,    97,   163,   252,   113,   519,   357,  1187,   519,   176,
-    1470,   358,   176,  1104,   609,   711,   307,    63,   113,    76,
-     342,   307,   263,   307,   307,  1029,   110,  1016,  1244,   -10,
-     869,   750,  1428,  1429,  1434,   113,   345,    41,    42,   229,
-     881,   330,   230,   327,    50,   234,    69,   236,   916,   683,
-     704,   910,  -440,    96,   245,   578,   705,   603,   176,   879,
-     804,   787,  -441,  1014,   917,  1330,   471,   882,   922,   411,
-    1069,     2,   206,     4,     5,     6,     7,  1157,  1159,   493,
-     571,   571,   494,    37,   212,   845,   914,    40,   307,   276,
-     598,    56,   928,   916,    41,    42,   439,   331,  1126,   625,
-     345,  1184,  1081,   913,   620,   714,   278,  1236,  1184,  1082,
-     602,   279,   602,   922,   372,   465,  1316,  1185,  1019,  1484,
-     812,   176,   601,  1318,  1308,   680,   371,   106,    45,    46,
-     625,   110,  1317,   332,   912,   625,    35,   620,    36,  1319,
-     333,   625,    41,    42,   625,   625,   625,  1362,  1138,   691,
-     483,   706,   806,  1512,   721,  1514,   702,   500,  1027,   731,
-     722,   286,   625,   747,   266,   732,   713,  1276,  1277,   814,
-    1332,   603,    41,    42,   334,   176,  1014,   376,  1074,  1363,
-     110,   229,   176,  -120,   746,  -120,   252,   329,   520,  -120,
-     747,    41,    42,   520,   113,   335,   520,   907,   514,  1029,
-     596,   523,   385,   523,  -120,  -120,   523,   212,  1360,   523,
-    1101,   252,   329,   411,   472,   570,    76,   411,    70,  1112,
-     625,   933,   620,    45,    46,   357,   177,   849,   719,   719,
-     358,   850,   389,     8,     9,    10,    11,    12,   399,   342,
-     472,  1234,    76,   629,   400,  1238,   549,   633,   498,   401,
-    1034,   176,   550,   551,   113,   345,   911,   892,   397,   750,
-     750,   402,    31,   747,   403,   404,   409,   894,   176,   450,
-     980,   407,   176,   747,   405,   702,   981,   993,   711,   922,
-     552,   553,  1408,   705,   162,   702,   804,   814,   603,  1232,
-      34,  1373,   426,   964,   965,   578,  1356,   427,   194,   702,
-    1474,   217,   747,   571,   227,   849,  1357,  1474,   749,  1100,
-     411,   625,   747,   625,   966,   999,    45,    46,   625,   345,
-    1161,   229,   602,   234,   432,   713,   110,  1359,   139,   238,
-     111,   554,   555,   747,   602,   176,  1364,    41,    42,   922,
-     922,    37,   747,   183,   184,    40,  -103,   714,   461,  1426,
-    -103,   890,    41,    42,   408,  1423,   442,  1348,  1522,   462,
-     897,  1349,  -364,   239,   899,  1476,  -393,  1477,   240,   484,
-     952,   806,  1425,   504,   952,   952,   291,  1444,   905,   691,
-     411,   814,   162,   747,   307,   508,    45,    46,  1436,   513,
-     885,   760,   411,   603,   525,   374,   765,   527,   342,   906,
-       2,   206,     4,     5,     6,     7,   625,    63,   327,    76,
-    1490,   229,   563,   113,   345,   907,  1491,   907,  1182,   562,
-    1523,   162,   110,   564,   139,   140,   714,   565,  1141,   113,
-     411,   338,   212,    41,    42,   568,    69,   711,  -437,    48,
-     112,  1168,   933,   933,   162,   465,   212,   719,  1153,   664,
-     411,  1546,   113,   307,   910,   586,   444,   578,  1494,  1436,
-    1105,   864,   560,   561,   845,    35,   589,    36,   112,   112,
-     932,    48,   601,  1156,  1083,   601,   911,   750,    45,    46,
-      -3,    56,    48,   775,   776,   777,   778,  1158,    48,   601,
-    1323,   638,   176,   891,  1508,  1241,    48,   411,  1087,   846,
-    1087,   657,    48,   702,   702,    48,   603,   658,    48,   345,
-     984,   981,  1227,   329,   411,   861,   878,   106,   880,  1369,
-    1370,   112,   112,   110,   176,   139,   140,   659,    -3,   876,
-     625,   625,   665,   661,    41,    42,   666,   912,   662,   212,
-     176,  1418,   981,  1126,   922,    48,   663,    37,    48,  1106,
-     307,    40,  1398,  1399,   176,    48,   771,   772,    41,    42,
-     922,   702,   702,   374,   737,   243,   738,   713,   927,   739,
-     773,   774,   743,   472,   668,    76,   110,  1380,   139,   140,
-    1079,  1380,   779,   780,    43,   106,    48,    41,    42,   257,
-     113,   692,    45,    46,    48,   907,   419,   660,   411,    48,
-     907,   693,  1189,   481,   329,   411,   697,    37,    70,   933,
-     500,    40,   987,   695,   691,  -236,   733,   266,    41,    42,
-     748,   744,   992,   756,    48,    48,   110,   807,   139,   140,
-     922,   922,   625,   808,   867,   176,  1004,    41,    42,   811,
-      48,   374,   822,   873,   718,   896,   -12,    56,    48,   828,
-     329,   601,    45,    46,   911,   -13,   345,    48,   866,   911,
-      48,   893,   213,   726,  1295,  1296,  1297,   112,   727,   895,
-     900,   232,  1331,  1333,  1334,   903,   921,  -414,  1459,   711,
-    -520,   936,   112,   106,  1284,  1285,   112,  1287,   722,   943,
-      48,   112,   945,   956,  1292,  1351,  1294,   957,   271,   113,
-     949,   498,   342,   950,    48,    48,   977,   219,   958,  1312,
-     959,    48,   116,   213,   960,   961,  -290,   113,    48,   988,
-     989,   307,   990,     8,     9,    10,    11,    12,  1005,  1006,
-    1007,  1008,  1009,  1203,  1010,   625,   442,  1011,  1022,   113,
-    -402,   702,  -401,  1071,    63,   906,    76,  1105,  1036,   702,
-     702,   702,    31,  1094,   215,  1095,   213,  1073,   711,  1096,
-     159,     2,   206,     4,     5,     6,     7,    48,  1097,  1103,
-     242,  1113,  1114,    69,    70,   691,   747,  1117,  1115,  1120,
-      34,   971,  1122,  1421,   625,   625,  1123,    48,    48,  1124,
-     228,  1534,  1125,   271,  1128,   210,   220,  1131,   307,   176,
-    1151,  1176,  1172,  1174,    48,   215,   510,  1173,    48,  1175,
-    1190,  1191,  1193,   702,  1194,  1202,   258,   213,    56,   643,
-    1121,   472,  1206,    76,   159,    -3,    35,  1207,    36,   547,
-     548,   113,   106,  1214,  1219,    48,  1106,  1058,   399,  1105,
-    1166,  1167,  1132,  1222,   400,    48,  1132,  1224,   215,   401,
-    1189,  1209,  1404,   493,   106,   213,  1228,   323,  1233,  1235,
-     213,   402,  1237,    48,   403,   404,   339,   547,  1240,    48,
-     407,    48,   106,  1246,   405,   499,  1250,  1252,  1254,  1256,
-      37,  1257,   183,   184,    40,  1258,  1507,  1259,   266,  1260,
-     441,    41,    42,  1262,   664,    56,  1132,  1269,  1216,  1217,
-    1278,  1279,  1286,   547,   625,  1307,   112,  1314,  1289,   215,
-    1290,    48,   528,   529,   530,  1320,   430,   185,  1291,    48,
-     434,  1322,   212,    48,  1293,    45,    46,    48,  1106,   113,
-     112,   106,   112,    57,    57,  1301,   531,  1105,   532,  1324,
-     533,   534,   528,   529,   530,    70,   213,   215,  1328,  1329,
-     323,   113,   215,   408,  1335,  1336,  1338,  1344,   113,  1345,
-     113,  1346,   113,  1347,   106,    57,   531,   112,   532,  1358,
-     533,  1305,   112,  1354,   472,   149,    76,   665,  1355,  1367,
-     327,   472,   434,    76,  1365,   488,  1366,   150,   151,  1297,
-    1374,  1506,  1375,  1376,  1382,  1383,   113,  -403,   113,    57,
-    1392,  1393,    57,  1189,  1396,   521,  1192,  1407,  1411,   113,
-    1189,  1413,  1415,  1416,  1422,  1506,  1506,   442,   159,  1430,
-    1431,   112,    70,   161,  1432,   307,  1106,   213,    48,  1433,
-    1417,  1435,   472,  1349,    76,  1440,  1449,  1451,   215,    48,
-    1506,    48,  1453,  1445,   213,  1447,  1455,   373,    56,  1462,
-    1457,  1464,   587,  1463,  1475,    56,   593,  1485,  1487,  1489,
-      48,  1189,   106,  1492,  1493,  1515,  1500,  1516,  1520,   213,
-     413,   768,   769,   770,   479,   626,    48,   421,  1337,   630,
-    1527,   112,   339,  1529,   106,  1531,  1339,  1340,  1341,   348,
-      48,   106,   112,    48,   112,  1537,  1544,    37,  1545,   174,
-     175,    40,  1208,   888,   781,   214,    56,   782,    41,    42,
-     176,  1132,  1132,  1132,   783,   785,  1130,   784,  1306,   215,
-    1495,  1410,  1547,  1368,  1384,  1478,    48,  1213,  1239,   901,
-     112,  1479,   112,  1483,   372,  1221,   112,   323,   323,   902,
-    1088,   924,   106,  1127,   112,  1482,   800,  1482,   872,   413,
-    1385,   703,  1092,  1035,    57,   938,   214,    48,    48,  1102,
-       0,   215,  1315,   946,   716,   687,     0,  1511,     0,  1513,
-       0,    48,   790,   791,  1058,    70,     0,   792,   116,     0,
-       0,  1482,    70,  1482,    57,     8,     9,    10,    11,    12,
-     213,     0,     0,     0,     0,     0,     0,     0,    37,   214,
-     183,   184,    40,   488,   576,   323,     0,   488,     0,    41,
-      42,  1542,   580,  1543,    31,   583,     0,   521,   213,   521,
-       0,  -291,   521,   213,   323,   521,  1550,  1551,     8,     9,
-      10,    11,    12,    70,     0,   600,   339,   601,     0,     0,
-       0,     0,    34,    45,    46,     0,     0,     0,     0,  1132,
-    1132,    48,     0,     0,     0,  1420,     0,    31,     0,     0,
-     214,     0,     0,    48,     0,     0,     0,  1372,     0,     0,
-       0,     0,   141,     8,     9,    10,    11,    12,   972,   413,
-     176,     0,   215,   421,   570,    34,   411,  1460,     0,   323,
-       0,     0,    45,    46,   213,     0,     0,     0,   214,     0,
-     802,     0,    31,   214,     0,     0,   643,     0,   213,     0,
-     215,     0,   112,     0,     0,   215,     0,     0,     0,  1397,
-       0,     0,  1405,     0,   241,   244,     0,     0,   499,     0,
-      34,   843,     0,     0,     0,    48,   593,     0,     0,     0,
-       0,     0,   852,     0,    48,  1509,    48,    37,     0,   174,
-     175,    40,     0,   112,  1517,     0,     0,   703,    41,    42,
-     413,     0,     0,     0,     0,  1442,   348,     0,     0,     0,
-    1446,     0,   749,     0,   411,    74,    48,     0,     0,     0,
-      45,    46,     0,     0,   376,     0,   215,     0,     0,   214,
-       8,     9,    10,    11,    12,   687,   112,     0,  1467,     0,
-     215,   213,     0,     0,     0,     0,     0,    74,     0,     0,
-     643,     0,    37,     0,   183,   184,    40,    57,   112,    31,
-       0,     0,   112,    41,    42,     0,   129,     0,   130,   131,
-     132,     0,     0,   488,     0,    66,   117,    41,    42,     0,
-       0,     0,     0,     0,   222,     0,     0,    34,     0,   265,
-       0,   576,   576,     0,     0,   339,     0,    45,    46,   348,
-       0,     0,    37,     0,   174,   175,    40,    66,     0,     0,
-     214,     0,   112,    41,    42,     0,   703,     0,     0,     0,
-       0,     0,  1535,     0,   160,   457,   703,     0,  1535,   932,
-       0,   601,     0,   215,     0,     0,     0,    45,    46,  1535,
-     703,     0,     0,  1535,   221,     0,     0,     0,     0,     0,
-     112,     0,   214,     0,   995,     0,     0,     0,     0,   802,
-       0,   547,     0,   348,    48,     0,     0,     0,     0,    48,
-       0,   353,     0,    37,     0,   183,   184,    40,   883,     0,
-     259,     0,   886,     0,    41,    42,    48,     0,     0,     0,
-       0,     8,     9,    10,    11,    12,     0,     0,     0,     0,
-       0,     0,   510,     0,     0,     0,     0,   348,   348,   348,
-     905,     0,   411,     0,     0,     0,     0,     0,    45,    46,
-      31,     0,   328,     0,     0,   348,     0,     0,     0,     0,
-     259,   350,     0,     0,     0,     0,     0,     0,   213,     0,
-       0,     0,     0,     0,     0,   449,     0,   802,    34,     0,
-       0,     0,     0,    37,   339,   183,   184,    40,     0,     0,
-       0,   406,   644,   112,    41,    42,    74,     0,     0,     0,
-     687,    74,     0,   214,     0,     0,   424,     0,     0,   429,
-     431,     0,     0,   348,   160,     0,    48,     0,     0,     0,
-     185,     0,   488,  1107,   323,     0,     0,     0,    45,    46,
-       0,   214,     0,     0,     0,   448,   214,     0,     0,   451,
-       0,   452,     0,     0,   576,     0,     0,     0,     0,     0,
-     459,     0,   126,   126,   126,     0,    66,   112,   112,   112,
-     215,   473,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   480,     0,     0,   703,   703,     0,     0,     0,   431,
-     843,   535,   536,   537,   538,   539,   540,   541,   542,   543,
-     544,     8,     9,    10,    11,    12,   222,    37,     0,   183,
-     184,    40,     0,   724,   348,   728,     0,   214,    41,    42,
-       0,     0,   348,     0,     0,   545,     0,     0,     0,     0,
-      31,   214,     0,     0,   126,     0,   126,     0,     0,     0,
-       0,     0,   703,   703,  1505,     0,   411,     0,     0,     0,
-       0,     0,    45,    46,     0,     0,   259,     0,    34,     0,
-     594,   275,     0,    37,   213,     0,   622,    40,     0,     0,
-       0,   687,   413,    74,    41,    42,     0,     0,     0,   627,
-       0,     0,     0,   627,     0,     0,   259,    57,   353,     0,
-       0,     0,     0,    74,     0,     0,    48,    48,     0,     0,
-      43,    74,   124,   127,   128,   112,   112,     0,    45,    46,
-       0,     0,     0,   802,     0,     0,     0,   126,     0,   353,
-       0,     0,     0,     0,   214,   126,     0,   126,   126,     0,
-       0,     0,   126,   473,   126,   126,     0,   353,     0,    74,
-       0,     0,     0,   112,     0,     0,     0,     0,   350,  1142,
-       0,     0,    77,   473,     0,    57,   215,     0,     0,   213,
-       0,   473,     0,     0,   865,     0,  1154,     0,     0,     0,
-       0,     0,     0,     0,   254,     0,   255,     0,     0,   698,
-       0,   353,   431,     0,    77,     0,     0,     0,     0,     0,
-    1313,     0,     0,     0,     0,     0,     0,   712,   339,    66,
-      48,   112,     0,     0,   126,     0,     0,   431,     0,     0,
-     112,   431,     0,   918,     0,   920,     0,     0,     0,   457,
-    1107,   223,   703,     0,    48,    48,     0,     0,     0,     0,
-     703,   703,   703,   348,   348,     0,     0,     0,     0,     0,
-     259,   350,     0,     0,   413,   353,     0,     0,     0,    48,
-       0,   215,     0,    57,     0,     0,     0,   396,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   415,   416,     0,
-       0,     0,   420,     0,   422,   423,     0,     0,     0,     0,
-       0,     0,     0,     0,  1242,     0,   793,     0,     0,   353,
-     353,   353,     0,     0,   703,     0,     0,     0,     8,     9,
-      10,    11,    12,     0,   627,   805,     0,   353,   355,     0,
-       0,     0,  1107,     0,     0,     0,     0,   824,     0,     0,
-       0,   214,     0,     0,     0,   353,     0,    31,     0,     0,
-       0,     0,     0,     0,     0,   594,    74,     0,     0,     0,
-     594,     0,     0,     0,     0,     0,   627,     0,     0,   350,