RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:37:35 +00:00
Code Issues Activity Actions

LibJS: Store range format patterns in the Intl.DateTimeFormat object

Browse source 
Now that LibUnicode generates these patterns, the AO steps to retrieve
them may be implemented.
This commit is contained in:
Timothy Flynn 2021-12-08 19:56:25 -05:00 • committed by Linus Groh
parent 7a0d5e3f7a
commit 1f35eda37b
2 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.cpp
View file

@ -279,6 +279,7 @@ ThrowCompletionOr<DateTimeFormat*> initialize_date_time_format(GlobalObject& glo
}); });
String pattern; String pattern;
Vector<Unicode::CalendarRangePattern> range_patterns;
// 39. If dateTimeFormat.[[Hour]] is undefined, then // 39. If dateTimeFormat.[[Hour]] is undefined, then
if (!date_time_format.has_hour()) { if (!date_time_format.has_hour()) {
@ -288,8 +289,8 @@ ThrowCompletionOr<DateTimeFormat*> initialize_date_time_format(GlobalObject& glo
// b. Let pattern be bestFormat.[[pattern]]. // b. Let pattern be bestFormat.[[pattern]].
pattern = move(best_format->pattern); pattern = move(best_format->pattern);
// FIXME: Implement step c when range formats are parsed by LibUnicode.
// c. Let rangePatterns be bestFormat.[[rangePatterns]]. // c. Let rangePatterns be bestFormat.[[rangePatterns]].
range_patterns = Unicode::get_calendar_range_formats(data_locale, date_time_format.calendar(), best_format->skeleton);
} }
// 40. Else, // 40. Else,
else { else {
@ -336,8 +337,6 @@ ThrowCompletionOr<DateTimeFormat*> initialize_date_time_format(GlobalObject& glo
// e. Set dateTimeFormat.[[HourCycle]] to hc. // e. Set dateTimeFormat.[[HourCycle]] to hc.
date_time_format.set_hour_cycle(hour_cycle); date_time_format.set_hour_cycle(hour_cycle);
// FIXME: Implement steps f.ii and g.ii when range formats are parsed by LibUnicode.
// f. If dateTimeformat.[[HourCycle]] is "h11" or "h12", then // f. If dateTimeformat.[[HourCycle]] is "h11" or "h12", then
if ((hour_cycle == Unicode::HourCycle::H11) || (hour_cycle == Unicode::HourCycle::H12)) { if ((hour_cycle == Unicode::HourCycle::H11) || (hour_cycle == Unicode::HourCycle::H12)) {
// i. Let pattern be bestFormat.[[pattern12]]. // i. Let pattern be bestFormat.[[pattern12]].
@ -350,6 +349,7 @@ ThrowCompletionOr<DateTimeFormat*> initialize_date_time_format(GlobalObject& glo
} }
// ii. Let rangePatterns be bestFormat.[[rangePatterns12]]. // ii. Let rangePatterns be bestFormat.[[rangePatterns12]].
range_patterns = Unicode::get_calendar_range12_formats(data_locale, date_time_format.calendar(), best_format->skeleton);
} }
// g. Else, // g. Else,
else { else {
@ -357,14 +357,15 @@ ThrowCompletionOr<DateTimeFormat*> initialize_date_time_format(GlobalObject& glo
pattern = move(best_format->pattern); pattern = move(best_format->pattern);
// ii. Let rangePatterns be bestFormat.[[rangePatterns]]. // ii. Let rangePatterns be bestFormat.[[rangePatterns]].
range_patterns = Unicode::get_calendar_range_formats(data_locale, date_time_format.calendar(), best_format->skeleton);
} }
} }
// 41. Set dateTimeFormat.[[Pattern]] to pattern. // 41. Set dateTimeFormat.[[Pattern]] to pattern.
date_time_format.set_pattern(move(pattern)); date_time_format.set_pattern(move(pattern));
// FIXME: Implement step 42 when range formats are parsed by LibUnicode.
// 42. Set dateTimeFormat.[[RangePatterns]] to rangePatterns. // 42. Set dateTimeFormat.[[RangePatterns]] to rangePatterns.
date_time_format.set_range_patterns(move(range_patterns));
// 43. Return dateTimeFormat. // 43. Return dateTimeFormat.
return &date_time_format; return &date_time_format;
@ -539,11 +540,10 @@ Optional<Unicode::CalendarPattern> date_time_style_format(StringView data_locale
format.pattern12 = move(pattern12); format.pattern12 = move(pattern12);
} }
// FIXME: Implement steps h-j when range formats are parsed by LibUnicode. // NOTE: Our implementation of steps h-j differ from the spec. LibUnicode does not attach range patterns to the
// h. Let dateTimeRangeFormat be styles.[[DateTimeRangeFormat]].[[<dateStyle>]].[[<timeStyle>]]. // format pattern; rather, lookups for range patterns are performed separately based on the format pattern's
// i. Set format.[[rangePatterns]] to dateTimeRangeFormat.[[rangePatterns]]. // skeleton. So we form a new skeleton here and defer the range pattern lookups.
// j. If dateTimeRangeFormat has a [[rangePatterns12]] field, then format.skeleton = Unicode::combine_skeletons(date_format.skeleton, time_format.skeleton);
// i. Set format.[[rangePatterns12]] to dateTimeRangeFormat.[[rangePatterns12]].
// k. Return format. // k. Return format.
return format; return format;

20
Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.h
View file

@ -79,6 +79,9 @@ public:
String const& pattern() const { return Patterns::pattern; }; String const& pattern() const { return Patterns::pattern; };
void set_pattern(String pattern) { Patterns::pattern = move(pattern); } void set_pattern(String pattern) { Patterns::pattern = move(pattern); }
Span<Unicode::CalendarRangePattern const> range_patterns() const { return m_range_patterns.span(); };
void set_range_patterns(Vector<Unicode::CalendarRangePattern> range_patterns) { m_range_patterns = move(range_patterns); }
bool has_era() const { return Patterns::era.has_value(); } bool has_era() const { return Patterns::era.has_value(); }
Unicode::CalendarPatternStyle era() const { return *Patterns::era; }; Unicode::CalendarPatternStyle era() const { return *Patterns::era; };
StringView era_string() const { return Unicode::calendar_pattern_style_to_string(*Patterns::era); } StringView era_string() const { return Unicode::calendar_pattern_style_to_string(*Patterns::era); }
@ -131,14 +134,15 @@ private:
virtual void visit_edges(Visitor&) override; virtual void visit_edges(Visitor&) override;
String m_locale; // [[Locale]] String m_locale; // [[Locale]]
String m_calendar; // [[Calendar]] String m_calendar; // [[Calendar]]
String m_numbering_system; // [[NumberingSystem]] String m_numbering_system; // [[NumberingSystem]]
Optional<Unicode::HourCycle> m_hour_cycle; // [[HourCycle]] Optional<Unicode::HourCycle> m_hour_cycle; // [[HourCycle]]
String m_time_zone; // [[TimeZone]] String m_time_zone; // [[TimeZone]]
Optional<Style> m_date_style; // [[DateStyle]] Optional<Style> m_date_style; // [[DateStyle]]
Optional<Style> m_time_style; // [[TimeStyle]] Optional<Style> m_time_style; // [[TimeStyle]]
NativeFunction* m_bound_format { nullptr }; // [[BoundFormat]] Vector<Unicode::CalendarRangePattern> m_range_patterns; // [[RangePatterns]]
NativeFunction* m_bound_format { nullptr }; // [[BoundFormat]]
String m_data_locale; String m_data_locale;
}; };