Merge pull request #40690 from ThakeeNathees/arithmetic-assign-type-check-bug-fix
GDScript arithmetic assignment type check bug fix
This commit is contained in:
commit
9adf6d3441
1 changed files with 53 additions and 5 deletions
|
@ -1369,12 +1369,60 @@ void GDScriptAnalyzer::reduce_assignment(GDScriptParser::AssignmentNode *p_assig
|
||||||
push_error("Cannot assign a new value to a constant.", p_assignment->assignee);
|
push_error("Cannot assign a new value to a constant.", p_assignment->assignee);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_type_compatible(p_assignment->assignee->get_datatype(), p_assignment->assigned_value->get_datatype(), true)) {
|
Variant::Operator vop = Variant::Operator::OP_EQUAL;
|
||||||
if (p_assignment->assignee->get_datatype().is_hard_type()) {
|
switch (p_assignment->operation) {
|
||||||
push_error(vformat(R"(Cannot assign a value of type "%s" to a target of type "%s".)", p_assignment->assigned_value->get_datatype().to_string(), p_assignment->assignee->get_datatype().to_string()), p_assignment->assigned_value);
|
case GDScriptParser::AssignmentNode::OP_NONE:
|
||||||
} else {
|
vop = Variant::Operator::OP_EQUAL;
|
||||||
// TODO: Warning in this case.
|
break;
|
||||||
|
case GDScriptParser::AssignmentNode::OP_ADDITION:
|
||||||
|
vop = Variant::Operator::OP_ADD;
|
||||||
|
break;
|
||||||
|
case GDScriptParser::AssignmentNode::OP_SUBTRACTION:
|
||||||
|
vop = Variant::Operator::OP_SUBTRACT;
|
||||||
|
break;
|
||||||
|
case GDScriptParser::AssignmentNode::OP_MULTIPLICATION:
|
||||||
|
vop = Variant::Operator::OP_MULTIPLY;
|
||||||
|
break;
|
||||||
|
case GDScriptParser::AssignmentNode::OP_DIVISION:
|
||||||
|
vop = Variant::Operator::OP_DIVIDE;
|
||||||
|
break;
|
||||||
|
case GDScriptParser::AssignmentNode::OP_MODULO:
|
||||||
|
vop = Variant::Operator::OP_MODULE;
|
||||||
|
break;
|
||||||
|
case GDScriptParser::AssignmentNode::OP_BIT_SHIFT_LEFT:
|
||||||
|
vop = Variant::Operator::OP_SHIFT_LEFT;
|
||||||
|
break;
|
||||||
|
case GDScriptParser::AssignmentNode::OP_BIT_SHIFT_RIGHT:
|
||||||
|
vop = Variant::Operator::OP_SHIFT_RIGHT;
|
||||||
|
break;
|
||||||
|
case GDScriptParser::AssignmentNode::OP_BIT_AND:
|
||||||
|
vop = Variant::Operator::OP_BIT_AND;
|
||||||
|
break;
|
||||||
|
case GDScriptParser::AssignmentNode::OP_BIT_OR:
|
||||||
|
vop = Variant::Operator::OP_BIT_OR;
|
||||||
|
break;
|
||||||
|
case GDScriptParser::AssignmentNode::OP_BIT_XOR:
|
||||||
|
vop = Variant::Operator::OP_BIT_XOR;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool compatible = true;
|
||||||
|
GDScriptParser::DataType op_type = p_assignment->assigned_value->get_datatype();
|
||||||
|
if (vop != Variant::OP_EQUAL) {
|
||||||
|
op_type = get_operation_type(vop, p_assignment->assignee->get_datatype(), p_assignment->assigned_value->get_datatype(), compatible);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (compatible) {
|
||||||
|
compatible = is_type_compatible(p_assignment->assignee->get_datatype(), op_type, true);
|
||||||
|
if (!compatible) {
|
||||||
|
if (p_assignment->assignee->get_datatype().is_hard_type()) {
|
||||||
|
push_error(vformat(R"(Cannot assign a value of type "%s" to a target of type "%s".)", p_assignment->assigned_value->get_datatype().to_string(), p_assignment->assignee->get_datatype().to_string()), p_assignment->assigned_value);
|
||||||
|
} else {
|
||||||
|
// TODO: Warning in this case.
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
} 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()) {
|
if (p_assignment->assignee->get_datatype().has_no_type() || p_assignment->assigned_value->get_datatype().is_variant()) {
|
||||||
|
|
Loading…
Reference in a new issue