Changeset 69918cea for src

Timestamp:

Jun 28, 2018, 3:27:34 PM (6 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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

a12c81f3

Parents:

afcb0a3

Message:

Add new EliminateTypedef? pass that just removes typedefs from AST

File:

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

src/SymTab/Validate.cc

@@ -214 +214 @@
         };
 
+        struct EliminateTypedef {
+                /// removes TypedefDecls from the AST
+                static void eliminateTypedef( std::list< Declaration * > &translationUnit );
+
+                template<typename AggDecl>
+                void handleAggregate( AggDecl *aggregateDecl );
+
+                void previsit( StructDecl * aggregateDecl );
+                void previsit( UnionDecl * aggregateDecl );
+                void previsit( CompoundStmt * compoundStmt );
+        };
+
         struct VerifyCtorDtorAssign {
                 /// ensure that constructors, destructors, and assignment have at least one
@@ -277 +289 @@
                 acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
                 HoistStruct::hoistStruct( translationUnit ); // must happen after EliminateTypedef, so that aggregate typedefs occur in the correct order
+                EliminateTypedef::eliminateTypedef( translationUnit ); //
                 acceptAll( translationUnit, genericParams );  // check as early as possible - can't happen before LinkReferenceToTypes
                 VerifyCtorDtorAssign::verify( translationUnit );  // must happen before autogen, because autogen examines existing ctor/dtors
@@ -399 +412 @@
         }
 
+
+        bool isTypedef( Declaration *decl ) {
+                return dynamic_cast< TypedefDecl * >( decl );
+        }
+
+        void EliminateTypedef::eliminateTypedef( std::list< Declaration * > &translationUnit ) {
+                PassVisitor<EliminateTypedef> eliminator;
+                acceptAll( translationUnit, eliminator );
+                filter( translationUnit, isTypedef, true );
+        }
+
+        template< typename AggDecl >
+        void EliminateTypedef::handleAggregate( AggDecl *aggregateDecl ) {
+                filter( aggregateDecl->members, isTypedef, true );
+        }
+
+        void EliminateTypedef::previsit( StructDecl * aggregateDecl ) {
+                handleAggregate( aggregateDecl );
+        }
+
+        void EliminateTypedef::previsit( UnionDecl * aggregateDecl ) {
+                handleAggregate( aggregateDecl );
+        }
+
+        void EliminateTypedef::previsit( CompoundStmt * compoundStmt ) {
+                // remove and delete decl stmts
+                filter( compoundStmt->kids, [](Statement * stmt) {
+                        if ( DeclStmt *declStmt = dynamic_cast< DeclStmt * >( stmt ) ) {
+                                if ( dynamic_cast< TypedefDecl * >( declStmt->decl ) ) {
+                                        return true;
+                                } // if
+                        } // if
+                        return false;
+                }, true);
+        }
 
         void EnumAndPointerDecay::previsit( EnumDecl *enumDecl ) {