Changes in translator/GenPoly/Box.cc [b1a6d6b:bdd516a]

File:

• translator/GenPoly/Box.cc (modified) (15 diffs)

translator/GenPoly/Box.cc

@@ -7 +7 @@
 
 #include <set>
-#include <stack>
 #include <string>
 #include <iterator>
@@ -51 +50 @@
             virtual Type *mutate( FunctionType *pointerType );
   
-            virtual void doBeginScope();
             virtual void doEndScope();
           private:
@@ -68 +66 @@
   
             std::map< std::string, DeclarationWithType *> assignOps;
-            typedef std::map< std::string, FunctionDecl *> AdapterMap;
-            std::stack< AdapterMap > adapters;
+            std::map< std::string, FunctionDecl *> adapters;
             DeclarationWithType *retval;
             bool useRetval;
@@ -129 +126 @@
 
     namespace {
-        std::string makeAdapterName( const std::string &mangleName ) {
-            return "_adapter" + mangleName;
-        }
-
         bool isPolyRet( FunctionType *function, std::string &name, const TyVarMap &otherTyVars ) {
             bool doTransform = false;
@@ -226 +219 @@
                 retval = oldRetval;
                 useRetval = oldUseRetval;
-                // doEndScope();
+                doEndScope();
             } // if
             return functionDecl;
@@ -323 +316 @@
             Type *concrete = env->lookup( typeName );
             if ( concrete == 0 ) {
-                throw SemanticError( "Unbound type variable " + typeName + " in ", appExpr );
+                throw SemanticError( "Unbound type variable " + typeName + " in", appExpr );
             } // if
             return addRetParam( appExpr, function, concrete, arg );
@@ -333 +326 @@
                 ret = addRetParam( appExpr, function, function->get_returnVals().front()->get_type(), arg );
             } // if
-            std::string mangleName = SymTab::Mangler::mangle( function );
-            std::string adapterName = makeAdapterName( mangleName );
-
             appExpr->get_args().push_front( appExpr->get_function() );
-            appExpr->set_function( new NameExpr( adapterName ) );
+            appExpr->set_function( new NameExpr( "_adapter" + SymTab::Mangler::mangle( function ) ) );
   
             return ret;
@@ -347 +337 @@
             TypeInstType *typeInst = dynamic_cast< TypeInstType *>( param );
             if ( typeInst && exprTyVars.find( typeInst->get_name() ) != exprTyVars.end() ) {
-                if ( dynamic_cast< TypeInstType *>( arg->get_results().front() ) ) {
-                    // if the argument's type is a type parameter, we don't need to box again!
-                    return;
-                } else if ( arg->get_results().front()->get_isLvalue() ) {
-                    // VariableExpr and MemberExpr are lvalues
+                if ( arg->get_results().front()->get_isLvalue() ) {
                     arg = new AddressExpr( arg );
                 } else {
@@ -385 +371 @@
             for ( std::list< DeclarationWithType *>::const_iterator param = function->get_parameters().begin(); param != function->get_parameters().end(); ++param, ++arg ) {
 ///     std::cout << "parameter is ";
-///     (*param)->print( std::fcout );
+///     (*param)->print( std::cout );
 ///     std::cout << std::endl << "argument is ";
 ///     (*arg)->print( std::cout );
@@ -462 +448 @@
         }
 
-
-
         FunctionDecl *Pass1::makeAdapter( FunctionType *adaptee, FunctionType *realType, const std::string &mangleName, const TyVarMap &tyVars ) {
             FunctionType *adapterType = makeAdapterType( adaptee, tyVars );
@@ -512 +496 @@
             CompoundStmt *adapterBody = new CompoundStmt( noLabels );
             adapterBody->get_kids().push_back( bodyStmt );
-            std::string adapterName = makeAdapterName( mangleName );
-            return new FunctionDecl( adapterName, Declaration::NoStorageClass, LinkageSpec::C, adapterType, adapterBody, false );
+            return new FunctionDecl( "_adapter" + mangleName, Declaration::NoStorageClass, LinkageSpec::C, adapterType, adapterBody, false );
         }
 
@@ -532 +515 @@
                 assert( env );
                 env->apply( realFunction );
-
                 std::string mangleName = SymTab::Mangler::mangle( realFunction );
                 if ( adaptersDone.find( mangleName ) == adaptersDone.end() ) {
-                    AdapterMap & adapters = Pass1::adapters.top();
-                    AdapterMap::iterator adapter = adapters.find( mangleName );
-
-                    if ( needsAdapter( realFunction, exprTyVars, true ) ) {
-                        // the function still contains type variables, which means we are in a polymorphic
-                        // context and the adapter function is a parameter - call the parameter and don't 
-                        // create a new adapter.
-                        appExpr->get_args().push_front( new NameExpr( makeAdapterName ( mangleName ) ) );
-                        continue;
-                    } else if ( adapter == adapters.end() ) {
-                        FunctionDecl *newAdapter = makeAdapter( *funType, realFunction, mangleName, exprTyVars );
+                    std::map< std::string, FunctionDecl *>::iterator adapter = adapters.find( mangleName );
+                    if ( adapter == adapters.end() ) {
+                        FunctionDecl *newAdapter = makeAdapter( *funType, realFunction, mangleName, exprTyVars );
                         adapter = adapters.insert( adapters.begin(), std::pair< std::string, FunctionDecl *>( mangleName, newAdapter ) );
                         stmtsToAdd.push_back( new DeclStmt( noLabels, newAdapter ) );
@@ -551 +525 @@
                     assert( adapter != adapters.end() );
                     appExpr->get_args().push_front( new VariableExpr( adapter->second ) );
-                    // appExpr->get_args().push_front( new NameExpr( makeAdapterName ( mangleName ) ) );
                     adaptersDone.insert( adaptersDone.begin(), mangleName );
                 } // if
@@ -872 +845 @@
         }
 
-        void Pass1::doBeginScope() {
-            adapters.push(AdapterMap());
-        }
-
         void Pass1::doEndScope() {
-            adapters.pop();
+            adapters.clear();
         }
 
@@ -896 +865 @@
                 std::string mangleName = SymTab::Mangler::mangle( *funType );
                 if ( adaptersDone.find( mangleName ) == adaptersDone.end() ) {
-                    std::string adapterName = makeAdapterName( mangleName );
-                    paramList.push_front( new ObjectDecl( adapterName, Declaration::NoStorageClass, LinkageSpec::C, 0, new PointerType( Type::Qualifiers(), makeAdapterType( *funType, scopeTyVars ) ), 0 ) );
+                    paramList.push_front( new ObjectDecl( "_adapter" + mangleName, Declaration::NoStorageClass, LinkageSpec::C, 0, new PointerType( Type::Qualifiers(), makeAdapterType( *funType, scopeTyVars ) ), 0 ) );
                     adaptersDone.insert( adaptersDone.begin(), mangleName );
                 }