WIP

Author: hhugo

runtime/js/mlBytes.js

@@ -94,15 +94,11 @@ function caml_sub_uint8_array_to_jsbytes(a, i, len) {
   for (; 0 < len; i += 1024, len -= 1024)
     s += f.apply(null, a.subarray(i, i + Math.min(len, 1024)));
   return s;
+}
 
 //Provides: caml_jsbytes_to_array
 function caml_jsbytes_to_array(s) {
-  /* Assumes not ARRAY */
-  if (globalThis.Uint8Array) {
-    var a = new globalThis.Uint8Array(s.length);
-  } else {
-    var a = new Array(s.length);
-  }
+  var a = new Uint8Array(s.length);
   var b = s,
     l = b.length,
     i = 0;
@@ -407,27 +403,29 @@ function caml_bytes_of_utf16_jsstring(s) {
 
 //Provides: MlBytes
 //Requires: jsoo_is_ascii, caml_utf16_of_utf8, caml_subarray_to_jsbytes
-function MlBytes(a) {
-  this.a = a;
-}
-MlBytes.prototype.toString = function () {
-  return caml_subarray_to_jsbytes(this.a, 0, this.a.length);
-};
-MlBytes.prototype.toUtf16 = function () {
-  var r = this.toString();
-  return caml_utf16_of_utf8(r);
-};
-MlBytes.prototype.slice = function () {
-  var content = this.a.slice();
-  return new MlBytes(content);
-};
+class MlBytes {
+  constructor(a) {
+    this.a = a;
+  }
+  toString() {
+    return caml_subarray_to_jsbytes(this.a, 0, this.a.length);
+  };
+  toUtf16() {
+    var r = this.toString();
+    return caml_utf16_of_utf8(r);
+  };
+  slice() {
+    var content = this.a.slice();
+    return new MlBytes(content);
+  }
+}
 
 //Provides: caml_uint8_array_of_bytes mutable
 function caml_uint8_array_of_bytes(s) {
   return s.a;
 }
 
-//Provides: caml_uint8_array_of_string
+//Provides: caml_uint8_array_of_string mutable
 //Requires: caml_ml_string_length, caml_string_unsafe_get
 function caml_uint8_array_of_string(s) {
   var l = caml_ml_string_length(s);
@@ -442,7 +440,7 @@ function caml_uint8_array_of_string(s) {
 //If: !js-string
 function caml_create_string(len) {
   if (len < 0) caml_invalid_argument("String.create");
-  return new MlBytes(new globalThis.Uint8Array(len));
+  return new MlBytes(new Uint8Array(len));
 }
 //Provides: caml_create_string const
 //Requires: caml_invalid_argument
@@ -455,7 +453,7 @@ function caml_create_string(len) {
 //Requires: MlBytes,caml_invalid_argument
 function caml_create_bytes(len) {
   if (len < 0) caml_invalid_argument("Bytes.create");
-  return new MlBytes(new globalThis.Uint8Array(len));
+  return new MlBytes(new Uint8Array(len));
 }
 
 //Provides: caml_string_of_array
@@ -481,6 +479,7 @@ function caml_string_of_uint8_array(a) {
 //Provides: caml_bytes_of_array
 //Requires: MlBytes
 function caml_bytes_of_array(a) {
+  if(! (a instanceof Uint8Array)) a = new Uint8Array(a);
   return new MlBytes(a);
 }
 
@@ -499,7 +498,7 @@ function caml_compare_array(a, b) {
 //Provides: caml_bytes_of_uint8_array
 //Requires: MlBytes
 function caml_bytes_of_uint8_array(a) {
-  return new MlBytes(4, a, a.length);
+  return new MlBytes(a);
 }
 
 //Provides: caml_bytes_compare mutable
@@ -607,7 +606,7 @@ function caml_string_concat(a, b) {
 //Requires: MlBytes
 //If: !js-string
 function caml_string_concat(s1, s2) {
-  var n = new globalThis.Uint8Array(s1.a.length + s2.a.length);
+  var n = new Uint8Array(s1.a.length + s2.a.length);
   n.set(s1.a);
   n.set(s2.a, s1.a.length);
   return new MlBytes(n);