Skip to content

Implement add and subtract methods for Duration #74

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

Merged
merged 3 commits into from
Jul 7, 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
42 changes: 42 additions & 0 deletions src/components/duration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,48 @@ impl Duration {
}
}

/// Returns the result of adding a `Duration` to the current `Duration`
#[inline]
pub fn add(&self, other: &Self) -> TemporalResult<Self> {
// NOTE: Implemented from AddDurations
// Steps 1-22 are functionally useless in this context.

// 23. Let largestUnit1 be DefaultTemporalLargestUnit(y1, mon1, w1, d1, h1, min1, s1, ms1, mus1).
let largest_one = self.default_largest_unit();
// 24. Let largestUnit2 be DefaultTemporalLargestUnit(y2, mon2, w2, d2, h2, min2, s2, ms2, mus2).
let largest_two = other.default_largest_unit();
// 25. Let largestUnit be LargerOfTwoTemporalUnits(largestUnit1, largestUnit2).
let largest_unit = largest_one.max(largest_two);
// 26. Let norm1 be NormalizeTimeDuration(h1, min1, s1, ms1, mus1, ns1).
let norm_one = NormalizedTimeDuration::from_time_duration(self.time());
// 27. Let norm2 be NormalizeTimeDuration(h2, min2, s2, ms2, mus2, ns2).
let norm_two = NormalizedTimeDuration::from_time_duration(other.time());

// 28. If IsCalendarUnit(largestUnit), throw a RangeError exception.
if largest_unit.is_calendar_unit() {
return Err(TemporalError::range().with_message(
"Largest unit cannot be a calendar unit when adding two durations.",
));
}

// 29. Let normResult be ? AddNormalizedTimeDuration(norm1, norm2).
// 30. Set normResult to ? Add24HourDaysToNormalizedTimeDuration(normResult, d1 + d2).
let result = (norm_one + norm_two)?.add_days((self.days() + other.days()) as i64)?;

// 31. Let result be ? BalanceTimeDuration(normResult, largestUnit).
let (result_days, result_time) = TimeDuration::from_normalized(result, largest_unit)?;

// 32. Return ! CreateTemporalDuration(0, 0, 0, result.[[Days]], result.[[Hours]], result.[[Minutes]],
// result.[[Seconds]], result.[[Milliseconds]], result.[[Microseconds]], result.[[Nanoseconds]]).
Ok(Duration::from_day_and_time(result_days, &result_time))
}

/// Returns the result of subtracting a `Duration` from the current `Duration`
#[inline]
pub fn subtract(&self, other: &Self) -> TemporalResult<Self> {
self.add(&other.negated())
}

#[inline]
pub fn round(
&self,
Expand Down
28 changes: 28 additions & 0 deletions src/components/duration/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -463,3 +463,31 @@ fn rounding_increment_non_integer() {
&[0.0, 0.0, 0.0, 1e9, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
);
}

#[test]
fn basic_add_duration() {
let base = Duration::new(0.0, 0.0, 0.0, 1.0, 0.0, 5.0, 0.0, 0.0, 0.0, 0.0).unwrap();
let other = Duration::new(0.0, 0.0, 0.0, 2.0, 0.0, 5.0, 0.0, 0.0, 0.0, 0.0).unwrap();
let result = base.add(&other).unwrap();
assert_eq!(result.days(), 3.0);
assert_eq!(result.minutes(), 10.0);

let other = Duration::new(0.0, 0.0, 0.0, -3.0, 0.0, -15.0, 0.0, 0.0, 0.0, 0.0).unwrap();
let result = base.add(&other).unwrap();
assert_eq!(result.days(), -2.0);
assert_eq!(result.minutes(), -10.0);
}

#[test]
fn basic_subtract_duration() {
let base = Duration::new(0.0, 0.0, 0.0, 3.0, 0.0, 15.0, 0.0, 0.0, 0.0, 0.0).unwrap();
let other = Duration::new(0.0, 0.0, 0.0, 1.0, 0.0, 5.0, 0.0, 0.0, 0.0, 0.0).unwrap();
let result = base.subtract(&other).unwrap();
assert_eq!(result.days(), 2.0);
assert_eq!(result.minutes(), 10.0);

let other = Duration::new(0.0, 0.0, 0.0, -3.0, 0.0, -15.0, 0.0, 0.0, 0.0, 0.0).unwrap();
let result = base.subtract(&other).unwrap();
assert_eq!(result.days(), 6.0);
assert_eq!(result.minutes(), 30.0);
}