Changeset 3ca540f for src/SymTab

Timestamp:

Dec 1, 2017, 2:55:41 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

a40d503

Parents:

882ad37 (diff), 5da9d6a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into with-statement

Location:

src/SymTab

Files:

• AddVisit.h (modified) (2 diffs)
• Autogen.cc (modified) (6 diffs)
• Autogen.h (modified) (2 diffs)
• ImplementationType.cc (deleted)
• ImplementationType.h (deleted)
• TypeEquality.cc (deleted)
• TypeEquality.h (deleted)
• Validate.cc (modified) (3 diffs)
• module.mk (modified) (1 diff)

src/SymTab/AddVisit.h

@@ -24 +24 @@
                         // add any new declarations after the previous statement
                         for ( std::list< Declaration* >::iterator decl = visitor.declsToAddAfter.begin(); decl != visitor.declsToAddAfter.end(); ++decl ) {
-                                DeclStmt *declStmt = new DeclStmt( noLabels, *decl );
+                                DeclStmt *declStmt = new DeclStmt( *decl );
                                 stmts.insert( stmt, declStmt );
                         }
@@ -36 +36 @@
                         // add any new declarations before the statement
                         for ( std::list< Declaration* >::iterator decl = visitor.declsToAdd.begin(); decl != visitor.declsToAdd.end(); ++decl ) {
-                                DeclStmt *declStmt = new DeclStmt( noLabels, *decl );
+                                DeclStmt *declStmt = new DeclStmt( *decl );
                                 stmts.insert( stmt, declStmt );
                         }

src/SymTab/Autogen.cc

@@ -264 +264 @@
                 Type::StorageClasses scs = functionNesting > 0 ? Type::StorageClasses() : Type::StorageClasses( Type::Static );
                 LinkageSpec::Spec spec = isIntrinsic ? LinkageSpec::Intrinsic : LinkageSpec::AutoGen;
-                FunctionDecl * decl = new FunctionDecl( fname, scs, spec, ftype, new CompoundStmt( noLabels ),
+                FunctionDecl * decl = new FunctionDecl( fname, scs, spec, ftype, new CompoundStmt(),
                                                                                                 std::list< Attribute * >(), Type::FuncSpecifiers( Type::Inline ) );
                 decl->fixUniqueId();
@@ -299 +299 @@
                                 assert( assignType->returnVals.size() == 1 );
                                 ObjectDecl * dstParam = strict_dynamic_cast< ObjectDecl * >( assignType->parameters.front() );
-                                dcl->statements->push_back( new ReturnStmt( noLabels, new VariableExpr( dstParam ) ) );
+                                dcl->statements->push_back( new ReturnStmt( new VariableExpr( dstParam ) ) );
                         }
                         resolve( dcl );
@@ -468 +468 @@
                 copy->args.push_back( new AddressExpr( new VariableExpr( srcParam ) ) );
                 copy->args.push_back( new SizeofExpr( srcParam->get_type()->clone() ) );
-                *out++ = new ExprStmt( noLabels, copy );
+                *out++ = new ExprStmt( copy );
         }
 
@@ -544 +544 @@
                         callExpr->get_args().push_back( new VariableExpr( dstParam ) );
                         callExpr->get_args().push_back( new VariableExpr( srcParam ) );
-                        funcDecl->statements->push_back( new ExprStmt( noLabels, callExpr ) );
+                        funcDecl->statements->push_back( new ExprStmt( callExpr ) );
                 } else {
                         // default ctor/dtor body is empty - add unused attribute to parameter to silence warnings
@@ -569 +569 @@
                 expr->args.push_back( new CastExpr( new VariableExpr( dst ), new ReferenceType( Type::Qualifiers(), typeDecl->base->clone() ) ) );
                 if ( src ) expr->args.push_back( new CastExpr( new VariableExpr( src ), typeDecl->base->clone() ) );
-                dcl->statements->kids.push_back( new ExprStmt( noLabels, expr ) );
+                dcl->statements->kids.push_back( new ExprStmt( expr ) );
         };
 
@@ -664 +664 @@
                         untyped->get_args().push_back( new VariableExpr( ftype->get_parameters().back() ) );
                 }
-                function->get_statements()->get_kids().push_back( new ExprStmt( noLabels, untyped ) );
-                function->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, UntypedExpr::createDeref( new VariableExpr( ftype->get_parameters().front() ) ) ) );
+                function->get_statements()->get_kids().push_back( new ExprStmt( untyped ) );
+                function->get_statements()->get_kids().push_back( new ReturnStmt( UntypedExpr::createDeref( new VariableExpr( ftype->get_parameters().front() ) ) ) );
         }
 

src/SymTab/Autogen.h

@@ -104 +104 @@
                 fExpr->args.splice( fExpr->args.end(), args );
 
-                *out++ = new ExprStmt( noLabels, fExpr );
+                *out++ = new ExprStmt( fExpr );
 
                 srcParam.clearArrayIndices();
@@ -162 +162 @@
 
                 // for stmt's body, eventually containing call
-                CompoundStmt * body = new CompoundStmt( noLabels );
+                CompoundStmt * body = new CompoundStmt();
                 Statement * listInit = genCall( srcParam, dstParam, fname, back_inserter( body->kids ), array->base, addCast, forward );
 
                 // block containing for stmt and index variable
                 std::list<Statement *> initList;
