[Rcpp-commits] r4509 - in pkg/Rcpp: . R inst man

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

Author: jjallaire
Date: 2013-09-18 11:57:17 +0200 (Wed, 18 Sep 2013)
New Revision: 4509

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/R/Attributes.R
   pkg/Rcpp/inst/NEWS.Rd
   pkg/Rcpp/man/pluginsAttribute.Rd
Log:
Don't search the inline package as a fallback when loading plugins for the the Rcpp::plugins attribute

Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2013-09-18 08:47:26 UTC (rev 4508)
+++ pkg/Rcpp/ChangeLog	2013-09-18 09:57:17 UTC (rev 4509)
@@ -1,3 +1,7 @@
+2013-09-18  JJ Allaire  <jj at rstudio.org>
+
+        * R/Attributes.R: Don't search the inline package as a fallback when loading plugins for the the Rcpp::plugins attribute
+
 2013-09-16  Romain Francois <romain at r-enthusiasts.com>
 
         * vignettes/Rcpp-package.Rnw: Updating the vignette. Setting attributes to TRUE

Modified: pkg/Rcpp/R/Attributes.R
===================================================================
--- pkg/Rcpp/R/Attributes.R	2013-09-18 08:47:26 UTC (rev 4508)
+++ pkg/Rcpp/R/Attributes.R	2013-09-18 09:57:17 UTC (rev 4509)
@@ -474,20 +474,13 @@
              error = function(e) NULL)
 }
 
-# Lookup a plugin (first in our package then in the inline package)
+# Lookup a plugin
 .findPlugin <- function(pluginName) {
-    # lookup in our plugins
+    
     plugin <- .plugins[[pluginName]]
-
-    # if necessary lookup in the inline package
     if (is.null(plugin))
-        if (length(find.package("inline", quiet=TRUE)) > 0)
-            plugin <- inline:::plugins[[pluginName]]
-
-    # error if plugin not found
-    if (is.null(plugin))
         stop("Inline plugin '", pluginName, "' could not be found ",
-             "within either the Rcpp or inline package. You should be ",
+             "within the Rcpp package. You should be ",
              "sure to call registerPlugin before using a plugin.")
 
     return(plugin)

Modified: pkg/Rcpp/inst/NEWS.Rd
===================================================================
--- pkg/Rcpp/inst/NEWS.Rd	2013-09-18 08:47:26 UTC (rev 4508)
+++ pkg/Rcpp/inst/NEWS.Rd	2013-09-18 09:57:17 UTC (rev 4509)
@@ -50,6 +50,8 @@
       we can now use references, pointers and const versions of them.
       The file \code{Module.cpp} file has an example. 
       \item{No longer call non-exported functions from the tools package}
+      \item{No longer search the inline package as a fallback when loading
+      plugins for the the \code{Rcpp::plugins} attribute}.
     }
     \item Changes in Modules:
     \itemize{

Modified: pkg/Rcpp/man/pluginsAttribute.Rd
===================================================================
--- pkg/Rcpp/man/pluginsAttribute.Rd	2013-09-18 08:47:26 UTC (rev 4508)
+++ pkg/Rcpp/man/pluginsAttribute.Rd	2013-09-18 09:57:17 UTC (rev 4509)
@@ -21,9 +21,6 @@
 Plugins must be registered using the \code{\link{registerPlugin}}
 function. 
 
-If a plugin is not found within the \pkg{Rcpp} package then the 
-\pkg{inline} package will also be searched for a matching plugin.
-
 When included within a \code{\link{sourceCpp}} translation unit,
 the configuration-related fields of the plugin (e.g. \code{env} and 
 \code{LinkingTo}) are utilized, however the code-generation fields