Changes in src/SymTab/Mangler.cc [69911c11:78dd0da]

File:

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

src/SymTab/Mangler.cc

@@ -30 +30 @@
 
 namespace SymTab {
-        std::string Mangler::mangleType( Type *ty ) {
-                Mangler mangler( false, true );
-                maybeAccept( ty, mangler );
-                return mangler.get_mangleName();
-        }
-        
-        Mangler::Mangler( bool mangleOverridable, bool typeMode )
-                : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ), typeMode( typeMode ) {}
+        Mangler::Mangler( bool mangleOverridable, bool includeQualifiers )
+                : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ), includeQualifiers(includeQualifiers) {}
                 
         Mangler::Mangler( const Mangler &rhs ) : mangleName() {
@@ -44 +38 @@
                 isTopLevel = rhs.isTopLevel;
                 mangleOverridable = rhs.mangleOverridable;
-                typeMode = rhs.typeMode;
+                includeQualifiers = rhs.includeQualifiers;
         }
 
@@ -155 +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 << "_";
-                        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");
-                                maybeAccept( paramType->get_type(), *this );
-                        }
-                        mangleName << "_";
-                }
-
-                oldName << mangleName.str().length() << mangleName.str();
-                mangleName.str( oldName.str() );
-        }
-
         void Mangler::visit( StructInstType *aggregateUseType ) {
-                if ( typeMode ) mangleGenericRef( aggregateUseType, "s" );
-                else mangleRef( aggregateUseType, "s" );
+                mangleRef( aggregateUseType, "s" );
         }
 
         void Mangler::visit( UnionInstType *aggregateUseType ) {
-                if ( typeMode ) mangleGenericRef( aggregateUseType, "u" );
-                else mangleRef( aggregateUseType, "u" );
+                mangleRef( aggregateUseType, "u" );
         }
 
@@ -239 +207 @@
         void Mangler::printQualifiers( Type *type ) {
                 // skip if not including qualifiers
-                if ( typeMode ) return;
+                if ( ! includeQualifiers ) return;
                 
                 if ( ! type->get_forall().empty() ) {
@@ -259 +227 @@
                                 varNums[ (*i )->get_name() ] = std::pair< int, int >( nextVarNum++, (int )(*i )->get_kind() );
                                 for ( std::list< DeclarationWithType* >::iterator assert = (*i )->get_assertions().begin(); assert != (*i )->get_assertions().end(); ++assert ) {
-                                        Mangler sub_mangler( mangleOverridable, typeMode );
+                                        Mangler sub_mangler( mangleOverridable, includeQualifiers );
                                         sub_mangler.nextVarNum = nextVarNum;
                                         sub_mangler.isTopLevel = false;