From d6f10cd08e795cdbf5fcf07149b584c47a236cf4 Mon Sep 17 00:00:00 2001 From: Dani Frank Date: Tue, 14 Jan 2020 17:33:33 +0200 Subject: [PATCH] Add fully_qualified_name for GDScript class --- modules/gdscript/gdscript.h | 1 + modules/gdscript/gdscript_compiler.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/modules/gdscript/gdscript.h b/modules/gdscript/gdscript.h index 72389cdddcbb..0e2b812a2219 100644 --- a/modules/gdscript/gdscript.h +++ b/modules/gdscript/gdscript.h @@ -111,6 +111,7 @@ class GDScript : public Script { String source; String path; String name; + String fully_qualified_name; SelfList script_list; GDScriptInstance *_create_instance(const Variant **p_args, int p_argcount, Object *p_owner, bool p_isref, Variant::CallError &r_error); diff --git a/modules/gdscript/gdscript_compiler.cpp b/modules/gdscript/gdscript_compiler.cpp index 7b3175d9cd6c..711fa54d0b14 100644 --- a/modules/gdscript/gdscript_compiler.cpp +++ b/modules/gdscript/gdscript_compiler.cpp @@ -2131,6 +2131,7 @@ void GDScriptCompiler::_make_scripts(GDScript *p_script, const GDScriptParser::C } subclass->_owner = p_script; + subclass->fully_qualified_name = p_script->fully_qualified_name + "::" + name; p_script->subclasses.insert(name, subclass); _make_scripts(subclass.ptr(), p_class->subclasses[i], false); @@ -2149,6 +2150,9 @@ Error GDScriptCompiler::compile(const GDScriptParser *p_parser, GDScript *p_scri source = p_script->get_path(); + // The best fully qualified name for a base level script is its file path + p_script->fully_qualified_name = p_script->path; + // Create scripts for subclasses beforehand so they can be referenced _make_scripts(p_script, static_cast(root), p_keep_state);