From 07e9ed1a1dc2807147702dbd08fdc8e1e2d3d5e0 Mon Sep 17 00:00:00 2001
From: yuyi <yuyi98@163.com>
Date: Mon, 21 Feb 2022 23:49:38 +0800
Subject: [PATCH] cgen: fix interface embedding method call (#13553)

---
 vlib/v/gen/c/fn.v                             |  4 +-
 .../interface_embedding_method_call_test.v    | 59 +++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 vlib/v/tests/interface_embedding_method_call_test.v

diff --git a/vlib/v/gen/c/fn.v b/vlib/v/gen/c/fn.v
index b57110d681..868ad196e4 100644
--- a/vlib/v/gen/c/fn.v
+++ b/vlib/v/gen/c/fn.v
@@ -755,7 +755,9 @@ fn (mut g Gen) method_call(node ast.CallExpr) {
 		}
 
 		left_is_shared := node.left_type.has_flag(.shared_f)
-		g.write('${c_name(receiver_type_name)}_name_table[')
+		left_cc_type := g.cc_type(node.left_type, false)
+		left_type_name := util.no_dots(left_cc_type)
+		g.write('${c_name(left_type_name)}_name_table[')
 		g.expr(node.left)
 		dot := if left_is_shared {
 			'->val.'
diff --git a/vlib/v/tests/interface_embedding_method_call_test.v b/vlib/v/tests/interface_embedding_method_call_test.v
new file mode 100644
index 0000000000..6b315d2f5d
--- /dev/null
+++ b/vlib/v/tests/interface_embedding_method_call_test.v
@@ -0,0 +1,59 @@
+fn test_interface_embedding_method_call() {
+	mut window := &Window{}
+	btn := &Button{}
+	window.initables << btn
+	window.run()
+}
+
+[heap]
+pub struct Window {
+mut:
+	initables []Initable
+	popview   PopView = DummyPopup{}
+}
+
+interface Initable {
+mut:
+	init(&Window)
+}
+
+interface Drawable {
+	draw()
+}
+
+pub fn (mut window Window) run() {
+	for mut i in window.initables {
+		i.init(window)
+	}
+	for wd in window.initables {
+		if wd is Drawable {
+			d := wd as Drawable
+			d.draw()
+		}
+	}
+	window.popview.draw()
+}
+
+struct DummyPopup {}
+
+fn (d DummyPopup) draw() {}
+
+interface PopView {
+	Drawable
+}
+
+[heap]
+pub struct Button {
+mut:
+	window &Window = voidptr(0)
+}
+
+pub fn (mut b Button) init(window &Window) {
+	b.window = window
+}
+
+pub fn (b Button) draw() {
+	g := b.window.initables
+	println(g.len)
+	assert g.len == 1
+}