Merge pull request #353 from RcppCore/feature/module-load

Feature/module load

Author: eddelbuettel

ChangeLog

@@ -20,6 +20,12 @@
         * inst/unitTests/cpp/Module.cpp: Rename 'World' to 'ModuleWorld'
         * inst/unitTests/runit.Module.R (test.Module): Ditto
 
+2015-08-25  Kurt Hornik  <[email protected]>
+
+        * R/loadModule.R: For now=TRUE, always set .botched to FALSE which
+        corresponds to the case of the methods package being in the search path
+        * inst/include/Rcpp/Reference.h: Call call with the internal Namespace
+ 
 2015-08-24  Dirk Eddelbuettel  <[email protected]>
 
         * vignettes/Rcpp.bib: Updated R / R Core references

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.12.0.3
+Version: 0.12.0.4
 Date: 2015-08-26
 Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, 
  Qiang Kou, Douglas Bates and John Chambers

R/loadModule.R

@@ -1,4 +1,4 @@
-# Copyright (C) 2010 - 2012 John Chambers, Dirk Eddelbuettel and Romain Francois
+# Copyright (C) 2010 - 2015  John Chambers, Dirk Eddelbuettel and Romain Francois
 #
 # This file is part of Rcpp.
 #
@@ -67,7 +67,9 @@ loadModule <- function( module, what = character(), loadNow,
         loadNow <- !is(loadM, "error")
     }
     if(loadNow) {
-        .botched <- isBotchedSession()
+        ## .botched <- isBotchedSession()
+        .botched <- FALSE
+
         if(is.null(loadM))
             loadM <- tryCatch(Module( module, mustStart = TRUE, where = env ),
                               error = function(e)e)

inst/NEWS.Rd

@@ -23,6 +23,7 @@
     \itemize{
       \item We no longer define multiple Modules objects named \code{World} in
       the unit tests with was seen to have a bad effect with R 3.2.2 or later.
+      \item Applied patch by Kurt Hornik which improves how Rcpp loads Modules
     }
   }
 }

inst/include/Rcpp/Reference.h

@@ -2,7 +2,7 @@
 //
 // Reference.h: Rcpp R/C++ interface class library -- Reference class objects
 //
-// Copyright (C) 2010 - 2013 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2015  Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -59,15 +59,15 @@ namespace Rcpp{
         Reference_Impl( const std::string& klass ) {
             SEXP newSym = Rf_install("new");
             Shield<SEXP> call( Rf_lang2( newSym, Rf_mkString( klass.c_str() ) ) );
-            Storage::set__( Rcpp_eval( call ) ) ;
+            Storage::set__( Rcpp_eval( call , Rcpp::internal::get_Rcpp_namespace()) );
         }
 
         void update( SEXP x){
-            if( ! ::Rf_isS4(x) ) throw not_reference() ;
+            if( ! ::Rf_isS4(x) ) throw not_reference();
         }
     } ;
 
-    typedef Reference_Impl<PreserveStorage> Reference ;
+    typedef Reference_Impl<PreserveStorage> Reference;
 
 } // namespace Rcpp