mirror of
https://github.com/godotengine/godot
synced 2024-10-06 14:55:02 +00:00
false positive "Identifier not found" error or signals fixed
This commit is contained in:
parent
e1e52b3736
commit
9869522e6a
|
@ -255,36 +255,59 @@ GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &code
|
||||||
}
|
}
|
||||||
|
|
||||||
// Try class constants.
|
// Try class constants.
|
||||||
GDScript *owner = codegen.script;
|
{
|
||||||
while (owner) {
|
GDScript *owner = codegen.script;
|
||||||
GDScript *scr = owner;
|
while (owner) {
|
||||||
|
GDScript *scr = owner;
|
||||||
|
GDScriptNativeClass *nc = nullptr;
|
||||||
|
while (scr) {
|
||||||
|
if (scr->constants.has(identifier)) {
|
||||||
|
return GDScriptCodeGenerator::Address(GDScriptCodeGenerator::Address::CLASS_CONSTANT, gen->add_or_get_name(identifier)); // TODO: Get type here.
|
||||||
|
}
|
||||||
|
if (scr->native.is_valid()) {
|
||||||
|
nc = scr->native.ptr();
|
||||||
|
}
|
||||||
|
scr = scr->_base;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Class C++ integer constant.
|
||||||
|
if (nc) {
|
||||||
|
bool success = false;
|
||||||
|
int constant = ClassDB::get_integer_constant(nc->get_name(), identifier, &success);
|
||||||
|
if (success) {
|
||||||
|
return codegen.add_constant(constant);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
owner = owner->_owner;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Try signals and methods (can be made callables).
|
||||||
|
{
|
||||||
|
if (codegen.class_node->members_indices.has(identifier)) {
|
||||||
|
const GDScriptParser::ClassNode::Member &member = codegen.class_node->members[codegen.class_node->members_indices[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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Try in native base.
|
||||||
|
GDScript *scr = codegen.script;
|
||||||
GDScriptNativeClass *nc = nullptr;
|
GDScriptNativeClass *nc = nullptr;
|
||||||
while (scr) {
|
while (scr) {
|
||||||
if (scr->constants.has(identifier)) {
|
|
||||||
return GDScriptCodeGenerator::Address(GDScriptCodeGenerator::Address::CLASS_CONSTANT, gen->add_or_get_name(identifier)); // TODO: Get type here.
|
|
||||||
}
|
|
||||||
if (scr->native.is_valid()) {
|
if (scr->native.is_valid()) {
|
||||||
nc = scr->native.ptr();
|
nc = scr->native.ptr();
|
||||||
}
|
}
|
||||||
scr = scr->_base;
|
scr = scr->_base;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Class C++ integer constant.
|
if (nc && (ClassDB::has_signal(nc->get_name(), identifier) || ClassDB::has_method(nc->get_name(), identifier))) {
|
||||||
if (nc) {
|
|
||||||
bool success = false;
|
|
||||||
int constant = ClassDB::get_integer_constant(nc->get_name(), identifier, &success);
|
|
||||||
if (success) {
|
|
||||||
return codegen.add_constant(constant);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
owner = owner->_owner;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try signals and methods (can be made callables);
|
|
||||||
if (codegen.class_node->members_indices.has(identifier)) {
|
|
||||||
const GDScriptParser::ClassNode::Member &member = codegen.class_node->members[codegen.class_node->members_indices[identifier]];
|
|
||||||
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.
|
||||||
GDScriptCodeGenerator::Address self(GDScriptCodeGenerator::Address::SELF);
|
GDScriptCodeGenerator::Address self(GDScriptCodeGenerator::Address::SELF);
|
||||||
|
|
Loading…
Reference in a new issue