Remove deprecated uncurried function syntax

Author: cknitt

analysis/examples/example-project/src/ZZ.res

@@ -85,7 +85,7 @@ let v1 = V1
 
 module DoubleNested = ModuleWithDocComment.Nested.NestedAgain
 
-let uncurried = (. x) => x + 1
+let uncurried = (x) => x + 1
 
 module Inner = {
   type tInner = int

analysis/examples/larger-project/src/BucklescriptAnnotations.res

@@ -12,14 +12,14 @@ type someMutableFields = {
 @genType
 type someMethods = {
   "send": string => unit,
-  "on": (string, (. int) => unit) => unit,
+  "on": (string, (int) => unit) => unit,
   "threeargs": (int, string, int) => string,
-  "twoArgs": (. int, string) => int,
+  "twoArgs": (int, string) => int,
 }
 
 // let foo = (x: someMethods) => x["threeargs"](3, "a", 4)
 
 let bar = (x: someMethods) => {
   let f = x["twoArgs"]
-  f(. 3, "a")
+  f(3, "a")
 }

analysis/examples/larger-project/src/Docstrings.res

@@ -9,7 +9,7 @@ let flat = 34
   * @returns A signed message
  ")
 @genType
-let signMessage = (. message, key) => message ++ string_of_int(key)
+let signMessage = (message, key) => message ++ string_of_int(key)
 
 @genType
 let one = a => a + 0
@@ -21,31 +21,31 @@ let two = (a, b) => a + b + 0
 let tree = (a, b, c) => a + b + c + 0
 
 @genType
-let oneU = (. a) => a + 0
+let oneU = (a) => a + 0
 
 @genType
-let twoU = (. a, b) => a + b + 0
+let twoU = (a, b) => a + b + 0
 
 @genType
-let treeU = (. a, b, c) => a + b + c + 0
+let treeU = (a, b, c) => a + b + c + 0
 
 @genType
 let useParam = param => param + 34
 
 @genType
-let useParamU = (. param) => param + 34
+let useParamU = (param) => param + 34
 
 @genType
 let unnamed1 = (_: int) => 34
 
 @genType
-let unnamed1U = (. _: int) => 34
+let unnamed1U = (_: int) => 34
 
 @genType
 let unnamed2 = (_: int, _: int) => 34
 
 @genType
-let unnamed2U = (. _: int, _: int) => 34
+let unnamed2U = (_: int, _: int) => 34
 
 @genType
 let grouped = (~x, ~y, a, b, c, ~z) => x + y + a + b + c + z
@@ -54,7 +54,7 @@ let grouped = (~x, ~y, a, b, c, ~z) => x + y + a + b + c + z
 let unitArgWithoutConversion = () => "abc"
 
 @genType
-let unitArgWithoutConversionU = (. ()) => "abc"
+let unitArgWithoutConversionU = (()) => "abc"
 
 type t =
   | A
@@ -64,4 +64,4 @@ type t =
 let unitArgWithConversion = () => A
 
 @genType
-let unitArgWithConversionU = (. ()) => A
+let unitArgWithConversionU = (()) => A

analysis/examples/larger-project/src/ImportJsValue.res

@@ -31,15 +31,15 @@ let areaValue = area({x: 3, y: None})
 
 module AbsoluteValue = {
   @genType.import(("./MyMath", "AbsoluteValue"))
-  type t = {"getAbs": (. unit) => int}
+  type t = {"getAbs": (unit) => int}
 
   /* This is untyped */
   @send external getProp: t => int = "getProp"
 
   /* This is also untyped, as we "trust" the type declaration in absoluteVaue */
   let getAbs = (x: t) => {
     let getAbs = x["getAbs"]
-    getAbs(.)
+    getAbs()
   }
 }
 

analysis/examples/larger-project/src/Uncurried.res

@@ -1,26 +1,26 @@
 @genType
-type u0 = (. unit) => string
+type u0 = (unit) => string
 
 @genType
-type u1 = (. int) => string
+type u1 = (int) => string
 
 @genType
-type u2 = (. int, string) => string
+type u2 = (int, string) => string
 
 @genType
-type u3 = (. int, string, int) => string
+type u3 = (int, string, int) => string
 
 @genType
-let uncurried0 = (. ()) => ""
+let uncurried0 = (()) => ""
 
 @genType
-let uncurried1 = (. x) => x |> string_of_int
+let uncurried1 = (x) => x |> string_of_int
 
 @genType
-let uncurried2 = (. x, y) => (x |> string_of_int) ++ y
+let uncurried2 = (x, y) => (x |> string_of_int) ++ y
 
 @genType
-let uncurried3 = (. x, y, z) => (x |> string_of_int) ++ (y ++ (z |> string_of_int))
+let uncurried3 = (x, y, z) => (x |> string_of_int) ++ (y ++ (z |> string_of_int))
 
 @genType
 let curried3 = (x, y, z) => (x |> string_of_int) ++ (y ++ (z |> string_of_int))
@@ -29,19 +29,19 @@ let curried3 = (x, y, z) => (x |> string_of_int) ++ (y ++ (z |> string_of_int))
 let callback = cb => cb() |> string_of_int
 
 type auth = {login: unit => string}
-type authU = {loginU: (. unit) => string}
+type authU = {loginU: (unit) => string}
 
 @genType
 let callback2 = auth => auth.login()
 
 @genType
-let callback2U = auth => auth.loginU(.)
+let callback2U = auth => auth.loginU()
 
 @genType
-let sumU = (. n, m) => Js.log4("sumU 2nd arg", m, "result", n + m)
+let sumU = (n, m) => Js.log4("sumU 2nd arg", m, "result", n + m)
 
 @genType
-let sumU2 = (. n, . m) => Js.log4("sumU2 2nd arg", m, "result", n + m)
+let sumU2 = (n, m) => Js.log4("sumU2 2nd arg", m, "result", n + m)
 
 @genType
 let sumCurried = n => {

analysis/examples/larger-project/src/res_core.res

@@ -3882,7 +3882,7 @@ and parseArgument = p =>
       let uncurried = true
       Parser.next(p)
       switch p.token {
-      /* apply(.) */
+      /* apply() */
       | Rparen =>
         let unitExpr = Ast_helper.Exp.construct(Location.mknoloc(Longident.Lident("()")), None)
 
@@ -3992,12 +3992,12 @@ and parseCallExpr = (p, funExpr) => {
     if !loc.loc_ghost &&
     p.mode == ParseForTypeChecker => /* Since there is no syntax space for arity zero vs arity one,
      *  we expand
-     *    `fn(. ())` into
-     *    `fn(. {let __res_unit = (); __res_unit})`
+     *    `fn(())` into
+     *    `fn({let __res_unit = (); __res_unit})`
      *  when the parsetree is intended for type checking
      *
      *  Note:
-     *    `fn(.)` is treated as zero arity application.
+     *    `fn()` is treated as zero arity application.
      *  The invisible unit expression here has loc_ghost === true
      *
      *  Related: https://github.com/rescript-lang/syntax/issues/138

analysis/examples/larger-project/src/res_printer.res

@@ -1190,7 +1190,7 @@ and printTypeDeclarations = (~recFlag, typeDeclarations, cmtTbl) =>
  * type_declaration = {
  *    ptype_name: string loc;
  *    ptype_params: (core_type * variance) list;
- *          (* ('a1,...'an) t; None represents  _*)
+ *          (* ('a1, ...'an) t; None represents  _*)
  *    ptype_cstrs: (core_type * core_type * Location.t) list;
  *          (* ... constraint T1=T1'  ... constraint Tn=Tn' *)
  *    ptype_kind: type_kind;
@@ -4203,7 +4203,7 @@ and printArgumentsWithCallbackInFirstPosition = (~uncurried, args, cmtTbl) => {
    */
   let fitsOnOneLine = Doc.concat(list{
     if uncurried {
-      Doc.text("(. ")
+      Doc.text("(")
     } else {
       Doc.lparen
     },
@@ -4285,7 +4285,7 @@ and printArgumentsWithCallbackInLastPosition = (~uncurried, args, cmtTbl) => {
   /* Thing.map(foo, (arg1, arg2) => MyModuleBlah.toList(argument)) */
   let fitsOnOneLine = Doc.concat(list{
     if uncurried {
-      Doc.text("(.")
+      Doc.text("(")
     } else {
       Doc.lparen
     },
@@ -4300,7 +4300,7 @@ and printArgumentsWithCallbackInLastPosition = (~uncurried, args, cmtTbl) => {
    */
   let arugmentsFitOnOneLine = Doc.concat(list{
     if uncurried {
-      Doc.text("(.")
+      Doc.text("(")
     } else {
       Doc.lparen
     },
@@ -4347,8 +4347,8 @@ and printArguments = (~uncurried, args: list<(Asttypes.arg_label, Parsetree.expr
      * arity zero vs arity one syntax.
      * Related: https://github.com/rescript-lang/syntax/issues/138 */
     switch (uncurried, loc.loc_ghost) {
-    | (true, true) => Doc.text("(.)") /* arity zero */
-    | (true, false) => Doc.text("(. ())") /* arity one */
+    | (true, true) => Doc.text("()") /* arity zero */
+    | (true, false) => Doc.text("(())") /* arity one */
     | _ => Doc.text("()")
     }
   | list{(Nolabel, arg)} if ParsetreeViewer.isHuggableExpression(arg) =>
@@ -4363,7 +4363,7 @@ and printArguments = (~uncurried, args: list<(Asttypes.arg_label, Parsetree.expr
 
     Doc.concat(list{
       if uncurried {
-        Doc.text("(. ")
+        Doc.text("(")
       } else {
         Doc.lparen
       },
@@ -4374,7 +4374,7 @@ and printArguments = (~uncurried, args: list<(Asttypes.arg_label, Parsetree.expr
     Doc.group(
       Doc.concat(list{
         if uncurried {
-          Doc.text("(.")
+          Doc.text("(")
         } else {
           Doc.lparen
         },
@@ -4635,7 +4635,7 @@ and printExprFunParameters = (~inCallback, ~uncurried, ~hasConstraint, parameter
     }
 
     let lparen = if uncurried {
-      Doc.text("(. ")
+      Doc.text("(")
     } else {
       Doc.lparen
     }

analysis/examples/workspace-project/myplugin/src/Promise.res

@@ -4,7 +4,7 @@ exception JsExn(Js.Exn.t)
 external unsafeToJsExn: exn => Js.Exn.t = "%identity"
 
 @new
-external make: ((@uncurry (. 'a) => unit, (. 'e) => unit) => unit) => t<'a> = "Promise"
+external make: ((@uncurry ('a) => unit, ('e) => unit) => unit) => t<'a> = "Promise"
 
 @val @scope("Promise")
 external resolve: 'a => t<'a> = "resolve"

compiler/syntax/src/res_core.ml

@@ -1726,11 +1726,9 @@ and parse_es6_arrow_expression ?(arrow_attrs = []) ?(arrow_start_pos = None)
   let start_pos = p.Parser.start_pos in
   Parser.leave_breadcrumb p Grammar.Es6ArrowExpr;
   (* Parsing function parameters and attributes:
-     1. Basically, attributes outside of `(...)` are added to the function, except
-     the uncurried attribute `(.)` is added to the function. e.g. async, uncurried
-
+     1. Attributes outside of `(...)` are added to the function, e.g. async.
      2. Attributes inside `(...)` are added to the arguments regardless of whether
-     labeled, optional or nolabeled *)
+     labeled, optional or nolabeled. *)
   let parameters =
     match term_parameters with
     | Some params -> (None, params)
@@ -1807,9 +1805,6 @@ and parse_es6_arrow_expression ?(arrow_attrs = []) ?(arrow_start_pos = None)
   {arrow_expr with pexp_loc = {arrow_expr.pexp_loc with loc_start = start_pos}}
 
 (*
- * dotted_parameter ::=
- *   | . parameter
- *
  * parameter ::=
  *   | pattern
  *   | pattern : type
@@ -1827,14 +1822,10 @@ and parse_es6_arrow_expression ?(arrow_attrs = []) ?(arrow_start_pos = None)
  *)
 and parse_parameter p =
   if
-    p.Parser.token = Token.Typ || p.token = Tilde || p.token = Dot
+    p.Parser.token = Token.Typ || p.token = Tilde
     || Grammar.is_pattern_start p.token
   then
     let start_pos = p.Parser.start_pos in
-    let _ =
-      Parser.optional p Token.Dot
-      (* dot is ignored *)
-    in
     let attrs = parse_attributes p in
     if p.Parser.token = Typ then (
       Parser.next p;
@@ -1934,7 +1925,6 @@ and parse_parameter_list p =
  *   | _
  *   | lident
  *   | ()
- *   | (.)
  *   | ( parameter {, parameter} [,] )
  *)
 and parse_parameters p : fundef_type_param option * fundef_term_param list =
@@ -1983,7 +1973,6 @@ and parse_parameters p : fundef_type_param option * fundef_term_param list =
       ] )
   | Lparen ->
     Parser.next p;
-    ignore (Parser.optional p Dot);
     let type_params, term_params = parse_parameter_list p in
     let term_params =
       if term_params <> [] then term_params else [unit_term_parameter ()]
@@ -3902,29 +3891,13 @@ and parse_switch_expression p =
  *   | ~ label-name = ? _           (* syntax sugar *)
  *   | ~ label-name = ? expr : type
  *
- *  dotted_argument ::=
- *   | . argument
  *)
 and parse_argument p : argument option =
   if
     p.Parser.token = Token.Tilde
-    || p.token = Dot || p.token = Underscore
+    || p.token = Underscore
     || Grammar.is_expr_start p.token
-  then
-    match p.Parser.token with
-    | Dot -> (
-      Parser.next p;
-      match p.token with
-      (* apply(.) *)
-      | Rparen ->
-        let unit_expr =
-          Ast_helper.Exp.construct
-            (Location.mknoloc (Longident.Lident "()"))
-            None
-        in
-        Some {label = Asttypes.Nolabel; expr = unit_expr}
-      | _ -> parse_argument2 p)
-    | _ -> parse_argument2 p
+  then parse_argument2 p
   else None
 
 and parse_argument2 p : argument option =
@@ -4614,9 +4587,6 @@ and parse_type_alias p typ =
  * note:
  *  | attrs ~ident: type_expr    -> attrs are on the arrow
  *  | attrs type_expr            -> attrs are here part of the type_expr
- *
- * dotted_type_parameter ::=
- *  | . type_parameter
  *)
 and parse_type_parameter p =
   let doc_attr : Parsetree.attributes =
@@ -4626,16 +4596,8 @@ and parse_type_parameter p =
       [doc_comment_to_attribute loc s]
     | _ -> []
   in
-  if
-    p.Parser.token = Token.Tilde
-    || p.token = Dot
-    || Grammar.is_typ_expr_start p.token
-  then
+  if p.Parser.token = Token.Tilde || Grammar.is_typ_expr_start p.token then
     let start_pos = p.Parser.start_pos in
-    let _ =
-      Parser.optional p Dot
-      (* dot is ignored *)
-    in
     let attrs = doc_attr @ parse_attributes p in
     match p.Parser.token with
     | Tilde -> (