Merge remote-tracking branch 'RcppCore/master' into unit-test-rdist

# Conflicts:
#	ChangeLog

Author: coatless

ChangeLog

@@ -3,6 +3,10 @@
         * inst/unitTests/cpp/rmath.cpp: Added unit test functions for Rmath
         random number generators.
         * inst/unitTests/runit.rmath.R: idem
+        * inst/include/Rcpp/Environment.h: Added get() & find() that accept 
+        a symbol
+        * inst/include/Rcpp.h: Modified header load order so that Symbol.h 
+        is now placed before Environment.h
 
 2016-07-21  Dirk Eddelbuettel  <edd@debian.org>
 
@@ -16,7 +20,7 @@
 
         * DESCRIPTION: Release 0.12.6
         * inst/NEWS.Rd: Release 0.12.6
-	* vignettes/Rcpp.bib: Release 0.12.6, RProtoBuf updates
+        * vignettes/Rcpp.bib: Release 0.12.6, RProtoBuf updates
         * inst/include/Rcpp/config.h: Release 0.12.6
 
         * README.md: Updated counts for dependents and tests

inst/NEWS.Rd

@@ -9,6 +9,8 @@
     \itemize{
       \item The \code{NORET} macro is now defined if it was not already defined
       by R (Kevin fixing issue \ghit{512}). 
+      \item Environment functions get() & find() now accept a Symbol
+      (James Joseph Balamuta in \ghpr{513} addressing issue \ghit{326}).
     }
     \item Changes in Rcpp unit tests
     \itemize{

inst/include/Rcpp.h

@@ -33,6 +33,8 @@
 #include <Rcpp/clone.h>
 #include <Rcpp/grow.h>
 #include <Rcpp/Dimension.h>
+
+#include <Rcpp/Symbol.h>
 #include <Rcpp/Environment.h>
 
 #include <Rcpp/Vector.h>
@@ -42,7 +44,6 @@
 #include <Rcpp/Promise.h>
 
 #include <Rcpp/XPtr.h>
-#include <Rcpp/Symbol.h>
 #include <Rcpp/DottedPairImpl.h>
 #include <Rcpp/Function.h>
 #include <Rcpp/Language.h>

inst/include/Rcpp/Environment.h

@@ -115,6 +115,27 @@ namespace Rcpp{
             }
             return res ;
         }
