Merge pull request #570 from thirdwing/up

fix range sugar and add unit test (fix error report in #568)

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,9 @@
+2016-10-24  Qiang Kou  <[email protected]>
+
+        * inst/include/Rcpp/sugar/Range.h : fix range sugar ambiguity
+        * inst/unitTests/cpp/sugar.cpp: range sugar unit test
+        * inst/unitTests/runit.sugar.R: range sugar unit test
+
 2016-10-24  Nathan Russell  <[email protected]>
 
 	* inst/include/Rcpp/vector/MatrixBase.h: Change sugar 

inst/include/Rcpp/sugar/Range.h

@@ -60,21 +60,21 @@ namespace Rcpp{
             return orig ;
         }
 
-        Range& operator+=(R_xlen_t n) {
+        Range& operator+=( int n ) {
             start += n ; end_ += n ;
             return *this ;
         }
 
-        Range& operator-=(R_xlen_t n) {
+        Range& operator-=( int n ) {
             start -= n ; end_ -= n ;
             return *this ;
         }
 
-        Range operator+( R_xlen_t n ){
+        Range operator+( int n ){
             return Range( start + n, end_ + n ) ;
         }
 
-        Range operator-( R_xlen_t n ){
+        Range operator-( int n ){
             return Range( start - n, end_ - n ) ;
         }
 

inst/unitTests/cpp/sugar.cpp

@@ -303,6 +303,18 @@ NumericVector runit_Range(){
     return xx ;
 }
 
+// [[Rcpp::export]]
+IntegerVector runit_range_plus(int start, int end, int n) {
+    IntegerVector vec = Range(start, end) + n;
+    return vec;
+}
+
+// [[Rcpp::export]]
+IntegerVector runit_range_minus(int start, int end, int n) {
+    IntegerVector vec = Range(start, end) - n;
+    return vec;
+}
+
 // [[Rcpp::export]]
 NumericVector runit_sapply( NumericVector xx ){
     NumericVector res = sapply( xx, square<double>() );

inst/unitTests/runit.sugar.R

@@ -360,6 +360,16 @@ if (.runThisTest) {
 	checkEquals(fx(), c( exp(seq_len(4)), exp(-seq_len(4))))
     }
 
+    test.sugar.Range.plus <- function( ){
+    fx <- runit_range_plus
+    checkEquals( fx(1, 10, 2), c(1:10) + 2 )
+    }
+
+    test.sugar.Range.minus <- function( ){
+    fx <- runit_range_minus
+    checkEquals( fx(1, 10, 2), c(1:10) - 2 )
+    }
+
     test.sugar.sapply <- function( ){
 	fx <- runit_sapply
 	checkEquals( fx(1:10) , (1:10)^2 )