diff options
| author | Yuri Sizov <11782833+YuriSizov@users.noreply.github.com> | 2023-03-20 19:13:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-20 19:13:23 +0100 |
| commit | 5461b9976cc3457cfb2017e2ab1c42caca6f8eea (patch) | |
| tree | c2f3169a8221040b906f89c132a3a85549e98193 /modules/gdscript/gdscript.cpp | |
| parent | a5f34744a2195ab7e008e0e5420b6e713b9f4e01 (diff) | |
| parent | 4e34cf238aeff209f5823685d7b66ae8d66118cb (diff) | |
| download | redot-engine-5461b9976cc3457cfb2017e2ab1c42caca6f8eea.tar.gz | |
Merge pull request #74844 from vonagam/change-class-extends-parsing
GDScript: Change parser representation of class extends
Diffstat (limited to 'modules/gdscript/gdscript.cpp')
| -rw-r--r-- | modules/gdscript/gdscript.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp index 1a1d021dbc..2646c1ad15 100644 --- a/modules/gdscript/gdscript.cpp +++ b/modules/gdscript/gdscript.cpp @@ -2483,7 +2483,7 @@ String GDScriptLanguage::get_global_class_name(const String &p_path, String *r_b subclass = nullptr; break; } else { - Vector<StringName> extend_classes = subclass->extends; + Vector<GDScriptParser::IdentifierNode *> extend_classes = subclass->extends; Ref<FileAccess> subfile = FileAccess::open(subclass->extends_path, FileAccess::READ); if (subfile.is_null()) { @@ -2513,7 +2513,7 @@ String GDScriptLanguage::get_global_class_name(const String &p_path, String *r_b } const GDScriptParser::ClassNode *inner_class = subclass->members[i].m_class; - if (inner_class->identifier->name == extend_classes[0]) { + if (inner_class->identifier->name == extend_classes[0]->name) { extend_classes.remove_at(0); found = true; subclass = inner_class; @@ -2527,7 +2527,7 @@ String GDScriptLanguage::get_global_class_name(const String &p_path, String *r_b } } } else if (subclass->extends.size() == 1) { - *r_base_type = subclass->extends[0]; + *r_base_type = subclass->extends[0]->name; subclass = nullptr; } else { break; |