Changeset 4406887 for src/InitTweak/FixInitNew.cpp

Timestamp:

Nov 3, 2020, 8:48:53 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

a3f5208a

Parents:

3c80ccc (diff), 293dc1c (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/InitTweak/FixInitNew.cpp (modified) (4 diffs)

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 );