Changeset 4d3ca1d8 for src/GenPoly/GenPoly.cc

Timestamp:

Jun 27, 2016, 3:43:10 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

888cbe4

Parents:

f1ee72e (diff), c1c0928 (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' into ctor

File:

• src/GenPoly/GenPoly.cc (modified) (1 diff)

src/GenPoly/GenPoly.cc

@@ -64 +64 @@
                         return false;
                 }
-
-                /// Replaces a TypeInstType by its referrent in the environment, if applicable
-                Type* replaceTypeInst( Type* type, const TypeSubstitution* env ) {
-                        if ( ! env ) return type;
-                        if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( type ) ) {
-                                Type *newType = env->lookup( typeInst->get_name() );
-                                if ( newType ) return newType;
-                        }
-                        return type;
-                }
+        }
+
+        Type* replaceTypeInst( Type* type, const TypeSubstitution* env ) {
+                if ( ! env ) return type;
+                if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( type ) ) {
+                        Type *newType = env->lookup( typeInst->get_name() );
+                        if ( newType ) return newType;
+                }
+                return type;
         }