mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 06:37:43 +00:00
LibJS: Implement parsing of TemporalInstantString
This commit is contained in:
parent
79a18b058f
commit
783222f87a
5 changed files with 42 additions and 5 deletions
|
@ -215,6 +215,7 @@
|
||||||
M(TemporalInvalidDurationPropertyValueNonIntegral, "Invalid value for duration property '{}': must be an integer, got {}") \
|
M(TemporalInvalidDurationPropertyValueNonIntegral, "Invalid value for duration property '{}': must be an integer, got {}") \
|
||||||
M(TemporalInvalidDurationPropertyValueNonZero, "Invalid value for duration property '{}': must be zero, got {}") \
|
M(TemporalInvalidDurationPropertyValueNonZero, "Invalid value for duration property '{}': must be zero, got {}") \
|
||||||
M(TemporalInvalidEpochNanoseconds, "Invalid epoch nanoseconds value, must be in range -86400 * 10^17 to 86400 * 10^17") \
|
M(TemporalInvalidEpochNanoseconds, "Invalid epoch nanoseconds value, must be in range -86400 * 10^17 to 86400 * 10^17") \
|
||||||
|
M(TemporalInvalidInstantString, "Invalid instant string '{}'") \
|
||||||
M(TemporalInvalidISODate, "Invalid ISO date") \
|
M(TemporalInvalidISODate, "Invalid ISO date") \
|
||||||
M(TemporalInvalidMonthCode, "Invalid month code") \
|
M(TemporalInvalidMonthCode, "Invalid month code") \
|
||||||
M(TemporalInvalidMonthDayString, "Invalid month day string '{}'") \
|
M(TemporalInvalidMonthDayString, "Invalid month day string '{}'") \
|
||||||
|
|
|
@ -1161,14 +1161,19 @@ ThrowCompletionOr<ISODateTime> parse_iso_date_time(GlobalObject& global_object,
|
||||||
// 13.35 ParseTemporalInstantString ( isoString ), https://tc39.es/proposal-temporal/#sec-temporal-parsetemporalinstantstring
|
// 13.35 ParseTemporalInstantString ( isoString ), https://tc39.es/proposal-temporal/#sec-temporal-parsetemporalinstantstring
|
||||||
ThrowCompletionOr<TemporalInstant> parse_temporal_instant_string(GlobalObject& global_object, String const& iso_string)
|
ThrowCompletionOr<TemporalInstant> parse_temporal_instant_string(GlobalObject& global_object, String const& iso_string)
|
||||||
{
|
{
|
||||||
|
auto& vm = global_object.vm();
|
||||||
|
|
||||||
// 1. Assert: Type(isoString) is String.
|
// 1. Assert: Type(isoString) is String.
|
||||||
|
|
||||||
// 2. If isoString does not satisfy the syntax of a TemporalInstantString (see 13.33), then
|
// 2. If isoString does not satisfy the syntax of a TemporalInstantString (see 13.33), then
|
||||||
// a. Throw a RangeError exception.
|
auto parse_result = parse_iso8601(Production::TemporalInstantString, iso_string);
|
||||||
// TODO
|
if (!parse_result.has_value()) {
|
||||||
|
// a. Throw a RangeError exception.
|
||||||
|
return vm.throw_completion<RangeError>(global_object, ErrorType::TemporalInvalidInstantString, iso_string);
|
||||||
|
}
|
||||||
|
|
||||||
// 3. Let result be ! ParseISODateTime(isoString).
|
// 3. Let result be ! ParseISODateTime(isoString).
|
||||||
auto result = MUST(parse_iso_date_time(global_object, {}));
|
auto result = MUST(parse_iso_date_time(global_object, *parse_result));
|
||||||
|
|
||||||
// 4. Let timeZoneResult be ? ParseTemporalTimeZoneString(isoString).
|
// 4. Let timeZoneResult be ? ParseTemporalTimeZoneString(isoString).
|
||||||
auto time_zone_result = TRY(parse_temporal_time_zone_string(global_object, iso_string));
|
auto time_zone_result = TRY(parse_temporal_time_zone_string(global_object, iso_string));
|
||||||
|
|
|
@ -746,6 +746,27 @@ bool ISO8601Parser::parse_calendar_date_time()
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// https://tc39.es/proposal-temporal/#prod-TemporalInstantString
|
||||||
|
bool ISO8601Parser::parse_temporal_instant_string()
|
||||||
|
{
|
||||||
|
// TemporalInstantString :
|
||||||
|
// Date TimeZoneOffsetRequired
|
||||||
|
// Date DateTimeSeparator TimeSpec TimeZoneOffsetRequired
|
||||||
|
StateTransaction transaction { *this };
|
||||||
|
if (!parse_date())
|
||||||
|
return false;
|
||||||
|
if (!parse_time_zone_offset_required()) {
|
||||||
|
if (!parse_date_time_separator())
|
||||||
|
return false;
|
||||||
|
if (!parse_time_spec())
|
||||||
|
return false;
|
||||||
|
if (!parse_time_zone_offset_required())
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
transaction.commit();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
// https://tc39.es/proposal-temporal/#prod-TemporalDateString
|
// https://tc39.es/proposal-temporal/#prod-TemporalDateString
|
||||||
bool ISO8601Parser::parse_temporal_date_string()
|
bool ISO8601Parser::parse_temporal_date_string()
|
||||||
{
|
{
|
||||||
|
@ -874,6 +895,7 @@ bool ISO8601Parser::parse_temporal_relative_to_string()
|
||||||
}
|
}
|
||||||
|
|
||||||
#define JS_ENUMERATE_ISO8601_PRODUCTION_PARSERS \
|
#define JS_ENUMERATE_ISO8601_PRODUCTION_PARSERS \
|
||||||
|
__JS_ENUMERATE(TemporalInstantString, parse_temporal_instant_string) \
|
||||||
__JS_ENUMERATE(TemporalDateString, parse_temporal_date_string) \
|
__JS_ENUMERATE(TemporalDateString, parse_temporal_date_string) \
|
||||||
__JS_ENUMERATE(TemporalDateTimeString, parse_temporal_date_time_string) \
|
__JS_ENUMERATE(TemporalDateTimeString, parse_temporal_date_time_string) \
|
||||||
__JS_ENUMERATE(TemporalMonthDayString, parse_temporal_month_day_string) \
|
__JS_ENUMERATE(TemporalMonthDayString, parse_temporal_month_day_string) \
|
||||||
|
|
|
@ -33,6 +33,7 @@ struct ParseResult {
|
||||||
};
|
};
|
||||||
|
|
||||||
enum class Production {
|
enum class Production {
|
||||||
|
TemporalInstantString,
|
||||||
TemporalDateString,
|
TemporalDateString,
|
||||||
TemporalDateTimeString,
|
TemporalDateTimeString,
|
||||||
TemporalMonthDayString,
|
TemporalMonthDayString,
|
||||||
|
@ -106,6 +107,7 @@ public:
|
||||||
[[nodiscard]] bool parse_time_spec_separator();
|
[[nodiscard]] bool parse_time_spec_separator();
|
||||||
[[nodiscard]] bool parse_date_time();
|
[[nodiscard]] bool parse_date_time();
|
||||||
[[nodiscard]] bool parse_calendar_date_time();
|
[[nodiscard]] bool parse_calendar_date_time();
|
||||||
|
[[nodiscard]] bool parse_temporal_instant_string();
|
||||||
[[nodiscard]] bool parse_temporal_date_string();
|
[[nodiscard]] bool parse_temporal_date_string();
|
||||||
[[nodiscard]] bool parse_temporal_date_time_string();
|
[[nodiscard]] bool parse_temporal_date_time_string();
|
||||||
[[nodiscard]] bool parse_temporal_month_day_string();
|
[[nodiscard]] bool parse_temporal_month_day_string();
|
||||||
|
|
|
@ -14,10 +14,17 @@ describe("correct behavior", () => {
|
||||||
expect(Temporal.Instant.from(zonedDateTime).epochNanoseconds).toBe(123n);
|
expect(Temporal.Instant.from(zonedDateTime).epochNanoseconds).toBe(123n);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Un-skip once ParseISODateTime & ParseTemporalTimeZoneString are implemented
|
test("Instant string argument", () => {
|
||||||
test.skip("Instant string argument", () => {
|
|
||||||
expect(Temporal.Instant.from("1975-02-02T14:25:36.123456789Z").epochNanoseconds).toBe(
|
expect(Temporal.Instant.from("1975-02-02T14:25:36.123456789Z").epochNanoseconds).toBe(
|
||||||
160583136123456789n
|
160583136123456789n
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe("errors", () => {
|
||||||
|
test("invalid instant string", () => {
|
||||||
|
expect(() => {
|
||||||
|
Temporal.Instant.from("foo");
|
||||||
|
}).toThrowWithMessage(RangeError, "Invalid instant string 'foo'");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue