Represent equality as == and ===.

Author: cristianoc

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

@@ -1236,8 +1236,8 @@ and walkExpr = (expr, t, comments) => {
             ":="
             | "||"
             | "&&"
-            | "="
             | "=="
+            | "==="
             | "<"
             | ">"
             | "!="

analysis/src/Xform.ml

@@ -93,15 +93,15 @@ module IfThenElse = struct
                         {
                           pexp_desc =
                             Pexp_ident
-                              {txt = Longident.Lident (("=" | "<>") as op)};
+                              {txt = Longident.Lident (("==" | "!=") as op)};
                         };
                       args = [(Nolabel, arg1); (Nolabel, arg2)];
                     };
               },
               e1,
               Some e2 )
           when Loc.hasPos ~pos e.pexp_loc -> (
-          let e1, e2 = if op = "=" then (e1, e2) else (e2, e1) in
+          let e1, e2 = if op = "==" then (e1, e2) else (e2, e1) in
           let mkMatch ~arg ~pat =
             let cases =
               [

compiler/ml/ast_mapper_from0.ml

@@ -324,7 +324,19 @@ module E = struct
           {e with pexp_desc = Pexp_ident {lid with txt = Longident.Lident "!="}}
         | ( Pexp_ident ({txt = Longident.Lident "!="} as lid),
             [(Nolabel, _); (Nolabel, _)] ) ->
-          {e with pexp_desc = Pexp_ident {lid with txt = Longident.Lident "!=="}}
+          {
+            e with
+            pexp_desc = Pexp_ident {lid with txt = Longident.Lident "!=="};
+          }
+        | ( Pexp_ident ({txt = Longident.Lident "="} as lid),
+            [(Nolabel, _); (Nolabel, _)] ) ->
+          {e with pexp_desc = Pexp_ident {lid with txt = Longident.Lident "=="}}
+        | ( Pexp_ident ({txt = Longident.Lident "=="} as lid),
+            [(Nolabel, _); (Nolabel, _)] ) ->
+          {
+            e with
+            pexp_desc = Pexp_ident {lid with txt = Longident.Lident "==="};
+          }
         | _ -> e
       in
       let process_partial_app_attribute attrs =

compiler/ml/ast_mapper_to0.ml

@@ -336,6 +336,12 @@ module E = struct
         | ( Pexp_ident ({txt = Longident.Lident "!=="} as lid),
             [(Nolabel, _); (Nolabel, _)] ) ->
           {e with pexp_desc = Pexp_ident {lid with txt = Longident.Lident "!="}}
+        | ( Pexp_ident ({txt = Longident.Lident "==="} as lid),
+            [(Nolabel, _); (Nolabel, _)] ) ->
+          {e with pexp_desc = Pexp_ident {lid with txt = Longident.Lident "=="}}
+        | ( Pexp_ident ({txt = Longident.Lident "=="} as lid),
+            [(Nolabel, _); (Nolabel, _)] ) ->
+          {e with pexp_desc = Pexp_ident {lid with txt = Longident.Lident "="}}
         | _ -> e
       in
       let attrs =

compiler/ml/error_message_utils.ml

@@ -204,7 +204,7 @@ let type_clash_context_from_function sexp sfunct =
   in
   match sfunct.Parsetree.pexp_desc with
   | Pexp_ident
-      {txt = Lident ("=" | "==" | "<>" | "!=" | ">" | ">=" | "<" | "<=")} ->
+      {txt = Lident ("==" | "===" | "!=" | "!==" | ">" | ">=" | "<" | "<=")} ->
     Some ComparisonOperator
   | Pexp_ident {txt = Lident "++"} -> Some StringConcat
   | Pexp_ident {txt = Lident (("/." | "*." | "+." | "-.") as operator)} ->

compiler/syntax/src/res_comments_table.ml

@@ -1338,7 +1338,7 @@ and walk_expression expr t comments =
                 {
                   txt =
                     Longident.Lident
-                      ( ":=" | "||" | "&&" | "=" | "==" | "<" | ">" | "!="
+                      ( ":=" | "||" | "&&" | "==" | "===" | "<" | ">" | "!="
                       | "!==" | "<=" | ">=" | "|>" | "+" | "+." | "-" | "-."
                       | "++" | "^" | "*" | "*." | "/" | "/." | "**" | "->"
                       | "<>" );

compiler/syntax/src/res_core.ml

@@ -396,8 +396,6 @@ let make_infix_operator (p : Parser.t) token start_pos end_pos =
       Parser.err ~start_pos ~end_pos p
         (Diagnostics.message "Did you mean `==` here?");
       "=")
-    else if token = Token.EqualEqual then "="
-    else if token = Token.EqualEqualEqual then "=="
     else Token.to_string token
   in
   let loc = mk_loc start_pos end_pos in

compiler/syntax/src/res_parsetree_viewer.ml

@@ -270,7 +270,7 @@ let operator_precedence operator =
   | ":=" -> 1
   | "||" -> 2
   | "&&" -> 3
-  | "=" | "==" | "<" | ">" | "!=" | "<>" | "!==" | "<=" | ">=" | "|>" -> 4
+  | "==" | "===" | "<" | ">" | "!=" | "<>" | "!==" | "<=" | ">=" | "|>" -> 4
   | "+" | "+." | "-" | "-." | "++" -> 5
   | "*" | "*." | "/" | "/." | "%" -> 6
   | "**" -> 7
@@ -296,7 +296,7 @@ let is_unary_expression expr =
 (* TODO: tweak this to check for ghost ^ as template literal *)
 let is_binary_operator operator =
   match operator with
-  | ":=" | "||" | "&&" | "=" | "==" | "<" | ">" | "!=" | "!==" | "<=" | ">="
+  | ":=" | "||" | "&&" | "==" | "===" | "<" | ">" | "!=" | "!==" | "<=" | ">="
   | "|>" | "+" | "+." | "-" | "-." | "++" | "*" | "*." | "/" | "/." | "**"
   | "->" | "<>" | "%" ->
     true
@@ -321,7 +321,7 @@ let is_binary_expression expr =
 
 let is_equality_operator operator =
   match operator with
-  | "=" | "==" | "!=" | "!==" -> true
+  | "==" | "===" | "!=" | "!==" -> true
   | _ -> false
 
 let is_rhs_binary_operator operator =

compiler/syntax/src/res_printer.ml

@@ -3662,12 +3662,6 @@ and print_unary_expression ~state expr cmt_tbl =
 
 and print_binary_expression ~state (expr : Parsetree.expression) cmt_tbl =
   let print_binary_operator ~inline_rhs operator =
-    let operator_txt =
-      match operator with
-      | "=" -> "=="
-      | "==" -> "==="
-      | txt -> txt
-    in
     let spacing_before_operator =
       if operator = "->" then Doc.soft_line
       else if operator = "|>" then Doc.line
@@ -3680,7 +3674,7 @@ and print_binary_expression ~state (expr : Parsetree.expression) cmt_tbl =
       else Doc.line
     in
     Doc.concat
-      [spacing_before_operator; Doc.text operator_txt; spacing_after_operator]
+      [spacing_before_operator; Doc.text operator; spacing_after_operator]
   in
   let print_operand ~is_lhs ~is_multiline expr parent_operator =
     let rec flatten ~is_lhs ~is_multiline expr parent_operator =

runtime/Pervasives.res

@@ -55,7 +55,7 @@ external mod: ('a, 'a) => 'a = "%mod"
 /* Comparisons */
 /* Note: Later comparisons will be converted to unified operations too */
 
-external \"=": ('a, 'a) => bool = "%equal"
+external \"==": ('a, 'a) => bool = "%equal"
 external \"!=": ('a, 'a) => bool = "%notequal"
 external \"<": ('a, 'a) => bool = "%lessthan"
 external \">": ('a, 'a) => bool = "%greaterthan"
@@ -64,7 +64,7 @@ external \">=": ('a, 'a) => bool = "%greaterequal"
 external compare: ('a, 'a) => int = "%compare"
 external min: ('a, 'a) => 'a = "%min"
 external max: ('a, 'a) => 'a = "%max"
-external \"==": ('a, 'a) => bool = "%eq"
+external \"===": ('a, 'a) => bool = "%eq"
 external \"!==": ('a, 'a) => bool = "%noteq"
 
 /* Boolean operations */

runtime/Pervasives_mini.res

@@ -34,7 +34,7 @@ external mod: (int, int) => int = "%modint"
 /* Comparisons */
 /* Note: Later comparisons will be converted to unified operations too */
 
-external \"=": ('a, 'a) => bool = "%equal"
+external \"==": ('a, 'a) => bool = "%equal"
 external \"!=": ('a, 'a) => bool = "%notequal"
 external \"<": ('a, 'a) => bool = "%lessthan"
 external \">": ('a, 'a) => bool = "%greaterthan"
@@ -43,7 +43,7 @@ external \">=": ('a, 'a) => bool = "%greaterequal"
 external compare: ('a, 'a) => int = "%compare"
 external min: ('a, 'a) => 'a = "%min"
 external max: ('a, 'a) => 'a = "%max"
-external \"==": ('a, 'a) => bool = "%eq"
+external \"===": ('a, 'a) => bool = "%eq"
 external \"!==": ('a, 'a) => bool = "%noteq"
 
 /* Boolean operations */

tests/syntax_tests/data/parsing/errors/expressions/expected/block.res.txt

@@ -75,7 +75,7 @@ let findThreadByIdLinearScan [arity:2]~threads:((threads)[@res.namedArgLoc ])
                | Group { id } -> id
                | Unknown { id } ->
                    (unknown.id -> Js.String.make) -> FBID.ofStringUnsafe in
-             thisId == id)
+             thisId === id)
            [@res.braces ])))
   [@res.braces ])
 let x = ((loop 0 (Nil -> (push doc)))[@res.braces ])

