Changeset a7c90d4

Timestamp:

Mar 7, 2017, 8:33:43 AM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc

Children:

64cb860, c3396e0

Parents:

7fe2498

Message:

change StorageClass? to bitset, support _Thread_local as separate storage-class

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (2 diffs)
• CodeGen/FixNames.cc (modified) (3 diffs)
• GenPoly/Box.cc (modified) (14 diffs)
• GenPoly/Specialize.cc (modified) (2 diffs)
• InitTweak/FixGlobalInit.cc (modified) (2 diffs)
• InitTweak/FixInit.cc (modified) (11 diffs)
• InitTweak/GenInit.cc (modified) (4 diffs)
• InitTweak/InitTweak.cc (modified) (1 diff)
• Parser/DeclarationNode.cc (modified) (23 diffs)
• Parser/ExpressionNode.cc (modified) (3 diffs)
• Parser/ParseNode.h (modified) (10 diffs)
• Parser/TypeData.cc (modified) (9 diffs)
• Parser/TypeData.h (modified) (3 diffs)
• Parser/lex.cc (modified) (27 diffs)
• Parser/lex.ll (modified) (2 diffs)
• Parser/parser.cc (modified) (284 diffs)
• Parser/parser.h (modified) (3 diffs)
• Parser/parser.yy (modified) (6 diffs)
• ResolvExpr/Unify.cc (modified) (2 diffs)
• SymTab/Autogen.cc (modified) (10 diffs)
• SymTab/Autogen.h (modified) (2 diffs)
• SymTab/FixFunction.cc (modified) (2 diffs)
• SymTab/Indexer.cc (modified) (2 diffs)
• SymTab/Validate.cc (modified) (10 diffs)
• SynTree/AggregateDecl.cc (modified) (2 diffs)
• SynTree/Declaration.cc (modified) (3 diffs)
• SynTree/Declaration.h (modified) (12 diffs)
• SynTree/DeclarationWithType.cc (modified) (2 diffs)
• SynTree/FunctionDecl.cc (modified) (5 diffs)
• SynTree/NamedTypeDecl.cc (modified) (4 diffs)
• SynTree/ObjectDecl.cc (modified) (4 diffs)
• SynTree/TypeDecl.cc (modified) (2 diffs)
• Tuples/TupleAssignment.cc (modified) (2 diffs)
• Tuples/TupleExpansion.cc (modified) (3 diffs)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar  3 21:18:47 2017
-// Update Count     : 465
+// Last Modified On : Sun Mar  5 17:13:33 2017
+// Update Count     : 475
 //
 
@@ -895 +895 @@
 
         void CodeGenerator::handleStorageClass( DeclarationWithType * decl ) {
-                switch ( decl->get_storageClass() ) {
-                        //output << DeclarationNode::storageClassNames[decl->get_storageClass()] << ' ';
-                  case DeclarationNode::Extern:
-                        output << "extern ";
-                        break;
-                  case DeclarationNode::Static:
-                        output << "static ";
-                        break;
-                  case DeclarationNode::Auto:
-                        // silently drop storage class
-                        break;
-                  case DeclarationNode::Register:
-                        output << "register ";
-                        break;
-                  case DeclarationNode::Threadlocal:
-                        output << "_Thread_local ";
-                        break;
-                  case DeclarationNode::NoStorageClass:
-                        break;
-                  default:
-                        assert( false );
-                } // switch
+                if ( decl->get_storageClasses().any() ) {
+                        DeclarationNode::print_StorageClass( output, decl->get_storageClasses() );
+                } // if
         } // CodeGenerator::handleStorageClass
 

src/CodeGen/FixNames.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar  3 21:52:17 2017
-// Update Count     : 6
+// Last Modified On : Mon Mar  6 23:32:08 2017
+// Update Count     : 15
 //
 
@@ -39 +39 @@
         std::string mangle_main() {
                 FunctionType* main_type;
-                std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl(
-                        "main", 
-                        DeclarationNode::NoStorageClass, 
-                        LinkageSpec::Cforall, 
-                        main_type = new FunctionType( Type::Qualifiers(), true ), 
-                        nullptr
-                ) };
+                std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl( "main", DeclarationNode::StorageClasses(), LinkageSpec::Cforall,
+                                                                                                                                   main_type = new FunctionType( Type::Qualifiers(), true ), nullptr )
+                                };
                 main_type->get_returnVals().push_back( 
-                        new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
+                        new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
                 );
 
@@ -56 +52 @@
         std::string mangle_main_args() {
                 FunctionType* main_type;
-                std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl(
-                        "main", 
-                        DeclarationNode::NoStorageClass, 
-                        LinkageSpec::Cforall, 
-                        main_type = new FunctionType( Type::Qualifiers(), false ), 
-                        nullptr
-                ) };
+                std::unique_ptr<FunctionDecl> mainDecl { new FunctionDecl( "main", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 
+                                                                                                                                   main_type = new FunctionType( Type::Qualifiers(), false ), nullptr )
+                                };
                 main_type->get_returnVals().push_back( 
-                        new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
+                        new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
                 );
 
                 mainDecl->get_functionType()->get_parameters().push_back( 
-                        new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
+                        new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
                 );
 
                 mainDecl->get_functionType()->get_parameters().push_back( 
-                        new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, 
+                        new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, 
                         new PointerType( Type::Qualifiers(), new PointerType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::Char ) ) ), 
                         nullptr )

src/GenPoly/Box.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar  3 21:57:15 2017
-// Update Count     : 310
+// Last Modified On : Mon Mar  6 23:45:59 2017
+// Update Count     : 330
 //
 
@@ -289 +289 @@
                         TypeInstType paramType( Type::Qualifiers(), (*param)->get_name(), *param );
                         std::string paramName = mangleType( &paramType );
-                        layoutFnType->get_parameters().push_back( new ObjectDecl( sizeofName( paramName ), DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, sizeAlignType.clone(), 0 ) );
-                        layoutFnType->get_parameters().push_back( new ObjectDecl( alignofName( paramName ), DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, sizeAlignType.clone(), 0 ) );
+                        layoutFnType->get_parameters().push_back( new ObjectDecl( sizeofName( paramName ), DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, sizeAlignType.clone(), 0 ) );
+                        layoutFnType->get_parameters().push_back( new ObjectDecl( alignofName( paramName ), DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, sizeAlignType.clone(), 0 ) );
                 }
         }
@@ -298 +298 @@
                 // Routines at global scope marked "static" to prevent multiple definitions is separate translation units
                 // because each unit generates copies of the default routines for each aggregate.
-                FunctionDecl *layoutDecl = new FunctionDecl(
-                        layoutofName( typeDecl ), functionNesting > 0 ? DeclarationNode::NoStorageClass : DeclarationNode::Static, LinkageSpec::AutoGen, layoutFnType, new CompoundStmt( noLabels ),
-                        std::list< Attribute * >(), DeclarationNode::FuncSpec( DeclarationNode::InlineSpec ) );
+                FunctionDecl *layoutDecl = new FunctionDecl( layoutofName( typeDecl ),
+                                                                                                         functionNesting > 0 ? DeclarationNode::StorageClasses() : DeclarationNode::StorageClasses( DeclarationNode::StaticClass ),
+                                                                                                         LinkageSpec::AutoGen, layoutFnType, new CompoundStmt( noLabels ),
+                                                                                                         std::list< Attribute * >(), DeclarationNode::FuncSpecifiers( DeclarationNode::InlineSpec ) );
                 layoutDecl->fixUniqueId();
                 return layoutDecl;
@@ -367 +368 @@
                 PointerType *sizeAlignOutType = new PointerType( Type::Qualifiers(), sizeAlignType );
 
-                ObjectDecl *sizeParam = new ObjectDecl( sizeofName( structDecl->get_name() ), DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, sizeAlignOutType, 0 );
+                ObjectDecl *sizeParam = new ObjectDecl( sizeofName( structDecl->get_name() ), DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, sizeAlignOutType, 0 );
                 layoutFnType->get_parameters().push_back( sizeParam );
-                ObjectDecl *alignParam = new ObjectDecl( alignofName( structDecl->get_name() ), DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, sizeAlignOutType->clone(), 0 );
+                ObjectDecl *alignParam = new ObjectDecl( alignofName( structDecl->get_name() ), DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, sizeAlignOutType->clone(), 0 );
                 layoutFnType->get_parameters().push_back( alignParam );
-                ObjectDecl *offsetParam = new ObjectDecl( offsetofName( structDecl->get_name() ), DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, sizeAlignOutType->clone(), 0 );
+                ObjectDecl *offsetParam = new ObjectDecl( offsetofName( structDecl->get_name() ), DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, sizeAlignOutType->clone(), 0 );
                 layoutFnType->get_parameters().push_back( offsetParam );
                 addOtypeParams( layoutFnType, otypeParams );
@@ -428 +429 @@
                 PointerType *sizeAlignOutType = new PointerType( Type::Qualifiers(), sizeAlignType );
 
-                ObjectDecl *sizeParam = new ObjectDecl( sizeofName( unionDecl->get_name() ), DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, sizeAlignOutType, 0 );
+                ObjectDecl *sizeParam = new ObjectDecl( sizeofName( unionDecl->get_name() ), DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, sizeAlignOutType, 0 );
                 layoutFnType->get_parameters().push_back( sizeParam );
-                ObjectDecl *alignParam = new ObjectDecl( alignofName( unionDecl->get_name() ), DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, sizeAlignOutType->clone(), 0 );
+                ObjectDecl *alignParam = new ObjectDecl( alignofName( unionDecl->get_name() ), DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, sizeAlignOutType->clone(), 0 );
                 layoutFnType->get_parameters().push_back( alignParam );
                 addOtypeParams( layoutFnType, otypeParams );
@@ -536 +537 @@
                                         if ( adapters.find( mangleName ) == adapters.end() ) {
                                                 std::string adapterName = makeAdapterName( mangleName );
-                                                adapters.insert( std::pair< std::string, DeclarationWithType *>( mangleName, new ObjectDecl( adapterName, DeclarationNode::NoStorageClass, LinkageSpec::C, nullptr, new PointerType( Type::Qualifiers(), makeAdapterType( *funType, scopeTyVars ) ), nullptr ) ) );
+                                                adapters.insert( std::pair< std::string, DeclarationWithType *>( mangleName, new ObjectDecl( adapterName, DeclarationNode::StorageClasses(), LinkageSpec::C, nullptr, new PointerType( Type::Qualifiers(), makeAdapterType( *funType, scopeTyVars ) ), nullptr ) ) );
                                         } // if
                                 } // for
@@ -655 +656 @@
 
                 ObjectDecl *Pass1::makeTemporary( Type *type ) {
-                        ObjectDecl *newObj = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, type, 0 );
+                        ObjectDecl *newObj = new ObjectDecl( tempNamer.newName(), DeclarationNode::StorageClasses(), LinkageSpec::C, 0, type, 0 );
                         stmtsToAdd.push_back( new DeclStmt( noLabels, newObj ) );
                         return newObj;
@@ -764 +765 @@
                                         Type * newType = param->clone();
                                         if ( env ) env->apply( newType );
-                                        ObjectDecl *newObj = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, newType, 0 );
+                                        ObjectDecl *newObj = new ObjectDecl( tempNamer.newName(), DeclarationNode::StorageClasses(), LinkageSpec::C, 0, newType, 0 );
                                         newObj->get_type()->get_qualifiers() = Type::Qualifiers(); // TODO: is this right???
                                         stmtsToAdd.push_back( new DeclStmt( noLabels, newObj ) );
@@ -830 +831 @@
                                 makeRetParm( adapter );
                         } // if
-                        adapter->get_parameters().push_front( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::C, 0, new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) ), 0 ) );
+                        adapter->get_parameters().push_front( new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::C, 0, new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) ), 0 ) );
                         return adapter;
                 }
@@ -911 +912 @@
                         adapterBody->get_kids().push_back( bodyStmt );
                         std::string adapterName = makeAdapterName( mangleName );
-                        return new FunctionDecl( adapterName, DeclarationNode::NoStorageClass, LinkageSpec::C, adapterType, adapterBody );
+                        return new FunctionDecl( adapterName, DeclarationNode::StorageClasses(), LinkageSpec::C, adapterType, adapterBody );
                 }
 
@@ -1272 +1273 @@
                                 if ( adaptersDone.find( mangleName ) == adaptersDone.end() ) {
                                         std::string adapterName = makeAdapterName( mangleName );
-                                        paramList.push_front( new ObjectDecl( adapterName, DeclarationNode::NoStorageClass, LinkageSpec::C, 0, new PointerType( Type::Qualifiers(), makeAdapterType( *funType, scopeTyVars ) ), 0 ) );
+                                        paramList.push_front( new ObjectDecl( adapterName, DeclarationNode::StorageClasses(), LinkageSpec::C, 0, new PointerType( Type::Qualifiers(), makeAdapterType( *funType, scopeTyVars ) ), 0 ) );
                                         adaptersDone.insert( adaptersDone.begin(), mangleName );
                                 }
@@ -1378 +1379 @@
                         std::list< DeclarationWithType *>::iterator last = funcType->get_parameters().begin();
                         std::list< DeclarationWithType *> inferredParams;
-                        ObjectDecl newObj( "", DeclarationNode::NoStorageClass, LinkageSpec::C, 0, new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), 0 );
-                        ObjectDecl newPtr( "", DeclarationNode::NoStorageClass, LinkageSpec::C, 0,
+                        ObjectDecl newObj( "", DeclarationNode::StorageClasses(), LinkageSpec::C, 0, new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), 0 );
+                        ObjectDecl newPtr( "", DeclarationNode::StorageClasses(), LinkageSpec::C, 0,
                                            new PointerType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) ), 0 );
                         for ( Type::ForallList::const_iterator tyParm = funcType->get_forall().begin(); tyParm != funcType->get_forall().end(); ++tyParm ) {
@@ -1633 +1634 @@
 
                 ObjectDecl *PolyGenericCalculator::makeVar( const std::string &name, Type *type, Initializer *init ) {
-                        ObjectDecl *newObj = new ObjectDecl( name, DeclarationNode::NoStorageClass, LinkageSpec::C, 0, type, init );
+                        ObjectDecl *newObj = new ObjectDecl( name, DeclarationNode::StorageClasses(), LinkageSpec::C, 0, type, init );
                         stmtsToAdd.push_back( new DeclStmt( noLabels, newObj ) );
                         return newObj;
@@ -1817 +1818 @@
                                                         memberDecl = origMember->clone();
                                                 } else {
-                                                        memberDecl = new ObjectDecl( (*member)->get_name(), DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, offsetType->clone(), 0 );
+                                                        memberDecl = new ObjectDecl( (*member)->get_name(), DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, offsetType->clone(), 0 );
                                                 }
                                                 inits.push_back( new SingleInit( new OffsetofExpr( ty->clone(), memberDecl ) ) );

src/GenPoly/Specialize.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar  3 21:54:45 2017
-// Update Count     : 28
+// Last Modified On : Mon Mar  6 23:13:00 2017
+// Update Count     : 30
 //
 
@@ -155 +155 @@
                 } // if
                 // create new thunk with same signature as formal type (C linkage, empty body)
-                FunctionDecl *thunkFunc = new FunctionDecl( thunkNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, newType, new CompoundStmt( noLabels ) );
+                FunctionDecl *thunkFunc = new FunctionDecl( thunkNamer.newName(), DeclarationNode::StorageClasses(), LinkageSpec::C, newType, new CompoundStmt( noLabels ) );
                 thunkFunc->fixUniqueId();
 

src/InitTweak/FixGlobalInit.cc

@@ -10 +10 @@
 // Created On       : Mon May 04 15:14:56 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar  3 21:55:33 2017
-// Update Count     : 9
+// Last Modified On : Mon Mar  6 23:14:19 2017
+// Update Count     : 14
 //
 
@@ -87 +87 @@
                         dtorParameters.push_back( new ConstantExpr( Constant::from_int( 102 ) ) );
                 }
-                initFunction = new FunctionDecl( "_init_" + fixedName, DeclarationNode::Static, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
+                initFunction = new FunctionDecl( "_init_" + fixedName, DeclarationNode::StorageClasses( DeclarationNode::StaticClass ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
                 initFunction->get_attributes().push_back( new Attribute( "constructor", ctorParameters ) );
-                destroyFunction = new FunctionDecl( "_destroy_" + fixedName, DeclarationNode::Static, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
+                destroyFunction = new FunctionDecl( "_destroy_" + fixedName, DeclarationNode::StorageClasses( DeclarationNode::StaticClass ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
                 destroyFunction->get_attributes().push_back( new Attribute( "destructor", dtorParameters ) );
         }

src/InitTweak/FixInit.cc

@@ -10 +10 @@
 // Created On       : Wed Jan 13 16:29:30 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar  3 21:56:11 2017
-// Update Count     : 39
+// Last Modified On : Tue Mar  7 07:51:40 2017
+// Update Count     : 59
 //
 
@@ -437 +437 @@
                         result = result->clone();
                         env->apply( result );
-                        ObjectDecl * tmp = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, result, 0 );
+                        ObjectDecl * tmp = new ObjectDecl( tempNamer.newName(), DeclarationNode::StorageClasses(), LinkageSpec::C, 0, result, 0 );
                         tmp->get_type()->set_isConst( false );
 
@@ -483 +483 @@
                                 result = result->clone();
                                 env->apply( result );
-                                ObjectDecl * ret = new ObjectDecl( retNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, result, 0 );
+                                ObjectDecl * ret = new ObjectDecl( retNamer.newName(), DeclarationNode::StorageClasses(), LinkageSpec::C, 0, result, 0 );
                                 ret->get_type()->set_isConst( false );
                                 impCpCtorExpr->get_returnDecls().push_back( ret );
@@ -506 +506 @@
                                 result = result->clone();
                                 env->apply( result );
-                                ObjectDecl * ret = new ObjectDecl( retNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, result, 0 );
+                                ObjectDecl * ret = new ObjectDecl( retNamer.newName(), DeclarationNode::StorageClasses(), LinkageSpec::C, 0, result, 0 );
                                 ret->get_type()->set_isConst( false );
                                 stmtExpr->get_returnDecls().push_front( ret );
@@ -538 +538 @@
                         } else {
                                 // expr isn't a call expr, so create a new temporary variable to use to hold the value of the unique expression
-                                unqExpr->set_object( new ObjectDecl( toString("_unq_expr_", unqExpr->get_id()), DeclarationNode::NoStorageClass, LinkageSpec::C, nullptr, unqExpr->get_result()->clone(), nullptr ) );
+                                unqExpr->set_object( new ObjectDecl( toString("_unq_expr_", unqExpr->get_id()), DeclarationNode::StorageClasses(), LinkageSpec::C, nullptr, unqExpr->get_result()->clone(), nullptr ) );
                                 unqExpr->set_var( new VariableExpr( unqExpr->get_object() ) );
                         }
@@ -678 +678 @@
                                 assert( ! ctorInit->get_ctor() || ! ctorInit->get_init() );
                                 if ( Statement * ctor = ctorInit->get_ctor() ) {
-                                        if ( objDecl->get_storageClass() == DeclarationNode::Static ) {
+                                        if ( objDecl->get_storageClasses()[ DeclarationNode::Static ] ) {
                                                 // originally wanted to take advantage of gcc nested functions, but
                                                 // we get memory errors with this approach. To remedy this, the static
@@ -704 +704 @@
                                                 BasicType * boolType = new BasicType( Type::Qualifiers(), BasicType::Bool );
                                                 SingleInit * boolInitExpr = new SingleInit( new ConstantExpr( Constant( boolType->clone(), "1" ) ), noDesignators );
-                                                ObjectDecl * isUninitializedVar = new ObjectDecl( objDecl->get_mangleName() + "_uninitialized", DeclarationNode::Static, LinkageSpec::Cforall, 0, boolType, boolInitExpr );
+                                                ObjectDecl * isUninitializedVar = new ObjectDecl( objDecl->get_mangleName() + "_uninitialized", DeclarationNode::StorageClasses( DeclarationNode::StaticClass ), LinkageSpec::Cforall, 0, boolType, boolInitExpr );
                                                 isUninitializedVar->fixUniqueId();
 
@@ -731 +731 @@
 
                                                         // void __objName_dtor_atexitN(...) {...}
-                                                        FunctionDecl * dtorCaller = new FunctionDecl( objDecl->get_mangleName() + dtorCallerNamer.newName(), DeclarationNode::Static, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
+                                                        FunctionDecl * dtorCaller = new FunctionDecl( objDecl->get_mangleName() + dtorCallerNamer.newName(), DeclarationNode::StorageClasses( DeclarationNode::StaticClass ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
                                                         dtorCaller->fixUniqueId();
                                                         dtorCaller->get_statements()->push_back( dtorStmt );
@@ -764 +764 @@
                                                         // create a new object which is never used
                                                         static UniqueName dummyNamer( "_dummy" );
-                                                        ObjectDecl * dummy = new ObjectDecl( dummyNamer.newName(), DeclarationNode::Static, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ), 0, std::list< Attribute * >{ new Attribute("unused") } );
+                                                        ObjectDecl * dummy = new ObjectDecl( dummyNamer.newName(), DeclarationNode::StorageClasses( DeclarationNode::StaticClass ), LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ), 0, std::list< Attribute * >{ new Attribute("unused") } );
                                                         return dummy;
                                                 }
@@ -821 +821 @@
                 void InsertDtors::visit( ObjectDecl * objDecl ) {
                         // remember non-static destructed objects so that their destructors can be inserted later
-                        if ( objDecl->get_storageClass() != DeclarationNode::Static ) {
+                        if ( ! objDecl->get_storageClasses()[ DeclarationNode::Static ] ) {
                                 if ( ConstructorInit * ctorInit = dynamic_cast< ConstructorInit * >( objDecl->get_init() ) ) {
                                         // a decision should have been made by the resolver, so ctor and init are not both non-NULL
@@ -1118 +1118 @@
 
                         // xxx - ideally we would reuse the temporary generated from the copy constructor passes from within firstArg if it exists and not generate a temporary if it's unnecessary.
-                        ObjectDecl * tmp = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, nullptr, ctorExpr->get_result()->clone(), nullptr );
+                        ObjectDecl * tmp = new ObjectDecl( tempNamer.newName(), DeclarationNode::StorageClasses(), LinkageSpec::C, nullptr, ctorExpr->get_result()->clone(), nullptr );
                         addDeclaration( tmp );
 

src/InitTweak/GenInit.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 16 14:57:53 2017
-// Update Count     : 167
+// Last Modified On : Tue Mar  7 07:51:38 2017
+// Update Count     : 179
 //
 
@@ -120 +120 @@
                 void hoist( Type * type );
 
-                DeclarationNode::StorageClass storageclass = DeclarationNode::NoStorageClass;
+                DeclarationNode::StorageClasses storageClasses;
                 bool inFunction = false;
         };
@@ -174 +174 @@
 
         DeclarationWithType * HoistArrayDimension::mutate( ObjectDecl * objectDecl ) {
-                storageclass = objectDecl->get_storageClass();
+                storageClasses = objectDecl->get_storageClasses();
                 DeclarationWithType * temp = Parent::mutate( objectDecl );
                 hoist( objectDecl->get_type() );
-                storageclass = DeclarationNode::NoStorageClass;
                 return temp;
         }
@@ -185 +184 @@
                 static UniqueName dimensionName( "_array_dim" );
 
-                // C doesn't allow variable sized arrays at global scope or for static variables,
-                // so don't hoist dimension.
+                // C doesn't allow variable sized arrays at global scope or for static variables, so don't hoist dimension.
                 if ( ! inFunction ) return;
-                if ( storageclass == DeclarationNode::Static ) return;
+                if ( storageClasses[ DeclarationNode::StaticClass] ) return;
 
                 if ( ArrayType * arrayType = dynamic_cast< ArrayType * >( type ) ) {
                         if ( ! arrayType->get_dimension() ) return; // xxx - recursive call to hoist?
 
-                        // don't need to hoist dimension if it's a constexpr - only need to if there's potential
-                        // for side effects.
+                        // don't need to hoist dimension if it's a constexpr - only need to if there's potential for side effects.
                         if ( isConstExpr( arrayType->get_dimension() ) ) return;
 
-                        ObjectDecl * arrayDimension = new ObjectDecl( dimensionName.newName(), storageclass, LinkageSpec::C, 0, SymTab::SizeType->clone(), new SingleInit( arrayType->get_dimension() ) );
+                        ObjectDecl * arrayDimension = new ObjectDecl( dimensionName.newName(), storageClasses, LinkageSpec::C, 0, SymTab::SizeType->clone(), new SingleInit( arrayType->get_dimension() ) );
                         arrayDimension->get_type()->set_isConst( true );
 

src/InitTweak/InitTweak.cc

@@ -260 +260 @@
                         (objDecl->get_init() == NULL ||
                                 ( objDecl->get_init() != NULL && objDecl->get_init()->get_maybeConstructed() ))
-                        && objDecl->get_storageClass() != DeclarationNode::Extern;
+                        && ! objDecl->get_storageClasses()[ DeclarationNode::Extern ];
         }
 

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar  3 21:38:34 2017
-// Update Count     : 862
+// Last Modified On : Tue Mar  7 08:02:09 2017
+// Update Count     : 936
 //
 
@@ -19 +19 @@
 #include <algorithm>
 #include <cassert>
+#include <strings.h>                                                                    // ffs
 
 #include "TypeData.h"
@@ -32 +33 @@
 
 // These must remain in the same order as the corresponding DeclarationNode enumerations.
-const char * DeclarationNode::storageClassNames[] = { "extern", "static", "auto", "register", "_Thread_local", "inline", "fortran", "_Noreturn", "NoStorageClassNames" };
+const char * DeclarationNode::storageClassNames[] = { "extern", "static", "auto", "register", "_Thread_local", "NoStorageClassNames" };
 const char * DeclarationNode::funcSpecifierNames[] = { "inline", "fortran", "_Noreturn", "NoFunctionSpecifierNames" };
-const char * DeclarationNode::typeQualifierNames[] = { "const", "restrict", "volatile", "lvalue", "_Atomic", "NoTypeQualifierNames" };
+const char * DeclarationNode::typeQualifierNames[] = { "const", "restrict", "volatile", "lvalue", "mutex", "_Atomic", "NoTypeQualifierNames" };
 const char * DeclarationNode::basicTypeNames[] = { "void", "_Bool", "char", "int", "float", "double", "long double", "NoBasicTypeNames" };
 const char * DeclarationNode::complexTypeNames[] = { "_Complex", "_Imaginary", "NoComplexTypeNames" };
@@ -49 +50 @@
 DeclarationNode::DeclarationNode() :
                 type( nullptr ),
-                storageClass( NoStorageClass ),
                 bitfieldWidth( nullptr ),
                 hasEllipsis( false ),
@@ -89 +89 @@
 
         newnode->type = maybeClone( type );
-        newnode->storageClass = storageClass;
+        newnode->storageClasses = storageClasses;
         newnode->bitfieldWidth = maybeClone( bitfieldWidth );
-        newnode->funcSpec = funcSpec;
+        newnode->funcSpecs = funcSpecs;
         newnode->enumeratorValue.reset( maybeClone( enumeratorValue.get() ) );
         newnode->hasEllipsis = hasEllipsis;
@@ -116 +116 @@
 }
 
-void DeclarationNode::print_FuncSpec( std::ostream & output, DeclarationNode::FuncSpec funcSpec ) {
+void DeclarationNode::print_StorageClass( std::ostream & output, StorageClasses storageClasses ) {
+        if ( storageClasses.any() ) {                                                           // function specifiers?
+                for ( unsigned int i = 0; i < DeclarationNode::NoStorageClass; i += 1 ) {
+                        if ( storageClasses[i] ) {
+                                output << DeclarationNode::storageClassNames[i] << ' ';
+                        } // if
+                } // for
+        } // if
+} // print_StorageClass
+
+void DeclarationNode::print_FuncSpec( std::ostream & output, DeclarationNode::FuncSpecifiers funcSpec ) {
         if ( funcSpec.any() ) {                                                         // function specifiers?
                 for ( unsigned int i = 0; i < DeclarationNode::NoFuncSpecifier; i += 1 ) {
@@ -138 +148 @@
         } // if
 
-        if ( storageClass != NoStorageClass ) os << DeclarationNode::storageClassNames[storageClass] << ' ';
-        print_FuncSpec( os, funcSpec );
+        print_StorageClass( os, storageClasses );
+        print_FuncSpec( os, funcSpecs );
 
         if ( type ) {
@@ -194 +204 @@
 DeclarationNode * DeclarationNode::newStorageClass( DeclarationNode::StorageClass sc ) {
         DeclarationNode * newnode = new DeclarationNode;
-        newnode->storageClass = sc;
+        newnode->storageClasses[ sc ] = true;
         return newnode;
 } // DeclarationNode::newStorageClass
@@ -200 +210 @@
 DeclarationNode * DeclarationNode::newFuncSpecifier( DeclarationNode::FuncSpecifier fs ) {
         DeclarationNode * newnode = new DeclarationNode;
-        newnode->funcSpec[ fs ] = true;
+        newnode->funcSpecs[ fs ] = true;
         return newnode;
 } // DeclarationNode::newFuncSpecifier
@@ -443 +453 @@
 
 void DeclarationNode::checkQualifiers( const TypeData * src, const TypeData * dst ) {
-        const TypeData::TypeQualifiers &qsrc = src->typeQualifiers, &qdst = dst->typeQualifiers; // optimization
-
-        if ( (qsrc & qdst).any() ) {                                             // common qualifier ?
+        const TypeData::TypeQualifiers qsrc = src->typeQualifiers, qdst = dst->typeQualifiers; // optimization
+
+        if ( (qsrc & qdst).any() ) {                                            // common qualifier ?
                 for ( unsigned int i = 0; i < NoTypeQualifier; i += 1 ) { // find common qualifiers
                         if ( qsrc[i] && qdst[i] ) {
@@ -451 +461 @@
                         } // if
                 } // for
-        } // if
+        } // for
 } // DeclarationNode::checkQualifiers
 
-void DeclarationNode::checkStorageClasses( DeclarationNode * q ) {
-        const FuncSpec &src = funcSpec, &dst = q->funcSpec; // optimization
-        if ( (src & dst).any() ) {                                                      // common specifier ?
+void DeclarationNode::checkSpecifiers( DeclarationNode * src ) {
+        if ( (funcSpecs & src->funcSpecs).any() ) {                     // common specifier ?
                 for ( unsigned int i = 0; i < NoFuncSpecifier; i += 1 ) { // find common specifier
-                        if ( src[i] && dst[i] ) {
+                        if ( funcSpecs[i] && src->funcSpecs[i] ) {
                                 appendError( error, string( "duplicate " ) + DeclarationNode::funcSpecifierNames[i] );
                         } // if
@@ -464 +473 @@
         } // if
 
-        if ( storageClass != NoStorageClass && q->storageClass != NoStorageClass ) {
-                if ( storageClass == q->storageClass ) {                // duplicate qualifier
-                        appendError( error, string( "duplicate " ) + storageClassNames[ storageClass ] );
-                } else {                                                                                // only one storage class
-                        appendError( error, string( "conflicting " ) + storageClassNames[ storageClass ] + " & " + storageClassNames[ q->storageClass ] );
-                        q->storageClass = storageClass;                         // FIX ERROR, prevent assertions from triggering
-                } // if
-        } // if
-
-        appendError( error, q->error );
-} // DeclarationNode::checkStorageClasses
-
-DeclarationNode * DeclarationNode::copyStorageClasses( DeclarationNode * q ) {
-        funcSpec = funcSpec | q->funcSpec;
-
-        // do not overwrite an existing value with NoStorageClass
-        if ( q->storageClass != NoStorageClass ) {
-                assert( storageClass == NoStorageClass || storageClass == q->storageClass );
-                storageClass = q->storageClass;
-        } // if
+        if ( storageClasses != 0 && src->storageClasses != 0 ) { // any reason to check ?
+                if ( (storageClasses & src->storageClasses).any() ) { // duplicates ?
+                        for ( unsigned int i = 0; i < NoStorageClass; i += 1 ) { // find duplicates
+                                if ( storageClasses[i] && src->storageClasses[i] ) {
+                                        appendError( error, string( "duplicate " ) + storageClassNames[i] );
+                                } // if
+                        } // for
+                        // src is the new item being added and has a single bit
+                } else if ( ! src->storageClasses[ Threadlocal ] ) { // conflict ?
+                        appendError( error, string( "conflicting " ) + storageClassNames[ffs( storageClasses.to_ulong() ) - 1] +
+                                                 " & " + storageClassNames[ffs( src->storageClasses.to_ulong() ) - 1] );
+                        src->storageClasses.reset();                            // FIX to preserve invariant of one basic storage specifier
+                } // if
+        } // if
+
+        appendError( error, src->error );
+} // DeclarationNode::checkSpecifiers
+
+DeclarationNode * DeclarationNode::copySpecifiers( DeclarationNode * q ) {
+        funcSpecs = funcSpecs | q->funcSpecs;
+        storageClasses = storageClasses | q->storageClasses;
 
         for ( Attribute *attr: reverseIterate( q->attributes ) ) {
@@ -489 +499 @@
         } // for
         return this;
-} // DeclarationNode::copyStorageClasses
+} // DeclarationNode::copySpecifiers
 
 static void addQualifiersToType( TypeData *&src, TypeData * dst ) {
@@ -513 +523 @@
         if ( ! q ) { delete q; return this; }
 
-        checkStorageClasses( q );
-        copyStorageClasses( q );
+        checkSpecifiers( q );
+        copySpecifiers( q );
 
         if ( ! q->type ) {
@@ -543 +553 @@
         } // if
 
-        checkQualifiers( q->type, type );
+        checkQualifiers( type, q->type );
         addQualifiersToType( q->type, type );
 
@@ -624 +634 @@
 DeclarationNode * DeclarationNode::addType( DeclarationNode * o ) {
         if ( o ) {
-                checkStorageClasses( o );
-                copyStorageClasses( o );
+                checkSpecifiers( o );
+                copySpecifiers( o );
                 if ( o->type ) {
                         if ( ! type ) {
@@ -879 +889 @@
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = maybeClone( type );
-        assert( storageClass == NoStorageClass );
-        newnode->copyStorageClasses( this );
+        newnode->copySpecifiers( this );
         assert( newName );
         newnode->name = newName;
@@ -889 +898 @@
         if ( ! o ) return nullptr;
 
-        o->copyStorageClasses( this );
+        o->copySpecifiers( this );
         if ( type ) {
                 TypeData * srcType = type;
@@ -981 +990 @@
                                 } else if ( StructDecl * agg = dynamic_cast< StructDecl * >( decl ) ) {
                                         StructInstType * inst = new StructInstType( Type::Qualifiers(), agg->get_name() );
-                                        auto obj = new ObjectDecl( "", DeclarationNode::NoStorageClass, linkage, nullptr, inst, nullptr );
+                                        auto obj = new ObjectDecl( "", DeclarationNode::StorageClasses(), linkage, nullptr, inst, nullptr );
                                         obj->location = cur->location;
                                         * out++ = obj;
@@ -987 +996 @@
                                 } else if ( UnionDecl * agg = dynamic_cast< UnionDecl * >( decl ) ) {
                                         UnionInstType * inst = new UnionInstType( Type::Qualifiers(), agg->get_name() );
-                                        auto obj = new ObjectDecl( "", DeclarationNode::NoStorageClass, linkage, nullptr, inst, nullptr );
+                                        auto obj = new ObjectDecl( "", DeclarationNode::StorageClasses(), linkage, nullptr, inst, nullptr );
                                         obj->location = cur->location;
                                         * out++ = obj;
@@ -1034 +1043 @@
                 assertf( sizeof(kindMap)/sizeof(kindMap[0] == NoTypeClass-1), "DeclarationNode::build: kindMap is out of sync." );
                 assertf( variable.tyClass < sizeof(kindMap)/sizeof(kindMap[0]), "Variable's tyClass is out of bounds." );
-                TypeDecl * ret = new TypeDecl( *name, DeclarationNode::NoStorageClass, nullptr, kindMap[ variable.tyClass ] );
+                TypeDecl * ret = new TypeDecl( *name, DeclarationNode::StorageClasses(), nullptr, kindMap[ variable.tyClass ] );
                 buildList( variable.assertions, ret->get_assertions() );
                 return ret;
@@ -1045 +1054 @@
                 //    inline _Noreturn int g( int i );  // allowed
                 //    inline _Noreturn int i;                   // disallowed
-                if ( type->kind != TypeData::Function && funcSpec.any() ) {
+                if ( type->kind != TypeData::Function && funcSpecs.any() ) {
                         throw SemanticError( "invalid function specifier for ", this );
                 } // if
-                return buildDecl( type, name ? *name : string( "" ), storageClass, maybeBuild< Expression >( bitfieldWidth ), funcSpec, linkage, asmName, maybeBuild< Initializer >(initializer), attributes )->set_extension( extension );
+                return buildDecl( type, name ? *name : string( "" ), storageClasses, maybeBuild< Expression >( bitfieldWidth ), funcSpecs, linkage, asmName, maybeBuild< Initializer >(initializer), attributes )->set_extension( extension );
         } // if
 
@@ -1055 +1064 @@
         //    inlne _Noreturn struct S { ... };         // disallowed
         //    inlne _Noreturn enum   E { ... };         // disallowed
-        if ( funcSpec.any() ) {
+        if ( funcSpecs.any() ) {
                 throw SemanticError( "invalid function specifier for ", this );
         } // if
         assertf( name, "ObjectDecl must a have name\n" );
-        return (new ObjectDecl( *name, storageClass, linkage, maybeBuild< Expression >( bitfieldWidth ), nullptr, maybeBuild< Initializer >( initializer ) ))->set_asmName( asmName )->set_extension( extension );
+        return (new ObjectDecl( *name, storageClasses, linkage, maybeBuild< Expression >( bitfieldWidth ), nullptr, maybeBuild< Initializer >( initializer ) ))->set_asmName( asmName )->set_extension( extension );
 }
 

src/Parser/ExpressionNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Sep 16 16:27:44 2016
-// Update Count     : 508
+// Last Modified On : Sat Mar  4 06:58:47 2017
+// Update Count     : 509
 //
 
@@ -173 +173 @@
 
 Expression *build_constantZeroOne( const std::string & str ) {
-        Expression * ret = new ConstantExpr( Constant( str == "0" ? (Type*)new ZeroType( emptyQualifiers ) : (Type*)new OneType( emptyQualifiers ), str ) );
+        Expression * ret = new ConstantExpr( Constant( str == "0" ? (Type *)new ZeroType( emptyQualifiers ) : (Type*)new OneType( emptyQualifiers ), str ) );
         delete &str;                                                                            // created by lex
         return ret;
@@ -275 +275 @@
 }
 Expression *build_offsetOf( DeclarationNode *decl_node, NameExpr *member ) {
-        Expression* ret = new UntypedOffsetofExpr( maybeMoveBuildType( decl_node ), member->get_name() );
+        Expression * ret = new UntypedOffsetofExpr( maybeMoveBuildType( decl_node ), member->get_name() );
         delete member;
         return ret;

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar  3 21:34:27 2017
-// Update Count     : 704
+// Last Modified On : Tue Mar  7 08:10:53 2017
+// Update Count     : 726
 //
 
@@ -40 +40 @@
 //##############################################################################
 
-extern char* yyfilename;
+extern char * yyfilename;
 extern int yylineno;
 
@@ -123 +123 @@
         }
 
-        Expression * build() const { return const_cast<ExpressionNode*>(this)->expr.release(); }
+        Expression * build() const { return const_cast<ExpressionNode *>(this)->expr.release(); }
   private:
         bool extension = false;
@@ -204 +204 @@
         // These must remain in the same order as the corresponding DeclarationNode names.
 
-        enum StorageClass { Extern, Static, Auto, Register, Threadlocal, NoStorageClass };
+        enum StorageClass { Extern, Static, Auto, Register, Threadlocal, NoStorageClass,
+                                                ExternClass = 1 << Extern, StaticClass = 1 << Static, AutoClass = 1 << Auto, RegisterClass = 1 << Register, ThreadlocalClass = 1 << Threadlocal };
         enum FuncSpecifier { Inline, Noreturn, Fortran, NoFuncSpecifier,
-                                        InlineSpec = 1 << Inline, NoreturnSpec = 1 << Noreturn, FortranSpec = 1 << Fortran };
-        enum TypeQualifier { Const, Restrict, Volatile, Lvalue, Atomic, NoTypeQualifier };
+                                                 InlineSpec = 1 << Inline, NoreturnSpec = 1 << Noreturn, FortranSpec = 1 << Fortran };
+        enum TypeQualifier { Const, Restrict, Volatile, Lvalue, Mutex, Atomic, NoTypeQualifier };
         enum BasicType { Void, Bool, Char, Int, Float, Double, LongDouble, NoBasicType };
         enum ComplexType { Complex, Imaginary, NoComplexType };
@@ -264 +265 @@
         DeclarationNode * addQualifiers( DeclarationNode * );
         void checkQualifiers( const TypeData *, const TypeData * );
-        void checkStorageClasses( DeclarationNode * );
-        DeclarationNode * copyStorageClasses( DeclarationNode * );
+        void checkSpecifiers( DeclarationNode * );
+        DeclarationNode * copySpecifiers( DeclarationNode * );
         DeclarationNode * addType( DeclarationNode * );
         DeclarationNode * addTypedef();
@@ -296 +297 @@
 
         Declaration * build() const;
-        ::Type * buildType() const;
+        Type * buildType() const;
 
         bool get_hasEllipsis() const;
@@ -302 +303 @@
         DeclarationNode * extractAggregate() const;
         bool has_enumeratorValue() const { return (bool)enumeratorValue; }
-        ExpressionNode * consume_enumeratorValue() const { return const_cast<DeclarationNode*>(this)->enumeratorValue.release(); }
+        ExpressionNode * consume_enumeratorValue() const { return const_cast<DeclarationNode *>(this)->enumeratorValue.release(); }
 
         bool get_extension() const { return extension; }
@@ -324 +325 @@
 
         TypeData * type;
-        StorageClass storageClass;
-
-        typedef std::bitset< DeclarationNode::NoFuncSpecifier > FuncSpec;
-        FuncSpec funcSpec;
-        static void print_FuncSpec( std::ostream & output, FuncSpec funcSpec );
+
+        typedef std::bitset< DeclarationNode::NoStorageClass > StorageClasses;
+        StorageClasses storageClasses;
+        static void print_StorageClass( std::ostream & output, StorageClasses storageClasses );
+
+        typedef std::bitset< DeclarationNode::NoFuncSpecifier > FuncSpecifiers;
+        FuncSpecifiers funcSpecs;
+        static void print_FuncSpec( std::ostream & output, FuncSpecifiers funcSpecs );
 
         ExpressionNode * bitfieldWidth;
@@ -347 +351 @@
 
 static inline Type * maybeMoveBuildType( const DeclarationNode * orig ) {
-        Type* ret = orig ? orig->buildType() : nullptr;
+        Type * ret = orig ? orig->buildType() : nullptr;
         delete orig;
         return ret;
@@ -362 +366 @@
 
         virtual StatementNode * clone() const final { assert( false ); return nullptr; }
-        Statement * build() const { return const_cast<StatementNode*>(this)->stmt.release(); }
+        Statement * build() const { return const_cast<StatementNode *>(this)->stmt.release(); }
 
         virtual StatementNode * add_label( const std::string * name, DeclarationNode * attr = nullptr ) {

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar  3 21:59:10 2017
-// Update Count     : 516
+// Last Modified On : Tue Mar  7 08:08:21 2017
+// Update Count     : 538
 //
 
@@ -393 +393 @@
         buildList( firstNode, outputList );
         for ( typename ForallList::iterator i = outputList.begin(); i != outputList.end(); ++i ) {
-                TypeDecl * td = static_cast<TypeDecl*>(*i);
+                TypeDecl * td = static_cast<TypeDecl *>(*i);
                 if ( td->get_kind() == TypeDecl::Any ) {
                         // add assertion parameters to `type' tyvars in reverse order
                         // add dtor:  void ^?{}(T *)
                         FunctionType * dtorType = new FunctionType( Type::Qualifiers(), false );
-                        dtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, nullptr, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), td->get_name(), *i ) ), nullptr ) );
-                        td->get_assertions().push_front( new FunctionDecl( "^?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, dtorType, nullptr ) );
+                        dtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, nullptr, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), td->get_name(), *i ) ), nullptr ) );
+                        td->get_assertions().push_front( new FunctionDecl( "^?{}", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, dtorType, nullptr ) );
 
                         // add copy ctor:  void ?{}(T *, T)
                         FunctionType * copyCtorType = new FunctionType( Type::Qualifiers(), false );
-                        copyCtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, nullptr, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), td->get_name(), *i ) ), nullptr ) );
-                        copyCtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, nullptr, new TypeInstType( Type::Qualifiers(), td->get_name(), *i ), nullptr ) );
-                        td->get_assertions().push_front( new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, copyCtorType, nullptr ) );
+                        copyCtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, nullptr, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), td->get_name(), *i ) ), nullptr ) );
+                        copyCtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, nullptr, new TypeInstType( Type::Qualifiers(), td->get_name(), *i ), nullptr ) );
+                        td->get_assertions().push_front( new FunctionDecl( "?{}", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, copyCtorType, nullptr ) );
 
                         // add default ctor:  void ?{}(T *)
                         FunctionType * ctorType = new FunctionType( Type::Qualifiers(), false );
