asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #91412 from dalexeev/gds-fix-non-static-access-in-static-context

Browse source 
GDScript: Fix access non-static members in static context
This commit is contained in:
Rémi Verschelde 2024-05-02 17:31:39 +02:00
commit 76f642b962
No known key found for this signature in database
GPG key ID: C3336907360768E1
18 changed files with 182 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
modules/gdscript/gdscript_analyzer.cpp
View file

@ -3384,7 +3384,7 @@ void GDScriptAnalyzer::reduce_call(GDScriptParser::CallNode *p_call, bool p_is_a
}
if (parent_function) {
push_error(vformat(R"*(Cannot call non-static function "%s()" from static function "%s()".)*", p_call->function_name, parent_function->identifier->name), p_call);
push_error(vformat(R"*(Cannot call non-static function "%s()" from the static function "%s()".)*", p_call->function_name, parent_function->identifier->name), p_call);
} else {
push_error(vformat(R"*(Cannot call non-static function "%s()" from a static variable initializer.)*", p_call->function_name), p_call);
}
@ -3801,6 +3801,8 @@ void GDScriptAnalyzer::reduce_identifier_from_base(GDScriptParser::IdentifierNod
if (is_base && (!base.is_meta_type || member.function->is_static || is_constructor)) {
p_identifier->set_datatype(make_callable_type(member.function->info));
p_identifier->source = GDScriptParser::IdentifierNode::MEMBER_FUNCTION;
p_identifier->function_source = member.function;
p_identifier->function_source_is_static = member.function->is_static;
return;
}
} break;
@ -3849,6 +3851,7 @@ void GDScriptAnalyzer::reduce_identifier_from_base(GDScriptParser::IdentifierNod
if (method_info.name == p_identifier->name) {
p_identifier->set_datatype(make_callable_type(method_info));
p_identifier->source = GDScriptParser::IdentifierNode::MEMBER_FUNCTION;
p_identifier->function_source_is_static = method_info.flags & METHOD_FLAG_STATIC;
return;
}
@ -4029,25 +4032,37 @@ void GDScriptAnalyzer::reduce_identifier(GDScriptParser::IdentifierNode *p_ident
}
if (found_source) {
bool source_is_variable = p_identifier->source == GDScriptParser::IdentifierNode::MEMBER_VARIABLE || p_identifier->source == GDScriptParser::IdentifierNode::INHERITED_VARIABLE;
bool source_is_signal = p_identifier->source == GDScriptParser::IdentifierNode::MEMBER_SIGNAL;
if ((source_is_variable || source_is_signal) && static_context) {
const bool source_is_instance_variable = p_identifier->source == GDScriptParser::IdentifierNode::MEMBER_VARIABLE || p_identifier->source == GDScriptParser::IdentifierNode::INHERITED_VARIABLE;
const bool source_is_instance_function = p_identifier->source == GDScriptParser::IdentifierNode::MEMBER_FUNCTION && !p_identifier->function_source_is_static;
const bool source_is_signal = p_identifier->source == GDScriptParser::IdentifierNode::MEMBER_SIGNAL;
if (static_context && (source_is_instance_variable || source_is_instance_function || source_is_signal)) {
// Get the parent function above any lambda.
GDScriptParser::FunctionNode *parent_function = parser->current_function;
while (parent_function && parent_function->source_lambda) {
parent_function = parent_function->source_lambda->parent_function;
}
String source_type;
if (source_is_instance_variable) {
source_type = "non-static variable";
} else if (source_is_instance_function) {
source_type = "non-static function";
} else { // source_is_signal
source_type = "signal";
}
if (parent_function) {
push_error(vformat(R"*(Cannot access %s "%s" from the static function "%s()".)*", source_is_signal ? "signal" : "instance variable", p_identifier->name, parent_function->identifier->name), p_identifier);
push_error(vformat(R"*(Cannot access %s "%s" from the static function "%s()".)*", source_type, p_identifier->name, parent_function->identifier->name), p_identifier);
} else {
push_error(vformat(R"*(Cannot access %s "%s" from a static variable initializer.)*", source_is_signal ? "signal" : "instance variable", p_identifier->name), p_identifier);
push_error(vformat(R"*(Cannot access %s "%s" from a static variable initializer.)*", source_type, p_identifier->name), p_identifier);
}
}
if (current_lambda != nullptr) {
// If the identifier is a member variable (including the native class properties) or a signal, we consider the lambda to be using `self`, so we keep a reference to the current instance.
if (source_is_variable || source_is_signal) {
// If the identifier is a member variable (including the native class properties), member function, or a signal,
// we consider the lambda to be using `self`, so we keep a reference to the current instance.
if (source_is_instance_variable || source_is_instance_function || source_is_signal) {
mark_lambda_use_self();
return; // No need to capture.
}

5
modules/gdscript/gdscript_parser.h
View file

@ -902,8 +902,11 @@ public:
VariableNode *variable_source;
ConstantNode *constant_source;
SignalNode *signal_source;
FunctionNode *function_source;
};
FunctionNode *source_function = nullptr;
bool function_source_is_static = false; // For non-GDScript scripts.
FunctionNode *source_function = nullptr; // TODO: Rename to disambiguate `function_source`.
int usages = 0; // Useful for binds/iterator variable.

10
modules/gdscript/tests/scripts/analyzer/errors/static_func_access_non_static.gd Normal file
View file

@ -0,0 +1,10 @@
# GH-91403
static func static_func():
print(non_static_func)
func non_static_func():
pass
func test():
pass

2
modules/gdscript/tests/scripts/analyzer/errors/static_func_access_non_static.out Normal file
View file

@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
Cannot access non-static function "non_static_func" from the static function "static_func()".

15
modules/gdscript/tests/scripts/analyzer/errors/static_func_access_non_static_in_lambda_param.gd Normal file
View file

@ -0,0 +1,15 @@
# GH-91403
func non_static_func():
pass
static func static_func(
f := func ():
var g := func ():
print(non_static_func)
g.call()
):
f.call()
func test():
pass

2
modules/gdscript/tests/scripts/analyzer/errors/static_func_access_non_static_in_lambda_param.out Normal file
View file

@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
Cannot access non-static function "non_static_func" from the static function "static_func()".

2
modules/gdscript/tests/scripts/analyzer/errors/static_func_call_non_static.out
View file

@ -1,2 +1,2 @@
GDTEST_ANALYZER_ERROR
Cannot call non-static function "non_static_func()" from static function "static_func()".
Cannot call non-static function "non_static_func()" from the static function "static_func()".

2
modules/gdscript/tests/scripts/analyzer/errors/static_func_call_non_static_in_lambda.out
View file

@ -1,2 +1,2 @@
GDTEST_ANALYZER_ERROR
Cannot call non-static function "non_static_func()" from static function "static_func()".
Cannot call non-static function "non_static_func()" from the static function "static_func()".

2
modules/gdscript/tests/scripts/analyzer/errors/static_func_call_non_static_in_lambda_param.out
View file

@ -1,2 +1,2 @@
GDTEST_ANALYZER_ERROR
Cannot call non-static function "non_static_func()" from static function "static_func()".
Cannot call non-static function "non_static_func()" from the static function "static_func()".

14
modules/gdscript/tests/scripts/analyzer/errors/static_var_init_access_non_static_in_lambda.gd Normal file
View file

@ -0,0 +1,14 @@
# GH-91403
func non_static_func():
pass
static var static_var = func ():
var f := func ():
var g := func ():
print(non_static_func)
g.call()
f.call()
func test():
pass

2
modules/gdscript/tests/scripts/analyzer/errors/static_var_init_access_non_static_in_lambda.out Normal file
View file

@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
Cannot access non-static function "non_static_func" from a static variable initializer.

15
modules/gdscript/tests/scripts/analyzer/errors/static_var_init_access_non_static_in_lambda_setter.gd Normal file
View file

@ -0,0 +1,15 @@
# GH-91403
func non_static_func():
pass
static var static_var:
set(_value):
var f := func ():
var g := func ():
print(non_static_func)
g.call()
f.call()
func test():
pass

2
modules/gdscript/tests/scripts/analyzer/errors/static_var_init_access_non_static_in_lambda_setter.out Normal file
View file

@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
Cannot access non-static function "non_static_func" from the static function "@static_var_setter()".

2
modules/gdscript/tests/scripts/analyzer/errors/static_var_init_call_non_static_in_lambda_setter.out
View file

@ -1,2 +1,2 @@
GDTEST_ANALYZER_ERROR
Cannot call non-static function "non_static_func()" from static function "@static_var_setter()".
Cannot call non-static function "non_static_func()" from the static function "@static_var_setter()".

11
modules/gdscript/tests/scripts/analyzer/errors/static_var_init_non_static_access.gd Normal file
View file

@ -0,0 +1,11 @@
# GH-91403
@static_unload
func non_static():
return "non static"
static var static_var = Callable(non_static)
func test():
print("does not run")

2
modules/gdscript/tests/scripts/analyzer/errors/static_var_init_non_static_access.out Normal file
View file

@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
Cannot access non-static function "non_static" from a static variable initializer.

75
modules/gdscript/tests/scripts/analyzer/features/static_non_static_access.gd Normal file
View file

@ -0,0 +1,75 @@
@static_unload
static var static_var
var non_static_var
signal my_signal()
static func static_func():
pass
func non_static_func():
pass
static var test_static_var_lambda = func ():
static_func()
print(static_func)
static_var = 1
print(static_var)
var test_non_static_var_lambda = func ():
static_func()
print(static_func)
static_var = 1
print(static_var)
non_static_func()
print(non_static_func)
non_static_var = 1
print(non_static_var)
my_signal.emit()
print(my_signal)
static var test_static_var_setter:
set(_value):
static_func()
print(static_func)
static_var = 1
print(static_var)
var test_non_static_var_setter:
set(_value):
static_func()
print(static_func)
static_var = 1
print(static_var)
non_static_func()
print(non_static_func)
non_static_var = 1
print(non_static_var)
my_signal.emit()
print(my_signal)
static func test_static_func():
static_func()
print(static_func)
static_var = 1
print(static_var)
func test_non_static_func():
static_func()
print(static_func)
static_var = 1
print(static_var)
non_static_func()
print(non_static_func)
non_static_var = 1
print(non_static_var)
my_signal.emit()
print(my_signal)
func test():
test_static_var_lambda = null
test_non_static_var_lambda = null

1
modules/gdscript/tests/scripts/analyzer/features/static_non_static_access.out Normal file
View file

@ -0,0 +1 @@
GDTEST_OK