Skip to content

Commit 81551a7

Browse files
vouillonhhugo
authored andcommitted
Update list of reserved keywords
Some where reserved as future keywords up to ECMAScript 3 and are no longer reserved.
1 parent e7c930e commit 81551a7

File tree

2 files changed

+14
-32
lines changed

2 files changed

+14
-32
lines changed

compiler/lib/reserved.ml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ let keyword =
5252
; "with"
5353
; (* reserved in ECMAScript 5 *)
5454
"class"
55+
; "const"
5556
; "enum"
5657
; "export"
5758
; "extends"
@@ -72,28 +73,9 @@ let keyword =
7273
; "false"
7374
; "NaN"
7475
; "undefined"
75-
; "this"
7676
; (* Unexpected eval or arguments in strict mode *)
7777
"eval"
7878
; "arguments"
79-
; (* also reserved in ECMAScript 3 *)
80-
"abstract"
81-
; "boolean"
82-
; "byte"
83-
; "char"
84-
; "const"
85-
; "double"
86-
; "final"
87-
; "float"
88-
; "goto"
89-
; "int"
90-
; "long"
91-
; "native"
92-
; "short"
93-
; "synchronized"
94-
; "throws"
95-
; "transient"
96-
; "volatile"
9779
; (* also reserved in ECMAScript 6 *)
9880
"await"
9981
]

compiler/tests-full/stdlib.cma.expected.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7864,16 +7864,16 @@
78647864
_l_ = _g_ ? j <= i ? 1 : 0 : _g_;
78657865
if(1 - _l_){
78667866
var
7867-
int$ = /*<<array.ml:443:2>>*/ Stdlib[33],
7867+
int = /*<<array.ml:443:2>>*/ Stdlib[33],
78687868
_h_ =
78697869
/*<<array.ml:447:36>>*/ [0,
78707870
cst_out_of_expected_range_0,
7871-
[0, int$(i), _b_]],
7872-
_i_ = /*<<array.ml:446:19>>*/ [0, cst_returned, [0, int$(j), _h_]],
7871+
[0, int(i), _b_]],
7872+
_i_ = /*<<array.ml:446:19>>*/ [0, cst_returned, [0, int(j), _h_]],
78737873
_j_ =
78747874
/*<<array.ml:445:29>>*/ [0,
78757875
cst_Array_shuffle_rand,
7876-
[0, int$(i + 1 | 0), _i_]],
7876+
[0, int(i + 1 | 0), _i_]],
78777877
_k_ = /*<<array.ml:444:2>>*/ Stdlib_String[7].call(null, cst, _j_);
78787878
/*<<array.ml:448:3>>*/ Stdlib[1].call(null, _k_);
78797879
}
@@ -21596,13 +21596,13 @@
2159621596
/*<<printexc.ml:71:22>>*/ return cst_Stack_overflow;
2159721597
var tag = /*<<printexc.ml:69:24>>*/ x[1];
2159821598
if(tag === Stdlib[4]){
21599-
var match = x[2], char$ = match[3], line = match[2], file = match[1];
21599+
var match = x[2], char = match[3], line = match[2], file = match[1];
2160021600
/*<<printexc.ml:73:6>>*/ return caml_call5
2160121601
(Stdlib_Printf[4].call(null, locfmt),
2160221602
file,
2160321603
line,
21604-
char$,
21605-
char$ + 5 | 0,
21604+
char,
21605+
char + 5 | 0,
2160621606
cst_Pattern_matching_failed) /*<<printexc.ml:79:50>>*/ ;
2160721607
}
2160821608
var tag$0 = /*<<printexc.ml:69:24>>*/ x[1];
@@ -23908,7 +23908,7 @@
2390823908
/*<<random.ml:148:55>>*/ return v;
2390923909
}
2391023910
/*<<random.ml:148:56>>*/ }
23911-
function int$(s, bound){
23911+
function int(s, bound){
2391223912
/*<<random.ml:154:4>>*/ if(1073741823 >= bound && 0 < bound)
2391323913
/*<<random.ml:156:9>>*/ return int_aux(s, bound, max_int31) /*<<random.ml:156:34>>*/ ;
2391423914
/*<<random.ml:155:9>>*/ return Stdlib[1].call(null, cst_Random_int) /*<<random.ml:156:34>>*/ ;
@@ -24082,7 +24082,7 @@
2408224082
/*<<random.ml:311:13>>*/ caml_int64_of_int32(min),
2408324083
/*<<random.ml:311:43>>*/ caml_int64_of_int32(max))) /*<<random.ml:311:68>>*/ ;
2408424084
};
24085-
function float$(s, bound){
24085+
function float(s, bound){
2408624086
/*<<random.ml:316:12>>*/ for(;;){
2408724087
var
2408824088
b = caml_lxm_next(s),
@@ -24117,7 +24117,7 @@
2411724117
(Stdlib_Domain[11][2], random_key)) /*<<random.ml:343:52>>*/ ;
2411824118
}
2411924119
function int$0(bound){
24120-
/*<<random.ml:344:26>>*/ return /*<<random.ml:344:53>>*/ int$
24120+
/*<<random.ml:344:26>>*/ return /*<<random.ml:344:53>>*/ int
2412124121
( /*<<random.ml:344:26>>*/ caml_call1
2412224122
(Stdlib_Domain[11][2], random_key),
2412324123
bound) /*<<random.ml:344:59>>*/ ;
@@ -24175,7 +24175,7 @@
2417524175
max) /*<<random.ml:356:60>>*/ ;
2417624176
}
2417724177
function float$0(scale){
24178-
/*<<random.ml:357:30>>*/ return /*<<random.ml:357:57>>*/ float$
24178+
/*<<random.ml:357:30>>*/ return /*<<random.ml:357:57>>*/ float
2417924179
( /*<<random.ml:357:30>>*/ caml_call1
2418024180
(Stdlib_Domain[11][2], random_key),
2418124181
scale) /*<<random.ml:357:63>>*/ ;
@@ -24256,7 +24256,7 @@
2425624256
make_self_init,
2425724257
copy,
2425824258
bits,
24259-
int$,
24259+
int,
2426024260
full_int,
2426124261
int_in_range,
2426224262
int32,
@@ -24265,7 +24265,7 @@
2426524265
nativeint_in_range,
2426624266
int64,
2426724267
int64_in_range,
24268-
float$,
24268+
float,
2426924269
bool,
2427024270
bits32,
2427124271
bits64,

0 commit comments

Comments
 (0)