moved eval_methods to Vector. It actually makes sense to eval any vector. Non expression vectors just eval to themselves

romainfrancois · romainfrancois · commit 439492dd8559 · 2013-11-12T10:23:57.000+01:00
diff --git a/inst/include/Rcpp/Vector.h b/inst/include/Rcpp/Vector.h
@@ -2,7 +2,7 @@
 //
 // Vector.h: Rcpp R/C++ interface class library -- vectors
 //
-// Copyright (C) 2010 - 2012 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2013 Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -40,7 +40,7 @@ namespace Rcpp{
 #include <Rcpp/vector/no_init.h>
 namespace Rcpp{
 #include <Rcpp/vector/00_forward_proxy.h>
-#include <Rcpp/vector/00_forward_eval_methods.h>
+#include <Rcpp/vector/vector_from_string.h>
 
 #include <Rcpp/vector/converter.h>
 
diff --git a/inst/include/Rcpp/r_cast.h b/inst/include/Rcpp/r_cast.h
@@ -27,7 +27,16 @@
 namespace Rcpp{
     namespace internal {
         
-        SEXP convert_using_rfunction(SEXP x, const char* const fun);
+        inline SEXP convert_using_rfunction(SEXP x, const char* const fun){
+            Armor<SEXP> res ;
+            try{
+                SEXP funSym = Rf_install(fun);
+                res = Rcpp_eval( Rf_lang2( funSym, x ) ) ;
+            } catch( eval_error& e){
+                throw not_compatible( std::string("could not convert using R function : ") + fun  ) ;
+            }
+            return res;
+        }
         
         // r_true_cast is only meant to be used when the target SEXP type
         // is different from the SEXP type of x 
diff --git a/inst/include/Rcpp/vector/Vector.h b/inst/include/Rcpp/vector/Vector.h
@@ -30,8 +30,7 @@ template <bool NA,typename T> class SingleLogicalResult ;
 template <int RTYPE>
 class Vector :
     public RObject,       
-    public VectorBase< RTYPE, true, Vector<RTYPE> >, 
-    public internal::eval_methods<RTYPE> 
+    public VectorBase< RTYPE, true, Vector<RTYPE> >
 {
     typename traits::r_vector_cache_type<RTYPE>::type cache ;
     
@@ -522,6 +521,15 @@ class Vector :
 
     #include <Rcpp/generated/Vector__create.h>
 
+    inline SEXP eval() const {
+        return Rcpp_eval( Storage::get__(), R_GlobalEnv ) ;    
+    }
+    
+    inline SEXP eval(SEXP env) const {
+        return Rcpp_eval( Storage::get__(), env );    
+    }
+    
+    
 } ; /* Vector */
 
 #endif
diff --git a/inst/include/Rcpp/vector/vector_from_string.h b/inst/include/Rcpp/vector/vector_from_string.h
@@ -1,8 +1,8 @@
 // -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*-
 //
-// eval_methods.h: Rcpp R/C++ interface class library -- 
+// vector_from_string.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2011 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2013 Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -19,10 +19,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef Rcpp__vector__forward_eval_methods_h
-#define Rcpp__vector__forward_eval_methods_h
+#ifndef Rcpp__vector__forward_vector_from_string_h
+#define Rcpp__vector__forward_vector_from_string_h
 
 namespace internal{
+    
     template <int RTYPE>
     SEXP vector_from_string( const std::string& st ) {
         return r_cast<RTYPE>( Rf_mkString( st.c_str() ) ) ;
@@ -49,13 +50,6 @@ namespace internal{
     inline SEXP vector_from_string<EXPRSXP>( const std::string& st ) {
         return vector_from_string_expr<EXPRSXP>( st ) ;
     }
-        
-    template <int RTYPE> class eval_methods {} ;
-    template <> class eval_methods<EXPRSXP> {
-    public:
-        SEXP eval() ;
-        SEXP eval(SEXP) ;
-    } ;
-      
+    
 }
 #endif
diff --git a/src/api.cpp b/src/api.cpp
@@ -269,36 +269,6 @@ namespace Rcpp {
 
 
 // {{{ utilities (from RcppCommon.cpp)
-
-namespace Rcpp{
-namespace internal{
-
-	SEXP convert_using_rfunction(SEXP x, const char* const fun) {
-        SEXP res = R_NilValue ;
-        try{
-            SEXP funSym = Rf_install(fun);
-            res = Rcpp_eval( Rf_lang2( funSym, x ) ) ;
-        } catch( eval_error& e){
-            throw ::Rcpp::not_compatible( std::string("could not convert using R function : ") + fun  ) ;
-        }
-        return res;
-    }
-    
-    SEXP eval_methods<EXPRSXP>::eval(){
-        SEXP xp = ( static_cast<ExpressionVector&>(*this) ).asSexp() ;
-        SEXP evalSym = Rf_install( "eval" );
-        return Rcpp_eval( Rf_lang2( evalSym, xp ) ) ;
-    }
-    
-    SEXP eval_methods<EXPRSXP>::eval( SEXP env ){
-        SEXP xp = ( static_cast<ExpressionVector&>(*this) ).asSexp() ;
-        SEXP evalSym = Rf_install( "eval" );
-        return Rcpp_eval( Rf_lang3( evalSym, xp, env ) ) ;
-    }
-	
-} // internal
-} // Rcpp
-
 SEXP as_character_externalptr(SEXP xp){
 	char buffer[20] ;
 	sprintf( buffer, "%p", (void*)EXTPTR_PTR(xp) ) ;
