From b38f19df29776d3f2ba68bf5e08bccc35b569fcc Mon Sep 17 00:00:00 2001 From: Daniel Gavin Date: Tue, 1 Nov 2022 17:31:59 +0100 Subject: Fix issue with binary expression having call expressions --- src/server/analysis.odin | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'src/server/analysis.odin') diff --git a/src/server/analysis.odin b/src/server/analysis.odin index b1f00bd..2eef852 100644 --- a/src/server/analysis.odin +++ b/src/server/analysis.odin @@ -2198,6 +2198,31 @@ resolve_binary_expression :: proc( return {}, false } + if symbol, ok := symbol_a.value.(SymbolProcedureValue); + ok && len(symbol.return_types) > 0 { + symbol_a, ok_a = resolve_type_expression( + ast_context, + symbol.return_types[0].type != nil \ + ? symbol.return_types[0].type \ + : symbol.return_types[0].default_value, + ) + } + + if symbol, ok := symbol_b.value.(SymbolProcedureValue); + ok && len(symbol.return_types) > 0 { + symbol_b, ok_b = resolve_type_expression( + ast_context, + symbol.return_types[0].type != nil \ + ? symbol.return_types[0].type \ + : symbol.return_types[0].default_value, + ) + } + + if !ok_a || !ok_b { + return {}, false + } + + matrix_value_a, is_matrix_a := symbol_a.value.(SymbolMatrixValue) matrix_value_b, is_matrix_b := symbol_b.value.(SymbolMatrixValue) -- cgit v1.2.3