Changeset 33a7b6d for src/GenPoly/Box.cc

Timestamp:

Nov 15, 2016, 5:30:52 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:

d9fa60a

Parents:

8f9cc50

Message:

changed use of formal types to actual types for boxing return parameters and passing type variables, fix bug where generic struct's members would change types when a member is accessed on a concrete instantiation

File:

• src/GenPoly/Box.cc (modified) (3 diffs)

src/GenPoly/Box.cc

@@ -1288 +1288 @@
                         TyVarMap exprTyVars( (TypeDecl::Kind)-1 );
                         makeTyVarMap( function, exprTyVars );
+                        ReferenceToType *concRetType = dynamic_cast< ReferenceToType* >( appExpr->get_result() ); // xxx - is concRetType a good name?
                         ReferenceToType *dynRetType = isDynRet( function, exprTyVars );
 
                         if ( dynRetType ) {
-                                ret = addDynRetParam( appExpr, function, dynRetType, arg );
+                                ret = addDynRetParam( appExpr, function, concRetType, arg ); // xxx - used to use dynRetType instead of concRetType
                         } else if ( needsAdapter( function, scopeTyVars ) ) {
                                 // std::cerr << "needs adapter: ";
@@ -1301 +1302 @@
                         arg = appExpr->get_args().begin();
 
-                        passTypeVars( appExpr, dynRetType, arg, exprTyVars );
+                        passTypeVars( appExpr, concRetType, arg, exprTyVars ); // xxx - used to use dynRetType instead of concRetType
                         addInferredParams( appExpr, function, arg, exprTyVars );
 
@@ -1364 +1365 @@
                         // line below cloned from FixFunction.cc
                         // xxx - functionObj is never added to a list of declarations...
+                        // alternatively, this function could return a new VariableExpr( functionDecl ) and change the result type of the new expression
                         ObjectDecl *functionObj = new ObjectDecl( functionDecl->get_name(), functionDecl->get_storageClass(), functionDecl->get_linkage(), 0,
                                                                   new PointerType( Type::Qualifiers(), functionDecl->get_type()->clone() ), 0 );