Merge pull request #41062 from ThakeeNathees/unsafe-arithmatic-assignment-bug-fix

GDScript: unsafe arithmetic assignment bug fix
This commit is contained in:
George Marques 2020-08-06 10:51:48 -03:00 committed by GitHub
commit 241e709462
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1406,6 +1406,7 @@ void GDScriptAnalyzer::reduce_assignment(GDScriptParser::AssignmentNode *p_assig
break;
}
if (!p_assignment->assignee->get_datatype().is_variant() && !p_assignment->assigned_value->get_datatype().is_variant()) {
bool compatible = true;
GDScriptParser::DataType op_type = p_assignment->assigned_value->get_datatype();
if (vop != Variant::OP_EQUAL) {
@ -1424,6 +1425,7 @@ void GDScriptAnalyzer::reduce_assignment(GDScriptParser::AssignmentNode *p_assig
} else {
push_error(vformat(R"(Invalid operands "%s" and "%s" for assignment operator.)", p_assignment->assignee->get_datatype().to_string(), p_assignment->assigned_value->get_datatype().to_string()), p_assignment);
}
}
if (p_assignment->assignee->get_datatype().has_no_type() || p_assignment->assigned_value->get_datatype().is_variant()) {
mark_node_unsafe(p_assignment);