switch to F#-style binary operators

Author: cometkim

compiler/ml/unified_ops.ml

@@ -208,7 +208,7 @@ let entries =
         };
     };
     {
-      path = builtin "~~";
+      path = builtin "~~~";
       name = "%bitnot";
       form = Unary;
       specialization =
@@ -221,20 +221,20 @@ let entries =
         };
     };
     {
-      path = builtin "&";
-      name = "%bitand";
+      path = builtin "|||";
+      name = "%bitor";
       form = Binary;
       specialization =
         {
-          int = Pandint;
+          int = Porint;
           bool = None;
           float = None;
-          bigint = Some Pandbigint;
+          bigint = Some Porbigint;
           string = None;
         };
     };
     {
-      path = builtin "^";
+      path = builtin "^^^";
       name = "%bitxor";
       form = Binary;
       specialization =
@@ -246,6 +246,19 @@ let entries =
           string = None;
         };
     };
+    {
+      path = builtin "&&&";
+      name = "%bitand";
+      form = Binary;
+      specialization =
+        {
+          int = Pandint;
+          bool = None;
+          float = None;
+          bigint = Some Pandbigint;
+          string = None;
+        };
+    };
   |]
 
 let index_by_path =

compiler/syntax/src/res_comments_table.ml

@@ -1496,7 +1496,7 @@ and walk_expression expr t comments =
                 {
                   txt =
                     Longident.Lident
-                      ("~+" | "~+." | "~-" | "~-." | "~~" | "not" | "!");
+                      ("~+" | "~+." | "~-" | "~-." | "~~~" | "not" | "!");
                 };
           };
         args = [(Nolabel, arg_expr)];
@@ -1517,7 +1517,8 @@ and walk_expression expr t comments =
                     Longident.Lident
                       ( ":=" | "||" | "&&" | "==" | "===" | "<" | ">" | "!="
                       | "!==" | "<=" | ">=" | "+" | "+." | "-" | "-." | "++"
-                      | "^" | "*" | "*." | "/" | "/." | "**" | "->" | "<>" );
+                      | "|||" | "^^^" | "&&&" | "*" | "*." | "/" | "/." | "**"
+                      | "->" | "<>" );
                 };
           };
         args = [(Nolabel, operand1); (Nolabel, operand2)];

compiler/syntax/src/res_core.ml

@@ -488,9 +488,12 @@ let make_unary_expr start_pos token_end token operand =
     }
   | (Minus | MinusDot), Pexp_constant (Pconst_float (n, m)) ->
     {operand with pexp_desc = Pexp_constant (Pconst_float (negate_string n, m))}
-  | (Token.Plus | PlusDot | Minus | MinusDot | Tilde), _ ->
+  | (Token.Plus | PlusDot | Minus | MinusDot | Bnot), _ ->
     let token_loc = mk_loc start_pos token_end in
