accelerated

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: spatstat.utils
-Version: 3.0-4.001
-Date: 2024-05-12
+Version: 3.0-4.002
+Date: 2024-06-05
 Title: Utility Functions for 'spatstat'
 Authors@R: c(person("Adrian", "Baddeley", 
                     role = c("aut", "cre"),

NEWS

@@ -1,5 +1,5 @@
 
-        CHANGES IN spatstat.utils VERSION 3.0-4.001
+        CHANGES IN spatstat.utils VERSION 3.0-4.002
 
 OVERVIEW
 

R/utilarg.R

@@ -3,7 +3,7 @@
 #'
 #'   Utilities for checking/handling arguments
 #'
-#'  $Revision: 1.12 $  $Date: 2024/02/20 08:30:09 $
+#'  $Revision: 1.13 $  $Date: 2024/06/05 08:16:37 $
 #'
 
 "%orifnull%" <- function(a, b) {
@@ -335,15 +335,17 @@ trap.extra.arguments <- function(..., .Context="", .Fatal=FALSE) {
 there.can.be.only.one <- function(..., .NeedOne=TRUE, .Fatal=TRUE) {
   argh <- list(...)
   given <- !sapply(argh, is.null)
-  nama <- sQuote(names(argh))
-  if(.NeedOne && !any(given)) {
+  ngiven <- sum(given)
+  if(.NeedOne && ngiven == 0) {
     if(!.Fatal) return(FALSE)
+    nama <- sQuote(names(argh))
     stop(paste("One of the arguments", commasep(nama, "or"), "is required"),
          call.=FALSE)
   }
-  if(sum(given) > 1) {
+  if(ngiven > 1) {
     if(!.Fatal) return(FALSE)
-    stop(paste("The arguments", commasep(nama[given]), "are incompatible"),
+    namesgiven <- sQuote(names(argh)[given])
+    stop(paste("The arguments", commasep(namesgiven), "are incompatible"),
          call.=FALSE)
   }
   return(TRUE)

inst/doc/packagesizes.txt

@@ -24,4 +24,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
 "2023-03-11" "3.0-2" 39 186 0 3655 2031
 "2023-05-09" "3.0-3" 39 186 0 3667 2031
 "2023-10-24" "3.0-4" 39 186 0 3670 2031
-"2024-05-12" "3.0-4.001" 39 187 0 3685 2031
+"2024-06-05" "3.0-4.002" 39 187 0 3687 2031