-                        ctorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, nullptr, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), td->get_name(), *i ) ), nullptr ) );
-                        td->get_assertions().push_front( new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, ctorType, nullptr ) );
+                        ctorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, nullptr, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), td->get_name(), *i ) ), nullptr ) );
+                        td->get_assertions().push_front( new FunctionDecl( "?{}", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, ctorType, nullptr ) );
 
                         // add assignment operator:  T * ?=?(T *, T)
                         FunctionType * assignType = new FunctionType( Type::Qualifiers(), false );
-                        assignType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, nullptr, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), td->get_name(), *i ) ), nullptr ) );
-                        assignType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, nullptr, new TypeInstType( Type::Qualifiers(), td->get_name(), *i ), nullptr ) );
-                        assignType->get_returnVals().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, nullptr, new TypeInstType( Type::Qualifiers(), td->get_name(), *i ), nullptr ) );
-                        td->get_assertions().push_front( new FunctionDecl( "?=?", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, assignType, nullptr ) );
+                        assignType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, nullptr, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), td->get_name(), *i ) ), nullptr ) );
+                        assignType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, nullptr, new TypeInstType( Type::Qualifiers(), td->get_name(), *i ), nullptr ) );
+                        assignType->get_returnVals().push_back( new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, nullptr, new TypeInstType( Type::Qualifiers(), td->get_name(), *i ), nullptr ) );
+                        td->get_assertions().push_front( new FunctionDecl( "?=?", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, assignType, nullptr ) );
                 } // if
         } // for
@@ -732 +732 @@
 } // buildAggInst
 
-NamedTypeDecl * buildSymbolic( const TypeData * td, const string & name, DeclarationNode::StorageClass sc ) {
+NamedTypeDecl * buildSymbolic( const TypeData * td, const string & name, DeclarationNode::StorageClasses scs ) {
         assert( td->kind == TypeData::Symbolic );
         NamedTypeDecl * ret;
         assert( td->base );
         if ( td->symbolic.isTypedef ) {
-                ret = new TypedefDecl( name, sc, typebuild( td->base ) );
+                ret = new TypedefDecl( name, scs, typebuild( td->base ) );
         } else {
-                ret = new TypeDecl( name, sc, typebuild( td->base ), TypeDecl::Any );
+                ret = new TypeDecl( name, scs, typebuild( td->base ), TypeDecl::Any );
         } // if
         buildList( td->symbolic.params, ret->get_parameters() );
@@ -784 +784 @@
 } // buildTypeof
 
-Declaration * buildDecl( const TypeData * td, const string &name, DeclarationNode::StorageClass sc, Expression * bitfieldWidth, DeclarationNode::FuncSpec funcSpec, LinkageSpec::Spec linkage, ConstantExpr *asmName, Initializer * init, std::list< Attribute * > attributes ) {
+Declaration * buildDecl( const TypeData * td, const string &name, DeclarationNode::StorageClasses scs, Expression * bitfieldWidth, DeclarationNode::FuncSpecifiers funcSpec, LinkageSpec::Spec linkage, ConstantExpr *asmName, Initializer * init, std::list< Attribute * > attributes ) {
         if ( td->kind == TypeData::Function ) {
                 if ( td->function.idList ) {                                    // KR function ?
@@ -792 +792 @@
                 FunctionDecl * decl;
                 Statement * stmt = maybeBuild<Statement>( td->function.body );
-                CompoundStmt * body = dynamic_cast< CompoundStmt* >( stmt );
-                decl = new FunctionDecl( name, sc, linkage, buildFunction( td ), body, attributes, funcSpec );
+                CompoundStmt * body = dynamic_cast< CompoundStmt * >( stmt );
+                decl = new FunctionDecl( name, scs, linkage, buildFunction( td ), body, attributes, funcSpec );
                 return decl->set_asmName( asmName );
         } else if ( td->kind == TypeData::Aggregate ) {
@@ -800 +800 @@
                 return buildEnum( td, attributes );
         } else if ( td->kind == TypeData::Symbolic ) {
-                return buildSymbolic( td, name, sc );
+                return buildSymbolic( td, name, scs );
         } else {
-                return (new ObjectDecl( name, sc, linkage, bitfieldWidth, typebuild( td ), init, attributes ))->set_asmName( asmName );
+                return (new ObjectDecl( name, scs, linkage, bitfieldWidth, typebuild( td ), init, attributes ))->set_asmName( asmName );
         } // if
         return nullptr;
@@ -820 +820 @@
                         break;
                   default:
-                        ft->get_returnVals().push_back( dynamic_cast< DeclarationWithType* >( buildDecl( td->base, "", DeclarationNode::NoStorageClass, nullptr, DeclarationNode::FuncSpecifier(), LinkageSpec::Cforall, nullptr ) ) );
+                        ft->get_returnVals().push_back( dynamic_cast< DeclarationWithType * >( buildDecl( td->base, "", DeclarationNode::StorageClasses(), nullptr, DeclarationNode::FuncSpecifiers(), LinkageSpec::Cforall, nullptr ) ) );
                 } // switch
         } else {
-                ft->get_returnVals().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, nullptr, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr ) );
+                ft->get_returnVals().push_back( new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, nullptr, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr ) );
         } // if
         return ft;
