Changes in src/GenPoly/GenPoly.h [4da152a:c8837e5]

File:

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

src/GenPoly/GenPoly.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Oct 24 15:18:00 2022
-// Update Count     : 11
+// Last Modified On : Fri Oct  7 15:06:00 2022
+// Update Count     : 9
 //
 
@@ -22 +22 @@
 #include "AST/Decl.hpp"           // for TypeDecl::Data
 #include "AST/Fwd.hpp"            // for ApplicationExpr, BaseInstType, Func...
-#include "AST/Type.hpp"           // for TypeInstType::TypeEnvKey
 #include "SymTab/Mangler.h"       // for Mangler
 #include "SynTree/Declaration.h"  // for TypeDecl::Data, AggregateDecl, Type...
@@ -29 +28 @@
 namespace GenPoly {
 
+        // TODO Via some tricks this works for ast::TypeDecl::Data as well.
         typedef ErasableScopedMap< std::string, TypeDecl::Data > TyVarMap;
-        using TypeVarMap = ErasableScopedMap< ast::TypeInstType::TypeEnvKey, ast::TypeDecl::Data >;
+        using TypeVarMap = ErasableScopedMap< std::string, ast::TypeDecl::Data >;
 
         /// Replaces a TypeInstType by its referrent in the environment, if applicable
         Type* replaceTypeInst( Type* type, const TypeSubstitution* env );
-        const Type* replaceTypeInst( const Type* type, const TypeSubstitution* env );
-        const ast::Type * replaceTypeInst( const ast::Type *, const ast::TypeSubstitution * );
 
         /// returns polymorphic type if is polymorphic type, NULL otherwise; will look up substitution in env if provided
@@ -55 +53 @@
         /// true iff function has dynamic-layout return type under the type variable map generated from its forall-parameters
         ReferenceToType *isDynRet( FunctionType *function );
-        const ast::BaseInstType *isDynRet( const ast::FunctionType * func );
 
         /// A function needs an adapter if it returns a dynamic-layout value or if any of its parameters have dynamic-layout type
@@ -115 +112 @@
         /// Prints type variable map
         void printTyVarMap( std::ostream &os, const TyVarMap &tyVarMap );
+        void printTypeVarMap( std::ostream &os, const TypeVarMap & typeVars );
 
         /// Gets the mangled name of this type; alias for SymTab::Mangler::mangleType().
-        inline std::string mangleType( const Type *ty ) { return SymTab::Mangler::mangleType( ty ); }
+        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
@@ -130 +128 @@
         /// 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(); }
-        inline std::string layoutofName( ast::AggregateDecl const * decl ) {
-                return std::string( "_layoutof_" ) + decl->name;
-        }
 
 } // namespace GenPoly