Changeset 293dc1c for src/InitTweak

Timestamp:

Nov 3, 2020, 4:06:20 PM (5 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

4406887

Parents:

daefe93

Message:

TranslationUnit is now used at the top-level of the new-ast passes.

Location:

src/InitTweak

Files:

• FixGlobalInit.cc (modified) (3 diffs)
• FixGlobalInit.h (modified) (1 diff)
• FixInit.h (modified) (2 diffs)
• FixInitNew.cpp (modified) (4 diffs)

src/InitTweak/FixGlobalInit.cc

@@ -109 +109 @@
         }
 
-        void fixGlobalInit(std::list<ast::ptr<ast::Decl>> & translationUnit, bool inLibrary) {
+        void fixGlobalInit(ast::TranslationUnit & translationUnit, bool inLibrary) {
                 ast::Pass<GlobalFixer_new> fixer;
                 accept_all(translationUnit, fixer);
@@ -119 +119 @@
                                 ast::Storage::Static, ast::Linkage::C, {new ast::Attribute("constructor", std::move(ctorParams))});
 
-                        translationUnit.emplace_back( initFunction );
+                        translationUnit.decls.emplace_back( initFunction );
                 } // if
 
@@ -128 +128 @@
                                 ast::Storage::Static, ast::Linkage::C, {new ast::Attribute("destructor", std::move(dtorParams))});
 
-                        translationUnit.emplace_back(destroyFunction);
+                        translationUnit.decls.emplace_back(destroyFunction);
                 } // if
         }

src/InitTweak/FixGlobalInit.h

@@ -29 +29 @@
         /// function is for library code.
         void fixGlobalInit( std::list< Declaration * > & translationUnit, bool inLibrary );
-        void fixGlobalInit( std::list< ast::ptr<ast::Decl> > & translationUnit, bool inLibrary );
+        void fixGlobalInit( ast::TranslationUnit & translationUnit, bool inLibrary );
 } // namespace
 

src/InitTweak/FixInit.h

@@ -19 +19 @@
 #include <string>  // for string
 
-#include <AST/Fwd.hpp>
-
 class Declaration;
+namespace ast {
+        class TranslationUnit;
+}
 
 namespace InitTweak {
@@ -27 +28 @@
         void fix( std::list< Declaration * > & translationUnit, bool inLibrary );
 
-        void fix( std::list<ast::ptr<ast::Decl>> & translationUnit, bool inLibrary);
+        void fix( ast::TranslationUnit & translationUnit, bool inLibrary);
 } // namespace
 

src/InitTweak/FixInitNew.cpp

@@ -179 +179 @@
         /// expand each object declaration to use its constructor after it is declared.
         struct FixInit : public ast::WithStmtsToAdd<> {
-                static void fixInitializers( std::list< ast::ptr<ast::Decl> > &translationUnit );
+                static void fixInitializers( ast::TranslationUnit &translationUnit );
 
                 const ast::DeclWithType * postvisit( const ast::ObjectDecl *objDecl );
@@ -225 +225 @@
 } // namespace
 
-void fix( std::list< ast::ptr<ast::Decl> > & translationUnit, bool inLibrary ) {
+void fix( ast::TranslationUnit & translationUnit, bool inLibrary ) {
         ast::Pass<SelfAssignChecker>::run( translationUnit );
 
@@ -308 +308 @@
         }
 
-        void FixInit::fixInitializers( std::list< ast::ptr<ast::Decl> > & translationUnit ) {
+        void FixInit::fixInitializers( ast::TranslationUnit & translationUnit ) {
                 ast::Pass<FixInit> fixer;
 
@@ -314 +314 @@
                 // can't use DeclMutator, because sometimes need to insert IfStmt, etc.
                 SemanticErrorException errors;
-                for ( auto i = translationUnit.begin(); i != translationUnit.end(); ++i ) {
+                for ( auto i = translationUnit.decls.begin(); i != translationUnit.decls.end(); ++i ) {
                         try {
                                 // maybeAccept( *i, fixer ); translationUnit should never contain null
                                 *i = (*i)->accept(fixer);
-                                translationUnit.splice( i, fixer.core.staticDtorDecls );
+                                translationUnit.decls.splice( i, fixer.core.staticDtorDecls );
                         } catch( SemanticErrorException &e ) {
                                 errors.append( e );