fix bad branches (#285)

Author: MichaelChirico

NEWS.md

@@ -72,6 +72,7 @@
 1. `as.integer64(2^63)` returns `NA_integer64_` more consistently (e.g. on ARM), consistent with `as.integer(2^31)` (#19). Thanks @dipterix.
 1. `[.integer64` now runs faster and correctly regarding `NA` and arrays (#176). Thanks @hcirellu.
 1. `integer64() %in% 1L` no longer warns (#265). Thanks @hcirellu.
+1. `match.integer64(..., method="orderpos")` and `duplicated.integer64(..., method="orderdup")` no longer fail with "object 's' not found" (#58).
 
 ## NOTES
 

R/highlevel64.R

@@ -1500,7 +1500,7 @@ match.integer64 = function(x, table, nomatch = NA_integer_, nunique=NULL, method
     },
     orderpos={
       if (is.null(cache_env) || !exists("order", cache_env)) {
-        o <- seq_along(s)
+        o <- seq_along(table)
         ramorder(table, o, na.last=FALSE)
       } else {
         o <- get("order", cache_env)
@@ -1685,7 +1685,7 @@ duplicated.integer64 = function(x, incomparables = FALSE, nunique = NULL, method
     },
     orderdup={
       if (is.null(cache_env) || is.null(cache_env$order)) {
-        o <- seq_along(s)
+        o <- seq_along(x)
         ramorder(x, o, na.last=FALSE)
       } else {
         o <- get("order", cache_env, inherits=FALSE)

tests/testthat/test-highlevel64.R

@@ -37,8 +37,7 @@ test_that("Different method= for match() and %in% work", {
   expect_identical(match(x, y, method="hashrev"), expected)
   expect_identical(match(x, y, method="sortorderpos"), expected)
   expect_error(match(x, y, method="_unknown_"), "'arg' should be one of", fixed=TRUE)
-  # TODO(#58): Fix this, currently fails.
-  # expect_identical(match(x, y, method="orderpos"), expected)
+  expect_identical(match(x, y, method="orderpos"), expected)
 
   # NB: %in% is quite a bit different; while there's a public API to
   #   `%in%.integer64`, likely, there shouldn't be (it's strange to export
@@ -265,8 +264,7 @@ test_that("different method= for duplicated, unique work", {
   expect_identical(unique(x, method="sortorderuni"), exp_unq)
   expect_identical(unique(x, method="sortuni"), exp_unq)
 
-  # TODO(#58): Fix this, currently fails.
-  # expect_identical(duplicated(x, method="orderdup"), exp_dup)
+  expect_identical(duplicated(x, method="orderdup"), exp_dup)
   expect_identical(unique(x, method="orderuni"), exp_unq)
 })
 
@@ -377,10 +375,10 @@ test_that("prank() works as intended", {
   expect_identical(prank(x[1L]), NA_integer64_)
 })
 
-test_that("match.integer64 with method='orderpos' fails due to bug", {
+test_that("match.integer64 with method='orderpos' works", {
   x <- as.integer64(1:5)
   table <- as.integer64(3:7)
-  expect_error(match(x, table, method="orderpos"), "object 's' not found", fixed=TRUE)
+  expect_identical(match(x, table, method="orderpos"), c(NA, NA, 1:3))
 })
 
 test_that("match.integer64 with partial cache triggers fallback", {