diff options
| author | George Marques <george@gmarqu.es> | 2021-06-17 20:00:28 -0300 |
|---|---|---|
| committer | George Marques <george@gmarqu.es> | 2021-06-18 13:09:35 -0300 |
| commit | b5f1e88b2ed7be4c0ecc9edf3f5d9f6287b7c513 (patch) | |
| tree | b1ea3c316b337a8f48e52f9da4fcc82631e332c0 | |
| parent | 2c81e5fa0ec17e8d17cc3c7df68417f9a49c73bc (diff) | |
GDScript: Fix setting type of operator return value
Also write type adjust when needed for binary operators.
| -rw-r--r-- | modules/gdscript/gdscript_analyzer.cpp | 1 | ||||
| -rw-r--r-- | modules/gdscript/gdscript_byte_codegen.cpp | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp index c3edc813d2..34310cf58d 100644 --- a/modules/gdscript/gdscript_analyzer.cpp +++ b/modules/gdscript/gdscript_analyzer.cpp @@ -3446,6 +3446,7 @@ GDScriptParser::DataType GDScriptAnalyzer::get_operation_type(Variant::Operator } r_valid = true; + result.type_source = GDScriptParser::DataType::ANNOTATED_INFERRED; result.kind = GDScriptParser::DataType::BUILTIN; result.builtin_type = Variant::get_operator_return_type(p_operation, a_type, b_type); diff --git a/modules/gdscript/gdscript_byte_codegen.cpp b/modules/gdscript/gdscript_byte_codegen.cpp index 6998cc5bb7..5a297cc50a 100644 --- a/modules/gdscript/gdscript_byte_codegen.cpp +++ b/modules/gdscript/gdscript_byte_codegen.cpp @@ -554,6 +554,14 @@ void GDScriptByteCodeGenerator::write_unary_operator(const Address &p_target, Va void GDScriptByteCodeGenerator::write_binary_operator(const Address &p_target, Variant::Operator p_operator, const Address &p_left_operand, const Address &p_right_operand) { if (HAS_BUILTIN_TYPE(p_left_operand) && HAS_BUILTIN_TYPE(p_right_operand)) { + if (p_target.mode == Address::TEMPORARY) { + Variant::Type result_type = Variant::get_operator_return_type(p_operator, p_left_operand.type.builtin_type, p_right_operand.type.builtin_type); + Variant::Type temp_type = temporaries[p_target.address].type; + if (result_type != temp_type) { + write_type_adjust(p_target, result_type); + } + } + // Gather specific operator. Variant::ValidatedOperatorEvaluator op_func = Variant::get_validated_operator_evaluator(p_operator, p_left_operand.type.builtin_type, p_right_operand.type.builtin_type); |