Skip to content

Commit 1f8a280

Browse files
committed
organized reserved word checking
1 parent 0c4eec1 commit 1f8a280

24 files changed

+2161
-416
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ jobs:
8383
uses: actions/setup-node@v4
8484
with:
8585
node-version: 18
86+
cache: npm
8687

8788
- name: Copy exes to platform bin dirs
8889
run: node ./scripts/copyExes.js
@@ -170,6 +171,7 @@ jobs:
170171
uses: actions/setup-node@v4
171172
with:
172173
node-version: 18
174+
cache: npm
173175

174176
- name: Install npm packages
175177
run: npm ci --ignore-scripts
@@ -280,6 +282,7 @@ jobs:
280282
uses: actions/setup-node@v4
281283
with:
282284
node-version: 18
285+
cache: npm
283286

284287
- name: NPM install
285288
run: npm ci --ignore-scripts
@@ -341,6 +344,7 @@ jobs:
341344
uses: actions/setup-node@v4
342345
with:
343346
node-version: 18
347+
cache: npm
344348

345349
- name: Download artifacts
346350
uses: actions/download-artifact@v4
@@ -374,6 +378,7 @@ jobs:
374378
with:
375379
node-version: 18
376380
registry-url: https://registry.npmjs.org # Needed to make auth work for publishing
381+
cache: npm
377382

378383
- name: Download artifacts
379384
uses: actions/download-artifact@v4

jscomp/ext/ext_ident.ml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,10 @@ let name_mangle name =
179179
let convert (name : string) =
180180
if is_exotic name then
181181
let name = unwrap_exotic name in
182-
name_mangle name
182+
if Js_reserved_map.is_js_keyword name then "$$" ^ name
183+
else name_mangle name
183184
else
184-
if Js_reserved_map.is_reserved name then
185+
if Js_reserved_map.is_js_keyword name || Js_reserved_map.is_js_special_word name || Js_reserved_map.is_reserved name then
185186
"$$" ^ name
186187
else name_mangle name
187188

0 commit comments

Comments
 (0)