Changeset eb5962a for src/AST/Pass.impl.hpp

Timestamp:

Jun 21, 2022, 1:39:24 PM (22 months ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

b62d1d6

Parents:

1df492a (diff), 1dbbef6 (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/AST/Pass.impl.hpp (modified) (5 diffs)

src/AST/Pass.impl.hpp

@@ -182 +182 @@
 
                 // get the stmts/decls that will need to be spliced in
-                auto stmts_before = __pass::stmtsToAddBefore( core, 0);
-                auto stmts_after  = __pass::stmtsToAddAfter ( core, 0);
-                auto decls_before = __pass::declsToAddBefore( core, 0);
-                auto decls_after  = __pass::declsToAddAfter ( core, 0);
+                auto stmts_before = __pass::stmtsToAddBefore( core, 0 );
+                auto stmts_after  = __pass::stmtsToAddAfter ( core, 0 );
+                auto decls_before = __pass::declsToAddBefore( core, 0 );
+                auto decls_after  = __pass::declsToAddAfter ( core, 0 );
 
                 // These may be modified by subnode but most be restored once we exit this statemnet.
@@ -287 +287 @@
 
                 // get the stmts/decls that will need to be spliced in
-                auto stmts_before = __pass::stmtsToAddBefore( core, 0);
-                auto stmts_after  = __pass::stmtsToAddAfter ( core, 0);
-                auto decls_before = __pass::declsToAddBefore( core, 0);
-                auto decls_after  = __pass::declsToAddAfter ( core, 0);
+                auto stmts_before = __pass::stmtsToAddBefore( core, 0 );
+                auto stmts_after  = __pass::stmtsToAddAfter ( core, 0 );
+                auto decls_before = __pass::declsToAddBefore( core, 0 );
+                auto decls_after  = __pass::declsToAddAfter ( core, 0 );
 
                 // These may be modified by subnode but most be restored once we exit this statemnet.
@@ -317 +317 @@
                                 assert(( empty( stmts_before ) && empty( stmts_after ))
                                     || ( empty( decls_before ) && empty( decls_after )) );
-
-
 
                                 // Take all the statements which should have gone after, N/A for first iteration
@@ -2116 +2114 @@
         if ( __visit_children() ) {
                 bool mutated = false;
-                std::unordered_map< ast::TypeInstType::TypeEnvKey, ast::ptr< ast::Type > > new_map;
-                for ( const auto & p : node->typeEnv ) {
+                ast::TypeSubstitution::TypeMap new_map;
+                for ( const auto & p : node->typeMap ) {
                         guard_symtab guard { *this };
                         auto new_node = p.second->accept( *this );
@@ -2125 +2123 @@
                 if (mutated) {
                         auto new_node = __pass::mutate<core_t>( node );
-                        new_node->typeEnv.swap( new_map );
+                        new_node->typeMap.swap( new_map );
                         node = new_node;
                 }