add RCPP_NO_MASK macro to protect individual calls

Author: Enchufa2

ChangeLog

@@ -12,10 +12,8 @@
 	* inst/include/Rcpp/macros/mask.h: Mask Rf_error with Rcpp::stop with
 	a warning at compilation time, unless RCPP_NO_MASK_RF_ERROR is defined
 	* inst/include/RcppCommon.h: Include the previous file in the last place
-	* inst/tinytest/cpp/stack.cpp: Define RCPP_NO_MASK_RF_ERROR to enable
-	Rf_error for this test
-	* src/attributes.cpp: Undef then re-include masking to allow generated
-	interface call to Rf_error
+	* src/attributes.cpp: Use RCPP_NO_MASK to protect call to Rf_error
+	* inst/tinytest/cpp/stack.cpp: Idem
 	* inst/tinytest/testRcppInterfaceExporter/src/RcppExports.cpp: Idem
 
 2025-10-21 Iñaki Ucar <iucar@fedoraproject.org>

inst/include/Rcpp/macros/mask.h

@@ -17,8 +17,16 @@
 // 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_macros_mask_h
+#define Rcpp_macros_mask_h
+
+#define RCPP_NO_MASK_EMPTY()
+#define RCPP_NO_MASK(id) id RCPP_NO_MASK_EMPTY()
+
 #ifndef RCPP_NO_MASK_RF_ERROR
-#define Rf_error \
+#define Rf_error(...) \
     _Pragma("GCC warning \"Invalid use of Rf_error, use Rcpp::stop instead\"") \
-    Rcpp::stop
+    Rcpp::stop(__VA_ARGS__)
+#endif
+
 #endif

inst/tinytest/cpp/stack.cpp

@@ -22,7 +22,6 @@
 
 // [[Rcpp::plugins(cpp11)]]
 
-#define RCPP_NO_MASK_RF_ERROR
 #include <Rcpp.h>
 using namespace Rcpp;
 
@@ -57,7 +56,7 @@ SEXP testSendInterrupt() {
 SEXP maybeThrow(void* data) {
     bool* fail = (bool*) data;
     if (*fail)
-        Rf_error("throw!");
+        RCPP_NO_MASK(Rf_error)("throw!");
     else
         return NumericVector::create(42);
 }

inst/tinytest/testRcppInterfaceExporter/src/RcppExports.cpp

@@ -43,9 +43,7 @@ RcppExport SEXP _testRcppInterfaceExporter_test_cpp_interface(SEXP xSEXP, SEXP f
     if (rcpp_isError_gen) {
         SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);
         UNPROTECT(1);
-        #undef Rf_error
-        Rf_error("%s", CHAR(rcpp_msgSEXP_gen));
-        #include <Rcpp/macros/mask.h>
+        RCPP_NO_MASK(Rf_error)("%s", CHAR(rcpp_msgSEXP_gen));
     }
     UNPROTECT(1);
     return rcpp_result_gen;

src/attributes.cpp

@@ -2953,9 +2953,7 @@ namespace attributes {
                      << "    if (rcpp_isError_gen) {" << std::endl
                      << "        SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);" << std::endl
                      << "        UNPROTECT(1);" << std::endl
-                     << "        #undef Rf_error" << std::endl
-                     << "        Rf_error(\"%s\", CHAR(rcpp_msgSEXP_gen));" << std::endl
-                     << "        #include <Rcpp/macros/mask.h>" << std::endl
+                     << "        RCPP_NO_MASK(Rf_error)(\"%s\", CHAR(rcpp_msgSEXP_gen));" << std::endl
                      << "    }" << std::endl
                      << "    UNPROTECT(1);" << std::endl
                      << "    return rcpp_result_gen;" << std::endl