Skip to content

Commit bc09a87

Browse files
committed
Fix getUncurriedFromBsconfig
1 parent 9f728c4 commit bc09a87

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

jscomp/syntax/src/res_multi_printer.ml

+17-17
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,26 @@ let getUncurriedFromBsconfig ~filename =
3838
| None -> ()
3939
| Some bsconfig ->
4040
let lines = bsconfig |> String.split_on_char '\n' in
41-
let uncurried =
41+
let is_legacy_uncurried =
4242
lines
4343
|> List.exists (fun line ->
44-
let uncurried = ref false in
45-
let false_ = ref false in
46-
let words = line |> String.split_on_char ' ' in
47-
words
48-
|> List.iter (fun word ->
49-
match word with
50-
| "\"uncurried\"" | "\"uncurried\":" -> uncurried := true
51-
| "\"uncurried\":false" | "\"uncurried\":false," ->
52-
uncurried := true;
53-
false_ := true
54-
| "false" | ":false" | "false," | ":false," ->
55-
false_ := true
56-
| _ -> ());
57-
!uncurried && not !false_
58-
)
44+
let is_uncurried_option = ref false in
45+
let is_option_falsy = ref false in
46+
let words = line |> String.split_on_char ' ' in
47+
words
48+
|> List.iter (fun word ->
49+
match word with
50+
| "\"uncurried\"" | "\"uncurried\":" ->
51+
is_uncurried_option := true
52+
| "\"uncurried\":false" | "\"uncurried\":false," ->
53+
is_uncurried_option := true;
54+
is_option_falsy := true
55+
| "false" | ":false" | "false," | ":false," ->
56+
is_option_falsy := true
57+
| _ -> ());
58+
!is_uncurried_option && !is_option_falsy)
5959
in
60-
if uncurried then Config.uncurried := Uncurried
60+
if not is_legacy_uncurried then Config.uncurried := Uncurried
6161

6262
(* print res files to res syntax *)
6363
let printRes ~ignoreParseErrors ~isInterface ~filename =

0 commit comments

Comments
 (0)