Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Duration types to use a FiniteF64 instead of f64 primitive. #86

Merged
merged 3 commits into from
Jul 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/calendar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ impl Calendar {
duration.years(),
duration.months(),
duration.weeks(),
duration.days() + balance_days,
duration.days().checked_add(&balance_days)?,
),
overflow,
)?;
Expand Down
39 changes: 22 additions & 17 deletions src/components/date.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ use crate::{
TemporalUnit,
},
parsers::parse_date_time,
TemporalError, TemporalFields, TemporalResult, TemporalUnwrap,
primitive::FiniteF64,
Sign, TemporalError, TemporalFields, TemporalResult, TemporalUnwrap,
};
use std::str::FromStr;

Expand Down Expand Up @@ -79,13 +80,20 @@ impl Date {
// 4. Let overflow be ? ToTemporalOverflow(options).
// 5. Let norm be NormalizeTimeDuration(duration.[[Hours]], duration.[[Minutes]], duration.[[Seconds]], duration.[[Milliseconds]], duration.[[Microseconds]], duration.[[Nanoseconds]]).
// 6. Let days be duration.[[Days]] + BalanceTimeDuration(norm, "day").[[Days]].
let days = duration.days()
+ TimeDuration::from_normalized(duration.time().to_normalized(), TemporalUnit::Day)?.0;
let days = duration.days().checked_add(
&TimeDuration::from_normalized(duration.time().to_normalized(), TemporalUnit::Day)?.0,
)?;

// 7. Let result be ? AddISODate(plainDate.[[ISOYear]], plainDate.[[ISOMonth]], plainDate.[[ISODay]], 0, 0, 0, days, overflow).
let result = self
.iso
.add_date_duration(&DateDuration::new(0f64, 0f64, 0f64, days)?, overflow)?;
let result = self.iso.add_date_duration(
&DateDuration::new(
FiniteF64::default(),
FiniteF64::default(),
FiniteF64::default(),
days,
)?,
overflow,
)?;

Ok(Self::new_unchecked(result, self.calendar().clone()))
}
Expand All @@ -109,10 +117,10 @@ impl Date {
if largest_unit == TemporalUnit::Day {
let days = self.days_until(other);
return Ok(Duration::from(DateDuration::new(
0f64,
0f64,
0f64,
f64::from(days),
FiniteF64::default(),
FiniteF64::default(),
FiniteF64::default(),
FiniteF64::from(days),
)?));
}

Expand Down Expand Up @@ -179,14 +187,11 @@ impl Date {
duration.date()
};

let sign = f64::from(sign as i8);
// 13. Return ! CreateTemporalDuration(sign × duration.[[Years]], sign × duration.[[Months]], sign × duration.[[Weeks]], sign × duration.[[Days]], 0, 0, 0, 0, 0, 0).
Ok(Duration::from(DateDuration::new(
date_duration.years * sign,
date_duration.months * sign,
date_duration.weeks * sign,
date_duration.days * sign,
)?))
match sign {
Sign::Positive | Sign::Zero => Ok(Duration::from(date_duration)),
Sign::Negative => Ok(Duration::from(date_duration.negated())),
}
}
}

Expand Down
28 changes: 23 additions & 5 deletions src/components/datetime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use crate::{
temporal_assert, Sign, TemporalError, TemporalResult, TemporalUnwrap,
};

use num_traits::AsPrimitive;
use std::{cmp::Ordering, str::FromStr};
use tinystr::TinyAsciiStr;

Expand Down Expand Up @@ -167,7 +168,7 @@ impl DateTime {
// a. Let normWithDays be ? Add24HourDaysToNormalizedTimeDuration(diff.[[NormalizedTime]], diff.[[Days]]).
let norm_with_days = diff
.normalized_time_duration()
.add_days(diff.date().days as i64)?;
.add_days(diff.date().days.as_())?;
// b. Let timeResult be ! BalanceTimeDuration(normWithDays, largestUnit).
let (days, time_duration) =
TimeDuration::from_normalized(norm_with_days, options.largest_unit)?;
Expand Down Expand Up @@ -530,6 +531,7 @@ mod tests {
components::{calendar::Calendar, duration::DateDuration, Duration},
iso::{IsoDate, IsoTime},
options::{DifferenceSettings, RoundingIncrement, TemporalRoundingMode, TemporalUnit},
primitive::FiniteF64,
};

use super::DateTime;
Expand Down Expand Up @@ -565,7 +567,15 @@ mod tests {

let result = pdt
.add(
&Duration::from(DateDuration::new(0.0, 1.0, 0.0, 0.0).unwrap()),
&Duration::from(
DateDuration::new(
FiniteF64::default(),
FiniteF64(1.0),
FiniteF64::default(),
FiniteF64::default(),
)
.unwrap(),
),
None,
)
.unwrap();
Expand All @@ -582,7 +592,15 @@ mod tests {

let result = pdt
.subtract(
&Duration::from(DateDuration::new(0.0, 1.0, 0.0, 0.0).unwrap()),
&Duration::from(
DateDuration::new(
FiniteF64::default(),
FiniteF64(1.0),
FiniteF64::default(),
FiniteF64::default(),
)
.unwrap(),
),
None,
)
.unwrap();
Expand All @@ -597,7 +615,7 @@ mod tests {
let dt =
DateTime::new(2019, 10, 29, 10, 46, 38, 271, 986, 102, Calendar::default()).unwrap();

let result = dt.subtract(&Duration::hour(12.0), None).unwrap();
let result = dt.subtract(&Duration::hour(FiniteF64(12.0)), None).unwrap();

assert_eq!(
result.iso.date,
Expand All @@ -619,7 +637,7 @@ mod tests {
}
);

let result = dt.add(&Duration::hour(-12.0), None).unwrap();
let result = dt.add(&Duration::hour(FiniteF64(-12.0)), None).unwrap();

assert_eq!(
result.iso.date,
Expand Down
Loading