From 40504428baca54614d5b3c544a88927088d39496 Mon Sep 17 00:00:00 2001 From: Dmitry Zakharov Date: Wed, 30 Aug 2023 19:41:29 +0400 Subject: [PATCH] Fix getUncurriedFromBsconfig --- jscomp/syntax/src/res_multi_printer.ml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/jscomp/syntax/src/res_multi_printer.ml b/jscomp/syntax/src/res_multi_printer.ml index 34b2c939878..21ca7991e86 100644 --- a/jscomp/syntax/src/res_multi_printer.ml +++ b/jscomp/syntax/src/res_multi_printer.ml @@ -38,26 +38,26 @@ let getUncurriedFromBsconfig ~filename = | None -> () | Some bsconfig -> let lines = bsconfig |> String.split_on_char '\n' in - let uncurried = + let is_legacy_uncurried = lines |> List.exists (fun line -> - let uncurried = ref false in - let false_ = ref false in + let is_uncurried_option = ref false in + let is_option_falsy = ref false in let words = line |> String.split_on_char ' ' in words |> List.iter (fun word -> match word with - | "\"uncurried\"" | "\"uncurried\":" -> uncurried := true + | "\"uncurried\"" | "\"uncurried\":" -> is_uncurried_option := true | "\"uncurried\":false" | "\"uncurried\":false," -> - uncurried := true; - false_ := true + is_uncurried_option := true; + is_option_falsy := true | "false" | ":false" | "false," | ":false," -> - false_ := true + is_option_falsy := true | _ -> ()); - !uncurried && not !false_ + !is_uncurried_option && !is_option_falsy ) in - if uncurried then Config.uncurried := Uncurried + if not is_legacy_uncurried then Config.uncurried := Uncurried (* print res files to res syntax *) let printRes ~ignoreParseErrors ~isInterface ~filename =