@@ -846 +846 @@
         for ( DeclarationNode * decl = function.oldDeclList; decl != nullptr; decl = dynamic_cast< DeclarationNode * >( decl->get_next() ) ) {
                 // scan ALL parameter names for each declaration name to check for duplicates
-                for ( DeclarationNode * param = function.idList; param != nullptr; param = dynamic_cast< DeclarationNode* >( param->get_next() ) ) {
+                for ( DeclarationNode * param = function.idList; param != nullptr; param = dynamic_cast< DeclarationNode * >( param->get_next() ) ) {
                         if ( *decl->name == *param->name ) {
                                 // type set => parameter name already transformed by a declaration names so there is a duplicate
@@ -867 +867 @@
         //    rtb( a, b, c ) const char * b; {} => int rtn( int a, const char * b, int c ) {}
 
-        for ( DeclarationNode * param = function.idList; param != nullptr; param = dynamic_cast< DeclarationNode* >( param->get_next() ) ) {
+        for ( DeclarationNode * param = function.idList; param != nullptr; param = dynamic_cast< DeclarationNode * >( param->get_next() ) ) {
                 if ( ! param->type ) {                                                  // generate type int for empty parameter type
                         param->type = new TypeData( TypeData::Basic );

src/Parser/TypeData.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar  3 20:56:53 2017
-// Update Count     : 167
+// Last Modified On : Tue Mar  7 08:03:53 2017
+// Update Count     : 173
 //
 
@@ -107 +107 @@
 ReferenceToType * buildComAggInst( const TypeData *, std::list< Attribute * > attributes );
 ReferenceToType * buildAggInst( const TypeData * );
-NamedTypeDecl * buildSymbolic( const TypeData *, const std::string &name, DeclarationNode::StorageClass sc );
 TypeDecl * buildVariable( const TypeData * );
 EnumDecl * buildEnum( const TypeData *, std::list< Attribute * > );
@@ -113 +112 @@
 TupleType * buildTuple( const TypeData * );
 TypeofType * buildTypeof( const TypeData * );
-Declaration * buildDecl( const TypeData *, const std::string &, DeclarationNode::StorageClass, Expression *, DeclarationNode::FuncSpec funcSpec, LinkageSpec::Spec, ConstantExpr *asmName, Initializer * init = nullptr, std::list< class Attribute * > attributes = std::list< class Attribute * >() );
+Declaration * buildDecl( const TypeData *, const std::string &, DeclarationNode::StorageClasses, Expression *, DeclarationNode::FuncSpecifiers funcSpec, LinkageSpec::Spec, ConstantExpr *asmName, Initializer * init = nullptr, std::list< class Attribute * > attributes = std::list< class Attribute * >() );
 FunctionType * buildFunction( const TypeData * );
 void buildKRFunction( const TypeData::Function_t & function );

src/Parser/lex.cc

@@ -382 +382 @@
         (yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 186
-#define YY_END_OF_BUFFER 187
+#define YY_NUM_RULES 187
+#define YY_END_OF_BUFFER 188
 /* This struct is not used in this scanner,
    but its presence is necessary. */
@@ -391 +391 @@
         flex_int32_t yy_nxt;
         };
-static yyconst flex_int16_t yy_accept[909] =
+static yyconst flex_int16_t yy_accept[914] =
     {   0,
-        0,    0,    0,    0,    0,    0,  121,  121,  124,  124,
-      187,  185,    7,    9,    8,  144,  123,  106,  149,  152,
-      120,  131,  132,  147,  145,  135,  146,  138,  148,  111,
-      112,  113,  136,  137,  154,  156,  155,  157,  185,  106,
-      129,  185,  130,  150,  106,  108,  106,  106,  106,  106,
-      106,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,  106,  133,  153,  134,  151,    7,  185,    4,
-        4,  186,  109,  186,  110,  121,  122,  128,  124,  125,
-        7,    9,    0,    8,  161,  180,  106,    0,  173,  143,
-      166,  174,  171,  158,  169,  159,  170,  168,    0,  117,
-
-        3,    0,  172,  116,  114,    0,    0,  114,  114,    0,
-        0,  114,  113,  113,  113,    0,  113,  141,  142,  140,
-      162,  164,  160,  165,  163,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,  122,  122,  125,  125,
+      188,  186,    7,    9,    8,  145,  124,  107,  150,  153,
+      121,  132,  133,  148,  146,  136,  147,  139,  149,  112,
+      113,  114,  137,  138,  155,  157,  156,  158,  186,  107,
+      130,  186,  131,  151,  107,  109,  107,  107,  107,  107,
+      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
+      107,  107,  107,  107,  134,  154,  135,  152,    7,  186,
+        4,    4,  187,  110,  187,  111,  122,  123,  129,  125,
+      126,    7,    9,    0,    8,  162,  181,  107,    0,  174,
+      144,  167,  175,  172,  159,  170,  160,  171,  169,    0,
+
+      118,    3,    0,  173,  117,  115,    0,    0,  115,  115,
+        0,    0,  115,  114,  114,  114,    0,  114,  142,  143,
+      141,  163,  165,  161,  166,  164,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      107,  179,    0,  123,  120,  106,    0,    0,  176,    0,
-      106,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,  106,  106,  106,  106,  106,   38,  106,  106,
-      106,  106,  106,  106,  106,  106,  106,  106,   57,  106,
-      106,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,  106,  106,  106,  106,  106,  106,  175,  167,
-
-        7,    0,    0,    0,    2,    0,    5,  109,    0,    0,
-        0,  121,    0,  127,  126,  126,    0,    0,    0,  124,
+        0,  108,  180,    0,  124,  121,  107,    0,    0,  177,
+        0,  107,  107,  107,  107,  107,  107,  107,  107,  107,
+      107,  107,  107,  107,  107,  107,  107,  107,   38,  107,
+      107,  107,  107,  107,  107,  107,  107,  107,  107,   57,
+      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
+      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
+
+      176,  168,    7,    0,    0,    0,    2,    0,    5,  110,
+        0,    0,    0,  122,    0,  128,  127,  127,    0,    0,
+        0,  125,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  140,  118,  119,
+        0,  119,  119,    0,    0,    6,  119,  115,    0,    0,
+        0,  119,    0,  115,  115,  115,  115,    0,  116,    0,
+        0,  114,  114,  114,  114,    0,  178,  179,    0,  184,
+      182,    0,    0,    0,  108,    0,    0,    0,    0,    0,
+        0,    0,    0,  107,   17,  107,  107,  107,  107,  107,
+      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
+
+      107,  107,  107,   14,  107,  107,  107,  107,  107,  107,
+      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
+      107,  107,   51,  107,  107,  107,   64,  107,  107,  107,
+      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
+      107,  107,  107,   92,  107,  107,  107,  107,  107,  107,
+      107,  107,  107,    0,    0,    0,    0,    0,    0,    0,
+        0,  127,    0,    0,    0,    0,    0,  127,    0,    0,
+      185,    0,    0,    0,    0,    0,    0,    0,  119,    0,
+      119,    0,  119,    0,  119,    0,    0,  119,    0,  115,
+      115,    0,    0,  116,  116,    0,  116,    0,  116,  114,
+
+      114,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  183,  107,  107,  107,  107,  107,  107,  107,  107,
+      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
+      107,  107,  107,  107,  107,   21,  107,   24,  107,   27,
+      107,  107,  107,  107,  107,  107,  107,   41,  107,   43,
+      107,  107,  107,  107,  107,  107,  107,   56,  107,   67,
+      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
+      107,  107,  107,  107,  107,  107,  107,  107,  107,  101,
+      107,  107,  107,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  127,    0,    0,
+
+        0,    0,    0,  119,    0,    0,    0,    0,    0,    0,
+        0,  116,  116,    0,  120,    0,  116,  116,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  139,  117,  118,    0,  118,
-      118,    0,    0,    6,  118,  114,    0,    0,    0,  118,
-        0,  114,  114,  114,  114,    0,  115,    0,    0,  113,
-      113,  113,  113,    0,  177,  178,    0,  183,  181,    0,
-        0,    0,  107,    0,    0,    0,    0,    0,    0,    0,
-        0,  106,   17,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-
-      106,   14,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-       51,  106,  106,  106,   64,  106,  106,  106,  106,  106,
-      106,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-       91,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-        0,    0,    0,    0,    0,    0,    0,    0,  126,    0,
-        0,    0,    0,    0,  126,    0,    0,  184,    0,    0,
-        0,    0,    0,    0,    0,  118,    0,  118,    0,  118,
-        0,  118,    0,    0,  118,    0,  114,  114,    0,    0,
-      115,  115,    0,  115,    0,  115,  113,  113,    0,    0,
-
-        0,    0,    0,    0,    0,    0,    0,    0,  182,  106,
-      106,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,   21,  106,   24,  106,   27,  106,  106,  106,
-      106,  106,  106,  106,   41,  106,   43,  106,  106,  106,
-      106,  106,  106,  106,   56,  106,   67,  106,  106,  106,
-      106,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,  106,  106,  106,  100,  106,  106,  106,    0,
+        0,  107,  107,   22,  107,  107,  107,  107,  107,  107,
+      107,   15,  107,  107,  107,  107,  107,  107,  107,  107,
+      107,  107,  107,  107,  107,  107,   23,   25,  107,   32,
+      107,  107,  107,  107,   40,  107,  107,  107,  107,   49,
+      107,  107,   54,  107,  107,   69,   72,   73,  107,  107,
+      107,   79,  107,  107,  107,  107,  107,   89,   91,   93,
+      107,  107,   98,  107,  107,  105,  107,    0,    0,    0,
+
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  126,    0,    0,    0,    0,    0,  118,
-
-        0,    0,    0,    0,    0,    0,    0,  115,  115,    0,
-      119,    0,  115,  115,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,  106,  106,   22,
-      106,  106,  106,  106,  106,  106,  106,   15,  106,  106,
-      106,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,   23,   25,  106,   32,  106,  106,  106,  106,
-       40,  106,  106,  106,  106,   49,  106,  106,   54,  106,
-      106,   71,   72,  106,  106,  106,   78,  106,  106,  106,
-      106,  106,   88,   90,   92,  106,  106,   97,  106,  106,
-      104,  106,    0,    0,    0,    0,    0,    0,    0,    0,
-
+        0,    0,    0,    0,    0,    0,  120,    0,    0,  116,
+      120,  120,  120,  120,    0,  116,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,  107,    0,  107,  107,
+      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
+      107,  107,  107,  107,   59,  107,  107,  107,  107,  107,
+      107,  107,  107,   28,  107,  107,  107,   39,   42,   45,
+      107,  107,   52,  107,   61,   68,  107,  107,   78,   80,
+       83,   84,   86,   87,  107,  107,   95,  107,  107,  106,
+        0,    1,    0,    0,    0,    0,    0,    0,  110,    0,
+
+        0,    0,  127,    0,    0,    0,    0,  120,    0,  120,
+      120,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+      107,  107,   18,  107,  107,  107,  107,  107,  107,  107,
+       16,  107,  107,  107,   33,  107,  107,  107,  107,  107,
+      107,  107,  107,  107,  107,  107,  107,   36,   37,  107,
+       48,   53,  107,  107,  107,   94,  107,  107,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,  119,    0,    0,  115,  119,  119,  119,  119,    0,
-      115,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,  106,    0,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,  106,  106,  106,  106,  106,  106,  106,   59,
-      106,  106,  106,  106,  106,  106,  106,  106,   28,  106,
-      106,  106,   39,   42,   45,  106,  106,   52,  106,   61,
-       68,  106,  106,   77,   79,   82,   83,   85,   86,  106,
-      106,   94,  106,  106,  105,    0,    1,    0,    0,    0,
-        0,    0,    0,  109,    0,    0,    0,  126,    0,    0,
-
-        0,    0,  119,    0,  119,  119,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  106,  106,   18,  106,  106,
-      106,  106,  106,  106,  106,   16,  106,  106,  106,   33,
-      106,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,   36,   37,  106,   48,   53,  106,  106,  106,
-       93,  106,  106,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   10,   11,   29,   55,
-      106,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,   60,   62,   65,  106,  106,   80,   95,  106,  106,
-       35,  106,   47,   73,   74,  106,   98,  101,    0,    0,
-
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      106,   69,  106,  106,   12,  106,  106,   30,   34,  106,
-      106,  106,   66,  106,  106,  106,  106,  106,  106,  106,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,   58,  106,  106,  106,  106,  106,  106,
-      106,   50,   63,   75,   81,   96,  102,  106,  106,  106,
-        0,    0,    0,    0,    0,    0,    0,    0,  106,  106,
-       13,   19,  106,  106,   31,  106,  106,  106,   26,   46,
-       89,    0,    0,  106,  106,  106,  106,  106,  106,   76,
-      103,  106,   87,   20,  106,  106,   44,   84,  106,  106,
-
-      106,  106,  106,  106,  106,   99,   70,    0
+        0,   10,   11,   29,   55,  107,  107,  107,  107,  107,
+      107,  107,  107,  107,  107,  107,   60,   62,   65,  107,
+      107,   81,   96,  107,  107,   35,  107,   47,   74,   75,
+
+      107,   99,  102,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  107,   70,  107,  107,   12,
+      107,  107,   30,   34,  107,  107,  107,   66,  107,  107,
+      107,  107,  107,  107,  107,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,   58,  107,
+      107,  107,  107,  107,  107,  107,   50,   63,   76,   82,
+       97,  103,  107,  107,  107,    0,    0,    0,    0,    0,
+        0,    0,    0,  107,  107,   13,   19,  107,  107,   31,
+      107,  107,  107,   26,   46,   90,    0,    0,  107,  107,
+      107,  107,  107,  107,   77,  104,  107,   88,   20,  107,
+
+      107,   44,   85,  107,  107,  107,  107,  107,  107,  107,
+      100,   71,    0
     } ;
 
@@ -540 +541 @@
     } ;
 
-static yyconst flex_int16_t yy_base[1083] =
+static yyconst flex_int16_t yy_base[1088] =
     {   0,
-        0,   84, 2330, 2327,   94,    0,  177,  178,  179,  180,
-     2341, 2877,  191, 2877,  197,   55, 2877, 2287,   60,  173,
-     2877, 2877, 2877,   56,  188, 2877,  191,  189,  204,  216,
-      275,    0, 2306, 2877,  216, 2305,  152,  344,  155,  220,
-     2877,  159, 2877,  217,  226, 2877,  185,  154,  212,  251,
-      237,  270,  235,  257,  241,  279,  193,  305,  314,  351,
-      238,  228,  227, 2877,  225, 2877, 2300,  406,  412, 2877,
-     2309, 2877, 2277,  235, 2877,    0, 2877,  439,    0, 2877,
-      426, 2877,  452,  464, 2877,  511, 2276,  264, 2877, 2877,
-     2877, 2877, 2877, 2293, 2877, 2290, 2877, 2877, 2300,  572,
-
-     2877, 2317, 2877,  451,  457,  524,  547,  298,  253,  197,
-      312,  279,    0,  342,  325,  198,  322, 2877, 2877, 2877,
-     2287, 2877, 2877, 2877, 2285, 2282,  218,  312, 2295,  350,
-      363,  368,  369,  391,  411,  417, 2276,  452, 2225,  453,
-     2254, 2877,  274, 2877, 2877,  438, 2248, 2245, 2877, 2218,
-      435,  282,  353,  277,  391,  419,  442,  320,  583,  451,
-      446,  443,  479,  469,  364,  472,  481,  454,  458,  484,
-      503,  493,  352,  506,  486,  453,  507,  509, 2246,  539,
-      532,  524,  516,  528,  556,  530,  540,  552,  553,  564,
-      574,  538,  576,  613,  573,  597,  602,  571, 2877, 2877,
-
-      668,  674, 2294,  680, 2877,  686, 2877, 2241,  603, 2235,
-     2234,    0,  683, 2877, 2877,  692, 2233, 2231, 2211,    0,
-     2233,  556,  627,  630,  662,  699,  688,  692,  693,  696,
-     2230,  700,  703, 2205, 2202, 2877,    0,  695,  726,  693,
-      701, 2201, 2253, 2877,  747,  742,  700,  753,  760,  793,
-      815,  746, 2877, 2210, 2183,    0,  802, 2227,  801,  754,
-     2877, 2203, 2178,  839, 2877, 2877, 2210, 2877, 2877,  709,
-      723, 2187, 2185,  755, 2181, 2180, 2178,    0, 2175,    0,
-     2144,  694,  736,  737,  741,  614,  739,  738,  742,  798,
-      807,  792,  802,  797,  746,  816,  748,  791,  824,  819,
-
-      826, 2174,  827,  830,  831,  440,  834,  838,  836,  843,
-      847,  849,  841,  850,  861,  853,  862,  851,  863,  865,
-      872,  864,  873,  874, 2173,  749,  875,  876,  878,  880,
-      881,  882,  884,  885,  886,  888,  889,  892,  898,  896,
-     2171,  899,  906,  944,  901,  907,  913,  917,  908,  911,
-      976,  977, 2165, 2164, 2163,    0, 2161,    0,  964,  968,
-     2158,    0, 2157,    0, 2156,    0, 2176, 2877,  964,  967,
-     2153, 2147,    0, 2143,    0, 2877,  979,  998,  990, 2877,
-     1004, 1044, 2141, 1020, 1066, 2139, 2877, 2877,  963, 1006,
-     1052, 1005, 1091,  968, 1083, 1006, 2877, 2877, 2136, 2134,
-
-     2132,    0, 2129,    0, 2126,    0, 2125,    0, 2877,  931,
-      981,  985,  928, 1024,  987, 1068,  958, 1070, 1060, 1010,
-     1005, 1072, 1083, 1022, 1078, 1082, 1088, 1042, 1084, 1081,
-     1089, 1097, 2127, 1090, 2125, 1095, 2122, 1093, 1091, 1109,
-     1101, 1111, 1115, 1116, 2119, 1118, 2118, 1119, 1120, 1121,
-     1123, 1126, 1127, 1128, 2117, 1129, 2115, 1131, 1134, 1135,
-     1132, 1138, 1140, 1143, 1148, 1149, 1150, 1152, 1155, 1151,
-     1161, 1164, 1166, 1168, 1169, 2112, 1170, 1172, 1175, 1221,
-     2106,    0, 2105,    0, 2104,    0, 2102,    0, 1216, 2099,
-        0, 2096,    0, 2095, 2094, 2092,    0, 2089,    0, 1223,
-
-     2086, 1229, 1245, 1231, 1270, 1236, 1186, 1185, 2877, 1286,
-     1304, 1297, 2097, 2072, 2082, 2079,    0, 2076,    0, 2075,
-        0, 2074,    0, 2072,    0, 2069,    0, 1190, 1210, 2069,
-     1191, 1227, 1212, 1230, 1253, 1246, 1254, 1280, 1281, 1282,
-     1284, 1228, 1287, 1286, 1288, 1285,  234, 1293, 1289, 1304,
-     1300, 1305, 2068, 1322, 1306, 2067, 1308, 1313, 1318, 1320,
-     2065, 1323, 1324, 1326, 1327, 2062, 1330, 1331, 2061, 1334,
-     1335, 2060, 2058, 1337, 1339, 1340, 2055, 1004, 1346, 1347,
-     1348, 1349, 1364, 2054, 2053, 1351, 1353, 2051, 1350, 1355,
-     2018, 1362, 2066, 2012,    0, 2009,    0, 2006,    0, 2005,
-
-        0, 2004,    0, 2002,    0, 1999,    0, 1996,    0, 1401,
-     1407, 1435, 1418, 1995, 2877, 1424, 1411, 1421, 1427, 1994,
-     2877, 1992,    0, 1989,    0, 1988,    0, 1987,    0,    0,
-        0, 1988,    0, 1412, 1422, 1419, 1387, 1369, 1416, 1433,
-     1436, 1403, 1446, 1441, 1431, 1432, 1451, 1452, 1455, 1456,
-     1457, 1486, 1460, 1461, 1462, 1464, 1463, 1467, 1985, 1465,
-     1468, 1470, 1984, 1983, 1981, 1472, 1466, 1974, 1478, 1972,
-     1971, 1480, 1484, 1968, 1964, 1960, 1956, 1953, 1952, 1487,
-     1494, 1951, 1497, 1483, 1949, 1996, 2877, 1942,    0, 1941,
-        0,    0,    0, 1942,    0,    0,    0, 2877,    0,    0,
-
-        0,    0, 1537, 1936, 2877, 2877, 1543, 1935,    0, 1934,
-        0,    0,    0,    0, 1932, 1499, 1519, 1932, 1500, 1524,
-     1530, 1501, 1502, 1533, 1537, 1931, 1532, 1541, 1534, 1539,
-     1544,  599, 1548, 1549, 1579, 1556, 1557, 1560, 1561, 1562,
-     1563, 1564, 1930, 1928, 1567, 1925, 1924, 1566, 1569, 1572,
-     1923, 1574, 1578,    0,    0,    0, 1918, 1915, 1914, 1624,
-        0, 1913, 1911, 1908, 1907, 1906, 1907, 1904, 1903, 1902,
-     1580, 1588, 1576, 1577, 1601, 1583, 1602, 1589, 1604, 1603,
-     1636, 1900, 1609, 1897, 1610, 1614, 1617, 1622, 1618, 1623,
-     1896, 1624, 1895, 1893, 1886, 1626, 1884, 1883, 1877, 1876,
-
-     1875, 1873, 1856, 1847, 1846, 1843, 1836, 1833, 1826, 1824,
-     1628, 1826, 1629, 1630, 1631, 1632, 1635, 1637, 1805, 1639,
-     1667, 1642, 1804, 1643, 1653, 1658, 1651, 1652, 1659, 1662,
-     1800, 1793, 1791, 1790, 1748, 1745, 1744, 1742, 1741, 1737,
-     1735, 1733, 1732, 1734, 1663, 1664, 1666, 1672, 1673, 1674,
-     1675, 1731, 1689, 1676, 1644, 1522, 1680, 1685, 1686, 1687,
-     1500, 1411, 1363, 1362, 1260, 1219, 1218, 1047, 1690, 1688,
-     1046, 1700, 1695, 1701,  924, 1704, 1708, 1709,  839,  794,
-      759,  702,  636, 1682, 1710, 1713, 1714, 1715, 1717,  638,
-      536, 1719,  488,  441, 1721, 1722,  408,  281, 1723, 1726,
-
-     1727, 1729, 1728, 1730, 1733,  233,  137, 2877, 1805, 1818,
-     1831, 1841, 1851, 1864, 1874, 1887, 1900, 1913, 1921, 1931,
-     1938, 1945, 1952, 1959, 1966, 1973, 1980, 1987, 1994, 2001,
-     2005, 2013, 2019, 2026, 2033, 2040, 2047, 2050, 2057, 2063,
-     2076, 2089, 2096, 2103, 2110, 2117, 2120, 2127, 2130, 2137,
-     2140, 2147, 2150, 2157, 2160, 2167, 2170, 2177, 2180, 2187,
-     2195, 2202, 2209, 2216, 2223, 2226, 2233, 2236, 2243, 2246,
-     2253, 2259, 2272, 2279, 2286, 2289, 2296, 2299, 2306, 2309,
-     2316, 2319, 2326, 2329, 2336, 2339, 2346, 2353, 2356, 2363,
-     2366, 2373, 2380, 2387, 2390, 2397, 2400, 2407, 2410, 2417,
-
-     2420, 2427, 2430, 2437, 2443, 2456, 2463, 2470, 2473, 2480,
-     2483, 2490, 2493, 2500, 2503, 2510, 2513, 2520, 2523, 2530,
-     2533, 2540, 2543, 2550, 2557, 2560, 2567, 2570, 2577, 2580,
-     2587, 2590, 2593, 2599, 2606, 2615, 2622, 2629, 2632, 2639,
-     2642, 2645, 2651, 2658, 2661, 2664, 2667, 2670, 2673, 2676,
-     2679, 2686, 2689, 2696, 2699, 2702, 2705, 2708, 2718, 2725,
-     2728, 2731, 2734, 2741, 2748, 2755, 2758, 2765, 2772, 2779,
-     2786, 2793, 2800, 2807, 2814, 2821, 2828, 2835, 2842, 2849,
-     2856, 2863
+        0,   84, 2340, 2339,   94,    0,  177,  178,  179,  180,
+     2355, 2883,  191, 2883,  197,   55, 2883, 2300,   60,  173,
+     2883, 2883, 2883,   56,  188, 2883,  191,  189,  204,  216,
+      275,    0, 2317, 2883,  216, 2315,  152,  344,  155,  220,
+     2883,  159, 2883,  217,  226, 2883,  185,  154,  212,  251,
+      237,  270,  235,  257,  241,  204,  279,  193,  305,  314,
+      351,  238,  228,  268, 2883,  257, 2883, 2312,  406,  412,
+     2883, 2323, 2883, 2290,  235, 2883,    0, 2883,  439,    0,
+     2883,  426, 2883,  452,  464, 2883,  511, 2287,  258, 2883,
+     2883, 2883, 2883, 2883, 2303, 2883, 2302, 2883, 2883, 2314,
+
+      572, 2883, 2330, 2883,  451,  457,  524,  547,  298,  285,
+      197,  312,  305,    0,  342,  325,  198,  322, 2883, 2883,
+     2883, 2298, 2883, 2883, 2883, 2295, 2294,  218,  312, 2309,
+      350,  388,  368,  363,  413,  369,  391, 2289,  417, 2236,
+      418, 2264, 2883,  274, 2883, 2883,  477, 2260, 2259, 2883,
+     2231,  419,  390,  432,  431,  435,  446,  447,  282,  583,
+      437,  452,  458,  479,  468,  244,  472,  481,  484,  488,
+      485,  503,  487,  442,  364,  505,  332,  504,  516, 2257,
+      534,  535,  524,  532,  528,  530,  555,  551,  525,  574,
+      548,  564,  568,  540,  572,  609,  597,  586,  600,  602,
+
+     2883, 2883,  674,  665, 2304,  680, 2883,  692, 2883, 2253,
+      609, 2249, 2247,    0,  667, 2883, 2883,  686, 2244, 2241,
+     2240,    0, 2263,  664,  668,  689,  695,  694,  690,  699,
+      700,  703, 2259,  706,  707, 2217, 2215, 2883,    0,  700,
+      727,  682,  717, 2214, 2264, 2883,  744,  739,  725,  763,
+      781,  803,  825,  699, 2883, 2220, 2195,    0,  811, 2241,
+      812,  723, 2883, 2216, 2189,  849, 2883, 2883, 2220, 2883,
+     2883,  725,  742, 2199, 2199,  734, 2194, 2191, 2188,    0,
+     2187,    0, 2158,  620,  726,  740,  729,  724,  743,  739,
+      760,  749,  788,  805,  762,  781,  812,  825,  763,  761,
+
+      831,  829,  817, 2187,  832,  833,  836,  571,  837,  840,
+      839,  843,  846,  847,  849,  854,  859,  855,  864,  862,
+      867,  869,  870,  866,  876,  878, 2184,  443,  880,  879,
+      608,  881,  883,  882,  884,  886,  893,  889,  887,  890,
+      897,  899,  901, 2181,  902,  903,  949,  908,  911,  915,
+      920,  916,  918,  978,  979, 2177, 2176, 2174,    0, 2171,
+        0,  967,  971, 2170,    0, 2169,    0, 2167,    0, 2186,
+     2883,  966,  967, 2165, 2162,    0, 2160,    0, 2883,  980,
+     1001,  991, 2883, 1007, 1047, 2157, 1023, 1069, 2153, 2883,
+     2883,  964,  966, 1055, 1008, 1094,  969, 1086, 1009, 2883,
+
+     2883, 2149, 2147, 2145,    0, 2142,    0, 2140,    0, 2138,
+        0, 2883,  922,  986,  988, 1008, 1036,  990, 1071, 1007,
+     1073, 1000, 1012, 1025, 1063, 1075, 1081, 1084, 1085, 1093,
+     1088, 1030, 1087, 1095, 1096, 2138, 1086, 2135, 1104, 2134,
+     1099, 1106, 1110, 1107, 1112, 1117, 1113, 2133, 1119, 2131,
+     1121, 1124, 1125, 1126, 1127, 1129, 1135, 2128, 1133, 2125,
+     1131, 1136, 1137, 1138, 1139, 1143, 1145, 1151, 1152, 1153,
+     1155,  764, 1157, 1156, 1158, 1166, 1169, 1167, 1172, 2124,
+     1170, 1176, 1179, 1238, 2120,    0, 2118,    0, 2115,    0,
+     2112,    0, 1225, 2111,    0, 2110,    0, 2108, 2105, 2102,
+
+        0, 2101,    0, 1229, 2100, 1235, 1251, 1237, 1276, 1242,
+     1193, 1193, 2883, 1292, 1310, 1303, 2110, 2083, 2092, 2091,
+        0, 2090,    0, 2088,    0, 2085,    0, 2082,    0, 2081,
+        0, 1174, 1214, 2083, 1178, 1211, 1258, 1233, 1259, 1213,
+     1286, 1257, 1269, 1287, 1234, 1288, 1290, 1303, 1293, 1292,
+      234, 1306, 1294, 1295, 1310, 1317, 2081, 1327, 1324, 2078,
+     1311, 1314, 1326, 1330, 2075, 1331, 1332, 1334, 1335, 2074,
+     1336, 1337, 2073, 1338, 1343, 2071, 2068, 2067, 1344, 1345,
+     1348, 2066, 1228, 1353, 1354, 1355, 1356, 1370, 2064, 2061,
+     1360, 1357, 2060, 1359, 1362, 2059, 1371, 2107, 2021,    0,
+
+     2019,    0, 2018,    0, 2015,    0, 2012,    0, 2011,    0,
+     2010,    0, 2008,    0, 1408, 1414, 1442, 1425, 2005, 2883,
+     1431, 1418, 1239, 1432, 2002, 2883, 2001,    0, 2000,    0,
+     1998,    0, 1995,    0,    0,    0, 1997,    0, 1419, 1422,
+     1426, 1394, 1374, 1421, 1436, 1438, 1410, 1448, 1441, 1439,
+     1449, 1453, 1456, 1458, 1459, 1460, 1491, 1466, 1465, 1467,
+     1468, 1470, 1469, 1996, 1471, 1474, 1479, 1994, 1991, 1990,
+     1482, 1472, 1989, 1483, 1987, 1980, 1484, 1490, 1978, 1977,
+     1974, 1970, 1966, 1962, 1489, 1495, 1959, 1501, 1503, 1958,
+     2007, 2883, 1952,    0, 1949,    0,    0,    0, 1951,    0,
+
+        0,    0, 2883,    0,    0,    0,    0, 1549, 1947, 2883,
+     2883, 1541, 1945,    0, 1942,    0,    0,    0,    0, 1941,
+     1487, 1507, 1943, 1504, 1525, 1526, 1509, 1533, 1538, 1527,
+     1941, 1528, 1542, 1547, 1543, 1548, 1578, 1550, 1551, 1580,
+     1558, 1563, 1565, 1567, 1566, 1568, 1572, 1938, 1937, 1570,
+     1936, 1934, 1571, 1574, 1582, 1931, 1575, 1585,    0,    0,
+        0, 1927, 1926, 1924, 1627,    0, 1921, 1920, 1919, 1917,
+     1914, 1916, 1915, 1913, 1910, 1584, 1590, 1587, 1595, 1605,
+     1586, 1606, 1608, 1611, 1612, 1641, 1909, 1616, 1908, 1617,
+     1621, 1624, 1626, 1618, 1622, 1906, 1631, 1903, 1902, 1901,
+
+     1632, 1899, 1892, 1887, 1886, 1883, 1882, 1881, 1879, 1862,
+     1853, 1852, 1849, 1842, 1839, 1635, 1835, 1636, 1638, 1637,
+     1639, 1643, 1644, 1833, 1642, 1674, 1649, 1832, 1650, 1663,
+     1664, 1659, 1291, 1658, 1665, 1808, 1807, 1806, 1799, 1797,
+     1796, 1754, 1751, 1750, 1748, 1747, 1746, 1741, 1742, 1670,
+     1671, 1673, 1675, 1677, 1679, 1680, 1741, 1739, 1683, 1737,
+     1693, 1685, 1687, 1690, 1689, 1689, 1650, 1648, 1503, 1422,
+     1370, 1369, 1186, 1694, 1699, 1053, 1705, 1700, 1706, 1049,
+     1709, 1713, 1714, 1015,  968,  930,  798,  764, 1707, 1715,
+     1718, 1719, 1720, 1722,  644,  570, 1724,  539,  493, 1726,
+
+     1728,  407,  286, 1731, 1732, 1733, 1735, 1734, 1736, 1738,
+      233,  137, 2883, 1811, 1824, 1837, 1847, 1857, 1870, 1880,
+     1893, 1906, 1919, 1927, 1937, 1944, 1951, 1958, 1965, 1972,
+     1979, 1986, 1993, 2000, 2007, 2011, 2019, 2025, 2032, 2039,
+     2046, 2053, 2056, 2063, 2069, 2082, 2095, 2102, 2109, 2116,
+     2123, 2126, 2133, 2136, 2143, 2146, 2153, 2156, 2163, 2166,
+     2173, 2176, 2183, 2186, 2193, 2201, 2208, 2215, 2222, 2229,
+     2232, 2239, 2242, 2249, 2252, 2259, 2265, 2278, 2285, 2292,
+     2295, 2302, 2305, 2312, 2315, 2322, 2325, 2332, 2335, 2342,
+     2345, 2352, 2359, 2362, 2369, 2372, 2379, 2386, 2393, 2396,
+
+     2403, 2406, 2413, 2416, 2423, 2426, 2433, 2436, 2443, 2449,
+     2462, 2469, 2476, 2479, 2486, 2489, 2496, 2499, 2506, 2509,
+     2516, 2519, 2526, 2529, 2536, 2539, 2546, 2549, 2556, 2563,
+     2566, 2573, 2576, 2583, 2586, 2593, 2596, 2599, 2605, 2612,
+     2621, 2628, 2635, 2638, 2645, 2648, 2651, 2657, 2664, 2667,
+     2670, 2673, 2676, 2679, 2682, 2685, 2692, 2695, 2702, 2705,
+     2708, 2711, 2714, 2724, 2731, 2734, 2737, 2740, 2747, 2754,
+     2761, 2764, 2771, 2778, 2785, 2792, 2799, 2806, 2813, 2820,
+     2827, 2834, 2841, 2848, 2855, 2862, 2869
     } ;
 
-static yyconst flex_int16_t yy_def[1083] =
+static yyconst flex_int16_t yy_def[1088] =
     {   0,
-      908,    1,  909,  909,  908,    5,  910,  910,  911,  911,
-      908,  908,  908,  908,  908,  908,  908,  912,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,   31,  908,  908,  908,  908,  908,  908,  913,  912,
-      908,  908,  908,  908,  912,  908,  912,  912,  912,  912,
-      912,  912,  912,  912,  912,  912,  912,  912,  912,  912,
-      912,  912,  912,  908,  908,  908,  908,  908,  914,  908,
-      908,  908,  915,  908,  908,  916,  908,  908,  917,  908,
-      908,  908,  908,  908,  908,  908,  912,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-
-      908,  918,  908,  908,   30,  908,  908,  908,  908,  919,
-       30,  908,   31,  908,  908,   31,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      920,  908,  908,  908,  908,  912,  921,  922,  908,  908,
-      912,  912,  912,  912,  912,  912,  912,  912,  912,  912,
-      912,  912,  912,  912,  912,  912,  912,  912,  912,  912,
-      912,  912,  912,  912,  912,  912,  912,  912,  912,  912,
-      912,  912,  912,  912,  912,  912,  912,  912,  912,  912,
-      912,  912,  912,  912,  912,  912,  912,  912,  908,  908,
-
-      908,  914,  914,  914,  908,  914,  908,  915,  908,  923,
-      924,  916,  908,  908,  908,  908,  925,  926,  927,  917,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  928,  929,  908,  100,  908,  908,  908,
-      908,  100,  918,  908,  100,  111,  246,  908,  908,  908,
-      908,  908,  908,  908,  908,  930,  931,  932,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  933,  908,  934,  935,  936,  937,  938,  939,
-      908,  940,  940,  940,  940,  940,  940,  940,  940,  940,
-      940,  940,  940,  940,  940,  940,  940,  940,  940,  940,
-
-      940,  940,  940,  940,  940,  940,  940,  940,  940,  940,
-      940,  940,  940,  940,  940,  940,  940,  940,  940,  940,
-      940,  940,  940,  940,  940,  940,  940,  940,  940,  940,
-      940,  940,  940,  940,  940,  940,  940,  940,  940,  940,
-      940,  940,  940,  940,  940,  940,  940,  940,  940,  940,
-      941,  942,  943,  944,  945,  946,  947,  948,  908,  908,
-      949,  950,  951,  952,  953,  954,  908,  908,  908,  908,
-      908,  955,  956,  957,  958,  908,  908,  908,  908,  908,
-      908,  908,  382,  908,  378,  385,  908,  908,  959,  960,
-      961,  908,  908,  908,  961,  908,  908,  908,  962,  963,
-
-      964,  965,  966,  967,  968,  969,  970,  971,  908,  972,
-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
-      972,  972,  972,  972,  972,  972,  972,  972,  972,  972,
-      972,  972,  972,  972,  972,  972,  972,  972,  972,  973,
-      974,  975,  976,  977,  978,  979,  980,  981,  908,  982,
-      983,  984,  985,  986,  986,  987,  988,  989,  990,  908,
-
-      500,  908,  908,  991,  908,  991,  908,  908,  908,  908,
-      908,  908,  908,  908,  992,  993,  994,  995,  996,  997,
-      998,  999, 1000, 1001, 1002, 1003, 1004, 1005, 1005, 1005,
-     1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005,
-     1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005,
-     1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005,
-     1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005,
-     1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005,
-     1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005, 1005,
-     1005, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013,
-
-     1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022,  908,
-      908,  908,  908, 1023,  908,  612,  908,  908,  908,  616,
-      908, 1024, 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1032,
-     1033, 1034, 1035, 1034, 1034, 1034, 1034, 1034, 1034, 1034,
-     1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034,
-     1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034,
-     1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034,
-     1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034,
-     1034, 1034, 1034, 1034, 1034, 1036,  908, 1037, 1038, 1039,
-     1040, 1041, 1042, 1043, 1044, 1045, 1046,  908, 1047, 1048,
-
-     1049, 1050,  908,  703,  908,  908,  908, 1051, 1052, 1053,
-     1054, 1055, 1056, 1057, 1058, 1059, 1059, 1059, 1059, 1059,
-     1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059,
-     1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059,
-     1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059,
-     1059, 1059, 1059, 1060, 1061, 1062, 1063, 1064, 1065,  908,
-     1066, 1051, 1053, 1067, 1068, 1058, 1059, 1059, 1059, 1059,
-     1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059,
-     1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059,
-     1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1069, 1070,
-
-     1063, 1071, 1064, 1072, 1065, 1073, 1074, 1067, 1075, 1068,
-     1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059,
-     1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059,
-     1076, 1069, 1077, 1070, 1078, 1071, 1079, 1072, 1080, 1073,
-     1081, 1074, 1075, 1059, 1059, 1059, 1059, 1059, 1059, 1059,
-     1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059,
-     1082, 1076, 1077, 1078, 1079, 1053, 1080, 1081, 1059, 1059,
-     1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059,
-     1059, 1082, 1053, 1059, 1059, 1059, 1059, 1059, 1059, 1059,
-     1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059, 1059,
-
-     1059, 1059, 1059, 1059, 1059, 1059, 1059,    0,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908
+      913,    1,  914,  914,  913,    5,  915,  915,  916,  916,
+      913,  913,  913,  913,  913,  913,  913,  917,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,   31,  913,  913,  913,  913,  913,  913,  918,  917,
+      913,  913,  913,  913,  917,  913,  917,  917,  917,  917,
+      917,  917,  917,  917,  917,  917,  917,  917,  917,  917,
+      917,  917,  917,  917,  913,  913,  913,  913,  913,  919,
+      913,  913,  913,  920,  913,  913,  921,  913,  913,  922,
+      913,  913,  913,  913,  913,  913,  913,  917,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+
+      913,  913,  923,  913,  913,   30,  913,  913,  913,  913,
+      924,   30,  913,   31,  913,  913,   31,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  925,  913,  913,  913,  913,  917,  926,  927,  913,
+      913,  917,  917,  917,  917,  917,  917,  917,  917,  917,
+      917,  917,  917,  917,  917,  917,  917,  917,  917,  917,
+      917,  917,  917,  917,  917,  917,  917,  917,  917,  917,
+      917,  917,  917,  917,  917,  917,  917,  917,  917,  917,
+      917,  917,  917,  917,  917,  917,  917,  917,  917,  917,
+
+      913,  913,  913,  919,  919,  919,  913,  919,  913,  920,
+      913,  928,  929,  921,  913,  913,  913,  913,  930,  931,
+      932,  922,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  933,  934,  913,  101,  913,
+      913,  913,  913,  101,  923,  913,  101,  112,  248,  913,
+      913,  913,  913,  913,  913,  913,  913,  935,  936,  937,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  938,  913,  939,  940,  941,  942,
+      943,  944,  913,  945,  945,  945,  945,  945,  945,  945,
+      945,  945,  945,  945,  945,  945,  945,  945,  945,  945,
+
+      945,  945,  945,  945,  945,  945,  945,  945,  945,  945,
+      945,  945,  945,  945,  945,  945,  945,  945,  945,  945,
+      945,  945,  945,  945,  945,  945,  945,  945,  945,  945,
+      945,  945,  945,  945,  945,  945,  945,  945,  945,  945,
+      945,  945,  945,  945,  945,  945,  945,  945,  945,  945,
+      945,  945,  945,  946,  947,  948,  949,  950,  951,  952,
+      953,  913,  913,  954,  955,  956,  957,  958,  959,  913,
+      913,  913,  913,  913,  960,  961,  962,  963,  913,  913,
+      913,  913,  913,  913,  913,  385,  913,  381,  388,  913,
+      913,  964,  965,  966,  913,  913,  913,  966,  913,  913,
+
+      913,  967,  968,  969,  970,  971,  972,  973,  974,  975,
+      976,  913,  977,  977,  977,  977,  977,  977,  977,  977,
+      977,  977,  977,  977,  977,  977,  977,  977,  977,  977,
+      977,  977,  977,  977,  977,  977,  977,  977,  977,  977,
+      977,  977,  977,  977,  977,  977,  977,  977,  977,  977,
+      977,  977,  977,  977,  977,  977,  977,  977,  977,  977,
+      977,  977,  977,  977,  977,  977,  977,  977,  977,  977,
+      977,  977,  977,  977,  977,  977,  977,  977,  977,  977,
+      977,  977,  977,  978,  979,  980,  981,  982,  983,  984,
+      985,  986,  913,  987,  988,  989,  990,  991,  991,  992,
+
+      993,  994,  995,  913,  504,  913,  913,  996,  913,  996,
+      913,  913,  913,  913,  913,  913,  913,  913,  997,  998,
+      999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008,
+     1009, 1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010,
+     1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010,
+     1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010,
+     1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010,
+     1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010,
+     1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010,
+     1010, 1010, 1010, 1010, 1010, 1010, 1010, 1011, 1012, 1013,
+
+     1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023,
+     1024, 1025, 1026, 1027,  913,  913,  913,  913, 1028,  913,
+      617,  913,  913,  913,  621,  913, 1029, 1030, 1031, 1032,
+     1033, 1034, 1035, 1036, 1037, 1038, 1039, 1040, 1039, 1039,
+     1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
+     1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
+     1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
+     1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
+     1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
+     1041,  913, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049,
+
+     1050, 1051,  913, 1052, 1053, 1054, 1055,  913,  708,  913,
+      913,  913, 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063,
+     1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064,
+     1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064,
+     1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064,
+     1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1065, 1066,
+     1067, 1068, 1069, 1070,  913, 1071, 1056, 1058, 1072, 1073,
+     1063, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064,
+     1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064,
+     1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064,
+
+     1064, 1064, 1064, 1074, 1075, 1068, 1076, 1069, 1077, 1070,
+     1078, 1079, 1072, 1080, 1073, 1064, 1064, 1064, 1064, 1064,
+     1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064,
+     1064, 1064, 1064, 1064, 1064, 1081, 1074, 1082, 1075, 1083,
+     1076, 1084, 1077, 1085, 1078, 1086, 1079, 1080, 1064, 1064,
+     1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064,
+     1064, 1064, 1064, 1064, 1064, 1087, 1081, 1082, 1083, 1084,
+     1058, 1085, 1086, 1064, 1064, 1064, 1064, 1064, 1064, 1064,
+     1064, 1064, 1064, 1064, 1064, 1064, 1087, 1058, 1064, 1064,
+     1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064,
+
+     1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064, 1064,
+     1064, 1064,    0,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913
     } ;
 
-static yyconst flex_int16_t yy_nxt[2963] =
+static yyconst flex_int16_t yy_nxt[2969] =
     {   0,
        12,   13,   14,   15,   15,   15,   13,   16,   17,   12,
@@ -794 +795 @@
        18,   18,   18,   40,   18,   18,   18,   18,   18,   40,
        18,   41,   42,   43,   44,   45,   46,   47,   48,   49,
-       50,   51,   52,   53,   18,   54,   18,   55,   18,   18,
-       56,   18,   57,   58,   59,   60,   61,   62,   18,   18,
-       63,   64,   65,   66,   67,   68,   85,   93,   86,   86,
-       68,   89,   90,   69,   72,   72,   72,   72,   72,   72,
-
-       72,   72,   72,   72,   73,   72,   72,   72,   72,   72,
-       72,   72,   72,   72,   72,   72,   72,   72,   72,   72,
-       72,   72,   72,   72,   72,   72,   72,   72,   72,   73,
+       50,   51,   52,   53,   18,   54,   18,   55,   56,   18,
+       57,   18,   58,   59,   60,   61,   62,   63,   18,   18,
+       64,   65,   66,   67,   68,   69,   86,   94,   87,   87,
+       69,   90,   91,   70,   73,   73,   73,   73,   73,   73,
+
+       73,   73,   73,   73,   74,   73,   73,   73,   73,   73,
        73,   73,   73,   73,   73,   73,   73,   73,   73,   73,
-       73,   73,   73,   73,   73,   72,   74,   72,   72,   73,
-       75,   73,   73,   73,   73,   73,   73,   73,   73,   73,
-       73,   73,   73,   73,   73,   73,   73,   73,   73,   73,
-       73,   73,   73,   73,   73,   72,   72,   72,   72,   77,
-       77,   80,   80,  124,  125,   91,  142,   80,   80,   88,
-       77,   77,   81,   82,   83,   83,   83,   81,   83,   82,
-
-       84,   84,   84,   83,   92,   94,   88,  143,  147,   99,
-       96,  100,  100,  100,  100,  100,  100,  256,  908,   95,
-      101,   86,   97,   98,   86,  102,  162,  119,  144,   78,
-       78,   78,   78,  145,  148,  103,  104,   88,  105,  105,
-      105,  105,  106,  106,  120,   88,  121,  122,  149,  267,
-      150,  268,  258,  264,  185,  107,  199,  652,  160,  108,
-      161,  151,  152,  153,   88,  109,  110,  154,  155,  163,
-      156,  111,   88,  157,  158,  146,  164,  107,   88,   88,
-       88,  159,  165,  112,  210,   88,   88,   88,  198,   88,
-       88,  109,  197,   88,  110,  104,  254,  113,  113,  113,
-
-      113,  113,  113,   88,  170,  178,  171,  200,  196,   88,
-      211,  181,  166,  234,  107,  172,  167,  182,  114,  179,
-      255,  168,   88,  275,  115,  169,  180,  173,  253,   88,
-      116,   88,  908,   88,   88,  174,  107,  175,  286,  235,
-      176,  252,  117,  267,  177,  268,  252,  253,  183,  276,
-      115,  126,  284,  184,  253,  127,  128,   88,  129,  144,
-      130,  131,  908,  132,  145,  133,   88,  259,  262,  186,
-      187,  261,   88,  253,  134,  135,  136,  194,  190,  188,
-      269,  267,  189,  268,  290,  260,  191,  269,  192,  260,
-      908,  261,  263,  193,  267,  137,  268,  261,  138,  267,
-
-      267,  268,  268,   88,   88,   88,  146,  201,   82,   83,
-       83,   83,  201,  204,  205,  202,   88,  261,  204,  318,
-      195,  270,  267,  285,  268,  139,  140,   81,   82,   83,
-       83,   83,   81,  309,  206,  206,  206,  206,  206,  206,
-      213,  214,  267,   88,  268,  213,  144,  215,  267,  271,
-      268,  145,  215,   83,   82,   83,   83,   83,   83,  287,
-       88,  216,  216,  216,  216,   83,   82,   84,   84,   84,
-       83,   88,  215,  245,  245,  245,  245,  245,  245,  246,
-      246,  246,  246,  267,  267,  268,  268,   88,  217,  288,
-       88,  215,   88,   88,   88,   88,  215,  215,   88,  436,
-
-      215,  215,  282,   88,  304,   88,   88,  908,  215,  283,
-       88,  215,  247,  215,  218,  215,  289,  219,  221,  302,
-      303,   88,  222,  223,   88,  321,  307,  224,  225,  312,
-      226,   88,  227,   88,  310,  908,   88,  313,   88,  308,
-       88,  228,  229,  230,  104,   88,  106,  106,  106,  106,
-      106,  106,  305,  306,  311,   88,  320,  314,   88,   88,
-      315,   88,  231,  107,  249,  232,  249,  317,   88,  250,
-      250,  250,  250,  250,  250,  319,   88,  328,  316,  248,
-       88,  327,   88,  323,   88,  107,  322,  367,   88,  368,
-       88,   88,   88,  233,  237,  237,  237,  237,  237,  237,
-
-      333,  326,  251,  334,   88,   88,  324,  329,   88,  336,
-      238,  239,  240,  325,  241,  240,   88,  342,  338,  330,
-      335,  144,  781,   88,  337,   88,   88,  242,   88,  331,
-      332,  340,  240,  239,  240,   88,  339,  241,  345,  240,
-      291,  292,  293,  350,  294,  295,  346,  343,  296,   88,
-      297,   88,  353,  341,   88,  298,  299,  300,  367,  301,
-      368,  367,  347,  368,  348,   88,   88,  349,  344,  201,
-       82,   83,   83,   83,  201,  204,  205,  202,  354,  368,
-      204,  204,  205,  414,  213,  214,  204,  351,  205,  213,
-       88,  908,  351,  367,  352,  368,  206,  206,  206,  206,
-
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  359,  359,  359,  359,  368,  367,
-      908,  368,  369,  367,  367,  368,  368,  367,  370,  368,
-      367,  367,  368,  368,  367,  376,  368,  376,  376,  380,
-      267,  380,  268,  377,  380,  377,   88,  360,  378,  378,
-      378,  378,  378,  378,  267,  384,  268,  908,  376,  410,
-      376,  380,  104,  380,  246,  246,  246,  246,  380,  382,
-      382,  382,  382,  382,  382,  106,  106,  106,  106,  106,
-      106,  379,  250,  250,  250,  250,  250,  250,   88,   88,
-       88,   88,  107,   88,   88,  387,  415,  247,   88,  417,
-
-       88,   88,  383,  397,  399,  428,  411,  412,  259,  413,
-      416,   88,  457,  425,  107,  385,  385,  385,  385,  385,
-      385,  387,  390,  106,  106,  106,  106,  106,  106,  397,
-      400,  238,  249,  240,  249,  241,  240,  250,  250,  250,
-      250,  250,  250,   88,   88,  392,   88,  393,  386,   88,
-       88,  394,  429,  240,   88,  240,  259,  395,  241,   88,
-      240,  113,  113,  113,  113,  113,  113,  422,   88,  396,
-      418,   88,  423,  393,  419,  424,   88,  394,   88,   88,
-      420,  421,   88,   88,  426,  427,   88,  434,   88,  430,
-       88,   88,  435,   88,  264,   88,  432,  433,  431,   88,
-
-      441,   88,   88,   88,  442,   88,  437,  443,  438,  439,
-      440,  445,  444,   88,   88,   88,   88,   88,  449,  446,
-      450,  447,  451,  448,   88,   88,   88,   88,   88,  452,
-       88,  459,   88,   88,   88,  454,   88,   88,   88,  456,
-       88,   88,  458,  455,   88,  461,  453,  466,   88,  460,
-       88,   88,  144,   88,  465,  462,  464,  463,   88,   88,
-       88,  471,  467,   88,  468,   88,  469,  473,  470,   88,
-      472,  474,  475,  476,  477,  478,   88,  351,  205,  205,
-       88,  479,  351,   88,  352,  203,  215,  215,  215,  215,
-      359,  359,  359,  359,  528,  367,   88,  368,  367,  531,
-
-      368,  378,  378,  378,  378,  378,  378,  377,  505,  377,
-       88,  513,  378,  378,  378,  378,  378,  378,  506,  489,
-      500,  500,  500,  500,  500,  500,  237,  237,  237,  237,
-      237,  237,  535,   88,  505,  514,  238,   88,  240,   88,
-      241,  240,  246,  246,  246,  246,  106,  106,  508,  529,
-      533,  505,  530,  501,  509,  509,   88,   88,  240,  381,
-      240,  507,   88,  241,  675,  240,  382,  382,  382,  382,
-      382,  382,  390,  508,   88,  384,   88,  505,  538,  539,
-      509,  509,  238,  239,  240,  532,  241,  240,  385,  385,
-      385,  385,  385,  385,   88,  392,  543,  393,   88,  383,
-
-      548,  394,  908,  908,  240,  239,  240,  395,  510,  241,
-      510,  240,   88,  511,  511,  511,  511,  511,  511,  396,
-       88,  386,   88,  393,   88,  537,  392,  394,  393,  534,
-       88,  536,  394,   88,   88,   88,   88,  540,  515,  545,
-       88,   88,   88,   88,  550,   88,  512,   88,  544,   88,
-      396,  541,  542,   88,  393,  546,  553,  549,  394,  554,
-      551,   88,  547,   88,  552,  556,  555,   88,   88,  559,
-       88,   88,   88,   88,  557,   88,  558,  561,   88,   88,
-       88,   88,  560,   88,   88,  562,   88,   88,  565,  569,
-       88,  563,   88,  567,  564,   88,  573,  566,  570,  568,
-
-       88,   88,   88,   88,   88,  574,  571,   88,  572,  578,
-      575,  581,  576,   88,  582,  580,   88,  577,   88,  579,
-       88,   88,   88,  205,   88,  585,  586,   88,  583,  593,
-      592,  505,  589,  591,  615,  584,  587,  588,  215,  215,
-      215,  215,   88,   88,  590,  500,  500,  500,  500,  500,
-      500,  382,  382,  382,  382,  382,  382,  505,  636,  634,
-      615,  238,   88,  240,   88,  241,  240,  385,  385,  385,
-      385,  385,  385,  908,  883,  635,  505,  638,  501,   88,
-       88,  505,   88,  240,  502,  240,  506,  611,  241,  611,
-      240,  614,  612,  612,  612,  612,  612,  612,   88,  637,
-
-      503,  647,  505,  641,  639,   88,   88,  505,  511,  511,
-      511,  511,  511,  511,  510,  908,  510,  642,  640,  511,
-      511,  511,  511,  511,  511,  613,  616,  616,  616,  616,
-      616,  616,   88,   88,   88,  643,   88,   88,   88,   88,
-       88,   88,  617,  649,  618,   88,  619,  618,  648,  645,
-      651,  650,   88,  644,  653,  646,   88,   88,   88,  620,
-       88,  656,  657,  654,  618,   88,  618,  659,  658,  619,
-       88,  618,   88,  655,   88,   88,   88,  660,   88,   88,
-      661,  663,   88,   88,  664,  662,   88,   88,  669,   88,
-      666,   88,   88,  665,  667,  670,  671,  668,   88,   88,
-
-       88,   88,   88,   88,  673,   88,  677,   88,  676,  674,
-      680,  672,  681,  679,   88,  682,   88,  908,  908,  683,
-      684,   88,  678,  500,  500,  500,  500,  500,  500,  612,
-      612,  612,  612,  612,  612,  611,  685,  611,  721,   88,
-      612,  612,  612,  612,  612,  612,  616,  616,  616,  616,
-      616,  616,  720,  705,  705,   88,  610,  703,  703,  703,
-      703,  703,  703,  705,   88,  706,  908,  706,   88,  716,
-      706,   88,  725,  617,   88,  618,  705,  619,  618,  620,
-      719,  718,  717,   88,   88,   88,  705,  706,   88,  706,
-      704,  722,  723,   88,  706,  618,  724,  618,   88,  729,
-
-      619,  726,  618,   88,   88,  728,  727,   88,   88,   88,
-      735,  733,   88,   88,   88,   88,   88,   88,   88,   88,
-       88,  731,   88,  738,   88,  730,  734,  736,  741,  732,
-       88,  744,   88,  737,  739,   88,   88,  740,   88,   88,
-      742,  748,  743,  749,  745,  746,   88,  747,  750,   88,
-      753,   88,   88,   88,   88,  882,  751,  773,  752,  703,
-      703,  703,  703,  703,  703,  616,  616,  616,  616,  616,
-      616,   88,  767,  772,   88,  617,   88,  618,  769,  619,
-      618,  768,   88,  770,   88,   88,   88,  771,  774,   88,
-      776,   88,  704,   88,  779,  778,   88,  618,  707,  618,
-
-       88,   88,  619,  782,  618,  784,  777,  775,   88,   88,
-      783,  785,   88,   88,   88,   88,   88,  780,   88,   88,
-      787,   88,  786,  788,   88,  791,   88,  789,   88,   88,
-       88,   88,   88,  813,  797,   88,  790,  792,  794,  798,
-       88,   88,  793,  795,  814,  796,  703,  703,  703,  703,
-      703,  703,  811,   88,   88,   88,   88,  812,  816,  819,
-      821,   88,   88,  815,  822,  823,   88,  818,  820,   88,
-       88,  817,  825,  824,   88,   88,   88,  826,   88,  760,
-       88,   88,   88,   88,   88,  827,  847,   88,   88,   88,
-      849,   88,  850,  852,   88,   88,   88,  853,  828,  829,
-
-      846,  830,  845,   88,   88,   88,  848,  844,  855,  851,
-       88,   88,  857,  856,   88,   88,   88,  854,   88,   88,
-      858,  871,  859,  870,   88,   88,   88,   88,   88,  875,
-      860,  877,   88,  872,   88,  878,  869,   88,   88,   88,
-       88,   88,   88,  873,  876,  885,  879,   88,  881,  874,
-      880,  884,   88,   88,  892,  886,   88,  887,  888,  889,
-       88,   88,   88,  890,  891,   88,   88,   88,  894,   88,
-      896,   88,  897,   88,   88,   88,  895,  893,   88,   88,
-       88,   88,   88,   88,  901,   88,   88,  908,  908,  900,
-      868,  902,  908,  898,  899,  907,  867,  908,  905,  865,
-
-      908,  903,  904,  864,  906,   70,   70,   70,   70,   70,
-       70,   70,   70,   70,   70,   70,   70,   70,   76,   76,
-       76,   76,   76,   76,   76,   76,   76,   76,   76,   76,
-       76,   79,   79,   79,   79,   79,   79,   79,   79,   79,
-       79,   79,   79,   79,   87,  908,  863,   87,  908,   87,
-       87,   87,   87,   87,  141,  862,   88,   88,  141,  141,
-      141,  141,  141,  141,  203,  203,  203,  203,  203,  203,
-      203,  203,  203,  203,  203,  203,  203,  208,   88,  908,
-      208,  843,  208,  208,  208,  208,  208,  212,  908,  212,
-      212,  842,  212,  212,  212,  212,  212,  212,  840,  212,
-
-      220,  908,  838,  220,  220,  220,  220,  220,  220,  220,
-      220,  908,  220,  243,  243,  243,  243,  243,  243,  243,
-      243,  243,  243,  243,  243,  243,  257,  257,  836,  257,
-      908,  834,  832,  257,  273,   88,   88,  273,   88,  273,
-      273,  273,  273,  273,  277,   88,  277,   88,   88,   88,
-      277,  279,   88,  279,   88,   88,   88,  279,  355,   88,
-      355,  908,  810,  808,  355,  357,  908,  357,  908,  805,
-      803,  357,  361,  801,  361,   88,   88,   88,  361,  363,
-       88,  363,   88,   88,   88,  363,  365,  766,  365,  763,
-      762,  760,  365,  372,  209,  372,  756,  755,  687,  372,
-
-      374,   88,  374,   88,   88,   88,  374,  389,   88,  389,
-      391,  391,   88,  391,  391,  391,   88,  391,  257,  257,
-       88,  257,  273,   88,   88,  273,   88,  273,  273,  273,
-      273,  273,  401,   88,  401,   88,   88,   88,  401,  403,
-       88,  403,  714,  713,  711,  403,  405,  709,  405,  707,
-      614,  702,  405,  277,  701,  277,  407,  699,  407,  697,
-      695,  693,  407,  279,  691,  279,   87,  689,  687,   87,
-       88,   87,   87,   87,   87,   87,  203,  203,  203,  203,
-      203,  203,  203,  203,  203,  203,  203,  203,  203,  480,
-      480,  480,  480,  480,  480,  480,  480,  480,  480,  480,
-
-      480,  480,  481,   88,  481,   88,   88,   88,  481,  483,
-       88,  483,   88,   88,   88,  483,  485,   88,  485,   88,
-       88,   88,  485,  355,  633,  355,  487,  631,  487,  629,
-      627,  625,  487,  357,  623,  357,  490,  515,  490,  621,
-      621,  610,  490,  361,  609,  361,  492,  607,  492,  495,
-      495,  605,  492,  363,  603,  363,  494,  601,  494,  599,
-      597,  595,  494,  365,   88,  365,  496,   88,  496,   88,
-       88,   88,  496,  372,   88,  372,  498,   88,  498,   88,
-      527,  525,  498,  374,  523,  374,  504,  521,  504,  519,
-      504,  517,  504,  389,  503,  389,  502,  389,  499,  389,
-
-      391,  391,  497,  391,  391,  391,  368,  391,  516,  368,
-      516,  495,  493,  491,  516,  518,  488,  518,  486,  484,
-      482,  518,  520,   88,  520,   88,   88,  409,  520,  401,
-      408,  401,  522,  406,  522,  404,  402,  274,  522,  403,
-      269,  403,  524,  268,  524,  398,  398,  256,  524,  405,
-      388,  405,  526,  388,  526,  244,  381,  375,  526,  407,
-      373,  407,   87,  371,  367,   87,  366,   87,   87,   87,
-       87,   87,  480,  480,  480,  480,  480,  480,  480,  480,
-      480,  480,  480,  480,  480,  594,  364,  594,  362,  358,
-      356,  594,  481,  209,  481,  596,  205,  596,   88,  281,
-
-      280,  596,  483,  278,  483,  598,  274,  598,  269,  272,
-      269,  598,  485,  267,  485,  600,  266,  600,  265,  244,
-      236,  600,  487,   86,  487,  602,   86,  602,   88,  209,
-      207,  602,  490,   86,  490,  604,  123,  604,  118,   88,
-      908,  604,  492,   71,  492,  494,   71,  494,  908,  908,
-      908,  494,  606,  908,  606,  908,  908,  908,  606,  496,
-      908,  496,  608,  908,  608,  908,  908,  908,  608,  498,
-      908,  498,  504,  908,  504,  908,  504,  908,  504,  391,
-      908,  391,  908,  908,  908,  391,  622,  908,  622,  908,
-      908,  908,  622,  516,  908,  516,  624,  908,  624,  908,
-
-      908,  908,  624,  518,  908,  518,  626,  908,  626,  908,
-      908,  908,  626,  520,  908,  520,  628,  908,  628,  908,
-      908,  908,  628,  522,  908,  522,  630,  908,  630,  908,
-      908,  908,  630,  524,  908,  524,  632,  908,  632,  908,
-      908,  908,  632,  526,  908,  526,   87,  908,  908,   87,
-      908,   87,   87,   87,   87,   87,  686,  686,  686,  686,
-      686,  686,  686,  686,  686,  686,  686,  686,  686,  688,
-      908,  688,  908,  908,  908,  688,  594,  908,  594,  690,
-      908,  690,  908,  908,  908,  690,  596,  908,  596,  692,
-      908,  692,  908,  908,  908,  692,  598,  908,  598,  694,
-
-      908,  694,  908,  908,  908,  694,  600,  908,  600,  696,
-      908,  696,  908,  908,  908,  696,  602,  908,  602,  698,
-      908,  698,  908,  908,  908,  698,  604,  908,  604,  700,
-      908,  700,  908,  908,  908,  700,  606,  908,  606,   87,
-      908,   87,  908,  908,  908,   87,  608,  908,  608,  504,
-      908,  504,  908,  908,  908,  504,  708,  908,  708,  908,
-      908,  908,  708,  622,  908,  622,  710,  908,  710,  908,
-      908,  908,  710,  624,  908,  624,  712,  908,  712,  908,
-      908,  908,  712,  626,  908,  626,  141,  908,  141,  908,
-      908,  908,  141,  628,  908,  628,  715,  908,  715,  630,
-
-      908,  630,   87,  908,  908,   87,  908,   87,   87,   87,
-       87,   87,  632,  908,  632,  686,  686,  686,  686,  686,
-      686,  686,  686,  686,  686,  686,  686,  686,  754,  908,
-      754,  908,  908,  908,  754,  688,  908,  688,  208,  908,
-      208,  908,  908,  908,  208,  690,  908,  690,  757,  908,
-      757,  692,  908,  692,  208,  908,  908,  208,  908,  208,
-      208,  208,  208,  208,  694,  908,  694,  758,  908,  758,
-      696,  908,  696,  698,  908,  698,  759,  908,  759,  700,
-      908,  700,   87,  908,   87,  761,  908,  761,  908,  908,
-      908,  761,  708,  908,  708,  273,  908,  273,  908,  908,
-
-      908,  273,  710,  908,  710,  764,  908,  764,  712,  908,
-      712,  141,  908,  141,  765,  908,  765,  908,  908,  908,
-      765,   87,  908,  908,   87,  908,   87,   87,   87,   87,
-       87,  799,  908,  799,  754,  908,  754,  208,  908,  208,
-      800,  908,  800,  908,  908,  908,  800,  802,  908,  802,
-      908,  908,  908,  802,  804,  908,  804,  908,  908,  908,
-      804,  806,  908,  806,  807,  908,  807,  908,  908,  908,
-      807,  809,  908,  809,  908,  908,  908,  809,  831,  908,
-      831,  908,  908,  908,  831,  833,  908,  833,  908,  908,
-      908,  833,  835,  908,  835,  908,  908,  908,  835,  837,
-
-      908,  837,  908,  908,  908,  837,  839,  908,  839,  908,
-      908,  908,  839,  841,  908,  841,  908,  908,  908,  841,
-      632,  908,  632,  908,  908,  908,  632,  861,  908,  861,
-      908,  908,  908,  861,  694,  908,  694,  908,  908,  908,
-      694,  698,  908,  698,  908,  908,  908,  698,   87,  908,
-       87,  908,  908,  908,   87,  866,  908,  866,  908,  908,
-      908,  866,  141,  908,  141,  908,  908,  908,  141,  208,
-      908,  208,  908,  908,  908,  208,   11,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908
+       73,   73,   73,   73,   73,   73,   73,   73,   73,   74,
+       74,   74,   74,   74,   74,   74,   74,   74,   74,   74,
+       74,   74,   74,   74,   74,   73,   75,   73,   73,   74,
+       76,   74,   74,   74,   74,   74,   74,   74,   74,   74,
+       74,   74,   74,   74,   74,   74,   74,   74,   74,   74,
+       74,   74,   74,   74,   74,   73,   73,   73,   73,   78,
+       78,   81,   81,  125,  126,   92,  143,   81,   81,   89,
+       78,   78,   82,   83,   84,   84,   84,   82,   84,   83,
+
+       85,   85,   85,   84,   93,   95,   89,  144,  148,  100,
+       97,  101,  101,  101,  101,  101,  101,  258,  913,   96,
+      102,   87,   98,   99,   87,  103,  163,  120,  145,   79,
+       79,   79,   79,  146,  149,  104,  105,   89,  106,  106,
+      106,  106,  107,  107,  121,   89,  122,  123,  150,  269,
+      151,  270,  260,  266,  187,  108,   89,  657,  161,  109,
+      162,  152,  153,  154,   89,  110,  111,  155,  156,  164,
+      157,  112,   89,  158,  159,  147,  165,  108,   89,  184,
+       89,  160,  166,  113,  212,   89,   89,   89,  201,   89,
+       89,  110,  199,   89,  111,  105,   89,  114,  114,  114,
+
+      114,  114,  114,   89,  171,  179,  172,  236,  198,   89,
+      213,  182,  167,  311,  108,  173,  168,  183,  115,  180,
+       89,  169,   89,  277,  116,  170,  181,  174,  256,  200,
+      117,   89,  913,  237,   89,  175,  108,  176,   89,  202,
+      177,  254,  118,  269,  178,  270,  292,  255,  185,  278,
+      116,  127,  257,  186,  255,  128,  129,   89,  130,  145,
+      131,  132,  913,  133,  146,  134,   89,  261,  264,  188,
+      189,  263,  254,  255,  135,  136,  137,  196,  192,  190,
+      255,  269,  191,  270,   89,  262,  193,  271,  194,  262,
+      913,  263,  265,  195,  269,  138,  270,  263,  139,  269,
+
+      269,  270,  270,   89,  323,  271,  147,  203,   83,   84,
+       84,   84,  203,  206,  207,  204,   89,  263,  206,  269,
+      197,  270,  269,  273,  270,  140,  141,   82,   83,   84,
+       84,   84,   82,  321,  208,  208,  208,  208,  208,  208,
+      215,  216,   89,  272,  269,  215,  270,  217,  269,  269,
+      270,  270,  217,   84,   83,   84,   84,   84,   84,   89,
+      286,  218,  218,  218,  218,   84,   83,   85,   85,   85,
+       84,   89,  217,  247,  247,  247,  247,  247,  247,  248,
+      248,  248,  248,   89,   89,  145,  284,   89,  219,   89,
+      146,  217,  288,  285,   89,   89,  217,  217,   89,   89,
+
+      217,  217,  287,  289,   89,  304,  460,  913,  217,  320,
+       89,  217,  249,  217,  220,  217,  290,  221,  223,  306,
+       89,  291,  224,  225,   89,  309,  305,  226,  227,   89,
+      228,   89,  229,   89,  312,  913,   89,   89,  310,   89,
+       89,  230,  231,  232,  105,   89,  107,  107,  107,  107,
+      107,  107,  307,  308,  313,   89,   89,   89,  316,  314,
+      317,  319,  233,  108,  251,  234,  251,  315,   89,  252,
+      252,  252,  252,  252,  252,  322,   89,   89,  318,  250,
+       89,  329,   89,  324,   89,  108,   89,   89,  337,  331,
+      325,   89,   89,  235,  239,  239,  239,  239,  239,  239,
+
+       89,  326,  253,   89,  328,  338,  330,   89,  327,  332,
+      240,  241,  242,  341,  243,  242,   89,  145,  333,  345,
+       89,  336,   89,   89,   89,  343,   89,  244,  334,  335,
+      439,  339,  242,  241,  242,   89,  342,  243,   89,  242,
+      293,  294,  295,  346,  296,  297,  340,  344,  298,   89,
+      299,  350,   89,  351,   89,  300,  301,  302,  356,  303,
+       89,   89,  348,  463,  347,  352,  206,  207,  215,  216,
+      349,  206,   89,  215,  353,  203,   83,   84,   84,   84,
+      203,  206,  207,  204,  357,  413,  206,  208,  208,  208,
+      208,  208,  208,  354,  207,  370,   89,  371,  354,  370,
+
+      355,  371,  208,  208,  208,  208,  208,  208,  362,  362,
+      362,  362,  371,  371,  208,  208,  208,  208,  208,  208,
+      370,  370,  371,  371,  379,  370,  370,  371,  371,  372,
+      370,  370,  371,  371,  370,  373,  371,  370,  370,  371,
+      371,  363,  379,  379,  380,  913,  380,  379,  390,  381,
+      381,  381,  381,  381,  381,  383,  269,  383,  270,  105,
+      383,  248,  248,  248,  248,  379,  385,  385,  385,  385,
+      385,  385,  400,  269,  390,  270,   89,  383,   89,  383,
+      387,   89,  382,  402,  383,  107,  107,  107,  107,  107,
+      107,   89,   89,  417,  249,   89,  414,  416,  400,  386,
+
+      418,   89,  108,  252,  252,  252,  252,  252,  252,  403,
+      415,  419,   89,   89,   89,   89,   89,  420,  261,  913,
+      431,  421,  432,  586,  108,  388,  388,  388,  388,  388,
+      388,  393,  426,   89,  107,  107,  107,  107,  107,  107,
+       89,  240,  251,  242,  251,  243,  242,  252,  252,  252,
+      252,  252,  252,  913,  395,  422,  396,   89,  389,  427,
+      397,  423,  424,  242,   89,  242,  398,  261,  243,   89,
+      242,  114,  114,  114,  114,  114,  114,   89,  399,  428,
+      425,   89,  396,   89,   89,   89,  397,  435,   89,   89,
+      437,   89,   89,  429,  430,   89,  433,  438,   89,   89,
+
+      444,   89,  436,  445,  266,  446,   89,   89,  434,  440,
+      441,   89,  442,  443,   89,  448,   89,  449,   89,   89,
+      447,   89,   89,  450,  453,  451,  454,  455,   89,  452,
+       89,   89,   89,   89,   89,   89,   89,  457,   89,   89,
+      462,   89,   89,  459,  456,   89,  458,  461,  465,   89,
+      470,   89,  464,   89,   89,   89,  466,  145,  468,  467,
+       89,  471,  469,   89,  477,  472,  475,   89,   89,  474,
+       89,  473,   89,  476,   89,  480,  479,  481,  478,  354,
+      207,  207,   89,  482,  354,  532,  355,  205,  483,  217,
+      217,  217,  217,  362,  362,  362,  362,  370,  370,  371,
+
+      371,   89,  381,  381,  381,  381,  381,  381,  380,  509,
+      380,  509,  517,  381,  381,  381,  381,  381,  381,  510,
+       89,  511,  493,  504,  504,  504,  504,  504,  504,  239,
+      239,  239,  239,  239,  239,  509,  518,  509,   89,  240,
+       89,  242,   89,  243,  242,  248,  248,  248,  248,  107,
+      107,  512,   89,  537,  533,  534,  505,  513,  513,   89,
+       89,  242,  384,  242,   89,  541,  243,   89,  242,  385,
+      385,  385,  385,  385,  385,  393,  512,   89,  387,  535,
+      542,  539,   89,  513,  513,  240,  241,  242,   89,  243,
+      242,  388,  388,  388,  388,  388,  388,  536,  395,  543,
+
+      396,   89,  386,  553,  397,   89,  913,  242,  241,  242,
+      398,  514,  243,  514,  242,   89,  515,  515,  515,  515,
+      515,  515,  399,   89,  389,   89,  396,   89,  544,  395,
+      397,  396,  538,   89,  540,  397,   89,   89,   89,   89,
+       89,  519,  549,  545,  546,   89,  552,   89,   89,  516,
+      554,   89,  557,  399,  548,  547,   89,  396,   89,   89,
+      550,  397,   89,  556,   89,   89,  555,  551,  558,   89,
+      563,   89,  559,   89,  565,  561,   89,   89,   89,   89,
+      560,   89,  562,   89,  564,   89,  566,   89,   89,   89,
+       89,   89,  569,  567,  571,   89,  573,   89,  568,  578,
+
+      570,  572,  574,   89,   89,   89,  575,   89,   89,   89,
+       89,  577,  579,  583,  576,  580,  587,  581,   89,   89,
+      585,   89,   89,  584,   89,  582,   89,  590,   89,  591,
+       89,   89,  589,  588,  597,  594,  593,  596,  509,  592,
+      207,  913,  620,  639,  595,  641,  598,  217,  217,  217,
+      217,  504,  504,  504,  504,  504,  504,  385,  385,  385,
+      385,  385,  385,   89,  509,   89,   89,  240,  620,  242,
+      646,  243,  242,  388,  388,  388,  388,  388,  388,  640,
+       89,  710,  509,  642,  505,   89,   89,  509,  680,  242,
+      506,  242,  510,  616,  243,  616,  242,  619,  617,  617,
+
+      617,  617,  617,  617,  710,  651,  507,  644,  509,   89,
+       89,   89,  648,  509,  515,  515,  515,  515,  515,  515,
+      514,   89,  514,  643,  645,  515,  515,  515,  515,  515,
+      515,  618,  621,  621,  621,  621,  621,  621,   89,   89,
+       89,  649,   89,   89,   89,   89,   89,   89,  622,  647,
+      623,  653,  624,  623,  650,   89,  655,  656,   89,  863,
+      654,  652,   89,   89,  660,  625,   89,  658,  659,   89,
+      623,  661,  623,  663,  662,  624,   89,  623,   89,   89,
+      665,  666,   89,   89,   89,  664,   89,   89,   89,   89,
+       89,  668,  669,  667,  674,   89,   89,   89,  671,  675,
+
+       89,  670,  672,  673,  676,   89,   89,   89,   89,   89,
+      678,   89,   89,  682,   89,  681,  685,  679,  677,  687,
+      684,  686,   89,   89,  913,  888,   89,  689,  688,  683,
+      504,  504,  504,  504,  504,  504,  617,  617,  617,  617,
+      617,  617,  616,  726,  616,  690,   89,  617,  617,  617,
+      617,  617,  617,  621,  621,  621,  621,  621,  621,  725,
+      710,  710,   89,  615,  708,  708,  708,  708,  708,  708,
+      711,   89,  711,   89,   89,  711,  721,  913,   89,  730,
+      622,  723,  623,  710,  624,  623,  625,  724,   89,  722,
+       89,   89,  711,   89,  711,  728,  727,  709,  729,  711,
+
+       89,   89,  623,  731,  623,   89,  732,  624,   89,  623,
+       89,   89,   89,  733,  738,  740,  734,   89,   89,   89,
+       89,   89,   89,   89,   89,  736,   89,  735,  743,  739,
+      746,   89,  737,  741,   89,   89,   89,  742,  744,   89,
+      749,   89,   89,   89,  745,  753,  747,   89,  748,  754,
+      755,  751,  752,   89,  750,   89,   89,  756,  913,   89,
+      772,   89,  757,  621,  621,  621,  621,  621,  621,  773,
+      758,  708,  708,  708,  708,  708,  708,   89,   89,   89,
+       89,  777,  774,  776,  775,   89,  781,  622,  778,  623,
+       89,  624,  623,  779,   89,   89,  712,  780,  784,   89,
+
+       89,  786,   89,   89,  709,  787,  789,  782,  783,  623,
+       89,  623,  788,  790,  624,   89,  623,   89,   89,   89,
+       89,  785,   89,   89,   89,  792,   89,   89,  791,  793,
+       89,  794,   89,  796,   89,  802,   89,   89,   89,   89,
+      797,  795,   89,  799,  818,  798,  803,   89,  800,  708,
+      708,  708,  708,  708,  708,  801,  816,   89,   89,  817,
+       89,  821,  819,   89,   89,  826,  824,  820,   89,   89,
+       89,  827,  828,   89,   89,  822,   89,  825,   89,  830,
+      829,  831,  765,   89,   89,  832,  823,   89,   89,   89,
+       89,   89,  852,   89,   89,   89,   89,  833,  854,  855,
+
+      857,   89,   89,  913,  858,  913,  834,  835,  851,  850,
+       89,   89,  856,  853,  849,   89,   89,   89,  860,  861,
+      862,  864,   89,   89,  859,   89,   89,   89,  876,   89,
+      875,   89,   89,  865,  880,   89,  877,   89,  882,   89,
+      883,   89,   89,  874,  887,   89,   89,  878,  884,  881,
+      886,   89,   89,  879,  885,  889,  890,   89,   89,   89,
+      891,   89,  892,  893,  894,   89,   89,   89,  895,  896,
+       89,   89,   89,  899,   89,  901,   89,  902,   89,  897,
+       89,  900,  898,   89,   89,   89,   89,   89,   89,   89,
+       89,   89,  906,   89,   89,  905,  913,  907,  903,  904,
+
+      912,  913,  873,  913,  910,  872,  913,  908,  909,  870,
+      911,   71,   71,   71,   71,   71,   71,   71,   71,   71,
+       71,   71,   71,   71,   77,   77,   77,   77,   77,   77,
+       77,   77,   77,   77,   77,   77,   77,   80,   80,   80,
+       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
+       88,  913,  869,   88,  913,   88,   88,   88,   88,   88,
+      142,  868,  913,  867,  142,  142,  142,  142,  142,  142,
+      205,  205,  205,  205,  205,  205,  205,  205,  205,  205,
+      205,  205,  205,  210,   89,   89,  210,   89,  210,  210,
+      210,  210,  210,  214,  913,  214,  214,  848,  214,  214,
+
+      214,  214,  214,  214,  913,  214,  222,  847,  845,  222,
+      222,  222,  222,  222,  222,  222,  222,  913,  222,  245,
+      245,  245,  245,  245,  245,  245,  245,  245,  245,  245,
+      245,  245,  259,  259,  843,  259,  913,  841,  913,  259,
+      275,  839,  837,  275,   89,  275,  275,  275,  275,  275,
+      279,   89,  279,   89,   89,   89,  279,  281,   89,  281,
+       89,   89,   89,  281,  358,   89,  358,   89,   89,  913,
+      358,  360,  815,  360,  813,  913,  913,  360,  364,  810,
+      364,  808,  806,   89,  364,  366,   89,  366,   89,   89,
+       89,  366,  368,   89,  368,   89,  771,  768,  368,  375,
+
+      767,  375,  765,  211,  761,  375,  377,  760,  377,  692,
+       89,   89,  377,  392,   89,  392,  394,  394,   89,  394,
+      394,  394,   89,  394,  259,  259,   89,  259,  275,   89,
+       89,  275,   89,  275,  275,  275,  275,  275,  404,   89,
+      404,   89,   89,   89,  404,  406,   89,  406,   89,   89,
+      719,  406,  408,  718,  408,  716,  714,  712,  408,  279,
+      619,  279,  410,  707,  410,  706,  704,  702,  410,  281,
+      700,  281,   88,  698,  696,   88,  694,   88,   88,   88,
+       88,   88,  205,  205,  205,  205,  205,  205,  205,  205,
+      205,  205,  205,  205,  205,  484,  484,  484,  484,  484,
+
+      484,  484,  484,  484,  484,  484,  484,  484,  485,  692,
+      485,   89,   89,   89,  485,  487,   89,  487,   89,   89,
+       89,  487,  489,   89,  489,   89,   89,   89,  489,  358,
+       89,  358,  491,   89,  491,   89,  638,  636,  491,  360,
+      634,  360,  494,  632,  494,  630,  628,  519,  494,  364,
+      626,  364,  496,  626,  496,  615,  614,  612,  496,  366,
+      499,  366,  498,  499,  498,  610,  608,  606,  498,  368,
+      604,  368,  500,  602,  500,  600,   89,   89,  500,  375,
+       89,  375,  502,   89,  502,   89,   89,   89,  502,  377,
+       89,  377,  508,  531,  508,  529,  508,  527,  508,  392,
+
+      525,  392,  523,  392,  521,  392,  394,  394,  507,  394,
+      394,  394,  506,  394,  520,  503,  520,  501,  371,  371,
+      520,  522,  499,  522,  497,  495,  492,  522,  524,  490,
+      524,  488,  486,   89,  524,  404,   89,  404,  526,   89,
+      526,  412,  411,  409,  526,  406,  407,  406,  528,  405,
+      528,  276,  271,  270,  528,  408,  401,  408,  530,  401,
+      530,  258,  391,  391,  530,  410,  246,  410,   88,  384,
+      378,   88,  376,   88,   88,   88,   88,   88,  484,  484,
+      484,  484,  484,  484,  484,  484,  484,  484,  484,  484,
+      484,  599,  374,  599,  370,  369,  367,  599,  485,  365,
+
+      485,  601,  361,  601,  359,  211,  207,  601,  487,   89,
+      487,  603,  283,  603,  282,  280,  276,  603,  489,  271,
+      489,  605,  274,  605,  271,  269,  268,  605,  491,  267,
+      491,  607,  246,  607,  238,   87,   87,  607,  494,   89,
+      494,  609,  211,  609,  209,   87,  124,  609,  496,  119,
+      496,  498,   89,  498,  913,   72,   72,  498,  611,  913,
+      611,  913,  913,  913,  611,  500,  913,  500,  613,  913,
+      613,  913,  913,  913,  613,  502,  913,  502,  508,  913,
+      508,  913,  508,  913,  508,  394,  913,  394,  913,  913,
+      913,  394,  627,  913,  627,  913,  913,  913,  627,  520,
+
+      913,  520,  629,  913,  629,  913,  913,  913,  629,  522,
+      913,  522,  631,  913,  631,  913,  913,  913,  631,  524,
+      913,  524,  633,  913,  633,  913,  913,  913,  633,  526,
+      913,  526,  635,  913,  635,  913,  913,  913,  635,  528,
+      913,  528,  637,  913,  637,  913,  913,  913,  637,  530,
+      913,  530,   88,  913,  913,   88,  913,   88,   88,   88,
+       88,   88,  691,  691,  691,  691,  691,  691,  691,  691,
+      691,  691,  691,  691,  691,  693,  913,  693,  913,  913,
+      913,  693,  599,  913,  599,  695,  913,  695,  913,  913,
+      913,  695,  601,  913,  601,  697,  913,  697,  913,  913,
+
+      913,  697,  603,  913,  603,  699,  913,  699,  913,  913,
+      913,  699,  605,  913,  605,  701,  913,  701,  913,  913,
+      913,  701,  607,  913,  607,  703,  913,  703,  913,  913,
+      913,  703,  609,  913,  609,  705,  913,  705,  913,  913,
+      913,  705,  611,  913,  611,   88,  913,   88,  913,  913,
+      913,   88,  613,  913,  613,  508,  913,  508,  913,  913,
+      913,  508,  713,  913,  713,  913,  913,  913,  713,  627,
+      913,  627,  715,  913,  715,  913,  913,  913,  715,  629,
+      913,  629,  717,  913,  717,  913,  913,  913,  717,  631,
+      913,  631,  142,  913,  142,  913,  913,  913,  142,  633,
+
+      913,  633,  720,  913,  720,  635,  913,  635,   88,  913,
+      913,   88,  913,   88,   88,   88,   88,   88,  637,  913,
+      637,  691,  691,  691,  691,  691,  691,  691,  691,  691,
+      691,  691,  691,  691,  759,  913,  759,  913,  913,  913,
+      759,  693,  913,  693,  210,  913,  210,  913,  913,  913,
+      210,  695,  913,  695,  762,  913,  762,  697,  913,  697,
+      210,  913,  913,  210,  913,  210,  210,  210,  210,  210,
+      699,  913,  699,  763,  913,  763,  701,  913,  701,  703,
+      913,  703,  764,  913,  764,  705,  913,  705,   88,  913,
+       88,  766,  913,  766,  913,  913,  913,  766,  713,  913,
+
+      713,  275,  913,  275,  913,  913,  913,  275,  715,  913,
+      715,  769,  913,  769,  717,  913,  717,  142,  913,  142,
+      770,  913,  770,  913,  913,  913,  770,   88,  913,  913,
+       88,  913,   88,   88,   88,   88,   88,  804,  913,  804,
+      759,  913,  759,  210,  913,  210,  805,  913,  805,  913,
+      913,  913,  805,  807,  913,  807,  913,  913,  913,  807,
+      809,  913,  809,  913,  913,  913,  809,  811,  913,  811,
+      812,  913,  812,  913,  913,  913,  812,  814,  913,  814,
+      913,  913,  913,  814,  836,  913,  836,  913,  913,  913,
+      836,  838,  913,  838,  913,  913,  913,  838,  840,  913,
+
+      840,  913,  913,  913,  840,  842,  913,  842,  913,  913,
+      913,  842,  844,  913,  844,  913,  913,  913,  844,  846,
+      913,  846,  913,  913,  913,  846,  637,  913,  637,  913,
+      913,  913,  637,  866,  913,  866,  913,  913,  913,  866,
+      699,  913,  699,  913,  913,  913,  699,  703,  913,  703,
+      913,  913,  913,  703,   88,  913,   88,  913,  913,  913,
+       88,  871,  913,  871,  913,  913,  913,  871,  142,  913,
+      142,  913,  913,  913,  142,  210,  913,  210,  913,  913,
+      913,  210,   11,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913
     } ;
 
-static yyconst flex_int16_t yy_chk[2963] =
+static yyconst flex_int16_t yy_chk[2969] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -1137 +1138 @@
         5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
         5,    5,    5,    5,    5,    5,    5,    5,    5,    7,
-        8,    9,   10,   37,   37,   20,   39,    9,   10,  907,
+        8,    9,   10,   37,   37,   20,   39,    9,   10,  912,
         7,    8,   13,   13,   13,   13,   13,   13,   15,   15,
 
        15,   15,   15,   15,   20,   25,   48,   39,   42,   28,
-       27,   28,   28,   28,   28,   28,   28,  110,  116,   25,
+       27,   28,   28,   28,   28,   28,   28,  111,  117,   25,
        29,   25,   27,   27,   27,   29,   48,   35,   40,    7,
         8,    9,   10,   40,   42,   29,   30,   47,   30,   30,
-       30,   30,   30,   30,   35,   57,   35,   35,   44,  127,
-       44,  127,  110,  116,   57,   30,   65,  547,   47,   30,
+       30,   30,   30,   30,   35,   58,   35,   35,   44,  128,
+       44,  128,  111,  117,   58,   30,   56,  551,   47,   30,
        47,   45,   45,   45,   49,   30,   30,   45,   45,   49,
-       45,   30,   40,   45,   45,   40,   49,   30,   45,   63,
-       62,   45,   49,   30,   74,  906,  547,   53,   63,   51,
-       61,   30,   62,   55,   30,   31,  109,   31,   31,   31,
-
-       31,   31,   31,   50,   51,   53,   51,   65,   61,   54,
-       74,   55,   50,   88,   31,   51,   50,   55,   31,   54,
-      109,   50,   52,  143,   31,   50,   54,   52,  112,  154,
-       31,   56,  111,  898,  152,   52,   31,   52,  154,   88,
-       52,  108,   31,  128,   52,  128,  112,  108,   56,  143,
-       31,   38,  152,   56,  112,   38,   38,   58,   38,   60,
-       38,   38,  111,   38,   60,   38,   59,  111,  115,   58,
-       58,  117,  158,  108,   38,   38,   38,   60,   59,   58,
-      131,  130,   58,  130,  158,  114,   59,  132,   59,  117,
-      111,  114,  115,   59,  131,   38,  131,  117,   38,  132,
-
-      133,  132,  133,   60,  173,  153,   60,   68,   68,   68,
-       68,   68,   68,   69,   69,   68,  165,  114,   69,  173,
-       60,  134,  134,  153,  134,   38,   38,   81,   81,   81,
-       81,   81,   81,  165,   69,   69,   69,   69,   69,   69,
-       78,   78,  135,  155,  135,   78,  146,   78,  136,  136,
-      136,  146,   78,   83,   83,   83,   83,   83,   83,  155,
-      897,   78,   78,   78,   78,   84,   84,   84,   84,   84,
-       84,  156,   78,  104,  104,  104,  104,  104,  104,  105,
-      105,  105,  105,  138,  140,  138,  140,  151,   78,  156,
-      146,   78,  306,  894,  157,  162,   78,   78,  161,  306,
-
-       78,   78,  151,  160,  162,  176,  168,  105,   78,  151,
-      169,   78,  105,   78,   78,   78,  157,   78,   86,  160,
-      161,  164,   86,   86,  166,  176,  164,   86,   86,  168,
-       86,  163,   86,  167,  166,  105,  170,  169,  175,  164,
-      893,   86,   86,   86,  106,  172,  106,  106,  106,  106,
-      106,  106,  163,  163,  167,  171,  175,  170,  174,  177,
-      171,  178,   86,  106,  107,   86,  107,  172,  183,  107,
-      107,  107,  107,  107,  107,  174,  182,  183,  171,  106,
-      184,  182,  186,  178,  181,  106,  177,  222,  891,  222,
-      192,  180,  187,   86,  100,  100,  100,  100,  100,  100,
-
-      186,  181,  107,  187,  188,  189,  180,  184,  185,  188,
-      100,  100,  100,  180,  100,  100,  190,  192,  189,  185,
-      187,  194,  732,  198,  188,  195,  191,  100,  193,  185,
-      185,  191,  100,  100,  100,  159,  190,  100,  195,  100,
-      159,  159,  159,  198,  159,  159,  195,  193,  159,  196,
-      159,  732,  209,  191,  197,  159,  159,  159,  223,  159,
-      223,  224,  196,  224,  196,  194,  286,  197,  194,  201,
-      201,  201,  201,  201,  201,  202,  202,  201,  209,  225,
-      202,  204,  204,  286,  213,  213,  204,  206,  206,  213,
-      890,  883,  206,  225,  206,  225,  202,  202,  202,  202,
-
-      202,  202,  204,  204,  204,  204,  204,  204,  206,  206,
-      206,  206,  206,  206,  216,  216,  216,  216,  226,  227,
-      247,  227,  228,  228,  229,  228,  229,  230,  230,  230,
-      226,  232,  226,  232,  233,  240,  233,  238,  238,  241,
-      270,  241,  270,  239,  241,  239,  282,  216,  239,  239,
-      239,  239,  239,  239,  271,  247,  271,  882,  240,  282,
-      238,  241,  246,  241,  246,  246,  246,  246,  241,  245,
-      245,  245,  245,  245,  245,  248,  248,  248,  248,  248,
-      248,  239,  249,  249,  249,  249,  249,  249,  283,  284,
-      288,  287,  248,  285,  289,  252,  287,  246,  295,  289,
-
-      297,  326,  245,  260,  274,  297,  283,  284,  248,  285,
-      288,  881,  326,  295,  248,  250,  250,  250,  250,  250,
-      250,  252,  257,  259,  259,  259,  259,  259,  259,  260,
-      274,  250,  251,  250,  251,  250,  250,  251,  251,  251,
-      251,  251,  251,  298,  292,  257,  880,  257,  250,  294,
-      290,  257,  298,  250,  293,  250,  259,  257,  250,  291,
-      250,  264,  264,  264,  264,  264,  264,  292,  296,  257,
-      290,  300,  293,  257,  291,  294,  299,  257,  301,  303,
-      291,  291,  304,  305,  296,  296,  307,  304,  309,  299,
-      308,  879,  305,  313,  264,  310,  301,  303,  300,  311,
-
-      310,  312,  314,  318,  311,  316,  307,  312,  308,  309,
-      309,  314,  313,  315,  317,  319,  322,  320,  318,  315,
-      319,  316,  320,  317,  321,  323,  324,  327,  328,  321,
-      329,  328,  330,  331,  332,  322,  333,  334,  335,  324,
-      336,  337,  327,  323,  338,  330,  321,  335,  340,  329,
-      339,  342,  344,  345,  334,  331,  333,  332,  343,  346,
-      349,  340,  336,  350,  337,  347,  338,  343,  339,  348,
-      342,  345,  346,  347,  348,  349,  875,  351,  351,  352,
-      413,  350,  351,  410,  351,  352,  359,  359,  359,  359,
-      360,  360,  360,  360,  410,  369,  344,  369,  370,  413,
-
-      370,  377,  377,  377,  377,  377,  377,  379,  389,  379,
-      417,  394,  379,  379,  379,  379,  379,  379,  389,  359,
-      378,  378,  378,  378,  378,  378,  381,  381,  381,  381,
-      381,  381,  417,  411,  389,  394,  378,  412,  378,  415,
-      378,  378,  384,  384,  384,  384,  384,  384,  392,  411,
-      415,  390,  412,  378,  392,  396,  578,  421,  378,  381,
-      378,  390,  420,  378,  578,  378,  382,  382,  382,  382,
-      382,  382,  391,  396,  424,  384,  414,  390,  420,  421,
-      392,  396,  382,  382,  382,  414,  382,  382,  385,  385,
-      385,  385,  385,  385,  428,  391,  424,  391,  871,  382,
-
-      428,  391,  868,  395,  382,  382,  382,  391,  393,  382,
-      393,  382,  419,  393,  393,  393,  393,  393,  393,  391,
-      416,  385,  418,  391,  422,  419,  395,  391,  395,  416,
-      425,  418,  395,  430,  426,  423,  429,  422,  395,  426,
-      427,  431,  434,  439,  430,  438,  393,  436,  425,  432,
-      395,  423,  423,  441,  395,  427,  434,  429,  395,  436,
-      431,  440,  427,  442,  432,  439,  438,  443,  444,  442,
-      446,  448,  449,  450,  440,  451,  441,  444,  452,  453,
-      454,  456,  443,  458,  461,  446,  459,  460,  450,  454,
-      462,  448,  463,  452,  449,  464,  460,  451,  456,  453,
-
-      465,  466,  467,  470,  468,  461,  458,  469,  459,  465,
-      462,  468,  463,  471,  469,  467,  472,  464,  473,  466,
-      474,  475,  477,  480,  478,  472,  473,  479,  470,  480,
-      479,  507,  475,  478,  508,  471,  473,  474,  489,  489,
-      489,  489,  528,  531,  477,  500,  500,  500,  500,  500,
-      500,  502,  502,  502,  502,  502,  502,  507,  531,  528,
-      508,  500,  529,  500,  533,  500,  500,  503,  503,  503,
-      503,  503,  503,  867,  866,  529,  504,  533,  500,  532,
-      542,  506,  534,  500,  502,  500,  504,  505,  500,  505,
-      500,  506,  505,  505,  505,  505,  505,  505,  536,  532,
-
-      503,  542,  504,  536,  534,  535,  537,  506,  510,  510,
-      510,  510,  510,  510,  512,  865,  512,  537,  535,  512,
-      512,  512,  512,  512,  512,  505,  511,  511,  511,  511,
-      511,  511,  538,  539,  540,  538,  541,  546,  544,  543,
-      545,  549,  511,  544,  511,  548,  511,  511,  543,  540,
-      546,  545,  551,  539,  548,  541,  550,  552,  555,  511,
-      557,  551,  552,  549,  511,  558,  511,  555,  554,  511,
-      559,  511,  560,  550,  554,  562,  563,  557,  564,  565,
-      558,  560,  567,  568,  562,  559,  570,  571,  568,  574,
-      564,  575,  576,  563,  565,  570,  571,  567,  579,  580,
-
-      581,  582,  589,  586,  575,  587,  580,  590,  579,  576,
-      583,  574,  586,  582,  592,  587,  583,  864,  863,  589,
-      590,  638,  581,  610,  610,  610,  610,  610,  610,  611,
-      611,  611,  611,  611,  611,  613,  592,  613,  638,  637,
-      613,  613,  613,  613,  613,  613,  616,  616,  616,  616,
-      616,  616,  637,  617,  617,  642,  610,  612,  612,  612,
-      612,  612,  612,  618,  634,  619,  862,  619,  639,  634,
-      619,  636,  642,  612,  635,  612,  617,  612,  612,  616,
-      636,  635,  634,  645,  646,  640,  618,  619,  641,  619,
-      612,  639,  640,  644,  619,  612,  641,  612,  643,  646,
-
-      612,  643,  612,  647,  648,  645,  644,  649,  650,  651,
-      652,  650,  653,  654,  655,  657,  656,  660,  667,  658,
-      661,  648,  662,  655,  666,  647,  651,  653,  658,  649,
-      669,  662,  672,  654,  656,  684,  673,  657,  652,  680,
-      660,  672,  661,  673,  666,  667,  681,  669,  680,  683,
-      684,  716,  719,  722,  723,  861,  681,  723,  683,  703,
-      703,  703,  703,  703,  703,  707,  707,  707,  707,  707,
-      707,  717,  716,  722,  856,  703,  720,  703,  719,  703,
-      703,  717,  721,  720,  727,  724,  729,  721,  724,  725,
-      727,  730,  703,  728,  730,  729,  731,  703,  707,  703,
-
-      733,  734,  703,  733,  703,  735,  728,  725,  736,  737,
-      734,  736,  738,  739,  740,  741,  742,  731,  748,  745,
-      738,  749,  737,  739,  750,  742,  752,  740,  773,  774,
-      753,  735,  771,  773,  752,  776,  741,  745,  748,  753,
-      772,  778,  745,  749,  774,  750,  760,  760,  760,  760,
-      760,  760,  771,  775,  777,  780,  779,  772,  776,  779,
-      781,  783,  785,  775,  783,  785,  786,  778,  780,  787,
-      789,  777,  787,  786,  788,  790,  792,  788,  796,  760,
-      811,  813,  814,  815,  816,  789,  815,  817,  781,  818,
-      817,  820,  818,  821,  822,  824,  855,  822,  790,  792,
-
-      814,  796,  813,  827,  828,  825,  816,  811,  825,  820,
-      826,  829,  827,  826,  830,  845,  846,  824,  847,  821,
-      828,  847,  829,  846,  848,  849,  850,  851,  854,  850,
-      830,  854,  857,  848,  884,  857,  845,  858,  859,  860,
-      870,  853,  869,  849,  851,  870,  858,  873,  860,  849,
-      859,  869,  872,  874,  884,  872,  876,  873,  874,  876,
-      877,  878,  885,  877,  878,  886,  887,  888,  886,  889,
-      888,  892,  889,  895,  896,  899,  887,  885,  900,  901,
-      903,  902,  904,  852,  899,  905,  844,  843,  842,  896,
-      841,  900,  840,  892,  895,  905,  839,  838,  903,  837,
-
-      836,  901,  902,  835,  904,  909,  909,  909,  909,  909,
-      909,  909,  909,  909,  909,  909,  909,  909,  910,  910,
-      910,  910,  910,  910,  910,  910,  910,  910,  910,  910,
-      910,  911,  911,  911,  911,  911,  911,  911,  911,  911,
-      911,  911,  911,  911,  912,  834,  833,  912,  832,  912,
-      912,  912,  912,  912,  913,  831,  823,  819,  913,  913,
-      913,  913,  913,  913,  914,  914,  914,  914,  914,  914,
-      914,  914,  914,  914,  914,  914,  914,  915,  812,  810,
-      915,  809,  915,  915,  915,  915,  915,  916,  808,  916,
-      916,  807,  916,  916,  916,  916,  916,  916,  806,  916,
-
-      917,  805,  804,  917,  917,  917,  917,  917,  917,  917,
-      917,  803,  917,  918,  918,  918,  918,  918,  918,  918,
-      918,  918,  918,  918,  918,  918,  919,  919,  802,  919,
-      801,  800,  799,  919,  920,  798,  797,  920,  795,  920,
-      920,  920,  920,  920,  921,  794,  921,  793,  791,  784,
-      921,  922,  782,  922,  770,  769,  768,  922,  923,  767,
-      923,  766,  765,  764,  923,  924,  763,  924,  762,  759,
-      758,  924,  925,  757,  925,  751,  747,  746,  925,  926,
-      744,  926,  743,  726,  718,  926,  927,  715,  927,  710,
-      708,  704,  927,  928,  694,  928,  690,  688,  686,  928,
-
-      929,  685,  929,  682,  679,  678,  929,  930,  677,  930,
-      931,  931,  676,  931,  931,  931,  675,  931,  932,  932,
-      674,  932,  933,  671,  670,  933,  668,  933,  933,  933,
-      933,  933,  934,  665,  934,  664,  663,  659,  934,  935,
-      632,  935,  628,  626,  624,  935,  936,  622,  936,  620,
-      614,  608,  936,  937,  606,  937,  938,  604,  938,  602,
-      600,  598,  938,  939,  596,  939,  940,  594,  593,  940,
-      591,  940,  940,  940,  940,  940,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  942,
-      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
-
-      942,  942,  943,  588,  943,  585,  584,  577,  943,  944,
-      573,  944,  572,  569,  566,  944,  945,  561,  945,  556,
-      553,  530,  945,  946,  526,  946,  947,  524,  947,  522,
-      520,  518,  947,  948,  516,  948,  949,  515,  949,  514,
-      513,  501,  949,  950,  498,  950,  951,  496,  951,  495,
-      494,  492,  951,  952,  490,  952,  953,  487,  953,  485,
-      483,  481,  953,  954,  476,  954,  955,  457,  955,  455,
-      447,  445,  955,  956,  437,  956,  957,  435,  957,  433,
-      407,  405,  957,  958,  403,  958,  959,  401,  959,  400,
-      959,  399,  959,  960,  386,  960,  383,  960,  374,  960,
-
-      961,  961,  372,  961,  961,  961,  371,  961,  962,  367,
-      962,  365,  363,  361,  962,  963,  357,  963,  355,  354,
-      353,  963,  964,  341,  964,  325,  302,  281,  964,  965,
-      279,  965,  966,  277,  966,  276,  275,  273,  966,  967,
-      272,  967,  968,  267,  968,  263,  262,  258,  968,  969,
-      255,  969,  970,  254,  970,  243,  242,  235,  970,  971,
-      234,  971,  972,  231,  221,  972,  219,  972,  972,  972,
-      972,  972,  973,  973,  973,  973,  973,  973,  973,  973,
-      973,  973,  973,  973,  973,  974,  218,  974,  217,  211,
-      210,  974,  975,  208,  975,  976,  203,  976,  179,  150,
-
-      148,  976,  977,  147,  977,  978,  141,  978,  139,  137,
-      129,  978,  979,  126,  979,  980,  125,  980,  121,  102,
-       99,  980,  981,   96,  981,  982,   94,  982,   87,   73,
-       71,  982,  983,   67,  983,  984,   36,  984,   33,   18,
-       11,  984,  985,    4,  985,  986,    3,  986,    0,    0,
-        0,  986,  987,    0,  987,    0,    0,    0,  987,  988,
-        0,  988,  989,    0,  989,    0,    0,    0,  989,  990,
-        0,  990,  991,    0,  991,    0,  991,    0,  991,  992,
-        0,  992,    0,    0,    0,  992,  993,    0,  993,    0,
-        0,    0,  993,  994,    0,  994,  995,    0,  995,    0,
-
-        0,    0,  995,  996,    0,  996,  997,    0,  997,    0,
-        0,    0,  997,  998,    0,  998,  999,    0,  999,    0,
-        0,    0,  999, 1000,    0, 1000, 1001,    0, 1001,    0,
-        0,    0, 1001, 1002,    0, 1002, 1003,    0, 1003,    0,
-        0,    0, 1003, 1004,    0, 1004, 1005,    0,    0, 1005,
-        0, 1005, 1005, 1005, 1005, 1005, 1006, 1006, 1006, 1006,
-     1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1007,
-        0, 1007,    0,    0,    0, 1007, 1008,    0, 1008, 1009,
-        0, 1009,    0,    0,    0, 1009, 1010,    0, 1010, 1011,
-        0, 1011,    0,    0,    0, 1011, 1012,    0, 1012, 1013,
-
-        0, 1013,    0,    0,    0, 1013, 1014,    0, 1014, 1015,
-        0, 1015,    0,    0,    0, 1015, 1016,    0, 1016, 1017,
-        0, 1017,    0,    0,    0, 1017, 1018,    0, 1018, 1019,
-        0, 1019,    0,    0,    0, 1019, 1020,    0, 1020, 1021,
-        0, 1021,    0,    0,    0, 1021, 1022,    0, 1022, 1023,
-        0, 1023,    0,    0,    0, 1023, 1024,    0, 1024,    0,
-        0,    0, 1024, 1025,    0, 1025, 1026,    0, 1026,    0,
-        0,    0, 1026, 1027,    0, 1027, 1028,    0, 1028,    0,
-        0,    0, 1028, 1029,    0, 1029, 1030,    0, 1030,    0,
-        0,    0, 1030, 1031,    0, 1031, 1032,    0, 1032, 1033,
-
-        0, 1033, 1034,    0,    0, 1034,    0, 1034, 1034, 1034,
-     1034, 1034, 1035,    0, 1035, 1036, 1036, 1036, 1036, 1036,
-     1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036, 1037,    0,
-     1037,    0,    0,    0, 1037, 1038,    0, 1038, 1039,    0,
-     1039,    0,    0,    0, 1039, 1040,    0, 1040, 1041,    0,
-     1041, 1042,    0, 1042, 1043,    0,    0, 1043,    0, 1043,
-     1043, 1043, 1043, 1043, 1044,    0, 1044, 1045,    0, 1045,
-     1046,    0, 1046, 1047,    0, 1047, 1048,    0, 1048, 1049,
-        0, 1049, 1050,    0, 1050, 1051,    0, 1051,    0,    0,
-        0, 1051, 1052,    0, 1052, 1053,    0, 1053,    0,    0,
-
-        0, 1053, 1054,    0, 1054, 1055,    0, 1055, 1056,    0,
-     1056, 1057,    0, 1057, 1058,    0, 1058,    0,    0,    0,
-     1058, 1059,    0,    0, 1059,    0, 1059, 1059, 1059, 1059,
+       45,   30,   40,   45,   45,   40,   49,   30,   45,   56,
+       63,   45,   49,   30,   75,  911,  551,   53,   66,   51,
+       62,   30,   63,   55,   30,   31,  166,   31,   31,   31,
+
+       31,   31,   31,   50,   51,   53,   51,   89,   62,   54,
+       75,   55,   50,  166,   31,   51,   50,   55,   31,   54,
+       64,   50,   52,  144,   31,   50,   54,   52,  110,   64,
+       31,   57,  112,   89,  159,   52,   31,   52,  903,   66,
+       52,  109,   31,  129,   52,  129,  159,  109,   57,  144,
+       31,   38,  110,   57,  113,   38,   38,   59,   38,   61,
+       38,   38,  112,   38,   61,   38,   60,  112,  116,   59,
+       59,  118,  113,  109,   38,   38,   38,   61,   60,   59,
+      113,  131,   59,  131,  177,  115,   60,  133,   60,  118,
+      112,  115,  116,   60,  134,   38,  134,  118,   38,  133,
+
+      136,  133,  136,   61,  177,  132,   61,   69,   69,   69,
+       69,   69,   69,   70,   70,   69,  175,  115,   70,  132,
+       61,  132,  137,  137,  137,   38,   38,   82,   82,   82,
+       82,   82,   82,  175,   70,   70,   70,   70,   70,   70,
+       79,   79,  153,  135,  135,   79,  135,   79,  139,  141,
+      139,  141,   79,   84,   84,   84,   84,   84,   84,  902,
+      153,   79,   79,   79,   79,   85,   85,   85,   85,   85,
+       85,  152,   79,  105,  105,  105,  105,  105,  105,  106,
+      106,  106,  106,  155,  154,  147,  152,  156,   79,  161,
+      147,   79,  155,  152,  174,  328,   79,   79,  157,  158,
+
+       79,   79,  154,  156,  162,  161,  328,  106,   79,  174,
+      163,   79,  106,   79,   79,   79,  157,   79,   87,  163,
+      165,  158,   87,   87,  167,  165,  162,   87,   87,  147,
+       87,  164,   87,  168,  167,  106,  169,  171,  165,  173,
+      170,   87,   87,   87,  107,  899,  107,  107,  107,  107,
+      107,  107,  164,  164,  168,  172,  178,  176,  171,  169,
+      172,  173,   87,  107,  108,   87,  108,  170,  179,  108,
+      108,  108,  108,  108,  108,  176,  183,  189,  172,  107,
+      185,  183,  186,  178,  184,  107,  181,  182,  189,  185,
+      179,  898,  194,   87,  101,  101,  101,  101,  101,  101,
+
+      191,  181,  108,  188,  182,  189,  184,  187,  181,  186,
+      101,  101,  101,  191,  101,  101,  192,  196,  187,  194,
+      193,  188,  896,  308,  195,  193,  190,  101,  187,  187,
+      308,  190,  101,  101,  101,  160,  192,  101,  198,  101,
+      160,  160,  160,  195,  160,  160,  190,  193,  160,  197,
+      160,  198,  199,  198,  200,  160,  160,  160,  211,  160,
+      331,  196,  197,  331,  196,  199,  204,  204,  215,  215,
+      197,  204,  284,  215,  200,  203,  203,  203,  203,  203,
+      203,  206,  206,  203,  211,  284,  206,  204,  204,  204,
+      204,  204,  204,  208,  208,  224,  895,  224,  208,  225,
+
+      208,  225,  206,  206,  206,  206,  206,  206,  218,  218,
+      218,  218,  227,  228,  208,  208,  208,  208,  208,  208,
+      226,  229,  226,  229,  242,  228,  227,  228,  227,  230,
+      230,  231,  230,  231,  232,  232,  232,  234,  235,  234,
+      235,  218,  240,  240,  241,  249,  241,  242,  254,  241,
+      241,  241,  241,  241,  241,  243,  272,  243,  272,  248,
+      243,  248,  248,  248,  248,  240,  247,  247,  247,  247,
+      247,  247,  262,  273,  254,  273,  288,  243,  285,  243,
+      249,  287,  241,  276,  243,  250,  250,  250,  250,  250,
+      250,  290,  286,  288,  248,  289,  285,  287,  262,  247,
+
+      289,  292,  250,  251,  251,  251,  251,  251,  251,  276,
+      286,  290,  291,  300,  295,  299,  472,  291,  250,  888,
+      299,  292,  300,  472,  250,  252,  252,  252,  252,  252,
+      252,  259,  295,  296,  261,  261,  261,  261,  261,  261,
+      293,  252,  253,  252,  253,  252,  252,  253,  253,  253,
+      253,  253,  253,  887,  259,  293,  259,  294,  252,  296,
+      259,  293,  293,  252,  297,  252,  259,  261,  252,  303,
+      252,  266,  266,  266,  266,  266,  266,  298,  259,  297,
+      294,  302,  259,  301,  305,  306,  259,  303,  307,  309,
+      306,  311,  310,  298,  298,  312,  301,  307,  313,  314,
+
+      312,  315,  305,  313,  266,  314,  316,  318,  302,  309,
+      310,  317,  311,  311,  320,  316,  319,  317,  324,  321,
+      315,  322,  323,  318,  321,  319,  322,  323,  325,  320,
+      326,  330,  329,  332,  334,  333,  335,  324,  336,  339,
+      330,  338,  340,  326,  323,  337,  325,  329,  333,  341,
+      338,  342,  332,  343,  345,  346,  334,  347,  336,  335,
+      348,  339,  337,  349,  346,  340,  343,  350,  352,  342,
+      353,  341,  351,  345,  413,  350,  349,  351,  348,  354,
+      354,  355,  886,  352,  354,  413,  354,  355,  353,  362,
+      362,  362,  362,  363,  363,  363,  363,  372,  373,  372,
+
+      373,  347,  380,  380,  380,  380,  380,  380,  382,  392,
+      382,  393,  397,  382,  382,  382,  382,  382,  382,  392,
+      885,  393,  362,  381,  381,  381,  381,  381,  381,  384,
+      384,  384,  384,  384,  384,  392,  397,  393,  414,  381,
+      415,  381,  418,  381,  381,  387,  387,  387,  387,  387,
+      387,  395,  422,  418,  414,  415,  381,  395,  399,  420,
+      416,  381,  384,  381,  423,  422,  381,  884,  381,  385,
+      385,  385,  385,  385,  385,  394,  399,  424,  387,  416,
+      423,  420,  432,  395,  399,  385,  385,  385,  417,  385,
+      385,  388,  388,  388,  388,  388,  388,  417,  394,  424,
+
+      394,  880,  385,  432,  394,  876,  398,  385,  385,  385,
+      394,  396,  385,  396,  385,  425,  396,  396,  396,  396,
+      396,  396,  394,  419,  388,  421,  394,  426,  425,  398,
+      394,  398,  419,  427,  421,  398,  428,  429,  437,  433,
+      431,  398,  429,  426,  426,  430,  431,  434,  435,  396,
+      433,  441,  437,  398,  428,  427,  439,  398,  442,  444,
+      430,  398,  443,  435,  445,  447,  434,  430,  439,  446,
+      445,  449,  441,  451,  447,  443,  452,  453,  454,  455,
+      442,  456,  444,  461,  446,  459,  449,  457,  462,  463,
+      464,  465,  453,  451,  455,  466,  457,  467,  452,  464,
+
+      454,  456,  459,  468,  469,  470,  461,  471,  474,  473,
+      475,  463,  465,  469,  462,  466,  473,  467,  476,  478,
+      471,  477,  481,  470,  479,  468,  532,  476,  482,  477,
+      535,  483,  475,  474,  483,  479,  478,  482,  511,  477,
+      484,  873,  512,  532,  481,  535,  484,  493,  493,  493,
+      493,  504,  504,  504,  504,  504,  504,  506,  506,  506,
+      506,  506,  506,  536,  511,  540,  533,  504,  512,  504,
+      540,  504,  504,  507,  507,  507,  507,  507,  507,  533,
+      583,  623,  508,  536,  504,  538,  545,  510,  583,  504,
+      506,  504,  508,  509,  504,  509,  504,  510,  509,  509,
+
+      509,  509,  509,  509,  623,  545,  507,  538,  508,  542,
+      537,  539,  542,  510,  514,  514,  514,  514,  514,  514,
+      516,  543,  516,  537,  539,  516,  516,  516,  516,  516,
+      516,  509,  515,  515,  515,  515,  515,  515,  541,  544,
+      546,  543,  547,  833,  550,  549,  553,  554,  515,  541,
+      515,  547,  515,  515,  544,  548,  549,  550,  552,  833,
+      548,  546,  555,  561,  554,  515,  562,  552,  553,  556,
+      515,  555,  515,  558,  556,  515,  559,  515,  563,  558,
+      561,  562,  564,  566,  567,  559,  568,  569,  571,  572,
+      574,  564,  566,  563,  572,  575,  579,  580,  568,  574,
+
+      581,  567,  569,  571,  575,  584,  585,  586,  587,  592,
+      580,  594,  591,  585,  595,  584,  588,  581,  579,  592,
+      587,  591,  588,  597,  872,  871,  643,  595,  594,  586,
+      615,  615,  615,  615,  615,  615,  616,  616,  616,  616,
+      616,  616,  618,  643,  618,  597,  642,  618,  618,  618,
+      618,  618,  618,  621,  621,  621,  621,  621,  621,  642,
+      622,  622,  647,  615,  617,  617,  617,  617,  617,  617,
+      624,  639,  624,  644,  640,  624,  639,  870,  641,  647,
+      617,  640,  617,  622,  617,  617,  621,  641,  645,  639,
+      646,  650,  624,  649,  624,  645,  644,  617,  646,  624,
+
+      648,  651,  617,  648,  617,  652,  649,  617,  653,  617,
+      654,  655,  656,  650,  655,  657,  651,  659,  658,  660,
+      661,  663,  662,  665,  672,  653,  666,  652,  660,  656,
+      663,  667,  654,  658,  671,  674,  677,  659,  661,  721,
+      667,  685,  678,  657,  662,  677,  665,  686,  666,  678,
+      685,  672,  674,  688,  671,  689,  724,  686,  869,  722,
+      721,  727,  688,  712,  712,  712,  712,  712,  712,  722,
+      689,  708,  708,  708,  708,  708,  708,  725,  726,  730,
+      732,  727,  724,  726,  725,  728,  732,  708,  728,  708,
+      729,  708,  708,  729,  733,  735,  712,  730,  735,  734,
+
+      736,  737,  738,  739,  708,  738,  740,  733,  734,  708,
+      741,  708,  739,  741,  708,  742,  708,  743,  745,  744,
+      746,  736,  750,  753,  747,  743,  754,  757,  742,  744,
+      737,  745,  740,  747,  755,  757,  776,  758,  781,  778,
+      750,  746,  777,  753,  778,  750,  758,  779,  754,  765,
+      765,  765,  765,  765,  765,  755,  776,  780,  782,  777,
+      783,  781,  779,  784,  785,  786,  784,  780,  788,  790,
+      794,  788,  790,  791,  795,  782,  792,  785,  793,  792,
+      791,  793,  765,  797,  801,  794,  783,  816,  818,  820,
+      819,  821,  820,  786,  825,  822,  823,  795,  822,  823,
+
+      826,  827,  829,  868,  827,  867,  797,  801,  819,  818,
+      834,  832,  825,  821,  816,  830,  831,  835,  830,  831,
+      832,  834,  850,  851,  829,  852,  826,  853,  852,  854,
+      851,  855,  856,  835,  855,  859,  853,  862,  859,  863,
+      862,  865,  864,  850,  866,  861,  874,  854,  863,  856,
+      865,  875,  878,  854,  864,  874,  875,  877,  879,  889,
+      877,  881,  878,  879,  881,  882,  883,  890,  882,  883,
+      891,  892,  893,  891,  894,  893,  897,  894,  900,  889,
+      901,  892,  890,  904,  905,  906,  908,  907,  909,  860,
+      910,  858,  904,  857,  849,  901,  848,  905,  897,  900,
+
+      910,  847,  846,  845,  908,  844,  843,  906,  907,  842,
+      909,  914,  914,  914,  914,  914,  914,  914,  914,  914,
+      914,  914,  914,  914,  915,  915,  915,  915,  915,  915,
+      915,  915,  915,  915,  915,  915,  915,  916,  916,  916,
+      916,  916,  916,  916,  916,  916,  916,  916,  916,  916,
+      917,  841,  840,  917,  839,  917,  917,  917,  917,  917,
+      918,  838,  837,  836,  918,  918,  918,  918,  918,  918,
+      919,  919,  919,  919,  919,  919,  919,  919,  919,  919,
+      919,  919,  919,  920,  828,  824,  920,  817,  920,  920,
+      920,  920,  920,  921,  815,  921,  921,  814,  921,  921,
+
+      921,  921,  921,  921,  813,  921,  922,  812,  811,  922,
+      922,  922,  922,  922,  922,  922,  922,  810,  922,  923,
+      923,  923,  923,  923,  923,  923,  923,  923,  923,  923,
+      923,  923,  924,  924,  809,  924,  808,  807,  806,  924,
+      925,  805,  804,  925,  803,  925,  925,  925,  925,  925,
+      926,  802,  926,  800,  799,  798,  926,  927,  796,  927,
+      789,  787,  775,  927,  928,  774,  928,  773,  772,  771,
+      928,  929,  770,  929,  769,  768,  767,  929,  930,  764,
+      930,  763,  762,  756,  930,  931,  752,  931,  751,  749,
+      748,  931,  932,  731,  932,  723,  720,  715,  932,  933,
+
+      713,  933,  709,  699,  695,  933,  934,  693,  934,  691,
+      690,  687,  934,  935,  684,  935,  936,  936,  683,  936,
+      936,  936,  682,  936,  937,  937,  681,  937,  938,  680,
+      679,  938,  676,  938,  938,  938,  938,  938,  939,  675,
+      939,  673,  670,  669,  939,  940,  668,  940,  664,  637,
+      633,  940,  941,  631,  941,  629,  627,  625,  941,  942,
+      619,  942,  943,  613,  943,  611,  609,  607,  943,  944,
+      605,  944,  945,  603,  601,  945,  599,  945,  945,  945,
+      945,  945,  946,  946,  946,  946,  946,  946,  946,  946,
+      946,  946,  946,  946,  946,  947,  947,  947,  947,  947,
+
+      947,  947,  947,  947,  947,  947,  947,  947,  948,  598,
+      948,  596,  593,  590,  948,  949,  589,  949,  582,  578,
+      577,  949,  950,  576,  950,  573,  570,  565,  950,  951,
+      560,  951,  952,  557,  952,  534,  530,  528,  952,  953,
+      526,  953,  954,  524,  954,  522,  520,  519,  954,  955,
+      518,  955,  956,  517,  956,  505,  502,  500,  956,  957,
+      499,  957,  958,  498,  958,  496,  494,  491,  958,  959,
+      489,  959,  960,  487,  960,  485,  480,  460,  960,  961,
+      458,  961,  962,  450,  962,  448,  440,  438,  962,  963,
+      436,  963,  964,  410,  964,  408,  964,  406,  964,  965,
+
+      404,  965,  403,  965,  402,  965,  966,  966,  389,  966,
+      966,  966,  386,  966,  967,  377,  967,  375,  374,  370,
+      967,  968,  368,  968,  366,  364,  360,  968,  969,  358,
+      969,  357,  356,  344,  969,  970,  327,  970,  971,  304,
+      971,  283,  281,  279,  971,  972,  278,  972,  973,  277,
+      973,  275,  274,  269,  973,  974,  265,  974,  975,  264,
+      975,  260,  257,  256,  975,  976,  245,  976,  977,  244,
+      237,  977,  236,  977,  977,  977,  977,  977,  978,  978,
+      978,  978,  978,  978,  978,  978,  978,  978,  978,  978,
+      978,  979,  233,  979,  223,  221,  220,  979,  980,  219,
+
+      980,  981,  213,  981,  212,  210,  205,  981,  982,  180,
+      982,  983,  151,  983,  149,  148,  142,  983,  984,  140,
+      984,  985,  138,  985,  130,  127,  126,  985,  986,  122,
+      986,  987,  103,  987,  100,   97,   95,  987,  988,   88,
+      988,  989,   74,  989,   72,   68,   36,  989,  990,   33,
+      990,  991,   18,  991,   11,    4,    3,  991,  992,    0,
+      992,    0,    0,    0,  992,  993,    0,  993,  994,    0,
+      994,    0,    0,    0,  994,  995,    0,  995,  996,    0,
+      996,    0,  996,    0,  996,  997,    0,  997,    0,    0,
+        0,  997,  998,    0,  998,    0,    0,    0,  998,  999,
+
+        0,  999, 1000,    0, 1000,    0,    0,    0, 1000, 1001,
+        0, 1001, 1002,    0, 1002,    0,    0,    0, 1002, 1003,
+        0, 1003, 1004,    0, 1004,    0,    0,    0, 1004, 1005,
+        0, 1005, 1006,    0, 1006,    0,    0,    0, 1006, 1007,
+        0, 1007, 1008,    0, 1008,    0,    0,    0, 1008, 1009,
+        0, 1009, 1010,    0,    0, 1010,    0, 1010, 1010, 1010,
+     1010, 1010, 1011, 1011, 1011, 1011, 1011, 1011, 1011, 1011,
+     1011, 1011, 1011, 1011, 1011, 1012,    0, 1012,    0,    0,
+        0, 1012, 1013,    0, 1013, 1014,    0, 1014,    0,    0,
+        0, 1014, 1015,    0, 1015, 1016,    0, 1016,    0,    0,
+
+        0, 1016, 1017,    0, 1017, 1018,    0, 1018,    0,    0,
+        0, 1018, 1019,    0, 1019, 1020,    0, 1020,    0,    0,
+        0, 1020, 1021,    0, 1021, 1022,    0, 1022,    0,    0,
+        0, 1022, 1023,    0, 1023, 1024,    0, 1024,    0,    0,
+        0, 1024, 1025,    0, 1025, 1026,    0, 1026,    0,    0,
+        0, 1026, 1027,    0, 1027, 1028,    0, 1028,    0,    0,
+        0, 1028, 1029,    0, 1029,    0,    0,    0, 1029, 1030,
+        0, 1030, 1031,    0, 1031,    0,    0,    0, 1031, 1032,
+        0, 1032, 1033,    0, 1033,    0,    0,    0, 1033, 1034,
+        0, 1034, 1035,    0, 1035,    0,    0,    0, 1035, 1036,
+
+        0, 1036, 1037,    0, 1037, 1038,    0, 1038, 1039,    0,
+        0, 1039,    0, 1039, 1039, 1039, 1039, 1039, 1040,    0,
+     1040, 1041, 1041, 1041, 1041, 1041, 1041, 1041, 1041, 1041,
+     1041, 1041, 1041, 1041, 1042,    0, 1042,    0,    0,    0,
+     1042, 1043,    0, 1043, 1044,    0, 1044,    0,    0,    0,
+     1044, 1045,    0, 1045, 1046,    0, 1046, 1047,    0, 1047,
+     1048,    0,    0, 1048,    0, 1048, 1048, 1048, 1048, 1048,
+     1049,    0, 1049, 1050,    0, 1050, 1051,    0, 1051, 1052,
+        0, 1052, 1053,    0, 1053, 1054,    0, 1054, 1055,    0,
+     1055, 1056,    0, 1056,    0,    0,    0, 1056, 1057,    0,
+
+     1057, 1058,    0, 1058,    0,    0,    0, 1058, 1059,    0,
      1059, 1060,    0, 1060, 1061,    0, 1061, 1062,    0, 1062,
-     1063,    0, 1063,    0,    0,    0, 1063, 1064,    0, 1064,
-        0,    0,    0, 1064, 1065,    0, 1065,    0,    0,    0,
-     1065, 1066,    0, 1066, 1067,    0, 1067,    0,    0,    0,
-     1067, 1068,    0, 1068,    0,    0,    0, 1068, 1069,    0,
-     1069,    0,    0,    0, 1069, 1070,    0, 1070,    0,    0,
-        0, 1070, 1071,    0, 1071,    0,    0,    0, 1071, 1072,
-
-        0, 1072,    0,    0,    0, 1072, 1073,    0, 1073,    0,
-        0,    0, 1073, 1074,    0, 1074,    0,    0,    0, 1074,
-     1075,    0, 1075,    0,    0,    0, 1075, 1076,    0, 1076,
-        0,    0,    0, 1076, 1077,    0, 1077,    0,    0,    0,
-     1077, 1078,    0, 1078,    0,    0,    0, 1078, 1079,    0,
-     1079,    0,    0,    0, 1079, 1080,    0, 1080,    0,    0,
-        0, 1080, 1081,    0, 1081,    0,    0,    0, 1081, 1082,
-        0, 1082,    0,    0,    0, 1082,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908,  908,  908,  908,  908,  908,  908,  908,  908,
-      908,  908
+     1063,    0, 1063,    0,    0,    0, 1063, 1064,    0,    0,
+     1064,    0, 1064, 1064, 1064, 1064, 1064, 1065,    0, 1065,
+     1066,    0, 1066, 1067,    0, 1067, 1068,    0, 1068,    0,
+        0,    0, 1068, 1069,    0, 1069,    0,    0,    0, 1069,
+     1070,    0, 1070,    0,    0,    0, 1070, 1071,    0, 1071,
+     1072,    0, 1072,    0,    0,    0, 1072, 1073,    0, 1073,
+        0,    0,    0, 1073, 1074,    0, 1074,    0,    0,    0,
+     1074, 1075,    0, 1075,    0,    0,    0, 1075, 1076,    0,
+
+     1076,    0,    0,    0, 1076, 1077,    0, 1077,    0,    0,
+        0, 1077, 1078,    0, 1078,    0,    0,    0, 1078, 1079,
+        0, 1079,    0,    0,    0, 1079, 1080,    0, 1080,    0,
+        0,    0, 1080, 1081,    0, 1081,    0,    0,    0, 1081,
+     1082,    0, 1082,    0,    0,    0, 1082, 1083,    0, 1083,
+        0,    0,    0, 1083, 1084,    0, 1084,    0,    0,    0,
+     1084, 1085,    0, 1085,    0,    0,    0, 1085, 1086,    0,
+     1086,    0,    0,    0, 1086, 1087,    0, 1087,    0,    0,
+        0, 1087,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  913,  913,  913
     } ;
 
 /* Table of booleans, true if rule could match eol. */
-static yyconst flex_int32_t yy_rule_can_match_eol[187] =
+static yyconst flex_int32_t yy_rule_can_match_eol[188] =
     {   0,
 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -1455 +1456 @@
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0,     };
+    0, 0, 0, 0, 0, 0, 0, 0,     };
 
 static yy_state_type yy_last_accepting_state;
@@ -1486 +1487 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Tue Nov 29 11:32:00 2016
- * Update Count     : 501
+ * Last Modified On : Fri Mar  3 22:18:00 2017
+ * Update Count     : 502
  */
 #line 20 "lex.ll"
@@ -1548 +1549 @@
 
 
-#line 1551 "Parser/lex.cc"
+#line 1552 "Parser/lex.cc"
 
 #define INITIAL 0
@@ -1743 +1744 @@
 
                                    /* line directives */
-#line 1746 "Parser/lex.cc"
+#line 1747 "Parser/lex.cc"
 
         if ( !(yy_init) )
@@ -1797 +1798 @@
                                 {
                                 yy_current_state = (int) yy_def[yy_current_state];
-                                if ( yy_current_state >= 909 )
+                                if ( yy_current_state >= 914 )
                                         yy_c = yy_meta[(unsigned int) yy_c];
                                 }
@@ -1803 +1804 @@
                         ++yy_cp;
                         }
-                while ( yy_base[yy_current_state] != 2877 );
+                while ( yy_base[yy_current_state] != 2883 );
 
 yy_find_action:
@@ -2209 +2210 @@
 YY_RULE_SETUP
 #line 237 "lex.ll"
+{ KEYWORD_RETURN(MUTEX); }                              // CFA
+        YY_BREAK
+case 70:
+YY_RULE_SETUP
+#line 238 "lex.ll"
 { KEYWORD_RETURN(NORETURN); }                   // C11
         YY_BREAK
-case 70:
-YY_RULE_SETUP
-#line 238 "lex.ll"
+case 71:
+YY_RULE_SETUP
+#line 239 "lex.ll"
 { KEYWORD_RETURN(OFFSETOF); }           // GCC
         YY_BREAK
-case 71:
-YY_RULE_SETUP
-#line 239 "lex.ll"
+case 72:
+YY_RULE_SETUP
+#line 240 "lex.ll"
 { NUMERIC_RETURN(ONE_T); }                              // CFA
         YY_BREAK
-case 72:
-YY_RULE_SETUP
-#line 240 "lex.ll"
+case 73:
+YY_RULE_SETUP
+#line 241 "lex.ll"
 { KEYWORD_RETURN(OTYPE); }                              // CFA
         YY_BREAK
-case 73:
-YY_RULE_SETUP
-#line 241 "lex.ll"
+case 74:
+YY_RULE_SETUP
+#line 242 "lex.ll"
 { KEYWORD_RETURN(REGISTER); }
         YY_BREAK
-case 74:
-YY_RULE_SETUP
-#line 242 "lex.ll"
+case 75:
+YY_RULE_SETUP
+#line 243 "lex.ll"
 { KEYWORD_RETURN(RESTRICT); }                   // C99
-        YY_BREAK
-case 75:
-YY_RULE_SETUP
-#line 243 "lex.ll"
-{ KEYWORD_RETURN(RESTRICT); }                   // GCC
         YY_BREAK
 case 76:
@@ -2249 +2250 @@
 YY_RULE_SETUP
 #line 245 "lex.ll"
+{ KEYWORD_RETURN(RESTRICT); }                   // GCC
+        YY_BREAK
+case 78:
+YY_RULE_SETUP
+#line 246 "lex.ll"
 { KEYWORD_RETURN(RETURN); }
         YY_BREAK
-case 78:
-YY_RULE_SETUP
-#line 246 "lex.ll"
+case 79:
+YY_RULE_SETUP
+#line 247 "lex.ll"
 { KEYWORD_RETURN(SHORT); }
         YY_BREAK
-case 79:
-YY_RULE_SETUP
-#line 247 "lex.ll"
+case 80:
+YY_RULE_SETUP
+#line 248 "lex.ll"
 { KEYWORD_RETURN(SIGNED); }
-        YY_BREAK
-case 80:
-YY_RULE_SETUP
-#line 248 "lex.ll"
-{ KEYWORD_RETURN(SIGNED); }                             // GCC
         YY_BREAK
 case 81:
@@ -2274 +2275 @@
 YY_RULE_SETUP
 #line 250 "lex.ll"
+{ KEYWORD_RETURN(SIGNED); }                             // GCC
+        YY_BREAK
+case 83:
+YY_RULE_SETUP
+#line 251 "lex.ll"
 { KEYWORD_RETURN(SIZEOF); }
         YY_BREAK
-case 83:
-YY_RULE_SETUP
-#line 251 "lex.ll"
+case 84:
+YY_RULE_SETUP
+#line 252 "lex.ll"
 { KEYWORD_RETURN(STATIC); }
         YY_BREAK
-case 84:
-YY_RULE_SETUP
-#line 252 "lex.ll"
+case 85:
+YY_RULE_SETUP
+#line 253 "lex.ll"
 { KEYWORD_RETURN(STATICASSERT); }               // C11
         YY_BREAK
-case 85:
-YY_RULE_SETUP
-#line 253 "lex.ll"
+case 86:
+YY_RULE_SETUP
+#line 254 "lex.ll"
 { KEYWORD_RETURN(STRUCT); }
         YY_BREAK
-case 86:
-YY_RULE_SETUP
-#line 254 "lex.ll"
+case 87:
+YY_RULE_SETUP
+#line 255 "lex.ll"
 { KEYWORD_RETURN(SWITCH); }
         YY_BREAK
-case 87:
-YY_RULE_SETUP
-#line 255 "lex.ll"
+case 88:
+YY_RULE_SETUP
+#line 256 "lex.ll"
 { KEYWORD_RETURN(THREADLOCAL); }                // C11
         YY_BREAK
-case 88:
-YY_RULE_SETUP
-#line 256 "lex.ll"
+case 89:
+YY_RULE_SETUP
+#line 257 "lex.ll"
 { KEYWORD_RETURN(THROW); }                              // CFA
         YY_BREAK
-case 89:
-YY_RULE_SETUP
-#line 257 "lex.ll"
+case 90:
+YY_RULE_SETUP
+#line 258 "lex.ll"
 { KEYWORD_RETURN(THROWRESUME); }                // CFA
         YY_BREAK
-case 90:
-YY_RULE_SETUP
-#line 258 "lex.ll"
+case 91:
+YY_RULE_SETUP
+#line 259 "lex.ll"
 { KEYWORD_RETURN(TRAIT); }                              // CFA
         YY_BREAK
-case 91:
-YY_RULE_SETUP
-#line 259 "lex.ll"
+case 92:
+YY_RULE_SETUP
+#line 260 "lex.ll"
 { KEYWORD_RETURN(TRY); }                                // CFA
         YY_BREAK
-case 92:
-YY_RULE_SETUP
-#line 260 "lex.ll"
+case 93:
+YY_RULE_SETUP
+#line 261 "lex.ll"
 { KEYWORD_RETURN(TTYPE); }                              // CFA
         YY_BREAK
-case 93:
-YY_RULE_SETUP
-#line 261 "lex.ll"
+case 94:
+YY_RULE_SETUP
+#line 262 "lex.ll"
 { KEYWORD_RETURN(TYPEDEF); }
-        YY_BREAK
-case 94:
-YY_RULE_SETUP
-#line 262 "lex.ll"
-{ KEYWORD_RETURN(TYPEOF); }                             // GCC
         YY_BREAK
 case 95:
@@ -2349 +2350 @@
 YY_RULE_SETUP
 #line 265 "lex.ll"
+{ KEYWORD_RETURN(TYPEOF); }                             // GCC
+        YY_BREAK
+case 98:
+YY_RULE_SETUP
+#line 266 "lex.ll"
 { KEYWORD_RETURN(UNION); }
         YY_BREAK
-case 98:
-YY_RULE_SETUP
-#line 266 "lex.ll"
+case 99:
+YY_RULE_SETUP
+#line 267 "lex.ll"
 { KEYWORD_RETURN(UNSIGNED); }
         YY_BREAK
-case 99:
-YY_RULE_SETUP
-#line 267 "lex.ll"
+case 100:
+YY_RULE_SETUP
+#line 268 "lex.ll"
 { KEYWORD_RETURN(VALIST); }                     // GCC
         YY_BREAK
-case 100:
-YY_RULE_SETUP
-#line 268 "lex.ll"
+case 101:
+YY_RULE_SETUP
+#line 269 "lex.ll"
 { KEYWORD_RETURN(VOID); }
         YY_BREAK
-case 101:
-YY_RULE_SETUP
-#line 269 "lex.ll"
+case 102:
+YY_RULE_SETUP
+#line 270 "lex.ll"
 { KEYWORD_RETURN(VOLATILE); }
-        YY_BREAK
-case 102:
-YY_RULE_SETUP
-#line 270 "lex.ll"
-{ KEYWORD_RETURN(VOLATILE); }                   // GCC
         YY_BREAK
 case 103:
@@ -2384 +2385 @@
 YY_RULE_SETUP
 #line 272 "lex.ll"
+{ KEYWORD_RETURN(VOLATILE); }                   // GCC
+        YY_BREAK
+case 105:
+YY_RULE_SETUP
+#line 273 "lex.ll"
 { KEYWORD_RETURN(WHILE); }
         YY_BREAK
-case 105:
-YY_RULE_SETUP
-#line 273 "lex.ll"
+case 106:
+YY_RULE_SETUP
+#line 274 "lex.ll"
 { NUMERIC_RETURN(ZERO_T); }                             // CFA
         YY_BREAK
 /* identifier */
-case 106:
-YY_RULE_SETUP
-#line 276 "lex.ll"
+case 107:
+YY_RULE_SETUP
+#line 277 "lex.ll"
 { IDENTIFIER_RETURN(); }
         YY_BREAK
-case 107:
-YY_RULE_SETUP
-#line 277 "lex.ll"
+case 108:
+YY_RULE_SETUP
+#line 278 "lex.ll"
 { ATTRIBUTE_RETURN(); }
         YY_BREAK
-case 108:
-YY_RULE_SETUP
-#line 278 "lex.ll"
+case 109:
+YY_RULE_SETUP
+#line 279 "lex.ll"
 { BEGIN BKQUOTE; }
         YY_BREAK
-case 109:
-YY_RULE_SETUP
-#line 279 "lex.ll"
+case 110:
+YY_RULE_SETUP
+#line 280 "lex.ll"
 { IDENTIFIER_RETURN(); }
         YY_BREAK
-case 110:
-YY_RULE_SETUP
-#line 280 "lex.ll"
+case 111:
+YY_RULE_SETUP
+#line 281 "lex.ll"
 { BEGIN 0; }
         YY_BREAK
 /* numeric constants */
-case 111:
-YY_RULE_SETUP
-#line 283 "lex.ll"
+case 112:
+YY_RULE_SETUP
+#line 284 "lex.ll"
 { NUMERIC_RETURN(ZERO); }                               // CFA
         YY_BREAK
-case 112:
-YY_RULE_SETUP
-#line 284 "lex.ll"
+case 113:
+YY_RULE_SETUP
+#line 285 "lex.ll"
 { NUMERIC_RETURN(ONE); }                                // CFA
-        YY_BREAK
-case 113:
-YY_RULE_SETUP
-#line 285 "lex.ll"
-{ NUMERIC_RETURN(INTEGERconstant); }
         YY_BREAK
 case 114:
@@ -2446 +2447 @@
 YY_RULE_SETUP
 #line 288 "lex.ll"
+{ NUMERIC_RETURN(INTEGERconstant); }
+        YY_BREAK
+case 117:
+YY_RULE_SETUP
+#line 289 "lex.ll"
 { NUMERIC_RETURN(REALDECIMALconstant); } // must appear before floating_constant
         YY_BREAK
-case 117:
-YY_RULE_SETUP
-#line 289 "lex.ll"
+case 118:
+YY_RULE_SETUP
+#line 290 "lex.ll"
 { NUMERIC_RETURN(REALFRACTIONconstant); } // must appear before floating_constant
-        YY_BREAK
-case 118:
-YY_RULE_SETUP
-#line 290 "lex.ll"
-{ NUMERIC_RETURN(FLOATINGconstant); }
         YY_BREAK
 case 119:
@@ -2463 +2464 @@
 { NUMERIC_RETURN(FLOATINGconstant); }
         YY_BREAK
+case 120:
+YY_RULE_SETUP
+#line 292 "lex.ll"
+{ NUMERIC_RETURN(FLOATINGconstant); }
+        YY_BREAK
 /* character constant, allows empty value */
-case 120:
-YY_RULE_SETUP
-#line 294 "lex.ll"
+case 121:
+YY_RULE_SETUP
+#line 295 "lex.ll"
 { BEGIN QUOTE; rm_underscore(); strtext = new std::string( yytext, yyleng ); }
         YY_BREAK
-case 121:
-YY_RULE_SETUP
-#line 295 "lex.ll"
+case 122:
+YY_RULE_SETUP
+#line 296 "lex.ll"
 { strtext->append( yytext, yyleng ); }
         YY_BREAK
-case 122:
-/* rule 122 can match eol */
-YY_RULE_SETUP
-#line 296 "lex.ll"
+case 123:
+/* rule 123 can match eol */
+YY_RULE_SETUP
+#line 297 "lex.ll"
 { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(CHARACTERconstant); }
         YY_BREAK
 /* ' stop highlighting */
 /* string constant */
-case 123:
-YY_RULE_SETUP
-#line 300 "lex.ll"
+case 124:
+YY_RULE_SETUP
+#line 301 "lex.ll"
 { BEGIN STRING; rm_underscore(); strtext = new std::string( yytext, yyleng ); }
         YY_BREAK
-case 124:
-YY_RULE_SETUP
-#line 301 "lex.ll"
+case 125:
+YY_RULE_SETUP
+#line 302 "lex.ll"
 { strtext->append( yytext, yyleng ); }
         YY_BREAK
-case 125:
-/* rule 125 can match eol */
-YY_RULE_SETUP
-#line 302 "lex.ll"
+case 126:
+/* rule 126 can match eol */
+YY_RULE_SETUP
+#line 303 "lex.ll"
 { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(STRINGliteral); }
         YY_BREAK
 /* " stop highlighting */
 /* common character/string constant */
-case 126:
-YY_RULE_SETUP
-#line 306 "lex.ll"
+case 127:
+YY_RULE_SETUP
+#line 307 "lex.ll"
 { rm_underscore(); strtext->append( yytext, yyleng ); }
         YY_BREAK
-case 127:
-/* rule 127 can match eol */
-YY_RULE_SETUP
-#line 307 "lex.ll"
+case 128:
+/* rule 128 can match eol */
+YY_RULE_SETUP
+#line 308 "lex.ll"
 {}                                              // continuation (ALSO HANDLED BY CPP)
         YY_BREAK
-case 128:
-YY_RULE_SETUP
-#line 308 "lex.ll"
+case 129:
+YY_RULE_SETUP
+#line 309 "lex.ll"
 { strtext->append( yytext, yyleng ); } // unknown escape character
         YY_BREAK
 /* punctuation */
-case 129:
-YY_RULE_SETUP
-#line 311 "lex.ll"
-{ ASCIIOP_RETURN(); }
-        YY_BREAK
 case 130:
 YY_RULE_SETUP
@@ -2550 +2551 @@
 YY_RULE_SETUP
 #line 317 "lex.ll"
+{ ASCIIOP_RETURN(); }
+        YY_BREAK
+case 136:
+YY_RULE_SETUP
+#line 318 "lex.ll"
 { ASCIIOP_RETURN(); }                                   // also operator
-        YY_BREAK
-case 136:
-YY_RULE_SETUP
-#line 318 "lex.ll"
-{ ASCIIOP_RETURN(); }
         YY_BREAK
 case 137:
@@ -2565 +2566 @@
 YY_RULE_SETUP
 #line 320 "lex.ll"
+{ ASCIIOP_RETURN(); }
+        YY_BREAK
+case 139:
+YY_RULE_SETUP
+#line 321 "lex.ll"
 { ASCIIOP_RETURN(); }                                   // also operator
         YY_BREAK
-case 139:
-YY_RULE_SETUP
-#line 321 "lex.ll"
+case 140:
+YY_RULE_SETUP
+#line 322 "lex.ll"
 { NAMEDOP_RETURN(ELLIPSIS); }
         YY_BREAK
 /* alternative C99 brackets, "<:" & "<:<:" handled by preprocessor */
-case 140:
-YY_RULE_SETUP
-#line 324 "lex.ll"
+case 141:
+YY_RULE_SETUP
+#line 325 "lex.ll"
 { RETURN_VAL('['); }
         YY_BREAK
-case 141:
-YY_RULE_SETUP
-#line 325 "lex.ll"
+case 142:
+YY_RULE_SETUP
+#line 326 "lex.ll"
 { RETURN_VAL(']'); }
         YY_BREAK
-case 142:
-YY_RULE_SETUP
-#line 326 "lex.ll"
+case 143:
+YY_RULE_SETUP
+#line 327 "lex.ll"
 { RETURN_VAL('{'); }
         YY_BREAK
-case 143:
-YY_RULE_SETUP
-#line 327 "lex.ll"
+case 144:
+YY_RULE_SETUP
+#line 328 "lex.ll"
 { RETURN_VAL('}'); }
         YY_BREAK
 /* operators */
-case 144:
-YY_RULE_SETUP
-#line 330 "lex.ll"
-{ ASCIIOP_RETURN(); }
-        YY_BREAK
 case 145:
 YY_RULE_SETUP
@@ -2666 +2667 @@
 case 158:
 YY_RULE_SETUP
-#line 345 "lex.ll"
+#line 344 "lex.ll"
+{ ASCIIOP_RETURN(); }
+        YY_BREAK
+case 159:
+YY_RULE_SETUP
+#line 346 "lex.ll"
 { NAMEDOP_RETURN(ICR); }
         YY_BREAK
-case 159:
-YY_RULE_SETUP
-#line 346 "lex.ll"
+case 160:
+YY_RULE_SETUP
+#line 347 "lex.ll"
 { NAMEDOP_RETURN(DECR); }
         YY_BREAK
-case 160:
-YY_RULE_SETUP
-#line 347 "lex.ll"
+case 161:
+YY_RULE_SETUP
+#line 348 "lex.ll"
 { NAMEDOP_RETURN(EQ); }
         YY_BREAK
-case 161:
-YY_RULE_SETUP
-#line 348 "lex.ll"
+case 162:
+YY_RULE_SETUP
+#line 349 "lex.ll"
 { NAMEDOP_RETURN(NE); }
         YY_BREAK
-case 162:
-YY_RULE_SETUP
-#line 349 "lex.ll"
+case 163:
+YY_RULE_SETUP
+#line 350 "lex.ll"
 { NAMEDOP_RETURN(LS); }
         YY_BREAK
-case 163:
-YY_RULE_SETUP
-#line 350 "lex.ll"
+case 164:
+YY_RULE_SETUP
+#line 351 "lex.ll"
 { NAMEDOP_RETURN(RS); }
         YY_BREAK
-case 164:
-YY_RULE_SETUP
-#line 351 "lex.ll"
+case 165:
+YY_RULE_SETUP
+#line 352 "lex.ll"
 { NAMEDOP_RETURN(LE); }
         YY_BREAK
-case 165:
-YY_RULE_SETUP
-#line 352 "lex.ll"
+case 166:
+YY_RULE_SETUP
+#line 353 "lex.ll"
 { NAMEDOP_RETURN(GE); }
         YY_BREAK
-case 166:
-YY_RULE_SETUP
-#line 353 "lex.ll"
+case 167:
+YY_RULE_SETUP
+#line 354 "lex.ll"
 { NAMEDOP_RETURN(ANDAND); }
         YY_BREAK
-case 167:
-YY_RULE_SETUP
-#line 354 "lex.ll"
+case 168:
+YY_RULE_SETUP
+#line 355 "lex.ll"
 { NAMEDOP_RETURN(OROR); }
         YY_BREAK
-case 168:
-YY_RULE_SETUP
-#line 355 "lex.ll"
+case 169:
+YY_RULE_SETUP
+#line 356 "lex.ll"
 { NAMEDOP_RETURN(ARROW); }
         YY_BREAK
-case 169:
-YY_RULE_SETUP
-#line 356 "lex.ll"
+case 170:
+YY_RULE_SETUP
+#line 357 "lex.ll"
 { NAMEDOP_RETURN(PLUSassign); }
         YY_BREAK
-case 170:
-YY_RULE_SETUP
-#line 357 "lex.ll"
+case 171:
+YY_RULE_SETUP
+#line 358 "lex.ll"
 { NAMEDOP_RETURN(MINUSassign); }
         YY_BREAK
-case 171:
-YY_RULE_SETUP
-#line 358 "lex.ll"
+case 172:
+YY_RULE_SETUP
+#line 359 "lex.ll"
 { NAMEDOP_RETURN(MULTassign); }
         YY_BREAK
-case 172:
-YY_RULE_SETUP
-#line 359 "lex.ll"
+case 173:
+YY_RULE_SETUP
+#line 360 "lex.ll"
 { NAMEDOP_RETURN(DIVassign); }
         YY_BREAK
-case 173:
-YY_RULE_SETUP
-#line 360 "lex.ll"
+case 174:
+YY_RULE_SETUP
+#line 361 "lex.ll"
 { NAMEDOP_RETURN(MODassign); }
         YY_BREAK
-case 174:
-YY_RULE_SETUP
-#line 361 "lex.ll"
+case 175:
+YY_RULE_SETUP
+#line 362 "lex.ll"
 { NAMEDOP_RETURN(ANDassign); }
         YY_BREAK
-case 175:
-YY_RULE_SETUP
-#line 362 "lex.ll"
+case 176:
+YY_RULE_SETUP
+#line 363 "lex.ll"
 { NAMEDOP_RETURN(ORassign); }
         YY_BREAK
-case 176:
-YY_RULE_SETUP
-#line 363 "lex.ll"
+case 177:
+YY_RULE_SETUP
+#line 364 "lex.ll"
 { NAMEDOP_RETURN(ERassign); }
         YY_BREAK
-case 177:
-YY_RULE_SETUP
-#line 364 "lex.ll"
+case 178:
+YY_RULE_SETUP
+#line 365 "lex.ll"
 { NAMEDOP_RETURN(LSassign); }
         YY_BREAK
-case 178:
-YY_RULE_SETUP
-#line 365 "lex.ll"
+case 179:
+YY_RULE_SETUP
+#line 366 "lex.ll"
 { NAMEDOP_RETURN(RSassign); }
         YY_BREAK
-case 179:
-YY_RULE_SETUP
-#line 367 "lex.ll"
+case 180:
+YY_RULE_SETUP
+#line 368 "lex.ll"
 { NAMEDOP_RETURN(ATassign); }                   // CFA
         YY_BREAK
 /* CFA, operator identifier */
-case 180:
-YY_RULE_SETUP
-#line 370 "lex.ll"
+case 181:
+YY_RULE_SETUP
+#line 371 "lex.ll"
 { IDENTIFIER_RETURN(); }                                // unary
-        YY_BREAK
-case 181:
-YY_RULE_SETUP
-#line 371 "lex.ll"
-{ IDENTIFIER_RETURN(); }
         YY_BREAK
 case 182:
@@ -2793 +2794 @@
 YY_RULE_SETUP
 #line 373 "lex.ll"
+{ IDENTIFIER_RETURN(); }
+        YY_BREAK
+case 184:
+YY_RULE_SETUP
+#line 374 "lex.ll"
 { IDENTIFIER_RETURN(); }                // binary
         YY_BREAK
@@ -2821 +2827 @@
           an argument list.
         */
-case 184:
-YY_RULE_SETUP
-#line 400 "lex.ll"
+case 185:
+YY_RULE_SETUP
+#line 401 "lex.ll"
 {
         // 1 or 2 character unary operator ?
@@ -2836 +2842 @@
         YY_BREAK
 /* unknown characters */
-case 185:
-YY_RULE_SETUP
-#line 412 "lex.ll"
+case 186:
+YY_RULE_SETUP
+#line 413 "lex.ll"
 { printf("unknown character(s):\"%s\" on line %d\n", yytext, yylineno); }
         YY_BREAK
-case 186:
-YY_RULE_SETUP
-#line 414 "lex.ll"
+case 187:
+YY_RULE_SETUP
+#line 415 "lex.ll"
 ECHO;
         YY_BREAK
-#line 2849 "Parser/lex.cc"
+#line 2855 "Parser/lex.cc"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(COMMENT):
@@ -3143 +3149 @@
                         {
                         yy_current_state = (int) yy_def[yy_current_state];
-                        if ( yy_current_state >= 909 )
+                        if ( yy_current_state >= 914 )
                                 yy_c = yy_meta[(unsigned int) yy_c];
                         }
@@ -3171 +3177 @@
                 {
                 yy_current_state = (int) yy_def[yy_current_state];
-                if ( yy_current_state >= 909 )
+                if ( yy_current_state >= 914 )
                         yy_c = yy_meta[(unsigned int) yy_c];
                 }
         yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-        yy_is_jam = (yy_current_state == 908);
+        yy_is_jam = (yy_current_state == 913);
 
         return yy_is_jam ? 0 : yy_current_state;
@@ -3821 +3827 @@
 #define YYTABLES_NAME "yytables"
 
-#line 414 "lex.ll"
+#line 415 "lex.ll"
 
 

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Tue Nov 29 11:32:00 2016
- * Update Count     : 501
+ * Last Modified On : Fri Mar  3 22:18:00 2017
+ * Update Count     : 502
  */
 
@@ -235 +235 @@
 long                    { KEYWORD_RETURN(LONG); }
 lvalue                  { KEYWORD_RETURN(LVALUE); }                             // CFA
+mutex                   { KEYWORD_RETURN(MUTEX); }                              // CFA
 _Noreturn               { KEYWORD_RETURN(NORETURN); }                   // C11
 __builtin_offsetof { KEYWORD_RETURN(OFFSETOF); }                // GCC

src/Parser/parser.cc

@@ -144 +144 @@
    enum yytokentype {
      TYPEDEF = 258,
-     AUTO = 259,
-     EXTERN = 260,
-     REGISTER = 261,
-     STATIC = 262,
-     INLINE = 263,
-     FORTRAN = 264,
-     CONST = 265,
-     VOLATILE = 266,
-     RESTRICT = 267,
-     FORALL = 268,
-     LVALUE = 269,
-     VOID = 270,
-     CHAR = 271,
-     SHORT = 272,
-     INT = 273,
-     LONG = 274,
-     FLOAT = 275,
-     DOUBLE = 276,
-     SIGNED = 277,
-     UNSIGNED = 278,
-     ZERO_T = 279,
-     ONE_T = 280,
-     VALIST = 281,
-     BOOL = 282,
-     COMPLEX = 283,
-     IMAGINARY = 284,
-     TYPEOF = 285,
-     LABEL = 286,
-     ENUM = 287,
-     STRUCT = 288,
-     UNION = 289,
-     OTYPE = 290,
-     FTYPE = 291,
-     DTYPE = 292,
-     TTYPE = 293,
-     TRAIT = 294,
-     SIZEOF = 295,
-     OFFSETOF = 296,
-     ATTRIBUTE = 297,
-     EXTENSION = 298,
-     IF = 299,
-     ELSE = 300,
-     SWITCH = 301,
-     CASE = 302,
-     DEFAULT = 303,
-     DO = 304,
-     WHILE = 305,
-     FOR = 306,
-     BREAK = 307,
-     CONTINUE = 308,
-     GOTO = 309,
-     RETURN = 310,
-     CHOOSE = 311,
-     DISABLE = 312,
-     ENABLE = 313,
-     FALLTHRU = 314,
-     TRY = 315,
-     CATCH = 316,
-     CATCHRESUME = 317,
-     FINALLY = 318,
-     THROW = 319,
-     THROWRESUME = 320,
-     AT = 321,
-     ASM = 322,
-     ALIGNAS = 323,
-     ALIGNOF = 324,
-     ATOMIC = 325,
-     GENERIC = 326,
-     NORETURN = 327,
-     STATICASSERT = 328,
-     THREADLOCAL = 329,
-     IDENTIFIER = 330,
-     QUOTED_IDENTIFIER = 331,
-     TYPEDEFname = 332,
-     TYPEGENname = 333,
-     ATTR_IDENTIFIER = 334,
-     ATTR_TYPEDEFname = 335,
-     ATTR_TYPEGENname = 336,
-     INTEGERconstant = 337,
-     CHARACTERconstant = 338,
-     STRINGliteral = 339,
-     REALDECIMALconstant = 340,
-     REALFRACTIONconstant = 341,
-     FLOATINGconstant = 342,
-     ZERO = 343,
-     ONE = 344,
-     ARROW = 345,
-     ICR = 346,
-     DECR = 347,
-     LS = 348,
-     RS = 349,
-     LE = 350,
-     GE = 351,
-     EQ = 352,
-     NE = 353,
-     ANDAND = 354,
-     OROR = 355,
-     ELLIPSIS = 356,
-     MULTassign = 357,
-     DIVassign = 358,
-     MODassign = 359,
-     PLUSassign = 360,
-     MINUSassign = 361,
-     LSassign = 362,
-     RSassign = 363,
-     ANDassign = 364,
-     ERassign = 365,
-     ORassign = 366,
-     ATassign = 367,
-     THEN = 368
+     EXTERN = 259,
+     STATIC = 260,
+     AUTO = 261,
+     REGISTER = 262,
+     THREADLOCAL = 263,
+     INLINE = 264,
+     FORTRAN = 265,
+     NORETURN = 266,
+     CONST = 267,
+     VOLATILE = 268,
+     RESTRICT = 269,
+     ATOMIC = 270,
+     FORALL = 271,
+     LVALUE = 272,
+     MUTEX = 273,
+     VOID = 274,
+     CHAR = 275,
+     SHORT = 276,
+     INT = 277,
+     LONG = 278,
+     FLOAT = 279,
+     DOUBLE = 280,
+     SIGNED = 281,
+     UNSIGNED = 282,
+     ZERO_T = 283,
+     ONE_T = 284,
+     VALIST = 285,
+     BOOL = 286,
+     COMPLEX = 287,
+     IMAGINARY = 288,
+     TYPEOF = 289,
+     LABEL = 290,
+     ENUM = 291,
+     STRUCT = 292,
+     UNION = 293,
+     OTYPE = 294,
+     FTYPE = 295,
+     DTYPE = 296,
+     TTYPE = 297,
+     TRAIT = 298,
+     SIZEOF = 299,
+     OFFSETOF = 300,
+     ATTRIBUTE = 301,
+     EXTENSION = 302,
+     IF = 303,
+     ELSE = 304,
+     SWITCH = 305,
+     CASE = 306,
+     DEFAULT = 307,
+     DO = 308,
+     WHILE = 309,
+     FOR = 310,
+     BREAK = 311,
+     CONTINUE = 312,
+     GOTO = 313,
+     RETURN = 314,
+     CHOOSE = 315,
+     DISABLE = 316,
+     ENABLE = 317,
+     FALLTHRU = 318,
+     TRY = 319,
+     CATCH = 320,
+     CATCHRESUME = 321,
+     FINALLY = 322,
+     THROW = 323,
+     THROWRESUME = 324,
+     AT = 325,
+     ASM = 326,
+     ALIGNAS = 327,
+     ALIGNOF = 328,
+     GENERIC = 329,
+     STATICASSERT = 330,
+     IDENTIFIER = 331,
+     QUOTED_IDENTIFIER = 332,
+     TYPEDEFname = 333,
+     TYPEGENname = 334,
+     ATTR_IDENTIFIER = 335,
+     ATTR_TYPEDEFname = 336,
+     ATTR_TYPEGENname = 337,
+     INTEGERconstant = 338,
+     CHARACTERconstant = 339,
+     STRINGliteral = 340,
+     REALDECIMALconstant = 341,
+     REALFRACTIONconstant = 342,
+     FLOATINGconstant = 343,
+     ZERO = 344,
+     ONE = 345,
+     ARROW = 346,
+     ICR = 347,
+     DECR = 348,
+     LS = 349,
+     RS = 350,
+     LE = 351,
+     GE = 352,
+     EQ = 353,
+     NE = 354,
+     ANDAND = 355,
+     OROR = 356,
+     ELLIPSIS = 357,
+     MULTassign = 358,
+     DIVassign = 359,
+     MODassign = 360,
+     PLUSassign = 361,
+     MINUSassign = 362,
+     LSassign = 363,
+     RSassign = 364,
+     ANDassign = 365,
+     ERassign = 366,
+     ORassign = 367,
+     ATassign = 368,
+     THEN = 369
    };
 #endif
 /* Tokens.  */
 #define TYPEDEF 258
-#define AUTO 259
-#define EXTERN 260
-#define REGISTER 261
-#define STATIC 262
-#define INLINE 263
-#define FORTRAN 264
-#define CONST 265
-#define VOLATILE 266
-#define RESTRICT 267
-#define FORALL 268
-#define LVALUE 269
-#define VOID 270
-#define CHAR 271
-#define SHORT 272
-#define INT 273
-#define LONG 274
-#define FLOAT 275
-#define DOUBLE 276
-#define SIGNED 277
-#define UNSIGNED 278
-#define ZERO_T 279
-#define ONE_T 280
-#define VALIST 281
-#define BOOL 282
-#define COMPLEX 283
-#define IMAGINARY 284
-#define TYPEOF 285
-#define LABEL 286
-#define ENUM 287
-#define STRUCT 288
-#define UNION 289
-#define OTYPE 290
-#define FTYPE 291
-#define DTYPE 292
-#define TTYPE 293
-#define TRAIT 294
-#define SIZEOF 295
-#define OFFSETOF 296
-#define ATTRIBUTE 297
-#define EXTENSION 298
-#define IF 299
-#define ELSE 300
-#define SWITCH 301
-#define CASE 302
-#define DEFAULT 303
-#define DO 304
-#define WHILE 305
-#define FOR 306
-#define BREAK 307
-#define CONTINUE 308
-#define GOTO 309
-#define RETURN 310
-#define CHOOSE 311
-#define DISABLE 312
-#define ENABLE 313
-#define FALLTHRU 314
-#define TRY 315
-#define CATCH 316
-#define CATCHRESUME 317
-#define FINALLY 318
-#define THROW 319
-#define THROWRESUME 320
-#define AT 321
-#define ASM 322
-#define ALIGNAS 323
-#define ALIGNOF 324
-#define ATOMIC 325
-#define GENERIC 326
-#define NORETURN 327
-#define STATICASSERT 328
-#define THREADLOCAL 329
-#define IDENTIFIER 330
-#define QUOTED_IDENTIFIER 331
-#define TYPEDEFname 332
-#define TYPEGENname 333
-#define ATTR_IDENTIFIER 334
-#define ATTR_TYPEDEFname 335
-#define ATTR_TYPEGENname 336
-#define INTEGERconstant 337
-#define CHARACTERconstant 338
-#define STRINGliteral 339
-#define REALDECIMALconstant 340
-#define REALFRACTIONconstant 341
-#define FLOATINGconstant 342
-#define ZERO 343
-#define ONE 344
-#define ARROW 345
-#define ICR 346
-#define DECR 347
-#define LS 348
-#define RS 349
-#define LE 350
-#define GE 351
-#define EQ 352
-#define NE 353
-#define ANDAND 354
-#define OROR 355
-#define ELLIPSIS 356
-#define MULTassign 357
-#define DIVassign 358
-#define MODassign 359
-#define PLUSassign 360
-#define MINUSassign 361
-#define LSassign 362
-#define RSassign 363
-#define ANDassign 364
-#define ERassign 365
-#define ORassign 366
-#define ATassign 367
-#define THEN 368
+#define EXTERN 259
+#define STATIC 260
+#define AUTO 261
+#define REGISTER 262
+#define THREADLOCAL 263
+#define INLINE 264
+#define FORTRAN 265
+#define NORETURN 266
+#define CONST 267
+#define VOLATILE 268
+#define RESTRICT 269
+#define ATOMIC 270
+#define FORALL 271
+#define LVALUE 272
+#define MUTEX 273
+#define VOID 274
+#define CHAR 275
+#define SHORT 276
+#define INT 277
+#define LONG 278
+#define FLOAT 279
+#define DOUBLE 280
+#define SIGNED 281
+#define UNSIGNED 282
+#define ZERO_T 283
+#define ONE_T 284
+#define VALIST 285
+#define BOOL 286
+#define COMPLEX 287
+#define IMAGINARY 288
+#define TYPEOF 289
+#define LABEL 290
+#define ENUM 291
+#define STRUCT 292
+#define UNION 293
+#define OTYPE 294
+#define FTYPE 295
+#define DTYPE 296
+#define TTYPE 297
+#define TRAIT 298
+#define SIZEOF 299
+#define OFFSETOF 300
+#define ATTRIBUTE 301
+#define EXTENSION 302
+#define IF 303
+#define ELSE 304
+#define SWITCH 305
+#define CASE 306
+#define DEFAULT 307
+#define DO 308
+#define WHILE 309
+#define FOR 310
+#define BREAK 311
+#define CONTINUE 312
+#define GOTO 313
+#define RETURN 314
+#define CHOOSE 315
+#define DISABLE 316
+#define ENABLE 317
+#define FALLTHRU 318
+#define TRY 319
+#define CATCH 320
+#define CATCHRESUME 321
+#define FINALLY 322
+#define THROW 323
+#define THROWRESUME 324
+#define AT 325
+#define ASM 326
+#define ALIGNAS 327
+#define ALIGNOF 328
+#define GENERIC 329
+#define STATICASSERT 330
+#define IDENTIFIER 331
+#define QUOTED_IDENTIFIER 332
+#define TYPEDEFname 333
+#define TYPEGENname 334
+#define ATTR_IDENTIFIER 335
+#define ATTR_TYPEDEFname 336
+#define ATTR_TYPEGENname 337
+#define INTEGERconstant 338
+#define CHARACTERconstant 339
+#define STRINGliteral 340
+#define REALDECIMALconstant 341
+#define REALFRACTIONconstant 342
+#define FLOATINGconstant 343
+#define ZERO 344
+#define ONE 345
+#define ARROW 346
+#define ICR 347
+#define DECR 348
+#define LS 349
+#define RS 350
+#define LE 351
+#define GE 352
+#define EQ 353
+#define NE 354
+#define ANDAND 355
+#define OROR 356
+#define ELLIPSIS 357
+#define MULTassign 358
+#define DIVassign 359
+#define MODassign 360
+#define PLUSassign 361
+#define MINUSassign 362
+#define LSassign 363
+#define RSassign 364
+#define ANDassign 365
+#define ERassign 366
+#define ORassign 367
+#define ATassign 368
+#define THEN 369
 
 
@@ -377 +379 @@
 
 /* Line 293 of yacc.c  */
-#line 139 "parser.yy"
+#line 141 "parser.yy"
 
         Token tok;
@@ -397 +399 @@
 
 /* Line 293 of yacc.c  */
-#line 400 "Parser/parser.cc"
+#line 402 "Parser/parser.cc"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
@@ -409 +411 @@
 
 /* Line 343 of yacc.c  */
-#line 412 "Parser/parser.cc"
+#line 414 "Parser/parser.cc"
 
 #ifdef short
@@ -626 +628 @@
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  240
+#define YYFINAL  241
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   11898
+#define YYLAST   11830
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  138
+#define YYNTOKENS  139
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  249
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  775
+#define YYNRULES  776
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  1582
+#define YYNSTATES  1583
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   368
+#define YYMAXUTOK   369
 
 #define YYTRANSLATE(YYX)                                                \
@@ -652 +654 @@
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   126,     2,     2,     2,   129,   123,     2,
-     114,   115,   122,   124,   121,   125,   118,   128,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,   135,   137,
-     130,   136,   131,   134,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,   127,     2,     2,     2,   130,   124,     2,
+     115,   116,   123,   125,   122,   126,   119,   129,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,   136,   138,
+     131,   137,   132,   135,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   116,     2,   117,   132,     2,     2,     2,     2,     2,
+       2,   117,     2,   118,   133,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   119,   133,   120,   127,     2,     2,     2,
+       2,     2,     2,   120,   134,   121,   128,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -685 +687 @@
       85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
       95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114
 };
 
@@ -724 +726 @@
     1076,  1083,  1085,  1087,  1089,  1091,  1093,  1095,  1097,  1099,
     1101,  1103,  1105,  1107,  1109,  1111,  1113,  1115,  1116,  1118,
-    1120,  1123,  1125,  1127,  1129,  1131,  1133,  1135,  1137,  1138,
-    1144,  1146,  1149,  1153,  1155,  1158,  1160,  1162,  1164,  1166,
+    1120,  1123,  1125,  1127,  1129,  1131,  1133,  1135,  1137,  1139,
+    1140,  1146,  1148,  1151,  1155,  1157,  1160,  1162,  1164,  1166,
     1168,  1170,  1172,  1174,  1176,  1178,  1180,  1182,  1184,  1186,
     1188,  1190,  1192,  1194,  1196,  1198,  1200,  1202,  1204,  1206,
-    1209,  1212,  1216,  1220,  1222,  1226,  1228,  1231,  1234,  1237,
-    1242,  1247,  1252,  1257,  1259,  1262,  1265,  1269,  1271,  1274,
-    1277,  1279,  1282,  1285,  1289,  1291,  1294,  1297,  1299,  1302,
-    1305,  1309,  1311,  1314,  1317,  1319,  1321,  1323,  1325,  1331,
-    1332,  1340,  1349,  1351,  1355,  1359,  1361,  1363,  1364,  1367,
-    1370,  1374,  1378,  1383,  1385,  1388,  1392,  1395,  1397,  1402,
-    1403,  1405,  1408,  1411,  1413,  1414,  1416,  1419,  1426,  1427,
-    1436,  1438,  1442,  1445,  1450,  1451,  1454,  1455,  1457,  1459,
-    1461,  1467,  1473,  1479,  1481,  1487,  1493,  1503,  1505,  1511,
-    1512,  1514,  1516,  1522,  1524,  1526,  1532,  1538,  1540,  1544,
-    1548,  1553,  1555,  1557,  1559,  1561,  1564,  1566,  1570,  1574,
-    1577,  1581,  1583,  1587,  1589,  1591,  1593,  1595,  1597,  1599,
-    1601,  1603,  1605,  1607,  1609,  1612,  1614,  1616,  1617,  1620,
-    1623,  1625,  1630,  1631,  1633,  1636,  1640,  1645,  1648,  1651,
-    1653,  1656,  1659,  1665,  1671,  1679,  1686,  1688,  1691,  1694,
-    1698,  1700,  1703,  1706,  1711,  1714,  1719,  1720,  1725,  1728,
-    1730,  1732,  1734,  1736,  1737,  1740,  1746,  1752,  1766,  1768,
-    1770,  1774,  1778,  1781,  1785,  1789,  1792,  1797,  1799,  1806,
-    1816,  1817,  1829,  1831,  1835,  1839,  1843,  1845,  1847,  1853,
-    1856,  1862,  1863,  1865,  1867,  1871,  1872,  1874,  1876,  1878,
-    1884,  1885,  1892,  1895,  1897,  1900,  1905,  1908,  1912,  1916,
-    1920,  1925,  1931,  1937,  1943,  1950,  1952,  1954,  1956,  1960,
-    1961,  1967,  1968,  1970,  1972,  1975,  1982,  1984,  1988,  1989,
-    1991,  1996,  1998,  2000,  2002,  2004,  2007,  2009,  2012,  2015,
-    2017,  2021,  2024,  2028,  2033,  2036,  2041,  2046,  2050,  2059,
-    2063,  2066,  2068,  2071,  2078,  2087,  2091,  2094,  2098,  2102,
-    2107,  2112,  2116,  2118,  2120,  2122,  2127,  2136,  2140,  2143,
-    2147,  2151,  2156,  2161,  2165,  2168,  2170,  2173,  2176,  2178,
-    2182,  2185,  2189,  2194,  2197,  2202,  2207,  2211,  2218,  2227,
-    2231,  2234,  2236,  2239,  2242,  2245,  2249,  2254,  2257,  2262,
-    2267,  2271,  2278,  2287,  2291,  2294,  2296,  2299,  2302,  2304,
-    2306,  2309,  2313,  2318,  2321,  2326,  2333,  2342,  2344,  2347,
-    2350,  2352,  2355,  2358,  2362,  2367,  2369,  2374,  2379,  2383,
-    2389,  2398,  2402,  2405,  2409,  2411,  2417,  2423,  2430,  2437,
-    2439,  2442,  2445,  2447,  2450,  2453,  2457,  2462,  2464,  2469,
-    2474,  2478,  2484,  2493,  2497,  2499,  2502,  2504,  2507,  2514,
-    2520,  2527,  2535,  2543,  2545,  2548,  2551,  2553,  2556,  2559,
-    2563,  2568,  2570,  2575,  2580,  2584,  2593,  2597,  2599,  2601,
-    2604,  2606,  2608,  2611,  2615,  2618,  2622,  2625,  2629,  2633,
-    2636,  2641,  2645,  2648,  2652,  2655,  2660,  2664,  2667,  2674,
-    2681,  2688,  2696,  2698,  2701,  2703,  2705,  2707,  2710,  2714,
-    2717,  2721,  2724,  2728,  2732,  2737,  2740,  2744,  2749,  2752,
-    2758,  2765,  2772,  2773,  2775,  2776
+    1208,  1211,  1214,  1218,  1222,  1224,  1228,  1230,  1233,  1236,
+    1239,  1244,  1249,  1254,  1259,  1261,  1264,  1267,  1271,  1273,
+    1276,  1279,  1281,  1284,  1287,  1291,  1293,  1296,  1299,  1301,
+    1304,  1307,  1311,  1313,  1316,  1319,  1321,  1323,  1325,  1327,
+    1333,  1334,  1342,  1351,  1353,  1357,  1361,  1363,  1365,  1366,
+    1369,  1372,  1376,  1380,  1385,  1387,  1390,  1394,  1397,  1399,
+    1404,  1405,  1407,  1410,  1413,  1415,  1416,  1418,  1421,  1428,
+    1429,  1438,  1440,  1444,  1447,  1452,  1453,  1456,  1457,  1459,
+    1461,  1463,  1469,  1475,  1481,  1483,  1489,  1495,  1505,  1507,
+    1513,  1514,  1516,  1518,  1524,  1526,  1528,  1534,  1540,  1542,
+    1546,  1550,  1555,  1557,  1559,  1561,  1563,  1566,  1568,  1572,
+    1576,  1579,  1583,  1585,  1589,  1591,  1593,  1595,  1597,  1599,
+    1601,  1603,  1605,  1607,  1609,  1611,  1614,  1616,  1618,  1619,
+    1622,  1625,  1627,  1632,  1633,  1635,  1638,  1642,  1647,  1650,
+    1653,  1655,  1658,  1661,  1667,  1673,  1681,  1688,  1690,  1693,
+    1696,  1700,  1702,  1705,  1708,  1713,  1716,  1721,  1722,  1727,
+    1730,  1732,  1734,  1736,  1738,  1739,  1742,  1748,  1754,  1768,
+    1770,  1772,  1776,  1780,  1783,  1787,  1791,  1794,  1799,  1801,
+    1808,  1818,  1819,  1831,  1833,  1837,  1841,  1845,  1847,  1849,
+    1855,  1858,  1864,  1865,  1867,  1869,  1873,  1874,  1876,  1878,
+    1880,  1886,  1887,  1894,  1897,  1899,  1902,  1907,  1910,  1914,
+    1918,  1922,  1927,  1933,  1939,  1945,  1952,  1954,  1956,  1958,
+    1962,  1963,  1969,  1970,  1972,  1974,  1977,  1984,  1986,  1990,
+    1991,  1993,  1998,  2000,  2002,  2004,  2006,  2009,  2011,  2014,
+    2017,  2019,  2023,  2026,  2030,  2035,  2038,  2043,  2048,  2052,
+    2061,  2065,  2068,  2070,  2073,  2080,  2089,  2093,  2096,  2100,
+    2104,  2109,  2114,  2118,  2120,  2122,  2124,  2129,  2138,  2142,
+    2145,  2149,  2153,  2158,  2163,  2167,  2170,  2172,  2175,  2178,
+    2180,  2184,  2187,  2191,  2196,  2199,  2204,  2209,  2213,  2220,
+    2229,  2233,  2236,  2238,  2241,  2244,  2247,  2251,  2256,  2259,
+    2264,  2269,  2273,  2280,  2289,  2293,  2296,  2298,  2301,  2304,
+    2306,  2308,  2311,  2315,  2320,  2323,  2328,  2335,  2344,  2346,
+    2349,  2352,  2354,  2357,  2360,  2364,  2369,  2371,  2376,  2381,
+    2385,  2391,  2400,  2404,  2407,  2411,  2413,  2419,  2425,  2432,
+    2439,  2441,  2444,  2447,  2449,  2452,  2455,  2459,  2464,  2466,
+    2471,  2476,  2480,  2486,  2495,  2499,  2501,  2504,  2506,  2509,
+    2516,  2522,  2529,  2537,  2545,  2547,  2550,  2553,  2555,  2558,
+    2561,  2565,  2570,  2572,  2577,  2582,  2586,  2595,  2599,  2601,
+    2603,  2606,  2608,  2610,  2613,  2617,  2620,  2624,  2627,  2631,
+    2635,  2638,  2643,  2647,  2650,  2654,  2657,  2662,  2666,  2669,
+    2676,  2683,  2690,  2698,  2700,  2703,  2705,  2707,  2709,  2712,
+    2716,  2719,  2723,  2726,  2730,  2734,  2739,  2742,  2746,  2751,
+    2754,  2760,  2767,  2774,  2775,  2777,  2778
 };
 
@@ -776 +778 @@
 static const yytype_int16 yyrhs[] =
 {
-     315,     0,    -1,    -1,    -1,    82,    -1,    85,    -1,    86,
-      -1,    87,    -1,    83,    -1,    75,    -1,    79,    -1,   145,
-      -1,    75,    -1,    79,    -1,    75,    -1,   145,    -1,    88,
-      -1,    89,    -1,   147,    -1,    84,    -1,   147,    84,    -1,
-      75,    -1,   145,    -1,   175,    -1,   114,   177,   115,    -1,
-     114,   181,   115,    -1,   148,    -1,   149,   116,   139,   172,
-     140,   117,    -1,   149,   114,   150,   115,    -1,   149,   118,
-     144,    -1,   149,   118,   116,   139,   152,   140,   117,    -1,
-     149,    86,    -1,   149,    90,   144,    -1,   149,    90,   116,
-     139,   152,   140,   117,    -1,   149,    91,    -1,   149,    92,
-      -1,   114,   288,   115,   119,   292,   385,   120,    -1,   149,
-     119,   150,   120,    -1,   151,    -1,   150,   121,   151,    -1,
-      -1,   172,    -1,   153,    -1,   152,   121,   153,    -1,   154,
-      -1,    85,   153,    -1,    85,   116,   139,   152,   140,   117,
-      -1,   154,   118,   153,    -1,   154,   118,   116,   139,   152,
-     140,   117,    -1,   154,    90,   153,    -1,   154,    90,   116,
-     139,   152,   140,   117,    -1,    82,   155,    -1,    87,   155,
-      -1,   144,   155,    -1,    -1,   155,    86,    -1,   149,    -1,
-     141,    -1,   146,    -1,    43,   159,    -1,   157,   159,    -1,
-     158,   159,    -1,    91,   156,    -1,    92,   156,    -1,    40,
-     156,    -1,    40,   114,   288,   115,    -1,    69,   156,    -1,
-      69,   114,   288,   115,    -1,    41,   114,   288,   121,   144,
-     115,    -1,    79,    -1,    79,   114,   151,   115,    -1,    79,
-     114,   289,   115,    -1,   122,    -1,   123,    -1,   124,    -1,
-     125,    -1,   126,    -1,   127,    -1,   156,    -1,   114,   288,
-     115,   159,    -1,   159,    -1,   160,   122,   159,    -1,   160,
-     128,   159,    -1,   160,   129,   159,    -1,   160,    -1,   161,
-     124,   160,    -1,   161,   125,   160,    -1,   161,    -1,   162,
-      93,   161,    -1,   162,    94,   161,    -1,   162,    -1,   163,
-     130,   162,    -1,   163,   131,   162,    -1,   163,    95,   162,
-      -1,   163,    96,   162,    -1,   163,    -1,   164,    97,   163,
-      -1,   164,    98,   163,    -1,   164,    -1,   165,   123,   164,
-      -1,   165,    -1,   166,   132,   165,    -1,   166,    -1,   167,
-     133,   166,    -1,   167,    -1,   168,    99,   167,    -1,   168,
-      -1,   169,   100,   168,    -1,   169,    -1,   169,   134,   177,
-     135,   170,    -1,   169,   134,   135,   170,    -1,   170,    -1,
-     170,    -1,   156,   174,   172,    -1,    -1,   172,    -1,   136,
-      -1,   112,    -1,   102,    -1,   103,    -1,   104,    -1,   105,
-      -1,   106,    -1,   107,    -1,   108,    -1,   109,    -1,   110,
-      -1,   111,    -1,   116,   139,   121,   176,   140,   117,    -1,
-     116,   139,   172,   121,   176,   140,   117,    -1,   173,    -1,
-     176,   121,   173,    -1,   172,    -1,   177,   121,   172,    -1,
-      -1,   177,    -1,   180,    -1,   181,    -1,   185,    -1,   186,
-      -1,   198,    -1,   200,    -1,   201,    -1,   206,    -1,   132,
-     149,   119,   150,   120,   137,    -1,   285,   135,   325,   179,
-      -1,   119,   120,    -1,   119,   139,   139,   217,   182,   140,
-     120,    -1,   183,    -1,   182,   139,   183,    -1,   220,    -1,
-      43,   220,    -1,   321,    -1,    43,   321,    -1,   179,   140,
-      -1,   179,    -1,   184,   179,    -1,   178,   137,    -1,    44,
-     114,   177,   115,   179,    -1,    44,   114,   177,   115,   179,
-      45,   179,    -1,    46,   114,   177,   115,   191,    -1,    46,
-     114,   177,   115,   119,   139,   213,   192,   120,    -1,    56,
-     114,   177,   115,   191,    -1,    56,   114,   177,   115,   119,
-     139,   213,   194,   120,    -1,   171,    -1,   171,   101,   171,
-      -1,   323,    -1,   187,    -1,   188,   121,   187,    -1,    47,
-     188,   135,    -1,    48,   135,    -1,   189,    -1,   190,   189,
-      -1,   190,   179,    -1,    -1,   193,    -1,   190,   184,    -1,
-     193,   190,   184,    -1,    -1,   195,    -1,   190,   197,    -1,
-     190,   184,   196,    -1,   195,   190,   197,    -1,   195,   190,
-     184,   196,    -1,    -1,   197,    -1,    59,    -1,    59,   137,
-      -1,    50,   114,   177,   115,   179,    -1,    49,   179,    50,
-     114,   177,   115,   137,    -1,    51,   114,   139,   199,   115,
-     179,    -1,   178,   140,   137,   178,   137,   178,    -1,   220,
-     178,   137,   178,    -1,    54,   285,   137,    -1,    54,   122,
-     177,   137,    -1,    53,   137,    -1,    53,   285,   137,    -1,
-      52,   137,    -1,    52,   285,   137,    -1,    55,   178,   137,
-      -1,    64,   173,   137,    -1,    65,   173,   137,    -1,    65,
-     173,    66,   172,   137,    -1,    60,   181,   202,    -1,    60,
-     181,   204,    -1,    60,   181,   202,   204,    -1,   203,    -1,
-      61,   114,   101,   115,   181,    -1,   203,    61,   114,   101,
-     115,   181,    -1,    62,   114,   101,   115,   181,    -1,   203,
-      62,   114,   101,   115,   181,    -1,    61,   114,   139,   139,
-     205,   140,   115,   181,   140,    -1,   203,    61,   114,   139,
-     139,   205,   140,   115,   181,   140,    -1,    62,   114,   139,
-     139,   205,   140,   115,   181,   140,    -1,   203,    62,   114,
-     139,   139,   205,   140,   115,   181,   140,    -1,    63,   181,
-      -1,   235,    -1,   235,   322,    -1,   235,   370,    -1,   379,
-     144,    -1,   379,    -1,    67,   207,   114,   146,   115,   137,
-      -1,    67,   207,   114,   146,   135,   208,   115,   137,    -1,
-      67,   207,   114,   146,   135,   208,   135,   208,   115,   137,
-      -1,    67,   207,   114,   146,   135,   208,   135,   208,   135,
-     211,   115,   137,    -1,    67,   207,    54,   114,   146,   135,
-     135,   208,   135,   211,   135,   212,   115,   137,    -1,    -1,
-      11,    -1,    -1,   209,    -1,   210,    -1,   209,   121,   210,
-      -1,   146,   114,   171,   115,    -1,   116,   171,   117,   146,
-     114,   171,   115,    -1,    -1,   146,    -1,   211,   121,   146,
-      -1,   144,    -1,   212,   121,   144,    -1,   140,    -1,   214,
-      -1,   220,    -1,   214,   139,   220,    -1,   140,    -1,   216,
-      -1,   230,    -1,   216,   139,   230,    -1,    -1,   218,    -1,
-      31,   219,   137,    -1,   218,    31,   219,   137,    -1,   287,
-      -1,   219,   121,   287,    -1,   221,    -1,   230,    -1,   222,
-     140,   137,    -1,   227,   140,   137,    -1,   224,   140,   137,
-      -1,   306,   140,   137,    -1,   309,   140,   137,    -1,   223,
-     290,    -1,   241,   223,   290,    -1,   222,   140,   121,   139,
-     285,   290,    -1,   380,   285,   324,    -1,   383,   285,   324,
-      -1,   237,   383,   285,   324,    -1,   225,    -1,   237,   225,
-      -1,   241,   225,    -1,   241,   237,   225,    -1,   224,   140,
-     121,   139,   285,    -1,   383,   285,   114,   139,   273,   140,
-     115,    -1,   226,   285,   114,   139,   273,   140,   115,    -1,
-     116,   139,   275,   140,   117,    -1,   116,   139,   275,   140,
-     121,   139,   276,   140,   117,    -1,     3,   223,    -1,     3,
-     225,    -1,   227,   140,   121,   139,   144,    -1,     3,   234,
-     322,    -1,   228,   140,   121,   139,   322,    -1,   237,     3,
-     234,   322,    -1,   234,     3,   322,    -1,   234,     3,   237,
-     322,    -1,     3,   144,   136,   172,    -1,   229,   140,   121,
-     139,   144,   136,   172,    -1,   232,   231,   140,   137,    -1,
-     228,   140,   137,    -1,   229,   140,   137,    -1,   249,   140,
-     137,    -1,   322,   324,   290,    -1,   231,   121,   325,   322,
-     324,   290,    -1,   245,    -1,   249,    -1,   253,    -1,   296,
-      -1,   245,    -1,   251,    -1,   253,    -1,   296,    -1,   246,
-      -1,   250,    -1,   254,    -1,   297,    -1,   246,    -1,   252,
-      -1,   254,    -1,   297,    -1,    -1,   237,    -1,   238,    -1,
-     237,   238,    -1,   239,    -1,   327,    -1,    10,    -1,    12,
-      -1,    11,    -1,    14,    -1,    70,    -1,    -1,    13,   114,
-     240,   299,   115,    -1,   242,    -1,   237,   242,    -1,   241,
-     237,   242,    -1,   243,    -1,   242,   243,    -1,     5,    -1,
-       7,    -1,     4,    -1,     6,    -1,    74,    -1,     8,    -1,
-       9,    -1,    72,    -1,    16,    -1,    21,    -1,    20,    -1,
-      18,    -1,    19,    -1,    17,    -1,    22,    -1,    23,    -1,
-      15,    -1,    27,    -1,    28,    -1,    29,    -1,    26,    -1,
-      24,    -1,    25,    -1,   246,    -1,   241,   246,    -1,   245,
-     243,    -1,   245,   243,   237,    -1,   245,   243,   246,    -1,
-     247,    -1,   236,   248,   236,    -1,   244,    -1,   237,   244,
-      -1,   247,   238,    -1,   247,   244,    -1,    30,   114,   289,
-     115,    -1,    30,   114,   177,   115,    -1,    81,   114,   289,
-     115,    -1,    81,   114,   177,   115,    -1,   250,    -1,   241,
-     250,    -1,   249,   243,    -1,   249,   243,   237,    -1,   255,
-      -1,   237,   255,    -1,   250,   238,    -1,   252,    -1,   241,
-     252,    -1,   251,   243,    -1,   251,   243,   237,    -1,   256,
-      -1,   237,   256,    -1,   252,   238,    -1,   254,    -1,   241,
-     254,    -1,   253,   243,    -1,   253,   243,   237,    -1,    77,
-      -1,   237,    77,    -1,   254,   238,    -1,   257,    -1,   268,
-      -1,   259,    -1,   270,    -1,   260,   325,   119,   261,   120,
-      -1,    -1,   260,   325,   287,   258,   119,   261,   120,    -1,
-     260,   325,   114,   305,   115,   119,   261,   120,    -1,   259,
-      -1,   260,   325,   287,    -1,   260,   325,   298,    -1,    33,
-      -1,    34,    -1,    -1,   261,   262,    -1,   263,   137,    -1,
-      43,   263,   137,    -1,   234,   264,   137,    -1,    43,   234,
-     264,   137,    -1,   379,    -1,   379,   287,    -1,   263,   121,
-     287,    -1,   263,   121,    -1,   265,    -1,   264,   121,   325,
-     265,    -1,    -1,   267,    -1,   331,   266,    -1,   344,   266,
-      -1,   370,    -1,    -1,   267,    -1,   135,   171,    -1,    32,
-     325,   119,   271,   385,   120,    -1,    -1,    32,   325,   287,
-     269,   119,   271,   385,   120,    -1,   270,    -1,    32,   325,
-     287,    -1,   287,   272,    -1,   271,   121,   287,   272,    -1,
-      -1,   136,   171,    -1,    -1,   274,    -1,   276,    -1,   275,
-      -1,   275,   140,   121,   139,   276,    -1,   276,   140,   121,
-     139,   101,    -1,   275,   140,   121,   139,   101,    -1,   280,
-      -1,   276,   140,   121,   139,   280,    -1,   275,   140,   121,
-     139,   280,    -1,   275,   140,   121,   139,   276,   140,   121,
-     139,   280,    -1,   281,    -1,   276,   140,   121,   139,   281,
-      -1,    -1,   278,    -1,   279,    -1,   279,   140,   121,   139,
-     101,    -1,   283,    -1,   282,    -1,   279,   140,   121,   139,
-     283,    -1,   279,   140,   121,   139,   282,    -1,   282,    -1,
-     375,   285,   386,    -1,   383,   285,   386,    -1,   237,   383,
-     285,   386,    -1,   225,    -1,   283,    -1,   375,    -1,   383,
-      -1,   237,   383,    -1,   384,    -1,   233,   349,   386,    -1,
-     233,   353,   386,    -1,   233,   386,    -1,   233,   364,   386,
-      -1,   144,    -1,   284,   121,   144,    -1,   142,    -1,    77,
-      -1,    78,    -1,   143,    -1,    77,    -1,    78,    -1,   144,
-      -1,    77,    -1,    78,    -1,   379,    -1,   234,    -1,   234,
-     358,    -1,   288,    -1,   384,    -1,    -1,   136,   291,    -1,
-     112,   291,    -1,   172,    -1,   119,   292,   385,   120,    -1,
-      -1,   291,    -1,   293,   291,    -1,   292,   121,   291,    -1,
-     292,   121,   293,   291,    -1,   294,   135,    -1,   287,   135,
-      -1,   295,    -1,   294,   295,    -1,   118,   287,    -1,   116,
-     139,   172,   140,   117,    -1,   116,   139,   323,   140,   117,
-      -1,   116,   139,   171,   101,   171,   140,   117,    -1,   118,
-     116,   139,   152,   140,   117,    -1,   297,    -1,   241,   297,
-      -1,   296,   243,    -1,   296,   243,   237,    -1,   298,    -1,
-     237,   298,    -1,   297,   238,    -1,    78,   114,   305,   115,
-      -1,   300,   386,    -1,   299,   121,   300,   386,    -1,    -1,
-     302,   287,   301,   303,    -1,   234,   349,    -1,    35,    -1,
-      37,    -1,    36,    -1,    38,    -1,    -1,   303,   304,    -1,
-     133,   287,   114,   305,   115,    -1,   133,   119,   139,   311,
-     120,    -1,   133,   114,   139,   299,   140,   115,   119,   139,
-     311,   120,   114,   305,   115,    -1,   289,    -1,   172,    -1,
-     305,   121,   289,    -1,   305,   121,   172,    -1,    35,   307,
-      -1,   242,    35,   307,    -1,   306,   121,   307,    -1,   308,
-     303,    -1,   308,   303,   136,   289,    -1,   287,    -1,   286,
-     114,   139,   299,   140,   115,    -1,    39,   287,   114,   139,
-     299,   140,   115,   119,   120,    -1,    -1,    39,   287,   114,
-     139,   299,   140,   115,   119,   310,   311,   120,    -1,   312,
-      -1,   311,   139,   312,    -1,   313,   140,   137,    -1,   314,
-     140,   137,    -1,   223,    -1,   225,    -1,   313,   140,   121,
-     139,   285,    -1,   234,   322,    -1,   314,   140,   121,   139,
-     322,    -1,    -1,   316,    -1,   318,    -1,   316,   139,   318,
-      -1,    -1,   316,    -1,   220,    -1,   320,    -1,    67,   114,
-     146,   115,   137,    -1,    -1,     5,    84,   319,   119,   317,
-     120,    -1,    43,   318,    -1,   321,    -1,   336,   181,    -1,
-     340,   139,   215,   181,    -1,   224,   181,    -1,   232,   336,
-     181,    -1,   237,   336,   181,    -1,   241,   3