From 2d2e4610e796b97bdef48d34114ef88c17e4f4e2 Mon Sep 17 00:00:00 2001
From: yuyi <yuyi98@163.com>
Date: Mon, 15 Mar 2021 18:22:52 +0800
Subject: [PATCH] cgen: make use of mut_rec in method consistent (#9308)

---
 vlib/v/gen/c/cgen.v                           |  5 ++-
 .../mut_receiver_returned_as_reference_test.v | 36 +++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 vlib/v/tests/mut_receiver_returned_as_reference_test.v

diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v
index ac33e1beb2..f0cc8c67c3 100644
--- a/vlib/v/gen/c/cgen.v
+++ b/vlib/v/gen/c/cgen.v
@@ -4498,9 +4498,8 @@ fn (mut g Gen) return_statement(node ast.Return) {
 		}
 		if expr0.is_auto_deref_var() {
 			if g.fn_decl.return_type.is_ptr() {
-				g.write('&(*')
-				g.expr(expr0)
-				g.write(')')
+				var_str := g.expr_string(expr0)
+				g.write(var_str.trim('&'))
 			} else {
 				g.write('*')
 				g.expr(expr0)
diff --git a/vlib/v/tests/mut_receiver_returned_as_reference_test.v b/vlib/v/tests/mut_receiver_returned_as_reference_test.v
new file mode 100644
index 0000000000..ea1a681542
--- /dev/null
+++ b/vlib/v/tests/mut_receiver_returned_as_reference_test.v
@@ -0,0 +1,36 @@
+struct Player {
+mut:
+	name string
+	x    int
+	y    int
+}
+
+fn (mut p Player) set_name(name string) &Player {
+	p.name = name
+	return p // because of automatic (de)reference of return values
+}
+
+// NB: `p` is declared as a `mut` parameter, 
+// which now only affects its mutability.
+fn (mut p Player) set_position(x int, y int) &Player {
+	p.x = x
+	p.y = y
+	// TODO: from the point of view of the V programmer,
+	// `p` has still type &Player.
+	// assert typeof(p).name == 'Player'
+	return &p
+}
+
+fn test_mut_receiver() {
+	mut p := &Player{}
+	f := p.set_name('frodo')
+	assert u64(p) == u64(f)
+	z := p.set_position(111, 222)
+	assert u64(p) == u64(z)
+	//
+	assert p.name == 'frodo'
+	assert p.x == 111
+	assert p.y == 222
+	assert u64(p.set_name('bilbo')) == u64(p)
+	assert p.name == 'bilbo'
+}