Changes in src/SymTab/Mangler.cc [8bf784a:89e6ffc]

File:

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

src/SymTab/Mangler.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Mangler.cc --
+// Mangler.cc -- 
 //
 // Author           : Richard C. Bilson
@@ -35 +35 @@
                 return mangler.get_mangleName();
         }
-
+        
         Mangler::Mangler( bool mangleOverridable, bool typeMode )
                 : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ), typeMode( typeMode ) {}
-
+                
         Mangler::Mangler( const Mangler &rhs ) : mangleName() {
                 varNums = rhs.varNums;
@@ -115 +115 @@
                         "Ir",   // LongDoubleImaginary
                 };
-
+  
                 printQualifiers( basicType );
                 mangleName << btLetter[ basicType->get_kind() ];
@@ -214 +214 @@
                                 mangleName << "f";
                                 break;
-                                case TypeDecl::Ttype:
-                                mangleName << "tVARGS";
-                                break;
-                                default:
-                                assert( false );
                         } // switch
                         mangleName << numStream.str();
@@ -258 +253 @@
                 // skip if not including qualifiers
                 if ( typeMode ) return;
-
+                
                 if ( ! type->get_forall().empty() ) {
                         std::list< std::string > assertionNames;
-                        int tcount = 0, dcount = 0, fcount = 0, vcount = 0;
+                        int tcount = 0, dcount = 0, fcount = 0;
                         mangleName << "A";
-                        for ( Type::ForallList::iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
+                        for ( std::list< TypeDecl* >::iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
                                 switch ( (*i)->get_kind() ) {
                                   case TypeDecl::Any:
@@ -274 +269 @@
                                         fcount++;
                                         break;
-                                  case TypeDecl::Ttype:
-                                        vcount++;
-                                        break;
-                                  default:
-                                        assert( false );
                                 } // switch
                                 varNums[ (*i )->get_name() ] = std::pair< int, int >( nextVarNum++, (int )(*i )->get_kind() );
@@ -290 +280 @@
                                 } // for
                         } // for
-                        mangleName << tcount << "_" << dcount << "_" << fcount << "_" << vcount << "_";
+                        mangleName << tcount << "_" << dcount << "_" << fcount << "_";
                         std::copy( assertionNames.begin(), assertionNames.end(), std::ostream_iterator< std::string >( mangleName, "" ) );
                         mangleName << "_";