-    let operator = "~" ^ Token.to_string token in
+    let token_string = Token.to_string token in
+    let operator =
+      if token_string.[0] = '~' then token_string else "~" ^ token_string
+    in
     Ast_helper.Exp.apply
       ~loc:(mk_loc start_pos operand.Parsetree.pexp_loc.loc_end)
       (Ast_helper.Exp.ident ~loc:token_loc
@@ -2265,7 +2268,7 @@ and parse_primary_expr ~operand ?(no_call = false) p =
 and parse_unary_expr p =
   let start_pos = p.Parser.start_pos in
   match p.Parser.token with
-  | (Minus | MinusDot | Plus | PlusDot | Bang | Tilde) as token ->
+  | (Minus | MinusDot | Plus | PlusDot | Bang | Bnot) as token ->
     Parser.leave_breadcrumb p Grammar.ExprUnary;
     let token_end = p.end_pos in
     Parser.next p;

compiler/syntax/src/res_grammar.ml

@@ -151,8 +151,9 @@ let is_atomic_typ_expr_start = function
 let is_expr_start = function
   | Token.Assert | At | Await | Backtick | Bang | Codepoint _ | False | Float _
   | For | Hash | If | Int _ | Lbrace | Lbracket | LessThan | Lident _ | List
-  | Lparen | Minus | MinusDot | Module | Percent | Plus | PlusDot | Tilde
-  | String _ | Switch | True | Try | Uident _ | Underscore (* _ => doThings() *)
+  | Lparen | Minus | MinusDot | Module | Percent | Plus | PlusDot | Bnot | Bor
+  | Bxor | Band | String _ | Switch | True | Try | Uident _
+  | Underscore (* _ => doThings() *)
   | While | Forwardslash | ForwardslashDot | Dict ->
     true
   | _ -> false

compiler/syntax/src/res_parens.ml

@@ -129,7 +129,6 @@ let binary_expr_operand ~is_lhs expr =
     | _ when Ast_uncurried.expr_is_uncurried_fun expr -> Parenthesized
     | expr when ParsetreeViewer.is_binary_expression expr -> Parenthesized
     | expr when ParsetreeViewer.is_ternary_expr expr -> Parenthesized
-    | expr when ParsetreeViewer.is_unary_bitnot_expression expr -> Parenthesized
     | {pexp_desc = Pexp_assert _} when is_lhs -> Parenthesized
     | _ when ParsetreeViewer.expr_is_await expr -> Parenthesized
     | {Parsetree.pexp_attributes = attrs} ->

compiler/syntax/src/res_parsetree_viewer.ml

@@ -267,19 +267,20 @@ let operator_precedence operator =
   | ":=" -> 1
   | "||" -> 2
   | "&&" -> 3
-  | "^" -> 4
-  | "&" -> 5
-  | "==" | "===" | "<" | ">" | "!=" | "<>" | "!==" | "<=" | ">=" -> 6
-  | "<<" | ">>" | ">>>" -> 7
-  | "+" | "+." | "-" | "-." | "++" -> 8
-  | "*" | "*." | "/" | "/." | "%" -> 9
-  | "**" -> 10
-  | "#" | "##" | "->" -> 11
+  | "|||" -> 4
+  | "^^^" -> 5
+  | "&&&" -> 6
+  | "==" | "===" | "<" | ">" | "!=" | "<>" | "!==" | "<=" | ">=" -> 7
+  | "<<" | ">>" | ">>>" -> 8
+  | "+" | "+." | "-" | "-." | "++" -> 9
+  | "*" | "*." | "/" | "/." | "%" -> 10
+  | "**" -> 11
+  | "#" | "##" | "->" -> 12
   | _ -> 0
 
 let is_unary_operator operator =
   match operator with
-  | "~+" | "~+." | "~-" | "~-." | "~~" | "not" -> true
+  | "~+" | "~+." | "~-" | "~-." | "~~~" | "not" -> true
   | _ -> false
 
 let is_unary_expression expr =
@@ -293,21 +294,11 @@ let is_unary_expression expr =
     true
   | _ -> false
 
-let is_unary_bitnot_expression expr =
-  match expr.pexp_desc with
-  | Pexp_apply
-      {
-        funct = {pexp_desc = Pexp_ident {txt = Longident.Lident "~~"}};
-        args = [(Nolabel, _arg)];
-      } ->
-    true
-  | _ -> false
-
 let is_binary_operator operator =
   match operator with
   | ":=" | "||" | "&&" | "==" | "===" | "<" | ">" | "!=" | "!==" | "<=" | ">="
   | "+" | "+." | "-" | "-." | "++" | "*" | "*." | "/" | "/." | "**" | "->"
-  | "<>" | "%" | "&" | "^" | "<<" | ">>" | ">>>" ->
+  | "<>" | "%" | "|||" | "^^^" | "&&&" | "<<" | ">>" | ">>>" ->
     true
   | _ -> false
 

compiler/syntax/src/res_parsetree_viewer.mli

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

compiler/syntax/src/res_printer.ml

@@ -3777,7 +3777,7 @@ and print_unary_expression ~state expr cmt_tbl =
       | "~+." -> "+."
       | "~-" -> "-"
       | "~-." -> "-."
-      | "~~" -> "~"
+      | "~~~" -> "~~~"
       | "not" -> "!"
       | _ -> assert false)
   in
@@ -5101,8 +5101,6 @@ and print_argument ~state (arg_lbl, arg) cmt_tbl =
       match Parens.expr expr with
       | Parenthesized -> add_parens doc
       | Braced braces -> print_braces doc expr braces
-      | Nothing when ParsetreeViewer.is_unary_bitnot_expression expr ->
-        add_parens doc
       | Nothing -> doc
     in
     let loc = {arg_loc with loc_end = expr.pexp_loc.loc_end} in

