nick/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-02-07 19:32:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #114808 from dalexeev/core-fix-implicit-conv-in-container-type-validate

Browse Source 
Core: Fix implicit conversions in `ContainerTypeValidate`
This commit is contained in:
Rémi Verschelde
2026-01-09 22:57:20 +01:00
parent dc19eb6ed8 37f09e579e
commit 2d0a589777
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/variant/container_type_validate.h
View File

@@ -46,7 +46,6 @@ struct ContainerTypeValidate {
const char *where = "container";
private:
// Coerces String and StringName into each other and int into float when needed.
_FORCE_INLINE_ bool _internal_validate(Variant &inout_variant, const char *p_operation, bool p_output_errors) const {
if (type == Variant::NIL) {
return true;
@@ -56,15 +55,17 @@ private:
if (inout_variant.get_type() == Variant::NIL && type == Variant::OBJECT) {
return true;
}
if (type == Variant::STRING && inout_variant.get_type() == Variant::STRING_NAME) {
inout_variant = String(inout_variant);
return true;
} else if (type == Variant::STRING_NAME && inout_variant.get_type() == Variant::STRING) {
inout_variant = StringName(inout_variant);
return true;
} else if (type == Variant::FLOAT && inout_variant.get_type() == Variant::INT) {
inout_variant = (float)inout_variant;
return true;
if (Variant::can_convert_strict(inout_variant.get_type(), type)) {
Variant converted_to;
const Variant *converted_from = &inout_variant;
Callable::CallError call_error;
Variant::construct(type, converted_to, &converted_from, 1, call_error);
if (call_error.error == Callable::CallError::CALL_OK) {
inout_variant = converted_to;
return true;
}
}
if (p_output_errors) {

6
modules/gdscript/tests/scripts/runtime/features/array_implicit_conversions.gd Normal file
View File

@@ -0,0 +1,6 @@
func test():
# GH-114299
var a1: Array[PackedInt32Array] = [[1]]
var a2 = [[2]] as Array[PackedInt32Array]
print(var_to_str(a1))
print(var_to_str(a2))

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

@@ -0,0 +1,3 @@
GDTEST_OK
Array[PackedInt32Array]([PackedInt32Array(1)])
Array[PackedInt32Array]([PackedInt32Array(2)])