+        
+        /**
+        * Get an object from the environment
+        *
+        * @param name symbol name to call
+        *
+        * @return a SEXP (possibly R_NilValue)
+        */
+        SEXP get(Symbol name) const {
+            SEXP env = Storage::get__() ;
+            SEXP res = Rf_findVarInFrame( env, name ) ;
+            
+            if( res == R_UnboundValue ) return R_NilValue ;
+            
+            /* We need to evaluate if it is a promise */
+            if( TYPEOF(res) == PROMSXP){
+                res = Rf_eval( res, env ) ;
+            }
+            return res ;
+        }
+        
 
         /**
          * Get an object from the environment or one of its
@@ -136,6 +157,29 @@ namespace Rcpp{
             }
             return res ;
         }
+        
+        /**
+        * Get an object from the environment or one of its
+        * parents
+        *
+        * @param name symbol name to call
+        */
+        SEXP find(Symbol name) const{
+            SEXP env = Storage::get__() ;
+            SEXP res = Rf_findVar( name, env ) ;
+            
+            if( res == R_UnboundValue ) {
+                // Pass on the const char* to the RCPP_EXCEPTION_CLASS's
+                // const std::string& requirement
+                throw binding_not_found(name.c_str()) ;
+            }
+            
+            /* We need to evaluate if it is a promise */
+            if( TYPEOF(res) == PROMSXP){
+                res = Rf_eval( res, env ) ;
+            }
+            return res ;
+        }
 
         /**
          * Indicates if an object called name exists in the

inst/unitTests/cpp/rmath.cpp

@@ -44,7 +44,12 @@ NumericVector runit_qnorm( double x, double a, double b ){
 
 // [[Rcpp::export]]
 NumericVector runit_rnorm( double a, double b ){
-    return NumericVector::create(R::rnorm(a, b), R::rnorm(a, b));
+    NumericVector o(5);
+    
+    for(int i = 0; i < o.size(); i++)
+        o[i] = R::rnorm(a, b);
+    
+    return o;
 }
 
 // ------------------- Uniform Distribution
@@ -68,7 +73,12 @@ NumericVector runit_qunif( double x, double a, double b ){
 
 // [[Rcpp::export]]
 NumericVector runit_runif( double a, double b ){
-    return NumericVector::create(R::runif(a, b), R::runif(a, b));
+    NumericVector o(5);
+    
+    for(int i = 0; i < o.size(); i++)
+        o[i] = R::runif(a, b);
+    
+    return o;
 }
 
 
@@ -93,7 +103,12 @@ NumericVector runit_qgamma( double x, double a, double b ){
 
 // [[Rcpp::export]]
 NumericVector runit_rgamma( double a, double b ){
-    return NumericVector::create(R::rgamma(a, b), R::rgamma(a, b));
+    NumericVector o(5);
+    
+    for(int i = 0; i < o.size(); i++)
+        o[i] = R::rgamma(a, b);
+    
+    return o;
 }
 
 
@@ -118,7 +133,12 @@ NumericVector runit_qbeta( double x, double a, double b ){
 
 // [[Rcpp::export]]
 NumericVector runit_rbeta( double a, double b ){
-    return NumericVector::create(R::rbeta(a, b), R::rbeta(a, b));
+    NumericVector o(5);
+    
+    for(int i = 0; i < o.size(); i++)
+        o[i] = R::rbeta(a, b);
+    
+    return o;
 }
 
 
@@ -143,7 +163,12 @@ NumericVector runit_qlnorm( double x, double a, double b ){
 
 // [[Rcpp::export]]
 NumericVector runit_rlnorm( double a, double b ){
-    return NumericVector::create(R::rlnorm(a, b), R::rlnorm(a, b));
+    NumericVector o(5);
+    
+    for(int i = 0; i < o.size(); i++)
+        o[i] = R::rlnorm(a, b);
+    
+    return o;
 }
 
 // ------------------- Chi-Squared Distribution
@@ -167,7 +192,12 @@ NumericVector runit_qchisq( double x, double a ){
 
 // [[Rcpp::export]]
 NumericVector runit_rchisq( double a ){
-    return NumericVector::create(R::rchisq(a), R::rchisq(a));
+    NumericVector o(5);
+    
+    for(int i = 0; i < o.size(); i++)
+        o[i] = R::rchisq(a);
+    
+    return o;
 }
 
 // ------------------- Non-central Chi-Squared Distribution
@@ -210,7 +240,12 @@ NumericVector runit_qf( double x, double a, double b ){
 
 // [[Rcpp::export]]
 NumericVector runit_rf( double a, double b ){
-    return NumericVector::create(R::rf(a, b), R::rf(a, b));
+    NumericVector o(5);
+    
+    for(int i = 0; i < o.size(); i++)
+        o[i] = R::rf(a, b);
+    
+    return o;
 }
 
 // -------------------  Student t Distribution
@@ -234,7 +269,12 @@ NumericVector runit_qt( double x, double a ){
 
 // [[Rcpp::export]]
 NumericVector runit_rt( double a ){
-    return NumericVector::create(R::rt(a), R::rt(a));
+    NumericVector o(5);
+    
+    for(int i = 0; i < o.size(); i++)
+        o[i] = R::rt(a);
+    
+    return o;
 }
 
 // -------------------  Binomial Distribution
@@ -258,7 +298,12 @@ NumericVector runit_qbinom( double x, double a, double b ){
 
 // [[Rcpp::export]]
 NumericVector runit_rbinom( double a, double b ){
-    return NumericVector::create(R::rbinom(a, b), R::rbinom(a, b));
+    NumericVector o(5);
+    
+    for(int i = 0; i < o.size(); i++)
+        o[i] = R::rbinom(a, b);
+    
+    return o;
 }
 
 // -------------------  Cauchy Distribution
@@ -282,7 +327,12 @@ NumericVector runit_qcauchy( double x, double a, double b ){
 
 // [[Rcpp::export]]
 NumericVector runit_rcauchy( double a, double b ){
-    return NumericVector::create(R::rcauchy(a, b), R::rcauchy(a, b));
+    NumericVector o(5);
+    
+    for(int i = 0; i < o.size(); i++)
+        o[i] = R::rcauchy(a, b);
+    
+    return o;
 }
 
 // -------------------  Exponential Distribution
@@ -306,7 +356,12 @@ NumericVector runit_qexp( double x, double a ){
 
 // [[Rcpp::export]]
 NumericVector runit_rexp( double a ){
-    return NumericVector::create(R::rexp(a), R::rexp(a));
+    NumericVector o(5);
+    
+    for(int i = 0; i < o.size(); i++)
+        o[i] = R::rexp(a);
+    
+    return o;
 }
 
 // -------------------  Geometric Distribution
@@ -330,7 +385,12 @@ NumericVector runit_qgeom( double x, double a ){
 
 // [[Rcpp::export]]
 NumericVector runit_rgeom( double a ){
-    return NumericVector::create(R::rgeom(a), R::rgeom(a));
+    NumericVector o(5);
+    
+    for(int i = 0; i < o.size(); i++)
+        o[i] = R::rgeom(a);
+    
+    return o;
 }
 
 // -------------------  Hypergeometric Distribution
@@ -354,7 +414,12 @@ NumericVector runit_qhyper( double x, double a, double b, double c ){
 
 // [[Rcpp::export]]
 NumericVector runit_rhyper( double a, double b, double c ){
-    return NumericVector::create(R::rhyper(a, b, c), R::rhyper(a, b, c));
+    NumericVector o(5);
+    
+    for(int i = 0; i < o.size(); i++)
+        o[i] = R::rhyper(a, b, c);
+    
+    return o;
 }
 
 // -------------------  Negative Binomial Distribution
@@ -378,7 +443,12 @@ NumericVector runit_qnbinom( double x, double a, double b ){
 
 // [[Rcpp::export]]
 NumericVector runit_rnbinom( double a, double b){
-    return NumericVector::create(R::rnbinom(a, b), R::rnbinom(a, b));
+    NumericVector o(5);
+    
+    for(int i = 0; i < o.size(); i++)
+        o[i] = R::rnbinom(a, b);
+    
+    return o;
 }
 
 // -------------------  Poisson Distribution
@@ -402,7 +472,12 @@ NumericVector runit_qpois( double x, double a ){
 
 // [[Rcpp::export]]
 NumericVector runit_rpois( double a ){
-    return NumericVector::create(R::rpois(a), R::rpois(a));
+    NumericVector o(5);
+    
+    for(int i = 0; i < o.size(); i++)
+        o[i] = R::rpois(a);
+    
+    return o;
 }
 
 // -------------------  Weibull Distribution
@@ -426,7 +501,12 @@ NumericVector runit_qweibull( double x, double a, double b ){
 
 // [[Rcpp::export]]
 NumericVector runit_rweibull( double a, double b ){
-    return NumericVector::create(R::rweibull(a, b), R::rweibull(a, b));
+    NumericVector o(5);
+    
+    for(int i = 0; i < o.size(); i++)
+        o[i] = R::rweibull(a, b);
+    
+    return o;
 }
 
 // -------------------  Logistic Distribution
@@ -450,7 +530,12 @@ NumericVector runit_qlogis( double x, double a, double b ){
 
 // [[Rcpp::export]]
 NumericVector runit_rlogis( double a, double b ){
-    return NumericVector::create(R::rlogis(a, b), R::rlogis(a, b));
+    NumericVector o(5);
+    
+    for(int i = 0; i < o.size(); i++)
+        o[i] = R::rlogis(a, b);
+    
+    return o;
 }
 
 // -------------------  Non-central Beta Distribution
@@ -531,5 +616,10 @@ NumericVector runit_qwilcox( double x, double a, double b ){
 
 // [[Rcpp::export]]
 NumericVector runit_rwilcox( double a, double b ){
-    return NumericVector::create(R::rwilcox(a, b), R::rwilcox(a, b));
+    NumericVector o(5);
+    
+    for(int i = 0; i < o.size(); i++)
+        o[i] = R::rwilcox(a, b);
+    
+    return o;
 }