Changeset 3096ec1 for src/ResolvExpr

Timestamp:

Oct 2, 2017, 6:02:25 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

11a2d9b

Parents:

9d79f93

Message:

Convert TtypeExpander? to PassVisitor?

File:

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

src/ResolvExpr/Unify.cc

@@ -22 +22 @@
 #include <utility>                // for pair
 
+#include "Common/PassVisitor.h"   // for PassVisitor
 #include "FindOpenVars.h"         // for findOpenVars
 #include "Parser/LinkageSpec.h"   // for C
@@ -537 +538 @@
         /// If this isn't done then argument lists can have wildly different
         /// size and structure, when they should be compatible.
-        struct TtypeExpander : public Mutator {
-                TypeEnvironment & env;
-                TtypeExpander( TypeEnvironment & env ) : env( env ) {}
-                Type * mutate( TypeInstType * typeInst ) {
+        struct TtypeExpander : public WithShortCircuiting {
+                TypeEnvironment & tenv;
+                TtypeExpander( TypeEnvironment & tenv ) : tenv( tenv ) {}
+                void premutate( TypeInstType * ) { visit_children = false; }
+                Type * postmutate( TypeInstType * typeInst ) {
                         EqvClass eqvClass;
-                        if ( env.lookup( typeInst->get_name(), eqvClass ) ) {
+                        if ( tenv.lookup( typeInst->get_name(), eqvClass ) ) {
                                 if ( eqvClass.data.kind == TypeDecl::Ttype ) {
                                         // expand ttype parameter into its actual type
@@ -560 +562 @@
                 dst.clear();
                 for ( DeclarationWithType * dcl : src ) {
-                        TtypeExpander expander( env );
+                        PassVisitor<TtypeExpander> expander( env );
                         dcl->acceptMutator( expander );
                         std::list< Type * > types;
@@ -750 +752 @@
                         std::list<Type *> types1, types2;
 
-                        TtypeExpander expander( env );
+                        PassVisitor<TtypeExpander> expander( env );
                         flat1->acceptMutator( expander );
                         flat2->acceptMutator( expander );