address issue #350 by renaming 'World' Modules

affects four different unit tests
also very minor cleanups

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,21 @@
+2015-08-26  Dirk Eddelbuettel  <[email protected]>
+
+        * inst/unitTests/testRcppClass/src/rcpp_module.cpp: Renamed Module
+        'World' to 'RcppClassWorld' to avoid multiple modules with same name
+        * inst/unitTests/testRcppClass/man/Rcpp_class_examples.Rd: Ditto
+        * inst/unitTests/testRcppClass/R/load.R: Ditto
+        * inst/unitTests/testRcppClass/NAMESPACE: Ditto
+        * inst/unitTests/runit.Module.client.package.R: Re-enable test
+
+        * inst/unitTests/testRcppModule/src/rcpp_module.cpp: Renamed Module
+        'World' to 'RcppModuleWorld' to avoid multiple modules with same name
+
+        * inst/unitTests/cpp/modref.cpp: Rename 'World' to 'ModRefWorld'
+        * inst/unitTests/runit.modref.R (test.modRef): Ditto
+
+        * inst/unitTests/cpp/Module.cpp: Rename 'World' to 'ModuleWorld'
+        * inst/unitTests/runit.Module.R (test.Module): Ditto
+
 2015-08-24  Dirk Eddelbuettel  <[email protected]>
 
         * vignettes/Rcpp.bib: Updated R / R Core references

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.12.0.2
-Date: 2015-08-17
+Version: 0.12.0.3
+Date: 2015-08-26
 Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, 
  Qiang Kou, Douglas Bates and John Chambers
 Maintainer: Dirk Eddelbuettel <[email protected]>

inst/NEWS.Rd

@@ -19,6 +19,11 @@
       \item Correctly reset directory in case of no-rebuilding but Windows code
       (PR #335)
     }
+    \item Changes in Rcpp Modules:
+    \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.
+    }
   }
 }
 

inst/unitTests/cpp/Module.cpp

@@ -3,7 +3,7 @@
 //
 // Module.cpp: Rcpp R/C++ interface class library -- module unit tests
 //
-// Copyright (C) 2013 - 2014  Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2013 - 2015  Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -22,45 +22,45 @@
 
 #include <Rcpp.h>
 
-using namespace Rcpp ;
+using namespace Rcpp;
 
 std::string hello() {
-    return "hello" ;
+    return "hello";
 }
 
 int bar(int x) {
-    return x*2 ;
+    return x*2;
 }
 
 double foo(int x, double y) {
-    return x * y ;
+    return x * y;
 }
 
 void bla() {
-    Rprintf("hello\\n") ;
+    Rprintf("hello\\n");
 }
 
 void bla1(int x) {
-    Rprintf("hello (x = %d)\\n", x) ;
+    Rprintf("hello (x = %d)\\n", x);
 }
 
 void bla2(int x, double y) {
-    Rprintf("hello (x = %d, y = %5.2f)\\n", x, y) ;
+    Rprintf("hello (x = %d, y = %5.2f)\\n", x, y);
 }
 
 int test_reference(std::vector<double>& ref) {
-    return ref.size() ;
+    return ref.size();
 }
 int test_const_reference(const std::vector<double>& ref) {
-    return ref.size() ;
+    return ref.size();
 }
 int test_const(const std::vector<double> ref) {
-    return ref.size() ;
+    return ref.size();
 }
 
