Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use java string switch for findPrototypeId #848

Merged
merged 4 commits into from
Mar 26, 2021
Merged

use java string switch for findPrototypeId #848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a91f375
use string switch
rbri Mar 21, 2021
826e516
regenerate and re apply some special strict checks
rbri Mar 21, 2021
64fb223
simplify code
rbri Mar 21, 2021
58f7c7c
let the code look more like java
rbri Mar 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions src/org/mozilla/javascript/Arguments.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,17 +186,20 @@ protected int getMaxInstanceId()
protected int findInstanceIdInfo(String s)
{
int id;
// #generated# Last update: 2010-01-06 05:48:21 ARST
L0: { id = 0; String X = null; int c;
int s_length = s.length();
if (s_length==6) {
c=s.charAt(5);
if (c=='e') { X="callee";id=Id_callee; }
else if (c=='h') { X="length";id=Id_length; }
else if (c=='r') { X="caller";id=Id_caller; }
}
if (X!=null && X!=s && !X.equals(s)) id = 0;
break L0;
// #generated# Last update: 2021-03-21 09:52:20 MEZ
switch (s) {
case "callee":
id = Id_callee;
break;
case "length":
id = Id_length;
break;
case "caller":
id = Id_caller;
break;
default:
id = 0;
break;
}
// #/generated#
Context cx = Context.getContext();
Expand Down
72 changes: 43 additions & 29 deletions src/org/mozilla/javascript/BaseFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,19 +118,26 @@ protected int getMaxInstanceId()
protected int findInstanceIdInfo(String s)
{
int id;
// #generated# Last update: 2007-05-09 08:15:15 EDT
L0: { id = 0; String X = null; int c;
L: switch (s.length()) {
case 4: X="name";id=Id_name; break L;
case 5: X="arity";id=Id_arity; break L;
case 6: X="length";id=Id_length; break L;
case 9: c=s.charAt(0);
if (c=='a') { X="arguments";id=Id_arguments; }
else if (c=='p') { X="prototype";id=Id_prototype; }
break L;
}
if (X!=null && X!=s && !X.equals(s)) id = 0;
break L0;
// #generated# Last update: 2021-03-21 09:52:05 MEZ
switch (s) {
case "length":
id = Id_length;
break;
case "arity":
id = Id_arity;
break;
case "name":
id = Id_name;
break;
case "prototype":
id = Id_prototype;
break;
case "arguments":
id = Id_arguments;
break;
default:
id = 0;
break;
}
// #/generated#
// #/string_id_map#
Expand Down Expand Up @@ -585,22 +592,29 @@ protected int findPrototypeId(String s)
{
int id;
// #string_id_map#
// #generated# Last update: 2009-07-24 16:00:52 EST
L0: { id = 0; String X = null; int c;
L: switch (s.length()) {
case 4: c=s.charAt(0);
if (c=='b') { X="bind";id=Id_bind; }
else if (c=='c') { X="call";id=Id_call; }
break L;
case 5: X="apply";id=Id_apply; break L;
case 8: c=s.charAt(3);
if (c=='o') { X="toSource";id=Id_toSource; }
else if (c=='t') { X="toString";id=Id_toString; }
break L;
case 11: X="constructor";id=Id_constructor; break L;
}
if (X!=null && X!=s && !X.equals(s)) id = 0;
break L0;
// #generated# Last update: 2021-03-21 09:52:05 MEZ
switch (s) {
case "constructor":
id = Id_constructor;
break;
case "toString":
id = Id_toString;
break;
case "toSource":
id = Id_toSource;
break;
case "apply":
id = Id_apply;
break;
case "call":
id = Id_call;
break;
case "bind":
id = Id_bind;
break;
default:
id = 0;
break;
}
// #/generated#
return id;
Expand Down
25 changes: 14 additions & 11 deletions src/org/mozilla/javascript/ImporterTopLevel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,17 +286,20 @@ private ScriptableObject realScope(Scriptable scope, Scriptable thisObj, IdFunct
protected int findPrototypeId(String s)
{
int id;
// #generated# Last update: 2007-05-09 08:15:24 EDT
L0: { id = 0; String X = null; int c;
int s_length = s.length();
if (s_length==11) {
c=s.charAt(0);
if (c=='c') { X="constructor";id=Id_constructor; }
else if (c=='i') { X="importClass";id=Id_importClass; }
}
else if (s_length==13) { X="importPackage";id=Id_importPackage; }
if (X!=null && X!=s && !X.equals(s)) id = 0;
break L0;
// #generated# Last update: 2021-03-21 09:51:58 MEZ
switch (s) {
case "constructor":
id = Id_constructor;
break;
case "importClass":
id = Id_importClass;
break;
case "importPackage":
id = Id_importPackage;
break;
default:
id = 0;
break;
}
// #/generated#
return id;
Expand Down
149 changes: 98 additions & 51 deletions src/org/mozilla/javascript/NativeArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2391,57 +2391,104 @@ public int compare(final Object x, final Object y) {
protected int findPrototypeId(String s)
{
int id;
// #generated# Last update: 2019-05-11 10:25:01 MESZ
L0: { id = 0; String X = null; int c;
L: switch (s.length()) {
case 3: c=s.charAt(0);
if (c=='m') { if (s.charAt(2)=='p' && s.charAt(1)=='a') {id=Id_map; break L0;} }
else if (c=='p') { if (s.charAt(2)=='p' && s.charAt(1)=='o') {id=Id_pop; break L0;} }
break L;
case 4: switch (s.charAt(2)) {
case 'i': X="join";id=Id_join; break L;
case 'l': X="fill";id=Id_fill; break L;
case 'm': X="some";id=Id_some; break L;
case 'n': X="find";id=Id_find; break L;
case 'r': X="sort";id=Id_sort; break L;
case 's': X="push";id=Id_push; break L;
case 'y': X="keys";id=Id_keys; break L;
} break L;
case 5: c=s.charAt(1);
if (c=='h') { X="shift";id=Id_shift; }
else if (c=='l') { X="slice";id=Id_slice; }
else if (c=='v') { X="every";id=Id_every; }
break L;
case 6: switch (s.charAt(0)) {
case 'c': X="concat";id=Id_concat; break L;
case 'f': X="filter";id=Id_filter; break L;
case 'r': X="reduce";id=Id_reduce; break L;
case 's': X="splice";id=Id_splice; break L;
case 'v': X="values";id=Id_values; break L;
} break L;
case 7: switch (s.charAt(0)) {
case 'e': X="entries";id=Id_entries; break L;
case 'f': X="forEach";id=Id_forEach; break L;
case 'i': X="indexOf";id=Id_indexOf; break L;
case 'r': X="reverse";id=Id_reverse; break L;
case 'u': X="unshift";id=Id_unshift; break L;
} break L;
case 8: c=s.charAt(3);
if (c=='l') { X="includes";id=Id_includes; }
else if (c=='o') { X="toSource";id=Id_toSource; }
else if (c=='t') { X="toString";id=Id_toString; }
break L;
case 9: X="findIndex";id=Id_findIndex; break L;
case 10: X="copyWithin";id=Id_copyWithin; break L;
case 11: c=s.charAt(0);
if (c=='c') { X="constructor";id=Id_constructor; }
else if (c=='l') { X="lastIndexOf";id=Id_lastIndexOf; }
else if (c=='r') { X="reduceRight";id=Id_reduceRight; }
break L;
case 14: X="toLocaleString";id=Id_toLocaleString; break L;
}
if (X!=null && X!=s && !X.equals(s)) id = 0;
break L0;
// #generated# Last update: 2021-03-21 09:43:46 MEZ
switch (s) {
case "constructor":
id = Id_constructor;
break;
case "toString":
id = Id_toString;
break;
case "toLocaleString":
id = Id_toLocaleString;
break;
case "toSource":
id = Id_toSource;
break;
case "join":
id = Id_join;
break;
case "reverse":
id = Id_reverse;
break;
case "sort":
id = Id_sort;
break;
case "push":
id = Id_push;
break;
case "pop":
id = Id_pop;
break;
case "shift":
id = Id_shift;
break;
case "unshift":
id = Id_unshift;
break;
case "splice":
id = Id_splice;
break;
case "concat":
id = Id_concat;
break;
case "slice":
id = Id_slice;
break;
case "indexOf":
id = Id_indexOf;
break;
case "lastIndexOf":
id = Id_lastIndexOf;
break;
case "every":
id = Id_every;
break;
case "filter":
id = Id_filter;
break;
case "forEach":
id = Id_forEach;
break;
case "map":
id = Id_map;
break;
case "some":
id = Id_some;
break;
case "find":
id = Id_find;
break;
case "findIndex":
id = Id_findIndex;
break;
case "reduce":
id = Id_reduce;
break;
case "reduceRight":
id = Id_reduceRight;
break;
case "fill":
id = Id_fill;
break;
case "keys":
id = Id_keys;
break;
case "values":
id = Id_values;
break;
case "entries":
id = Id_entries;
break;
case "includes":
id = Id_includes;
break;
case "copyWithin":
id = Id_copyWithin;
break;
default:
id = 0;
break;
}
// #/generated#
return id;
Expand Down
29 changes: 17 additions & 12 deletions src/org/mozilla/javascript/NativeBoolean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,18 +112,23 @@ public Object execIdCall(IdFunctionObject f, Context cx, Scriptable scope,
protected int findPrototypeId(String s)
{
int id;
// #generated# Last update: 2007-05-09 08:15:31 EDT
L0: { id = 0; String X = null; int c;
int s_length = s.length();
if (s_length==7) { X="valueOf";id=Id_valueOf; }
else if (s_length==8) {
c=s.charAt(3);
if (c=='o') { X="toSource";id=Id_toSource; }
else if (c=='t') { X="toString";id=Id_toString; }
}
else if (s_length==11) { X="constructor";id=Id_constructor; }
if (X!=null && X!=s && !X.equals(s)) id = 0;
break L0;
// #generated# Last update: 2021-03-21 09:44:49 MEZ
switch (s) {
case "constructor":
id = Id_constructor;
break;
case "toString":
id = Id_toString;
break;
case "toSource":
id = Id_toSource;
break;
case "valueOf":
id = Id_valueOf;
break;
default:
id = 0;
break;
}
// #/generated#
return id;
Expand Down
Loading