Merge branch 'master' into bugfix/user-defined-database-drop-support

RcppCore · Jul 22, 2024 · f084a6a · f084a6a
2 parents ccfdc2e + 19328ad
commit f084a6a
Show file tree

Hide file tree

Showing 23 changed files with 87 additions and 20 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,25 @@
+2024-07-11  Dirk Eddelbuettel  <edd@debian.org>
+
+        * DESCRIPTION (Date, Version): Release 1.0.13
+
+        * inst/include/Rcpp/config.h: Idem
+        * inst/NEWS.Rd: Idem
+        * vignettes/rmd/Rcpp.bib: Idem
+        * inst/bib/Rcpp.bib: Idem
+	* vignettes/pdf/*: Rebuilt
+
+2024-07-07  Kevin Ushey  <kevinushey@gmail.com>
+
+	* inst/include/Rcpp/internal/SEXP_Iterator.h: Avoid using VECTOR_PTR
+	* inst/include/Rcpp/vector/Subsetter.h: Avoid using STRING_PTR
+	* inst/include/RcppCommon.h: Include compatibility defines
+	* src/barrier.cpp: Avoid using {STRING/VECTOR}_PTR
+	* inst/include/Rcpp/r/compat.h: Include compatibility defines
+
 2024-07-05  Kevin Ushey  <kevinushey@gmail.com>
 
-	* inst/include/Rcpp/Environment.h: Drop support for UserDefinedDatabase.
+	* inst/include/Rcpp/Environment.h: Drop support for UserDefinedDatabase
+  [ merged 2024-07-22 after release of Rcpp 1.0.13 ]
 
 2024-06-22  Dirk Eddelbuettel  <edd@debian.org>
 

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 1.0.12.4
-Date: 2024-06-22
+Version: 1.0.13
+Date: 2024-07-11
 Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
  Nathan Russell, Inaki Ucar, Douglas Bates and John Chambers
 Maintainer: Dirk Eddelbuettel <edd@debian.org>

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 [![Dependencies](https://tinyverse.netlify.app/badge/Rcpp)](https://cran.r-project.org/package=Rcpp)
 [![Coverage Status](https://codecov.io/gh/RcppCore/Rcpp/graph/badge.svg)](https://app.codecov.io/github/RcppCore/Rcpp?branch=master)
 [![Debian package](https://img.shields.io/debian/v/r-cran-rcpp/sid?color=brightgreen)](https://packages.debian.org/sid/r-cran-rcpp)
-[![r-universe](https://rcppcore.r-universe.dev/badges/Rcpp)](https://rcppcore.r-universe.dev/rcpp)
+[![r-universe](https://rcppcore.r-universe.dev/badges/Rcpp)](https://rcppcore.r-universe.dev/Rcpp)
 [![Last Commit](https://img.shields.io/github/last-commit/RcppCore/Rcpp)](https://github.com/RcppCore/Rcpp)
 [![Downloads (monthly)](https://cranlogs.r-pkg.org/badges/Rcpp?color=brightgreen)](https://www.r-pkg.org/pkg/Rcpp)
 [![Downloads (total)](https://cranlogs.r-pkg.org/badges/grand-total/Rcpp?color=brightgreen)](https://www.r-pkg.org/pkg/Rcpp)

diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
@@ -3,7 +3,7 @@
 \newcommand{\ghpr}{\href{https://github.com/RcppCore/Rcpp/pull/#1}{##1}}
 \newcommand{\ghit}{\href{https://github.com/RcppCore/Rcpp/issues/#1}{##1}}
 
-\section{Changes in Rcpp release version 1.0.13 (2024-xx-yy)}{
+\section{Changes in Rcpp release version 1.0.13 (2024-07-11)}{
   \itemize{
     \item Changes in Rcpp API:
     \itemize{
@@ -17,6 +17,8 @@
       \ghpr{1310})
       \item Rcpp now emits an R warning on out-of-bounds Vector accesses. This
       may become an error in a future Rcpp release. (Kevin in \ghpr{1310})
+      \item Switch \code{VECTOR_PTR} and \code{STRING_PTR} to new API-compliant
+      \code{RO} variants (Kevin in \ghpr{1317} fixing \ghit{1316})
     }
     \item Changes in Rcpp Deployment:
     \itemize{

diff --git a/inst/bib/Rcpp.bib b/inst/bib/Rcpp.bib
@@ -136,7 +136,7 @@ @Manual{CRAN:Rcpp
                   Allaire and Kevin Ushey and Qiang Kou and
                   Nathan Russel and John Chambers and Douglas Bates},
   year =	 2024,
-  note =	 {R package version 1.0.12},
+  note =	 {R package version 1.0.13},
   url =		 CRAN # "package=Rcpp"
 }
 

diff --git a/inst/include/Rcpp/config.h b/inst/include/Rcpp/config.h
@@ -26,11 +26,11 @@
 #define RcppDevVersion(maj, min, rev, dev)  (((maj)*1000000) + ((min)*10000) + ((rev)*100) + (dev))
 
 // the currently released version
-#define RCPP_VERSION            Rcpp_Version(1,0,12)
-#define RCPP_VERSION_STRING     "1.0.12"
+#define RCPP_VERSION            Rcpp_Version(1,0,13)
+#define RCPP_VERSION_STRING     "1.0.13"
 
 // the current source snapshot (using four components, if a fifth is used in DESCRIPTION we ignore it)
-#define RCPP_DEV_VERSION        RcppDevVersion(1,0,12,4)
-#define RCPP_DEV_VERSION_STRING "1.0.12.4"
+#define RCPP_DEV_VERSION        RcppDevVersion(1,0,13,0)
+#define RCPP_DEV_VERSION_STRING "1.0.13.0"
 
 #endif
diff --git a/inst/include/Rcpp/internal/SEXP_Iterator.h b/inst/include/Rcpp/internal/SEXP_Iterator.h
@@ -37,7 +37,7 @@ class SEXP_Iterator {
 
 		SEXP_Iterator( ): ptr(){} ;
 		SEXP_Iterator( const SEXP_Iterator& other) : ptr(other.ptr){} ;
-		SEXP_Iterator( const VECTOR& vec ) : ptr( get_vector_ptr(vec) ){} ;
+		SEXP_Iterator( const VECTOR& vec ) : ptr( RCPP_VECTOR_PTR(vec) ){} ;
 
 		SEXP_Iterator& operator=(const SEXP_Iterator& other){ ptr = other.ptr ; return *this ;}
 

diff --git a/inst/include/Rcpp/r/compat.h b/inst/include/Rcpp/r/compat.h
@@ -0,0 +1,39 @@
+
+//
+// compat.h: Rcpp R/C++ interface class library -- compatibility defines
+//
+// Copyright (C) 2024         Dirk Eddelbuettel, Kevin Ushey
+//
+// 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_R_COMPAT_H
+#define RCPP_R_COMPAT_H
+
+#include <Rversion.h>
+
+#if R_VERSION >= R_Version(4, 4, 2)
+# define RCPP_STRING_PTR STRING_PTR_RO
+#else
+# define RCPP_STRING_PTR STRING_PTR
+#endif
+
+#if R_VERSION >= R_Version(4, 4, 2)
+# define RCPP_VECTOR_PTR VECTOR_PTR_RO
+#else
+# define RCPP_VECTOR_PTR VECTOR_PTR
+#endif
+
+#endif /* RCPP_R_COMPAT_H */
diff --git a/inst/include/Rcpp/vector/Subsetter.h b/inst/include/Rcpp/vector/Subsetter.h
@@ -174,10 +174,10 @@ class SubsetProxy {
         indices.reserve(rhs_n);
         SEXP names = Rf_getAttrib(lhs, R_NamesSymbol);
         if (Rf_isNull(names)) stop("names is null");
-        SEXP* namesPtr = STRING_PTR(names);
-        SEXP* rhsPtr = STRING_PTR(rhs);
+        const SEXP* namesPtr = RCPP_STRING_PTR(names);
+        const SEXP* rhsPtr = RCPP_STRING_PTR(rhs);
         for (R_xlen_t i = 0; i < rhs_n; ++i) {
-            SEXP* match = std::find(namesPtr, namesPtr + lhs_n, *(rhsPtr + i));
+            const SEXP* match = std::find(namesPtr, namesPtr + lhs_n, *(rhsPtr + i));
             if (match == namesPtr + lhs_n)
                 stop("not found");
             indices.push_back(match - namesPtr);

diff --git a/inst/include/RcppCommon.h b/inst/include/RcppCommon.h
@@ -28,6 +28,7 @@
 // #define RCPP_DEBUG_MODULE_LEVEL 1
 
 #include <Rcpp/r/headers.h>
+#include <Rcpp/r/compat.h>
 
 /**
  * \brief Rcpp API

diff --git a/src/api.cpp b/src/api.cpp
@@ -112,7 +112,7 @@ namespace Rcpp {
         case BCODESXP:  	return "BCODESXP";
         case EXTPTRSXP: 	return "EXTPTRSXP";
         case WEAKREFSXP:    return "WEAKREFSXP";
-#if R_Version >= R_Version(4,4,0)					// replaces S4SXP in R 4.4.0
+#if R_VERSION >= R_Version(4,4,0)					// replaces S4SXP in R 4.4.0
         case OBJSXP:    	return Rf_isS4(x) ? "S4SXP" : "OBJSXP"; 	// cf src/main/inspect.c
 #else
         case S4SXP:     	return "S4SXP";

diff --git a/src/barrier.cpp b/src/barrier.cpp
@@ -22,11 +22,15 @@
 #define COMPILING_RCPP
 
 #define USE_RINTERNALS
+
+#include <algorithm>
 #include <Rinternals.h>
+
 #include <Rcpp/barrier.h>
-#include "internal.h"
-#include <algorithm>
 #include <Rcpp/protection/Shield.h>
+#include <Rcpp/r/compat.h>
+
+#include "internal.h"
 
 // [[Rcpp::register]]
 SEXP get_string_elt(SEXP x, R_xlen_t i) {			// #nocov start
@@ -50,7 +54,8 @@ void char_set_string_elt(SEXP x, R_xlen_t i, const char* value) {
 
 // [[Rcpp::register]]
 SEXP* get_string_ptr(SEXP x) {
-    return STRING_PTR(x);
+    // TODO: should we deprecate this?
+    return const_cast<SEXP*>(RCPP_STRING_PTR(x));
 }
 
 // [[Rcpp::register]]
@@ -65,7 +70,8 @@ void set_vector_elt(SEXP x, R_xlen_t i, SEXP value) {
 
 // [[Rcpp::register]]
 SEXP* get_vector_ptr(SEXP x) {
-    return VECTOR_PTR(x);							// #nocov end
+    // TODO: should we deprecate this?
+    return const_cast<SEXP*>(RCPP_VECTOR_PTR(x));							// #nocov end
 }
 
 // [[Rcpp::register]]

diff --git a/vignettes/Rcpp-FAQ.pdf b/vignettes/Rcpp-FAQ.pdf
diff --git a/vignettes/Rcpp-attributes.pdf b/vignettes/Rcpp-attributes.pdf
diff --git a/vignettes/Rcpp-extending.pdf b/vignettes/Rcpp-extending.pdf
diff --git a/vignettes/Rcpp-introduction.pdf b/vignettes/Rcpp-introduction.pdf
diff --git a/vignettes/Rcpp-jss-2011.pdf b/vignettes/Rcpp-jss-2011.pdf
diff --git a/vignettes/Rcpp-libraries.pdf b/vignettes/Rcpp-libraries.pdf
diff --git a/vignettes/Rcpp-modules.pdf b/vignettes/Rcpp-modules.pdf
diff --git a/vignettes/Rcpp-package.pdf b/vignettes/Rcpp-package.pdf
diff --git a/vignettes/Rcpp-quickref.pdf b/vignettes/Rcpp-quickref.pdf
diff --git a/vignettes/Rcpp-sugar.pdf b/vignettes/Rcpp-sugar.pdf
diff --git a/vignettes/rmd/Rcpp.bib b/vignettes/rmd/Rcpp.bib
@@ -136,7 +136,7 @@ @Manual{CRAN:Rcpp
                   Allaire and Kevin Ushey and Qiang Kou and
                   Nathan Russel and John Chambers and Douglas Bates},
   year =	 2024,
-  note =	 {R package version 1.0.12},
+  note =	 {R package version 1.0.13},
   url =		 CRAN # "package=Rcpp"
 }