Changes in src/SymTab/Mangler.cc [4aa0858:78dd0da]

File:

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

src/SymTab/Mangler.cc

@@ -30 +30 @@
 
 namespace SymTab {
-        Mangler::Mangler( bool mangleOverridable ) : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ) {
-        }
-
-//Mangler::Mangler( const Mangler & )
-//  : mangleName(), varNums( varNums ), nextVarNum( nextVarNum ), isTopLevel( isTopLevel )
-//{
-//}
+        Mangler::Mangler( bool mangleOverridable, bool includeQualifiers )
+                : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ), includeQualifiers(includeQualifiers) {}
+                
         Mangler::Mangler( const Mangler &rhs ) : mangleName() {
                 varNums = rhs.varNums;
@@ -42 +38 @@
                 isTopLevel = rhs.isTopLevel;
                 mangleOverridable = rhs.mangleOverridable;
+                includeQualifiers = rhs.includeQualifiers;
         }
 
@@ -209 +206 @@
 
         void Mangler::printQualifiers( Type *type ) {
+                // skip if not including qualifiers
+                if ( ! includeQualifiers ) return;
+                
                 if ( ! type->get_forall().empty() ) {
                         std::list< std::string > assertionNames;
@@ -227 +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 );
+                                        Mangler sub_mangler( mangleOverridable, includeQualifiers );
                                         sub_mangler.nextVarNum = nextVarNum;
                                         sub_mangler.isTopLevel = false;