Some minor tweaks

Author: kevinushey

inst/include/Rcpp/vector/Subsetter.h

@@ -73,7 +73,7 @@ namespace Rcpp {
         template <template <class> class OtherStoragePolicy>
         inline Vector<RTYPE, StoragePolicy> subset_impl( const VECTOR& this_, const Vector<LGLSXP, OtherStoragePolicy>& x ) const {
             if (this_.size() != x.size()) {
-                stop("unequal vector sizes");
+                stop("subsetting with a LogicalVector requires both vectors to be of equal size");
             }
             Vector<INTSXP, StoragePolicy> tmp = which_na(x);
             if (!tmp.size()) return Vector<RTYPE, StoragePolicy>(0);
@@ -85,7 +85,7 @@ namespace Rcpp {
         inline Vector<RTYPE, StoragePolicy> subset_impl( const VECTOR& this_, const Vector<STRSXP, OtherStoragePolicy>& x ) const {
 
             if (Rf_isNull( Rf_getAttrib(this_, R_NamesSymbol) )) {
-                stop("Tried to subset a vector with no names using a CharacterVector");
+                stop("can't subset a nameless vector using a CharacterVector");
             }
 
             Vector<STRSXP, StoragePolicy> names = as< Vector<STRSXP, StoragePolicy> >(Rf_getAttrib(this_, R_NamesSymbol));

inst/unitTests/cpp/Subset.cpp

@@ -6,6 +6,11 @@ NumericVector subset_test_int(NumericVector x, IntegerVector y) {
     return x[y];
 }
 
+// [[Rcpp::export]]
+NumericVector subset_test_num(NumericVector x, NumericVector y) {
+    return x[y];
+}
+
 // [[Rcpp::export]]
 NumericVector subset_test_lgcl(NumericVector x, LogicalVector y) {
     return x[y];

inst/unitTests/runit.subset.R

@@ -33,6 +33,9 @@ if (.runThisTest) {
         checkException( subset_test_int(x, -1L) )
         checkException( subset_test_int(x, length(x)) )
 
+        checkIdentical( x[c(1, 2, 3)], subset_test_num(x, c(0, 1, 2)),
+            "numeric subsetting")
+        
         checkIdentical( x[ c('b', 'a') ], subset_test_char(x, c('b', 'a')),
             "character subsetting")