Merge branch 'master' into feature/lua-tests

1 files changed, 4 insertions, 4 deletions

diff --git a/src/lauxlib.js b/src/lauxlib.js
index 064e229..3d75282 100644
--- a/src/lauxlib.js
+++ b/src/lauxlib.js
@@ -513,7 +513,7 @@ if (typeof require === "function") {
         const errfile = function(L, what, fnameindex, error) {
             let serr = error.message;
             let filename = lapi.lua_tostring(L, fnameindex).slice(1);
-            lapi.lua_pushstring(L, lua.to_luastring(`cannot ${lobject.jsstring(what)} ${lobject.jsstring(filename)}: ${lobject.jsstring(serr)}`));
+            lapi.lua_pushstring(L, lua.to_luastring(`cannot ${what} ${lobject.jsstring(filename)}: ${serr}`));
             lapi.lua_remove(L, fnameindex);
             return lua.thread_status.LUA_ERRFILE;
         };
@@ -567,18 +567,18 @@ if (typeof require === "function") {
         };
 
         const luaL_loadfilex = function(L, filename, mode) {
-            let jsfilename = lobject.jsstring(filename);
             let lf = new LoadF();
             let fnameindex = lapi.lua_gettop(L) + 1;  /* index of filename on the stack */
             if (filename === null) {
                 lapi.lua_pushliteral(L, "=stdin");
                 lf.f = process.stdin.fd;
             } else {
+                let jsfilename = lobject.jsstring(filename);
                 lapi.lua_pushliteral(L, `@${jsfilename}`);
                 try {
                     lf.f = fs.openSync(jsfilename, "r");
                 } catch (e) {
-                    return errfile(L, lua.to_luastring("open", true), fnameindex, e);
+                    return errfile(L, "open", fnameindex, e);
                 }
             }
 
@@ -597,7 +597,7 @@ if (typeof require === "function") {
                 return status;
             } catch (err) {
                 lapi.lua_settop(L, fnameindex);  /* ignore results from 'lua_load' */
-                return errfile(L, lua.to_luastring("read", true), fnameindex);
+                return errfile(L, "read", fnameindex, err);
             }
         };