mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2025-12-13 16:32:13 +01:00
Code Issues Releases Wiki Activity

Codefix: Leading newlines in Squirrel error/callstack prints (#14851)

Browse Source
This commit is contained in:
Jonathan G Rennison
2025-12-03 08:19:49 +00:00
committed by GitHub
parent 43a82c2e27
commit 73b260ce05
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
regression/regression/result.txt
View File

@@ -10116,8 +10116,10 @@ ERROR: IsEnd() is invalid as Begin() is never called
constructor failed with: excessive CPU usage in list filter function constructor failed with: excessive CPU usage in list filter function
Your script made an error: excessive CPU usage in valuator function Your script made an error: excessive CPU usage in valuator function
CALLSTACK
*FUNCTION [Start()] regression/main.nut line [2184] *FUNCTION [Start()] regression/main.nut line [2184]
LOCALS
[Infinite] CLOSURE [Infinite] CLOSURE
[list] INSTANCE [list] INSTANCE
[this] INSTANCE [this] INSTANCE

11
src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp vendored
View File

@@ -18,7 +18,8 @@ void sqstd_printcallstack(HSQUIRRELVM v)
SQFloat f; SQFloat f;
SQInteger level=1; //1 is to skip this function that is level 0 SQInteger level=1; //1 is to skip this function that is level 0
SQInteger seq=0; SQInteger seq=0;
pf(v,"\nCALLSTACK\n"); pf(v,"\n");
pf(v,"CALLSTACK\n");
while(SQ_SUCCEEDED(sq_stackinfos(v,level,&si))) while(SQ_SUCCEEDED(sq_stackinfos(v,level,&si)))
{ {
std::string_view fn="unknown"; std::string_view fn="unknown";
@@ -37,7 +38,8 @@ void sqstd_printcallstack(HSQUIRRELVM v)
level++; level++;
} }
level=0; level=0;
pf(v,"\nLOCALS\n"); pf(v,"\n");
pf(v,"LOCALS\n");
for(level=0;level<10;level++){ for(level=0;level<10;level++){
seq=0; seq=0;
@@ -116,11 +118,12 @@ static SQInteger _sqstd_aux_printerror(HSQUIRRELVM v)
if(pf) { if(pf) {
std::string_view error; std::string_view error;
if(sq_gettop(v)>=1) { if(sq_gettop(v)>=1) {
pf(v,"\n");
if(SQ_SUCCEEDED(sq_getstring(v,2,error))) { if(SQ_SUCCEEDED(sq_getstring(v,2,error))) {
pf(v,fmt::format("\nAN ERROR HAS OCCURRED [{}]\n",error)); pf(v,fmt::format("AN ERROR HAS OCCURRED [{}]\n",error));
} }
else{ else{
pf(v,"\nAN ERROR HAS OCCURRED [unknown]\n"); pf(v,"AN ERROR HAS OCCURRED [unknown]\n");
} }
sqstd_printcallstack(v); sqstd_printcallstack(v);
} }