Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-01 06:01:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #56830 from strank/parent-signals

Browse source
This commit is contained in:
Rémi Verschelde 2022-03-04 17:29:49 +01:00 • committed by GitHub
commit 79bbe57244
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/gdscript/gdscript_compiler.cpp
View file

@ -294,8 +294,11 @@ GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &code
// Try signals and methods (can be made callables). // Try signals and methods (can be made callables).
{ {
if (codegen.class_node->members_indices.has(identifier)) { // Search upwards through parent classes:
const GDScriptParser::ClassNode::Member &member = codegen.class_node->members[codegen.class_node->members_indices[identifier]]; const GDScriptParser::ClassNode *base_class = codegen.class_node;
while (base_class != nullptr) {
if (base_class->has_member(identifier)) {
const GDScriptParser::ClassNode::Member &member = base_class->get_member(identifier);
if (member.type == GDScriptParser::ClassNode::Member::FUNCTION || member.type == GDScriptParser::ClassNode::Member::SIGNAL) { if (member.type == GDScriptParser::ClassNode::Member::FUNCTION || member.type == GDScriptParser::ClassNode::Member::SIGNAL) {
// Get like it was a property. // Get like it was a property.
GDScriptCodeGenerator::Address temp = codegen.add_temporary(); // TODO: Get type here. GDScriptCodeGenerator::Address temp = codegen.add_temporary(); // TODO: Get type here.
@ -305,6 +308,8 @@ GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &code
return temp; return temp;
} }
} }
base_class = base_class->base_type.class_type;
}
// Try in native base. // Try in native base.
GDScript *scr = codegen.script; GDScript *scr = codegen.script;