Move all the uncurried config to module Config.

The Config module is used by the compiler, so the `uncurried` setting needs to be reset on each file as tests compile several files on a single command line (actual project builds don't).

Author: cristianoc

jscomp/bsc/rescript_compiler_main.ml

@@ -51,11 +51,12 @@ let process_file sourcefile ?(kind ) ppf =
      The {!Location.input_name} relies on that we write the binary ast 
      properly
   *)
+  let uncurried = !Config.uncurried in
   let kind =
     match kind with 
     | None -> Ext_file_extensions.classify_input (Ext_filename.get_extension_maybe sourcefile)  
     | Some kind -> kind in 
-  match kind with 
+  let res = match kind with 
   | Ml ->
     let sourcefile = set_abs_input_name  sourcefile in     
     setup_compiler_printer `ml;
@@ -103,6 +104,9 @@ let process_file sourcefile ?(kind ) ppf =
     Format.pp_print_newline Format.std_formatter ()      
   | Unknown -> 
     Bsc_args.bad_arg ("don't know what to do with " ^ sourcefile)
+  in
+  Config.uncurried := uncurried;
+  res
 let usage = "Usage: bsc <options> <files>\nOptions are:"
 
 let ppf = Format.err_formatter
@@ -406,7 +410,7 @@ let buckle_script_flags : (string * Bsc_args.spec * string) array =
 
     "-nopervasives", set Clflags.nopervasives, 
     "*internal*";
-    "-uncurried", unit_call (fun () -> Res_uncurried.init := Swap; Config.use_automatic_curried_application := true),
+    "-uncurried", unit_call (fun () -> Config.uncurried := Uncurried),
     "*internal* Set jsx module";
     "-v", unit_call print_version_string,
     "Print compiler version and location of standard library and exit";  

jscomp/core/res_compmisc.ml

@@ -46,7 +46,7 @@ let initial_env () =
   let initial = Env.initial_safe_string in
   let env =
     if !Clflags.nopervasives then initial
-    else open_implicit_module (if !Config.use_automatic_curried_application then "PervasivesU" else "Pervasives") initial
+    else open_implicit_module (if !Config.uncurried = Uncurried then "PervasivesU" else "Pervasives") initial
   in
   List.fold_left
     (fun env m -> open_implicit_module m env)

jscomp/ext/config.ml

@@ -13,7 +13,8 @@ let bs_only = ref true
 
 let unsafe_empty_array = ref false
 
-let use_automatic_curried_application = ref false
+type uncurried = Legacy | Uncurried | Swap
+let uncurried = ref Legacy
 
 and cmi_magic_number = "Caml1999I022"
 

jscomp/ext/config.mli

@@ -47,4 +47,5 @@ val cmt_magic_number : string
 
 val print_config : out_channel -> unit
 
-val use_automatic_curried_application : bool ref
+type uncurried = Legacy | Uncurried | Swap
+val uncurried : uncurried ref

jscomp/frontend/ast_config.ml

@@ -44,7 +44,7 @@ let process_directives str =
   | Pstr_attribute ({ txt = "directive" },
       PStr [ { pstr_desc = Pstr_eval ({ pexp_desc = Pexp_constant (Pconst_string (d, _)) }, _) } ]) ->
       Js_config.directives := !Js_config.directives @ [d]
-  | Pstr_attribute ({txt = "uncurried"}, _) -> Config.use_automatic_curried_application := true
+  | Pstr_attribute ({txt = "uncurried"}, _) -> Config.uncurried := Uncurried
   | _ -> ())
 
 let rec iter_on_bs_config_str (x : Parsetree.structure) =

jscomp/ml/ctype.ml

@@ -2341,7 +2341,7 @@ let rec unify (env:Env.t ref) t1 t2 =
         with Cannot_expand ->
           unify2 env t1 t2
         end
-    | (Tconstr (Pident {name="function$"}, [tFun; _], _), Tarrow _) when !Config.use_automatic_curried_application ->
+    | (Tconstr (Pident {name="function$"}, [tFun; _], _), Tarrow _) when !Config.uncurried = Uncurried ->
         (* subtype: an uncurried function is cast to a curried one *)
         unify2 env tFun t2
     | _ ->

jscomp/ml/typecore.ml

@@ -2980,7 +2980,7 @@ and type_argument ?recarg env sarg ty_expected' ty_expected =
       texp
 and is_automatic_curried_application env funct =
   (* When a curried function is used with uncurried application, treat it as a curried application *)
-  !Config.use_automatic_curried_application &&
+  !Config.uncurried = Uncurried &&
   match (expand_head env funct.exp_type).desc with
   | Tarrow _ -> true
   | _ -> false

res_syntax/src/res_core.ml

@@ -6409,10 +6409,10 @@ and parseStandaloneAttribute p =
   let attrId =
     match attrId.txt with
     | "uncurried.swap" ->
-      p.uncurried_config <- Res_uncurried.Swap;
+      p.uncurried_config <- Config.Swap;
       attrId
     | "uncurried" ->
-      p.uncurried_config <- Res_uncurried.Uncurried;
+      p.uncurried_config <- Config.Uncurried;
       attrId
     | _ -> attrId
   in

res_syntax/src/res_multi_printer.ml

@@ -45,7 +45,7 @@ let getUncurriedFromBsconfig ~filename =
              words |> List.exists (fun word -> word = "uncurried")
              && words |> List.exists (fun word -> word = "true"))
     in
-    if uncurried then Res_uncurried.init := Uncurried
+    if uncurried then Config.uncurried := Uncurried
 
 (* print res files to res syntax *)
 let printRes ~ignoreParseErrors ~isInterface ~filename =

res_syntax/src/res_parser.ml

@@ -22,7 +22,7 @@ type t = {
   mutable diagnostics: Diagnostics.t list;
   mutable comments: Comment.t list;
   mutable regions: regionStatus ref list;
-  mutable uncurried_config: Res_uncurried.config;
+  mutable uncurried_config: Config.uncurried;
 }
 
 let err ?startPos ?endPos p error =
@@ -122,7 +122,7 @@ let make ?(mode = ParseForTypeChecker) src filename =
       diagnostics = [];
       comments = [];
       regions = [ref Report];
-      uncurried_config = !Res_uncurried.init;
+      uncurried_config = !Config.uncurried;
     }
   in
   parserState.scanner.err <-

res_syntax/src/res_parser.mli

@@ -21,7 +21,7 @@ type t = {
   mutable diagnostics: Diagnostics.t list;
   mutable comments: Comment.t list;
   mutable regions: regionStatus ref list;
-  mutable uncurried_config: Res_uncurried.config;
+  mutable uncurried_config: Config.uncurried;
 }
 
 val make : ?mode:mode -> string -> string -> t

res_syntax/src/res_printer.ml

@@ -575,9 +575,9 @@ let printOptionalLabel attrs =
 module State = struct
   let customLayoutThreshold = 2
 
-  type t = {customLayout: int; mutable uncurried_config: Res_uncurried.config}
+  type t = {customLayout: int; mutable uncurried_config: Config.uncurried}
 
-  let init () = {customLayout = 0; uncurried_config = !Res_uncurried.init}
+  let init () = {customLayout = 0; uncurried_config = !Config.uncurried}
 
   let nextCustomLayout t = {t with customLayout = t.customLayout + 1}
 
@@ -5277,10 +5277,10 @@ and printAttribute ?(standalone = false) ~state
     let id =
       match id.txt with
       | "uncurried.swap" ->
-        state.uncurried_config <- Res_uncurried.Swap;
+        state.uncurried_config <- Config.Swap;
         id
       | "uncurried" ->
-        state.uncurried_config <- Res_uncurried.Uncurried;
+        state.uncurried_config <- Config.Uncurried;
         id
       | _ -> id
     in

res_syntax/src/res_uncurried.ml

@@ -1,20 +1,16 @@
-type config = Legacy | Swap | Uncurried
-
-let init = ref Legacy
-
 let isSwap = function
-  | Legacy -> false
+  | Config.Legacy -> false
   | Swap -> true
   | Uncurried -> true
 
 (* For parsing *)
 let fromDotted ~dotted = function
-  | Legacy -> dotted
+  | Config.Legacy -> dotted
   | Swap -> not dotted
   | Uncurried -> true
 
 (* For printing *)
 let getDotted ~uncurried = function
-  | Legacy -> uncurried
+  | Config.Legacy -> uncurried
   | Swap -> not uncurried
   | Uncurried -> false