Skip to content

Commit

Permalink
Run formatter
Browse files Browse the repository at this point in the history
  • Loading branch information
@DavisVaughan
DavisVaughan committed Jan 3, 2025
1 parent 94a37e9 commit 7f1a382
Show file tree
Hide file tree
Showing 29 changed files with 3,425 additions and 1,249 deletions.
2 changes: 1 addition & 1 deletion R/arithmetic.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ add_duration <- function(x, duration, ..., swapped = FALSE) {
precision <- duration_precision_attribute(duration)
precision <- precision_to_string(precision)

switch (
switch(
precision,
year = add_years(x, duration),
quarter = add_quarters(x, duration),
Expand Down
173 changes: 112 additions & 61 deletions R/calendar.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,25 @@ ptype2_calendar_and_calendar <- function(x, y, ...) {
if (calendar_precision_attribute(x) == calendar_precision_attribute(y)) {
x
} else {
stop_incompatible_type(x, y, ..., details = "Can't combine calendars with different precisions.")
stop_incompatible_type(
x,
y,
...,
details = "Can't combine calendars with different precisions."
)
}
}

cast_calendar_to_calendar <- function(x, to, ...) {
if (calendar_precision_attribute(x) == calendar_precision_attribute(to)) {
x
} else {
stop_incompatible_cast(x, to, ..., details = "Can't cast between calendars with different precisions.")
stop_incompatible_cast(
x,
to,
...,
details = "Can't cast between calendars with different precisions."
)
}
}

Expand Down Expand Up @@ -161,31 +171,35 @@ calendar_leap_year.clock_calendar <- function(x) {
#' calendar_month_factor(x)
#' calendar_month_factor(x, abbreviate = TRUE)
#' calendar_month_factor(x, labels = "fr")
calendar_month_factor <- function(x,
...,
labels = "en",
abbreviate = FALSE) {
calendar_month_factor <- function(x, ..., labels = "en", abbreviate = FALSE) {
check_calendar(x)
UseMethod("calendar_month_factor")
}

#' @export
calendar_month_factor.clock_calendar <- function(x,
...,
labels = "en",
abbreviate = FALSE) {
calendar_month_factor.clock_calendar <- function(
x,
...,
labels = "en",
abbreviate = FALSE
) {
stop_clock_unsupported(x)
}

calendar_month_factor_impl <- function(x,
labels,
abbreviate,
...,
error_call = caller_env()) {
calendar_month_factor_impl <- function(
x,
labels,
abbreviate,
...,
error_call = caller_env()
) {
check_dots_empty0(...)

if (calendar_precision_attribute(x) < PRECISION_MONTH) {
cli::cli_abort("{.arg x} must have at least {.str month} precision.", call = error_call)
cli::cli_abort(
"{.arg x} must have at least {.str month} precision.",
call = error_call
)
}

if (is_character(labels)) {
Expand Down Expand Up @@ -633,7 +647,6 @@ calendar_widen_time <- function(x, x_precision, precision) {
#' calendar_end(x, "month")
NULL


#' @rdname calendar-boundary
#' @export
calendar_start <- function(x, precision) {
Expand All @@ -646,7 +659,6 @@ calendar_start.clock_calendar <- function(x, precision) {
stop_clock_unsupported(x)
}


#' @rdname calendar-boundary
#' @export
calendar_end <- function(x, precision) {
Expand All @@ -659,7 +671,6 @@ calendar_end.clock_calendar <- function(x, precision) {
stop_clock_unsupported(x)
}


calendar_start_end_checks <- function(x, x_precision, precision, which) {
calendar_check_precision(x, precision)

Expand Down Expand Up @@ -797,21 +808,19 @@ NULL

#' @rdname calendar-count-between
#' @export
calendar_count_between <- function(start,
end,
precision,
...,
n = 1L) {
calendar_count_between <- function(start, end, precision, ..., n = 1L) {
check_calendar(start)
UseMethod("calendar_count_between")
}

#' @export
calendar_count_between.clock_calendar <- function(start,
end,
precision,
...,
n = 1L) {
calendar_count_between.clock_calendar <- function(
start,
end,
precision,
...,
n = 1L
) {
check_dots_empty0(...)
check_calendar(end)

Expand Down Expand Up @@ -987,7 +996,12 @@ calendar_is_precision <- function(x, precision) {
UseMethod("calendar_is_precision")
}

calendar_check_precision <- function(x, precision, ..., error_call = caller_env()) {
calendar_check_precision <- function(
x,
precision,
...,
error_call = caller_env()
) {
if (calendar_is_precision(x, precision)) {
return(invisible(NULL))
}
Expand All @@ -1008,11 +1022,13 @@ calendar_precision_attribute <- function(x) {

# ------------------------------------------------------------------------------

calendar_check_minimum_precision <- function(x,
precision,
...,
arg = caller_arg(x),
call = caller_env()) {
calendar_check_minimum_precision <- function(
x,
precision,
...,
arg = caller_arg(x),
call = caller_env()
) {
x_precision <- calendar_precision_attribute(x)

if (x_precision >= precision) {
Expand All @@ -1028,11 +1044,13 @@ calendar_check_minimum_precision <- function(x,
cli::cli_abort(message, call = call)
}

calendar_check_exact_precision <- function(x,
precision,
...,
arg = caller_arg(x),
call = caller_env()) {
calendar_check_exact_precision <- function(
x,
precision,
...,
arg = caller_arg(x),
call = caller_env()
) {
x_precision <- calendar_precision_attribute(x)

if (x_precision %in% precision) {
Expand All @@ -1051,9 +1069,11 @@ calendar_check_exact_precision <- function(x,
}

# For use in calendar constructor helpers
calendar_check_subsecond_precision <- function(subsecond_precision,
...,
call = caller_env()) {
calendar_check_subsecond_precision <- function(
subsecond_precision,
...,
call = caller_env()
) {
if (is_null(subsecond_precision)) {
cli::cli_abort(
"When {.arg subsecond} is provided, {.arg subsecond_precision} must also be specified.",
Expand All @@ -1066,10 +1086,12 @@ calendar_check_subsecond_precision <- function(subsecond_precision,

# ------------------------------------------------------------------------------

calendar_check_no_invalid <- function(x,
...,
arg = caller_arg(x),
call = caller_env()) {
calendar_check_no_invalid <- function(
x,
...,
arg = caller_arg(x),
call = caller_env()
) {
if (!invalid_any(x)) {
return(invisible(NULL))
}
Expand Down Expand Up @@ -1104,23 +1126,29 @@ calendar_ptype_abbr <- function(x, abbr) {
# ------------------------------------------------------------------------------

arith_calendar_and_missing <- function(op, x, y, ...) {
switch (
switch(
op,
"+" = x,
stop_incompatible_op(op, x, y, ...)
)
}

arith_calendar_and_calendar <- function(op, x, y, ..., calendar_minus_calendar_fn) {
switch (
arith_calendar_and_calendar <- function(
op,
x,
y,
...,
calendar_minus_calendar_fn
) {
switch(
op,
"-" = calendar_minus_calendar_fn(op, x, y, ...),
stop_incompatible_op(op, x, y, ...)
)
}

arith_calendar_and_duration <- function(op, x, y, ...) {
switch (
switch(
op,
"+" = add_duration(x, y),
"-" = add_duration(x, -y),
Expand All @@ -1129,28 +1157,50 @@ arith_calendar_and_duration <- function(op, x, y, ...) {
}

arith_duration_and_calendar <- function(op, x, y, ...) {
switch (
switch(
op,
"+" = add_duration(y, x, swapped = TRUE),
"-" = stop_incompatible_op(op, x, y, details = "Can't subtract a calendar from a duration.", ...),
"-" = stop_incompatible_op(
op,
x,
y,
details = "Can't subtract a calendar from a duration.",
...
),
stop_incompatible_op(op, x, y, ...)
)
}

arith_calendar_and_numeric <- function(op, x, y, ...) {
switch (
switch(
op,
"+" = add_duration(x, duration_helper(y, calendar_precision_attribute(x), retain_names = TRUE)),
"-" = add_duration(x, duration_helper(-y, calendar_precision_attribute(x), retain_names = TRUE)),
"+" = add_duration(
x,
duration_helper(y, calendar_precision_attribute(x), retain_names = TRUE)
),
"-" = add_duration(
x,
duration_helper(-y, calendar_precision_attribute(x), retain_names = TRUE)
),
stop_incompatible_op(op, x, y, ...)
)
}

arith_numeric_and_calendar <- function(op, x, y, ...) {
switch (
switch(
op,
"+" = add_duration(y, duration_helper(x, calendar_precision_attribute(y), retain_names = TRUE), swapped = TRUE),
"-" = stop_incompatible_op(op, x, y, details = "Can't subtract a calendar from a duration.", ...),
"+" = add_duration(
y,
duration_helper(x, calendar_precision_attribute(y), retain_names = TRUE),
swapped = TRUE
),
"-" = stop_incompatible_op(
op,
x,
y,
details = "Can't subtract a calendar from a duration.",
...
),
stop_incompatible_op(op, x, y, ...)
)
}
Expand Down Expand Up @@ -1238,7 +1288,9 @@ add_nanoseconds.clock_calendar <- function(x, n, ...) {
advice_convert_to_time_point <- function() {
c(
i = "Do you need to convert to a time point first?",
i = cli::format_inline("Use {.fn as_naive_time} or {.fn as_sys_time} to convert to a time point.")
i = cli::format_inline(
"Use {.fn as_naive_time} or {.fn as_sys_time} to convert to a time point."
)
)
}

Expand Down Expand Up @@ -1301,4 +1353,3 @@ is_calendar <- function(x) {
check_calendar <- function(x, ..., arg = caller_arg(x), call = caller_env()) {
check_inherits(x, what = "clock_calendar", arg = arg, call = call)
}

Loading

0 comments on commit 7f1a382

Please sign in to comment.