add bitxor

Co-authored-by: Hyeseong Kim <[email protected]>

Author: MiryangJung

compiler/ml/unified_ops.ml

@@ -172,11 +172,11 @@ let entries =
           float = Some Ppowfloat;
           bigint = Some Ppowbigint;
           string = None;
-        }
+        };
     };
     {
       path = builtin "^";
-      name = "%xor";
+      name = "%bitxor";
       form = Binary;
       specialization =
         {

compiler/syntax/src/res_diagnostics.ml

@@ -65,14 +65,8 @@ let explain t =
   | UnclosedTemplate ->
     "Did you forget to close this template expression with a backtick?"
   | UnclosedComment -> "This comment seems to be missing a closing `*/`"
-  | UnknownUchar uchar -> (
-    match uchar with
-    | '^' ->
-      "Not sure what to do with this character.\n"
-      ^ "  If you're trying to dereference a mutable value, use \
-         `myValue.contents` instead.\n"
-      ^ "  To concatenate strings, use `\"a\" ++ \"b\"` instead."
-    | _ -> "Not sure what to do with this character.")
+  | UnknownUchar uchar ->
+    "Not sure what to do with this character \"" ^ Char.escaped uchar ^ "\""
   | Expected {context; token = t} ->
     let hint =
       match context with

compiler/syntax/src/res_parens.ml

@@ -162,8 +162,7 @@ let rhs_binary_expr_operand parent_operator rhs =
           };
         args = [(_, _left); (_, _right)];
       }
-    when ParsetreeViewer.is_binary_operator operator
-         && not (operator_loc.loc_ghost && operator = "++") ->
+    when ParsetreeViewer.not_ghost_operator operator operator_loc ->
     let prec_parent = ParsetreeViewer.operator_precedence parent_operator in
     let prec_child = ParsetreeViewer.operator_precedence operator in
     prec_parent == prec_child
@@ -180,8 +179,7 @@ let flatten_operand_rhs parent_operator rhs =
           };
         args = [(_, _left); (_, _right)];
       }
-    when ParsetreeViewer.is_binary_operator operator
-         && not (operator_loc.loc_ghost && operator = "++") ->
+    when ParsetreeViewer.not_ghost_operator operator operator_loc ->
     let prec_parent = ParsetreeViewer.operator_precedence parent_operator in
     let prec_child = ParsetreeViewer.operator_precedence operator in
     prec_parent >= prec_child || rhs.pexp_attributes <> []

compiler/syntax/src/res_parsetree_viewer.ml

@@ -272,11 +272,12 @@ let operator_precedence operator =
   | ":=" -> 1
   | "||" -> 2
   | "&&" -> 3
-  | "==" | "===" | "<" | ">" | "!=" | "<>" | "!==" | "<=" | ">=" | "|>" -> 4
-  | "+" | "+." | "-" | "-." | "++" -> 5
-  | "*" | "*." | "/" | "/." | "%" -> 6
-  | "**" -> 7
-  | "#" | "##" | "->" -> 8
+  | "^" -> 4
+  | "==" | "===" | "<" | ">" | "!=" | "<>" | "!==" | "<=" | ">=" | "|>" -> 5
+  | "+" | "+." | "-" | "-." | "++" -> 6
+  | "*" | "*." | "/" | "/." | "%" -> 7
+  | "**" -> 8
+  | "#" | "##" | "->" -> 9
   | _ -> 0
 
 let is_unary_operator operator =
@@ -295,15 +296,17 @@ let is_unary_expression expr =
     true
   | _ -> false
 
-(* TODO: tweak this to check for ghost ^ as template literal *)
 let is_binary_operator operator =
   match operator with
   | ":=" | "||" | "&&" | "==" | "===" | "<" | ">" | "!=" | "!==" | "<=" | ">="
   | "|>" | "+" | "+." | "-" | "-." | "++" | "*" | "*." | "/" | "/." | "**"
-  | "->" | "<>" | "%" ->
+  | "->" | "<>" | "%" | "^" ->
     true
   | _ -> false
 
