aboutsummaryrefslogtreecommitdiff
path: root/src/lauxlib.js
diff options
context:
space:
mode:
Diffstat (limited to 'src/lauxlib.js')
-rw-r--r--src/lauxlib.js133
1 files changed, 61 insertions, 72 deletions
diff --git a/src/lauxlib.js b/src/lauxlib.js
index eb174be..6489dc7 100644
--- a/src/lauxlib.js
+++ b/src/lauxlib.js
@@ -698,62 +698,48 @@ const skipcomment = function(lf) {
let luaL_loadfilex;
-if (!WEB) {
- const fs = require('fs');
-
- class LoadF {
- constructor() {
- this.n = NaN; /* number of pre-read characters */
- this.f = null; /* file being read */
- this.buff = new Buffer(1024); /* area for reading file */
- this.pos = 0; /* current position in file */
- this.err = void 0;
- }
+class LoadF {
+ constructor() {
+ this.n = NaN; /* number of pre-read characters */
+ this.f = null; /* file being read */
+ this.buff = new Buffer(1024); /* area for reading file */
+ this.pos = 0; /* current position in file */
+ this.err = void 0;
}
+}
+if (WEB) {
const getF = function(L, ud) {
let lf = ud;
- let bytes = 0;
- if (lf.n > 0) { /* are there pre-read characters to be read? */
- bytes = lf.n; /* return them (chars already in buffer) */
- lf.n = 0; /* no more pre-read characters */
- } else { /* read a block from file */
- lf.buff.fill(0);
- try {
- bytes = fs.readSync(lf.f, lf.buff, 0, lf.buff.length, lf.pos); /* read block */
- } catch(e) {
- lf.err = e;
- bytes = 0;
- }
- lf.pos += bytes;
- }
- if (bytes > 0)
- return lf.buff.slice(0, bytes); /* slice on a node.js Buffer is 'free' */
- else return null;
+ let f = lf.f;
+ lf.f = null;
+ return f;
};
getc = function(lf) {
- let b = new Buffer(1);
- let bytes = fs.readSync(lf.f, b, 0, 1, lf.pos);
- lf.pos += bytes;
- return bytes > 0 ? b.readUInt8() : null;
+ return lf.pos < lf.f.length ? lf.f[lf.pos++] : null;
};
luaL_loadfilex = function(L, filename, mode) {
let lf = new LoadF();
let fnameindex = lua.lua_gettop(L) + 1; /* index of filename on the stack */
if (filename === null) {
- lua.lua_pushliteral(L, "=stdin");
- lf.f = process.stdin.fd;
+ throw new Error("Can't read stdin in the browser");
} else {
let jsfilename = lua.to_jsstring(filename);
lua.lua_pushfstring(L, "@%s", filename);
- try {
- lf.f = fs.openSync(jsfilename, "r");
- if (!fs.fstatSync(lf.f).isFile())
- throw new Error(`${jsfilename} is not a readable file`);
- } catch (e) {
- return errfile(L, "open", fnameindex, e);
+
+ let xhr = new XMLHttpRequest();
+ xhr.open("GET", jsfilename, false);
+ // TODO: find a way to load bytes instead of js string
+ xhr.send();
+
+ if (xhr.status >= 200 && xhr.status <= 299) {
+ /* TODO: Synchronous xhr alway return a js string */
+ lf.f = lua.to_luastring(xhr.response);
+ } else {
+ lf.err = xhr.status;
+ return errfile(L, "open", fnameindex, { message: `${xhr.status}: ${xhr.statusText}` });
}
}
let com = skipcomment(lf);
@@ -767,7 +753,6 @@ if (!WEB) {
lf.buff[lf.n++] = com.c; /* 'c' is the first character of the stream */
let status = lua.lua_load(L, getF, lf, lua.lua_tostring(L, -1), mode);
let readstatus = lf.err;
- if (filename) try { fs.closeSync(lf.f); } catch(e) {} /* close file (even in case of errors) */
if (readstatus) {
lua.lua_settop(L, fnameindex); /* ignore results from 'lua_load' */
return errfile(L, "read", fnameindex, readstatus);
@@ -776,47 +761,51 @@ if (!WEB) {
return status;
};
} else {
- class LoadF {
- constructor() {
- this.n = NaN; /* number of pre-read characters */
- this.f = null; /* file being read */
- this.buff = new Buffer(1024); /* area for reading file */
- this.pos = 0; /* current position in file */
- this.err = void 0;
- }
- }
+ const fs = require('fs');
const getF = function(L, ud) {
let lf = ud;
- let f = lf.f;
- lf.f = null;
- return f;
+ let bytes = 0;
+ if (lf.n > 0) { /* are there pre-read characters to be read? */
+ bytes = lf.n; /* return them (chars already in buffer) */
+ lf.n = 0; /* no more pre-read characters */
+ } else { /* read a block from file */
+ lf.buff.fill(0);
+ try {
+ bytes = fs.readSync(lf.f, lf.buff, 0, lf.buff.length, lf.pos); /* read block */
+ } catch(e) {
+ lf.err = e;
+ bytes = 0;
+ }
+ lf.pos += bytes;
+ }
+ if (bytes > 0)
+ return lf.buff.slice(0, bytes); /* slice on a node.js Buffer is 'free' */
+ else return null;
};
getc = function(lf) {
- return lf.pos < lf.f.length ? lf.f[lf.pos++] : null;
+ let b = new Buffer(1);
+ let bytes = fs.readSync(lf.f, b, 0, 1, lf.pos);
+ lf.pos += bytes;
+ return bytes > 0 ? b.readUInt8() : null;
};
luaL_loadfilex = function(L, filename, mode) {
let lf = new LoadF();
let fnameindex = lua.lua_gettop(L) + 1; /* index of filename on the stack */
if (filename === null) {
- throw new Error("Can't read stdin in the browser");
+ lua.lua_pushliteral(L, "=stdin");
+ lf.f = process.stdin.fd;
} else {
let jsfilename = lua.to_jsstring(filename);
- lua.lua_pushliteral(L, `@${jsfilename}`);
-
- let xhr = new XMLHttpRequest();
- xhr.open("GET", jsfilename, false);
- // TODO: find a way to load bytes instead of js string
- xhr.send();
-
- if (xhr.status >= 200 && xhr.status <= 299) {
- /* TODO: Synchronous xhr alway return a js string */
- lf.f = lua.to_luastring(xhr.response);
- } else {
- lf.err = xhr.status;
- return errfile(L, "open", fnameindex, { message: `${xhr.status}: ${xhr.statusText}` });
+ lua.lua_pushfstring(L, "@%s", filename);
+ try {
+ lf.f = fs.openSync(jsfilename, "r");
+ if (!fs.fstatSync(lf.f).isFile())
+ throw new Error(`${jsfilename} is not a readable file`);
+ } catch (e) {
+ return errfile(L, "open", fnameindex, e);
}
}
let com = skipcomment(lf);
@@ -830,6 +819,7 @@ if (!WEB) {
lf.buff[lf.n++] = com.c; /* 'c' is the first character of the stream */
let status = lua.lua_load(L, getF, lf, lua.lua_tostring(L, -1), mode);
let readstatus = lf.err;
+ if (filename) try { fs.closeSync(lf.f); } catch(e) {} /* close file (even in case of errors) */
if (readstatus) {
lua.lua_settop(L, fnameindex); /* ignore results from 'lua_load' */
return errfile(L, "read", fnameindex, readstatus);
@@ -847,10 +837,6 @@ const luaL_dofile = function(L, filename) {
return (luaL_loadfile(L, filename) || lua.lua_pcall(L, 0, lua.LUA_MULTRET, 0));
};
-module.exports.luaL_dofile = luaL_dofile;
-module.exports.luaL_loadfilex = luaL_loadfilex;
-module.exports.luaL_loadfile = luaL_loadfile;
-
const lua_writestringerror = function(s) {
if (process.stderr) process.stderr.write(s);
else console.error(s);
@@ -895,6 +881,7 @@ module.exports.luaL_checkstring = luaL_checkstring;
module.exports.luaL_checktype = luaL_checktype;
module.exports.luaL_checkudata = luaL_checkudata;
module.exports.luaL_checkversion = luaL_checkversion;
+module.exports.luaL_dofile = luaL_dofile;
module.exports.luaL_dostring = luaL_dostring;
module.exports.luaL_error = luaL_error;
module.exports.luaL_execresult = luaL_execresult;
@@ -906,6 +893,8 @@ module.exports.luaL_gsub = luaL_gsub;
module.exports.luaL_len = luaL_len;
module.exports.luaL_loadbuffer = luaL_loadbuffer;
module.exports.luaL_loadbufferx = luaL_loadbufferx;
+module.exports.luaL_loadfile = luaL_loadfile;
+module.exports.luaL_loadfilex = luaL_loadfilex;
module.exports.luaL_loadstring = luaL_loadstring;
module.exports.luaL_newlib = luaL_newlib;
module.exports.luaL_newlibtable = luaL_newlibtable;
generated by cgit v1.2.3-54-g00ecf (git 2.45.1) at 2024-06-16 08:43:20 +0000