Skip to content

V
V8
Commit 69608fc7 authored by Frank Tang's avatar Frank Tang Committed by V8 LUCI CQ
Browse files
Options

[Temporal] Sync Parser to pull/1950 

Sync the parser to grammar change in
https://github.com/tc39/proposal-temporal/pull/1950

Bug: v8:11544
Change-Id: I57e9f9c2bd234f930cc06dd730ad4ccf77d239d0
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3313966Reviewed-by: 's avatarShu-yu Guo <syg@chromium.org>
Commit-Queue: Frank Tang <ftang@chromium.org>
Cr-Commit-Position: refs/heads/main@{#78233}
parent 9ec5be7d
Hide whitespace changes
Inline Side-by-side
Showing with 137 additions and 100 deletions
src/temporal/temporal-parser.cc
View file @ 69608fc7
......@@ -644,12 +644,69 @@ int32_t ScanTimeZoneNameRequired(base::Vector<Char> str, int32_t s,
SCAN_EITHER_FORWARD(TimeZone, TimeZoneOffsetRequired, TimeZoneNameRequired,
ParsedISO8601Result)
// Time: TimeSpec [TimeZone]
// CalendarNameComponent:
// CalChar {3,8}
template <typename Char>
int32_t ScanTime(base::Vector<Char> str, int32_t s, ParsedISO8601Result* r) {
int32_t len = ScanTimeSpec(str, s, r);
int32_t ScanCalendarNameComponent(base::Vector<Char> str, int32_t s) {
int32_t cur = s;
while ((cur < str.length()) && IsAlphaNumeric(str[cur])) cur++;
if ((cur - s) < 3 || (cur - s) > 8) return 0;
return (cur - s);
}
// CalendarNameTail :
// CalendarNameComponent
// CalendarNameComponent - CalendarNameTail
// CalendarName :
// CalendarNameTail
// The spec text use tail recusion with CalendarNameComponent and
// CalendarNameTail. In our implementation, we use an iteration loop instead.
template <typename Char>
int32_t ScanCalendarName(base::Vector<Char> str, int32_t s,
ParsedISO8601Result* r) {
int32_t cur = s;
int32_t len;
if ((len = ScanCalendarNameComponent(str, cur)) == 0) return 0;
cur += len;
while ((str.length() > (cur + 1)) && (str[cur++] == '-')) {
if ((len = ScanCalendarNameComponent(str, cur)) == 0) return 0;
// CalendarNameComponent - CalendarName
cur += len;
}
r->calendar_name_start = s;
r->calendar_name_length = cur - s;
return cur - s;
}
// Calendar: '[u-ca=' CalendarName ']'
template <typename Char>
int32_t ScanCalendar(base::Vector<Char> str, int32_t s,
ParsedISO8601Result* r) {
if (str.length() < (s + 7)) return 0;
int32_t cur = s;
// "[u-ca="
if ((str[cur++] != '[') || (str[cur++] != 'u') || (str[cur++] != '-') ||
(str[cur++] != 'c') || (str[cur++] != 'a') || (str[cur++] != '=')) {
return 0;
}
int32_t len = ScanCalendarName(str, cur, r);
if (len == 0) return 0;
return len + ScanTimeZone(str, s, r);
if ((str.length() < (cur + len + 1)) || (str[cur + len] != ']')) {
return 0;
}
return 6 + len + 1;
}
// CalendarTime: TimeSpec [TimeZone] [Calendar]
template <typename Char>
int32_t ScanCalendarTime(base::Vector<Char> str, int32_t s,
ParsedISO8601Result* r) {
int32_t cur = s;
cur += ScanTimeSpec(str, cur, r);
if (cur - s == 0) return 0;
cur += ScanTimeZone(str, cur, r);
cur += ScanCalendar(str, cur, r);
return cur - s;
}
// DateTime: Date [TimeSpecSeparator][TimeZone]
......@@ -707,59 +764,6 @@ int32_t ScanDateSpecMonthDay(base::Vector<Char> str, int32_t s,
return cur + len - s;
}
// CalendarNameComponent:
// CalChar {3,8}
template <typename Char>
int32_t ScanCalendarNameComponent(base::Vector<Char> str, int32_t s) {
int32_t cur = s;
while ((cur < str.length()) && IsAlphaNumeric(str[cur])) cur++;
if ((cur - s) < 3 || (cur - s) > 8) return 0;
return (cur - s);
}
// CalendarNameTail :
// CalendarNameComponent
// CalendarNameComponent - CalendarNameTail
// CalendarName :
// CalendarNameTail
// The spec text use tail recusion with CalendarNameComponent and
// CalendarNameTail. In our implementation, we use an iteration loop instead.
template <typename Char>
int32_t ScanCalendarName(base::Vector<Char> str, int32_t s,
ParsedISO8601Result* r) {
int32_t cur = s;
int32_t len;
if ((len = ScanCalendarNameComponent(str, cur)) == 0) return 0;
cur += len;
while ((str.length() > (cur + 1)) && (str[cur++] == '-')) {
if ((len = ScanCalendarNameComponent(str, cur)) == 0) return 0;
// CalendarNameComponent - CalendarName
cur += len;
}
r->calendar_name_start = s;
r->calendar_name_length = cur - s;
return cur - s;
}
// Calendar: '[u-ca=' CalendarName ']'
template <typename Char>
int32_t ScanCalendar(base::Vector<Char> str, int32_t s,
ParsedISO8601Result* r) {
if (str.length() < (s + 7)) return 0;
int32_t cur = s;
// "[u-ca="
if ((str[cur++] != '[') || (str[cur++] != 'u') || (str[cur++] != '-') ||
(str[cur++] != 'c') || (str[cur++] != 'a') || (str[cur++] != '=')) {
return 0;
}
int32_t len = ScanCalendarName(str, cur, r);
if (len == 0) return 0;
if ((str.length() < (cur + len + 1)) || (str[cur + len] != ']')) {
return 0;
}
return 6 + len + 1;
}
// TemporalTimeZoneIdentifier:
// TimeZoneNumericUTCOffset
// TimeZoneIANAName
......@@ -831,23 +835,24 @@ SCAN_EITHER_FORWARD(TemporalTimeZoneString, TemporalTimeZoneIdentifier,
ParsedISO8601Result)
// TemporalTimeString
// Time
// DateTime
// CalendarTime
// CalendarDateTime
// The lookahead is at most 7 chars.
SCAN_EITHER_FORWARD(TemporalTimeString, Time, DateTime, ParsedISO8601Result)
SCAN_EITHER_FORWARD(TemporalTimeString, CalendarTime, CalendarDateTime,
ParsedISO8601Result)
// TemporalYearMonthString:
// DateSpecYearMonth
// DateTime
// CalendarDateTime
// The lookahead is at most 11 chars.
SCAN_EITHER_FORWARD(TemporalYearMonthString, DateSpecYearMonth, DateTime,
ParsedISO8601Result)
SCAN_EITHER_FORWARD(TemporalYearMonthString, DateSpecYearMonth,
CalendarDateTime, ParsedISO8601Result)
// TemporalMonthDayString
// DateSpecMonthDay
// DateTime
// CalendarDateTime
// The lookahead is at most 5 chars.
SCAN_EITHER_FORWARD(TemporalMonthDayString, DateSpecMonthDay, DateTime,
SCAN_EITHER_FORWARD(TemporalMonthDayString, DateSpecMonthDay, CalendarDateTime,
ParsedISO8601Result)
// TemporalRelativeToString:
......@@ -916,15 +921,17 @@ int32_t ScanTemporalInstantString(base::Vector<Char> str, int32_t s,
SATISIFY(TemporalDateTimeString, ParsedISO8601Result)
SATISIFY(TemporalDateString, ParsedISO8601Result)
SATISIFY(Time, ParsedISO8601Result)
SATISIFY(CalendarTime, ParsedISO8601Result)
SATISIFY(DateTime, ParsedISO8601Result)
SATISIFY(DateSpecYearMonth, ParsedISO8601Result)
SATISIFY(DateSpecMonthDay, ParsedISO8601Result)
SATISIFY(Date_TimeSpecSeparator_TimeZone_Calendar, ParsedISO8601Result)
SATISIFY_EITHER(TemporalTimeString, Time, DateTime, ParsedISO8601Result)
SATISIFY_EITHER(TemporalYearMonthString, DateSpecYearMonth, DateTime,
SATISIFY(CalendarDateTime, ParsedISO8601Result)
SATISIFY_EITHER(TemporalTimeString, CalendarTime, CalendarDateTime,
ParsedISO8601Result)
SATISIFY_EITHER(TemporalYearMonthString, DateSpecYearMonth, CalendarDateTime,
ParsedISO8601Result)
SATISIFY_EITHER(TemporalMonthDayString, DateSpecMonthDay, DateTime,
SATISIFY_EITHER(TemporalMonthDayString, DateSpecMonthDay, CalendarDateTime,
ParsedISO8601Result)
SATISIFY(TimeZoneNumericUTCOffset, ParsedISO8601Result)
SATISIFY(TimeZoneIANAName, ParsedISO8601Result)
......@@ -939,7 +946,6 @@ SATISIFY_EITHER(TemporalRelativeToString, TemporalDateTimeString,
TemporalZonedDateTimeString, ParsedISO8601Result)
SATISIFY(CalendarName, ParsedISO8601Result)
SATISIFY(CalendarDateTime, ParsedISO8601Result)
template <typename Char>
bool SatisfyTemporalCalendarString(base::Vector<Char> str,
......@@ -947,7 +953,7 @@ bool SatisfyTemporalCalendarString(base::Vector<Char> str,
IF_SATISFY_RETURN(CalendarName)
IF_SATISFY_RETURN(TemporalInstantString)
IF_SATISFY_RETURN(CalendarDateTime)
IF_SATISFY_RETURN(Time)
IF_SATISFY_RETURN(CalendarTime)
IF_SATISFY_RETURN(DateSpecYearMonth)
IF_SATISFY_RETURN(DateSpecMonthDay)
return false;
......
test/cctest/test-temporal-parser.cc
View file @ 69608fc7
......@@ -753,6 +753,65 @@ TEST(TemporalTimeStringSuccess) {
VerifyParseTemporalTimeStringSuccess(
isolate, "2021-11-09 01:23:45.678912345Z", 1, 23, 45, 678912345, "");
VerifyParseTemporalTimeStringSuccess(isolate, "2021-03-11[u-ca=iso8601]",
kUndefined, kUndefined, kUndefined,
kUndefined, "iso8601");
VerifyParseTemporalTimeStringSuccess(
isolate, "2021-03-11[u-ca=abcdefgh-wxyzefg]", kUndefined, kUndefined,
kUndefined, kUndefined, "abcdefgh-wxyzefg");
VerifyParseTemporalTimeStringSuccess(
isolate, "2021-03-11[u-ca=abcdefgh-wxyzefg-ijklmnop]", kUndefined,
kUndefined, kUndefined, kUndefined, "abcdefgh-wxyzefg-ijklmnop");
VerifyParseTemporalTimeStringSuccess(isolate, "2021-03-11T01[u-ca=iso8601]",
1, kUndefined, kUndefined, kUndefined,
"iso8601");
VerifyParseTemporalTimeStringSuccess(
isolate, "2021-03-11 02:34[u-ca=abcdefgh-wxyzefg]", 2, 34, kUndefined,
kUndefined, "abcdefgh-wxyzefg");
VerifyParseTemporalTimeStringSuccess(
isolate,
"2021-11-03 "
"123456.789-012345.789123456[aBcDEfGHiJ.L_N/"
"ABCbcdGfIJKLMN][u-ca=abc]",
12, 34, 56, 789000000, "abc");
VerifyParseTemporalTimeStringSuccess(
isolate, "2021-03-11[+12:34:56,789123456][u-ca=abcdefgh-wxyzefg]",
kUndefined, kUndefined, kUndefined, kUndefined, "abcdefgh-wxyzefg");
VerifyParseTemporalTimeStringSuccess(
isolate, "2021-03-11T23[+12:34:56,789123456][u-ca=abcdefgh-wxyzefg]", 23,
kUndefined, kUndefined, kUndefined, "abcdefgh-wxyzefg");
VerifyParseTemporalTimeStringSuccess(
isolate,
u8"20210311[\u221200:34:56.789123456][u-ca=abcdefgh-wxyzefg-ijklmnop]",
kUndefined, kUndefined, kUndefined, kUndefined,
"abcdefgh-wxyzefg-ijklmnop");
VerifyParseTemporalTimeStringSuccess(
isolate,
u8"20210311T22:11[\u221200:34:56.789123456][u-ca=abcdefgh-"
u8"wxyzefg-ijklmnop]",
22, 11, kUndefined, kUndefined, "abcdefgh-wxyzefg-ijklmnop");
VerifyParseTemporalTimeStringSuccess(isolate, "2021-11-03[u-ca=abc]",
kUndefined, kUndefined, kUndefined,
kUndefined, "abc");
VerifyParseTemporalTimeStringSuccess(isolate,
"2021-11-03T23:45:12.345[u-ca=abc]", 23,
45, 12, 345000000, "abc");
VerifyParseTemporalTimeStringSuccess(isolate, "2021-11-03[u-ca=iso-8601]",
kUndefined, kUndefined, kUndefined,
kUndefined, "iso-8601");
VerifyParseTemporalTimeStringSuccess(isolate,
"2021-11-03 234527[u-ca=iso-8601]", 23,
45, 27, kUndefined, "iso-8601");
VerifyParseTemporalTimeStringSuccess(isolate, "2021-11-03[u-ca=123456-789]",
kUndefined, kUndefined, kUndefined,
kUndefined, "123456-789");
VerifyParseTemporalTimeStringSuccess(
isolate, "2021-11-03t12[u-ca=123456-789]", 12, kUndefined, kUndefined,
kUndefined, "123456-789");
}
TEST(TemporalTimeStringIllegal) {
......@@ -761,37 +820,9 @@ TEST(TemporalTimeStringIllegal) {
v8::HandleScope scope(CcTest::isolate());
VERIFY_PARSE_FAIL_ON_DATE(TemporalTimeString);
VERIFY_PARSE_FAIL(TemporalTimeString, "");
VERIFY_PARSE_FAIL(TemporalTimeString, "2021-03-11[u-ca=iso8601]");
VERIFY_PARSE_FAIL(TemporalTimeString, "2021-03-11[u-ca=abcdefgh-wxyzefg]");
VERIFY_PARSE_FAIL(TemporalTimeString,
"2021-03-11[u-ca=abcdefgh-wxyzefg-ijklmnop]");
VERIFY_PARSE_FAIL(TemporalTimeString, "2021-03-11T01[u-ca=iso8601]");
VERIFY_PARSE_FAIL(TemporalTimeString,
"2021-03-11 02:34[u-ca=abcdefgh-wxyzefg]");
VERIFY_PARSE_FAIL(TemporalTimeString,
"2021-03-11t03:45.67[u-ca=abcdefgh-wxyzefg-ijklmnop]");
VERIFY_PARSE_FAIL(TemporalTimeString,
"2021-11-03 "
"123456.789-012345.789123456[aBcDEfGHiJ.L_N/"
"ABCbcdGfIJKLMN][u-ca=abc]");
VERIFY_PARSE_FAIL(TemporalTimeString,
"2021-03-11[+12:34:56,789123456][u-ca=abcdefgh-wxyzefg]");
VERIFY_PARSE_FAIL(
TemporalTimeString,
"2021-03-11T23[+12:34:56,789123456][u-ca=abcdefgh-wxyzefg]");
VERIFY_PARSE_FAIL(
TemporalTimeString,
u8"20210311[\u221200:34:56.789123456][u-ca=abcdefgh-wxyzefg-ijklmnop]");
VERIFY_PARSE_FAIL(TemporalTimeString,
u8"20210311T22:11[\u221200:34:56.789123456][u-ca=abcdefgh-"
u8"wxyzefg-ijklmnop]");
VERIFY_PARSE_FAIL(TemporalTimeString, "2021-11-03[u-ca=abc]");
VERIFY_PARSE_FAIL(TemporalTimeString, "2021-11-03T23:45:12.345[u-ca=abc]");
VERIFY_PARSE_FAIL(TemporalTimeString, "2021-11-03[u-ca=iso-8601]");
VERIFY_PARSE_FAIL(TemporalTimeString, "2021-11-03 234527[u-ca=iso-8601]");
VERIFY_PARSE_FAIL(TemporalTimeString, "2021-11-03[u-ca=123456-789]");
VERIFY_PARSE_FAIL(TemporalTimeString, "2021-11-03t12[u-ca=123456-789]");
// Single digit Hour
VERIFY_PARSE_FAIL(TemporalTimeString, "0");
VERIFY_PARSE_FAIL(TemporalTimeString, "9");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment