Skip to content

Commit 44a65a3

Browse files
iamstolisiamstolis
committed
Normative: Change from getters to method with get prefix name change.
1 parent 1c51911 commit 44a65a3

File tree

1 file changed

+44
-44
lines changed

1 file changed

+44
-44
lines changed

‎graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/builtins/intl/LocalePrototypeBuiltins.java‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -55,24 +55,24 @@
5555
import com.oracle.truffle.js.builtins.JSBuiltinsContainer;
5656
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleBaseNameAccessorNodeGen;
5757
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleCalendarAccessorNodeGen;
58-
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleCalendarsAccessorNodeGen;
5958
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleCaseFirstAccessorNodeGen;
6059
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleCollationAccessorNodeGen;
61-
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleCollationsAccessorNodeGen;
60+
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleGetCalendarsNodeGen;
61+
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleGetCollationsNodeGen;
62+
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleGetHourCyclesNodeGen;
63+
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleGetNumberingSystemsNodeGen;
64+
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleGetTextInfoNodeGen;
65+
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleGetTimeZonesNodeGen;
66+
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleGetWeekInfoNodeGen;
6267
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleHourCycleAccessorNodeGen;
63-
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleHourCyclesAccessorNodeGen;
6468
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleLanguageAccessorNodeGen;
6569
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleMaximizeNodeGen;
6670
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleMinimizeNodeGen;
6771
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleNumberingSystemAccessorNodeGen;
68-
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleNumberingSystemsAccessorNodeGen;
6972
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleNumericAccessorNodeGen;
7073
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleRegionAccessorNodeGen;
7174
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleScriptAccessorNodeGen;
72-
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleTextInfoAccessorNodeGen;
73-
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleTimeZonesAccessorNodeGen;
7475
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleToStringNodeGen;
75-
import com.oracle.truffle.js.builtins.intl.LocalePrototypeBuiltinsFactory.JSLocaleWeekInfoAccessorNodeGen;
7676
import com.oracle.truffle.js.nodes.access.CreateDataPropertyNode;
7777
import com.oracle.truffle.js.nodes.function.JSBuiltin;
7878
import com.oracle.truffle.js.nodes.function.JSBuiltinNode;
@@ -119,13 +119,13 @@ public enum LocalePrototype implements BuiltinEnum<LocalePrototype> {
119119
script(0),
120120
region(0),
121121

122-
calendars(0),
123-
collations(0),
124-
hourCycles(0),
125-
numberingSystems(0),
126-
timeZones(0),
127-
textInfo(0),
128-
weekInfo(0);
122+
getCalendars(0),
123+
getCollations(0),
124+
getHourCycles(0),
125+
getNumberingSystems(0),
126+
getTimeZones(0),
127+
getTextInfo(0),
128+
getWeekInfo(0);
129129

130130
private final int length;
131131

@@ -140,12 +140,12 @@ public int getLength() {
140140

141141
@Override
142142
public boolean isGetter() {
143-
return baseName.ordinal() <= ordinal();
143+
return baseName.ordinal() <= ordinal() && ordinal() <= region.ordinal();
144144
}
145145

146146
@Override
147147
public int getECMAScriptVersion() {
148-
if (calendars.ordinal() <= ordinal()) {
148+
if (getCalendars.ordinal() <= ordinal()) {
149149
return JSConfig.StagingECMAScriptVersion;
150150
}
151151
return BuiltinEnum.super.getECMAScriptVersion();
@@ -181,20 +181,20 @@ protected Object createNode(JSContext context, JSBuiltin builtin, boolean constr
181181
return JSLocaleScriptAccessorNodeGen.create(context, builtin, args().withThis().createArgumentNodes(context));
182182
case region:
183183
return JSLocaleRegionAccessorNodeGen.create(context, builtin, args().withThis().createArgumentNodes(context));
184-
case calendars:
185-
return JSLocaleCalendarsAccessorNodeGen.create(context, builtin, args().withThis().createArgumentNodes(context));
186-
case collations:
187-
return JSLocaleCollationsAccessorNodeGen.create(context, builtin, args().withThis().createArgumentNodes(context));
188-
case hourCycles:
189-
return JSLocaleHourCyclesAccessorNodeGen.create(context, builtin, args().withThis().createArgumentNodes(context));
190-
case numberingSystems:
191-
return JSLocaleNumberingSystemsAccessorNodeGen.create(context, builtin, args().withThis().createArgumentNodes(context));
192-
case timeZones:
193-
return JSLocaleTimeZonesAccessorNodeGen.create(context, builtin, args().withThis().createArgumentNodes(context));
194-
case textInfo:
195-
return JSLocaleTextInfoAccessorNodeGen.create(context, builtin, args().withThis().createArgumentNodes(context));
196-
case weekInfo:
197-
return JSLocaleWeekInfoAccessorNodeGen.create(context, builtin, args().withThis().createArgumentNodes(context));
184+
case getCalendars:
185+
return JSLocaleGetCalendarsNodeGen.create(context, builtin, args().withThis().createArgumentNodes(context));
186+
case getCollations:
187+
return JSLocaleGetCollationsNodeGen.create(context, builtin, args().withThis().createArgumentNodes(context));
188+
case getHourCycles:
189+
return JSLocaleGetHourCyclesNodeGen.create(context, builtin, args().withThis().createArgumentNodes(context));
190+
case getNumberingSystems:
191+
return JSLocaleGetNumberingSystemsNodeGen.create(context, builtin, args().withThis().createArgumentNodes(context));
192+
case getTimeZones:
193+
return JSLocaleGetTimeZonesNodeGen.create(context, builtin, args().withThis().createArgumentNodes(context));
194+
case getTextInfo:
195+
return JSLocaleGetTextInfoNodeGen.create(context, builtin, args().withThis().createArgumentNodes(context));
196+
case getWeekInfo:
197+
return JSLocaleGetWeekInfoNodeGen.create(context, builtin, args().withThis().createArgumentNodes(context));
198198
}
199199
return null;
200200
}
@@ -435,9 +435,9 @@ public Object doOther(@SuppressWarnings("unused") Object bummer) {
435435

436436
}
437437

438-
public abstract static class JSLocaleCalendarsAccessor extends JSBuiltinNode {
438+
public abstract static class JSLocaleGetCalendarsNode extends JSBuiltinNode {
439439

440-
public JSLocaleCalendarsAccessor(JSContext context, JSBuiltin builtin) {
440+
public JSLocaleGetCalendarsNode(JSContext context, JSBuiltin builtin) {
441441
super(context, builtin);
442442
}
443443

@@ -462,9 +462,9 @@ public Object doOther(@SuppressWarnings("unused") Object bummer) {
462462

463463
}
464464

465-
public abstract static class JSLocaleCollationsAccessor extends JSBuiltinNode {
465+
public abstract static class JSLocaleGetCollationsNode extends JSBuiltinNode {
466466

467-
public JSLocaleCollationsAccessor(JSContext context, JSBuiltin builtin) {
467+
public JSLocaleGetCollationsNode(JSContext context, JSBuiltin builtin) {
468468
super(context, builtin);
469469
}
470470

@@ -489,9 +489,9 @@ public Object doOther(@SuppressWarnings("unused") Object bummer) {
489489

490490
}
491491

492-
public abstract static class JSLocaleHourCyclesAccessor extends JSBuiltinNode {
492+
public abstract static class JSLocaleGetHourCyclesNode extends JSBuiltinNode {
493493

494-
public JSLocaleHourCyclesAccessor(JSContext context, JSBuiltin builtin) {
494+
public JSLocaleGetHourCyclesNode(JSContext context, JSBuiltin builtin) {
495495
super(context, builtin);
496496
}
497497

@@ -514,9 +514,9 @@ public Object doOther(@SuppressWarnings("unused") Object bummer) {
514514

515515
}
516516

517-
public abstract static class JSLocaleNumberingSystemsAccessor extends JSBuiltinNode {
517+
public abstract static class JSLocaleGetNumberingSystemsNode extends JSBuiltinNode {
518518

519-
public JSLocaleNumberingSystemsAccessor(JSContext context, JSBuiltin builtin) {
519+
public JSLocaleGetNumberingSystemsNode(JSContext context, JSBuiltin builtin) {
520520
super(context, builtin);
521521
}
522522

@@ -538,9 +538,9 @@ public Object doOther(@SuppressWarnings("unused") Object bummer) {
538538

539539
}
540540

541-
public abstract static class JSLocaleTimeZonesAccessor extends JSBuiltinNode {
541+
public abstract static class JSLocaleGetTimeZonesNode extends JSBuiltinNode {
542542

543-
public JSLocaleTimeZonesAccessor(JSContext context, JSBuiltin builtin) {
543+
public JSLocaleGetTimeZonesNode(JSContext context, JSBuiltin builtin) {
544544
super(context, builtin);
545545
}
546546

@@ -569,10 +569,10 @@ public Object doOther(@SuppressWarnings("unused") Object bummer) {
569569

570570
}
571571

572-
public abstract static class JSLocaleTextInfoAccessor extends JSBuiltinNode {
572+
public abstract static class JSLocaleGetTextInfoNode extends JSBuiltinNode {
573573
@Child CreateDataPropertyNode createDirectionNode = CreateDataPropertyNode.create(getContext(), IntlUtil.KEY_DIRECTION);
574574

575-
public JSLocaleTextInfoAccessor(JSContext context, JSBuiltin builtin) {
575+
public JSLocaleGetTextInfoNode(JSContext context, JSBuiltin builtin) {
576576
super(context, builtin);
577577
}
578578

@@ -597,12 +597,12 @@ private static TruffleString direction(JSLocaleObject localeObject) {
597597

598598
}
599599

600-
public abstract static class JSLocaleWeekInfoAccessor extends JSBuiltinNode {
600+
public abstract static class JSLocaleGetWeekInfoNode extends JSBuiltinNode {
601601
@Child CreateDataPropertyNode createFirstDayNode = CreateDataPropertyNode.create(getContext(), IntlUtil.KEY_FIRST_DAY);
602602
@Child CreateDataPropertyNode createWeekendNode = CreateDataPropertyNode.create(getContext(), IntlUtil.KEY_WEEKEND);
603603
@Child CreateDataPropertyNode createMinimalDaysNode = CreateDataPropertyNode.create(getContext(), IntlUtil.KEY_MINIMAL_DAYS);
604604

605-
public JSLocaleWeekInfoAccessor(JSContext context, JSBuiltin builtin) {
605+
public JSLocaleGetWeekInfoNode(JSContext context, JSBuiltin builtin) {
606606
super(context, builtin);
607607
}
608608

0 commit comments

Comments
 (0)