Runtime: delete BigStringReader

hhugo · hhugo · commit 95cbe30757dd · 2025-03-17T13:17:10.000+01:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,7 @@
 * Runtime: make Obj.dup work with floats and boxed numbers (#1871)
 * Lib: make the Wasm version of Json.output work with native ints and JavaScript objects (#1872)
 * Runtime: implement BLAKE2b primitives for Wasm (#1873)
+* Runtime: delete BigStringReader, one should use UInt8ArrayReader instead
 
 ## Bug fixes
 * Runtime: fix path normalization (#1848)
diff --git a/compiler/tests-check-prim/main.4.14.output b/compiler/tests-check-prim/main.4.14.output
@@ -102,7 +102,6 @@ caml_trampoline_return
 caml_wrap_exception
 
 From +marshal.js:
-BigStringReader
 caml_marshal_constants
 
 From +mlBytes.js:
diff --git a/compiler/tests-check-prim/main.5.2.output b/compiler/tests-check-prim/main.5.2.output
@@ -98,7 +98,6 @@ caml_trampoline_return
 caml_wrap_exception
 
 From +marshal.js:
-BigStringReader
 caml_marshal_constants
 
 From +mlBytes.js:
diff --git a/compiler/tests-check-prim/main.5.3.output b/compiler/tests-check-prim/main.5.3.output
@@ -97,7 +97,6 @@ caml_trampoline_return
 caml_wrap_exception
 
 From +marshal.js:
-BigStringReader
 caml_marshal_constants
 
 From +mlBytes.js:
diff --git a/compiler/tests-check-prim/unix-Unix.4.14.output b/compiler/tests-check-prim/unix-Unix.4.14.output
@@ -178,7 +178,6 @@ caml_trampoline_return
 caml_wrap_exception
 
 From +marshal.js:
-BigStringReader
 caml_marshal_constants
 
 From +mlBytes.js:
diff --git a/compiler/tests-check-prim/unix-Unix.5.2.output b/compiler/tests-check-prim/unix-Unix.5.2.output
@@ -174,7 +174,6 @@ caml_trampoline_return
 caml_wrap_exception
 
 From +marshal.js:
-BigStringReader
 caml_marshal_constants
 
 From +mlBytes.js:
diff --git a/compiler/tests-check-prim/unix-Unix.5.3.output b/compiler/tests-check-prim/unix-Unix.5.3.output
@@ -173,7 +173,6 @@ caml_trampoline_return
 caml_wrap_exception
 
 From +marshal.js:
-BigStringReader
 caml_marshal_constants
 
 From +mlBytes.js:
diff --git a/compiler/tests-check-prim/unix-Win32.4.14.output b/compiler/tests-check-prim/unix-Win32.4.14.output
@@ -150,7 +150,6 @@ caml_trampoline_return
 caml_wrap_exception
 
 From +marshal.js:
-BigStringReader
 caml_marshal_constants
 
 From +mlBytes.js:
diff --git a/compiler/tests-check-prim/unix-Win32.5.2.output b/compiler/tests-check-prim/unix-Win32.5.2.output
@@ -147,7 +147,6 @@ caml_trampoline_return
 caml_wrap_exception
 
 From +marshal.js:
-BigStringReader
 caml_marshal_constants
 
 From +mlBytes.js:
diff --git a/compiler/tests-check-prim/unix-Win32.5.3.output b/compiler/tests-check-prim/unix-Win32.5.3.output
@@ -146,7 +146,6 @@ caml_trampoline_return
 caml_wrap_exception
 
 From +marshal.js:
-BigStringReader
 caml_marshal_constants
 
 From +mlBytes.js:
diff --git a/runtime/js/marshal.js b/runtime/js/marshal.js
@@ -176,78 +176,6 @@ class MlStringReader {
   }
 }
 
-//Provides: BigStringReader
-//Requires: caml_string_of_uint8_array, caml_ba_get_1
-class BigStringReader {
-  constructor(bs, i) {
-    this.s = bs;
-    this.i = i;
-  }
-
-  read8u() {
-    return caml_ba_get_1(this.s, this.i++);
-  }
-
-  read8s() {
-    return (caml_ba_get_1(this.s, this.i++) << 24) >> 24;
-  }
-
-  read16u() {
-    var s = this.s,
-      i = this.i;
-    this.i = i + 2;
-    return (caml_ba_get_1(s, i) << 8) | caml_ba_get_1(s, i + 1);
-  }
-
-  read16s() {
-    var s = this.s,
-      i = this.i;
-    this.i = i + 2;
-    return ((caml_ba_get_1(s, i) << 24) >> 16) | caml_ba_get_1(s, i + 1);
-  }
-
-  read32u() {
-    var s = this.s,
-      i = this.i;
-    this.i = i + 4;
-    return (
-      ((caml_ba_get_1(s, i) << 24) |
-        (caml_ba_get_1(s, i + 1) << 16) |
-        (caml_ba_get_1(s, i + 2) << 8) |
-        caml_ba_get_1(s, i + 3)) >>>
-      0
-    );
-  }
-
-  read32s() {
-    var s = this.s,
-      i = this.i;
-    this.i = i + 4;
-    return (
-      (caml_ba_get_1(s, i) << 24) |
-      (caml_ba_get_1(s, i + 1) << 16) |
-      (caml_ba_get_1(s, i + 2) << 8) |
-      caml_ba_get_1(s, i + 3)
-    );
-  }
-
-  readstr(len) {
-    var i = this.i;
-    var offset = this.offset(i);
-    this.i = i + len;
-    return caml_string_of_uint8_array(
-      this.s.data.subarray(offset, offset + len),
-    );
-  }
-
-  readuint8array(len) {
-    var i = this.i;
-    var offset = this.offset(i);
-    this.i = i + len;
-    return this.s.data.subarray(offset, offset + len);
-  }
-}
-
 //Provides: caml_float_of_bytes
 //Requires: caml_int64_float_of_bits, caml_int64_of_bytes
 function caml_float_of_bytes(a) {
