mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 03:18:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

GDScript: Fix regression with native signal not found

Browse Source
This commit is contained in:
Danil Alexeev 2023-08-02 15:42:36 +03:00
parent dca12c2e54
commit f19377160c
No known key found for this signature in database
GPG Key ID: 124453E157DA8DC7
3 changed files with 52 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
modules/gdscript/gdscript_compiler.cpp
View File

@ -245,6 +245,8 @@ GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &code
// MEMBERS. // MEMBERS.
case GDScriptParser::IdentifierNode::MEMBER_VARIABLE: case GDScriptParser::IdentifierNode::MEMBER_VARIABLE:
case GDScriptParser::IdentifierNode::MEMBER_FUNCTION:
case GDScriptParser::IdentifierNode::MEMBER_SIGNAL:
case GDScriptParser::IdentifierNode::INHERITED_VARIABLE: { case GDScriptParser::IdentifierNode::INHERITED_VARIABLE: {
// Try class members. // Try class members.
if (_is_class_member_property(codegen, identifier)) { if (_is_class_member_property(codegen, identifier)) {
@ -271,45 +273,44 @@ GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &code
} }
} }
} }
} break;
case GDScriptParser::IdentifierNode::MEMBER_FUNCTION:
case GDScriptParser::IdentifierNode::MEMBER_SIGNAL: {
// Try methods and signals (can be Callable and Signal). // Try methods and signals (can be Callable and Signal).
{
// Search upwards through parent classes:
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) {
// Get like it was a property.
GDScriptCodeGenerator::Address temp = codegen.add_temporary(); // TODO: Get type here.
GDScriptCodeGenerator::Address self(GDScriptCodeGenerator::Address::SELF);
// Search upwards through parent classes: gen->write_get_named(temp, identifier, self);
const GDScriptParser::ClassNode *base_class = codegen.class_node; return temp;
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) {
// Get like it was a property.
GDScriptCodeGenerator::Address temp = codegen.add_temporary(); // TODO: Get type here.
GDScriptCodeGenerator::Address self(GDScriptCodeGenerator::Address::SELF);
gen->write_get_named(temp, identifier, self);
return temp;
} }
base_class = base_class->base_type.class_type;
} }
base_class = base_class->base_type.class_type;
}
// Try in native base. // Try in native base.
GDScript *scr = codegen.script; GDScript *scr = codegen.script;
GDScriptNativeClass *nc = nullptr; GDScriptNativeClass *nc = nullptr;
while (scr) { while (scr) {
if (scr->native.is_valid()) { if (scr->native.is_valid()) {
nc = scr->native.ptr(); nc = scr->native.ptr();
}
scr = scr->_base;
} }
scr = scr->_base;
}
if (nc && (ClassDB::has_signal(nc->get_name(), identifier) || ClassDB::has_method(nc->get_name(), identifier))) { if (nc && (ClassDB::has_signal(nc->get_name(), identifier) || ClassDB::has_method(nc->get_name(), identifier))) {
// 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.
GDScriptCodeGenerator::Address self(GDScriptCodeGenerator::Address::SELF); GDScriptCodeGenerator::Address self(GDScriptCodeGenerator::Address::SELF);
gen->write_get_named(temp, identifier, self); gen->write_get_named(temp, identifier, self);
return temp; return temp;
}
} }
} break; } break;
case GDScriptParser::IdentifierNode::MEMBER_CONSTANT: case GDScriptParser::IdentifierNode::MEMBER_CONSTANT:
@ -319,6 +320,7 @@ GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &code
while (owner) { while (owner) {
GDScript *scr = owner; GDScript *scr = owner;
GDScriptNativeClass *nc = nullptr; GDScriptNativeClass *nc = nullptr;
while (scr) { while (scr) {
if (scr->constants.has(identifier)) { if (scr->constants.has(identifier)) {
return codegen.add_constant(scr->constants[identifier]); // TODO: Get type here. return codegen.add_constant(scr->constants[identifier]); // TODO: Get type here.

14
modules/gdscript/tests/scripts/runtime/features/first_class_callable_and_signal.gd Normal file
View File

@ -0,0 +1,14 @@
# GH-80157
extends Node
func f():
pass
signal s()
func test():
print(f)
print(s)
print(get_child)
print(ready)

5
modules/gdscript/tests/scripts/runtime/features/first_class_callable_and_signal.out Normal file
View File

@ -0,0 +1,5 @@
GDTEST_OK
Node::f
Node::[signal]s
Node::get_child
Node::[signal]ready