seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #61510 from Calinou/script-tweak-stack-overflow-message

Browse Source
This commit is contained in:
Rémi Verschelde
2022-06-17 13:03:05 +02:00
committed by GitHub
parent a60e2085b6 cceeb671db
commit 78944fef82
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gdscript/gdscript.h
View File

@ -368,7 +368,7 @@ public:
if (_debug_call_stack_pos >= _debug_max_call_stack) { if (_debug_call_stack_pos >= _debug_max_call_stack) {
//stack overflow //stack overflow
_debug_error = "Stack Overflow (Stack Size: " + itos(_debug_max_call_stack) + ")"; _debug_error = vformat("Stack overflow (stack size: %s). Check for infinite recursion in your script.", _debug_max_call_stack);
EngineDebugger::get_script_debugger()->debug(this); EngineDebugger::get_script_debugger()->debug(this);
return; return;
} }

4
modules/visual_script/visual_script.cpp
View File

@ -1582,7 +1582,7 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
if (!found) { if (!found) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD; r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
error_str = RTR("Found sequence bit but not the node in the stack, report bug!"); error_str = RTR("Found sequence bit but not the node in the stack (please report).");
error = true; error = true;
break; break;
} }
@ -1594,7 +1594,7 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
// Check for stack overflow. // Check for stack overflow.
if (flow_stack_pos + 1 >= flow_max) { if (flow_stack_pos + 1 >= flow_max) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD; r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
error_str = RTR("Stack overflow with stack depth:") + " " + itos(output); error_str = vformat(RTR("Stack overflow (stack size: %s). Check for infinite recursion in your script."), output);
error = true; error = true;
break; break;
} }

4
modules/visual_script/visual_script.h
View File

@ -522,7 +522,7 @@ public:
if (_debug_call_stack_pos >= _debug_max_call_stack) { if (_debug_call_stack_pos >= _debug_max_call_stack) {
// Stack overflow. // Stack overflow.
_debug_error = "Stack Overflow (Stack Size: " + itos(_debug_max_call_stack) + ")"; _debug_error = vformat("Stack overflow (stack size: %s). Check for infinite recursion in your script.", _debug_max_call_stack);
EngineDebugger::get_script_debugger()->debug(this); EngineDebugger::get_script_debugger()->debug(this);
return; return;
} }
@ -545,7 +545,7 @@ public:
} }
if (_debug_call_stack_pos == 0) { if (_debug_call_stack_pos == 0) {
_debug_error = "Stack Underflow (Engine Bug)"; _debug_error = "Stack underflow (engine bug), please report.";
EngineDebugger::get_script_debugger()->debug(this); EngineDebugger::get_script_debugger()->debug(this);
return; return;
} }