Changeset be945ac for src/GenPoly

Timestamp:

Jun 2, 2016, 11:51:07 AM (10 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, stuck-waitfor-destruct, with_gc

Children:

2edd5502

Parents:

f1b1e4c (diff), 4df85197 (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

Conflicts:

src/SymTab/Validate.cc

File:

• src/GenPoly/GenPoly.cc (modified) (7 diffs)

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 ) {
@@ -78 +78 @@
         Type *isPolyType( Type *type, const TypeSubstitution *env ) {
                 type = replaceTypeInst( type, env );
-                
+
                 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) {
                         return type;
@@ -91 +91 @@
         Type *isPolyType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env ) {
                 type = replaceTypeInst( type, env );
-                
+
                 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) {
                         if ( tyVars.find( typeInst->get_name() ) != tyVars.end() ) {
@@ -106 +106 @@
         Type *isPolyPtr( Type *type, const TypeSubstitution *env ) {
                 type = replaceTypeInst( type, env );
-                
+
                 if ( PointerType *ptr = dynamic_cast< PointerType *>( type ) ) {
                         return isPolyType( ptr->get_base(), env );
@@ -115 +115 @@
         Type *isPolyPtr( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env ) {
                 type = replaceTypeInst( type, env );
-                
+
                 if ( PointerType *ptr = dynamic_cast< PointerType *>( type ) ) {
                         return isPolyType( ptr->get_base(), tyVars, env );
@@ -129 +129 @@
                 while ( true ) {
                         type = replaceTypeInst( type, env );
-                
+
                         if ( PointerType *ptr = dynamic_cast< PointerType *>( type ) ) {
                                 type = ptr->get_base();
@@ -146 +146 @@
                 while ( true ) {
                         type = replaceTypeInst( type, env );
-                
+
                         if ( PointerType *ptr = dynamic_cast< PointerType *>( type ) ) {
                                 type = ptr->get_base();