Manual merge of branch 'origin/feature/new-env' (#169)

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,7 @@
+2014-09-03  Kevin Ushey  <kevinushey@gmail.com>
+
+        * inst/include/Rcpp/Environment.h: make new_env a free function
+
 2014-09-02  Kevin Ushey  <kevinushey@gmail.com>
 
         * inst/include/Rcpp/api/meat/proxy.h: Finish meat reintroduction + tests
@@ -20,6 +24,10 @@
         * inst/include/Rcpp/vector/ListOf.h: `size()` member function should
         return `R_len_t` rather than `int`
 
+2014-08-30  Kevin Ushey  <kevinushey@gmail.com>
+
+        * inst/include/Rcpp/Environment.h: Add 'new_env' function
+
 2014-08-30  Dirk Eddelbuettel  <edd@debian.org>
 
         * inst/include/Rcpp/vector/Vector.h: Mark two 'from string' ctors as

inst/include/Rcpp/Environment.h

@@ -22,6 +22,10 @@
 #ifndef Rcpp_Environment_h
 #define Rcpp_Environment_h
 
+// From 'R/Defn.h'
+// NOTE: can't include header directly as it checks for some C99 features
+extern "C" SEXP R_NewHashedEnv(SEXP, SEXP);
+
 namespace Rcpp{
 
     RCPP_API_CLASS(Environment_Impl),
@@ -349,7 +353,12 @@ namespace Rcpp{
         void update(SEXP){}
     };
 
-    typedef Environment_Impl<PreserveStorage> Environment ;
+typedef Environment_Impl<PreserveStorage> Environment ;
+
+inline Environment new_env(int size = 29) {
+    Shield<SEXP> sizeSEXP(Rf_ScalarInteger(size));
+    return R_NewHashedEnv(R_EmptyEnv, sizeSEXP);
+};
 
 
 } // namespace Rcpp