From dba35fd2956f9f6b14ea8947baa11c5e483bc407 Mon Sep 17 00:00:00 2001 From: daurnimator Date: Fri, 3 Mar 2017 22:46:39 +1100 Subject: Remove use of 'buffer-dataview' library --- package.json | 1 - src/llex.js | 1 - src/lundump.js | 3 +-- tests/tests.js | 6 +++--- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 7496921..d567a62 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,6 @@ "tmp": "0.0.31" }, "dependencies": { - "buffer-dataview": "0.0.2", "seedrandom": "^2.4.2" } } diff --git a/src/llex.js b/src/llex.js index 711f44b..2e79066 100644 --- a/src/llex.js +++ b/src/llex.js @@ -1,6 +1,5 @@ "use strict"; -const DataView = require('buffer-dataview'); const assert = require('assert'); const lapi = require('./lapi.js'); diff --git a/src/lundump.js b/src/lundump.js index 5a6d8c4..92063a2 100644 --- a/src/lundump.js +++ b/src/lundump.js @@ -1,7 +1,6 @@ /*jshint esversion: 6 */ "use strict"; -const DataView = require('buffer-dataview'); const fs = require('fs'); const assert = require('assert'); @@ -110,7 +109,7 @@ class BytecodeParser { } readInstruction() { - let ins = new DataView(new Buffer(this.instructionSize)); + let ins = new DataView(new ArrayBuffer(this.instructionSize)); for (let i = 0; i < this.instructionSize; i++) ins.setUint8(i, this.readByte()); diff --git a/tests/tests.js b/tests/tests.js index a47aee5..d4173c3 100644 --- a/tests/tests.js +++ b/tests/tests.js @@ -3,7 +3,6 @@ const fs = require('fs'); const child_process = require('child_process'); const tmp = require('tmp'); -const DataView = require('buffer-dataview'); const BytecodeParser = require("../src/lundump.js"); const lauxlib = require("../src/lauxlib.js"); @@ -20,10 +19,11 @@ const toByteCode = function (luaCode) { bclist = fs.readFileSync(`${luaFile.name}.bc.txt`, 'utf8'); - // console.log(bclist); + let b = fs.readFileSync(`${luaFile.name}.bc`); + let dv = new DataView(b.buffer.slice(b.byteOffset, b.byteOffset + b.byteLength)); return { - dataView: new DataView(fs.readFileSync(`${luaFile.name}.bc`)), + dataView: dv, bclist: bclist }; }; -- cgit v1.2.3-54-g00ecf