Changeset 8360977

Timestamp:

Dec 16, 2015, 3:20:19 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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

Children:

0f889a77

Parents:

5f6c42c

Message:

Mangler now mangles parameters to generic types

Location:

src/SymTab

Files:

• Mangler.cc (modified) (1 diff)
• Mangler.h (modified) (1 diff)

src/SymTab/Mangler.cc

@@ -149 +149 @@
         void Mangler::mangleRef( ReferenceToType *refType, std::string prefix ) {
                 printQualifiers( refType );
+
                 mangleName << ( refType->get_name().length() + prefix.length() ) << prefix << refType->get_name();
         }
 
+        void Mangler::mangleGenericRef( ReferenceToType *refType, std::string prefix ) {
+                printQualifiers( refType );
+
+                std::ostringstream oldName( mangleName.str() );
+                mangleName.clear();
+
+                mangleName << prefix << refType->get_name();
+
+                std::list< Expression* >& params = refType->get_parameters();
+                if ( ! params.empty() ) {
+                        mangleName << "_";
+                        std::list< Type* > paramTypes;
+                        for ( std::list< Expression* >::const_iterator param = params.begin(); param != params.end(); ++param ) {
+                                TypeExpr *paramType = dynamic_cast< TypeExpr* >( *param );
+                                assert(paramType && "Aggregate parameters should be type expressions");
+                                paramTypes.push_back( paramType->get_type() );
+                        }
+                        acceptAll( paramTypes, *this );
+                        mangleName << "_";
+                }
+
+                oldName << mangleName.str().length() << mangleName.str();
+                mangleName.str( oldName.str() );
+        }
+
         void Mangler::visit( StructInstType *aggregateUseType ) {
-                mangleRef( aggregateUseType, "s" );
+                mangleGenericRef( aggregateUseType, "s" );
         }
 
         void Mangler::visit( UnionInstType *aggregateUseType ) {
-                mangleRef( aggregateUseType, "u" );
+                mangleGenericRef( aggregateUseType, "u" );
         }
 

src/SymTab/Mangler.h

@@ -58 +58 @@
                 void mangleDecl( DeclarationWithType *declaration );
                 void mangleRef( ReferenceToType *refType, std::string prefix );
+                void mangleGenericRef( ReferenceToType *refType, std::string prefix );
   
                 void printQualifiers( Type *type );