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

File:

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

src/GenPoly/GenPoly.h

@@ -17 +17 @@
 #define GENPOLY_H
 
+#include <map>
 #include <string>
 #include <iostream>
 #include <utility>
-
-#include "ErasableScopedMap.h"
-
-#include "SymTab/Mangler.h"
 
 #include "SynTree/Declaration.h"
@@ -30 +27 @@
 
 namespace GenPoly {
-        typedef ErasableScopedMap< std::string, TypeDecl::Kind > TyVarMap;
+        typedef std::map< std::string, TypeDecl::Kind > TyVarMap;
 
         /// A function needs an adapter if it returns a polymorphic value or if any of its
@@ -72 +69 @@
         void printTyVarMap( std::ostream &os, const TyVarMap &tyVarMap );
 
-        /// 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; }
+        /// Gets the name of the sizeof parameter for the type
+        std::string sizeofName( Type *ty );
 
-        /// Gets the name of the alignof parameter for the type, given its mangled name
-        inline std::string alignofName( const std::string &name ) { return std::string( "_alignof_" ) + name; }
+        /// 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, given its mangled name
-        inline std::string offsetofName( const std::string &name ) { return std::string( "_offsetof_" ) + name; }
-
-        /// 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(); }
-        
+        /// Gets the name of the offsetof parameter for the type
+        std::string offsetofName( Type *ty );
 } // namespace GenPoly