Changeset 447b0d2b for src

Timestamp:

Sep 3, 2020, 12:07:15 PM (4 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:

9617533

Parents:

4bc27c0 (diff), 73f1b1c (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

Location:

src

Files:

• AST/Pass.hpp (modified) (2 diffs)
• AST/Pass.impl.hpp (modified) (2 diffs)
• AST/TypeSubstitution.hpp (modified) (3 diffs)
• ResolvExpr/Unify.cc (modified) (1 diff)

src/AST/Pass.hpp

@@ -48 +48 @@
 //
 // Several additional features are available through inheritance
+// | PureVisitor           - makes the visitor pure, it never modifies nodes in place and always
+//                           clones nodes it needs to make changes to
 // | WithTypeSubstitution  - provides polymorphic const TypeSubstitution * env for the
 //                           current expression
@@ -267 +269 @@
 /// Keep track of the polymorphic const TypeSubstitution * env for the current expression
 
-/// marker to force shallow copies in pass visit
+/// If used the visitor will always clone nodes.
 struct PureVisitor {};
 

src/AST/Pass.impl.hpp

@@ -21 +21 @@
 
 #include "AST/TypeSubstitution.hpp"
-// #include "AST/Copy.hpp"
 
 #define VISIT_START( node ) \
@@ -329 +328 @@
 
                 if( __pass::differs(old_val, new_val) ) {
-                        // auto new_parent = mutate(parent);
                         auto new_parent = __pass::mutate<core_t>(parent);
                         new_parent->*child = new_val;

src/AST/TypeSubstitution.hpp

@@ -46 +46 @@
         template< typename SynTreeClass >
         struct ApplyResult {
-                // const SynTreeClass * node;
                 ast::ptr<SynTreeClass> node;
                 int count;
@@ -187 +186 @@
         assert( input );
         Pass<Substituter> sub( *this, false );
-//      input = strict_dynamic_cast< const SynTreeClass * >( deepCopy(input)->accept( sub ) );
         input = strict_dynamic_cast< const SynTreeClass * >( input->accept( sub ) );
         return { input, sub.core.subCount };
@@ -196 +194 @@
         assert( input );
         Pass<Substituter> sub( *this, true );
-//      input = strict_dynamic_cast< const SynTreeClass * >( deepCopy(input)->accept( sub ) );
         input = strict_dynamic_cast< const SynTreeClass * >( input->accept( sub ) );
         return { input, sub.core.subCount };

src/ResolvExpr/Unify.cc

@@ -1113 +1113 @@
                         ast::Pass<TtypeExpander_new> expander{ tenv };
 
-                        // ast::ptr<ast::TupleType> tuplec = tuple;
-                        // ast::ptr<ast::TupleType> tuple2c = tuple2;
                         const ast::Type * flat = tuple->accept( expander );
                         const ast::Type * flat2 = tuple2->accept( expander );