compiler/syntax/src/res_scanner.ml

@@ -756,9 +756,14 @@ let rec scan scanner =
     | '`' ->
       next scanner;
       Token.Backtick
-    | '~' ->
-      next scanner;
-      Token.Tilde
+    | '~' -> (
+      match (peek scanner, peek2 scanner) with
+      | '~', '~' ->
+        next3 scanner;
+        Token.Bnot
+      | _ ->
+        next scanner;
+        Token.Tilde)
     | '?' ->
       next scanner;
       Token.Question
@@ -830,24 +835,35 @@ let rec scan scanner =
         next scanner;
         Token.Percent)
     | '|' -> (
-      match peek scanner with
-      | '|' ->
+      match (peek scanner, peek2 scanner) with
+      | '|', '|' ->
+        next3 scanner;
+        Token.Bor
+      | '|', _ ->
         next2 scanner;
         Token.Lor
       | _ ->
         next scanner;
         Token.Bar)
     | '&' -> (
-      match peek scanner with
-      | '&' ->
+      match (peek scanner, peek2 scanner) with
+      | '&', '&' ->
+        next3 scanner;
+        Token.Band
+      | '&', _ ->
         next2 scanner;
         Token.Land
       | _ ->
         next scanner;
         Token.Band)
-    | '^' ->
-      next scanner;
-      Token.Caret
+    | '^' -> (
+      match (peek scanner, peek2 scanner) with
+      | '^', '^' ->
+        next3 scanner;
+        Token.Bxor
+      | _ ->
+        next scanner;
+        Token.Caret)
     | ':' -> (
       match peek scanner with
       | '=' ->

compiler/syntax/src/res_token.ml

@@ -25,6 +25,7 @@ type t =
   | Equal
   | EqualEqual
   | EqualEqualEqual
+  | Ampersand
   | Bar
   | Lparen
   | Rparen
@@ -76,7 +77,10 @@ type t =
   | Of
   | Land
   | Lor
-  | Band (* Bitwise and: & *)
+  | Bnot (* Bitwise and: ~~~ *)
+  | Bor (* Bitwise and: ||| *)
+  | Bxor (* Bitwise and: ^^^ *)
+  | Band (* Bitwise and: &&& *)
   | Caret
   | BangEqual
   | BangEqualEqual
@@ -104,17 +108,18 @@ let precedence = function
   | HashEqual | ColonEqual -> 1
   | Lor -> 2
   | Land -> 3
-  | Caret -> 4
-  | Band -> 5
+  | Bor -> 4
+  | Bxor -> 5
+  | Band -> 6
   | Equal | EqualEqual | EqualEqualEqual | LessThan | GreaterThan | BangEqual
   | BangEqualEqual | LessEqual | GreaterEqual ->
-    6
-  | LeftShift | RightShift | RightShiftUnsigned -> 7
-  | Plus | PlusDot | Minus | MinusDot | PlusPlus -> 8
-  | Asterisk | AsteriskDot | Forwardslash | ForwardslashDot | Percent -> 9
-  | Exponentiation -> 10
-  | MinusGreater -> 11
-  | Dot -> 12
+    7
+  | LeftShift | RightShift | RightShiftUnsigned -> 8
+  | Plus | PlusDot | Minus | MinusDot | PlusPlus -> 9
+  | Asterisk | AsteriskDot | Forwardslash | ForwardslashDot | Percent -> 10
+  | Exponentiation -> 11
+  | MinusGreater -> 12
+  | Dot -> 13
   | _ -> 0
 
 let to_string = function
@@ -143,6 +148,7 @@ let to_string = function
   | EqualEqual -> "=="
   | EqualEqualEqual -> "==="
   | Eof -> "eof"
+  | Ampersand -> "&"
   | Bar -> "|"
   | As -> "as"
   | Lparen -> "("
@@ -193,7 +199,10 @@ let to_string = function
   | Module -> "module"
   | Of -> "of"
   | Lor -> "||"
-  | Band -> "&"
+  | Bnot -> "~~~"
+  | Bor -> "|||"
+  | Bxor -> "^^^"
+  | Band -> "&&&"
   | Caret -> "^"
   | Land -> "&&"
   | BangEqual -> "!="