Fix issue with bytes_to_string in library.

jscomp/core/js_of_lam_string.ml

@@ -60,7 +60,4 @@ let set_byte e e0 e1 = E.assign (E.array_index e e0) e1
    ]}
 *)
 let bytes_to_string e =
-  E.runtime_call Js_runtime_modules.bytes "bytes_to_string" [ e ]
-
-let bytes_of_string s =
-  E.runtime_call Js_runtime_modules.bytes "bytes_of_string" [ s ]
+  E.runtime_call Js_runtime_modules.bytes_ "bytes_to_string" [ e ]

jscomp/core/js_of_lam_string.mli

@@ -37,5 +37,3 @@ val set_byte : J.expression -> J.expression -> J.expression -> J.expression
 val const_char : char -> J.expression
 
 val bytes_to_string : J.expression -> J.expression
-
-val bytes_of_string : J.expression -> J.expression

jscomp/core/lam_analysis.ml

@@ -62,7 +62,7 @@ let rec no_side_effects (lam : Lam.t) : bool =
       | Pundefined_to_opt | Pnull_undefined_to_opt | Pjs_fn_make _
       | Pjs_object_create _
       (* TODO: check *)
-      | Pbytes_to_string | Pbytes_of_string | Pmakeblock _
+      | Pbytes_to_string | Pmakeblock _
       (* whether it's mutable or not *)
       | Pfield _ | Pval_from_option | Pval_from_option_not_nest
       (* NOP The compiler already [t option] is the same as t *)

jscomp/core/lam_compile_primitive.ml

@@ -219,12 +219,6 @@ let translate loc (cxt : Lam_compile_context.t) (prim : Lam_primitive.t)
       *)
       | [ range; e ] -> E.is_out (E.offset e off) range
       | _ -> assert false)
-  | Pbytes_of_string ->
-      (* TODO: write a js primitive  - or is it necessary ?
-         if we have byte_get/string_get
-         still necessary, since you can set it now.
-      *)
-      Js_of_lam_string.bytes_of_string (Ext_list.singleton_exn args)
   | Pbytes_to_string ->
       Js_of_lam_string.bytes_to_string (Ext_list.singleton_exn args)
   | Pstringlength -> E.string_length (Ext_list.singleton_exn args)

jscomp/core/lam_convert.ml

@@ -167,7 +167,6 @@ let lam_prim ~primitive:(p : Lambda.primitive) ~args loc : Lam.t =
   | Ploc _ -> assert false (* already compiled away here*)
   | Pbytes_to_string (* handled very early *) ->
       prim ~primitive:Pbytes_to_string ~args loc
-  | Pbytes_of_string -> prim ~primitive:Pbytes_of_string ~args loc
   | Pcreate_extension s -> prim ~primitive:(Pcreate_extension s) ~args loc
   | Pignore ->
       (* Pignore means return unit, it is not an nop *)

jscomp/core/lam_primitive.ml

@@ -34,7 +34,6 @@ type record_representation =
 
 type t =
   | Pbytes_to_string
-  | Pbytes_of_string
   (* Operations on heap blocks *)
   | Pmakeblock of int * Lam_tag_info.t * Asttypes.mutable_flag
   | Pfield of int * Lam_compat.field_dbg_info
@@ -172,7 +171,6 @@ let eq_primitive_approx (lhs : t) (rhs : t) =
       match rhs with Pcreate_extension b -> a = (b : string) | _ -> false)
   | Pwrap_exn -> rhs = Pwrap_exn
   | Pbytes_to_string -> rhs = Pbytes_to_string
-  | Pbytes_of_string -> rhs = Pbytes_of_string
   | Praise -> rhs = Praise
   | Psequand -> rhs = Psequand
   | Psequor -> rhs = Psequor

jscomp/core/lam_primitive.mli

@@ -32,7 +32,6 @@ type record_representation =
 
 type t =
   | Pbytes_to_string
-  | Pbytes_of_string
   | Pmakeblock of int * Lam_tag_info.t * Asttypes.mutable_flag
   | Pfield of int * Lambda.field_dbg_info
   | Psetfield of int * Lambda.set_field_dbg_info

jscomp/core/lam_print.ml

@@ -56,7 +56,6 @@ let primitive ppf (prim : Lam_primitive.t) =
   | Pinit_mod -> fprintf ppf "init_mod!"
   | Pupdate_mod -> fprintf ppf "update_mod!"
   | Pbytes_to_string -> fprintf ppf "bytes_to_string"
