Changeset ce55a81 for src/AST/TypeSubstitution.hpp

Timestamp:

Sep 4, 2020, 2:14:10 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:

14d8a9b

Parents:

56c44dc (diff), 2801829 (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/TypeSubstitution.hpp (modified) (4 diffs)

src/AST/TypeSubstitution.hpp

@@ -46 +46 @@
         template< typename SynTreeClass >
         struct ApplyResult {
-                // const SynTreeClass * node;
                 ast::ptr<SynTreeClass> node;
                 int count;
@@ -159 +158 @@
 
 // definitition must happen after PassVisitor is included so that WithGuards can be used
-struct TypeSubstitution::Substituter : public WithGuards, public WithVisitorRef<Substituter> {
+struct TypeSubstitution::Substituter : public WithGuards, public WithVisitorRef<Substituter>, public PureVisitor {
                 static size_t traceId;
 
@@ -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 };
 }
@@ -195 +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 };
 }