+let not_ghost_operator operator (loc : Location.t) =
+  is_binary_operator operator && not (loc.loc_ghost && operator = "++")
+
 let is_binary_expression expr =
   match expr.pexp_desc with
   | Pexp_apply
@@ -315,9 +318,7 @@ let is_binary_expression expr =
           };
         args = [(Nolabel, _operand1); (Nolabel, _operand2)];
       }
-    when is_binary_operator operator
-         && not (operator_loc.loc_ghost && operator = "++")
-         (* template literal *) ->
+    when not_ghost_operator operator operator_loc ->
     true
   | _ -> false
 

compiler/syntax/src/res_parsetree_viewer.mli

@@ -65,6 +65,7 @@ val is_huggable_rhs : Parsetree.expression -> bool
 
 val operator_precedence : string -> int
 
+val not_ghost_operator : string -> Location.t -> bool
 val is_unary_expression : Parsetree.expression -> bool
 val is_binary_operator : string -> bool
 val is_binary_expression : Parsetree.expression -> bool

compiler/syntax/src/res_scanner.ml

@@ -834,6 +834,9 @@ let rec scan scanner =
       | _ ->
         next scanner;
         Token.Band)
+    | '^' ->
+      next scanner;
+      Token.Caret
     | ':' -> (
       match peek scanner with
       | '=' ->

compiler/syntax/src/res_token.ml

@@ -78,6 +78,7 @@ type t =
   | Land
   | Lor
   | Band (* Bitwise and: & *)
+  | Caret
   | BangEqual
   | BangEqualEqual
   | LessEqual
@@ -102,14 +103,15 @@ let precedence = function
   | HashEqual | ColonEqual -> 1
   | Lor -> 2
   | Land -> 3
+  | Caret -> 4
   | Equal | EqualEqual | EqualEqualEqual | LessThan | GreaterThan | BangEqual
   | BangEqualEqual | LessEqual | GreaterEqual | BarGreater ->
-    4
-  | Plus | PlusDot | Minus | MinusDot | PlusPlus -> 5
-  | Asterisk | AsteriskDot | Forwardslash | ForwardslashDot | Percent -> 6
-  | Exponentiation -> 7
-  | MinusGreater -> 8
-  | Dot -> 9
+    5
+  | Plus | PlusDot | Minus | MinusDot | PlusPlus -> 6
+  | Asterisk | AsteriskDot | Forwardslash | ForwardslashDot | Percent -> 7
+  | Exponentiation -> 8
+  | MinusGreater -> 9
+  | Dot -> 10
   | _ -> 0
 
 let to_string = function
@@ -189,6 +191,7 @@ let to_string = function
   | Of -> "of"
   | Lor -> "||"
   | Band -> "&"
+  | Caret -> "^"
   | Land -> "&&"
   | BangEqual -> "!="
   | BangEqualEqual -> "!=="

runtime/Pervasives.res

@@ -52,7 +52,7 @@ external \"/": ('a, 'a) => 'a = "%div"
 external \"%": ('a, 'a) => 'a = "%mod"
 external mod: ('a, 'a) => 'a = "%mod"
 external \"**": ('a, 'a) => 'a = "%pow"
-external \"^": ('a, 'a) => 'a = "%xor"
+external \"^": ('a, 'a) => 'a = "%bitxor"
 
 /* Comparisons */
 /* Note: Later comparisons will be converted to unified operations too */

runtime/Pervasives_mini.res

@@ -31,7 +31,7 @@ external \"/": (int, int) => int = "%divint"
 external \"%": (int, int) => int = "%modint"
 external mod: (int, int) => int = "%modint"
 external \"**": (int, int) => int = "%powint"
-external \"^": (int, int) => int = "%xorint"
+external \"^": (int, int) => int = "%bitxorint"
 
 /* Comparisons */
 /* Note: Later comparisons will be converted to unified operations too */

tests/syntax_tests/data/parsing/errors/pattern/expected/templateLiteral.res.txt

@@ -20,7 +20,7 @@
   6 │ | _ => ()
   7 │ }
 
