Changeset 4bf5298 for translator/GenPoly/GenPoly.cc

Timestamp:

May 14, 2015, 1:54:02 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, string, with_gc

Children:

5c7fb6c

Parents:

c11e31c (diff), b1a6d6b (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:

update merged files from master

File:

• translator/GenPoly/GenPoly.cc (modified) (3 diffs)

translator/GenPoly/GenPoly.cc

@@ -9 +9 @@
 #include "SynTree/Type.h"
 
+#include <iostream>
+using namespace std;
 
 namespace GenPoly {
 
+// interface functions
+bool isPolyVal( Type *type, const TyVarMap &tyVars ) {
+  return isPolyVal( type, tyVars, false );
+}
+
+bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVars ) {  
+  return needsAdapter( adaptee, tyVars, false );
+}
+
 bool
-isPolyVal( Type *type, const TyVarMap &tyVars )
+isPolyVal( Type *type, const TyVarMap &tyVars, bool considerAllTyVars )
 {
   if( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( type ) ) {
@@ -19 +30 @@
       return true;
     }
+    return considerAllTyVars;
   }
   return false;
@@ -26 +38 @@
 // parameters have polymorphic type
 bool
-needsAdapter( FunctionType *adaptee, const TyVarMap &tyVars )
+needsAdapter( FunctionType *adaptee, const TyVarMap &tyVars, bool considerAllTyVars )
 {
   bool needsAdapter = false;
-  if( !adaptee->get_returnVals().empty() && isPolyVal( adaptee->get_returnVals().front()->get_type(), tyVars ) ) {
+  if( !adaptee->get_returnVals().empty() && isPolyVal( adaptee->get_returnVals().front()->get_type(), tyVars, considerAllTyVars ) ) {
     needsAdapter = true;
   }
   for( std::list< DeclarationWithType* >::const_iterator innerArg = adaptee->get_parameters().begin(); !needsAdapter && innerArg != adaptee->get_parameters().end(); ++innerArg ) {
-    if( isPolyVal( (*innerArg)->get_type(), tyVars ) ) {
+    if( isPolyVal( (*innerArg)->get_type(), tyVars, considerAllTyVars ) ) {
       needsAdapter = true;
     }