Skip to content

Commit

Permalink
Merge pull request #46936 from DavidSichma/match_temp_header
Browse files Browse the repository at this point in the history
Fixed match test expression for temporaries
  • Loading branch information
akien-mga authored Mar 14, 2021
2 parents 2e2d533 + 762bb58 commit 6edb0a7
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions modules/gdscript/gdscript_compiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1511,17 +1511,17 @@ Error GDScriptCompiler::_parse_block(CodeGen &codegen, const GDScriptParser::Sui
codegen.start_block();

// Evaluate the match expression.
GDScriptCodeGenerator::Address value_local = codegen.add_local("@match_value", _gdtype_from_datatype(match->test->get_datatype()));
GDScriptCodeGenerator::Address value = _parse_expression(codegen, error, match->test);
GDScriptCodeGenerator::Address value = codegen.add_local("@match_value", _gdtype_from_datatype(match->test->get_datatype()));
GDScriptCodeGenerator::Address value_expr = _parse_expression(codegen, error, match->test);
if (error) {
return error;
}

// Assign to local.
// TODO: This can be improved by passing the target to parse_expression().
gen->write_assign(value_local, value);
gen->write_assign(value, value_expr);

if (value.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
if (value_expr.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
codegen.generator->pop_temporary();
}

Expand Down

0 comments on commit 6edb0a7

Please sign in to comment.