-  Not sure what to do with this character.
+  Not sure what to do with this character "$"
 
 
   Syntax error!

tests/syntax_tests/data/parsing/errors/scanner/expected/badCharacter.res.txt

@@ -4,7 +4,7 @@
 
   1 │ let $ = 1
 
-  Not sure what to do with this character.
+  Not sure what to do with this character "$"
 
 
   Syntax error!

tests/syntax_tests/data/parsing/errors/scanner/expected/oldDerefOp.res.txt

@@ -1,26 +1,23 @@
 
   Syntax error!
-  syntax_tests/data/parsing/errors/scanner/oldDerefOp.res:1:50
+  syntax_tests/data/parsing/errors/scanner/oldDerefOp.res:1:51
 
   1 │ let newVelocity = velocity +. a *. secondPerFrame^;
   2 │ let newX = x +. newVelocity *. secondPerFrame^;
   3 │ 
 
-  Not sure what to do with this character.
-  If you're trying to dereference a mutable value, use `myValue.contents` instead.
-  To concatenate strings, use `"a" ++ "b"` instead.
+  Did you forget to write an expression here?
 
 
   Syntax error!
-  syntax_tests/data/parsing/errors/scanner/oldDerefOp.res:2:46
+  syntax_tests/data/parsing/errors/scanner/oldDerefOp.res:2:47
 
   1 │ let newVelocity = velocity +. a *. secondPerFrame^;
   2 │ let newX = x +. newVelocity *. secondPerFrame^;
   3 │ 
 
-  Not sure what to do with this character.
-  If you're trying to dereference a mutable value, use `myValue.contents` instead.
-  To concatenate strings, use `"a" ++ "b"` instead.
+  Did you forget to write an expression here?
 
-let newVelocity = velocity +. (a *. secondPerFrame)
-let newX = x +. (newVelocity *. secondPerFrame)
+let newVelocity =
+  (velocity +. (a *. secondPerFrame)) ^ ([%rescript.exprhole ])
+let newX = (x +. (newVelocity *. secondPerFrame)) ^ ([%rescript.exprhole ])

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

@@ -14,6 +14,7 @@ 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/printer/expr/expected/binary.res.txt

@@ -85,6 +85,7 @@ let () = (print_int: int => unit)((x: int))
 x + y / z
 x / y + z
 x % y * z
+x ^ y + z
 100 * x / total
 2 / 3 * 10 / 2 + 2
 let rotateX = (range / rect.height * refY - range / 2) * getXMultiplication(rect.width)

tests/tests/src/belt_int_test.mjs

@@ -36,6 +36,7 @@ Mocha.describe("Belt_int_test", () => {
     Test_utils.eq("File \"belt_int_test.res\", line 41, characters 7-14", 6, 6);
     Test_utils.eq("File \"belt_int_test.res\", line 42, characters 7-14", 0, 0);
     Test_utils.eq("File \"belt_int_test.res\", line 43, characters 7-14", 0, 0);
+    Test_utils.eq("File \"belt_int_test.res\", line 44, characters 7-14", 1, 1);
   });
 });
 

tests/tests/src/unified_ops_test.mjs

@@ -67,6 +67,14 @@ let pow3 = 2n ** 2n;
 
 let pow_overflow = 0;
 
+function bxor_int(a, b) {
+  return a ^ b;
+}
+
+function bxor_bigint(a, b) {
+  return a ^ b;
+}
+
 let int = 3;
 
 export {
@@ -91,5 +99,7 @@ export {
   pow2,
   pow3,
   pow_overflow,
+  bxor_int,
+  bxor_bigint,
 }
 /* No side effect */

tests/tests/src/unified_ops_test.res

@@ -27,4 +27,5 @@ let pow3 = 2n ** 2n
 
 let pow_overflow = 2147483647 ** 2
 
-let lxor = (a, b: int) => a ^ b
+let bxor_int = (a, b) => a ^ b
+let bxor_bigint = (a: bigint, b) => a ^ b