Skip to content

Commit

Permalink
Add ensure_i32 util
Browse files Browse the repository at this point in the history
  • Loading branch information
unexge committed Dec 31, 2023
1 parent ce7584d commit 81e5f5a
Showing 1 changed file with 10 additions and 12 deletions.
22 changes: 10 additions & 12 deletions src/builtins/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,9 @@ fn add_date(span: &Span, params: &[Ref<Expr>], args: &[Value], strict: bool) ->
ensure_args_count(span, name, params, args, 4)?;

let (datetime, _) = parse_epoch(name, &params[0], &args[0])?;
let years: i32 = ensure_numeric(name, &params[1], &args[1])?
.as_i64()
.and_then(|n| n.try_into().ok())
.ok_or_else(|| span.error("could not convert `years` to int32"))?;
let months: i32 = ensure_numeric(name, &params[2], &args[2])?
.as_i64()
.and_then(|n| n.try_into().ok())
.ok_or_else(|| span.error("could not convert `months` to int32"))?;
let days: i32 = ensure_numeric(name, &params[3], &args[3])?
.as_i64()
.and_then(|n| n.try_into().ok())
.ok_or_else(|| span.error("could not convert `days` to int32"))?;
let years = ensure_i32(name, &params[1], &args[1])?;
let months = ensure_i32(name, &params[2], &args[2])?;
let days = ensure_i32(name, &params[3], &args[3])?;

let Some(new_year) = datetime.year().checked_add(years) else {
return Ok(Value::Undefined);
Expand Down Expand Up @@ -231,6 +222,13 @@ fn weekday(span: &Span, params: &[Ref<Expr>], args: &[Value], _strict: bool) ->
Ok(Value::String(weekday.into()))
}

fn ensure_i32(name: &str, arg: &Expr, v: &Value) -> Result<i32> {
ensure_numeric(name, arg, v)?
.as_i64()
.and_then(|n| n.try_into().ok())
.ok_or_else(|| arg.span().error("could not convert to int32"))
}

fn safe_timestamp_nanos(span: &Span, strict: bool, nanos: Option<i64>) -> Result<Value> {
match nanos {
Some(ns) => Ok(Value::Number(ns.into())),
Expand Down

0 comments on commit 81e5f5a

Please sign in to comment.