Changeset d3aa64f1 for src/ResolvExpr/Unify.cc

Timestamp:

Aug 31, 2020, 6:55:22 PM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

25a1cb0, 68f0c4e

Parents:

49a980b

Message:

pure visitor interface for new ast

File:

• src/ResolvExpr/Unify.cc (modified) (3 diffs)

src/ResolvExpr/Unify.cc

@@ -767 +767 @@
                 /// If this isn't done when satifying ttype assertions, then argument lists can have
                 /// different size and structure when they should be compatible.
-                struct TtypeExpander_new : public ast::WithShortCircuiting {
+                struct TtypeExpander_new : public ast::WithShortCircuiting, public ast::PureVisitor {
                         ast::TypeEnvironment & tenv;
 
@@ -793 +793 @@
                                 // TtypeExpander pass is impure (may mutate nodes in place)
                                 // need to make nodes shared to prevent accidental mutation
-                                ast::ptr<ast::DeclWithType> dc = d;
-                                dc = dc->accept( expander );
+                                ast::ptr<ast::DeclWithType> dc = d->accept(expander);
                                 auto types = flatten( dc->get_type() );
                                 for ( ast::ptr< ast::Type > & t : types ) {
@@ -1114 +1113 @@
                         ast::Pass<TtypeExpander_new> expander{ tenv };
 
-                        ast::ptr<ast::TupleType> tuplec = tuple;
-                        ast::ptr<ast::TupleType> tuple2c = tuple2;
-                        const ast::Type * flat = tuplec->accept( expander );
-                        const ast::Type * flat2 = tuple2c->accept( expander );
+                        // 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 );
 
                         auto types = flatten( flat );