Skip to content

Update Duration's inner representation from floating point to integers. #268

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.

Sign up for GitHub

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
nekevss merged 9 commits into from
May 2, 2025
Merged

Update Duration's inner representation from floating point to integers. #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8c66a2e
Change repr for Duration to remove floating point ops
nekevss Apr 19, 2025
7ddfa34
Updates to temporal_capi for the previous changes
nekevss Apr 25, 2025
725f384
Migrate and add boundary tests + necessary adjustments
nekevss Apr 26, 2025
a7a645a
saturating_add to checked_add
nekevss Apr 30, 2025
0309214
Fixes from Boa checks
nekevss May 1, 2025
c01629c
Address a couple bugs
nekevss May 1, 2025
d1cd5dd
cargo fmt and fix tests
nekevss May 1, 2025
6f2e729
Update FFI for Duration changes
nekevss May 1, 2025
64fab5c
Merge branch 'main' into update-duration-repr
nekevss May 2, 2025
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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

638 changes: 325 additions & 313 deletions src/builtins/compiled/duration/tests.rs
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 8 additions & 5 deletions src/builtins/core/calendar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,10 @@ impl Calendar {
duration.years(),
duration.months(),
duration.weeks(),
duration.days().checked_add(&balance_days)?,
duration
.days()
.checked_add(balance_days)
.ok_or(TemporalError::range())?,
),
overflow,
)?;
Expand Down Expand Up @@ -954,22 +957,22 @@ mod tests {
let second = IsoDate::new_unchecked(test.1 .0, test.1 .1, test.1 .2);
let result = calendar.date_until(&first, &second, Unit::Year).unwrap();
assert_eq!(
result.years().0 as i32,
result.years() as i32,
test.2 .0,
"year failed for test \"{test:?}\""
);
assert_eq!(
result.months().0 as i32,
result.months() as i32,
test.2 .1,
"months failed for test \"{test:?}\""
);
assert_eq!(
result.weeks().0 as i32,
result.weeks() as i32,
test.2 .2,
"weeks failed for test \"{test:?}\""
);
assert_eq!(
result.days().0 as i32,
result.days(),
test.2 .3,
"days failed for test \"{test:?}\""
);
Expand Down
42 changes: 15 additions & 27 deletions src/builtins/core/date.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ use crate::{
DisplayCalendar, ResolvedRoundingOptions, Unit, UnitGroup,
},
parsers::{parse_date_time, IxdtfStringBuilder},
primitive::FiniteF64,
provider::{NeverProvider, TimeZoneProvider},
MonthCode, TemporalError, TemporalResult, TemporalUnwrap, TimeZone,
};
Expand Down Expand Up @@ -217,10 +216,7 @@ impl PlainDate {
// 2. If options is not present, set options to undefined.
let overflow = overflow.unwrap_or(ArithmeticOverflow::Constrain);
// 3. If duration.[[Years]] ≠ 0, or duration.[[Months]] ≠ 0, or duration.[[Weeks]] ≠ 0, then
if duration.date().years != 0.0
|| duration.date().months != 0.0
|| duration.date().weeks != 0.0
{
if duration.date().years != 0 || duration.date().months != 0 || duration.date().weeks != 0 {
// a. If dateAdd is not present, then
// i. Set dateAdd to unused.
// ii. If calendar is an Object, set dateAdd to ? GetMethod(calendar, "dateAdd").
Expand All @@ -235,20 +231,17 @@ impl PlainDate {
// duration.[[Nanoseconds]]).
// 6. Let days be duration.[[Days]] + BalanceTimeDuration(norm,
// "day").[[Days]].
let days = duration.days().checked_add(
&TimeDuration::from_normalized(duration.time().to_normalized(), Unit::Day)?.0,
)?;
let days = duration
.days()
.checked_add(
TimeDuration::from_normalized(duration.time().to_normalized(), Unit::Day)?.0,
)
.ok_or(TemporalError::range())?;

// 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(
FiniteF64::default(),
FiniteF64::default(),
FiniteF64::default(),
days,
)?,
overflow,
)?;
let result = self
.iso
.add_date_duration(&DateDuration::new(0, 0, 0, days)?, overflow)?;

Self::try_new(
result.year,
Expand Down Expand Up @@ -276,12 +269,7 @@ impl PlainDate {

if largest_unit == Unit::Day {
let days = self.days_until(other);
return Ok(Duration::from(DateDuration::new(
FiniteF64::default(),
FiniteF64::default(),
FiniteF64::default(),
FiniteF64::from(days),
)?));
return Ok(Duration::from(DateDuration::new(0, 0, 0, days.into())?));
}

self.calendar()
Expand Down Expand Up @@ -911,13 +899,13 @@ mod tests {
let result = earlier
.until(&later, DifferenceSettings::default())
.unwrap();
assert_eq!(result.days(), 73.0,);
assert_eq!(result.days(), 73,);

let later = PlainDate::from_str("1996-03-03").unwrap();
let result = earlier
.until(&later, DifferenceSettings::default())
.unwrap();
assert_eq!(result.days(), 9719.0,);
assert_eq!(result.days(), 9719,);
}

#[test]
Expand All @@ -927,13 +915,13 @@ mod tests {
let result = later
.since(&earlier, DifferenceSettings::default())
.unwrap();
assert_eq!(result.days(), 73.0,);
assert_eq!(result.days(), 73,);

let later = PlainDate::from_str("1996-03-03").unwrap();
let result = later
.since(&earlier, DifferenceSettings::default())
.unwrap();
assert_eq!(result.days(), 9719.0,);
assert_eq!(result.days(), 9719,);
}

#[test]
Expand Down
46 changes: 14 additions & 32 deletions src/builtins/core/datetime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ impl PlainDateTime {
let diff = self
.iso
.diff(&other.iso, &self.calendar, options.largest_unit)?;

// 4. If smallestUnit is nanosecond and roundingIncrement = 1, return diff.
if options.smallest_unit == Unit::Nanosecond && options.increment.get() == 1 {
return Ok(diff);
Expand Down Expand Up @@ -799,7 +798,6 @@ mod tests {
ToStringRoundingOptions, Unit,
},
parsers::Precision,
primitive::FiniteF64,
MonthCode, TemporalResult,
};

Expand Down Expand Up @@ -1031,15 +1029,7 @@ mod tests {

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

let result = pdt
.subtract(
&Duration::from(
DateDuration::new(
FiniteF64::default(),
FiniteF64(1.0),
FiniteF64::default(),
FiniteF64::default(),
)
.unwrap(),
),
&Duration::from(DateDuration::new(0, 1, 0, 0).unwrap()),
None,
)
.unwrap();
Expand All @@ -1081,13 +1063,13 @@ mod tests {
PlainDateTime::try_new(2019, 10, 29, 10, 46, 38, 271, 986, 102, Calendar::default())
.unwrap();

let result = dt.subtract(&Duration::hour(FiniteF64(12.0)), None).unwrap();
let result = dt.subtract(&Duration::hour(12), None).unwrap();
assert_datetime(
result,
(2019, 10, tinystr!(4, "M10"), 28, 22, 46, 38, 271, 986, 102),
);

let result = dt.add(&Duration::hour(FiniteF64(-12.0)), None).unwrap();
let result = dt.add(&Duration::hour(-12), None).unwrap();
assert_datetime(
result,
(2019, 10, tinystr!(4, "M10"), 28, 22, 46, 38, 271, 986, 102),
Expand Down Expand Up @@ -1119,15 +1101,15 @@ mod tests {
let settings = create_diff_setting(Unit::Hour, 3, RoundingMode::HalfExpand);
let result = earlier.until(&later, settings).unwrap();

assert_eq!(result.days(), 973.0);
assert_eq!(result.hours(), 3.0);
assert_eq!(result.days(), 973);
assert_eq!(result.hours(), 3);

let settings = create_diff_setting(Unit::Minute, 30, RoundingMode::HalfExpand);
let result = earlier.until(&later, settings).unwrap();

assert_eq!(result.days(), 973.0);
assert_eq!(result.hours(), 4.0);
assert_eq!(result.minutes(), 30.0);
assert_eq!(result.days(), 973);
assert_eq!(result.hours(), 4);
assert_eq!(result.minutes(), 30);
}

#[test]
Expand All @@ -1142,15 +1124,15 @@ mod tests {
let settings = create_diff_setting(Unit::Hour, 3, RoundingMode::HalfExpand);
let result = later.since(&earlier, settings).unwrap();

assert_eq!(result.days(), 973.0);
assert_eq!(result.hours(), 3.0);
assert_eq!(result.days(), 973);
assert_eq!(result.hours(), 3);

let settings = create_diff_setting(Unit::Minute, 30, RoundingMode::HalfExpand);
let result = later.since(&earlier, settings).unwrap();

assert_eq!(result.days(), 973.0);
assert_eq!(result.hours(), 4.0);
assert_eq!(result.minutes(), 30.0);
assert_eq!(result.days(), 973);
assert_eq!(result.hours(), 4);
assert_eq!(result.minutes(), 30);
}

#[test]
Expand Down
Loading