Changes in src/AST/Pass.impl.hpp [d3aa64f1:7ff3e522]

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 ) \
@@ -58 +57 @@
 
 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
@@ -66 +62 @@
                 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);
                 }
 
@@ -329 +320 @@
 
                 if( __pass::differs(old_val, new_val) ) {
-                        // auto new_parent = mutate(parent);
-                        auto new_parent = __pass::mutate<core_t>(parent);
+                        auto new_parent = mutate(parent);
                         new_parent->*child = new_val;
                         parent = new_parent;
@@ -344 +334 @@
                         if ( node->forall.empty() ) return;
 
-                        node_t * mut = __pass::mutate<core_t>( node );
+                        node_t * mut = mutate( node );
                         mut->forall = subs->clone( node->forall, *this );
                         node = mut;
@@ -904 +894 @@
 
                 if(mutated) {
-                        auto n = __pass::mutate<core_t>(node);
+                        auto n = mutate(node);
                         n->clauses = std::move( new_clauses );
                         node = n;
@@ -914 +904 @@
                         auto nval = call_accept( node->field ); \
                         if(nval != node->field ) { \
-                                auto nparent = __pass::mutate<core_t>(node); \
+                                auto nparent = mutate(node); \
                                 nparent->field = nval; \
                                 node = nparent; \
@@ -1620 +1610 @@
 
                 if(mutated) {
-                        auto n = __pass::mutate<core_t>(node);
+                        auto n = mutate(node);
                         n->associations = std::move( new_kids );
                         node = n;
@@ -1950 +1940 @@
                         }
                         if (mutated) {
-                                auto new_node = __pass::mutate<core_t>( node );
+                                auto new_node = mutate( node );
                                 new_node->typeEnv.swap( new_map );
                                 node = new_node;
@@ -1966 +1956 @@
                         }
                         if (mutated) {
-                                auto new_node = __pass::mutate<core_t>( node );
+                                auto new_node = mutate( node );
                                 new_node->varEnv.swap( new_map );
                                 node = new_node;