Rename @@uncurried.always to simply @@uncurried.

Author: cristianoc

CHANGELOG.md

@@ -24,7 +24,7 @@ subset of the arguments, and return a curried type with the remaining ones https
 - Add support for default arguments in uncurried functions https://github.com/rescript-lang/rescript-compiler/pull/5835
 - Inline uncurried application when it is safe https://github.com/rescript-lang/rescript-compiler/pull/5847
 - Support optional named arguments without a final unit in uncurried functions https://github.com/rescript-lang/rescript-compiler/pull/5907
-- Add support for uncurried-always: a mode where everything is considered uncurried, whether with or without the `.`. This can be turned on with `@@uncurriedAlways` locally in a file. Added a boolean project config `"uncurried"`, which propagates to dependencies, to turn on uncurried mode.
+- Add support for uncurried mode: a mode where everything is considered uncurried, whether with or without the `.`. This can be turned on with `@@uncurried` locally in a file. For project-level configuration in `bsconfig.json`, there's a boolean config `"uncurried"`, which propagates to dependencies, to turn on uncurried mode.
 Since there's no syntax for partial application in this new mode, introduce `@res.partial foo(x)` to express partial application. This is temporary and will later have some surface syntax.
 Use best effort to determine the config when formatting a file.
 https://github.com/rescript-lang/rescript-compiler/pull/5968

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 = "uncurriedAlways"}, _) -> Config.use_automatic_curried_application := true
+  | Pstr_attribute ({txt = "uncurried"}, _) -> Config.use_automatic_curried_application := true
   | _ -> ())
 
 let rec iter_on_bs_config_str (x : Parsetree.structure) =

jscomp/stdlib-406/pervasivesU.res

@@ -13,7 +13,7 @@
 /*  */
 /* ************************************************************************ */
 
-@@uncurriedAlways
+@@uncurried
 
 /* Internal */
 external __unsafe_cast: 'a => 'b = "%identity"

jscomp/stdlib-406/pervasivesU.resi

@@ -13,7 +13,7 @@
 /*  */
 /* ************************************************************************ */
 
-@@uncurriedAlways
+@@uncurried
 
 " The initially opened module.
 

jscomp/test/UncurriedAlways.res

@@ -1,4 +1,4 @@
-@@uncurriedAlways
+@@uncurried
 
 let foo = (x, y) => x + y
 

jscomp/test/UncurriedPervasives.res

@@ -1,2 +1,2 @@
-@@uncurriedAlways
+@@uncurried
 let n : _ => unit = ignore // Check that we're pulling in uncurried pervasives

res_syntax/src/res_core.ml

@@ -6411,8 +6411,8 @@ and parseStandaloneAttribute p =
     | "uncurried.swap" ->
       p.uncurried_config <- Res_uncurried.Swap;
       attrId
-    | "uncurriedAlways" ->
-      p.uncurried_config <- Res_uncurried.Always;
+    | "uncurried" ->
+      p.uncurried_config <- Res_uncurried.Uncurried;
       attrId
     | _ -> attrId
   in

res_syntax/src/res_multi_printer.ml

@@ -1,8 +1,8 @@
 let defaultPrintWidth = 100
 
-(* Determine if the file is in uncurried-always mode by looking for
-   the fist ancestor .bsconfig and see if it contains "uncurry": "default" *)
-let getUncurriedAlwaysFromBsconfig ~filename =
+(* Determine if the file is in uncurried mode by looking for
+   the fist ancestor .bsconfig and see if it contains "uncurried": "true" *)
+let getUncurriedFromBsconfig ~filename =
   let rec findBsconfig ~dir =
     let bsconfig = Filename.concat dir "bsconfig.json" in
     if Sys.file_exists bsconfig then Some (Res_io.readFile ~filename:bsconfig)
@@ -38,18 +38,18 @@ let getUncurriedAlwaysFromBsconfig ~filename =
   | None -> ()
   | Some bsconfig ->
     let lines = bsconfig |> String.split_on_char '\n' in
-    let uncurriedAlways =
+    let uncurried =
       lines
       |> List.exists (fun line ->
              let words = line |> String.split_on_char '\"' in
              words |> List.exists (fun word -> word = "uncurried")
              && words |> List.exists (fun word -> word = "true"))
     in
-    if uncurriedAlways then Res_uncurried.init := Always
+    if uncurried then Res_uncurried.init := Uncurried
 
 (* print res files to res syntax *)
 let printRes ~ignoreParseErrors ~isInterface ~filename =
-  getUncurriedAlwaysFromBsconfig ~filename;
+  getUncurriedFromBsconfig ~filename;
   if isInterface then (
     let parseResult =
       Res_driver.parsingEngine.parseInterface ~forPrinter:true ~filename

res_syntax/src/res_printer.ml

@@ -5279,8 +5279,8 @@ and printAttribute ?(standalone = false) ~state
       | "uncurried.swap" ->
         state.uncurried_config <- Res_uncurried.Swap;
         id
-      | "uncurriedAlways" ->
-        state.uncurried_config <- Res_uncurried.Always;
+      | "uncurried" ->
+        state.uncurried_config <- Res_uncurried.Uncurried;
         id
       | _ -> id
     in

res_syntax/src/res_uncurried.ml

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

res_syntax/tests/parsing/grammar/expressions/UncurriedAlways.res

@@ -1,4 +1,4 @@
-@@uncurriedAlways
+@@uncurried
 
 let foo = (x, y) => x + y
 

res_syntax/tests/parsing/grammar/expressions/expected/UncurriedAlways.res.txt

@@ -1,4 +1,4 @@
-[@@@uncurriedAlways ]
+[@@@uncurried ]
 let foo = ((Function$ (fun x -> fun y -> x + y))[@res.arity 2])
 let z = ((foo 3 4)[@res.uapp ])
 let bar = ((Function$ (fun x -> fun y -> x + y))[@res.arity 2])