Changeset d41280e for src/GenPoly/GenPoly.h

Timestamp:

Feb 8, 2016, 10:07:42 AM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

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

Children:

c44e622

Parents:

00ede9e (diff), bd85400 (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:

Merge branch 'master' into gc_noraii

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"
 
@@ -32 +34 @@
 
         /// true iff function has polymorphic return type
-        bool isPolyRet( FunctionType *function, std::string &name, const TyVarMap &otherTyVars );
-        bool isPolyRet( FunctionType *function, std::string &name );
-        bool isPolyRet( FunctionType *function, const TyVarMap &otherTyVars );
+        ReferenceToType *isPolyRet( FunctionType *function );
 
         /// 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 );
+
+        /// 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 );
+        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 );
@@ -59 +74 @@
         /// 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