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

Merge pull request #73398 from anvilfolk/fix-getter

Browse source 
Fix unset getter return types resulting in strange behavior
This commit is contained in:
Rémi Verschelde 2023-02-17 00:31:42 +01:00
commit 68807165f4
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/gdscript/gdscript_compiler.cpp
View file

@ -254,7 +254,7 @@ GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &code
if (codegen.script->member_indices.has(identifier)) { if (codegen.script->member_indices.has(identifier)) {
if (codegen.script->member_indices[identifier].getter != StringName() && codegen.script->member_indices[identifier].getter != codegen.function_name) { if (codegen.script->member_indices[identifier].getter != StringName() && codegen.script->member_indices[identifier].getter != codegen.function_name) {
// Perform getter. // Perform getter.
GDScriptCodeGenerator::Address temp = codegen.add_temporary(); GDScriptCodeGenerator::Address temp = codegen.add_temporary(codegen.script->member_indices[identifier].data_type);
Vector<GDScriptCodeGenerator::Address> args; // No argument needed. Vector<GDScriptCodeGenerator::Address> args; // No argument needed.
gen->write_call_self(temp, codegen.script->member_indices[identifier].getter, args); gen->write_call_self(temp, codegen.script->member_indices[identifier].getter, args);
return temp; return temp;

9
modules/gdscript/tests/scripts/analyzer/features/getter_return_type.gd Normal file
View file

@ -0,0 +1,9 @@
var Value:int = 8 :
get:
return Value
set(v):
Value = v
func test():
var f:float = Value
print(int(f))

2
modules/gdscript/tests/scripts/analyzer/features/getter_return_type.out Normal file
View file

@ -0,0 +1,2 @@
GDTEST_OK
8