Changeset 25a1cb0 for src/AST/Pass.impl.hpp

Timestamp:

Sep 1, 2020, 1:18:10 PM (5 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:

86c1f1c3, a77496cb

Parents:

8d8ac3b (diff), d3aa64f1 (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) (10 diffs)

src/AST/Pass.impl.hpp

@@ -21 +21 @@
 
 #include "AST/TypeSubstitution.hpp"
+// #include "AST/Copy.hpp"
 
 #define VISIT_START( node ) \
@@ -57 +58 @@
 
 namespace ast {
+        template<typename node_t>
+        node_t * shallowCopy( const node_t * node );
+
         namespace __pass {
                 // Check if this is either a null pointer or a pointer to an empty container
@@ -62 +66 @@
                 static inline bool empty( T * ptr ) {
                         return !ptr || ptr->empty();
+                }
+
+                template< typename core_t, typename node_t >
+                static inline node_t* mutate(const node_t *node) {
+                        return std::is_base_of<PureVisitor, core_t>::value ? ::ast::shallowCopy(node) : ::ast::mutate(node);
                 }
 
@@ -320 +329 @@
 
                 if( __pass::differs(old_val, new_val) ) {
-                        auto new_parent = mutate(parent);
+                        // auto new_parent = mutate(parent);
+                        auto new_parent = __pass::mutate<core_t>(parent);
                         new_parent->*child = new_val;
                         parent = new_parent;
@@ -334 +344 @@
                         if ( node->forall.empty() ) return;
 
-                        node_t * mut = mutate( node );
+                        node_t * mut = __pass::mutate<core_t>( node );
                         mut->forall = subs->clone( node->forall, *this );
                         node = mut;
@@ -894 +904 @@
 
                 if(mutated) {
-                        auto n = mutate(node);
+                        auto n = __pass::mutate<core_t>(node);
                         n->clauses = std::move( new_clauses );
                         node = n;
@@ -904 +914 @@
                         auto nval = call_accept( node->field ); \
                         if(nval != node->field ) { \
-                                auto nparent = mutate(node); \
+                                auto nparent = __pass::mutate<core_t>(node); \
                                 nparent->field = nval; \
                                 node = nparent; \
@@ -1610 +1620 @@
 
                 if(mutated) {
-                        auto n = mutate(node);
+                        auto n = __pass::mutate<core_t>(node);
                         n->associations = std::move( new_kids );
                         node = n;
@@ -1940 +1950 @@
                         }
                         if (mutated) {
-                                auto new_node = mutate( node );
+                                auto new_node = __pass::mutate<core_t>( node );
                                 new_node->typeEnv.swap( new_map );
                                 node = new_node;
@@ -1956 +1966 @@
                         }
                         if (mutated) {
-                                auto new_node = mutate( node );
+                                auto new_node = __pass::mutate<core_t>( node );
                                 new_node->varEnv.swap( new_map );
                                 node = new_node;