asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show function name in debugger stack trace

Browse source 
Also show script and line when the instance is gone when resuming from
yield.
This commit is contained in:
George Marques 2019-05-10 16:39:39 -03:00
parent bdc6649b79
commit 9df1a2442b
No known key found for this signature in database
GPG key ID: 046BD46A3201E43D
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
editor/script_editor_debugger.cpp
View file

@ -622,8 +622,7 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
d["frame"] = i; d["frame"] = i;
s->set_metadata(0, d); s->set_metadata(0, d);
//String line = itos(i)+" - "+String(d["file"])+":"+itos(d["line"])+" - at func: "+d["function"]; String line = itos(i) + " - " + String(d["file"]) + ":" + itos(d["line"]) + " - at function: " + d["function"];
String line = itos(i) + " - " + String(d["file"]) + ":" + itos(d["line"]);
s->set_text(0, line); s->set_text(0, line);
if (i == 0) if (i == 0)

4
modules/gdscript/gdscript_function.cpp
View file

@ -1778,7 +1778,7 @@ Variant GDScriptFunctionState::_signal_callback(const Variant **p_args, int p_ar
if (state.instance_id && !ObjectDB::get_instance(state.instance_id)) { if (state.instance_id && !ObjectDB::get_instance(state.instance_id)) {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
ERR_EXPLAIN("Resumed after yield, but class instance is gone"); ERR_EXPLAIN("Resumed function '" + String(function->get_name()) + "()' after yield, but class instance is gone. At script: " + state.script->get_path() + ":" + itos(state.line));
ERR_FAIL_V(Variant()); ERR_FAIL_V(Variant());
#else #else
return Variant(); return Variant();
@ -1874,7 +1874,7 @@ Variant GDScriptFunctionState::resume(const Variant &p_arg) {
ERR_FAIL_COND_V(!function, Variant()); ERR_FAIL_COND_V(!function, Variant());
if (state.instance_id && !ObjectDB::get_instance(state.instance_id)) { if (state.instance_id && !ObjectDB::get_instance(state.instance_id)) {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
ERR_EXPLAIN("Resumed after yield, but class instance is gone"); ERR_EXPLAIN("Resumed function '" + String(function->get_name()) + "()' after yield, but class instance is gone. At script: " + state.script->get_path() + ":" + itos(state.line));
ERR_FAIL_V(Variant()); ERR_FAIL_V(Variant());
#else #else
return Variant(); return Variant();