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

File:

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

translator/GenPoly/Box.cc

@@ -7 +7 @@
 
 #include <set>
+#include <stack>
 #include <string>
 #include <iterator>
@@ -50 +51 @@
             virtual Type *mutate( FunctionType *pointerType );
   
+            virtual void doBeginScope();
             virtual void doEndScope();
           private:
@@ -66 +68 @@
   
             std::map< std::string, DeclarationWithType *> assignOps;
-            std::map< std::string, FunctionDecl *> adapters;
+            typedef std::map< std::string, FunctionDecl *> AdapterMap;
+            std::stack< AdapterMap > adapters;
             DeclarationWithType *retval;
             bool useRetval;
@@ -126 +129 @@
 
     namespace {
+        std::string makeAdapterName( const std::string &mangleName ) {
+            return "_adapter" + mangleName;
+        }
+
         bool isPolyRet( FunctionType *function, std::string &name, const TyVarMap &otherTyVars ) {
             bool doTransform = false;
@@ -219 +226 @@
                 retval = oldRetval;
                 useRetval = oldUseRetval;
-                doEndScope();
+                // doEndScope();
             } // if
             return functionDecl;
@@ -316 +323 @@
             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 );
@@ -326 +333 @@
                 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( "_adapter" + SymTab::Mangler::mangle( function ) ) );
+            appExpr->set_function( new NameExpr( adapterName ) );
   
             return ret;
@@ -337 +347 @@
             TypeInstType *typeInst = dynamic_cast< TypeInstType *>( param );
             if ( typeInst && exprTyVars.find( typeInst->get_name() ) != exprTyVars.end() ) {
-                if ( arg->get_results().front()->get_isLvalue() ) {
+                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
                     arg = new AddressExpr( arg );
                 } else {
@@ -371 +385 @@
             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::cout );
+///     (*param)->print( std::fcout );
 ///     std::cout << std::endl << "argument is ";
 ///     (*arg)->print( std::cout );
@@ -448 +462 @@
         }
 
+
+
         FunctionDecl *Pass1::makeAdapter( FunctionType *adaptee, FunctionType *realType, const std::string &mangleName, const TyVarMap &tyVars ) {
             FunctionType *adapterType = makeAdapterType( adaptee, tyVars );
@@ -496 +512 @@
             CompoundStmt *adapterBody = new CompoundStmt( noLabels );
             adapterBody->get_kids().push_back( bodyStmt );
-            return new FunctionDecl( "_adapter" + mangleName, Declaration::NoStorageClass, LinkageSpec::C, adapterType, adapterBody, false );
+            std::string adapterName = makeAdapterName( mangleName );
+            return new FunctionDecl( adapterName, Declaration::NoStorageClass, LinkageSpec::C, adapterType, adapterBody, false );
         }
 
@@ -515 +532 @@
                 assert( env );
                 env->apply( realFunction );
+
                 std::string mangleName = SymTab::Mangler::mangle( realFunction );
                 if ( adaptersDone.find( mangleName ) == adaptersDone.end() ) {
-                    std::map< std::string, FunctionDecl *>::iterator adapter = adapters.find( mangleName );
-                    if ( adapter == adapters.end() ) {
-                        FunctionDecl *newAdapter = makeAdapter( *funType, realFunction, mangleName, exprTyVars );
+                    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 );
                         adapter = adapters.insert( adapters.begin(), std::pair< std::string, FunctionDecl *>( mangleName, newAdapter ) );
                         stmtsToAdd.push_back( new DeclStmt( noLabels, newAdapter ) );
@@ -525 +551 @@
                     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
@@ -845 +872 @@
         }
 
+        void Pass1::doBeginScope() {
+            adapters.push(AdapterMap());
+        }
+
         void Pass1::doEndScope() {
-            adapters.clear();
+            adapters.pop();
         }
 
@@ -865 +896 @@
                 std::string mangleName = SymTab::Mangler::mangle( *funType );
                 if ( adaptersDone.find( mangleName ) == adaptersDone.end() ) {
-                    paramList.push_front( new ObjectDecl( "_adapter" + mangleName, Declaration::NoStorageClass, LinkageSpec::C, 0, new PointerType( Type::Qualifiers(), makeAdapterType( *funType, scopeTyVars ) ), 0 ) );
+                    std::string adapterName = makeAdapterName( mangleName );
+                    paramList.push_front( new ObjectDecl( adapterName, Declaration::NoStorageClass, LinkageSpec::C, 0, new PointerType( Type::Qualifiers(), makeAdapterType( *funType, scopeTyVars ) ), 0 ) );
                     adaptersDone.insert( adaptersDone.begin(), mangleName );
                 }