[Rcpp-commits] r4202 - in pkg/Rcpp: . R

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

Author: jjallaire
Date: 2013-01-13 12:31:22 +0100 (Sun, 13 Jan 2013)
New Revision: 4202

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/R/Attributes.R
Log:
use plugin includes in cppFunction

Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2013-01-13 03:30:19 UTC (rev 4201)
+++ pkg/Rcpp/ChangeLog	2013-01-13 11:31:22 UTC (rev 4202)
@@ -1,3 +1,7 @@
+2014-01-13  JJ Allaire <jj at rstudio.org>
+
+        * R/Attributes.R: use plugin includes in cppFunction
+
 2014-01-12  JJ Allaire <jj at rstudio.org>
 
         * DESCRIPTION: bump version to 0.10.2.2

Modified: pkg/Rcpp/R/Attributes.R
===================================================================
--- pkg/Rcpp/R/Attributes.R	2013-01-13 03:30:19 UTC (rev 4201)
+++ pkg/Rcpp/R/Attributes.R	2013-01-13 11:31:22 UTC (rev 4202)
@@ -173,7 +173,7 @@
         depends <- paste(depends, sep=", ")
         scaffolding <- paste("// [[Rcpp::depends(", depends, ")]]", sep="")
         scaffolding <- c(scaffolding, "", .linkingToIncludes(depends, FALSE), 
-                         recursive=T)
+                         recursive=TRUE)
     }
     else {
         scaffolding <- "#include <Rcpp.h>"
@@ -184,6 +184,13 @@
         plugins <- paste(plugins, sep=", ")
         pluginsAttrib <- paste("// [[Rcpp::plugins(", plugins, ")]]", sep="")
         scaffolding <- c(scaffolding, pluginsAttrib)
+        
+        # append plugin includes
+        for (pluginName in plugins) {
+            plugin <- .plugins[[pluginName]]
+            settings <- plugin()
+            scaffolding <- c(scaffolding, settings$includes, recursive=TRUE)
+        }
     }
     
     # remainder of scaffolding