fix operators/minus.h

Author: Enchufa2

inst/include/Rcpp/sugar/operators/minus.h

@@ -2,7 +2,8 @@
 //
 // minus.h: Rcpp R/C++ interface class library -- operator-
 //
-// Copyright (C) 2010 - 2011 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2025 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2026        Dirk Eddelbuettel, Romain Francois and Iñaki Ucar
 //
 // This file is part of Rcpp.
 //
@@ -42,7 +43,7 @@ namespace sugar{
 			STORAGE x = lhs[i] ;
 			if( Rcpp::traits::is_na<RTYPE>( x ) ) return x ;
 			STORAGE y = rhs[i] ;
-			return Rcpp::traits::is_na<RTYPE>( y ) ? y : ( x - y ) ;
+			return Rcpp::traits::is_na<RTYPE>( y ) ? y : RCPP_SAFE_SUB(x, y);
 		}
 
 		inline R_xlen_t size() const { return lhs.size() ; }
@@ -91,7 +92,7 @@ namespace sugar{
 		inline STORAGE operator[]( R_xlen_t i ) const {
 			STORAGE y = rhs[i] ;
 			if( Rcpp::traits::is_na<RTYPE>( y ) ) return y ;
-			return lhs[i] - y ;
+			return RCPP_SAFE_SUB(lhs[i], y);
 		}
 
 		inline R_xlen_t size() const { return lhs.size() ; }
@@ -140,7 +141,7 @@ namespace sugar{
 		inline STORAGE operator[]( R_xlen_t i ) const {
 			STORAGE x = lhs[i] ;
 			if( Rcpp::traits::is_na<RTYPE>( x ) ) return x ;
-			return x - rhs[i] ;
+			return RCPP_SAFE_SUB(x, rhs[i]);
 		}
 
 		inline R_xlen_t size() const { return lhs.size() ; }
@@ -188,7 +189,7 @@ namespace sugar{
 			lhs(lhs_.get_ref()), rhs(rhs_.get_ref()) {}
 
 		inline STORAGE operator[]( R_xlen_t i ) const {
-			return lhs[i] - rhs[i] ;
+			return RCPP_SAFE_SUB(lhs[i], rhs[i]);
 		}
 
 		inline R_xlen_t size() const { return lhs.size() ; }
@@ -238,7 +239,7 @@ namespace sugar{
 		inline STORAGE operator[]( R_xlen_t i ) const {
 			if( rhs_na ) return rhs ;
 			STORAGE x = lhs[i] ;
-			return Rcpp::traits::is_na<RTYPE>(x) ? x : (x - rhs) ;
+			return Rcpp::traits::is_na<RTYPE>(x) ? x : RCPP_SAFE_SUB(x, rhs);
 		}
 
 		inline R_xlen_t size() const { return lhs.size() ; }
@@ -284,7 +285,7 @@ namespace sugar{
 		inline STORAGE operator[]( R_xlen_t i ) const {
 			if( rhs_na ) return rhs ;
 			STORAGE x = lhs[i] ;
-			return Rcpp::traits::is_na<RTYPE>(x) ? x : (x - rhs) ;
+			return Rcpp::traits::is_na<RTYPE>(x) ? x : RCPP_SAFE_SUB(x, rhs);
 		}
 
 		inline R_xlen_t size() const { return lhs.size() ; }
@@ -333,7 +334,7 @@ namespace sugar{
 
 		inline STORAGE operator[]( R_xlen_t i ) const {
 			if( lhs_na ) return lhs ;
-			return lhs - rhs[i] ;
+			return RCPP_SAFE_SUB(lhs, rhs[i]);
 		}
 		inline R_xlen_t size() const { return rhs.size() ; }
 
@@ -377,7 +378,7 @@ namespace sugar{
 
 		inline STORAGE operator[]( R_xlen_t i ) const {
 			if( lhs_na ) return lhs ;
-		    return lhs - rhs[i] ;
+		    return RCPP_SAFE_SUB(lhs, rhs[i]);
 		}
 
 		inline R_xlen_t size() const { return rhs.size() ; }

inst/tinytest/cpp/sugar.cpp

@@ -285,6 +285,21 @@ List runit_minus( IntegerVector xx ){
     	) ;
 }
 
+// [[Rcpp::export]]
+IntegerVector runit_minus_ivv( IntegerVector x, IntegerVector y ){
+    return x - y;
+}
+
+// [[Rcpp::export]]
+IntegerVector runit_minus_ivp( IntegerVector x, int y ){
+    return x - y;
+}
+
+// [[Rcpp::export]]
+IntegerVector runit_minus_ipv( int x, IntegerVector y ){
+    return x - y;
+}
+
 // [[Rcpp::export]]
 LogicalVector runit_any_equal_not( NumericVector xx, NumericVector yy){
     return any( !( xx == yy) ) ;

inst/tinytest/test_sugar.R

@@ -367,6 +367,9 @@ expect_equal( fx(1:10, 1:10*2) , mapply(seq, 1:10, 1:10*2) )
 
 
 #    test.sugar.minus <- function( ){
+expect_error(runit_minus_ivv(-.Machine$integer.max, 2), "overflow")
+expect_error(runit_minus_ivp(-.Machine$integer.max, 2), "overflow")
+expect_error(runit_minus_ipv(-.Machine$integer.max, 2), "overflow")
 fx <- runit_minus
 expect_equal(fx(1:10) ,
              list( (1:10)-10L, 10L-(1:10), rep(0L,10), (1:10)-10L, 10L-(1:10)  ))