register short_file_name. needed for debugging

Author: romainfrancois

inst/include/Rcpp/macros/debug.h

@@ -24,11 +24,9 @@
 
 // simple logging help
 #ifndef RCPP_DEBUG_LEVEL
-#define RCPP_DEBUG_LEVEL 0
+    #define RCPP_DEBUG_LEVEL 0
 #endif
 
-const char* short_file_name(const char* file) ;
-
 #if RCPP_DEBUG_LEVEL > 0
     #define RCPP_DEBUG( MSG ) Rprintf( "%40s:%4d %s\n" , short_file_name(__FILE__), __LINE__, MSG ) ; 
     #define RCPP_DEBUG_1( fmt, MSG ) Rprintf( "%40s:%4d " fmt "\n" , short_file_name(__FILE__), __LINE__, MSG ) ; 

inst/include/Rcpp/routines.h

@@ -39,6 +39,7 @@ namespace Rcpp{
     struct tm * gmtime_(const time_t * const) ;
 }
 
+const char* short_file_name(const char* ) ;
 int* get_cache( int n ) ;
 SEXP stack_trace( const char *file, int line) ;
 SEXP get_string_elt(SEXP s, int i); 
@@ -129,6 +130,11 @@ namespace Rcpp {
 
 }     
 
+inline const char* short_file_name(const char* file) {
+    typedef const char* (*Fun)(const char*) ;
+    static Fun fun = GET_CALLABLE("short_file_name") ;
+    return fun(file) ;    
+}
 inline SEXP stack_trace( const char *file, int line){
     typedef SEXP (*Fun)(const char*, int) ;
     static Fun fun = GET_CALLABLE("stack_trace") ;

src/api.cpp

@@ -169,19 +169,19 @@ namespace Rcpp {
         }
     }
 
-    // [[Rcpp::register]]
-    const char* short_file_name(const char* file){
-        std::string f(file) ;
-        size_t index = f.find("/include/") ;
-        if( index != std::string::npos ){ 
-            f = f.substr( index + 9 ) ;
-        }
-        return f.c_str() ;
-    }
-    
 
 } // namespace Rcpp
 
+// [[Rcpp::register]]
+const char* short_file_name(const char* file){
+    std::string f(file) ;
+    size_t index = f.find("/include/") ;
+    if( index != std::string::npos ){ 
+        f = f.substr( index + 9 ) ;
+    }
+    return f.c_str() ;
+}
+    
 // [[Rcpp::internal]]
 SEXP as_character_externalptr(SEXP xp){
     char buffer[20] ;