more

Author: hhugo

compiler/lib/generate.ml

@@ -1282,7 +1282,12 @@ let rec translate_expr ctx queue loc x e level : _ * J.statement_list =
             let (pa, ca), queue = access_queue' ~ctx queue a in
             let (pb, cb), queue = access_queue' ~ctx queue b in
             let prop = or_p pa pb in
-            J.EBin (J.Plus, ca, cb), prop, queue
+            let rec add ca cb =
+              match cb with
+              | J.EBin (J.Plus, cb1, cb2) -> J.EBin (J.Plus, add ca cb1, cb2)
+              | _ -> J.EBin (J.Plus, ca, cb)
+            in
+            add ca cb, prop, queue
         | Extern name, l -> (
             let name = Primitive.resolve name in
             match internal_prim name with

compiler/tests-compiler/test_string.ml

@@ -56,7 +56,7 @@ let (_ : string) = here ()
         cst_a = "a",
         cst_b = "b",
         caml_string_concat = runtime.caml_string_concat;
-       function _a_(_b_){return cst_a + (cst_a + (cst_b + cst_b));}
+       function _a_(_b_){return cst_a + cst_a + cst_b + cst_b;}
        _a_(0);
        var Test = [0, caml_string_concat, _a_];
        runtime.caml_register_global(2, Test, "Test");

compiler/tests-full/stdlib.cma.expected.js

@@ -813,7 +813,7 @@
      /*<<stdlib.ml:545:2>>*/ return [0,
              /*<<stdlib.ml:545:10>>*/ caml_call2
              (CamlinternalFormatBasics[3], fmt1, fmt2),
-            str1 + ("%," + str2)];
+            str1 + "%," + str2];
    }
     /*<<stdlib.ml:559:20>>*/  /*<<stdlib.ml:559:20>>*/ var
     exit_function = [0, flush_all];