Changeset 2ec65ad

Timestamp:

Mar 1, 2018, 4:58:58 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:

ee61248

Parents:

a8a2b0a

Message:

Refactor trimEnv into TypeSubstitution::newFromExpr

Location:

src

Files:

• GenPoly/Specialize.cc (modified) (2 diffs)
• SynTree/TypeSubstitution.cc (modified) (1 diff)
• SynTree/TypeSubstitution.h (modified) (1 diff)

src/GenPoly/Specialize.cc

@@ -200 +200 @@
         }
 
-        struct EnvTrimmer {
-                TypeSubstitution * env, * newEnv;
-                EnvTrimmer( TypeSubstitution * env, TypeSubstitution * newEnv ) : env( env ), newEnv( newEnv ){}
-                void previsit( TypeDecl * tyDecl ) {
-                        // transfer known bindings for seen type variables
-                        if ( Type * t = env->lookup( tyDecl->name ) ) {
-                                newEnv->add( tyDecl->name, t );
-                        }
-                }
-        };
-
-        /// reduce environment to just the parts that are referenced in a given expression
-        TypeSubstitution * trimEnv( ApplicationExpr * expr, TypeSubstitution * env ) {
-                if ( env ) {
-                        TypeSubstitution * newEnv = new TypeSubstitution();
-                        PassVisitor<EnvTrimmer> trimmer( env, newEnv );
-                        expr->accept( trimmer );
-                        return newEnv;
-                }
-                return nullptr;
-        }
-
         /// Generates a thunk that calls `actual` with type `funType` and returns its address
         Expression * Specialize::createThunkFunction( FunctionType *funType, Expression *actual, InferredParams *inferParams ) {
@@ -265 +243 @@
                 }
 
-                appExpr->set_env( trimEnv( appExpr, env ) );
+                appExpr->env = TypeSubstitution::newFromExpr( appExpr, env );
                 if ( inferParams ) {
                         appExpr->get_inferParams() = *inferParams;

src/SynTree/TypeSubstitution.cc

@@ -104 +104 @@
 bool TypeSubstitution::empty() const {
         return typeEnv.empty() && varEnv.empty();
+}
+
+namespace {
+        struct EnvTrimmer {
+                TypeSubstitution * env, * newEnv;
+                EnvTrimmer( TypeSubstitution * env, TypeSubstitution * newEnv ) : env( env ), newEnv( newEnv ){}
+                void previsit( TypeDecl * tyDecl ) {
+                        // transfer known bindings for seen type variables
+                        if ( Type * t = env->lookup( tyDecl->name ) ) {
+                                newEnv->add( tyDecl->name, t );
+                        }
+                }
+        };
+} // namespace
+
+/// reduce environment to just the parts that are referenced in a given expression
+TypeSubstitution * TypeSubstitution::newFromExpr( Expression * expr, TypeSubstitution * env ) {
+        if ( env ) {
+                TypeSubstitution * newEnv = new TypeSubstitution();
+                PassVisitor<EnvTrimmer> trimmer( env, newEnv );
+                expr->accept( trimmer );
+                return newEnv;
+        }
+        return nullptr;
 }
 

src/SynTree/TypeSubstitution.h

@@ -54 +54 @@
         template< typename TypeInstListIterator >
         void extract( TypeInstListIterator begin, TypeInstListIterator end, TypeSubstitution &result );
+
+        /// create a new TypeSubstitution using bindings from env containing all of the type variables in expr
+        static TypeSubstitution * newFromExpr( Expression * expr, TypeSubstitution * env );
 
         void normalize();