Changeset be8bd88 for src/SymTab/Validate.cc

Timestamp:

Mar 8, 2017, 3:22:50 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

031a2c95, 0e7ea335

Parents:

87c3bef (diff), 6363ad1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/SymTab/Validate.cc (modified) (11 diffs)

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 23 21:33:55 2017
-// Update Count     : 318
+// Last Modified On : Tue Mar  7 07:51:36 2017
+// Update Count     : 349
 //
 
@@ -97 +97 @@
         class ReturnTypeFixer final : public Visitor {
           public:
-
                 typedef Visitor Parent;
                 using Parent::visit;
@@ -104 +103 @@
 
                 virtual void visit( FunctionDecl * functionDecl );
-
                 virtual void visit( FunctionType * ftype );
         };
@@ -161 +159 @@
           private:
                 virtual void visit( FunctionDecl * functionDecl );
-
                 virtual void visit( ReturnStmt * returnStmt );
 
@@ -211 +208 @@
 
         class CompoundLiteral final : public GenPoly::DeclMutator {
-                DeclarationNode::StorageClass storageclass = DeclarationNode::NoStorageClass;
+                DeclarationNode::StorageClasses storageClasses;
 
                 using GenPoly::DeclMutator::mutate;
@@ -660 +657 @@
                 // Note, qualifiers on the typedef are superfluous for the forward declaration.
                 if ( StructInstType *aggDecl = dynamic_cast< StructInstType * >( tyDecl->get_base() ) ) {
-                        return aggDecl->get_baseStruct() ? Mutator::mutate( aggDecl->get_baseStruct() ) : new StructDecl( aggDecl->get_name() );
+                        return new StructDecl( aggDecl->get_name() );
                 } else if ( UnionInstType *aggDecl = dynamic_cast< UnionInstType * >( tyDecl->get_base() ) ) {
-                        return aggDecl->get_baseUnion() ? Mutator::mutate( aggDecl->get_baseUnion() ) : new UnionDecl( aggDecl->get_name() );
+                        return new UnionDecl( aggDecl->get_name() );
                 } else if ( EnumInstType *enumDecl = dynamic_cast< EnumInstType * >( tyDecl->get_base() ) ) {
                         return new EnumDecl( enumDecl->get_name() );
@@ -691 +688 @@
                 DeclarationWithType *ret = Mutator::mutate( objDecl );
                 typedefNames.endScope();
-                // is the type a function?
-                if ( FunctionType *funtype = dynamic_cast<FunctionType *>( ret->get_type() ) ) {
+
+                if ( FunctionType *funtype = dynamic_cast<FunctionType *>( 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, ret->get_isInline(), ret->get_isNoreturn(), objDecl->get_attributes() );
+                        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 );
                         delete objDecl;
                         return newDecl;
-                } else if ( objDecl->get_isInline() || objDecl->get_isNoreturn() ) {
-                        throw SemanticError( "invalid inline or _Noreturn specification in declaration of ", objDecl );
                 } // if
                 return ret;
@@ -759 +754 @@
                                 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
@@ -813 +808 @@
 
         DeclarationWithType * CompoundLiteral::mutate( ObjectDecl *objectDecl ) {
-                storageclass = objectDecl->get_storageClass();
+                storageClasses = objectDecl->get_storageClasses();
                 DeclarationWithType * temp = Mutator::mutate( objectDecl );
-                storageclass = DeclarationNode::NoStorageClass;
                 return temp;
         }
@@ -824 +818 @@
                 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 );
@@ -863 +857 @@
                         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<Initializer*>(), noDesignators, false ) );
+                        ObjectDecl * newRet = new ObjectDecl( "", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, 0, tupleType, new ListInit( std::list<Initializer*>(), noDesignators, false ) );
                         deleteAll( retVals );
                         retVals.clear();