Merge pull request #270 from RcppCore/feature/print-v2

Feature/print v2

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,12 @@
+2015-03-02  Dirk Eddelbuettel  <[email protected]>
+
+        * inst/include/Rcpp/print.h (Rcpp): New inline function Rcpp::print()
+        * inst/include/RcppCommon.h: Include new header
+
+        * src/api.cpp: Commented-out print() in global namespace
+        * src/Rcpp_init.cpp: Commented-out registration of print()
+        * inst/include/Rcpp/routines.h: Commented-out initialization
+
 2015-03-01  Dirk Eddelbuettel  <[email protected]>
 
         * src/api.cpp: New function print() as a wrapper around Rf_PrintValue()

DESCRIPTION

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

inst/NEWS.Rd

@@ -14,8 +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 A new inline header function \code{print} function was added as a
+      wrapper around \code{Rf_PrintValue}. 
     }
     \item Changes in Rcpp Attributes:
     \itemize{

inst/include/Rcpp/print.h

@@ -0,0 +1,32 @@
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*-
+//
+// Copyright (C) 2015  Dirk Eddelbuettel
+//
+// This file is part of Rcpp.
+//
+// Rcpp is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// Rcpp is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// 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_PRINT_H
+#define RCPP_PRINT_H
+
+namespace Rcpp {
+
+inline void print(SEXP s) {
+    Rf_PrintValue(s);           // defined in Rinternals.h
+}
+
+}
+
+#endif
+

inst/include/Rcpp/routines.h

@@ -59,7 +59,7 @@ void          setCurrentScope( Rcpp::Module* mod );
 SEXP          reset_current_error();
 int           error_occured();
 SEXP          rcpp_get_current_error();
-void          print(SEXP s);
+// void          print(SEXP s);
 
 #else
 
@@ -245,11 +245,11 @@ inline attribute_hidden SEXP 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);
-}
+// inline attribute_hidden void print(SEXP s) {
+//     typedef void (*Fun)(SEXP);
+//     static Fun fun = GET_CALLABLE("print");
+//     fun(s);
+// }
 
 #endif
 

inst/include/RcppCommon.h

@@ -173,6 +173,7 @@ namespace Rcpp{
 #include <Rcpp/internal/SEXP_Iterator.h>
 #include <Rcpp/internal/converter.h>
 
+#include <Rcpp/print.h>
 #include <Rcpp/algo.h>
 
 #include <Rcpp/sugar/sugar_forward.h>

src/Rcpp_init.cpp

@@ -116,7 +116,7 @@ void registerFunctions(){
     RCPP_REGISTER(reset_current_error)
     RCPP_REGISTER(error_occured)
     RCPP_REGISTER(rcpp_get_current_error)
-    RCPP_REGISTER(print)
+    // RCPP_REGISTER(print)
     #undef RCPP_REGISTER
 }
 

src/api.cpp

@@ -298,10 +298,10 @@ SEXP stack_trace( const char* file, int line ){
     #endif
 }
 
-// [[Rcpp::register]]
-void print(SEXP s) {
-    Rf_PrintValue(s);           // defined in Rinternals.h
-}
+// // [ [ Rcpp::register ] ]
+// void print(SEXP s) {
+//     Rf_PrintValue(s);           // defined in Rinternals.h
+// }
 
 // }}}