Error for invalid input

Author: MichaelChirico

NEWS.md

@@ -51,7 +51,7 @@
 1. `as.integer64.integer64` is consistent with `as.integer.integer` in terms or returning a plain integer64 vector (i.e., stripped of attributes; #188). Thanks @hcirellu.
 1. `log(integer64(), base=integer64(1))` no longer warns, consistent with `log(integer(), base=integer())` (#93).
 1. `sortfin(integer64(), 1:10)` no longer segfaults (#164).
-1. `orderfin(as.integer64(10:1), 1:3, 8:11)` no longer segfaults (#166).
+1. `orderfin(as.integer64(10:1), 1:3, 8:11)` enforces that `table` be sorted by `order` instead of segfaulting (#166).
 
 ## NOTES
 

src/sortuse64.c

@@ -274,8 +274,7 @@ SEXP r_ram_integer64_orderfin_asc(
 
   for(i=1;i<nt;i++)
     if (table[index[i]-1] < table[index[i-1]-1]) {
-      for(i=0; i<n; i++) ret[i] = FALSE;
-      goto wrapup_no_index_increment;
+      error("Invalid input -- 'table' is not sorted by 'order'");
     }
 
   for(i=0;i<nt;i++)
@@ -324,7 +323,6 @@ SEXP r_ram_integer64_orderfin_asc(
   for(i=0;i<nt;i++)
     index[i]++;
 
-wrapup_no_index_increment:
       R_Busy(0);
   if (method==0)
     error("unimplemented method");
@@ -361,8 +359,7 @@ SEXP r_ram_integer64_orderpos_asc(
 
   for(i=1;i<nt;i++)
     if (table[index[i]-1] < table[index[i-1]-1]) {
-      for(i=0; i<n; i++) ret[i] = nomatch;
-      goto wrapup_no_index_increment;
+      error("Invalid input -- 'table' is not sorted by 'order'");
     }
 
   for(i=0;i<nt;i++)
@@ -412,7 +409,6 @@ SEXP r_ram_integer64_orderpos_asc(
   for(i=0;i<nt;i++)
     index[i]++;
 
-wrapup_no_index_increment:
       R_Busy(0);
   if (method==0)
     error("unimplemented method");

tests/testthat/test-sortuse64.R

@@ -43,8 +43,16 @@ with_parameters_test_that("orderfin and orderpos work", method=1:3, {
   expect_identical(orderfin(table, partial_order, x_search, method=method), partial_fin)
   expect_identical(orderpos(table, partial_order, x_search, method=method), partial_pos)
 
-  expect_identical(orderfin(as.integer64(10:1), 1:3, 8:11, method=method), rep(FALSE, 4L))
-  expect_identical(orderpos(as.integer64(10:1), 1:3, 8:11, method=method), rep(NA_integer_, 4L))
+  expect_error(
+    orderfin(as.integer64(10:1), 1:3, 8:11, method=method),
+    "'table' is not sorted by 'order'",
+    fixed = TRUE
+  )
+  expect_error(
+    orderpos(as.integer64(10:1), 1:3, 8:11, method=method),
+    "'table' is not sorted by 'order'",
+    fixed = TRUE
+  )
 })
 
 test_that("ordertab and orderdup work", {
@@ -56,3 +64,4 @@ test_that("ordertab and orderdup work", {
   expect_identical(orderdup(x, idx), rep(c(FALSE, TRUE), c(10L, 14L)))
   expect_identical(orderdup(x, idx, method=2L), rep(c(FALSE, TRUE), c(10L, 14L)))
 })
+