From c2eb909c9b513fba977241d6911520f6a0adde06 Mon Sep 17 00:00:00 2001
From: yuyi <yuyi98@163.com>
Date: Fri, 19 Nov 2021 19:52:28 +0800
Subject: [PATCH] cgen: fix multiple matches in one expr (#12516)

---
 vlib/v/gen/c/cgen.v                           |  1 +
 .../tests/multiple_matchs_in_one_expr_test.v  | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 vlib/v/tests/multiple_matchs_in_one_expr_test.v

diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v
index 7072438c8d..662126fd3c 100644
--- a/vlib/v/gen/c/cgen.v
+++ b/vlib/v/gen/c/cgen.v
@@ -4444,6 +4444,7 @@ fn (mut g Gen) match_expr(node ast.MatchExpr) {
 	} else {
 		g.match_expr_classic(node, is_expr, cond_var, tmp_var)
 	}
+	g.set_current_pos_as_last_stmt_pos()
 	g.write(cur_line)
 	if need_tmp_var {
 		g.write('$tmp_var')
diff --git a/vlib/v/tests/multiple_matchs_in_one_expr_test.v b/vlib/v/tests/multiple_matchs_in_one_expr_test.v
new file mode 100644
index 0000000000..8bd43fae0e
--- /dev/null
+++ b/vlib/v/tests/multiple_matchs_in_one_expr_test.v
@@ -0,0 +1,26 @@
+fn hex_to_bytes(s string) ?[]byte {
+	mut ret := []byte{cap: s.len}
+	for read := 0; read < s.len; read += 2 {
+		high := s[read]
+		low := s[read + 1]
+
+		ret << match high {
+			48...57 { (high - 48) << 4 }
+			65...70 { (high - 65) << 4 }
+			97...102 { (high - 97) << 4 }
+			else { panic('impossible') }
+		} + match low {
+			48...57 { low - 48 }
+			65...70 { low - 65 }
+			97...102 { low - 97 }
+			else { panic('impossible') }
+		}
+	}
+	return ret
+}
+
+fn test_multiple_matchs_in_one_expr() {
+	ret := hex_to_bytes('FFFF') or { 'error'.bytes() }
+	println(ret)
+	assert '$ret' == '[U, U]'
+}