Support OBJSXP coming in R 4.4.0 (closes #1283) (#1293)

* Support OBJSXP coming in R 4.4.0 (closes #1283) * Refined the OBJSXP return
RcppCore · Dec 27, 2023 · 7fa80f2 · 7fa80f2
1 parent 4a8d30f
commit 7fa80f2
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 22 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2023-12-27  Dirk Eddelbuettel  <edd@debian.org>
+
+	* src/api.cpp (type2name): Refine OBJSXP return
+
+2023-12-21  Dirk Eddelbuettel  <edd@debian.org>
+
+	* src/api.cpp (type2name): Recognise OBJSXP added in R 4.4.0
+
 2023-11-28  Dirk Eddelbuettel  <edd@debian.org>
 
 	* inst/tinytest/testRcppInterfaceExporter/R/RcppExports.R: Regenerated

diff --git a/src/api.cpp b/src/api.cpp
@@ -3,7 +3,7 @@
 // api.cpp: Rcpp R/C++ interface class library -- Rcpp api
 //
 // Copyright (C) 2012 - 2020  Dirk Eddelbuettel and Romain Francois
-// Copyright (C) 2021         Dirk Eddelbuettel, Romain Francois and Iñaki Ucar
+// Copyright (C) 2021 - 2023  Dirk Eddelbuettel, Romain Francois and Iñaki Ucar
 //
 // This file is part of Rcpp.
 //
@@ -89,30 +89,34 @@ namespace Rcpp {
     // [[Rcpp::register]]
     const char * type2name(SEXP x) {                            // #nocov start
         switch (TYPEOF(x)) {
-        case NILSXP:    return "NILSXP";
-        case SYMSXP:    return "SYMSXP";
-        case RAWSXP:    return "RAWSXP";
-        case LISTSXP:   return "LISTSXP";
-        case CLOSXP:    return "CLOSXP";
-        case ENVSXP:    return "ENVSXP";
-        case PROMSXP:   return "PROMSXP";
-        case LANGSXP:   return "LANGSXP";
+        case NILSXP:    	return "NILSXP";
+        case SYMSXP:    	return "SYMSXP";
+        case RAWSXP:    	return "RAWSXP";
+        case LISTSXP:   	return "LISTSXP";
+        case CLOSXP:    	return "CLOSXP";
+        case ENVSXP:    	return "ENVSXP";
+        case PROMSXP:   	return "PROMSXP";
+        case LANGSXP:   	return "LANGSXP";
         case SPECIALSXP:    return "SPECIALSXP";
         case BUILTINSXP:    return "BUILTINSXP";
-        case CHARSXP:   return "CHARSXP";
-        case LGLSXP:    return "LGLSXP";
-        case INTSXP:    return "INTSXP";
-        case REALSXP:   return "REALSXP";
-        case CPLXSXP:   return "CPLXSXP";
-        case STRSXP:    return "STRSXP";
-        case DOTSXP:    return "DOTSXP";
-        case ANYSXP:    return "ANYSXP";
-        case VECSXP:    return "VECSXP";
-        case EXPRSXP:   return "EXPRSXP";
-        case BCODESXP:  return "BCODESXP";
-        case EXTPTRSXP: return "EXTPTRSXP";
+        case CHARSXP:   	return "CHARSXP";
+        case LGLSXP:    	return "LGLSXP";
+        case INTSXP:    	return "INTSXP";
+        case REALSXP:   	return "REALSXP";
+        case CPLXSXP:   	return "CPLXSXP";
+        case STRSXP:    	return "STRSXP";
+        case DOTSXP:    	return "DOTSXP";
+        case ANYSXP:    	return "ANYSXP";
+        case VECSXP:    	return "VECSXP";
+        case EXPRSXP:   	return "EXPRSXP";
+        case BCODESXP:  	return "BCODESXP";
+        case EXTPTRSXP: 	return "EXTPTRSXP";
         case WEAKREFSXP:    return "WEAKREFSXP";
-        case S4SXP:     return "S4SXP";
+#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";
+#endif
         default:
         return "<unknown>";
         }