-  | Pbytes_of_string -> fprintf ppf "bytes_of_string"
   | Pjs_apply -> fprintf ppf "#apply"
   | Pjs_runtime_apply -> fprintf ppf "#runtime_apply"
   | Pjs_unsafe_downgrade { name; setter } ->

jscomp/ext/js_runtime_modules.ml

@@ -41,6 +41,7 @@ let format = "Caml_format"
 let string = "Caml_string"
 
 let bytes = "Caml_bytes"
+let bytes_ = "Bytes"
 
 let float = "Caml_float"
 

jscomp/ml/lambda.ml

@@ -146,7 +146,6 @@ type is_safe =
 type primitive =
   | Pidentity
   | Pbytes_to_string
-  | Pbytes_of_string
   | Pignore
   | Prevapply
   | Pdirapply

jscomp/ml/lambda.mli

@@ -145,7 +145,6 @@ type pointer_info =
 type primitive =
   | Pidentity
   | Pbytes_to_string
-  | Pbytes_of_string
   | Pignore
   | Prevapply
   | Pdirapply

jscomp/ml/printlambda.ml

@@ -124,7 +124,6 @@ let primitive ppf = function
   | Puncurried_apply -> fprintf ppf "@app"
   | Pidentity -> fprintf ppf "id"
   | Pbytes_to_string -> fprintf ppf "bytes_to_string"
-  | Pbytes_of_string -> fprintf ppf "bytes_of_string"
   | Pignore -> fprintf ppf "ignore"
   | Prevapply -> fprintf ppf "revapply"
   | Pdirapply -> fprintf ppf "dirapply"
@@ -239,7 +238,6 @@ let primitive ppf = function
 let name_of_primitive = function
   | Puncurried_apply -> "Puncurried_apply"
   | Pidentity -> "Pidentity"
-  | Pbytes_of_string -> "Pbytes_of_string"
   | Pbytes_to_string -> "Pbytes_to_string"
   | Pignore -> "Pignore"
   | Prevapply -> "Prevapply"

jscomp/ml/translcore.ml

@@ -282,7 +282,6 @@ let primitives_table =
     [
       ("%identity", Pidentity);
       ("%bytes_to_string", Pbytes_to_string);
-      ("%bytes_of_string", Pbytes_of_string);
       ("%ignore", Pignore);
       ("%revapply", Prevapply);
       ("%apply", Pdirapply);

jscomp/test/test_bytes.js

@@ -1,11 +1,10 @@
 'use strict';
 
 var Bytes = require("../../lib/js/bytes.js");
-var Caml_bytes = require("../../lib/js/caml_bytes.js");
 
 var f = Bytes.unsafe_to_string;
 
-var ff = Caml_bytes.bytes_to_string;
+var ff = Bytes.bytes_to_string;
 
 exports.f = f;
 exports.ff = ff;

lib/es6/char.js

@@ -1,6 +1,6 @@
 
 
-import * as Caml_bytes from "./caml_bytes.js";
+import * as Bytes from "./bytes.js";
 
 function chr(n) {
   if (n < 0 || n > 255) {
@@ -64,11 +64,11 @@ function escaped(c) {
         s[1] = 48 + (c / 100 | 0) | 0;
         s[2] = 48 + (c / 10 | 0) % 10 | 0;
         s[3] = 48 + c % 10 | 0;
-        return Caml_bytes.bytes_to_string(s);
+        return Bytes.bytes_to_string(s);
     case 2 :
         var s$1 = [0];
         s$1[0] = c;
-        return Caml_bytes.bytes_to_string(s$1);
+        return Bytes.bytes_to_string(s$1);
 
   }
 }

lib/js/char.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Caml_bytes = require("./caml_bytes.js");
+var Bytes = require("./bytes.js");
 
 function chr(n) {
   if (n < 0 || n > 255) {
@@ -64,11 +64,11 @@ function escaped(c) {
         s[1] = 48 + (c / 100 | 0) | 0;
         s[2] = 48 + (c / 10 | 0) % 10 | 0;
         s[3] = 48 + c % 10 | 0;
-        return Caml_bytes.bytes_to_string(s);
+        return Bytes.bytes_to_string(s);
     case 2 :
         var s$1 = [0];
         s$1[0] = c;
-        return Caml_bytes.bytes_to_string(s$1);
+        return Bytes.bytes_to_string(s$1);
 
   }
 }