Runtime: rely on TextEncoder and TextDecoder

Author: hhugo

runtime/mlBytes.js

@@ -82,111 +82,6 @@ function caml_subarray_to_jsbytes(a, i, len) {
   return s;
 }
 
-//Provides: caml_utf8_of_utf16
-function caml_utf8_of_utf16(s) {
-  for (var b = "", t = b, c, d, i = 0, l = s.length; i < l; i++) {
-    c = s.charCodeAt(i);
-    if (c < 0x80) {
-      for (var j = i + 1; j < l && (c = s.charCodeAt(j)) < 0x80; j++);
-      if (j - i > 512) {
-        t.substr(0, 1);
-        b += t;
-        t = "";
-        b += s.slice(i, j);
-      } else t += s.slice(i, j);
-      if (j == l) break;
-      i = j;
-    }
-    if (c < 0x800) {
-      t += String.fromCharCode(0xc0 | (c >> 6));
-      t += String.fromCharCode(0x80 | (c & 0x3f));
-    } else if (c < 0xd800 || c >= 0xdfff) {
-      t += String.fromCharCode(
-        0xe0 | (c >> 12),
-        0x80 | ((c >> 6) & 0x3f),
-        0x80 | (c & 0x3f),
-      );
-    } else if (
-      c >= 0xdbff ||
-      i + 1 == l ||
-      (d = s.charCodeAt(i + 1)) < 0xdc00 ||
-      d > 0xdfff
-    ) {
-      // Unmatched surrogate pair, replaced by \ufffd (replacement character)
-      t += "\xef\xbf\xbd";
-    } else {
-      i++;
-      c = (c << 10) + d - 0x35fdc00;
-      t += String.fromCharCode(
-        0xf0 | (c >> 18),
-        0x80 | ((c >> 12) & 0x3f),
-        0x80 | ((c >> 6) & 0x3f),
-        0x80 | (c & 0x3f),
-      );
-    }
-    if (t.length > 1024) {
-      t.substr(0, 1);
-      b += t;
-      t = "";
-    }
-  }
-  return b + t;
-}
-
-//Provides: caml_utf16_of_utf8
-function caml_utf16_of_utf8(s) {
-  for (var b = "", t = "", c, c1, c2, v, i = 0, l = s.length; i < l; i++) {
-    c1 = s.charCodeAt(i);
-    if (c1 < 0x80) {
-      for (var j = i + 1; j < l && (c1 = s.charCodeAt(j)) < 0x80; j++);
-      if (j - i > 512) {
-        t.substr(0, 1);
-        b += t;
-        t = "";
-        b += s.slice(i, j);
-      } else t += s.slice(i, j);
-      if (j == l) break;
-      i = j;
-    }
-    v = 1;
-    if (++i < l && ((c2 = s.charCodeAt(i)) & -64) == 128) {
-      c = c2 + (c1 << 6);
-      if (c1 < 0xe0) {
-        v = c - 0x3080;
-        if (v < 0x80) v = 1;
-      } else {
-        v = 2;
-        if (++i < l && ((c2 = s.charCodeAt(i)) & -64) == 128) {
-          c = c2 + (c << 6);
-          if (c1 < 0xf0) {
-            v = c - 0xe2080;
-            if (v < 0x800 || (v >= 0xd7ff && v < 0xe000)) v = 2;
-          } else {
-            v = 3;
-            if (++i < l && ((c2 = s.charCodeAt(i)) & -64) == 128 && c1 < 0xf5) {
-              v = c2 - 0x3c82080 + (c << 6);
-              if (v < 0x10000 || v > 0x10ffff) v = 3;
-            }
-          }
-        }
-      }
-    }
-    if (v < 4) {
-      // Invalid sequence
-      i -= v;
-      t += "\ufffd";
-    } else if (v > 0xffff)
-      t += String.fromCharCode(0xd7c0 + (v >> 10), 0xdc00 + (v & 0x3ff));
-    else t += String.fromCharCode(v);
-    if (t.length > 1024) {
-      t.substr(0, 1);
-      b += t;
-      t = "";
-    }
-  }
-  return b + t;
-}
-
 //Provides: jsoo_is_ascii
 function jsoo_is_ascii(s) {
   // The regular expression gets better at around this point for all browsers
@@ -426,20 +321,18 @@ function caml_bytes_set(s, i, c) {
 }
 
 //Provides: caml_bytes_of_utf16_jsstring
-//Requires: jsoo_is_ascii, caml_utf8_of_utf16, MlBytes
-function caml_bytes_of_utf16_jsstring(s) {
-  var tag = 9 /* BYTES | ASCII */;
-  if (!jsoo_is_ascii(s))
-    (tag = 8) /* BYTES | NOT_ASCII */, (s = caml_utf8_of_utf16(s));
-  return new MlBytes(tag, s, s.length);
+//Requires: MlBytes
+function caml_bytes_of_utf16_jsstring (s) {
+  var e = new TextEncoder();
+  var a = e.encode(s);
+  return new MlBytes(4, a, a.length);
 }
 
 //Provides: MlBytes
-//Requires: caml_convert_string_to_bytes, jsoo_is_ascii, caml_utf16_of_utf8
-function MlBytes(tag, contents, length) {
-  this.t = tag;
-  this.c = contents;
-  this.l = length;
+//Requires: caml_convert_string_to_bytes, jsoo_is_ascii
+//Requires: caml_uint8_array_of_bytes
+function MlBytes (tag, contents, length) {
+  this.t=tag; this.c=contents; this.l=length;
 }
 MlBytes.prototype.toString = function () {
   switch (this.t) {
@@ -457,12 +350,13 @@ MlBytes.prototype.toString = function () {
       return this.c;
   }
 };
-MlBytes.prototype.toUtf16 = function () {
-  var r = this.toString();
-  if (this.t == 9) return r;
-  return caml_utf16_of_utf8(r);
-};
-MlBytes.prototype.slice = function () {
+MlBytes.prototype.toUtf16 = function (){
+  if(this.t == 9) return this.c;
+  var a = caml_uint8_array_of_bytes(this);
+  let d = new TextDecoder();
+  return d.decode(a);
+}
+MlBytes.prototype.slice = function (){
   var content = this.t == 4 ? this.c.slice() : this.c;
   return new MlBytes(this.t, content, this.l);
 };
@@ -775,19 +669,25 @@ function caml_jsbytes_of_string(x) {
 }
 
 //Provides: caml_jsstring_of_string const
-//Requires: jsoo_is_ascii, caml_utf16_of_utf8
+//Requires: jsoo_is_ascii
 //If: js-string
 function caml_jsstring_of_string(s) {
-  if (jsoo_is_ascii(s)) return s;
-  return caml_utf16_of_utf8(s);
+  if(jsoo_is_ascii(s)) return s;
+  var a = new Uint8Array(s.length);
+  for(var i = 0; i < s.length; i++){
+    a[i] = s.charCodeAt(i);
+  }
+  var d = new TextDecoder();
+  return d.decode(a);
 }
 
 //Provides: caml_string_of_jsstring const
-//Requires: jsoo_is_ascii, caml_utf8_of_utf16, caml_string_of_jsbytes
+//Requires: caml_string_of_array
 //If: js-string
-function caml_string_of_jsstring(s) {
-  if (jsoo_is_ascii(s)) return caml_string_of_jsbytes(s);
-  else return caml_string_of_jsbytes(caml_utf8_of_utf16(s));
+function caml_string_of_jsstring (s) {
+  var e = new TextEncoder();
+  var a = e.encode(s);
+  return caml_string_of_array(a);
 }
 
 //Provides: caml_bytes_of_jsbytes const
@@ -907,7 +807,6 @@ function caml_ml_bytes_content(s) {
 }
 
 //Provides: caml_is_ml_string
-//Requires: jsoo_is_ascii
 //If: js-string
 function caml_is_ml_string(s) {
   // biome-ignore lint/suspicious/noControlCharactersInRegex: expected