Changes in src/SymTab/Mangler.cc [e35f30a:f0ecf9b]

File:

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

src/SymTab/Mangler.cc

@@ -32 +32 @@
 namespace SymTab {
         std::string Mangler::mangleType( Type * ty ) {
-                Mangler mangler( false, true, true );
+                Mangler mangler( false, true );
                 maybeAccept( ty, mangler );
                 return mangler.get_mangleName();
         }
 
-        std::string Mangler::mangleConcrete( Type* ty ) {
-                Mangler mangler( false, false, false );
-                maybeAccept( ty, mangler );
-                return mangler.get_mangleName();
-        }
-
-        Mangler::Mangler( bool mangleOverridable, bool typeMode, bool mangleGenericParams )
-                : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ), typeMode( typeMode ), mangleGenericParams( mangleGenericParams ) {}
+        Mangler::Mangler( bool mangleOverridable, bool typeMode )
+                : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ), typeMode( typeMode ) {}
 
         Mangler::Mangler( const Mangler &rhs ) : mangleName() {
@@ -172 +166 @@
 
                 mangleName << ( refType->get_name().length() + prefix.length() ) << prefix << refType->get_name();
-
-                if ( mangleGenericParams ) {
-                        std::list< Expression* >& params = refType->get_parameters();
-                        if ( ! params.empty() ) {
-                                mangleName << "_";
-                                for ( std::list< Expression* >::const_iterator param = params.begin(); param != params.end(); ++param ) {
-                                        TypeExpr *paramType = dynamic_cast< TypeExpr* >( *param );
-                                        assertf(paramType, "Aggregate parameters should be type expressions: %s", toString(*param).c_str());
-                                        maybeAccept( paramType->get_type(), *this );
-                                }
-                                mangleName << "_";
+        }
+
+        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 << "_";
+                        for ( std::list< Expression* >::const_iterator param = params.begin(); param != params.end(); ++param ) {
+                                TypeExpr *paramType = dynamic_cast< TypeExpr* >( *param );
+                                assertf(paramType, "Aggregate parameters should be type expressions: %s", toString(*param).c_str());
+                                maybeAccept( paramType->get_type(), *this );
                         }
+                        mangleName << "_";
                 }
+
+                oldName << mangleName.str().length() << mangleName.str();
+                mangleName.str( oldName.str() );
         }
 
         void Mangler::visit( StructInstType * aggregateUseType ) {
-                mangleRef( aggregateUseType, "s" );
+                if ( typeMode ) mangleGenericRef( aggregateUseType, "s" );
+                else mangleRef( aggregateUseType, "s" );
         }
 
         void Mangler::visit( UnionInstType * aggregateUseType ) {
-                mangleRef( aggregateUseType, "u" );
+                if ( typeMode ) mangleGenericRef( aggregateUseType, "u" );
+                else mangleRef( aggregateUseType, "u" );
         }
 
@@ -279 +285 @@
                                 varNums[ (*i)->name ] = std::pair< int, int >( nextVarNum++, (int)(*i)->get_kind() );
                                 for ( std::list< DeclarationWithType* >::iterator assert = (*i)->assertions.begin(); assert != (*i)->assertions.end(); ++assert ) {
-                                        Mangler sub_mangler( mangleOverridable, typeMode, mangleGenericParams );
+                                        Mangler sub_mangler( mangleOverridable, typeMode );
                                         sub_mangler.nextVarNum = nextVarNum;
                                         sub_mangler.isTopLevel = false;