register functions

Author: romainfrancois

inst/include/Rcpp/Environment.h

@@ -307,7 +307,7 @@ namespace Rcpp{
          * @return the Rcpp namespace
          */
         static Environment_Impl Rcpp_namespace(){
-            return Rcpp::internal::get_Rcpp_namespace() ;
+            return Rcpp::get_Rcpp_namespace() ;
         }
 
         /**

inst/include/Rcpp/Module.h

@@ -94,9 +94,6 @@ namespace Rcpp{
 
 namespace Rcpp{
 
-    Rcpp::Module* getCurrentScope() ;
-    void setCurrentScope( Rcpp::Module* ) ;
-
     template <typename Class>
     class CppMethod {
     public:

inst/include/Rcpp/cache.h

@@ -32,11 +32,11 @@ namespace Rcpp{
         unsigned long exitRNGScope() ;
     }
     SEXP get_Rcpp_namespace() ; 
-    int* get_cache( int n ) ;
     SEXP rcpp_get_stack_trace() ;
     SEXP rcpp_set_stack_trace(SEXP) ;
 }
 
+int* get_cache( int n ) ;
 SEXP stack_trace( const char *file, int line) ;
 SEXP get_string_elt(SEXP s, int i); 
 const char* char_get_string_elt(SEXP s, int i) ;
@@ -92,26 +92,20 @@ namespace Rcpp {
             static Fun fun = GET_CALLABLE("enterRNGScope") ;
             return fun() ;
         }
-    }
 
-    inline unsigned long exitRNGScope(){
-        typedef unsigned long (*Fun)(void) ;
-        static Fun fun = GET_CALLABLE("exitRNGScope") ;
-        return fun() ;
+        inline unsigned long exitRNGScope(){
+            typedef unsigned long (*Fun)(void) ;
+            static Fun fun = GET_CALLABLE("exitRNGScope") ;
+            return fun() ;
+        }
     }
-           
+                  
     inline SEXP get_Rcpp_namespace() {
         typedef SEXP (*Fun)(void) ;
         static Fun fun = GET_CALLABLE("get_Rcpp_namespace") ;
         return fun();
     }
 
-    inline int* get_cache( int n ){
-        typedef int* (*Fun)(int) ;
-        static Fun fun = GET_CALLABLE("get_cache") ;
-        return fun(n) ;    
-    }
-    
 }
 
 inline SEXP stack_trace( const char *file, int line){
@@ -192,6 +186,12 @@ inline void setCurrentScope( Rcpp::Module* mod ){
     fun(mod) ;    
 }
 
+inline int* get_cache( int n ){
+    typedef int* (*Fun)(int) ;
+    static Fun fun = GET_CALLABLE("get_cache") ;
+    return fun(n) ;    
+}
+    
 #endif
 
 

inst/include/Rcpp/routines.h

@@ -170,8 +170,6 @@ namespace Rcpp{
 
 #include <Rcpp/sugar/sugar_forward.h>
 
-#include <Rcpp/cache.h>
-
 #include <Rcpp/iostream/Rstreambuf.h>
 #include <Rcpp/longlong.h>
 

inst/include/RcppCommon.h

@@ -229,13 +229,3 @@ void setCurrentScope( Rcpp::Module* scope ){
     Rcpp::current_scope = scope ; 
 }
 
-extern "C" void R_init_Rcpp( DllInfo* info){
-	Rcpp::current_scope = 0 ;
-	
-	// init the cache
-	init_Rcpp_cache() ;
-	
-	// init routines
-	init_Rcpp_routines(info) ;
-}
-

src/Module.cpp

@@ -21,8 +21,7 @@
 
 #define COMPILING_RCPP
 
-#include <R.h>
-#include <Rinternals.h>
+#include <Rcpp.h>
 #include "internal.h"
 
 // borrowed from Matrix
@@ -82,7 +81,51 @@ void init_Rcpp_routines(DllInfo *info){
       extEntries /*.External*/
   );
 }
-        
+      
+void registerFunctions(){
+    using namespace Rcpp ;
+    using namespace Rcpp::internal ;
+    
+    #define RCPP_REGISTER(__FUN__) R_RegisterCCallable( "Rcpp", #__FUN__ , (DL_FUNC)__FUN__ );
+    RCPP_REGISTER(rcpp_get_stack_trace)
+    RCPP_REGISTER(rcpp_set_stack_trace)
+    RCPP_REGISTER(Rcpp_eval)
+    RCPP_REGISTER(type2name)
+    RCPP_REGISTER(demangle)
+    RCPP_REGISTER(enterRNGScope)
+    RCPP_REGISTER(exitRNGScope)
+    RCPP_REGISTER(get_Rcpp_namespace)
+    RCPP_REGISTER(get_cache)
+    RCPP_REGISTER(stack_trace)
+    RCPP_REGISTER(get_string_elt)
+    RCPP_REGISTER(char_get_string_elt)
+    RCPP_REGISTER(set_string_elt)
+    RCPP_REGISTER(char_set_string_elt)
+    RCPP_REGISTER(get_string_ptr)
+    RCPP_REGISTER(get_vector_elt)
+    RCPP_REGISTER(set_vector_elt)
+    RCPP_REGISTER(get_vector_ptr)
+    RCPP_REGISTER(char_nocheck)
+    RCPP_REGISTER(dataptr)
+    RCPP_REGISTER(getCurrentScope)
+    RCPP_REGISTER(setCurrentScope)
+    #undef RCPP_REGISTER
+}
+
+
 extern "C" void R_unload_Rcpp(DllInfo *info) {
   /* Release resources. */
 }
+
+extern "C" void R_init_Rcpp( DllInfo* info){
+	setCurrentScope(0) ;
+	
+	registerFunctions() ;
+	
+	// init the cache
+	init_Rcpp_cache() ;
+	
+	// init routines
+	init_Rcpp_routines(info) ;
+}
+

src/Rcpp_init.cpp

@@ -25,7 +25,6 @@
 #include <Rinternals.h>
 #include <Rcpp/barrier.h>
 #include "internal.h"
-#include <Rcpp/cache.h>
 #include <algorithm>
 #include <Rcpp/protection/Shield.h>
 
@@ -88,11 +87,11 @@ SEXP get_rcpp_cache() {
 }
 
 namespace Rcpp {
-    namespace internal {   
-		SEXP get_Rcpp_namespace(){ 
-			return VECTOR_ELT( get_rcpp_cache() , 0 ) ;
-		}
-	}
+    	
+    // [[Rcpp::register]]
+    SEXP get_Rcpp_namespace(){ 
+    	    return VECTOR_ELT( get_rcpp_cache() , 0 ) ;
+    }
 
 	// [[Rcpp::register]]
     SEXP rcpp_get_stack_trace(){