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

Timestamp:

Mar 25, 2022, 1:50:46 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

400b8be

Parents:

64bdacc (diff), 8631c84 (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) (3 diffs)

src/AST/Pass.impl.hpp

@@ -354 +354 @@
                         // Take all the elements that are different in 'values'
                         // and swap them into 'container'
-                        if( values[i] != nullptr ) std::swap(container[i], values[i]);
+                        if( values[i] != nullptr ) swap(container[i], values[i]);
                 }
 
@@ -1054 +1054 @@
                         auto n = __pass::mutate<core_t>(node);
                         for(size_t i = 0; i < new_clauses.size(); i++) {
-                                if(new_clauses.at(i).target.func != nullptr) std::swap(n->clauses.at(i).target.func, new_clauses.at(i).target.func);
+                                if(new_clauses.at(i).target.func != nullptr) swap(n->clauses.at(i).target.func, new_clauses.at(i).target.func);
 
                                 for(size_t j = 0; j < new_clauses.at(i).target.args.size(); j++) {
-                                        if(new_clauses.at(i).target.args.at(j) != nullptr) std::swap(n->clauses.at(i).target.args.at(j), new_clauses.at(i).target.args.at(j));
+                                        if(new_clauses.at(i).target.args.at(j) != nullptr) swap(n->clauses.at(i).target.args.at(j), new_clauses.at(i).target.args.at(j));
                                 }
 
-                                if(new_clauses.at(i).stmt != nullptr) std::swap(n->clauses.at(i).stmt, new_clauses.at(i).stmt);
-                                if(new_clauses.at(i).cond != nullptr) std::swap(n->clauses.at(i).cond, new_clauses.at(i).cond);
+                                if(new_clauses.at(i).stmt != nullptr) swap(n->clauses.at(i).stmt, new_clauses.at(i).stmt);
+                                if(new_clauses.at(i).cond != nullptr) swap(n->clauses.at(i).cond, new_clauses.at(i).cond);
                         }
                         node = n;
@@ -2151 +2151 @@
 
         if ( __visit_children() ) {
-                {
-                        bool mutated = false;
-                        std::unordered_map< ast::TypeInstType::TypeEnvKey, ast::ptr< ast::Type > > new_map;
-                        for ( const auto & p : node->typeEnv ) {
-                                guard_symtab guard { *this };
-                                auto new_node = p.second->accept( *this );
-                                if (new_node != p.second) mutated = true;
-                                new_map.insert({ p.first, new_node });
-                        }
-                        if (mutated) {
-                                auto new_node = __pass::mutate<core_t>( node );
-                                new_node->typeEnv.swap( new_map );
-                                node = new_node;
-                        }
+                bool mutated = false;
+                std::unordered_map< ast::TypeInstType::TypeEnvKey, ast::ptr< ast::Type > > new_map;
+                for ( const auto & p : node->typeEnv ) {
+                        guard_symtab guard { *this };
+                        auto new_node = p.second->accept( *this );
+                        if (new_node != p.second) mutated = true;
+                        new_map.insert({ p.first, new_node });
+                }
+                if (mutated) {
+                        auto new_node = __pass::mutate<core_t>( node );
+                        new_node->typeEnv.swap( new_map );
+                        node = new_node;
                 }
         }