talezero/integration
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug in traceback code.

Browse Source
This commit is contained in:
Josh Yelon
2021-02-25 14:58:29 -05:00
parent c1ecf593d1
commit f7be4a93e2
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
luprex/core/cpp/traceback.cpp
View File

@@ -1,3 +1,4 @@
#include <cstring>
#include "traceback.hpp" #include "traceback.hpp"
#define TRACEBACK_LEVELS1 12 #define TRACEBACK_LEVELS1 12
@@ -26,6 +27,7 @@ int traceback_coroutine(lua_State *L) {
// Append the traceback. // Append the traceback.
lua_Debug ar; lua_Debug ar;
int firstpart = 1; int firstpart = 1;
bool any = false;
for (int level = 0; lua_getstack(L, level, &ar); level++) { for (int level = 0; lua_getstack(L, level, &ar); level++) {
if (level > TRACEBACK_LEVELS1 && firstpart) { if (level > TRACEBACK_LEVELS1 && firstpart) {
/* no more than `LEVELS2' more levels? */ /* no more than `LEVELS2' more levels? */
@@ -40,10 +42,11 @@ int traceback_coroutine(lua_State *L) {
continue; continue;
} }
lua_getinfo(L, "Snl", &ar); lua_getinfo(L, "Snl", &ar);
if ((level == 0) && (*ar.what == 'C') && (std::string(ar.name) == "__newindex")) { if ((!any) && (*ar.what == 'C') && (ar.name != 0)) {
continue; if (strcmp(ar.name, "__newindex") == 0) continue;
} }
if ((ar.currentline > 0) || (*ar.namewhat != 0) || (*ar.what != 'C')) { if ((ar.currentline > 0) || (*ar.namewhat != 0) || (*ar.what != 'C')) {
any = true;
lua_pushliteral(L, "\n\t"); lua_pushliteral(L, "\n\t");
lua_pushfstring(L, "%s:", ar.short_src); lua_pushfstring(L, "%s:", ar.short_src);
if (ar.currentline > 0) if (ar.currentline > 0)