Skip to content

Commit 1c10a9b

Browse files
committed
Fixed definition of Javascript.is_ident: a reserved word is not an identifier
1 parent 350a2c8 commit 1c10a9b

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

compiler/.depend

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,10 @@ inline.cmi : code.cmi
5757
instr.cmo : util.cmi instr.cmi
5858
instr.cmx : util.cmx instr.cmi
5959
instr.cmi :
60-
javascript.cmo : varPrinter.cmi parse_info.cmi code.cmi javascript.cmi
61-
javascript.cmx : varPrinter.cmx parse_info.cmx code.cmx javascript.cmi
60+
javascript.cmo : varPrinter.cmi util.cmi reserved.cmi parse_info.cmi \
61+
code.cmi javascript.cmi
62+
javascript.cmx : varPrinter.cmx util.cmx reserved.cmx parse_info.cmx \
63+
code.cmx javascript.cmi
6264
javascript.cmi : parse_info.cmi code.cmi
6365
js_assign.cmo : util.cmi option.cmi js_traverse.cmi javascript.cmi code.cmi \
6466
js_assign.cmi
@@ -120,12 +122,12 @@ linker.cmi : util.cmi parse_info.cmi jsoo_primitive.cmi javascript.cmi
120122
minifyArg.cmo : compiler_version.cmi commonArg.cmi minifyArg.cmi
121123
minifyArg.cmx : compiler_version.cmx commonArg.cmx minifyArg.cmi
122124
minifyArg.cmi : commonArg.cmi
123-
minify.cmo : util.cmi pretty_print.cmi parse_js.cmi parse_info.cmi \
124-
option.cmi minifyArg.cmi js_traverse.cmi js_output.cmi js_assign.cmi \
125-
commonArg.cmi code.cmi
126-
minify.cmx : util.cmx pretty_print.cmx parse_js.cmx parse_info.cmx \
127-
option.cmx minifyArg.cmx js_traverse.cmx js_output.cmx js_assign.cmx \
128-
commonArg.cmx code.cmx
125+
minify.cmo : varPrinter.cmi util.cmi pretty_print.cmi parse_js.cmi \
126+
parse_info.cmi option.cmi minifyArg.cmi js_traverse.cmi js_output.cmi \
127+
js_assign.cmi commonArg.cmi code.cmi
128+
minify.cmx : varPrinter.cmx util.cmx pretty_print.cmx parse_js.cmx \
129+
parse_info.cmx option.cmx minifyArg.cmx js_traverse.cmx js_output.cmx \
130+
js_assign.cmx commonArg.cmx code.cmx
129131
option.cmo : util.cmi option.cmi
130132
option.cmx : util.cmx option.cmi
131133
option.cmi :

compiler/javascript.ml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ let is_ident =
216216
else 0
217217
) in
218218
fun s ->
219+
not (Util.StringSet.mem s Reserved.keyword) &&
219220
try
220221
for i = 0 to String.length s - 1 do
221222
let code = l.(Char.code(s.[i])) in

0 commit comments

Comments
 (0)