From 302baaa7b48dc1903251e91ea5c8a95fb07cea9a Mon Sep 17 00:00:00 2001
From: yuyi <yuyi98@163.com>
Date: Tue, 23 Feb 2021 15:53:07 +0800
Subject: [PATCH] cgen: fix error of match in fn_call (#8900)

---
 vlib/v/gen/c/cgen.v                  |  5 ++--
 vlib/v/tests/match_in_fn_call_test.v | 42 ++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 vlib/v/tests/match_in_fn_call_test.v

diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v
index 861c8ae1cc..fae3708f54 100644
--- a/vlib/v/gen/c/cgen.v
+++ b/vlib/v/gen/c/cgen.v
@@ -3589,14 +3589,15 @@ fn (mut g Gen) match_expr(node ast.MatchExpr) {
 		cond_var = g.new_tmp_var()
 		g.write('${g.typ(node.cond_type)} $cond_var = ')
 		g.expr(node.cond)
-		g.writeln('; ')
+		g.writeln(';')
+		g.stmt_path_pos << g.out.len
 		g.write(line)
 	}
 	if need_tmp_var {
 		g.empty_line = true
 		cur_line = g.go_before_stmt(0)
 		tmp_var = g.new_tmp_var()
-		g.writeln('\t${g.typ(node.return_type)} $tmp_var;')
+		g.writeln('${g.typ(node.return_type)} $tmp_var;')
 	}
 
 	if is_expr && !need_tmp_var {
diff --git a/vlib/v/tests/match_in_fn_call_test.v b/vlib/v/tests/match_in_fn_call_test.v
new file mode 100644
index 0000000000..5b478381c3
--- /dev/null
+++ b/vlib/v/tests/match_in_fn_call_test.v
@@ -0,0 +1,42 @@
+struct Data {
+	array []int
+}
+
+fn (d Data) len() int {
+	return d.array.len
+}
+
+fn make_result() []Data {
+	return []
+}
+
+fn f_doesnotcompile(d Data) []Data {
+	return match d.len() {
+		1 { make_result() }
+		else { make_result() }
+	}
+}
+
+fn f_compiles1(d Data) []Data {
+	return match d.array.len {
+		1 { make_result() }
+		else { make_result() }
+	}
+}
+
+fn f_compiles2(d Data) []Data {
+	length := d.array.len
+	return match length {
+		1 { make_result() }
+		else { make_result() }
+	}
+}
+
+fn test_match_in_fn_call() {
+	println(f_doesnotcompile({}))
+	assert f_doesnotcompile({}) == []Data{}
+	println(f_compiles1({}))
+	assert f_compiles1({}) == []Data{}
+	println(f_compiles2({}))
+	assert f_compiles2({}) == []Data{}
+}