summaryrefslogtreecommitdiff
path: root/src/ldebug.js
diff options
context:
space:
mode:
authorBenoit Giannangeli <giann008@gmail.com>2017-05-08 10:55:26 +0200
committerBenoit Giannangeli <giann008@gmail.com>2017-05-08 10:55:26 +0200
commite535c784055065ba8c8b6313b2804562c35dd261 (patch)
tree00fb42afc99e3187cfc192b750e102ebaf0df35e /src/ldebug.js
parentecc153eed6f7d2fd4c39b0e276cdf14abd48d62c (diff)
parent636b1d8a5a566fac0c9c61fed44049c659435a56 (diff)
downloadfengari-e535c784055065ba8c8b6313b2804562c35dd261.tar.gz
fengari-e535c784055065ba8c8b6313b2804562c35dd261.tar.bz2
fengari-e535c784055065ba8c8b6313b2804562c35dd261.zip
Merge remote-tracking branch 'daurnimator/boxed-strings'
Diffstat (limited to 'src/ldebug.js')
-rw-r--r--src/ldebug.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ldebug.js b/src/ldebug.js
index af9b9a9..6a16b9c 100644
--- a/src/ldebug.js
+++ b/src/ldebug.js
@@ -82,7 +82,7 @@ const upvalname = function(p, uv) {
assert(uv < p.upvalues.length);
let s = p.upvalues[uv].name;
if (s === null) return ["?".charCodeAt(0)];
- return s;
+ return s.getstr();
};
const findvararg = function(ci, n) {
@@ -167,7 +167,7 @@ const funcinfo = function(ar, cl) {
ar.what = "J";
} else {
let p = cl.p;
- ar.source = p.source ? p.source : defs.to_luastring("=?", true);
+ ar.source = p.source ? p.source.getstr() : defs.to_luastring("=?", true);
ar.linedefined = p.linedefined;
ar.lastlinedefined = p.lastlinedefined;
ar.what = ar.linedefined === 0 ? defs.to_luastring("main", true) : defs.to_luastring("Lua", true);
@@ -491,7 +491,7 @@ const funcnamefromcode = function(L, ci) {
return null; /* cannot find a reasonable name */
}
- r.name = L.l_G.tmname[tm];
+ r.name = L.l_G.tmname[tm].getstr();
r.funcname = defs.to_luastring("metamethod", true);
return r;
};
@@ -569,7 +569,7 @@ const luaG_ordererror = function(L, p1, p2) {
const luaG_addinfo = function(L, msg, src, line) {
let buff;
if (src)
- buff = lobject.luaO_chunkid(src, luaconf.LUA_IDSIZE);
+ buff = lobject.luaO_chunkid(src.getstr(), luaconf.LUA_IDSIZE);
else
buff = ['?'.charCodeAt(0)];