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

Merge pull request #70980 from vonagam/fix-array-as-default-parameter

Browse source 
GDScript: Fix array as default value for parameter
This commit is contained in:
Rémi Verschelde 2023-01-06 08:06:36 +01:00 committed by GitHub
commit 2e11627110
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/gdscript/gdscript_compiler.cpp
View file

@ -2025,7 +2025,7 @@ GDScriptFunction *GDScriptCompiler::_parse_function(Error &r_error, GDScript *p_
uint32_t par_addr = codegen.generator->add_parameter(parameter->identifier->name, parameter->initializer != nullptr, par_type);
codegen.parameters[parameter->identifier->name] = GDScriptCodeGenerator::Address(GDScriptCodeGenerator::Address::FUNCTION_PARAMETER, par_addr, par_type);
if (p_func->parameters[i]->initializer != nullptr) {
if (parameter->initializer != nullptr) {
optional_parameters++;
}
}
@ -2103,6 +2103,17 @@ GDScriptFunction *GDScriptCompiler::_parse_function(Error &r_error, GDScript *p_
return nullptr;
}
GDScriptCodeGenerator::Address dst_addr = codegen.parameters[parameter->identifier->name];
// For typed arrays we need to make sure this is already initialized correctly so typed assignment work.
GDScriptDataType par_type = dst_addr.type;
if (par_type.has_type && par_type.builtin_type == Variant::ARRAY) {
if (par_type.has_container_element_type()) {
codegen.generator->write_construct_typed_array(dst_addr, par_type.get_container_element_type(), Vector<GDScriptCodeGenerator::Address>());
} else {
codegen.generator->write_construct_array(dst_addr, Vector<GDScriptCodeGenerator::Address>());
}
}
codegen.generator->write_assign_default_parameter(dst_addr, src_addr);
if (src_addr.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
codegen.generator->pop_temporary();

17
modules/gdscript/tests/scripts/analyzer/features/typed_array_as_default_parameter.gd Normal file
View file

@ -0,0 +1,17 @@
func print_untyped(array = [0]) -> void:
print(array)
print(array.get_typed_builtin())
func print_inferred(array := [1]) -> void:
print(array)
print(array.get_typed_builtin())
func print_typed(array: Array[int] = [2]) -> void:
print(array)
print(array.get_typed_builtin())
func test():
print_untyped()
print_inferred()
print_typed()
print('ok')

8
modules/gdscript/tests/scripts/analyzer/features/typed_array_as_default_parameter.out Normal file
View file

@ -0,0 +1,8 @@
GDTEST_OK
[0]
0
[1]
2
[2]
2
ok