From 73b260ce057cc677b6964f6c9ff94e2e66e9cbbe Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Wed, 3 Dec 2025 08:19:49 +0000 Subject: [PATCH] Codefix: Leading newlines in Squirrel error/callstack prints (#14851) --- regression/regression/result.txt | 2 ++ src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/regression/regression/result.txt b/regression/regression/result.txt index 4b17a7b39b..3c98d4b27e 100644 --- a/regression/regression/result.txt +++ b/regression/regression/result.txt @@ -10116,8 +10116,10 @@ ERROR: IsEnd() is invalid as Begin() is never called constructor failed with: excessive CPU usage in list filter function Your script made an error: excessive CPU usage in valuator function +CALLSTACK *FUNCTION [Start()] regression/main.nut line [2184] +LOCALS [Infinite] CLOSURE [list] INSTANCE [this] INSTANCE diff --git a/src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp b/src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp index f5763589c2..8f3b6b78b4 100644 --- a/src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp +++ b/src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp @@ -18,7 +18,8 @@ void sqstd_printcallstack(HSQUIRRELVM v) SQFloat f; SQInteger level=1; //1 is to skip this function that is level 0 SQInteger seq=0; - pf(v,"\nCALLSTACK\n"); + pf(v,"\n"); + pf(v,"CALLSTACK\n"); while(SQ_SUCCEEDED(sq_stackinfos(v,level,&si))) { std::string_view fn="unknown"; @@ -37,7 +38,8 @@ void sqstd_printcallstack(HSQUIRRELVM v) level++; } level=0; - pf(v,"\nLOCALS\n"); + pf(v,"\n"); + pf(v,"LOCALS\n"); for(level=0;level<10;level++){ seq=0; @@ -116,11 +118,12 @@ static SQInteger _sqstd_aux_printerror(HSQUIRRELVM v) if(pf) { std::string_view error; if(sq_gettop(v)>=1) { + pf(v,"\n"); 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{ - pf(v,"\nAN ERROR HAS OCCURRED [unknown]\n"); + pf(v,"AN ERROR HAS OCCURRED [unknown]\n"); } sqstd_printcallstack(v); }