Skip to content

Commit 81f544b

Browse files
committed
revert changes that unrelated to the main issue
1 parent 06ec128 commit 81f544b

File tree

7 files changed

+287
-325
lines changed

7 files changed

+287
-325
lines changed

.github/workflows/ci.yml

-5
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ jobs:
8383
uses: actions/setup-node@v4
8484
with:
8585
node-version: 18
86-
cache: npm
8786

8887
- name: Copy exes to platform bin dirs
8988
run: node ./scripts/copyExes.js
@@ -171,7 +170,6 @@ jobs:
171170
uses: actions/setup-node@v4
172171
with:
173172
node-version: 18
174-
cache: npm
175173

176174
- name: Install npm packages
177175
run: npm ci --ignore-scripts
@@ -282,7 +280,6 @@ jobs:
282280
uses: actions/setup-node@v4
283281
with:
284282
node-version: 18
285-
cache: npm
286283

287284
- name: NPM install
288285
run: npm ci --ignore-scripts
@@ -346,7 +343,6 @@ jobs:
346343
uses: actions/setup-node@v4
347344
with:
348345
node-version: 18
349-
cache: npm
350346

351347
- name: Download artifacts
352348
uses: actions/download-artifact@v4
@@ -380,7 +376,6 @@ jobs:
380376
with:
381377
node-version: 18
382378
registry-url: https://registry.npmjs.org # Needed to make auth work for publishing
383-
cache: npm
384379

385380
- name: Download artifacts
386381
uses: actions/download-artifact@v4

CHANGELOG.md

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
- Turn off transformation for closures inside loops when capturing loop variables, now that `let` is emitted instead of `var`. https://github.com/rescript-lang/rescript-compiler/pull/6480
4545
- Fix formatter eats comments on the first argument of a uncurried function. https://github.com/rescript-lang/rescript-compiler/pull/6763
4646
- Fix formatter removes parens in pipe operator with anonymous uncurried function. https://github.com/rescript-lang/rescript-compiler/pull/6766
47-
- Allow [future reserved words in older standards](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Lexical_grammar#future_reserved_words_in_older_standards) as identifiers. https://github.com/rescript-lang/rescript-compiler/pull/6658
4847

4948
# 11.1.0
5049

jscomp/ext/ext_ident.ml

+4-9
Original file line numberDiff line numberDiff line change
@@ -174,19 +174,14 @@ let name_mangle name =
174174
Ext_ident.convert "^";;
175175
- : string = "$caret"
176176
]}
177-
[convert name] if [name] is a js keyword, and also is not explicitly used as exotic identifier, add "$$"
177+
[convert name] if [name] is a js keyword, add "$$"
178178
otherwise do the name mangling to make sure ocaml identifier it is
179179
a valid js identifier
180180
*)
181181
let convert (name : string) =
182-
if is_exotic name then
183-
let name = unwrap_exotic name in
184-
if Js_reserved_map.is_js_keyword name then "$$" ^ name
185-
else name_mangle name
186-
else
187-
if Js_reserved_map.is_js_keyword name || Js_reserved_map.is_js_special_word name || Js_reserved_map.is_reserved name then
188-
"$$" ^ name
189-
else name_mangle name
182+
if Js_reserved_map.is_reserved name then
183+
"$$" ^ name
184+
else name_mangle name
190185

191186
(** keyword could be used in property *)
192187

0 commit comments

Comments
 (0)