AST: represent concatenation internally as "++" instead of "^".

Author: cristianoc

compiler/syntax/src/res_core.ml

@@ -391,8 +391,7 @@ let build_longident words =
 
 let make_infix_operator (p : Parser.t) token start_pos end_pos =
   let stringified_token =
-    if token = Token.PlusPlus then "^"
-    else if token = Token.BangEqual then "<>"
+    if token = Token.BangEqual then "<>"
     else if token = Token.BangEqualEqual then "!="
     else if token = Token.Equal then (
       (* TODO: could have a totally different meaning like x->fooSet(y)*)
@@ -2327,7 +2326,7 @@ and parse_template_expr ?prefix p =
   in
 
   let hidden_operator =
-    let op = Location.mknoloc (Longident.Lident "^") in
+    let op = Location.mknoloc (Longident.Lident "++") in
     Ast_helper.Exp.ident op
   in
   let concat (e1 : Parsetree.expression) (e2 : Parsetree.expression) =

compiler/syntax/src/res_parens.ml

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

@@ -271,7 +271,7 @@ let operator_precedence operator =
   | "||" -> 2
   | "&&" -> 3
   | "=" | "==" | "<" | ">" | "!=" | "<>" | "!==" | "<=" | ">=" | "|>" -> 4
-  | "+" | "+." | "-" | "-." | "^" -> 5
+  | "+" | "+." | "-" | "-." | "++" -> 5
   | "*" | "*." | "/" | "/." | "%" -> 6
   | "**" -> 7
   | "#" | "##" | "->" -> 8
@@ -297,8 +297,8 @@ let is_unary_expression expr =
 let is_binary_operator operator =
   match operator with
   | ":=" | "||" | "&&" | "=" | "==" | "<" | ">" | "!=" | "!==" | "<=" | ">="
-  | "|>" | "+" | "+." | "-" | "-." | "^" | "*" | "*." | "/" | "/." | "**" | "->"
-  | "<>" | "%" ->
+  | "|>" | "+" | "+." | "-" | "-." | "++" | "*" | "*." | "/" | "/." | "**"
+  | "->" | "<>" | "%" ->
     true
   | _ -> false
 
@@ -314,7 +314,7 @@ let is_binary_expression expr =
         args = [(Nolabel, _operand1); (Nolabel, _operand2)];
       }
     when is_binary_operator operator
-         && not (operator_loc.loc_ghost && operator = "^")
+         && not (operator_loc.loc_ghost && operator = "++")
          (* template literal *) ->
     true
   | _ -> false
@@ -643,7 +643,7 @@ let is_template_literal expr =
   match expr.pexp_desc with
   | Pexp_apply
       {
-        funct = {pexp_desc = Pexp_ident {txt = Longident.Lident "^"}};
+        funct = {pexp_desc = Pexp_ident {txt = Longident.Lident "++"}};
         args = [(Nolabel, _); (Nolabel, _)];
       }
     when has_template_literal_attr expr.pexp_attributes ->

compiler/syntax/src/res_printer.ml

@@ -3557,7 +3557,7 @@ and print_template_literal ~state expr cmt_tbl =
     match expr.pexp_desc with
     | Pexp_apply
         {
-          funct = {pexp_desc = Pexp_ident {txt = Longident.Lident "^"}};
+          funct = {pexp_desc = Pexp_ident {txt = Longident.Lident "++"}};
           args = [(Nolabel, arg1); (Nolabel, arg2)];
         } ->
       let lhs = walk_expr arg1 in
@@ -3664,7 +3664,6 @@ and print_binary_expression ~state (expr : Parsetree.expression) cmt_tbl =
   let print_binary_operator ~inline_rhs operator =
     let operator_txt =
       match operator with
-      | "^" -> "++"
       | "=" -> "=="
       | "==" -> "==="
       | "<>" -> "!="
