Changes in src/SymTab/Mangler.cc [e1f7eef:0e761e40]

File:

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

src/SymTab/Mangler.cc

@@ -15 +15 @@
 #include "Mangler.h"
 
-#include <algorithm>                     // for copy, transform
-#include <cassert>                       // for assert, assertf
-#include <functional>                    // for const_mem_fun_t, mem_fun
-#include <iterator>                      // for ostream_iterator, back_insert_ite...
-#include <list>                          // for _List_iterator, list, _List_const...
-#include <string>                        // for string, char_traits, operator<<
-
-#include "CodeGen/OperatorTable.h"       // for OperatorInfo, operatorLookup
+#include <algorithm>                // for copy, transform
+#include <cassert>                  // for assert, assertf
+#include <functional>               // for const_mem_fun_t, mem_fun
+#include <iterator>                 // for ostream_iterator, back_insert_ite...
+#include <list>                     // for _List_iterator, list, _List_const...
+#include <string>                   // for string, char_traits, operator<<
+
+#include "CodeGen/OperatorTable.h"  // for OperatorInfo, operatorLookup
 #include "Common/PassVisitor.h"
-#include "Common/SemanticError.h"        // for SemanticError
-#include "Common/utility.h"              // for toString
-#include "Parser/LinkageSpec.h"          // for Spec, isOverridable, AutoGen, Int...
-#include "ResolvExpr/TypeEnvironment.h"  // for TypeEnvironment
-#include "SynTree/Declaration.h"         // for TypeDecl, DeclarationWithType
-#include "SynTree/Expression.h"          // for TypeExpr, Expression, operator<<
-#include "SynTree/Type.h"                // for Type, ReferenceToType, Type::Fora...
+#include "Common/SemanticError.h"   // for SemanticError
+#include "Common/utility.h"         // for toString
+#include "Parser/LinkageSpec.h"     // for Spec, isOverridable, AutoGen, Int...
+#include "SynTree/Declaration.h"    // for TypeDecl, DeclarationWithType
+#include "SynTree/Expression.h"     // for TypeExpr, Expression, operator<<
+#include "SynTree/Type.h"           // for Type, ReferenceToType, Type::Fora...
 
 namespace SymTab {
@@ -38 +37 @@
                         struct Mangler : public WithShortCircuiting, public WithVisitorRef<Mangler>, public WithGuards {
                                 Mangler( bool mangleOverridable, bool typeMode, bool mangleGenericParams );
-                                Mangler( const ResolvExpr::TypeEnvironment& env );
                                 Mangler( const Mangler & ) = delete;
 
@@ -67 +65 @@
                           private:
                                 std::ostringstream mangleName;  ///< Mangled name being constructed
-                                typedef std::map< std::string, std::pair< std::string, int > > VarMapType;
+                                typedef std::map< std::string, std::pair< int, int > > VarMapType;
                                 VarMapType varNums;             ///< Map of type variables to indices
                                 int nextVarNum;                 ///< Next type variable index
-                                const ResolvExpr::TypeEnvironment* env;  ///< optional environment for substitutions
                                 bool isTopLevel;                ///< Is the Mangler at the top level
                                 bool mangleOverridable;         ///< Specially mangle overridable built-in methods
@@ -78 +75 @@
                                 bool inQualifiedType = false;   ///< Add start/end delimiters around qualified type
 
-                          public:
-                                Mangler( bool mangleOverridable, bool typeMode, bool mangleGenericParams, 
-                                        int nextVarNum, const ResolvExpr::TypeEnvironment* env, 
-                                        const VarMapType& varNums );
-
-                          private:
                                 void mangleDecl( DeclarationWithType *declaration );
                                 void mangleRef( ReferenceToType *refType, std::string prefix );
@@ -109 +100 @@
                 }
 
-                std::string mangleAssnKey( DeclarationWithType* decl, 
-                                const ResolvExpr::TypeEnvironment& env ) {
-                        PassVisitor<Mangler> mangler( env );
-                        maybeAccept( decl, mangler );
-                        return mangler.pass.get_mangleName();
-                }
-
                 namespace {
                         Mangler::Mangler( bool mangleOverridable, bool typeMode, bool mangleGenericParams )
-                                : nextVarNum( 0 ), env(nullptr), isTopLevel( true ), 
-                                mangleOverridable( mangleOverridable ), typeMode( typeMode ), 
-                                mangleGenericParams( mangleGenericParams ) {}
-                        
-                        Mangler::Mangler( const ResolvExpr::TypeEnvironment& env )
-                                : nextVarNum( 0 ), env( &env ), isTopLevel( true ), mangleOverridable( false ),
-                                typeMode( false ), mangleGenericParams( true ) {}
-                        
-                        Mangler::Mangler( bool mangleOverridable, bool typeMode, bool mangleGenericParams, 
-                                int nextVarNum, const ResolvExpr::TypeEnvironment* env, 
-                                const VarMapType& varNums )
-                                : varNums( varNums ), nextVarNum( nextVarNum ), env( env ), isTopLevel( false ), 
-                                mangleOverridable( mangleOverridable ), typeMode( typeMode ), 
-                                mangleGenericParams( mangleGenericParams ) {}
+                                : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ), typeMode( typeMode ), mangleGenericParams( mangleGenericParams ) {}
 
                         void Mangler::mangleDecl( DeclarationWithType * declaration ) {
@@ -358 +329 @@
                                                         assert( false );
                                                 } // switch
-                                                std::string varName;
-                                                // replace type with substitution name if environment is available and bound
-                                                if ( env ) {
-                                                        const ResolvExpr::EqvClass* varClass = env->lookup( (*i)->name );
-                                                        if ( varClass && varClass->type ) {
-                                                                PassVisitor<Mangler> sub_mangler(
-                                                                        mangleOverridable, typeMode, mangleGenericParams, nextVarNum, 
-                                                                        env, varNums );
-                                                                varClass->type->accept( sub_mangler );
-                                                                varName = std::string{"%"} + sub_mangler.pass.get_mangleName();
-                                                        }
-                                                }
-                                                // otherwise just give type numeric name
-                                                if ( varName.empty() ) {
-                                                        varName = std::to_string( nextVarNum++ );
-                                                }
-                                                varNums[ (*i)->name ] = std::make_pair( varName, (int)(*i)->get_kind() );
+                                                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 ) {
-                                                        PassVisitor<Mangler> sub_mangler( 
-                                                                mangleOverridable, typeMode, mangleGenericParams, nextVarNum, env, 
-                                                                varNums );
+                                                        PassVisitor<Mangler> sub_mangler( mangleOverridable, typeMode, mangleGenericParams );
+                                                        sub_mangler.pass.nextVarNum = nextVarNum;
+                                                        sub_mangler.pass.isTopLevel = false;
+                                                        sub_mangler.pass.varNums = varNums;
                                                         (*assert)->accept( sub_mangler );
-                                                        assertionNames.push_back( sub_mangler.pass.get_mangleName() );
+                                                        assertionNames.push_back( sub_mangler.pass.mangleName.str() );
                                                         acount++;
                                                 } // for