Index: src/SymTab/Autogen.cc =================================================================== --- src/SymTab/Autogen.cc (revision dd020c0cdff72537d5b1dffcf6920c72db9d585a) +++ src/SymTab/Autogen.cc (revision a7c90d4d68e0538c8215b52b958e12c56980c401) @@ -10,6 +10,6 @@ // Created On : Thu Mar 03 15:45:56 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri Mar 3 22:00:55 2017 -// Update Count : 30 +// Last Modified On : Tue Mar 7 07:42:44 2017 +// Update Count : 51 // @@ -125,5 +125,5 @@ FunctionType * genDefaultType( Type * paramType ) { FunctionType *ftype = new FunctionType( Type::Qualifiers(), false ); - ObjectDecl *dstParam = new ObjectDecl( "_dst", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, nullptr, new PointerType( Type::Qualifiers(), paramType->clone() ), nullptr ); + ObjectDecl *dstParam = new ObjectDecl( "_dst", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, nullptr, new PointerType( Type::Qualifiers(), paramType->clone() ), nullptr ); ftype->get_parameters().push_back( dstParam ); @@ -134,5 +134,5 @@ FunctionType * genCopyType( Type * paramType ) { FunctionType *ftype = genDefaultType( paramType ); - ObjectDecl *srcParam = new ObjectDecl( "_src", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, nullptr, paramType->clone(), nullptr ); + ObjectDecl *srcParam = new ObjectDecl( "_src", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, nullptr, paramType->clone(), nullptr ); ftype->get_parameters().push_back( srcParam ); return ftype; @@ -142,5 +142,5 @@ FunctionType * genAssignType( Type * paramType ) { FunctionType *ftype = genCopyType( paramType ); - ObjectDecl *returnVal = new ObjectDecl( "_ret", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, nullptr, paramType->clone(), nullptr ); + ObjectDecl *returnVal = new ObjectDecl( "_ret", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, nullptr, paramType->clone(), nullptr ); ftype->get_returnVals().push_back( returnVal ); return ftype; @@ -161,8 +161,9 @@ // Routines at global scope marked "static" to prevent multiple definitions in separate translation units // because each unit generates copies of the default routines for each aggregate. - DeclarationNode::StorageClass sc = functionNesting > 0 ? DeclarationNode::NoStorageClass : DeclarationNode::Static; +// DeclarationNode::StorageClass sc = functionNesting > 0 ? DeclarationNode::NoStorageClass : DeclarationNode::Static; + DeclarationNode::StorageClasses scs = functionNesting > 0 ? DeclarationNode::StorageClasses() : DeclarationNode::StorageClasses( DeclarationNode::StaticClass ); LinkageSpec::Spec spec = isIntrinsic ? LinkageSpec::Intrinsic : LinkageSpec::AutoGen; - FunctionDecl * decl = new FunctionDecl( fname, sc, spec, ftype, new CompoundStmt( noLabels ), - std::list< Attribute * >(), DeclarationNode::FuncSpecifier( DeclarationNode::InlineSpec ) ); + FunctionDecl * decl = new FunctionDecl( fname, scs, spec, ftype, new CompoundStmt( noLabels ), + std::list< Attribute * >(), DeclarationNode::FuncSpecifiers( DeclarationNode::InlineSpec ) ); decl->fixUniqueId(); return decl; @@ -459,5 +460,5 @@ continue; } - memCtorType->get_parameters().push_back( new ObjectDecl( member->get_name(), DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, member->get_type()->clone(), 0 ) ); + memCtorType->get_parameters().push_back( new ObjectDecl( member->get_name(), DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, member->get_type()->clone(), 0 ) ); FunctionDecl * ctor = genFunc( "?{}", memCtorType->clone(), functionNesting ); makeStructFieldCtorBody( aggregateDecl->get_members().begin(), aggregateDecl->get_members().end(), ctor, isDynamicLayout ); @@ -539,5 +540,5 @@ for ( Declaration * member : aggregateDecl->get_members() ) { if ( DeclarationWithType * field = dynamic_cast< DeclarationWithType * >( member ) ) { - ObjectDecl * srcParam = new ObjectDecl( "src", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, field->get_type()->clone(), 0 ); + ObjectDecl * srcParam = new ObjectDecl( "src", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, field->get_type()->clone(), 0 ); FunctionType * memCtorType = ctorType->clone(); @@ -604,6 +605,6 @@ TypeInstType *typeInst = new TypeInstType( Type::Qualifiers(), typeDecl->get_name(), false ); typeInst->set_baseType( typeDecl ); - ObjectDecl *src = new ObjectDecl( "_src", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, nullptr, typeInst->clone(), nullptr ); - ObjectDecl *dst = new ObjectDecl( "_dst", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, nullptr, new PointerType( Type::Qualifiers(), typeInst->clone() ), nullptr ); + ObjectDecl *src = new ObjectDecl( "_src", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, nullptr, typeInst->clone(), nullptr ); + ObjectDecl *dst = new ObjectDecl( "_dst", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, nullptr, new PointerType( Type::Qualifiers(), typeInst->clone() ), nullptr ); std::list< Statement * > stmts; @@ -617,5 +618,5 @@ } // if FunctionType *type = new FunctionType( Type::Qualifiers(), false ); - type->get_returnVals().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, typeInst, 0 ) ); + type->get_returnVals().push_back( new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, typeInst, 0 ) ); type->get_parameters().push_back( dst ); type->get_parameters().push_back( src ); @@ -716,14 +717,14 @@ if ( TypeInstType * ty = dynamic_cast< TypeInstType * >( t ) ) { if ( ! done.count( ty->get_baseType() ) ) { - TypeDecl * newDecl = new TypeDecl( ty->get_baseType()->get_name(), DeclarationNode::NoStorageClass, nullptr, TypeDecl::Any ); + TypeDecl * newDecl = new TypeDecl( ty->get_baseType()->get_name(), DeclarationNode::StorageClasses(), nullptr, TypeDecl::Any ); TypeInstType * inst = new TypeInstType( Type::Qualifiers(), newDecl->get_name(), newDecl ); - newDecl->get_assertions().push_back( new FunctionDecl( "?=?", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, genAssignType( inst ), nullptr, - std::list< Attribute * >(), DeclarationNode::FuncSpec( DeclarationNode::InlineSpec ) ) ); - newDecl->get_assertions().push_back( new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, genDefaultType( inst ), nullptr, - std::list< Attribute * >(), DeclarationNode::FuncSpec( DeclarationNode::InlineSpec ) ) ); - newDecl->get_assertions().push_back( new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, genCopyType( inst ), nullptr, - std::list< Attribute * >(), DeclarationNode::FuncSpec( DeclarationNode::InlineSpec ) ) ); - newDecl->get_assertions().push_back( new FunctionDecl( "^?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, genDefaultType( inst ), nullptr, - std::list< Attribute * >(), DeclarationNode::FuncSpec( DeclarationNode::InlineSpec ) ) ); + newDecl->get_assertions().push_back( new FunctionDecl( "?=?", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, genAssignType( inst ), nullptr, + std::list< Attribute * >(), DeclarationNode::FuncSpecifiers( DeclarationNode::InlineSpec ) ) ); + newDecl->get_assertions().push_back( new FunctionDecl( "?{}", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, genDefaultType( inst ), nullptr, + std::list< Attribute * >(), DeclarationNode::FuncSpecifiers( DeclarationNode::InlineSpec ) ) ); + newDecl->get_assertions().push_back( new FunctionDecl( "?{}", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, genCopyType( inst ), nullptr, + std::list< Attribute * >(), DeclarationNode::FuncSpecifiers( DeclarationNode::InlineSpec ) ) ); + newDecl->get_assertions().push_back( new FunctionDecl( "^?{}", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, genDefaultType( inst ), nullptr, + std::list< Attribute * >(), DeclarationNode::FuncSpecifiers( DeclarationNode::InlineSpec ) ) ); typeParams.push_back( newDecl ); done.insert( ty->get_baseType() ); Index: src/SymTab/Autogen.h =================================================================== --- src/SymTab/Autogen.h (revision dd020c0cdff72537d5b1dffcf6920c72db9d585a) +++ src/SymTab/Autogen.h (revision a7c90d4d68e0538c8215b52b958e12c56980c401) @@ -10,6 +10,6 @@ // Created On : Sun May 17 21:53:34 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Feb 1 16:31:00 2017 -// Update Count : 2 +// Last Modified On : Mon Mar 6 23:33:01 2017 +// Update Count : 4 // @@ -102,5 +102,5 @@ } - ObjectDecl *index = new ObjectDecl( indexName.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), new SingleInit( begin, std::list() ) ); + ObjectDecl *index = new ObjectDecl( indexName.newName(), DeclarationNode::StorageClasses(), LinkageSpec::C, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), new SingleInit( begin, std::list() ) ); UntypedExpr *cond = new UntypedExpr( cmp ); Index: src/SymTab/FixFunction.cc =================================================================== --- src/SymTab/FixFunction.cc (revision dd020c0cdff72537d5b1dffcf6920c72db9d585a) +++ src/SymTab/FixFunction.cc (revision a7c90d4d68e0538c8215b52b958e12c56980c401) @@ -10,6 +10,6 @@ // Created On : Sun May 17 16:19:49 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Mar 2 17:31:10 2016 -// Update Count : 3 +// Last Modified On : Mon Mar 6 23:36:59 2017 +// Update Count : 6 // @@ -21,9 +21,8 @@ namespace SymTab { - FixFunction::FixFunction() : isVoid( false ) { - } + FixFunction::FixFunction() : isVoid( false ) {} DeclarationWithType * FixFunction::mutate(FunctionDecl *functionDecl) { - ObjectDecl *pointer = new ObjectDecl( functionDecl->get_name(), functionDecl->get_storageClass(), functionDecl->get_linkage(), 0, new PointerType( Type::Qualifiers(), functionDecl->get_type()->clone() ), 0, functionDecl->get_attributes() ); + ObjectDecl *pointer = new ObjectDecl( functionDecl->get_name(), functionDecl->get_storageClasses(), functionDecl->get_linkage(), 0, new PointerType( Type::Qualifiers(), functionDecl->get_type()->clone() ), 0, functionDecl->get_attributes() ); functionDecl->get_attributes().clear(); delete functionDecl; Index: src/SymTab/Indexer.cc =================================================================== --- src/SymTab/Indexer.cc (revision dd020c0cdff72537d5b1dffcf6920c72db9d585a) +++ src/SymTab/Indexer.cc (revision a7c90d4d68e0538c8215b52b958e12c56980c401) @@ -10,6 +10,6 @@ // Created On : Sun May 17 21:37:33 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Feb 16 14:59:19 2017 -// Update Count : 13 +// Last Modified On : Tue Mar 7 07:45:32 2017 +// Update Count : 16 // @@ -738,5 +738,5 @@ ObjectDecl *newobj = dynamic_cast< ObjectDecl* >( added ); ObjectDecl *oldobj = dynamic_cast< ObjectDecl* >( existing ); - if ( newobj->get_storageClass() != DeclarationNode::Extern && oldobj->get_storageClass() != DeclarationNode::Extern ) { + if ( ! newobj->get_storageClasses()[ DeclarationNode::Extern ] && ! oldobj->get_storageClasses()[ DeclarationNode::Extern ] ) { throw SemanticError( "duplicate object definition for ", added ); } // if Index: src/SymTab/Validate.cc =================================================================== --- src/SymTab/Validate.cc (revision dd020c0cdff72537d5b1dffcf6920c72db9d585a) +++ src/SymTab/Validate.cc (revision a7c90d4d68e0538c8215b52b958e12c56980c401) @@ -10,6 +10,6 @@ // Created On : Sun May 17 21:50:04 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri Mar 3 21:02:23 2017 -// Update Count : 332 +// Last Modified On : Tue Mar 7 07:51:36 2017 +// Update Count : 349 // @@ -97,5 +97,4 @@ class ReturnTypeFixer final : public Visitor { public: - typedef Visitor Parent; using Parent::visit; @@ -104,5 +103,4 @@ virtual void visit( FunctionDecl * functionDecl ); - virtual void visit( FunctionType * ftype ); }; @@ -161,5 +159,4 @@ private: virtual void visit( FunctionDecl * functionDecl ); - virtual void visit( ReturnStmt * returnStmt ); @@ -211,5 +208,5 @@ class CompoundLiteral final : public GenPoly::DeclMutator { - DeclarationNode::StorageClass storageclass = DeclarationNode::NoStorageClass; + DeclarationNode::StorageClasses storageClasses; using GenPoly::DeclMutator::mutate; @@ -694,5 +691,5 @@ if ( FunctionType *funtype = dynamic_cast( ret->get_type() ) ) { // function type? // replace the current object declaration with a function declaration - FunctionDecl * newDecl = new FunctionDecl( ret->get_name(), ret->get_storageClass(), ret->get_linkage(), funtype, 0, objDecl->get_attributes(), ret->get_funcSpec() ); + FunctionDecl * newDecl = new FunctionDecl( ret->get_name(), ret->get_storageClasses(), ret->get_linkage(), funtype, 0, objDecl->get_attributes(), ret->get_funcSpec() ); objDecl->get_attributes().clear(); objDecl->set_type( nullptr ); @@ -757,5 +754,5 @@ type = new EnumInstType( Type::Qualifiers(), newDeclEnumDecl->get_name() ); } // if - TypedefDeclPtr tyDecl( new TypedefDecl( aggDecl->get_name(), DeclarationNode::NoStorageClass, type ) ); + TypedefDeclPtr tyDecl( new TypedefDecl( aggDecl->get_name(), DeclarationNode::StorageClasses(), type ) ); typedefNames[ aggDecl->get_name() ] = std::make_pair( std::move( tyDecl ), scopeLevel ); } // if @@ -811,7 +808,6 @@ DeclarationWithType * CompoundLiteral::mutate( ObjectDecl *objectDecl ) { - storageclass = objectDecl->get_storageClass(); + storageClasses = objectDecl->get_storageClasses(); DeclarationWithType * temp = Mutator::mutate( objectDecl ); - storageclass = DeclarationNode::NoStorageClass; return temp; } @@ -822,5 +818,5 @@ static UniqueName indexName( "_compLit" ); - ObjectDecl *tempvar = new ObjectDecl( indexName.newName(), storageclass, LinkageSpec::C, 0, compLitExpr->get_type(), compLitExpr->get_initializer() ); + ObjectDecl *tempvar = new ObjectDecl( indexName.newName(), storageClasses, LinkageSpec::C, 0, compLitExpr->get_type(), compLitExpr->get_initializer() ); compLitExpr->set_type( 0 ); compLitExpr->set_initializer( 0 ); @@ -861,5 +857,5 @@ TupleType * tupleType = safe_dynamic_cast< TupleType * >( ResolvExpr::extractResultType( ftype ) ); // ensure return value is not destructed by explicitly creating an empty ListInit node wherein maybeConstruct is false. - ObjectDecl * newRet = new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, tupleType, new ListInit( std::list(), noDesignators, false ) ); + ObjectDecl * newRet = new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, tupleType, new ListInit( std::list(), noDesignators, false ) ); deleteAll( retVals ); retVals.clear();