@@ -3800,7 +3799,7 @@ and print_binary_expression ~state (expr : Parsetree.expression) cmt_tbl =
         match expr.pexp_desc with
         | Pexp_apply
             {
-              funct = {pexp_desc = Pexp_ident {txt = Longident.Lident "^"; loc}};
+              funct = {pexp_desc = Pexp_ident {txt = Longident.Lident "++"; loc}};
               args = [(Nolabel, _); (Nolabel, _)];
             }
           when loc.loc_ghost ->

runtime/Pervasives.res

@@ -230,7 +230,7 @@ let classify_float = (x: float): fpclass =>
 
 /* String and byte sequence operations -- more in modules String and Bytes */
 
-external \"^": (string, string) => string = "%string_concat"
+external \"++": (string, string) => string = "%string_concat"
 
 /* Character operations -- more in module Char */
 

runtime/Pervasives_mini.res

@@ -78,7 +78,7 @@ external \"/.": (float, float) => float = "%divfloat"
 
 /* String operations */
 
-external \"^": (string, string) => string = "%string_concat"
+external \"++": (string, string) => string = "%string_concat"
 
 /* Unit operations */
 

tests/build_tests/super_errors/expected/primitives2.res.expected

@@ -7,6 +7,6 @@
   3 │ 
 
   This has type: int
-  But this function argument is expecting: string
+  But it's expected to have type: string
 
   You can convert int to string with Belt.Int.toString.

tests/build_tests/super_errors/expected/unicode_location.res.expected

@@ -8,6 +8,6 @@
   3 │ 
 
   This has type: int
-  But this function argument is expecting: string
+  But it's expected to have type: string
 
   You can convert int to string with Belt.Int.toString.

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

@@ -16,15 +16,15 @@ let wss = Server.make { port = 82 }
 let address = wss -> Server.address
 let log [arity:1]msg =
   Js.log
