Changeset 8e9d567 for src/AST

Timestamp:

Aug 19, 2020, 2:09:04 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:

03a4c73

Parents:

133a161 (diff), 13d33a75 (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/AST

Files:

• Convert.cpp (modified) (1 diff)
• Print.cpp (modified) (1 diff)
• TypeSubstitution.hpp (modified) (1 diff)

src/AST/Convert.cpp

@@ -167 +167 @@
                         LinkageSpec::Spec( node->linkage.val ),
                         bfwd,
-                        type,
+                        type->clone(),
                         init,
                         attr,

src/AST/Print.cpp

@@ -237 +237 @@
         void postprint( const ast::Expr * node ) {
                 print( node->inferred );
+
+                if ( node->result ) {
+                        os << endl << indent << "... with resolved type:" << endl;
+                        ++indent;
+                        os << indent;
+                        node->result->accept( *this );
+                        --indent;
+                }
 
                 if ( node->env ) {

src/AST/TypeSubstitution.hpp

@@ -195 +195 @@
         assert( input );
         Pass<Substituter> sub( *this, true );
-        input = strict_dynamic_cast< const SynTreeClass * >( input->accept( sub ) );
+        input = strict_dynamic_cast< const SynTreeClass * >( deepCopy(input)->accept( sub ) );
         return { input, sub.core.subCount };
 }