From fe371845da5db715932385e4a26f95ae1844376c Mon Sep 17 00:00:00 2001
From: yuyi <yuyi98@163.com>
Date: Mon, 18 Apr 2022 17:38:08 +0800
Subject: [PATCH] ast, checker, cgen: fix aggregations type check (#14066)

---
 vlib/v/ast/types.v                        |  3 ++-
 vlib/v/checker/checker.v                  |  4 ++++
 vlib/v/checker/if.v                       |  5 ++++-
 vlib/v/checker/match.v                    |  1 +
 vlib/v/gen/c/infix_expr.v                 | 13 +++++++++++--
 vlib/v/tests/aggregate_is_nodetype_test.v | 19 +++++++++++++++++++
 6 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 vlib/v/tests/aggregate_is_nodetype_test.v

diff --git a/vlib/v/ast/types.v b/vlib/v/ast/types.v
index 63be8af531..d5557a4004 100644
--- a/vlib/v/ast/types.v
+++ b/vlib/v/ast/types.v
@@ -937,7 +937,8 @@ pub struct Aggregate {
 mut:
 	fields []StructField // used for faster lookup inside the module
 pub:
-	types []Type
+	sum_type Type
+	types    []Type
 }
 
 pub struct Array {
diff --git a/vlib/v/checker/checker.v b/vlib/v/checker/checker.v
index 3535646ea8..26bf6d2ce8 100644
--- a/vlib/v/checker/checker.v
+++ b/vlib/v/checker/checker.v
@@ -1013,6 +1013,10 @@ pub fn (mut c Checker) infix_expr(mut node ast.InfixExpr) ast.Type {
 				if typ_sym.kind == .placeholder {
 					c.error('$op: type `$typ_sym.name` does not exist', right_expr.pos())
 				}
+				if left_sym.kind == .aggregate {
+					parent_left_type := (left_sym.info as ast.Aggregate).sum_type
+					left_sym = c.table.sym(parent_left_type)
+				}
 				if left_sym.kind !in [.interface_, .sum_type] {
 					c.error('`$op` can only be used with interfaces and sum types', node.pos)
 				} else if mut left_sym.info is ast.SumType {
diff --git a/vlib/v/checker/if.v b/vlib/v/checker/if.v
index abf5616e5d..5bbb3f2555 100644
--- a/vlib/v/checker/if.v
+++ b/vlib/v/checker/if.v
@@ -296,7 +296,10 @@ fn (mut c Checker) smartcast_if_conds(node ast.Expr, mut scope ast.Scope) {
 			if right_type != ast.Type(0) {
 				left_sym := c.table.sym(node.left_type)
 				right_sym := c.table.sym(right_type)
-				expr_type := c.unwrap_generic(c.expr(node.left))
+				mut expr_type := c.unwrap_generic(c.expr(node.left))
+				if left_sym.kind == .aggregate {
+					expr_type = (left_sym.info as ast.Aggregate).sum_type
+				}
 				if left_sym.kind == .interface_ {
 					if right_sym.kind != .interface_ {
 						c.type_implements(right_type, expr_type, node.pos)
diff --git a/vlib/v/checker/match.v b/vlib/v/checker/match.v
index 5b56ef86d4..019be624ec 100644
--- a/vlib/v/checker/match.v
+++ b/vlib/v/checker/match.v
@@ -282,6 +282,7 @@ fn (mut c Checker) match_exprs(mut node ast.MatchExpr, cond_type_sym ast.TypeSym
 							kind: .aggregate
 							mod: c.mod
 							info: ast.Aggregate{
+								sum_type: node.cond_type
 								types: expr_types.map(it.typ)
 							}
 						})
diff --git a/vlib/v/gen/c/infix_expr.v b/vlib/v/gen/c/infix_expr.v
index 88bb1f8bdc..3857905f65 100644
--- a/vlib/v/gen/c/infix_expr.v
+++ b/vlib/v/gen/c/infix_expr.v
@@ -495,7 +495,12 @@ fn (mut g Gen) infix_expr_in_optimization(left ast.Expr, right ast.ArrayInit) {
 
 // infix_expr_is_op generates code for `is` and `!is`
 fn (mut g Gen) infix_expr_is_op(node ast.InfixExpr) {
-	sym := g.table.sym(node.left_type)
+	mut sym := g.table.sym(node.left_type)
+	is_aggregate := sym.kind == .aggregate
+	if is_aggregate {
+		parent_left_type := (sym.info as ast.Aggregate).sum_type
+		sym = g.table.sym(parent_left_type)
+	}
 	right_sym := g.table.sym(node.right_type)
 	if sym.kind == .interface_ && right_sym.kind == .interface_ {
 		g.gen_interface_is_op(node)
@@ -504,7 +509,11 @@ fn (mut g Gen) infix_expr_is_op(node ast.InfixExpr) {
 
 	cmp_op := if node.op == .key_is { '==' } else { '!=' }
 	g.write('(')
-	g.expr(node.left)
+	if is_aggregate {
+		g.write('$node.left')
+	} else {
+		g.expr(node.left)
+	}
 	g.write(')')
 	if node.left_type.is_ptr() {
 		g.write('->')
diff --git a/vlib/v/tests/aggregate_is_nodetype_test.v b/vlib/v/tests/aggregate_is_nodetype_test.v
new file mode 100644
index 0000000000..62dcd751ca
--- /dev/null
+++ b/vlib/v/tests/aggregate_is_nodetype_test.v
@@ -0,0 +1,19 @@
+type Abc = bool | int | string
+
+fn test_aggregate_is_nodetype() {
+	x := Abc('test')
+
+	match x {
+		string, int {
+			if x is string {
+				println('it is a string')
+				assert true
+			} else {
+				assert false
+			}
+		}
+		else {
+			assert false
+		}
+	}
+}