godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Fix type adjustment skipped when value is considered both not hard and not variant

Browse Source
This commit is contained in:
cdemirer
2022-07-04 01:10:16 +03:00
parent f382a2b59b
commit bbb21c3fd5
3 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/gdscript/gdscript_analyzer.cpp
View File

@@ -2259,30 +2259,26 @@ void GDScriptAnalyzer::reduce_assignment(GDScriptParser::AssignmentNode *p_assig
} }
p_assignment->set_datatype(op_type); p_assignment->set_datatype(op_type);
if (!assignee_type.is_variant() && assigned_value_type.is_hard_type()) { if (assignee_type.is_hard_type() && !assignee_type.is_variant() && op_type.is_hard_type()) {
if (compatible) { if (compatible) {
compatible = is_type_compatible(assignee_type, op_type, true, p_assignment->assigned_value); compatible = is_type_compatible(assignee_type, op_type, true, p_assignment->assigned_value);
if (!compatible) { if (!compatible) {
if (assignee_type.is_hard_type()) { // Try reverse test since it can be a masked subtype.
// Try reverse test since it can be a masked subtype. if (!is_type_compatible(op_type, assignee_type, true)) {
if (!is_type_compatible(op_type, assignee_type, true, p_assignment->assigned_value)) { push_error(vformat(R"(Cannot assign a value of type "%s" to a target of type "%s".)", assigned_value_type.to_string(), assignee_type.to_string()), p_assignment->assigned_value);
push_error(vformat(R"(Cannot assign a value of type "%s" to a target of type "%s".)", assigned_value_type.to_string(), assignee_type.to_string()), p_assignment->assigned_value);
} else {
// TODO: Add warning.
mark_node_unsafe(p_assignment);
p_assignment->use_conversion_assign = true;
}
} else { } else {
// TODO: Warning in this case. // TODO: Add warning.
mark_node_unsafe(p_assignment); mark_node_unsafe(p_assignment);
p_assignment->use_conversion_assign = true;
} }
} }
} else { } else {
push_error(vformat(R"(Invalid operands "%s" and "%s" for assignment operator.)", assignee_type.to_string(), assigned_value_type.to_string()), p_assignment); push_error(vformat(R"(Invalid operands "%s" and "%s" for assignment operator.)", assignee_type.to_string(), assigned_value_type.to_string()), p_assignment);
} }
} } else if (assignee_type.is_hard_type() && !assignee_type.is_variant()) {
mark_node_unsafe(p_assignment);
if (assignee_type.has_no_type() || assigned_value_type.is_variant()) { p_assignment->use_conversion_assign = true;
} else {
mark_node_unsafe(p_assignment); mark_node_unsafe(p_assignment);
if (assignee_type.is_hard_type() && !assignee_type.is_variant()) { if (assignee_type.is_hard_type() && !assignee_type.is_variant()) {
p_assignment->use_conversion_assign = true; p_assignment->use_conversion_assign = true;

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

@@ -0,0 +1,9 @@
func test():
var x: int = 2
var y = 3.14
var z := 2.72
print(typeof(x))
x = y
print(typeof(x))
x = z
print(typeof(x))

12
modules/gdscript/tests/scripts/runtime/features/typed_assignment.out Normal file
View File

@@ -0,0 +1,12 @@
GDTEST_OK
>> WARNING
>> Line: 6
>> NARROWING_CONVERSION
>> Narrowing conversion (float is converted to int and loses precision).
>> WARNING
>> Line: 8
>> NARROWING_CONVERSION
>> Narrowing conversion (float is converted to int and loses precision).
2
2
2