-                CompoundStmt * block = new CompoundStmt( noLabels );
-                block->push_back( new DeclStmt( noLabels, index ) );
+                CompoundStmt * block = new CompoundStmt();
+                block->push_back( new DeclStmt( index ) );
                 if ( listInit ) block->get_kids().push_back( listInit );
-                block->push_back( new ForStmt( noLabels, initList, cond, inc, body ) );
+                block->push_back( new ForStmt( initList, cond, inc, body ) );
 
                 *out++ = block;

src/SymTab/Validate.cc

@@ -81 +81 @@
 
 namespace SymTab {
-        class HoistStruct final : public Visitor {
-                template< typename Visitor >
-                friend void acceptAndAdd( std::list< Declaration * > &translationUnit, Visitor &visitor );
-            template< typename Visitor >
-            friend void addVisitStatementList( std::list< Statement* > &stmts, Visitor &visitor );
-          public:
+        struct HoistStruct final : public WithDeclsToAdd, public WithGuards {
                 /// Flattens nested struct types
                 static void hoistStruct( std::list< Declaration * > &translationUnit );
 
-                std::list< Declaration * > &get_declsToAdd() { return declsToAdd; }
-
-                virtual void visit( EnumInstType *enumInstType );
-                virtual void visit( StructInstType *structInstType );
-                virtual void visit( UnionInstType *unionInstType );
-                virtual void visit( StructDecl *aggregateDecl );
-                virtual void visit( UnionDecl *aggregateDecl );
-
-                virtual void visit( CompoundStmt *compoundStmt );
-                virtual void visit( SwitchStmt *switchStmt );
+                void previsit( EnumInstType * enumInstType );
+                void previsit( StructInstType * structInstType );
+                void previsit( UnionInstType * unionInstType );
+                void previsit( StructDecl * aggregateDecl );
+                void previsit( UnionDecl * aggregateDecl );
+
           private:
-                HoistStruct();
-
                 template< typename AggDecl > void handleAggregate( AggDecl *aggregateDecl );
 
-                std::list< Declaration * > declsToAdd, declsToAddAfter;
-                bool inStruct;
+                bool inStruct = false;
         };
 
@@ -305 +293 @@
 
         void HoistStruct::hoistStruct( std::list< Declaration * > &translationUnit ) {
-                HoistStruct hoister;
-                acceptAndAdd( translationUnit, hoister );
-        }
-
-        HoistStruct::HoistStruct() : inStruct( false ) {
+                PassVisitor<HoistStruct> hoister;
+                acceptAll( translationUnit, hoister );
         }
 
@@ -320 +305 @@
                 if ( inStruct ) {
                         // Add elements in stack order corresponding to nesting structure.
-                        declsToAdd.push_front( aggregateDecl );
-                        Visitor::visit( aggregateDecl );
+                        declsToAddBefore.push_front( aggregateDecl );
                 } else {
+                        GuardValue( inStruct );
                         inStruct = true;
-                        Visitor::visit( aggregateDecl );
-                        inStruct = false;
                 } // if
                 // Always remove the hoisted aggregate from the inner structure.
-                filter( aggregateDecl->get_members(), isStructOrUnion, false );
-        }
-
-        void HoistStruct::visit( EnumInstType *structInstType ) {
-                if ( structInstType->get_baseEnum() ) {
-                        declsToAdd.push_front( structInstType->get_baseEnum() );
-                }
-        }
-
-        void HoistStruct::visit( StructInstType *structInstType ) {
-                if ( structInstType->get_baseStruct() ) {
-                        declsToAdd.push_front( structInstType->get_baseStruct() );
-                }
-        }
-
-        void HoistStruct::visit( UnionInstType *structInstType ) {
-                if ( structInstType->get_baseUnion() ) {
-                        declsToAdd.push_front( structInstType->get_baseUnion() );
-                }
-        }
-
-        void HoistStruct::visit( StructDecl *aggregateDecl ) {
+                GuardAction( [this, aggregateDecl]() { filter( aggregateDecl->members, isStructOrUnion, false ); } );
+        }
+
+        void HoistStruct::previsit( EnumInstType * inst ) {
+                if ( inst->baseEnum ) {
+                        declsToAddBefore.push_front( inst->baseEnum );
+                }
+        }
+
+        void HoistStruct::previsit( StructInstType * inst ) {
+                if ( inst->baseStruct ) {
+                        declsToAddBefore.push_front( inst->baseStruct );
+                }
+        }
+
+        void HoistStruct::previsit( UnionInstType * inst ) {
+                if ( inst->baseUnion ) {
+                        declsToAddBefore.push_front( inst->baseUnion );
+                }
+        }
+
+        void HoistStruct::previsit( StructDecl * aggregateDecl ) {
                 handleAggregate( aggregateDecl );
         }
 
-        void HoistStruct::visit( UnionDecl *aggregateDecl ) {
+        void HoistStruct::previsit( UnionDecl * aggregateDecl ) {
                 handleAggregate( aggregateDecl );
-        }
-
-        void HoistStruct::visit( CompoundStmt *compoundStmt ) {
-                addVisit( compoundStmt, *this );
-        }
-
-        void HoistStruct::visit( SwitchStmt *switchStmt ) {
-                addVisit( switchStmt, *this );
         }
 

src/SymTab/module.mk

@@ -19 +19 @@
        SymTab/Validate.cc \
        SymTab/FixFunction.cc \
-       SymTab/ImplementationType.cc \
-       SymTab/TypeEquality.cc \
        SymTab/Autogen.cc