Changes in src/GenPoly/GenPoly.h [3bb195cb:2c57025]

File:

• src/GenPoly/GenPoly.h (modified) (6 diffs)

src/GenPoly/GenPoly.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// GenPoly.h -- 
+// GenPoly.h --
 //
 // Author           : Richard C. Bilson
@@ -30 +30 @@
 
 namespace GenPoly {
-        typedef ErasableScopedMap< std::string, TypeDecl::Kind > TyVarMap;
+        typedef ErasableScopedMap< std::string, TypeDecl::Data > TyVarMap;
 
         /// Replaces a TypeInstType by its referrent in the environment, if applicable
         Type* replaceTypeInst( Type* type, const TypeSubstitution* env );
-        
+
         /// returns polymorphic type if is polymorphic type, NULL otherwise; will look up substitution in env if provided
         Type *isPolyType( Type *type, const TypeSubstitution *env = 0 );
-        
+
         /// returns polymorphic type if is polymorphic type in tyVars, NULL otherwise; will look up substitution in env if provided
         Type *isPolyType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env = 0 );
 
         /// returns dynamic-layout type if is dynamic-layout type in tyVars, NULL otherwise; will look up substitution in env if provided
-        Type *isDynType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env = 0 );
+        ReferenceToType *isDynType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env = 0 );
 
         /// true iff function has dynamic-layout return type under the given type variable map
@@ -55 +55 @@
         /// returns polymorphic type if is pointer to polymorphic type, NULL otherwise; will look up substitution in env if provided
         Type *isPolyPtr( Type *type, const TypeSubstitution *env = 0 );
-        
+
         /// returns polymorphic type if is pointer to polymorphic type in tyVars, NULL otherwise; will look up substitution in env if provided
         Type *isPolyPtr( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env = 0 );
@@ -74 +74 @@
         VariableExpr *getBaseVar( Expression *expr, int *levels = 0 );
 
+        /// Adds the type variable `tyVar` to `tyVarMap`
+        void addToTyVarMap( TypeDecl * tyVar, TyVarMap &tyVarMap );
+
         /// Adds the declarations in the forall list of type (and its pointed-to type if it's a pointer type) to `tyVarMap`
         void makeTyVarMap( Type *type, TyVarMap &tyVarMap );
-        
+
         /// Prints type variable map
         void printTyVarMap( std::ostream &os, const TyVarMap &tyVarMap );
@@ -82 +85 @@
         /// Gets the mangled name of this type; alias for SymTab::Mangler::mangleType().
         inline std::string mangleType( Type *ty ) { return SymTab::Mangler::mangleType( ty ); }
-        
+
         /// Gets the name of the sizeof parameter for the type, given its mangled name
         inline std::string sizeofName( const std::string &name ) { return std::string( "_sizeof_" ) + name; }
@@ -94 +97 @@
         /// Gets the name of the layout function for a given aggregate type, given its declaration
         inline std::string layoutofName( AggregateDecl *decl ) { return std::string( "_layoutof_" ) + decl->get_name(); }
-        
+
 } // namespace GenPoly