From 11a2421acaf2b39d19ee99933102c35e28fd13f8 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Wed, 13 Dec 2017 14:55:33 +1100
Subject: Use Uint8Array to back strings

---
 src/lzio.js | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

(limited to 'src/lzio.js')

diff --git a/src/lzio.js b/src/lzio.js
index 3d877aa..efd7909 100644
--- a/src/lzio.js
+++ b/src/lzio.js
@@ -11,7 +11,7 @@ class MBuffer {
 }
 
 const luaZ_buffer = function(buff) {
-    return buff.buffer;
+    return buff.buffer.subarray(0, buff.n);
 };
 
 const luaZ_buffremove = function(buff, i) {
@@ -20,7 +20,13 @@ const luaZ_buffremove = function(buff, i) {
 
 const luaZ_resetbuffer = function(buff) {
     buff.n = 0;
-    buff.buffer = [];
+};
+
+const luaZ_resizebuffer = function(L, buff, size) {
+    let newbuff = new Uint8Array(size);
+    if (buff.buffer)
+        newbuff.set(buff.buffer);
+    buff.buffer = newbuff;
 };
 
 class ZIO {
@@ -51,7 +57,7 @@ const luaZ_fill = function(z) {
         z.off = 0;
         size = buff.byteLength - buff.byteOffset;
     } else {
-        assert(typeof buff !== "string", "Should only load binary of array of bytes");
+        assert(buff instanceof Uint8Array, "Should only load binary of array of bytes");
         z.buffer = buff;
         z.off = 0;
         size = buff.length;
@@ -87,11 +93,12 @@ const luaZ_read = function(z, b, b_offset, n) {
     return 0;
 };
 
-module.exports.EOZ              = EOZ;
-module.exports.luaZ_buffer      = luaZ_buffer;
-module.exports.luaZ_buffremove  = luaZ_buffremove;
-module.exports.luaZ_fill        = luaZ_fill;
-module.exports.luaZ_read        = luaZ_read;
-module.exports.luaZ_resetbuffer = luaZ_resetbuffer;
-module.exports.MBuffer          = MBuffer;
-module.exports.ZIO              = ZIO;
+module.exports.EOZ               = EOZ;
+module.exports.luaZ_buffer       = luaZ_buffer;
+module.exports.luaZ_buffremove   = luaZ_buffremove;
+module.exports.luaZ_fill         = luaZ_fill;
+module.exports.luaZ_read         = luaZ_read;
+module.exports.luaZ_resetbuffer  = luaZ_resetbuffer;
+module.exports.luaZ_resizebuffer = luaZ_resizebuffer;
+module.exports.MBuffer           = MBuffer;
+module.exports.ZIO               = ZIO;
-- 
cgit v1.2.3-54-g00ecf


From af95e27d1b2d5f0f39534523778003dfd1fcf417 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Wed, 13 Dec 2017 17:17:43 +1100
Subject: src/lzio.js: Don't permit DataView returned from a lua_load reader
 any more

---
 src/lzio.js      | 15 ++++-----------
 tests/lstrlib.js |  4 ++--
 tests/tests.js   |  2 +-
 3 files changed, 7 insertions(+), 14 deletions(-)

(limited to 'src/lzio.js')

diff --git a/src/lzio.js b/src/lzio.js
index efd7909..a00a24b 100644
--- a/src/lzio.js
+++ b/src/lzio.js
@@ -48,22 +48,15 @@ class ZIO {
 const EOZ = -1;
 
 const luaZ_fill = function(z) {
-    let size;
     let buff = z.reader(z.L, z.data);
     if (buff === null)
         return EOZ;
-    if (buff instanceof DataView) {
-        z.buffer = new Uint8Array(buff.buffer, buff.byteOffset, buff.byteLength);
-        z.off = 0;
-        size = buff.byteLength - buff.byteOffset;
-    } else {
-        assert(buff instanceof Uint8Array, "Should only load binary of array of bytes");
-        z.buffer = buff;
-        z.off = 0;
-        size = buff.length;
-    }
+    assert(buff instanceof Uint8Array, "Should only load binary of array of bytes");
+    let size = buff.length;
     if (size === 0)
         return EOZ;
+    z.buffer = buff;
+    z.off = 0;
     z.n = size - 1;
     return z.buffer[z.off++];
 };
diff --git a/tests/lstrlib.js b/tests/lstrlib.js
index a55fca1..bdf68d8 100644
--- a/tests/lstrlib.js
+++ b/tests/lstrlib.js
@@ -442,9 +442,9 @@ test('string.dump', function (t) {
 
         lua.lua_call(L, 0, -1);
 
-        let dv = lua.lua_todataview(L, -1);
+        let str = lua.lua_tostring(L, -1);
 
-        lua.lua_load(L, function(L, s) { let r = s.dv; s.dv = null; return r; }, {dv: dv}, lua.to_luastring("test"), lua.to_luastring("binary"));
+        lua.lua_load(L, function(L, s) { let r = s.str; s.str = null; return r; }, {str: str}, lua.to_luastring("test"), lua.to_luastring("binary"));
 
         lua.lua_call(L, 0, -1);
 
diff --git a/tests/tests.js b/tests/tests.js
index 1bc4fc6..1ad9900 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -11,7 +11,7 @@ const toByteCode = function(luaCode) {
         return 0;
     }, b, false) !== 0)
         throw Error("unable to dump given function");
-    return new DataView(Uint8Array.from(b).buffer);
+    return Uint8Array.from(b);
 };
 
 const getState = function(luaCode) {
-- 
cgit v1.2.3-54-g00ecf