Changeset 540de412 for src/GenPoly

Timestamp:

May 2, 2016, 3:09:08 PM (9 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:

fbfde843

Parents:

d8ba086

Message:

'merge' type substitutions from resolved copy constructors, add case to getBaseVar for CommaExpr?

Location:

src/GenPoly

Files:

• Box.cc (modified) (2 diffs)
• GenPoly.cc (modified) (6 diffs)
• PolyMutator.cc (modified) (3 diffs)

src/GenPoly/Box.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Fri Apr 29 12:16:11 2016
+// Last Modified On : Mon May 02 14:49:01 2016
 // Update Count     : 295
 //
@@ -785 +785 @@
                                         } else {
                                                 /// xxx - should this be an assertion?
-                                                throw SemanticError( "unbound type variable in application ", appExpr );
+                                                throw SemanticError( "unbound type variable: " + tyParm->first + " in application ", appExpr );
                                         } // if
                                 } // if

src/GenPoly/GenPoly.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// GenPoly.cc -- 
+// GenPoly.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec 15 16:11:18 2015
+// Last Modified By : Rob Schluntz
+// Last Modified On : Mon May 02 14:53:33 2016
 // Update Count     : 13
 //
@@ -81 +81 @@
                 return 0;
         }
-        
+
         Type *isPolyType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env ) {
                 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) {
@@ -112 +112 @@
                 return 0;
         }
-        
+
         Type *isPolyPtr( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env ) {
                 if ( PointerType *ptr = dynamic_cast< PointerType *>( type ) ) {
@@ -146 +146 @@
                 return isPolyType( type, env );
         }
-        
+
         Type * hasPolyBase( Type *type, const TyVarMap &tyVars, int *levels, const TypeSubstitution *env ) {
                 int dummy;
@@ -192 +192 @@
                                 if ( ! fn || fn->get_name() != std::string("*?") ) return 0;
                                 expr = *untypedExpr->begin_args();
+                        } else if ( CommaExpr *commaExpr = dynamic_cast< CommaExpr* >( expr ) ) {
+                                // copy constructors insert comma exprs, look at second argument which contains the variable
+                                expr = commaExpr->get_arg2();
+                                continue;
                         } else break;
 
@@ -209 +213 @@
                 }
         }
-        
+
         void printTyVarMap( std::ostream &os, const TyVarMap &tyVarMap ) {
                 for ( TyVarMap::const_iterator i = tyVarMap.begin(); i != tyVarMap.end(); ++i ) {

src/GenPoly/PolyMutator.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// PolyMutator.cc -- 
+// PolyMutator.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Fri Aug 14 15:28:50 2015
+// Last Modified On : Mon May 02 14:50:58 2016
 // Update Count     : 11
 //
@@ -63 +63 @@
                                 env = expr->get_env();
                         }
+                        // xxx - should env be cloned (or moved) onto the result of the mutate?
                         return expr->acceptMutator( *this );
                 } else {
@@ -144 +145 @@
                 return untypedExpr;
         }
- 
- 
+
+
         Initializer *PolyMutator::mutate( SingleInit *singleInit ) {
                 singleInit->set_value( mutateExpression( singleInit->get_value() ) );