Changeset e35f30a for src/SymTab/Mangler.h

Timestamp:

Nov 8, 2017, 1:54:16 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

3f7e12cb, 4ee36bf0, bd41764

Parents:

c6747a1

git-author:

Rob Schluntz <rschlunt@…> (11/08/17 13:54:06)

git-committer:

Rob Schluntz <rschlunt@…> (11/08/17 13:54:16)

Message:

Fix generic type name mangling, add mangleGenericParams mode to name mangler [fixes #41]

File:

• src/SymTab/Mangler.h (modified) (3 diffs)

src/SymTab/Mangler.h

@@ -30 +30 @@
                 /// Mangle syntax tree object; primary interface to clients
                 template< typename SynTreeClass >
-            static std::string mangle( SynTreeClass *decl, bool mangleOverridable = true, bool typeMode = false );
+            static std::string mangle( SynTreeClass *decl, bool mangleOverridable = true, bool typeMode = false, bool mangleGenericParams = true );
                 /// Mangle a type name; secondary interface
                 static std::string mangleType( Type* ty );
+                /// Mangle ignoring generic type parameters
+                static std::string mangleConcrete( Type* ty );
+
 
                 virtual void visit( ObjectDecl *declaration );
@@ -62 +65 @@
                 bool mangleOverridable;         ///< Specially mangle overridable built-in methods
                 bool typeMode;                  ///< Produce a unique mangled name for a type
+                bool mangleGenericParams;       ///< Include generic parameters in name mangling if true
 
-                Mangler( bool mangleOverridable, bool typeMode );
+                Mangler( bool mangleOverridable, bool typeMode, bool mangleGenericParams );
                 Mangler( const Mangler & );
 
                 void mangleDecl( DeclarationWithType *declaration );
                 void mangleRef( ReferenceToType *refType, std::string prefix );
-                void mangleGenericRef( ReferenceToType *refType, std::string prefix );
 
                 void printQualifiers( Type *type );
@@ -74 +77 @@
 
         template< typename SynTreeClass >
-        std::string Mangler::mangle( SynTreeClass *decl, bool mangleOverridable, bool typeMode ) {
-                Mangler mangler( mangleOverridable, typeMode );
+        std::string Mangler::mangle( SynTreeClass *decl, bool mangleOverridable, bool typeMode, bool mangleGenericParams ) {
+                Mangler mangler( mangleOverridable, typeMode, mangleGenericParams );
                 maybeAccept( decl, mangler );
                 return mangler.get_mangleName();