-    (((((({js|> Server: |js})[@res.template ]) ^ msg)[@res.template ]) ^
+    (((((({js|> Server: |js})[@res.template ]) ++ msg)[@res.template ]) ++
         (({js||js})[@res.template ]))[@res.template ])
 ;;log
-    (((((((((((((({js|Running on: |js})[@res.template ]) ^ address.address)
-                [@res.template ]) ^ (({js|:|js})[@res.template ]))
-              [@res.template ]) ^ (address.port -> string_of_int))
-            [@res.template ]) ^ (({js| (|js})[@res.template ]))
-          [@res.template ]) ^ address.family)
-        [@res.template ]) ^ (({js|)|js})[@res.template ]))[@res.template ])
+    (((((((((((((({js|Running on: |js})[@res.template ]) ++ address.address)
+                [@res.template ]) ++ (({js|:|js})[@res.template ]))
+              [@res.template ]) ++ (address.port -> string_of_int))
+            [@res.template ]) ++ (({js| (|js})[@res.template ]))
+          [@res.template ]) ++ address.family)
+        [@res.template ]) ++ (({js|)|js})[@res.template ]))[@res.template ])
 module ClientSet =
   struct
     module T =

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

@@ -1,6 +1,6 @@
 let greetUser async [arity:1]userId =
   ((let name = ((getUserName userId)[@res.await ]) in
-    ({js|Hello |js} ^ name) ^ {js|!|js})
+    ({js|Hello |js} ++ name) ++ {js|!|js})
   [@res.braces ])
 ;;async fun [arity:1]() -> 123
 let fetch = ((async fun [arity:1]url -> browserFetch url)[@res.braces ])

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

@@ -5,74 +5,74 @@ let s = (({js|multi
 string
 |js})[@res.template ])
 let s =
-  (((((({js||js})[@res.template ]) ^ foo)[@res.template ]) ^ (({js||js})
+  (((((({js||js})[@res.template ]) ++ foo)[@res.template ]) ++ (({js||js})
       [@res.template ]))
   [@res.template ])
 let s =
-  (((((({js|before|js})[@res.template ]) ^ foo)[@res.template ]) ^
+  (((((({js|before|js})[@res.template ]) ++ foo)[@res.template ]) ++
       (({js||js})[@res.template ]))
   [@res.template ])
 let s =
-  (((((({js|before |js})[@res.template ]) ^ foo)[@res.template ]) ^
+  (((((({js|before |js})[@res.template ]) ++ foo)[@res.template ]) ++
       (({js||js})[@res.template ]))
   [@res.template ])
 let s =
-  (((((({js|before  |js})[@res.template ]) ^ foo)[@res.template ]) ^
+  (((((({js|before  |js})[@res.template ]) ++ foo)[@res.template ]) ++
       (({js||js})[@res.template ]))
   [@res.template ])
 let s =
-  (((((({js||js})[@res.template ]) ^ foo)[@res.template ]) ^ (({js|after|js})
-      [@res.template ]))
+  (((((({js||js})[@res.template ]) ++ foo)[@res.template ]) ++
+      (({js|after|js})[@res.template ]))
   [@res.template ])
 let s =
-  (((((({js||js})[@res.template ]) ^ foo)[@res.template ]) ^
+  (((((({js||js})[@res.template ]) ++ foo)[@res.template ]) ++
       (({js| after|js})[@res.template ]))
   [@res.template ])
 let s =
-  (((((({js||js})[@res.template ]) ^ foo)[@res.template ]) ^
+  (((((({js||js})[@res.template ]) ++ foo)[@res.template ]) ++
       (({js|  after|js})[@res.template ]))
   [@res.template ])
 let s =
-  (((((((((({js||js})[@res.template ]) ^ foo)[@res.template ]) ^ (({js||js})
-          [@res.template ]))
-        [@res.template ]) ^ bar)
-      [@res.template ]) ^ (({js||js})[@res.template ]))
+  (((((((((({js||js})[@res.template ]) ++ foo)[@res.template ]) ++
+          (({js||js})[@res.template ]))
+        [@res.template ]) ++ bar)
+      [@res.template ]) ++ (({js||js})[@res.template ]))
   [@res.template ])
 let s =
-  (((((((((((((({js||js})[@res.template ]) ^ foo)[@res.template ]) ^
+  (((((((((((((({js||js})[@res.template ]) ++ foo)[@res.template ]) ++
               (({js||js})[@res.template ]))
-            [@res.template ]) ^ bar)
-          [@res.template ]) ^ (({js||js})[@res.template ]))
-        [@res.template ]) ^ baz)
-      [@res.template ]) ^ (({js||js})[@res.template ]))
+            [@res.template ]) ++ bar)
+          [@res.template ]) ++ (({js||js})[@res.template ]))
+        [@res.template ]) ++ baz)
+      [@res.template ]) ++ (({js||js})[@res.template ]))
   [@res.template ])
 let s =
-  (((((((((({js||js})[@res.template ]) ^ foo)[@res.template ]) ^ (({js| |js})
-          [@res.template ]))
-        [@res.template ]) ^ bar)
-      [@res.template ]) ^ (({js||js})[@res.template ]))
+  (((((((((({js||js})[@res.template ]) ++ foo)[@res.template ]) ++
+          (({js| |js})[@res.template ]))
+        [@res.template ]) ++ bar)
+      [@res.template ]) ++ (({js||js})[@res.template ]))
   [@res.template ])
 let s =
-  (((((((((((((({js||js})[@res.template ]) ^ foo)[@res.template ]) ^
+  (((((((((((((({js||js})[@res.template ]) ++ foo)[@res.template ]) ++
               (({js| |js})[@res.template ]))
-            [@res.template ]) ^ bar)
-          [@res.template ]) ^ (({js| |js})[@res.template ]))
-        [@res.template ]) ^ baz)
-      [@res.template ]) ^ (({js||js})[@res.template ]))
+            [@res.template ]) ++ bar)
+          [@res.template ]) ++ (({js| |js})[@res.template ]))
+        [@res.template ]) ++ baz)
+      [@res.template ]) ++ (({js||js})[@res.template ]))
   [@res.template ])
 let s =
-  (((((((((({js| before |js})[@res.template ]) ^ foo)[@res.template ]) ^
+  (((((((((({js| before |js})[@res.template ]) ++ foo)[@res.template ]) ++
           (({js| |js})[@res.template ]))
-        [@res.template ]) ^ bar)
-      [@res.template ]) ^ (({js| after |js})[@res.template ]))
+        [@res.template ]) ++ bar)
+      [@res.template ]) ++ (({js| after |js})[@res.template ]))
   [@res.template ])
 let s =
-  (((((((((((((({js|before |js})[@res.template ]) ^ foo)[@res.template ]) ^
+  (((((((((((((({js|before |js})[@res.template ]) ++ foo)[@res.template ]) ++
               (({js| middle |js})[@res.template ]))
-            [@res.template ]) ^ bar)
-          [@res.template ]) ^ (({js| |js})[@res.template ]))
-        [@res.template ]) ^ baz)
-      [@res.template ]) ^ (({js| wow |js})[@res.template ]))
+            [@res.template ]) ++ bar)
+          [@res.template ]) ++ (({js| |js})[@res.template ]))
+        [@res.template ]) ++ baz)
+      [@res.template ]) ++ (({js| wow |js})[@res.template ]))
   [@res.template ])
 let s =
   (({js|
@@ -93,15 +93,15 @@ let s = (({js|$dollar without $braces $interpolation|js})[@res.template ])
 let s = (({json|null|json})[@res.template ])
 let x = (({js|foo\`bar\$\\foo|js})[@res.template ])
 let x =
-  (((((((((({js|foo\`bar\$\\foo|js})[@res.template ]) ^ a)[@res.template ]) ^
-          (({js| \` |js})[@res.template ]))
-        [@res.template ]) ^ b)
-      [@res.template ]) ^ (({js| \` xx|js})[@res.template ]))
+  (((((((((({js|foo\`bar\$\\foo|js})[@res.template ]) ++ a)[@res.template ])
+          ++ (({js| \` |js})[@res.template ]))
+        [@res.template ]) ++ b)
+      [@res.template ]) ++ (({js| \` xx|js})[@res.template ]))
   [@res.template ])
 let thisIsFine = (({js|$something|js})[@res.template ])
 let thisIsAlsoFine = (({js|fine\$|js})[@res.template ])
 let isThisFine = (({js|shouldBeFine$|js})[@res.template ])
-;;(((((({js|$|js})[@res.template ]) ^ dollarAmountInt)[@res.template ]) ^
+;;(((((({js|$|js})[@res.template ]) ++ dollarAmountInt)[@res.template ]) ++
       (({js||js})[@res.template ]))[@res.template ])
-;;(((((({js|\$|js})[@res.template ]) ^ dollarAmountInt)[@res.template ]) ^
+;;(((((({js|\$|js})[@res.template ]) ++ dollarAmountInt)[@res.template ]) ++
       (({js||js})[@res.template ]))[@res.template ])

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

@@ -1,5 +1,5 @@
 ;;a -> (f b)
-;;{js|string1|js} ^ {js|string2|js}
+;;{js|string1|js} ++ {js|string2|js}
 ;;a <> b
 ;;a != b
 ;;a = b

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

@@ -534,8 +534,9 @@ let _ =
 let _ =
   ((div
       ~children:[(((let left = limit -> Int.toString in
-                    (((((({js||js})[@res.template ]) ^ left)[@res.template ])
-                        ^ (({js| characters left|js})[@res.template ]))
+                    (((((({js||js})[@res.template ]) ++ left)
+                        [@res.template ]) ++ (({js| characters left|js})
+                        [@res.template ]))
                       [@res.template ]) -> React.string))
                 [@res.braces ])] ())
   [@JSX ])

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

@@ -6,7 +6,7 @@ let constructor = None
 let longidentConstructor = Option.None
 let txt = {js|a string|js}
 let otherTxt =
-  (((((({js|foo bar |js})[@res.template ]) ^ txt)[@res.template ]) ^
+  (((((({js|foo bar |js})[@res.template ]) ++ txt)[@res.template ]) ++
       (({js||js})[@res.template ]))
   [@res.template ])
 let ident = myIdent

tests/syntax_tests/data/parsing/other/expected/stringLiterals.res.txt

@@ -1,12 +1,12 @@
 let s = {js|some unicode é £ |js}
 let s = (({js|foo|js})[@res.template ])
 let s =
-  (((((({js|foo |js})[@res.template ]) ^ bar)[@res.template ]) ^
+  (((((({js|foo |js})[@res.template ]) ++ bar)[@res.template ]) ++
       (({js| baz|js})[@res.template ]))
   [@res.template ])
 let s =
-  (((((({js|some unicode é |js})[@res.template ]) ^ bar)[@res.template ]) ^
-      (({js| £ |js})[@res.template ]))
+  (((((({js|some unicode é |js})[@res.template ]) ++ bar)[@res.template ])
+      ++ (({js| £ |js})[@res.template ]))
   [@res.template ])
 let s = ((x [|(({js|foo|js})[@res.template ])|] [||])[@res.taggedTemplate ])
 let s =

tests/syntax_tests/data/parsing/recovery/string/expected/es6template.res.txt

@@ -8,6 +8,6 @@
   Did you forget to close this template expression with a backtick?
 
 let x =
-  (((((({js|this contains |js})[@res.template ]) ^ foo)[@res.template ]) ^
+  (((((({js|this contains |js})[@res.template ]) ++ foo)[@res.template ]) ++
       (({js|, missing closing|js})[@res.template ]))
   [@res.template ])

tests/tests/src/bs_mutable_set_test.res

@@ -117,7 +117,7 @@ include (
     let () = {
       let aa = f(I.randomRange(0, 100))
       let bb = f(I.randomRange(40, 120))
-      let cc = \"++"(aa, bb)
+      let cc = aa ++ bb
       b(__LOC__, \"=~"(cc, f(I.randomRange(0, 120))))
 
       b(
@@ -170,15 +170,15 @@ let () = {
 }
 
 let () = {
-  let u = \"++"(I.randomRange(30, 100), I.randomRange(40, 120))
+  let u = I.randomRange(30, 100) ++ I.randomRange(40, 120)
   let v = N.make()
   N.mergeMany(v, u)
   eq(__LOC__, N.size(v), 91)
   eq(__LOC__, N.toArray(v), I.range(30, 120))
 }
 
 let () = {
-  let u = \"++"(I.randomRange(0, 100_000), I.randomRange(0, 100))
+  let u = I.randomRange(0, 100_000) ++ I.randomRange(0, 100)
   let v = N.fromArray(u)
   eq(__LOC__, N.size(v), 100_001)
   let u = I.randomRange(50_000, 80_000)
@@ -265,7 +265,7 @@ let \"=~" = N.eq
 let () = {
   let aa = f(I.randomRange(0, 100))
   let bb = f(I.randomRange(40, 120))
-  let cc = \"++"(aa, bb)
+  let cc = aa ++ bb
   b(__LOC__, \"=~"(cc, f(I.randomRange(0, 120))))
 
   b(

tests/tests/src/bs_poly_mutable_set_test.res

@@ -111,7 +111,7 @@ let \"=~" = N.eq
 let () = {
   let aa = f(I.randomRange(0, 100))
   let bb = f(I.randomRange(40, 120))
-  let cc = \"++"(aa, bb)
+  let cc = aa ++ bb
   b(__LOC__, \"=~"(cc, f(I.randomRange(0, 120))))
 
   b(