tests/syntax_tests/data/parsing/errors/structure/expected/letBinding.res.txt

@@ -99,7 +99,7 @@
 
 let rightResource =
   (ur.resources).find
-    (fun [arity:1]r -> r.account_id == ((connection.left).account).id)
+    (fun [arity:1]r -> r.account_id === ((connection.left).account).id)
 let x = ((let field = p -> parseFieldDeclaration in field)[@res.braces ])
 let t = ((let (_, _, token) = scanner -> scan in token)[@res.braces ])
 let (keyTable : int Belt.Map.String.t) = [%rescript.exprhole ]

tests/syntax_tests/data/parsing/grammar/expressions/expected/arrow.res.txt

@@ -52,9 +52,9 @@ let f [arity:4]~a:((a)[@res.namedArgLoc ][@attr ])  ((b)[@attrOnB ])
 let f [arity:1]list = list ()
 ;;match colour with
   | Red when
-      (l = l') ||
+      (l == l') ||
         (Clflags.classic.contents &&
-           ((l = Nolabel) && (not (is_optional l'))))
+           ((l == Nolabel) && (not (is_optional l'))))
       -> (t1, t2)
   | _ -> ()
 let arr =

tests/syntax_tests/data/parsing/grammar/expressions/expected/binary.res.txt

@@ -1,5 +1,5 @@
-;;node := (if newBalance == 2 then avl -> (rotateRight node) else node)
-;;node := ((if newBalance == 2 then avl -> (rotateRight node) else node)
+;;node := (if newBalance === 2 then avl -> (rotateRight node) else node)
+;;node := ((if newBalance === 2 then avl -> (rotateRight node) else node)
     [@attr ])
 let x = (match z with | _ -> false) z
 let x = ((match z with | _ -> false)[@attr ]) z
@@ -13,7 +13,7 @@ let x = while condition do () done z
 let x = ((while condition do () done)[@attr ]) z
 let x = (a + (-1)) + (-2)
 let x = (a + (((-1))[@attr ])) + (((-2))[@attr ])
-let x = (a % a) = 0
+let x = (a % a) == 0
 let x = a - b
 let x = a -. b
 ;;Constructor (a, b)

tests/syntax_tests/data/parsing/grammar/expressions/expected/binaryNoEs6Arrow.res.txt

@@ -1,25 +1,25 @@
-;;if (color == Black) && ((sibling == None) || (parent == None)) then ()
+;;if (color === Black) && ((sibling === None) || (parent === None)) then ()
 ;;if
-    ((color == Black) && ((!==) color Red)) &&
-      ((sibling == None) || (parent == None))
+    ((color === Black) && ((!==) color Red)) &&
+      ((sibling === None) || (parent === None))
   then ()
-;;match (color == Black) && ((sibling == None) || (parent == None)) with
+;;match (color === Black) && ((sibling === None) || (parent === None)) with
   | _ -> ()
-;;match ((color == Black) && ((!==) color Red)) &&
-          ((sibling == None) || (parent == None))
+;;match ((color === Black) && ((!==) color Red)) &&
+          ((sibling === None) || (parent === None))
   with
   | _ -> ()
-;;try (color == Black) && ((sibling == None) || (parent == None))
+;;try (color === Black) && ((sibling === None) || (parent === None))
   with | _ -> ()
 ;;try
-    ((color == Black) && (color == Red)) &&
-      ((sibling == None) || (parent == None))
+    ((color === Black) && (color === Red)) &&
+      ((sibling === None) || (parent === None))
   with | _ -> ()
-;;while (color == Black) && ((sibling == None) || (parent == None)) do ()
+;;while (color === Black) && ((sibling === None) || (parent === None)) do ()
     done
 ;;while
-    ((color == Black) && (color == Red)) &&
-      ((sibling == None) || (parent == None))
+    ((color === Black) && (color === Red)) &&
+      ((sibling === None) || (parent === None))
     do () done
 ;;((div
       ~onClick:((fun [arity:1]event ->

tests/syntax_tests/data/parsing/grammar/expressions/expected/block.res.txt

@@ -40,8 +40,8 @@ let res =
   [@res.braces ])
 let nestedLet = ((let _ = 1 in ())[@res.braces ])
 let nestedLet = ((let _ = 1 in 2)[@res.braces ])
-let init [arity:1]() = ((foo (1 == 1); [%assert 1 == 2])[@res.braces ])
-let init [arity:1]() = (([%assert 1 == 2]; foo (1 == 1); [%assert 1 == 2])
+let init [arity:1]() = ((foo (1 === 1); [%assert 1 === 2])[@res.braces ])
+let init [arity:1]() = (([%assert 1 === 2]; foo (1 === 1); [%assert 1 === 2])
   [@res.braces ])
 let f [arity:1]() = ((let x = 1 in fun [arity:1]_ -> ())[@res.braces ])
 let reifyStyle (type a) [arity:1](x : 'a) =
@@ -55,7 +55,7 @@ let reifyStyle (type a) [arity:1](x : 'a) =
               (({js|function(x,y) {return +(x instanceof y)}|js})
                 [@res.template ])] : 'a -> constructor -> bool (a:2))
        end in
-       ((if (Js.typeof x) = {js|string|js}
+       ((if (Js.typeof x) == {js|string|js}
          then Obj.magic String
          else
            if Internal.instanceOf x Internal.canvasGradient

tests/syntax_tests/data/parsing/grammar/expressions/expected/if.res.txt

@@ -1,8 +1,8 @@
 ;;if foo then true else false
-;;if foo = 2 then let bar = 1 in let foo = 2 in bar + foo
+;;if foo == 2 then let bar = 1 in let foo = 2 in bar + foo
 let ifThenElse = if foo then lala else doStuff x y z
 let ifElseIfThen =
-  if foo = bar
+  if foo == bar
   then f ()
-  else if foo = bar2 then f1 () else if foo = bar3 then f2 () else f3 ()
+  else if foo == bar2 then f1 () else if foo == bar3 then f2 () else f3 ()
 let x = (if true then 1 else 2) + (if false then 2 else 3)

tests/syntax_tests/data/parsing/grammar/expressions/expected/infix.res.txt

@@ -2,5 +2,5 @@
 ;;{js|string1|js} ++ {js|string2|js}
 ;;a != b
 ;;(!==) a b
-;;a = b
-;;a == b
+;;a == b
+;;a === b

tests/syntax_tests/data/parsing/grammar/expressions/expected/jsx.res.txt

@@ -159,7 +159,7 @@ let y =
                                      let pathFromState =
                                        Routes.stateToPath
                                          latestComponentBag.state in
-                                     ((if currentActualPath = pathFromState
+                                     ((if currentActualPath == pathFromState
                                        then None
                                        else
                                          dispatchEventless
@@ -220,7 +220,7 @@ let icon =
   [@JSX ])
 let _ =
   ((MessengerSharedPhotosAlbumViewPhotoReact.createElement
-      ?ref:((if foo#bar == baz
+      ?ref:((if foo#bar === baz
              then Some (foooooooooooooooooooooooo setRefChild)
              else None)[@res.namedArgLoc ][@res.ternary ])
       ~key:((node#legacy_attachment_id)[@res.namedArgLoc ]) ~children:[] ())

tests/syntax_tests/data/parsing/grammar/expressions/expected/underscoreApply.res.txt

@@ -9,7 +9,7 @@ let incr [arity:1]~v:((v)[@res.namedArgLoc ])  = v + 1
 let l1 = List.length (List.map (fun [arity:1]__x -> incr ~v:__x) [1; 2; 3])
 let l2 = List.length (List.map (fun [arity:1]__x -> incr ~v:__x) [1; 2; 3])
 let optParam [arity:2]?v:((v)[@res.namedArgLoc ])  () =
-  ((if v = None then 0 else 1)[@res.ternary ])
+  ((if v == None then 0 else 1)[@res.ternary ])
 let l1 =
   List.length
     (List.map (fun [arity:1]__x -> optParam ?v:__x ()) [Some 1; None; Some 2])