[Rcpp-commits] r2699 - in pkg/Rcpp: . inst/unitTests

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

Author: edd
Date: 2010-12-03 23:01:10 +0100 (Fri, 03 Dec 2010)
New Revision: 2699

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/inst/unitTests/runit.RObject.R
Log:
fix some missing syntax in what was added earlier and clean up labels -- all good now


Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2010-12-03 21:31:19 UTC (rev 2698)
+++ pkg/Rcpp/ChangeLog	2010-12-03 22:01:10 UTC (rev 2699)
@@ -1,5 +1,7 @@
 2010-12-03  Dirk Eddelbuettel  <edd at debian.org>
 
+	* inst/unitTests/runit.RObject.R: fix 'inherits' test added today
+
 	* inst/include/Rcpp/module/Module_generated_Constructor.h: Applied
 	patch by Tama Ma <pingnang at phys.ethz.ch> for up to seven args in ctor
 	* inst/include/Rcpp/module/Module_generated_class_constructor.h: Idem

Modified: pkg/Rcpp/inst/unitTests/runit.RObject.R
===================================================================
--- pkg/Rcpp/inst/unitTests/runit.RObject.R	2010-12-03 21:31:19 UTC (rev 2698)
+++ pkg/Rcpp/inst/unitTests/runit.RObject.R	2010-12-03 22:01:10 UTC (rev 2699)
@@ -145,14 +145,14 @@
                   ,"isNULL"=list(
                    signature(x="ANY"),
                    'bool is_null = RObject(x).isNULL() ;
-					return wrap( is_null ) ; '
-				   ,"inherits" = list( x = "ANY" ), 
-				   '
-				   RObject xx(x) ;
-				   return wrap( xx.inherits( "foo" ) ) ;
-				   '
-					)
+					return wrap( is_null ) ; ')
 
+				  ,"inherits" = list(
+                   signature(x = "ANY" ),
+				   'RObject xx(x) ;
+				    return wrap( xx.inherits( "foo" ) ) ;
+				   ')
+
                   )
 
         signatures <- lapply(f, "[[", 1L)
@@ -332,8 +332,8 @@
 	checkTrue( !funx(.GlobalEnv), msg = "RObject.isNULL(environment) -> false" )
 }
 
-test.RObject.isNULL <- function(){
-	funx <- .Rcpp.RObject$inherits
+test.RObject.inherits <- function(){
+	fx <- .Rcpp.RObject$inherits
 	x <- 1:10
 	checkTrue( !fx(x) )
 	class(x) <- "foo"