Changeset 4ee36bf0 for src/SymTab/Mangler.h

Timestamp:

Nov 8, 2017, 2:50:35 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

049ead9

Parents:

136ccd7 (diff), e35f30a (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 cleanup-dtors

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();