mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 07:57:46 +00:00
LibJS: Change nanoseconds_to_days() argument from a JS to Crypto BigInt
This is an editorial change in the Temporal spec.
See: 0b1346c
This commit is contained in:
parent
039cb9f189
commit
ff3256792d
3 changed files with 38 additions and 50 deletions
|
@ -426,11 +426,9 @@ Crypto::SignedBigInteger total_duration_nanoseconds(double days, double hours, d
|
|||
// 7.5.18 BalanceDuration ( days, hours, minutes, seconds, milliseconds, microseconds, nanoseconds, largestUnit [ , relativeTo ] ), https://tc39.es/proposal-temporal/#sec-temporal-balanceduration
|
||||
ThrowCompletionOr<TimeDurationRecord> balance_duration(GlobalObject& global_object, double days, double hours, double minutes, double seconds, double milliseconds, double microseconds, Crypto::SignedBigInteger const& nanoseconds, String const& largest_unit, Object* relative_to)
|
||||
{
|
||||
auto& vm = global_object.vm();
|
||||
|
||||
// 1. If relativeTo is not present, set relativeTo to undefined.
|
||||
|
||||
BigInt* total_nanoseconds_bigint;
|
||||
Crypto::SignedBigInteger total_nanoseconds;
|
||||
// 2. If Type(relativeTo) is Object and relativeTo has an [[InitializedTemporalZonedDateTime]] internal slot, then
|
||||
if (relative_to && is<ZonedDateTime>(*relative_to)) {
|
||||
auto& relative_to_zoned_date_time = static_cast<ZonedDateTime&>(*relative_to);
|
||||
|
@ -438,25 +436,25 @@ ThrowCompletionOr<TimeDurationRecord> balance_duration(GlobalObject& global_obje
|
|||
// a. Let endNs be ? AddZonedDateTime(relativeTo.[[Nanoseconds]], relativeTo.[[TimeZone]], relativeTo.[[Calendar]], 0, 0, 0, days, hours, minutes, seconds, milliseconds, microseconds, nanoseconds).
|
||||
auto* end_ns = TRY(add_zoned_date_time(global_object, relative_to_zoned_date_time.nanoseconds(), &relative_to_zoned_date_time.time_zone(), relative_to_zoned_date_time.calendar(), 0, 0, 0, days, hours, minutes, seconds, milliseconds, microseconds, nanoseconds.to_double()));
|
||||
|
||||
// b. Set nanoseconds to endNs − relativeTo.[[Nanoseconds]].
|
||||
total_nanoseconds_bigint = js_bigint(vm, end_ns->big_integer().minus(relative_to_zoned_date_time.nanoseconds().big_integer()));
|
||||
// b. Set nanoseconds to ℝ(endNs − relativeTo.[[Nanoseconds]]).
|
||||
total_nanoseconds = end_ns->big_integer().minus(relative_to_zoned_date_time.nanoseconds().big_integer());
|
||||
}
|
||||
// 3. Else,
|
||||
else {
|
||||
// a. Set nanoseconds to ℤ(! TotalDurationNanoseconds(days, hours, minutes, seconds, milliseconds, microseconds, nanoseconds, 0)).
|
||||
total_nanoseconds_bigint = js_bigint(vm, total_duration_nanoseconds(days, hours, minutes, seconds, milliseconds, microseconds, nanoseconds, 0));
|
||||
// a. Set nanoseconds to ! TotalDurationNanoseconds(days, hours, minutes, seconds, milliseconds, microseconds, nanoseconds, 0).
|
||||
total_nanoseconds = total_duration_nanoseconds(days, hours, minutes, seconds, milliseconds, microseconds, nanoseconds, 0);
|
||||
}
|
||||
|
||||
// 4. If largestUnit is one of "year", "month", "week", or "day", then
|
||||
if (largest_unit.is_one_of("year"sv, "month"sv, "week"sv, "day"sv)) {
|
||||
// a. Let result be ? NanosecondsToDays(nanoseconds, relativeTo).
|
||||
auto result = TRY(nanoseconds_to_days(global_object, *total_nanoseconds_bigint, relative_to ?: js_undefined()));
|
||||
auto result = TRY(nanoseconds_to_days(global_object, total_nanoseconds, relative_to ?: js_undefined()));
|
||||
|
||||
// b. Set days to result.[[Days]].
|
||||
days = result.days;
|
||||
|
||||
// c. Set nanoseconds to result.[[Nanoseconds]].
|
||||
total_nanoseconds_bigint = js_bigint(vm, move(result.nanoseconds));
|
||||
total_nanoseconds = move(result.nanoseconds);
|
||||
}
|
||||
// 5. Else,
|
||||
else {
|
||||
|
@ -470,17 +468,14 @@ ThrowCompletionOr<TimeDurationRecord> balance_duration(GlobalObject& global_obje
|
|||
milliseconds = 0;
|
||||
microseconds = 0;
|
||||
|
||||
// 7. Set nanoseconds to ℝ(nanoseconds).
|
||||
auto total_nanoseconds = total_nanoseconds_bigint->big_integer();
|
||||
|
||||
// 8. If nanoseconds < 0, let sign be −1; else, let sign be 1.
|
||||
// 7. If nanoseconds < 0, let sign be −1; else, let sign be 1.
|
||||
i8 sign = total_nanoseconds.is_negative() ? -1 : 1;
|
||||
|
||||
// 9. Set nanoseconds to abs(nanoseconds).
|
||||
// 8. Set nanoseconds to abs(nanoseconds).
|
||||
total_nanoseconds = Crypto::SignedBigInteger(total_nanoseconds.unsigned_value());
|
||||
auto result_nanoseconds = total_nanoseconds.to_double();
|
||||
|
||||
// 10. If largestUnit is "year", "month", "week", "day", or "hour", then
|
||||
// 9. If largestUnit is "year", "month", "week", "day", or "hour", then
|
||||
if (largest_unit.is_one_of("year"sv, "month"sv, "week"sv, "day"sv, "hour"sv)) {
|
||||
// a. Set microseconds to floor(nanoseconds / 1000).
|
||||
auto nanoseconds_division_result = total_nanoseconds.divided_by(Crypto::UnsignedBigInteger(1000));
|
||||
|
@ -504,7 +499,7 @@ ThrowCompletionOr<TimeDurationRecord> balance_duration(GlobalObject& global_obje
|
|||
// j. Set minutes to minutes modulo 60.
|
||||
minutes = minutes_division_result.remainder.to_double();
|
||||
}
|
||||
// 11. Else if largestUnit is "minute", then
|
||||
// 10. Else if largestUnit is "minute", then
|
||||
else if (largest_unit == "minute"sv) {
|
||||
// a. Set microseconds to floor(nanoseconds / 1000).
|
||||
auto nanoseconds_division_result = total_nanoseconds.divided_by(Crypto::UnsignedBigInteger(1000));
|
||||
|
@ -524,7 +519,7 @@ ThrowCompletionOr<TimeDurationRecord> balance_duration(GlobalObject& global_obje
|
|||
// h. Set seconds to seconds modulo 60.
|
||||
seconds = seconds_division_result.remainder.to_double();
|
||||
}
|
||||
// 12. Else if largestUnit is "second", then
|
||||
// 11. Else if largestUnit is "second", then
|
||||
else if (largest_unit == "second"sv) {
|
||||
// a. Set microseconds to floor(nanoseconds / 1000).
|
||||
auto nanoseconds_division_result = total_nanoseconds.divided_by(Crypto::UnsignedBigInteger(1000));
|
||||
|
@ -540,7 +535,7 @@ ThrowCompletionOr<TimeDurationRecord> balance_duration(GlobalObject& global_obje
|
|||
// f. Set milliseconds to milliseconds modulo 1000.
|
||||
milliseconds = milliseconds_division_result.remainder.to_double();
|
||||
}
|
||||
// 13. Else if largestUnit is "millisecond", then
|
||||
// 12. Else if largestUnit is "millisecond", then
|
||||
else if (largest_unit == "millisecond"sv) {
|
||||
// a. Set microseconds to floor(nanoseconds / 1000).
|
||||
auto nanoseconds_division_result = total_nanoseconds.divided_by(Crypto::UnsignedBigInteger(1000));
|
||||
|
@ -552,7 +547,7 @@ ThrowCompletionOr<TimeDurationRecord> balance_duration(GlobalObject& global_obje
|
|||
// d. Set microseconds to microseconds modulo 1000.
|
||||
microseconds = microseconds_division_result.remainder.to_double();
|
||||
}
|
||||
// 14. Else if largestUnit is "microsecond", then
|
||||
// 13. Else if largestUnit is "microsecond", then
|
||||
else if (largest_unit == "microsecond"sv) {
|
||||
// a. Set microseconds to floor(nanoseconds / 1000).
|
||||
auto nanoseconds_division_result = total_nanoseconds.divided_by(Crypto::UnsignedBigInteger(1000));
|
||||
|
@ -560,12 +555,12 @@ ThrowCompletionOr<TimeDurationRecord> balance_duration(GlobalObject& global_obje
|
|||
// b. Set nanoseconds to nanoseconds modulo 1000.
|
||||
result_nanoseconds = nanoseconds_division_result.remainder.to_double();
|
||||
}
|
||||
// 15. Else,
|
||||
// 14. Else,
|
||||
else {
|
||||
// a. Assert: largestUnit is "nanosecond".
|
||||
VERIFY(largest_unit == "nanosecond"sv);
|
||||
}
|
||||
// 16. Return ! CreateTimeDurationRecord(days, hours × sign, minutes × sign, seconds × sign, milliseconds × sign, microseconds × sign, nanoseconds × sign).
|
||||
// 15. Return ! CreateTimeDurationRecord(days, hours × sign, minutes × sign, seconds × sign, milliseconds × sign, microseconds × sign, nanoseconds × sign).
|
||||
return create_time_duration_record(days, hours * sign, minutes * sign, seconds * sign, milliseconds * sign, microseconds * sign, result_nanoseconds * sign);
|
||||
}
|
||||
|
||||
|
@ -1171,7 +1166,7 @@ ThrowCompletionOr<RoundedDuration> round_duration(GlobalObject& global_object, d
|
|||
}
|
||||
|
||||
// d. Let result be ? NanosecondsToDays(nanoseconds, intermediate).
|
||||
auto result = TRY(nanoseconds_to_days(global_object, *js_bigint(vm, nanoseconds_bigint), intermediate));
|
||||
auto result = TRY(nanoseconds_to_days(global_object, nanoseconds_bigint, intermediate));
|
||||
|
||||
// e. Set days to days + result.[[Days]] + result.[[Nanoseconds]] / result.[[DayLength]].
|
||||
auto nanoseconds_division_result = result.nanoseconds.divided_by(Crypto::UnsignedBigInteger::create_from((u64)result.day_length));
|
||||
|
|
|
@ -405,8 +405,6 @@ ThrowCompletionOr<BigInt*> add_zoned_date_time(GlobalObject& global_object, BigI
|
|||
// 6.5.6 DifferenceZonedDateTime ( ns1, ns2, timeZone, calendar, largestUnit [ , options ] ), https://tc39.es/proposal-temporal/#sec-temporal-differencezoneddatetime
|
||||
ThrowCompletionOr<DurationRecord> difference_zoned_date_time(GlobalObject& global_object, BigInt const& nanoseconds1, BigInt const& nanoseconds2, Object& time_zone, Object& calendar, StringView largest_unit, Object* options)
|
||||
{
|
||||
auto& vm = global_object.vm();
|
||||
|
||||
// 1. Assert: Type(ns1) is BigInt.
|
||||
// 2. Assert: Type(ns2) is BigInt.
|
||||
|
||||
|
@ -441,7 +439,7 @@ ThrowCompletionOr<DurationRecord> difference_zoned_date_time(GlobalObject& globa
|
|||
auto* intermediate = MUST(create_temporal_zoned_date_time(global_object, *intermediate_ns, time_zone, calendar));
|
||||
|
||||
// 12. Let result be ? NanosecondsToDays(timeRemainderNs, intermediate).
|
||||
auto result = TRY(nanoseconds_to_days(global_object, *js_bigint(vm, time_remainder_ns), intermediate));
|
||||
auto result = TRY(nanoseconds_to_days(global_object, time_remainder_ns, intermediate));
|
||||
|
||||
// 13. Let timeDifference be ! BalanceDuration(0, 0, 0, 0, 0, 0, result.[[Nanoseconds]], "hour").
|
||||
auto time_difference = MUST(balance_duration(global_object, 0, 0, 0, 0, 0, 0, result.nanoseconds, "hour"sv));
|
||||
|
@ -451,28 +449,23 @@ ThrowCompletionOr<DurationRecord> difference_zoned_date_time(GlobalObject& globa
|
|||
}
|
||||
|
||||
// 6.5.7 NanosecondsToDays ( nanoseconds, relativeTo ), https://tc39.es/proposal-temporal/#sec-temporal-nanosecondstodays
|
||||
ThrowCompletionOr<NanosecondsToDaysResult> nanoseconds_to_days(GlobalObject& global_object, BigInt const& nanoseconds_bigint, Value relative_to_value)
|
||||
ThrowCompletionOr<NanosecondsToDaysResult> nanoseconds_to_days(GlobalObject& global_object, Crypto::SignedBigInteger nanoseconds, Value relative_to_value)
|
||||
{
|
||||
auto& vm = global_object.vm();
|
||||
|
||||
// 1. Assert: Type(nanoseconds) is BigInt.
|
||||
|
||||
// 2. Set nanoseconds to ℝ(nanoseconds).
|
||||
auto nanoseconds = nanoseconds_bigint.big_integer();
|
||||
|
||||
// 3. Let dayLengthNs be 8.64 × 10^13.
|
||||
// 1. Let dayLengthNs be 8.64 × 10^13.
|
||||
auto day_length_ns = "86400000000000"_sbigint;
|
||||
|
||||
// 4. If nanoseconds = 0, then
|
||||
// 2. If nanoseconds = 0, then
|
||||
if (nanoseconds == "0"_bigint) {
|
||||
// a. Return the Record { [[Days]]: 0, [[Nanoseconds]]: 0, [[DayLength]]: dayLengthNs }.
|
||||
return NanosecondsToDaysResult { .days = 0, .nanoseconds = "0"_sbigint, .day_length = day_length_ns.to_double() };
|
||||
}
|
||||
|
||||
// 5. If nanoseconds < 0, let sign be −1; else, let sign be 1.
|
||||
// 3. If nanoseconds < 0, let sign be −1; else, let sign be 1.
|
||||
auto sign = nanoseconds.is_negative() ? -1 : 1;
|
||||
|
||||
// 6. If Type(relativeTo) is not Object or relativeTo does not have an [[InitializedTemporalZonedDateTime]] internal slot, then
|
||||
// 4. If Type(relativeTo) is not Object or relativeTo does not have an [[InitializedTemporalZonedDateTime]] internal slot, then
|
||||
if (!relative_to_value.is_object() || !is<ZonedDateTime>(relative_to_value.as_object())) {
|
||||
// a. Return the Record { [[Days]]: the integral part of nanoseconds / dayLengthNs, [[Nanoseconds]]: (abs(nanoseconds) modulo dayLengthNs) × sign, [[DayLength]]: dayLengthNs }.
|
||||
return NanosecondsToDaysResult {
|
||||
|
@ -484,34 +477,34 @@ ThrowCompletionOr<NanosecondsToDaysResult> nanoseconds_to_days(GlobalObject& glo
|
|||
|
||||
auto& relative_to = static_cast<ZonedDateTime&>(relative_to_value.as_object());
|
||||
|
||||
// 7. Let startNs be ℝ(relativeTo.[[Nanoseconds]]).
|
||||
// 5. Let startNs be ℝ(relativeTo.[[Nanoseconds]]).
|
||||
auto& start_ns = relative_to.nanoseconds().big_integer();
|
||||
|
||||
// 8. Let startInstant be ! CreateTemporalInstant(ℤ(startNs)).
|
||||
// 6. Let startInstant be ! CreateTemporalInstant(ℤ(startNs)).
|
||||
auto* start_instant = MUST(create_temporal_instant(global_object, *js_bigint(vm, start_ns)));
|
||||
|
||||
// 9. Let startDateTime be ? BuiltinTimeZoneGetPlainDateTimeFor(relativeTo.[[TimeZone]], startInstant, relativeTo.[[Calendar]]).
|
||||
// 7. Let startDateTime be ? BuiltinTimeZoneGetPlainDateTimeFor(relativeTo.[[TimeZone]], startInstant, relativeTo.[[Calendar]]).
|
||||
auto* start_date_time = TRY(builtin_time_zone_get_plain_date_time_for(global_object, &relative_to.time_zone(), *start_instant, relative_to.calendar()));
|
||||
|
||||
// 10. Let endNs be startNs + nanoseconds.
|
||||
// 8. Let endNs be startNs + nanoseconds.
|
||||
auto end_ns = start_ns.plus(nanoseconds);
|
||||
|
||||
// 11. Let endInstant be ! CreateTemporalInstant(ℤ(endNs)).
|
||||
// 9. Let endInstant be ! CreateTemporalInstant(ℤ(endNs)).
|
||||
auto* end_instant = MUST(create_temporal_instant(global_object, *js_bigint(vm, end_ns)));
|
||||
|
||||
// 12. Let endDateTime be ? BuiltinTimeZoneGetPlainDateTimeFor(relativeTo.[[TimeZone]], endInstant, relativeTo.[[Calendar]]).
|
||||
// 10. Let endDateTime be ? BuiltinTimeZoneGetPlainDateTimeFor(relativeTo.[[TimeZone]], endInstant, relativeTo.[[Calendar]]).
|
||||
auto* end_date_time = TRY(builtin_time_zone_get_plain_date_time_for(global_object, &relative_to.time_zone(), *end_instant, relative_to.calendar()));
|
||||
|
||||
// 13. Let dateDifference be ? DifferenceISODateTime(startDateTime.[[ISOYear]], startDateTime.[[ISOMonth]], startDateTime.[[ISODay]], startDateTime.[[ISOHour]], startDateTime.[[ISOMinute]], startDateTime.[[ISOSecond]], startDateTime.[[ISOMillisecond]], startDateTime.[[ISOMicrosecond]], startDateTime.[[ISONanosecond]], endDateTime.[[ISOYear]], endDateTime.[[ISOMonth]], endDateTime.[[ISODay]], endDateTime.[[ISOHour]], endDateTime.[[ISOMinute]], endDateTime.[[ISOSecond]], endDateTime.[[ISOMillisecond]], endDateTime.[[ISOMicrosecond]], endDateTime.[[ISONanosecond]], relativeTo.[[Calendar]], "day").
|
||||
// 11. Let dateDifference be ? DifferenceISODateTime(startDateTime.[[ISOYear]], startDateTime.[[ISOMonth]], startDateTime.[[ISODay]], startDateTime.[[ISOHour]], startDateTime.[[ISOMinute]], startDateTime.[[ISOSecond]], startDateTime.[[ISOMillisecond]], startDateTime.[[ISOMicrosecond]], startDateTime.[[ISONanosecond]], endDateTime.[[ISOYear]], endDateTime.[[ISOMonth]], endDateTime.[[ISODay]], endDateTime.[[ISOHour]], endDateTime.[[ISOMinute]], endDateTime.[[ISOSecond]], endDateTime.[[ISOMillisecond]], endDateTime.[[ISOMicrosecond]], endDateTime.[[ISONanosecond]], relativeTo.[[Calendar]], "day").
|
||||
auto date_difference = TRY(difference_iso_date_time(global_object, start_date_time->iso_year(), start_date_time->iso_month(), start_date_time->iso_day(), start_date_time->iso_hour(), start_date_time->iso_minute(), start_date_time->iso_second(), start_date_time->iso_millisecond(), start_date_time->iso_microsecond(), start_date_time->iso_nanosecond(), end_date_time->iso_year(), end_date_time->iso_month(), end_date_time->iso_day(), end_date_time->iso_hour(), end_date_time->iso_minute(), end_date_time->iso_second(), end_date_time->iso_millisecond(), end_date_time->iso_microsecond(), end_date_time->iso_nanosecond(), relative_to.calendar(), "day"sv));
|
||||
|
||||
// 14. Let days be dateDifference.[[Days]].
|
||||
// 12. Let days be dateDifference.[[Days]].
|
||||
auto days = date_difference.days;
|
||||
|
||||
// 15. Let intermediateNs be ℝ(? AddZonedDateTime(ℤ(startNs), relativeTo.[[TimeZone]], relativeTo.[[Calendar]], 0, 0, 0, days, 0, 0, 0, 0, 0, 0)).
|
||||
// 13. Let intermediateNs be ℝ(? AddZonedDateTime(ℤ(startNs), relativeTo.[[TimeZone]], relativeTo.[[Calendar]], 0, 0, 0, days, 0, 0, 0, 0, 0, 0)).
|
||||
auto intermediate_ns = TRY(add_zoned_date_time(global_object, *js_bigint(vm, start_ns), &relative_to.time_zone(), relative_to.calendar(), 0, 0, 0, days, 0, 0, 0, 0, 0, 0))->big_integer();
|
||||
|
||||
// 16. If sign is 1, then
|
||||
// 14. If sign is 1, then
|
||||
if (sign == 1) {
|
||||
// a. Repeat, while days > 0 and intermediateNs > endNs,
|
||||
while (days > 0 && intermediate_ns > end_ns) {
|
||||
|
@ -523,11 +516,11 @@ ThrowCompletionOr<NanosecondsToDaysResult> nanoseconds_to_days(GlobalObject& glo
|
|||
}
|
||||
}
|
||||
|
||||
// 17. Set nanoseconds to endNs − intermediateNs.
|
||||
// 15. Set nanoseconds to endNs − intermediateNs.
|
||||
nanoseconds = end_ns.minus(intermediate_ns);
|
||||
|
||||
// 18. Let done be false.
|
||||
// 19. Repeat, while done is false,
|
||||
// 16. Let done be false.
|
||||
// 17. Repeat, while done is false,
|
||||
while (true) {
|
||||
// a. Let oneDayFartherNs be ℝ(? AddZonedDateTime(ℤ(intermediateNs), relativeTo.[[TimeZone]], relativeTo.[[Calendar]], 0, 0, 0, sign, 0, 0, 0, 0, 0, 0)).
|
||||
auto one_day_farther_ns = TRY(add_zoned_date_time(global_object, *js_bigint(vm, intermediate_ns), &relative_to.time_zone(), relative_to.calendar(), 0, 0, 0, sign, 0, 0, 0, 0, 0, 0))->big_integer();
|
||||
|
@ -553,7 +546,7 @@ ThrowCompletionOr<NanosecondsToDaysResult> nanoseconds_to_days(GlobalObject& glo
|
|||
}
|
||||
}
|
||||
|
||||
// 20. Return the Record { [[Days]]: days, [[Nanoseconds]]: nanoseconds, [[DayLength]]: abs(dayLengthNs) }.
|
||||
// 18. Return the Record { [[Days]]: days, [[Nanoseconds]]: nanoseconds, [[DayLength]]: abs(dayLengthNs) }.
|
||||
return NanosecondsToDaysResult { .days = days, .nanoseconds = move(nanoseconds), .day_length = fabs(day_length_ns.to_double()) };
|
||||
}
|
||||
|
||||
|
|
|
@ -56,6 +56,6 @@ ThrowCompletionOr<ZonedDateTime*> create_temporal_zoned_date_time(GlobalObject&,
|
|||
ThrowCompletionOr<String> temporal_zoned_date_time_to_string(GlobalObject&, ZonedDateTime& zoned_date_time, Variant<StringView, u8> const& precision, StringView show_calendar, StringView show_time_zone, StringView show_offset, Optional<u64> increment = {}, Optional<StringView> unit = {}, Optional<StringView> rounding_mode = {});
|
||||
ThrowCompletionOr<BigInt*> add_zoned_date_time(GlobalObject&, BigInt const& epoch_nanoseconds, Value time_zone, Object& calendar, double years, double months, double weeks, double days, double hours, double minutes, double seconds, double milliseconds, double microseconds, double nanoseconds, Object* options = nullptr);
|
||||
ThrowCompletionOr<DurationRecord> difference_zoned_date_time(GlobalObject&, BigInt const& nanoseconds1, BigInt const& nanoseconds2, Object& time_zone, Object& calendar, StringView largest_unit, Object* options = nullptr);
|
||||
ThrowCompletionOr<NanosecondsToDaysResult> nanoseconds_to_days(GlobalObject&, BigInt const& nanoseconds, Value relative_to);
|
||||
ThrowCompletionOr<NanosecondsToDaysResult> nanoseconds_to_days(GlobalObject&, Crypto::SignedBigInteger nanoseconds, Value relative_to);
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue