[Rcpp-commits] r3866 - in pkg/Rcpp: R man

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

Author: romain
Date: 2012-10-31 08:42:53 +0100 (Wed, 31 Oct 2012)
New Revision: 3866

Modified:
   pkg/Rcpp/R/00_classes.R
   pkg/Rcpp/man/sourceCpp.Rd
Log:
anticipate generator function change in R 2.16.0

Modified: pkg/Rcpp/R/00_classes.R
===================================================================
--- pkg/Rcpp/R/00_classes.R	2012-10-31 03:22:23 UTC (rev 3865)
+++ pkg/Rcpp/R/00_classes.R	2012-10-31 07:42:53 UTC (rev 3866)
@@ -19,6 +19,10 @@
 # e.g. highlight 
 setClass( "C++ObjectS3" ) 
 
+# anticipating a change in R 2.16.0
+setClass( "refClassGeneratorFunction" )
+setClassUnion("refGenerator", c("refObjectGenerator", "refClassGeneratorFunction")) 
+
 ## "Module" class as an environment with "pointer", "moduleName",
 ##  "packageName" and "refClassGenerators"
 ## Stands in for a reference class with those fields.
@@ -72,7 +76,7 @@
 	    fields       = "list",
 	    methods      = "list",
 	    constructors = "list",
-	    generator    = "refObjectGenerator", 
+	    generator    = "refGenerator", 
 	    docstring    = "character", 
 	    typeid       = "character", 
 	    enums        = "list"
@@ -82,7 +86,7 @@
 setClass( "C++ClassRepresentation", 
     representation( 
         pointer         = "externalptr", 
-        generator       = "refObjectGenerator", 
+        generator       = "refGenerator", 
         cpp_fields      = "list", 
         cpp_methods     = "list", 
         cpp_constructor = "list"

Modified: pkg/Rcpp/man/sourceCpp.Rd
===================================================================
--- pkg/Rcpp/man/sourceCpp.Rd	2012-10-31 03:22:23 UTC (rev 3865)
+++ pkg/Rcpp/man/sourceCpp.Rd	2012-10-31 07:42:53 UTC (rev 3866)
@@ -8,7 +8,7 @@
 }
 \usage{
 sourceCpp(file, code = NULL, local = FALSE, rebuild = FALSE, 
-          show.output = verbose, verbose = getOption("verbose"))
+          show.output = verbose, verbose = getOption("verbose"), code)
 }
 %- maybe also 'usage' for other objects documented here.
 \arguments{
@@ -30,7 +30,10 @@
   \item{verbose}{
     \code{TRUE} to print detailed information about generated code to the console
 }
+  \item{code}{
+    Code. If supplied, the code is taken from this string instead of a file.  
 }
+}
 \details{
     If the \code{code} parameter is provided then the \code{file} parameter is ignored.