chore: clean-up assertions

m-muecke · m-muecke · commit 0989e123a401 · 2025-06-29T10:38:15.000+02:00
diff --git a/R/assertions.R b/R/assertions.R
@@ -0,0 +1,6 @@
+is_count <- function(x, null_ok = FALSE) {
+  if (null_ok && is.null(x)) {
+    return(TRUE)
+  }
+  is.numeric(x) && length(x) == 1L && !is.na(x) && as.integer(x) == x && x > 0L
+}
diff --git a/R/utils.R b/R/utils.R
diff --git a/R/yield-curve.R b/R/yield-curve.R
@@ -38,7 +38,7 @@ tr_curve_rate <- function(
   if (requireNamespace("readxl", quietly = TRUE)) {
     stop("Please install the readxl package to use this function.", call. = FALSE)
   }
-  stopifnot(is_count_or_null(year))
+  stopifnot(is_count(year, null_ok = TRUE))
   x <- match.arg(x)
   type <- match.arg(type)
   start_year <- switch(x, hqm = 1984L, tnc = 1978L, trc = 2003L, tbi = 2003L)

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ tr_curve_rate <- function(`
`38`	`38`	`if (requireNamespace("readxl", quietly = TRUE)) {`
`39`	`39`	`stop("Please install the readxl package to use this function.", call. = FALSE)`
`40`	`40`	`}`
`41`		`- stopifnot(is_count_or_null(year))`
	`41`	`+ stopifnot(is_count(year, null_ok = TRUE))`
`42`	`42`	`x <- match.arg(x)`
`43`	`43`	`type <- match.arg(type)`
`44`	`44`	`start_year <- switch(x, hqm = 1984L, tnc = 1978L, trc = 2003L, tbi = 2003L)`