-class World {
+class ModuleWorld {
 public:
-    World() : msg("hello") {}
+    ModuleWorld() : msg("hello") {}
     void set(std::string msg_) { this->msg = msg_; }
     void set_ref(std::string& msg_) { this->msg = msg_; }
     void set_const_ref(const std::string& msg_) { this->msg = msg_; }
@@ -70,30 +70,30 @@ class World {
     std::string msg;
 };
 
-void clearWorld(World* w) {
+void clearWorld(ModuleWorld* w) {
     w->set("");
 }
 
 class Num{
 public:
-    Num() : x(0.0), y(0) {} ;
+    Num() : x(0.0), y(0) {};
 
-    double getX() const { return x ; }
-    void setX(double value) { x = value ; }
+    double getX() const { return x; }
+    void setX(double value) { x = value; }
 
-    int getY() { return y ; }
+    int getY() { return y; }
 
 private:
-    double x ;
-    int y ;
+    double x;
+    int y;
 };
 
 class Number{
 public:
-    Number() : x(0.0), y(0) {} ;
+    Number() : x(0.0), y(0) {};
 
-    double x ;
-    int y ;
+    double x;
+    int y;
 };
 
 class Randomizer {
@@ -103,40 +103,40 @@ class Randomizer {
     Randomizer(double min_, double max_) : min(min_), max(max_) {}
 
     NumericVector get(int n) {
-        RNGScope scope ;
+        RNGScope scope;
         return runif(n, min, max);
     }
 
 private:
-    double min, max ;
-} ;
+    double min, max;
+};
 
 RCPP_EXPOSED_CLASS(Test)
 class Test{
 public:
-    double value ;
+    double value;
     Test(double v) : value(v) {}
 private:
     // hiding those on purpose
     // we work by reference or pointers here. Not by copy.
-    Test(const Test& other) ;
-    Test& operator=(const Test&) ;
-} ;
+    Test(const Test& other);
+    Test& operator=(const Test&);
+};
 
 double Test_get_x_const_ref(const Test& x) {
-    return x.value ;
+    return x.value;
 }
 double Test_get_x_ref(Test& x) {
     return x.value;
 }
 double Test_get_x_const_pointer(const Test* x) {
-    return x->value ;
+    return x->value;
 }
 double Test_get_x_pointer(Test* x) {
-    return x->value ;
+    return x->value;
 }
 
-RCPP_MODULE(yada) {
+RCPP_MODULE(demoModule) {
     function("hello", &hello);
     function("bar"  , &bar  );
     function("foo"  , &foo  );
@@ -145,23 +145,21 @@ RCPP_MODULE(yada) {
     function("bla2" , &bla2 );
 
     function("test_reference", test_reference);
-    function("test_const_reference", test_const_reference) ;
-    function("test_const", test_const) ;
+    function("test_const_reference", test_const_reference);
+    function("test_const", test_const);
 
     class_<Test>("Test")
         .constructor<double>()
         ;
 
-    class_<World>("World")
-
+    class_<ModuleWorld>("ModuleWorld")
         .constructor()
-
-        .method("greet", &World::greet)
-        .method("set", &World::set)
-        .method("set_ref", &World::set_ref)
-        .method("set_const_ref", &World::set_const_ref)
+        .method("greet", &ModuleWorld::greet)
+        .method("set", &ModuleWorld::set)
+        .method("set_ref", &ModuleWorld::set_ref)
+        .method("set_const_ref", &ModuleWorld::set_const_ref)
         .method("clear", &clearWorld)
-	;
+        ;
 
     class_<Num>("Num")
         .constructor()
@@ -200,7 +198,7 @@ RCPP_MODULE(yada) {
 
 // [[Rcpp::export]]
 double attr_Test_get_x_const_ref(const Test& x) {
-    return x.value ;
+    return x.value;
 }
 
 // [[Rcpp::export]]
@@ -210,12 +208,12 @@ double attr_Test_get_x_ref(Test& x) {
 
 // [[Rcpp::export]]
 double attr_Test_get_x_const_pointer(const Test* x) {
-    return x->value ;
+    return x->value;
 }
 
 // [[Rcpp::export]]
 double attr_Test_get_x_pointer(Test* x) {
-    return x->value ;
+    return x->value;
 }
 
 

inst/unitTests/cpp/modref.cpp

@@ -2,7 +2,7 @@
 //
 // modref.cpp: Rcpp R/C++ interface class library -- module unit tests
 //
-// Copyright (C) 2013 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2013 - 2015  Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -22,9 +22,9 @@
 #include <Rcpp.h>
 using namespace Rcpp ;
 
-class World {
+class ModRefWorld {
 public:
-    World() : foo(1), msg("hello") {}
+    ModRefWorld() : foo(1), msg("hello") {}
     void set(std::string msg_) { this->msg = msg_; }
     std::string greet() { return msg; }
 
@@ -35,21 +35,21 @@ class World {
     std::string msg;
 };
 
-void clearWorld( World* w ){
+void clearWorld( ModRefWorld* w ){
     w->set( "" );
 }
 
-RCPP_MODULE(yada){
-	class_<World>( "World" )
+RCPP_MODULE(modrefmodule){
+    class_<ModRefWorld>( "ModRefWorld" )
         .default_constructor()
 
-        .method( "greet", &World::greet )
-        .method( "set", &World::set )
+        .method( "greet", &ModRefWorld::greet )
+        .method( "set", &ModRefWorld::set )
         .method( "clear", &clearWorld )
 
-        .field( "foo", &World::foo )
-        .field_readonly( "bar", &World::bar )
-	;
+        .field( "foo", &ModRefWorld::foo )
+        .field_readonly( "bar", &ModRefWorld::bar )
+        ;
 
 }
 

inst/unitTests/runit.Module.R

@@ -33,7 +33,7 @@ if( .runThisTest && Rcpp:::capabilities()[["Rcpp modules"]] ) {
         checkEquals( foo( 2L, 10.0 ), 20.0 )
         checkEquals( hello(), "hello" )
 
-        w <- new( World )
+        w <- new( ModuleWorld )
         checkEquals( w$greet(), "hello" )
         w$set( "hello world" )
         checkEquals( w$greet(), "hello world" )

inst/unitTests/runit.Module.client.package.R

@@ -32,7 +32,6 @@
 .onWindows <- .Platform$OS.type == "windows"
 
 .runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
-.runThisTest <- FALSE  ## FIXME
 
 if (.runThisTest && ! .badOSX && ! .onWindows) {
 

inst/unitTests/runit.modref.R

@@ -1,6 +1,6 @@
 #!/usr/bin/r -t
 #
-# Copyright (C) 2010 - 2014  John Chambers, Dirk Eddelbuettel and Romain Francois
+# Copyright (C) 2010 - 2015  John Chambers, Dirk Eddelbuettel and Romain Francois
 #
 # This file is part of Rcpp.
 #
@@ -24,8 +24,8 @@ if (.runThisTest) {
     .setUp <- Rcpp:::unitTestSetup("modref.cpp")     
 
     test.modRef <- function() {
-        ww = new(World)
-        wg = World$new()
+        ww <- new(ModRefWorld)
+        wg <- ModRefWorld$new()
 
         checkEquals(ww$greet(), wg$greet())
         wgg <- wg$greet()
@@ -36,7 +36,7 @@ if (.runThisTest) {
         checkEquals(ww$greet(), "Other")
         checkEquals(wg$greet(), wgg)
 
-        World$methods(twice = function() paste(greet(), greet()))
+        ModRefWorld$methods(twice = function() paste(greet(), greet()))
 
         checkEquals(ww$twice(), paste(ww$greet(), ww$greet()))
 

inst/unitTests/testRcppClass/NAMESPACE

@@ -4,4 +4,4 @@ import(Rcpp,methods)
 export(genWorld, stdNumeric, rcpp_hello_world,
        bar, foo, baz, baz1)
 
-exportClass(World, stdNumeric)#, NumEx)
+exportClass(RcppClassWorld, stdNumeric)#, NumEx)

inst/unitTests/testRcppClass/R/load.R

@@ -1,4 +1,4 @@
-setRcppClass("World", module = "yada", fields = list(more = "character"),
+setRcppClass("RcppClassWorld", module = "RcppClassModule", fields = list(more = "character"),
              methods = list(test = function(what) message("Testing: ", what, "; ", more)),
              saveAs = "genWorld"
              )
@@ -47,5 +47,7 @@ evalqOnLoad({
 ## For R 2.15.1 and later this also works. Note that calling loadModule() triggers
 ## a load action, so this does not have to be placed in .onLoad() or evalqOnLoad().
 loadModule("NumEx", TRUE)
-loadModule("yada", TRUE)
+loadModule("RcppClassModule", TRUE)
 loadModule("stdVector", TRUE)
+
+loadModule("RcppClassModule", c("bar", baz = "bla", baz1 = "bla1", "foo"))