From 39b68518b27536db4cf6fc0b75a07bcef3c558a0 Mon Sep 17 00:00:00 2001
From: yuyi <yuyi98@163.com>
Date: Tue, 12 Jul 2022 01:16:42 +0800
Subject: [PATCH] checker: minor refactor in infix_expr() (#15028)

---
 vlib/v/checker/infix.v | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/vlib/v/checker/infix.v b/vlib/v/checker/infix.v
index 08dbc74a53..1b9adfd095 100644
--- a/vlib/v/checker/infix.v
+++ b/vlib/v/checker/infix.v
@@ -30,9 +30,9 @@ pub fn (mut c Checker) infix_expr(mut node ast.InfixExpr) ast.Type {
 		node.left_type = right_type
 	}
 	mut right_sym := c.table.sym(right_type)
-	right_final := c.table.final_sym(right_type)
+	right_final_sym := c.table.final_sym(right_type)
 	mut left_sym := c.table.sym(left_type)
-	left_final := c.table.final_sym(left_type)
+	left_final_sym := c.table.final_sym(left_type)
 	left_pos := node.left.pos()
 	right_pos := node.right.pos()
 	left_right_pos := left_pos.extend(right_pos)
@@ -116,10 +116,10 @@ pub fn (mut c Checker) infix_expr(mut node ast.InfixExpr) ast.Type {
 			}
 		}
 		.key_in, .not_in {
-			match right_final.kind {
+			match right_final_sym.kind {
 				.array {
 					if left_sym.kind !in [.sum_type, .interface_] {
-						elem_type := right_final.array_info().elem_type
+						elem_type := right_final_sym.array_info().elem_type
 						c.check_expected(left_type, elem_type) or {
 							c.error('left operand to `$node.op` does not match the array element type: $err.msg()',
 								left_right_pos)
@@ -127,7 +127,7 @@ pub fn (mut c Checker) infix_expr(mut node ast.InfixExpr) ast.Type {
 					}
 				}
 				.map {
-					map_info := right_final.map_info()
+					map_info := right_final_sym.map_info()
 					c.check_expected(left_type, map_info.key_type) or {
 						c.error('left operand to `$node.op` does not match the map key type: $err.msg()',
 							left_right_pos)
@@ -136,7 +136,7 @@ pub fn (mut c Checker) infix_expr(mut node ast.InfixExpr) ast.Type {
 				}
 				.array_fixed {
 					if left_sym.kind !in [.sum_type, .interface_] {
-						elem_type := right_final.array_fixed_info().elem_type
+						elem_type := right_final_sym.array_fixed_info().elem_type
 						c.check_expected(left_type, elem_type) or {
 							c.error('left operand to `$node.op` does not match the fixed array element type: $err.msg()',
 								left_right_pos)
@@ -381,7 +381,7 @@ pub fn (mut c Checker) infix_expr(mut node ast.InfixExpr) ast.Type {
 			}
 		}
 		.left_shift {
-			if left_final.kind == .array {
+			if left_final_sym.kind == .array {
 				if !node.is_stmt {
 					c.error('array append cannot be used in an expression', node.pos)
 				}
@@ -391,7 +391,7 @@ pub fn (mut c Checker) infix_expr(mut node ast.InfixExpr) ast.Type {
 				left_value_type := c.table.value_type(c.unwrap_generic(left_type))
 				left_value_sym := c.table.sym(c.unwrap_generic(left_value_type))
 				if left_value_sym.kind == .interface_ {
-					if right_final.kind != .array {
+					if right_final_sym.kind != .array {
 						// []Animal << Cat
 						if c.type_implements(right_type, left_value_type, right_pos) {
 							if !right_type.is_ptr() && !right_type.is_pointer() && !c.inside_unsafe
@@ -406,7 +406,7 @@ pub fn (mut c Checker) infix_expr(mut node ast.InfixExpr) ast.Type {
 					}
 					return ast.void_type
 				} else if left_value_sym.kind == .sum_type {
-					if right_final.kind != .array {
+					if right_final_sym.kind != .array {
 						if !c.table.is_sumtype_or_in_variant(left_value_type, ast.mktyp(right_type)) {
 							c.error('cannot append `$right_sym.name` to `$left_sym.name`',
 								right_pos)