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

Merge pull request #73870 from vnen/gdscript-dont-reference-group-properties

Browse source 
GDScript: Fix groups and categories been seen as members
This commit is contained in:
Rémi Verschelde 2023-02-24 14:08:20 +01:00
commit 7e00cc1f7a
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/gdscript/gdscript_compiler.cpp
View file

@ -211,6 +211,10 @@ static bool _can_use_ptrcall(const MethodBind *p_method, const Vector<GDScriptCo
return true;
}
inline static bool is_category_or_group(const PropertyInfo &p_info) {
return p_info.usage & PROPERTY_USAGE_CATEGORY || p_info.usage & PROPERTY_USAGE_GROUP || p_info.usage & PROPERTY_USAGE_SUBGROUP;
}
GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &codegen, Error &r_error, const GDScriptParser::ExpressionNode *p_expression, bool p_root, bool p_initializer, const GDScriptCodeGenerator::Address &p_index_addr) {
if (p_expression->is_constant && !(p_expression->get_datatype().is_meta_type && p_expression->get_datatype().kind == GDScriptParser::DataType::CLASS)) {
return codegen.add_constant(p_expression->reduced_value);
@ -246,7 +250,7 @@ GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &code
// Try members.
if (!codegen.function_node || !codegen.function_node->is_static) {
// Try member variables.
if (codegen.script->member_indices.has(identifier)) {
if (codegen.script->member_indices.has(identifier) && !is_category_or_group(codegen.script->member_info[identifier])) {
if (codegen.script->member_indices[identifier].getter != StringName() && codegen.script->member_indices[identifier].getter != codegen.function_name) {
// Perform getter.
GDScriptCodeGenerator::Address temp = codegen.add_temporary(codegen.script->member_indices[identifier].data_type);

9
modules/gdscript/tests/scripts/runtime/features/groups_are_not_properties.gd Normal file
View file

@ -0,0 +1,9 @@
# https://github.com/godotengine/godot/issues/73843
extends RefCounted
@export_group("Resource")
@export_category("RefCounted")
func test():
prints("Not shadowed", Resource.new())
prints("Not shadowed", RefCounted.new())

3
modules/gdscript/tests/scripts/runtime/features/groups_are_not_properties.out Normal file
View file

@ -0,0 +1,3 @@
GDTEST_OK
Not shadowed <Resource#-9223371975785708326>
Not shadowed <RefCounted#-9223371975768931110>