Changeset 3bb195cb for src/GenPoly/GenPoly.cc

Timestamp:

Aug 8, 2016, 3:44:56 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, 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:

ce76eb9

Parents:

752dc70

Message:

Dtypes now erased on dtype-only generic types, tests pass, build produces many warnings

File:

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

src/GenPoly/GenPoly.cc

@@ -23 +23 @@
 
 namespace GenPoly {
-        bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVars ) {
-                if ( ! adaptee->get_returnVals().empty() && isPolyType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) {
-                        return true;
-                } // if
-                for ( std::list< DeclarationWithType* >::const_iterator innerArg = adaptee->get_parameters().begin(); innerArg != adaptee->get_parameters().end(); ++innerArg ) {
-                        if ( isPolyType( (*innerArg)->get_type(), tyVars ) ) {
-                                return true;
-                        } // if
-                } // for
-                return false;
-        }
-
-        ReferenceToType *isPolyRet( FunctionType *function ) {
-                if ( ! function->get_returnVals().empty() ) {
-                        TyVarMap forallTypes( (TypeDecl::Kind)-1 );
-                        makeTyVarMap( function, forallTypes );
-                        return (ReferenceToType*)isPolyType( function->get_returnVals().front()->get_type(), forallTypes );
-                } // if
-                return 0;
-        }
-
         namespace {
                 /// Checks a parameter list for polymorphic parameters; will substitute according to env if present
@@ -64 +43 @@
                         return false;
                 }
+
+                /// Checks a parameter list for dynamic-layout parameters from tyVars; will substitute according to env if present
+                bool hasDynParams( std::list< Expression* >& params, const TyVarMap &tyVars, const TypeSubstitution *env ) {
+                        for ( std::list< Expression* >::iterator param = params.begin(); param != params.end(); ++param ) {
+                                TypeExpr *paramType = dynamic_cast< TypeExpr* >( *param );
+                                assert(paramType && "Aggregate parameters should be type expressions");
+                                if ( isDynType( paramType->get_type(), tyVars, env ) ) return true;
+                        }
+                        return false;
+                }
         }
 
@@ -101 +90 @@
                 }
                 return 0;
+        }
+
+        Type *isDynType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env ) {
+                type = replaceTypeInst( type, env );
+
+                if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) {
+                        auto var = tyVars.find( typeInst->get_name() );
+                        if ( var != tyVars.end() && var->second == TypeDecl::Any ) {
+                                return type;
+                        }
+                } else if ( StructInstType *structType = dynamic_cast< StructInstType* >( type ) ) {
+                        if ( hasDynParams( structType->get_parameters(), tyVars, env ) ) return type;
+                } else if ( UnionInstType *unionType = dynamic_cast< UnionInstType* >( type ) ) {
+                        if ( hasDynParams( unionType->get_parameters(), tyVars, env ) ) return type;
+                }
+                return 0;
+        }
+
+        ReferenceToType *isDynRet( FunctionType *function, const TyVarMap &forallTypes ) {
+                if ( function->get_returnVals().empty() ) return 0;
+                
+                return (ReferenceToType*)isDynType( function->get_returnVals().front()->get_type(), forallTypes );
+        }
+
+        ReferenceToType *isDynRet( FunctionType *function ) {
+                if ( function->get_returnVals().empty() ) return 0;
+
+                TyVarMap forallTypes( (TypeDecl::Kind)-1 );
+                makeTyVarMap( function, forallTypes );
+                return (ReferenceToType*)isDynType( function->get_returnVals().front()->get_type(), forallTypes );
+        }
+
+        bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVars ) {
+//              if ( ! adaptee->get_returnVals().empty() && isPolyType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) {
+//                      return true;
+//              } // if
+                if ( isDynRet( adaptee, tyVars ) ) return true;
+                
+                for ( std::list< DeclarationWithType* >::const_iterator innerArg = adaptee->get_parameters().begin(); innerArg != adaptee->get_parameters().end(); ++innerArg ) {
+//                      if ( isPolyType( (*innerArg)->get_type(), tyVars ) ) {
+                        if ( isDynType( (*innerArg)->get_type(), tyVars ) ) {
+                                return true;
+                        } // if
+                } // for
+                return false;
         }