mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 21:57:34 +00:00
LibJS: Change Intl.Locale info APIs from property getters to methods
This is a normative change in the Intl Locale Info spec. See:
e550152
This commit is contained in:
Timothy Flynn
Andreas Kling
parent
a357874c77
commit
1d76738dde
14 changed files with 191 additions and 185 deletions
|
|
@ -93,7 +93,6 @@ namespace JS {
|
|||
P(byteOffset) \
|
||||
P(calendar) \
|
||||
P(calendarName) \
|
||||
P(calendars) \
|
||||
P(call) \
|
||||
P(callee) \
|
||||
P(caller) \
|
||||
|
|
@ -108,7 +107,6 @@ namespace JS {
|
|||
P(clz32) \
|
||||
P(codePointAt) \
|
||||
P(collation) \
|
||||
P(collations) \
|
||||
P(compactDisplay) \
|
||||
P(compareExchange) \
|
||||
P(compile) \
|
||||
|
|
@ -222,12 +220,15 @@ namespace JS {
|
|||
P(get) \
|
||||
P(getBigInt64) \
|
||||
P(getBigUint64) \
|
||||
P(getCalendars) \
|
||||
P(getCanonicalLocales) \
|
||||
P(getCollations) \
|
||||
P(getDate) \
|
||||
P(getDay) \
|
||||
P(getFloat32) \
|
||||
P(getFloat64) \
|
||||
P(getFullYear) \
|
||||
P(getHourCycles) \
|
||||
P(getHours) \
|
||||
P(getInstantFor) \
|
||||
P(getInt8) \
|
||||
|
|
@ -238,6 +239,7 @@ namespace JS {
|
|||
P(getMinutes) \
|
||||
P(getMonth) \
|
||||
P(getNextTransition) \
|
||||
P(getNumberingSystems) \
|
||||
P(getOffsetNanosecondsFor) \
|
||||
P(getOffsetStringFor) \
|
||||
P(getOwnPropertyDescriptor) \
|
||||
|
|
@ -249,8 +251,10 @@ namespace JS {
|
|||
P(getPreviousTransition) \
|
||||
P(getPrototypeOf) \
|
||||
P(getSeconds) \
|
||||
P(getTextInfo) \
|
||||
P(getTime) \
|
||||
P(getTimezoneOffset) \
|
||||
P(getTimeZones) \
|
||||
P(getUint8) \
|
||||
P(getUint16) \
|
||||
P(getUint32) \
|
||||
|
|
@ -262,6 +266,7 @@ namespace JS {
|
|||
P(getUTCMinutes) \
|
||||
P(getUTCMonth) \
|
||||
P(getUTCSeconds) \
|
||||
P(getWeekInfo) \
|
||||
P(getYear) \
|
||||
P(global) \
|
||||
P(globalThis) \
|
||||
|
|
@ -278,7 +283,6 @@ namespace JS {
|
|||
P(hour) \
|
||||
P(hour12) \
|
||||
P(hourCycle) \
|
||||
P(hourCycles) \
|
||||
P(hours) \
|
||||
P(hoursDisplay) \
|
||||
P(hoursInDay) \
|
||||
|
|
@ -385,7 +389,6 @@ namespace JS {
|
|||
P(notation) \
|
||||
P(now) \
|
||||
P(numberingSystem) \
|
||||
P(numberingSystems) \
|
||||
P(numeric) \
|
||||
P(of) \
|
||||
P(offset) \
|
||||
|
|
@ -507,7 +510,6 @@ namespace JS {
|
|||
P(tan) \
|
||||
P(tanh) \
|
||||
P(test) \
|
||||
P(textInfo) \
|
||||
P(then) \
|
||||
P(time) \
|
||||
P(timeEnd) \
|
||||
|
|
@ -515,7 +517,6 @@ namespace JS {
|
|||
P(timeStyle) \
|
||||
P(timeZone) \
|
||||
P(timeZoneName) \
|
||||
P(timeZones) \
|
||||
P(toArray) \
|
||||
P(toDateString) \
|
||||
P(toExponential) \
|
||||
|
|
@ -575,7 +576,6 @@ namespace JS {
|
|||
P(valueOf) \
|
||||
P(values) \
|
||||
P(warn) \
|
||||
P(weekInfo) \
|
||||
P(weekOfYear) \
|
||||
P(weekday) \
|
||||
P(weekend) \
|
||||
|
|
|
|||
|
|
@ -29,28 +29,28 @@ void LocalePrototype::initialize(Realm& realm)
|
|||
define_native_function(realm, vm.names.maximize, maximize, 0, attr);
|
||||
define_native_function(realm, vm.names.minimize, minimize, 0, attr);
|
||||
define_native_function(realm, vm.names.toString, to_string, 0, attr);
|
||||
define_native_function(realm, vm.names.getCalendars, get_calendars, 0, attr);
|
||||
define_native_function(realm, vm.names.getCollations, get_collations, 0, attr);
|
||||
define_native_function(realm, vm.names.getHourCycles, get_hour_cycles, 0, attr);
|
||||
define_native_function(realm, vm.names.getNumberingSystems, get_numbering_systems, 0, attr);
|
||||
define_native_function(realm, vm.names.getTimeZones, get_time_zones, 0, attr);
|
||||
define_native_function(realm, vm.names.getTextInfo, get_text_info, 0, attr);
|
||||
define_native_function(realm, vm.names.getWeekInfo, get_week_info, 0, attr);
|
||||
|
||||
// 14.3.2 Intl.Locale.prototype[ @@toStringTag ], https://tc39.es/ecma402/#sec-Intl.Locale.prototype-@@tostringtag
|
||||
define_direct_property(vm.well_known_symbol_to_string_tag(), PrimitiveString::create(vm, "Intl.Locale"_string), Attribute::Configurable);
|
||||
|
||||
define_native_accessor(realm, vm.names.baseName, base_name, {}, Attribute::Configurable);
|
||||
define_native_accessor(realm, vm.names.calendar, calendar, {}, Attribute::Configurable);
|
||||
define_native_accessor(realm, vm.names.calendars, calendars, {}, Attribute::Configurable);
|
||||
define_native_accessor(realm, vm.names.caseFirst, case_first, {}, Attribute::Configurable);
|
||||
define_native_accessor(realm, vm.names.collation, collation, {}, Attribute::Configurable);
|
||||
define_native_accessor(realm, vm.names.collations, collations, {}, Attribute::Configurable);
|
||||
define_native_accessor(realm, vm.names.firstDayOfWeek, first_day_of_week, {}, Attribute::Configurable);
|
||||
define_native_accessor(realm, vm.names.hourCycle, hour_cycle, {}, Attribute::Configurable);
|
||||
define_native_accessor(realm, vm.names.hourCycles, hour_cycles, {}, Attribute::Configurable);
|
||||
define_native_accessor(realm, vm.names.numberingSystem, numbering_system, {}, Attribute::Configurable);
|
||||
define_native_accessor(realm, vm.names.numberingSystems, numbering_systems, {}, Attribute::Configurable);
|
||||
define_native_accessor(realm, vm.names.numeric, numeric, {}, Attribute::Configurable);
|
||||
define_native_accessor(realm, vm.names.language, language, {}, Attribute::Configurable);
|
||||
define_native_accessor(realm, vm.names.script, script, {}, Attribute::Configurable);
|
||||
define_native_accessor(realm, vm.names.region, region, {}, Attribute::Configurable);
|
||||
define_native_accessor(realm, vm.names.timeZones, time_zones, {}, Attribute::Configurable);
|
||||
define_native_accessor(realm, vm.names.textInfo, text_info, {}, Attribute::Configurable);
|
||||
define_native_accessor(realm, vm.names.weekInfo, week_info, {}, Attribute::Configurable);
|
||||
}
|
||||
|
||||
// 14.3.3 Intl.Locale.prototype.maximize ( ), https://tc39.es/ecma402/#sec-Intl.Locale.prototype.maximize
|
||||
|
|
@ -229,21 +229,21 @@ JS_DEFINE_NATIVE_FUNCTION(LocalePrototype::region)
|
|||
__JS_ENUMERATE(hour_cycles) \
|
||||
__JS_ENUMERATE(numbering_systems)
|
||||
|
||||
// 1.4.17 get Intl.Locale.prototype.calendars, https://tc39.es/proposal-intl-locale-info/#sec-Intl.Locale.prototype.calendars
|
||||
// 1.4.18 get Intl.Locale.prototype.collations, https://tc39.es/proposal-intl-locale-info/#sec-Intl.Locale.prototype.collations
|
||||
// 1.4.19 get Intl.Locale.prototype.hourCycles, https://tc39.es/proposal-intl-locale-info/#sec-Intl.Locale.prototype.hourCycles
|
||||
// 1.4.20 get Intl.Locale.prototype.numberingSystems, https://tc39.es/proposal-intl-locale-info/#sec-Intl.Locale.prototype.numberingSystems
|
||||
#define __JS_ENUMERATE(keyword) \
|
||||
JS_DEFINE_NATIVE_FUNCTION(LocalePrototype::keyword) \
|
||||
{ \
|
||||
auto locale_object = TRY(typed_this_object(vm)); \
|
||||
return keyword##_of_locale(vm, locale_object); \
|
||||
// 1.4.17 Intl.Locale.prototype.getCalendars, https://tc39.es/proposal-intl-locale-info/#sec-Intl.Locale.prototype.getCalendars
|
||||
// 1.4.18 Intl.Locale.prototype.getCollations, https://tc39.es/proposal-intl-locale-info/#sec-Intl.Locale.prototype.getCollations
|
||||
// 1.4.19 Intl.Locale.prototype.getHourCycles, https://tc39.es/proposal-intl-locale-info/#sec-Intl.Locale.prototype.getHourCycles
|
||||
// 1.4.20 Intl.Locale.prototype.getNumberingSystems, https://tc39.es/proposal-intl-locale-info/#sec-Intl.Locale.prototype.getNumberingSystems
|
||||
#define __JS_ENUMERATE(keyword) \
|
||||
JS_DEFINE_NATIVE_FUNCTION(LocalePrototype::get_##keyword) \
|
||||
{ \
|
||||
auto locale_object = TRY(typed_this_object(vm)); \
|
||||
return keyword##_of_locale(vm, locale_object); \
|
||||
}
|
||||
JS_ENUMERATE_LOCALE_INFO_PROPERTIES
|
||||
#undef __JS_ENUMERATE
|
||||
|
||||
// 1.4.21 get Intl.Locale.prototype.timeZones, https://tc39.es/proposal-intl-locale-info/#sec-Intl.Locale.prototype.timeZones
|
||||
JS_DEFINE_NATIVE_FUNCTION(LocalePrototype::time_zones)
|
||||
// 1.4.21 Intl.Locale.prototype.getTimeZones, https://tc39.es/proposal-intl-locale-info/#sec-Intl.Locale.prototype.getTimeZones
|
||||
JS_DEFINE_NATIVE_FUNCTION(LocalePrototype::get_time_zones)
|
||||
{
|
||||
// 1. Let loc be the this value.
|
||||
// 2. Perform ? RequireInternalSlot(loc, [[InitializedLocale]]).
|
||||
|
|
@ -260,8 +260,8 @@ JS_DEFINE_NATIVE_FUNCTION(LocalePrototype::time_zones)
|
|||
return time_zones_of_locale(vm, locale->language_id.region.value());
|
||||
}
|
||||
|
||||
// 1.4.22 get Intl.Locale.prototype.textInfo, https://tc39.es/proposal-intl-locale-info/#sec-Intl.Locale.prototype.textInfo
|
||||
JS_DEFINE_NATIVE_FUNCTION(LocalePrototype::text_info)
|
||||
// 1.4.22 Intl.Locale.prototype.getTextInfo, https://tc39.es/proposal-intl-locale-info/#sec-Intl.Locale.prototype.getTextInfo
|
||||
JS_DEFINE_NATIVE_FUNCTION(LocalePrototype::get_text_info)
|
||||
{
|
||||
auto& realm = *vm.current_realm();
|
||||
|
||||
|
|
@ -282,8 +282,8 @@ JS_DEFINE_NATIVE_FUNCTION(LocalePrototype::text_info)
|
|||
return info;
|
||||
}
|
||||
|
||||
// 1.4.23 get Intl.Locale.prototype.weekInfo, https://tc39.es/proposal-intl-locale-info/#sec-Intl.Locale.prototype.weekInfo
|
||||
JS_DEFINE_NATIVE_FUNCTION(LocalePrototype::week_info)
|
||||
// 1.4.23 Intl.Locale.prototype.getWeekInfo, https://tc39.es/proposal-intl-locale-info/#sec-Intl.Locale.prototype.getWeekInfo
|
||||
JS_DEFINE_NATIVE_FUNCTION(LocalePrototype::get_week_info)
|
||||
{
|
||||
auto& realm = *vm.current_realm();
|
||||
|
||||
|
|
|
|||
|
|
@ -27,22 +27,22 @@ private:
|
|||
|
||||
JS_DECLARE_NATIVE_FUNCTION(base_name);
|
||||
JS_DECLARE_NATIVE_FUNCTION(calendar);
|
||||
JS_DECLARE_NATIVE_FUNCTION(calendars);
|
||||
JS_DECLARE_NATIVE_FUNCTION(case_first);
|
||||
JS_DECLARE_NATIVE_FUNCTION(collation);
|
||||
JS_DECLARE_NATIVE_FUNCTION(collations);
|
||||
JS_DECLARE_NATIVE_FUNCTION(first_day_of_week);
|
||||
JS_DECLARE_NATIVE_FUNCTION(hour_cycle);
|
||||
JS_DECLARE_NATIVE_FUNCTION(hour_cycles);
|
||||
JS_DECLARE_NATIVE_FUNCTION(numbering_system);
|
||||
JS_DECLARE_NATIVE_FUNCTION(numbering_systems);
|
||||
JS_DECLARE_NATIVE_FUNCTION(numeric);
|
||||
JS_DECLARE_NATIVE_FUNCTION(language);
|
||||
JS_DECLARE_NATIVE_FUNCTION(script);
|
||||
JS_DECLARE_NATIVE_FUNCTION(region);
|
||||
JS_DECLARE_NATIVE_FUNCTION(time_zones);
|
||||
JS_DECLARE_NATIVE_FUNCTION(text_info);
|
||||
JS_DECLARE_NATIVE_FUNCTION(week_info);
|
||||
JS_DECLARE_NATIVE_FUNCTION(get_calendars);
|
||||
JS_DECLARE_NATIVE_FUNCTION(get_collations);
|
||||
JS_DECLARE_NATIVE_FUNCTION(get_hour_cycles);
|
||||
JS_DECLARE_NATIVE_FUNCTION(get_numbering_systems);
|
||||
JS_DECLARE_NATIVE_FUNCTION(get_time_zones);
|
||||
JS_DECLARE_NATIVE_FUNCTION(get_text_info);
|
||||
JS_DECLARE_NATIVE_FUNCTION(get_week_info);
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue