Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-24 02:13:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #75885 from AThousandShips/compound_fix

Browse source 
[GDScript] Fix incorrect compound assignment
This commit is contained in:
Rémi Verschelde 2023-04-25 16:17:02 +02:00
commit 45cd5dcad3
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 38 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/gdscript/gdscript_compiler.cpp
View file

@ -1165,18 +1165,8 @@ GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &code
bool has_operation = assignment->operation != GDScriptParser::AssignmentNode::OP_NONE;
if (has_operation) {
// Perform operation.
GDScriptCodeGenerator::Address og_value = _parse_expression(codegen, r_error, assignment->assignee);
if (!has_setter && !assignment->use_conversion_assign) {
// If there's nothing special about the assignment, perform the assignment as part of the operator
gen->write_binary_operator(target, assignment->variant_op, og_value, assigned_value);
if (assigned_value.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
gen->pop_temporary(); // Pop assigned value if not done before.
}
return GDScriptCodeGenerator::Address();
}
GDScriptCodeGenerator::Address op_result = codegen.add_temporary(_gdtype_from_datatype(assignment->get_datatype(), codegen.script));
GDScriptCodeGenerator::Address og_value = _parse_expression(codegen, r_error, assignment->assignee);
gen->write_binary_operator(op_result, assignment->variant_op, og_value, assigned_value);
to_assign = op_result;