[Rinside-commits] r103 - pkg/src

[noreply at r-forge.r-project.org]

Author: romain
Date: 2010-02-17 21:52:50 +0100 (Wed, 17 Feb 2010)
New Revision: 103

Modified:
   pkg/src/RInside.cpp
Log:
partial fix until I find out the real fix

Modified: pkg/src/RInside.cpp
===================================================================
--- pkg/src/RInside.cpp	2010-02-17 20:39:58 UTC (rev 102)
+++ pkg/src/RInside.cpp	2010-02-17 20:52:50 UTC (rev 103)
@@ -181,19 +181,20 @@
         - NAME is updated in a loop
         
     */
-    
+     
     int i,j, idx=0, nobj ;
     Rcpp::Language delayed_assign_call( 
     	    Rcpp::Function("delayedAssign"), 
     	    R_NilValue,     /* arg1: assigned in loop */
     	    R_NilValue,     /* arg2: assigned in loop */
     	    global_env,
-    	    global_env[".AutoloadEnv"]
+    	    // global_env[".AutoloadEnv"]
+    	    Rf_findVar(Rf_install(".AutoloadEnv"), global_env )
     	    ) ;
     Rcpp::Language::Proxy delayed_assign_name  = delayed_assign_call[1];
 
     Rcpp::Language autoloader_call( 
-    	    Rcpp::Function("autoloader"), 
+    	    Rcpp::Function("autoloader"),
     	    Rcpp::Named( "name", R_NilValue) ,  /* arg1 : assigned in loop */
     	    Rcpp::Named( "package", R_NilValue) /* arg2 : assigned in loop */
     	    );
@@ -216,8 +217,6 @@
 		    /* Set the 'name' argument of the delayedAssign call */
 		    delayed_assign_name = packobj[idx+j] ;
 		    
-		    Rf_PrintValue( delayed_assign_call ) ;
-		    
 		    /* evaluate the call */
 		    delayed_assign_call.eval() ;