Merge branch 'main' into test-all-r

.devcontainer/r-420/Dockerfile

@@ -0,0 +1,15 @@
+FROM ghcr.io/r-hub/evercran/4.2.0
+
+RUN apt-get -qq update && \
+ apt-get install -y --no-install-recommends git
+
+COPY DESCRIPTION .
+
+RUN Rscript -e '                           \
+  install.packages("remotes");             \
+  remotes::install_deps(dependencies = c(  \
+    "Depends",                             \
+    "Imports",                             \
+    "Config/needs/development"             \
+  ))                                       \
+'

.devcontainer/r-420/devcontainer.json

@@ -0,0 +1,3 @@
+{
+  "build": { "dockerfile": "Dockerfile", "context": "../.." }
+}

NAMESPACE

@@ -396,6 +396,7 @@ export(unipos)
 export(unipos.integer64)
 export(unique.integer64)
 export(xor.integer64)
+if (getRversion() >= "4.2.0") S3method(mtfrm,integer64)
 importFrom(bit,clone)
 importFrom(bit,is.sorted)
 importFrom(bit,keyorder)

NEWS

@@ -46,6 +46,8 @@
 
 1. `all.equal.integer64()` gets the same fix for vector `scale=` to work as intended that `all.equal.numeric()` got in R 4.1.3, #23.
 
+2. Made edits to `match()` to handle `is.integer64(table)` better for older versions of R, including a new `mtfrm()` method for integer64 objects in R>=4.2.0, #85 and #111.
+
 ## NOTES
 
 1. After creating, developing, and maintaining {bit64} for about 13 years, Jens Oehlschlägel has decided to step down as maintainer of the package. Michael Chirico will take over in this duty. Thank you Jens for creating such a wonderful & important part of the R ecosystem!

R/patch64.R

@@ -97,11 +97,15 @@ is.double.default <- function(x) base::is.double(x)
 #' @export
 is.double.integer64 <- function(x)FALSE
 
+# TODO(R>=4.2.0): Remove workarounds for match(). Needed for #85 and #111.
+#' @rdname bit64S3
+#' @rawNamespace if (getRversion() >= "4.2.0") S3method(mtfrm,integer64)
+mtfrm.integer64 = function(x) as.character(x)
+
 match <- function(x, table, ...) UseMethod("match")
 #' @rdname bit64S3
 #' @export
 match.default <- function(x, table, ...) {
-  # TODO(R>=4.2.0): Remove this workaround. Needed for #85.
   if (!exists("mtfrm", baseenv()) && is.integer64(table)) base::match(as.character(x), as.character(table), ...) # nocov
   else base::match(x, table, ...)
 }