mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-08-07 16:49:54 +00:00
LibJS: Implement Temporal.PlainTime.prototype.add/subtract
This commit is contained in:
parent
ab3c825fa8
commit
1c22011ed6
Notes:
github-actions[bot]
2024-11-24 00:37:49 +00:00
Author: https://github.com/trflynn89
Commit: 1c22011ed6
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/2535
6 changed files with 105 additions and 0 deletions
|
@ -606,4 +606,24 @@ Time round_time(Time const& time, u64 increment, Unit unit, RoundingMode roundin
|
||||||
VERIFY_NOT_REACHED();
|
VERIFY_NOT_REACHED();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 4.5.18 AddDurationToTime ( operation, temporalTime, temporalDurationLike ), https://tc39.es/proposal-temporal/#sec-temporal-adddurationtotime
|
||||||
|
ThrowCompletionOr<GC::Ref<PlainTime>> add_duration_to_time(VM& vm, ArithmeticOperation operation, PlainTime const& temporal_time, Value temporal_duration_like)
|
||||||
|
{
|
||||||
|
// 1. Let duration be ? ToTemporalDuration(temporalDurationLike).
|
||||||
|
auto duration = TRY(to_temporal_duration(vm, temporal_duration_like));
|
||||||
|
|
||||||
|
// 2. If operation is SUBTRACT, set duration to CreateNegatedTemporalDuration(duration).
|
||||||
|
if (operation == ArithmeticOperation::Subtract)
|
||||||
|
duration = create_negated_temporal_duration(vm, duration);
|
||||||
|
|
||||||
|
// 3. Let internalDuration be ToInternalDurationRecord(duration).
|
||||||
|
auto internal_duration = to_internal_duration_record(vm, duration);
|
||||||
|
|
||||||
|
// 4. Let result be AddTime(temporalTime.[[Time]], internalDuration.[[Time]]).
|
||||||
|
auto result = add_time(temporal_time.time(), internal_duration.time);
|
||||||
|
|
||||||
|
// 5. Return ! CreateTemporalTime(result).
|
||||||
|
return MUST(create_temporal_time(vm, result));
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,5 +63,6 @@ String time_record_to_string(Time const&, SecondsStringPrecision::Precision);
|
||||||
i8 compare_time_record(Time const&, Time const&);
|
i8 compare_time_record(Time const&, Time const&);
|
||||||
Time add_time(Time const&, TimeDuration const& time_duration);
|
Time add_time(Time const&, TimeDuration const& time_duration);
|
||||||
Time round_time(Time const&, u64 increment, Unit, RoundingMode);
|
Time round_time(Time const&, u64 increment, Unit, RoundingMode);
|
||||||
|
ThrowCompletionOr<GC::Ref<PlainTime>> add_duration_to_time(VM&, ArithmeticOperation, PlainTime const&, Value temporal_duration_like);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,6 +35,8 @@ void PlainTimePrototype::initialize(Realm& realm)
|
||||||
define_native_accessor(realm, vm.names.nanosecond, nanosecond_getter, {}, Attribute::Configurable);
|
define_native_accessor(realm, vm.names.nanosecond, nanosecond_getter, {}, Attribute::Configurable);
|
||||||
|
|
||||||
u8 attr = Attribute::Writable | Attribute::Configurable;
|
u8 attr = Attribute::Writable | Attribute::Configurable;
|
||||||
|
define_native_function(realm, vm.names.add, add, 1, attr);
|
||||||
|
define_native_function(realm, vm.names.subtract, subtract, 1, attr);
|
||||||
define_native_function(realm, vm.names.toString, to_string, 0, attr);
|
define_native_function(realm, vm.names.toString, to_string, 0, attr);
|
||||||
define_native_function(realm, vm.names.toLocaleString, to_locale_string, 0, attr);
|
define_native_function(realm, vm.names.toLocaleString, to_locale_string, 0, attr);
|
||||||
define_native_function(realm, vm.names.toJSON, to_json, 0, attr);
|
define_native_function(realm, vm.names.toJSON, to_json, 0, attr);
|
||||||
|
@ -67,6 +69,32 @@ void PlainTimePrototype::initialize(Realm& realm)
|
||||||
JS_ENUMERATE_PLAIN_TIME_FIELDS
|
JS_ENUMERATE_PLAIN_TIME_FIELDS
|
||||||
#undef __JS_ENUMERATE
|
#undef __JS_ENUMERATE
|
||||||
|
|
||||||
|
// 4.3.9 Temporal.PlainTime.prototype.add ( temporalDurationLike ), https://tc39.es/proposal-temporal/#sec-temporal.plaintime.prototype.add
|
||||||
|
JS_DEFINE_NATIVE_FUNCTION(PlainTimePrototype::add)
|
||||||
|
{
|
||||||
|
auto temporal_duration_like = vm.argument(0);
|
||||||
|
|
||||||
|
// 1. Let temporalTime be the this value.
|
||||||
|
// 2. Perform ? RequireInternalSlot(temporalTime, [[InitializedTemporalTime]]).
|
||||||
|
auto temporal_time = TRY(typed_this_object(vm));
|
||||||
|
|
||||||
|
// 3. Return ? AddDurationToTime(ADD, temporalTime, temporalDurationLike).
|
||||||
|
return TRY(add_duration_to_time(vm, ArithmeticOperation::Add, temporal_time, temporal_duration_like));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 4.3.10 Temporal.PlainTime.prototype.subtract ( temporalDurationLike ), https://tc39.es/proposal-temporal/#sec-temporal.plaintime.prototype.subtract
|
||||||
|
JS_DEFINE_NATIVE_FUNCTION(PlainTimePrototype::subtract)
|
||||||
|
{
|
||||||
|
auto temporal_duration_like = vm.argument(0);
|
||||||
|
|
||||||
|
// 1. Let temporalTime be the this value.
|
||||||
|
// 2. Perform ? RequireInternalSlot(temporalTime, [[InitializedTemporalTime]]).
|
||||||
|
auto temporal_time = TRY(typed_this_object(vm));
|
||||||
|
|
||||||
|
// 3. Return ? AddDurationToTime(SUBTRACT, temporalTime, temporalDurationLike).
|
||||||
|
return TRY(add_duration_to_time(vm, ArithmeticOperation::Subtract, temporal_time, temporal_duration_like));
|
||||||
|
}
|
||||||
|
|
||||||
// 4.3.16 Temporal.PlainTime.prototype.toString ( [ options ] ), https://tc39.es/proposal-temporal/#sec-temporal.plaintime.prototype.tostring
|
// 4.3.16 Temporal.PlainTime.prototype.toString ( [ options ] ), https://tc39.es/proposal-temporal/#sec-temporal.plaintime.prototype.tostring
|
||||||
JS_DEFINE_NATIVE_FUNCTION(PlainTimePrototype::to_string)
|
JS_DEFINE_NATIVE_FUNCTION(PlainTimePrototype::to_string)
|
||||||
{
|
{
|
||||||
|
|
|
@ -29,6 +29,8 @@ private:
|
||||||
JS_DECLARE_NATIVE_FUNCTION(millisecond_getter);
|
JS_DECLARE_NATIVE_FUNCTION(millisecond_getter);
|
||||||
JS_DECLARE_NATIVE_FUNCTION(microsecond_getter);
|
JS_DECLARE_NATIVE_FUNCTION(microsecond_getter);
|
||||||
JS_DECLARE_NATIVE_FUNCTION(nanosecond_getter);
|
JS_DECLARE_NATIVE_FUNCTION(nanosecond_getter);
|
||||||
|
JS_DECLARE_NATIVE_FUNCTION(add);
|
||||||
|
JS_DECLARE_NATIVE_FUNCTION(subtract);
|
||||||
JS_DECLARE_NATIVE_FUNCTION(to_string);
|
JS_DECLARE_NATIVE_FUNCTION(to_string);
|
||||||
JS_DECLARE_NATIVE_FUNCTION(to_locale_string);
|
JS_DECLARE_NATIVE_FUNCTION(to_locale_string);
|
||||||
JS_DECLARE_NATIVE_FUNCTION(to_json);
|
JS_DECLARE_NATIVE_FUNCTION(to_json);
|
||||||
|
|
|
@ -0,0 +1,27 @@
|
||||||
|
describe("correct behavior", () => {
|
||||||
|
test("length is 1", () => {
|
||||||
|
expect(Temporal.PlainTime.prototype.add).toHaveLength(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("basic functionality", () => {
|
||||||
|
const plainTime = new Temporal.PlainTime(1, 1, 1, 1, 1, 1);
|
||||||
|
const duration = new Temporal.Duration(2021, 10, 1, 1, 0, 1, 2, 3, 4, 5);
|
||||||
|
const result = plainTime.add(duration);
|
||||||
|
expect(result.hour).toBe(1);
|
||||||
|
expect(result.minute).toBe(2);
|
||||||
|
expect(result.second).toBe(3);
|
||||||
|
expect(result.millisecond).toBe(4);
|
||||||
|
expect(result.microsecond).toBe(5);
|
||||||
|
expect(result.nanosecond).toBe(6);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("errors", () => {
|
||||||
|
test("invalid duration-like", () => {
|
||||||
|
const plainTime = new Temporal.PlainTime(1, 1, 1, 1, 1, 1);
|
||||||
|
const invalidDuration = { foo: 1, bar: 2 };
|
||||||
|
expect(() => {
|
||||||
|
plainTime.add(invalidDuration);
|
||||||
|
}).toThrowWithMessage(TypeError, "Invalid duration-like object");
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,27 @@
|
||||||
|
describe("correct behavior", () => {
|
||||||
|
test("length is 1", () => {
|
||||||
|
expect(Temporal.PlainTime.prototype.subtract).toHaveLength(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("basic functionality", () => {
|
||||||
|
const plainTime = new Temporal.PlainTime(1, 2, 3, 4, 5, 6);
|
||||||
|
const duration = new Temporal.Duration(2021, 10, 1, 1, 0, 1, 2, 3, 4, 5);
|
||||||
|
const result = plainTime.subtract(duration);
|
||||||
|
expect(result.hour).toBe(1);
|
||||||
|
expect(result.minute).toBe(1);
|
||||||
|
expect(result.second).toBe(1);
|
||||||
|
expect(result.millisecond).toBe(1);
|
||||||
|
expect(result.microsecond).toBe(1);
|
||||||
|
expect(result.nanosecond).toBe(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("errors", () => {
|
||||||
|
test("invalid duration-like", () => {
|
||||||
|
const plainTime = new Temporal.PlainTime(1, 1, 1, 1, 1, 1);
|
||||||
|
const invalidDuration = { foo: 1, bar: 2 };
|
||||||
|
expect(() => {
|
||||||
|
plainTime.subtract(invalidDuration);
|
||||||
|
}).toThrowWithMessage(TypeError, "Invalid duration-like object");
|
||||||
|
});
|
||||||
|
});
|
Loading…
Add table
Add a link
Reference in a new issue