Changeset dbf5e18 for src/Validate/ReplaceTypedef.cpp

Timestamp:

Jul 17, 2023, 9:24:46 AM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

7ed01be

Parents:

847ab8f (diff), 0d7fc00 (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/Validate/ReplaceTypedef.cpp (modified) (4 diffs)

src/Validate/ReplaceTypedef.cpp

@@ -20 +20 @@
 #include "Common/ScopedMap.h"
 #include "Common/UniqueName.h"
-#include "Common/utility.h"
 #include "ResolvExpr/Unify.h"
 
@@ -294 +293 @@
                 aggrDecl->name, ast::Storage::Classes(), type, aggrDecl->linkage );
         // Add the implicit typedef to the AST.
-        declsToAddBefore.push_back( ast::deepCopy( typeDecl.get() ) );
+        declsToAddAfter.push_back( ast::deepCopy( typeDecl.get() ) );
         // Shore the name in the map of names.
         typedefNames[ aggrDecl->name ] =
@@ -316 +315 @@
         auto mut = ast::mutate( decl );
 
-        std::vector<ast::ptr<ast::Decl>> members;
+        std::list<ast::ptr<ast::Decl>> members;
         // Unroll accept_all for decl->members so that implicit typedefs for
         // nested types are added to the aggregate body.
         for ( ast::ptr<ast::Decl> const & member : mut->members ) {
+                assert( declsToAddBefore.empty() );
                 assert( declsToAddAfter.empty() );
                 ast::Decl const * newMember = nullptr;
@@ -328 +328 @@
                 }
                 if ( !declsToAddBefore.empty() ) {
-                        for ( auto declToAdd : declsToAddBefore ) {
-                                members.push_back( declToAdd );
-                        }
-                        declsToAddBefore.clear();
+                        members.splice( members.end(), declsToAddBefore );
                 }
                 members.push_back( newMember );
-        }
+                if ( !declsToAddAfter.empty() ) {
+                        members.splice( members.end(), declsToAddAfter );
+                }
+        }
+        assert( declsToAddBefore.empty() );
         assert( declsToAddAfter.empty() );
         if ( !errors.isEmpty() ) { throw errors; }