Merge pull request #269 from RcppCore/feature/print-function

Feature/print function

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,9 @@
+2015-03-01  Dirk Eddelbuettel  <[email protected]>
+
+        * src/api.cpp: New function print() as a wrapper around Rf_PrintValue()
+        * src/Rcpp_init.cpp: Corresponding registration for print()
+        * inst/include/Rcpp/routines.h: Corresponding initialization
+
 2015-02-25  Dirk Eddelbuettel  <[email protected]>
 
         * inst/include/Rcpp/routines.h: Use the 'attribute_hidden' define from

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.11.4.8
-Date: 2015-02-25
+Version: 0.11.4.9
+Date: 2015-03-01
 Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, 
  Douglas Bates, and John Chambers
 Maintainer: Dirk Eddelbuettel <[email protected]>

inst/NEWS.Rd

@@ -14,6 +14,8 @@
       exception rather than crash) when a NULL external pointer is dereferenced.
       \item R code is evaluated within an \code{R_toplevelExec} block to prevent
       user interrupts from bypassing C++ destructors on the stack.
+      \item A new function \code{print} function was added as a wrapper around
+      \code{Rf_PrintValue}. 
     }
     \item Changes in Rcpp Attributes:
     \itemize{

inst/include/Rcpp/config.h

@@ -30,7 +30,7 @@
 #define RCPP_VERSION Rcpp_Version(0,11,4)
 
 // the current source snapshot
-#define RCPP_DEV_VERSION RcppDevVersion(0,11,4,8)
+#define RCPP_DEV_VERSION RcppDevVersion(0,11,4,9)
 
 #endif
 

inst/include/Rcpp/routines.h

@@ -38,29 +38,31 @@ namespace Rcpp{
     struct tm * gmtime_(const time_t * const);
 }
 
-SEXP rcpp_get_stack_trace();
-SEXP rcpp_set_stack_trace(SEXP);
-std::string demangle( const std::string& name);
-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);
-const char* char_get_string_elt(SEXP s, int i);
-void set_string_elt(SEXP s, int i, SEXP v);
-void char_set_string_elt(SEXP s, int i, const char* v);
-SEXP* get_string_ptr(SEXP s);
-SEXP get_vector_elt(SEXP v, int i);
-void set_vector_elt(SEXP v, int i, SEXP x);
-SEXP* get_vector_ptr(SEXP v);
-const char* char_nocheck( SEXP x);
-void* dataptr(SEXP x);
+SEXP          rcpp_get_stack_trace();
+SEXP          rcpp_set_stack_trace(SEXP);
+std::string   demangle(const std::string& name);
+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);
+const char*   char_get_string_elt(SEXP s, int i);
+void          set_string_elt(SEXP s, int i, SEXP v);
+void          char_set_string_elt(SEXP s, int i, const char* v);
+SEXP*         get_string_ptr(SEXP s);
+SEXP          get_vector_elt(SEXP v, int i);
+void          set_vector_elt(SEXP v, int i, SEXP x);
+SEXP*         get_vector_ptr(SEXP v);
+const char*   char_nocheck(SEXP x);
+void*         dataptr(SEXP x);
 Rcpp::Module* getCurrentScope();
-void setCurrentScope( Rcpp::Module* mod );
-SEXP reset_current_error();
-int error_occured();
-SEXP rcpp_get_current_error();
+void          setCurrentScope( Rcpp::Module* mod );
+SEXP          reset_current_error();
+int           error_occured();
+SEXP          rcpp_get_current_error();
+void          print(SEXP s);
 
 #else
+
 namespace Rcpp {
 
     #define GET_CALLABLE(__FUN__) (Fun) R_GetCCallable( "Rcpp", __FUN__ )
@@ -140,6 +142,7 @@ inline attribute_hidden const char* short_file_name(const char* file) {
     static Fun fun = GET_CALLABLE("short_file_name");
     return fun(file);
 }
+
 inline attribute_hidden SEXP stack_trace( const char *file, int line){
     typedef SEXP (*Fun)(const char*, int);
     static Fun fun = GET_CALLABLE("stack_trace");
@@ -235,11 +238,19 @@ inline attribute_hidden int error_occured(){
     static Fun fun = GET_CALLABLE("error_occured");
     return fun();
 }
+
 inline attribute_hidden SEXP rcpp_get_current_error(){
     typedef SEXP (*Fun)(void);
     static Fun fun = GET_CALLABLE("rcpp_get_current_error");
     return fun();
 }
+
+inline attribute_hidden void print(SEXP s) {
+    typedef void (*Fun)(SEXP);
+    static Fun fun = GET_CALLABLE("print");
+    fun(s);
+}
+
 #endif
 
 

src/Rcpp_init.cpp

@@ -1,8 +1,8 @@
-// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*-
 //
 // Rcpp_init.cpp : Rcpp R/C++ interface class library -- Initialize and register
 //
-// Copyright (C) 2010 - 2013 John Chambers, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2015  John Chambers, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -116,6 +116,7 @@ void registerFunctions(){
     RCPP_REGISTER(reset_current_error)
     RCPP_REGISTER(error_occured)
     RCPP_REGISTER(rcpp_get_current_error)
+    RCPP_REGISTER(print)
     #undef RCPP_REGISTER
 }
 

src/api.cpp

@@ -3,7 +3,7 @@
 //
 // api.cpp: Rcpp R/C++ interface class library -- Rcpp api
 //
-// Copyright (C) 2012 - 2014  Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2012 - 2015  Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -56,7 +56,7 @@ using namespace Rcpp ;
 
 namespace Rcpp {
 
-    namespace internal{
+    namespace internal {
         namespace {
             unsigned long RNGScopeCounter = 0;
         }
@@ -294,8 +294,14 @@ SEXP stack_trace( const char* file, int line ){
             return trace ;
         #endif
     #else /* !defined( __GNUC__ ) */
-	    return R_NilValue ;
-	#endif
+        return R_NilValue ;
+    #endif
 }
+
+// [[Rcpp::register]]
+void print(SEXP s) {
+    Rf_PrintValue(s);           // defined in Rinternals.h
+}
+
 // }}}