Skip to content

Commit 6fca318

Browse files
committed
Remove helper type functions
1 parent 97a85b0 commit 6fca318

File tree

1 file changed

+13
-26
lines changed

1 file changed

+13
-26
lines changed

R/tags_types.R

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#'
1313
#' @seealso
1414
#' * [tags_defaults()] for the default tags
15-
#' * [validate_types()] uses [tags_types()] for validating tags
15+
#' * [validate_tags()] uses [tags_types()] for validating tags
1616
#' * [validate_linelist()] uses [tags_types()] for validating tags
1717
#'
1818
#' @examples
@@ -28,35 +28,22 @@
2828
tags_types <- function(..., allow_extra = FALSE) {
2929
defaults <- list(
3030
id = c("numeric", "integer", "character"),
31-
date_onset = date_types,
32-
date_reporting = date_types,
33-
date_admission = date_types,
34-
date_discharge = date_types,
35-
date_outcome = date_types,
36-
date_death = date_types,
37-
gender = category_types,
38-
age = numeric_types,
39-
location = category_types,
40-
occupation = category_types,
41-
hcw = binary_types,
42-
outcome = category_types
31+
date_onset = datatagr::type('date'),
32+
date_reporting = datatagr::type('date'),
33+
date_admission = datatagr::type('date'),
34+
date_discharge = datatagr::type('date'),
35+
date_outcome = datatagr::type('date'),
36+
date_death = datatagr::type('date'),
37+
gender = datatagr::type('category'),
38+
age = datatagr::type('numeric'),
39+
location = datatagr::type('category'),
40+
occupation = datatagr::type('category'),
41+
hcw = datatagr::type('binary'),
42+
outcome = datatagr::type('category')
4343
)
4444

4545
new_values <- rlang::list2(...)
4646
checkmate::assert_list(new_values, types = "character")
4747

4848
modify_defaults(defaults = defaults, x = new_values, strict = !allow_extra)
4949
}
50-
51-
52-
#' @noRd
53-
date_types <- c("integer", "numeric", "Date", "POSIXct", "POSIXlt")
54-
55-
#' @noRd
56-
category_types <- c("character", "factor")
57-
58-
#' @noRd
59-
numeric_types <- c("numeric", "integer")
60-
61-
#' @noRd
62-
binary_types <- c("logical", "integer", "character", "factor")

0 commit comments

Comments
 (0)