Changes in src/GenPoly/GenPoly.h [8488c715:7754cde]

File:

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

src/GenPoly/GenPoly.h

@@ -20 +20 @@
 #include <string>
 #include <iostream>
-#include <utility>
 
 #include "SynTree/Declaration.h"
-#include "SynTree/Type.h"
 #include "SynTree/TypeSubstitution.h"
 
@@ -34 +32 @@
 
         /// true iff function has polymorphic return type
-        ReferenceToType *isPolyRet( FunctionType *function );
+        bool isPolyRet( FunctionType *function, std::string &name, const TyVarMap &otherTyVars );
+        bool isPolyRet( FunctionType *function, std::string &name );
+        bool isPolyRet( FunctionType *function, const TyVarMap &otherTyVars );
 
         /// returns polymorphic type if is polymorphic type, NULL otherwise; will look up substitution in env if provided
@@ -48 +48 @@
         Type *isPolyPtr( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env = 0 );
 
-        /// if the base type (after dereferencing N >= 0 pointers) is a polymorphic type, returns the base type, NULL otherwise;
-        /// N will be stored in levels, if provided, will look up substitution in env if provided
-        Type *hasPolyBase( Type *type, int *levels = 0, const TypeSubstitution *env = 0 );
+        /// Returns a pointer to the base FunctionType if ty is the type of a function (or pointer to one), NULL otherwise
+        FunctionType * getFunctionType( Type *ty );
 
-        /// if the base type (after dereferencing N >= 0 pointers) is a polymorphic type in tyVars, returns the base type, NULL otherwise;
-        /// N will be stored in levels, if provided, will look up substitution in env if provided
-        Type *hasPolyBase( Type *type, const TyVarMap &tyVars, int *levels = 0, const TypeSubstitution *env = 0 );
-
-        /// Returns a pointer to the base FunctionType if ty is the type of a function (or pointer to one), NULL otherwise
-        FunctionType *getFunctionType( Type *ty );
-
-        /// If expr (after dereferencing N >= 0 pointers) is a variable expression, returns the variable expression, NULL otherwise;
-        /// N will be stored in levels, if provided
-        VariableExpr *getBaseVar( Expression *expr, int *levels = 0 );
-
-        /// 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 );
@@ -74 +59 @@
         /// Gets the name of the alignof parameter for the type
         std::string alignofName( Type *ty );
-
-        /// Gets the name of the offsetof parameter for the type
-        std::string offsetofName( Type *ty );
 } // namespace GenPoly