From f60cf652847c8e5297473a7bd4f2b0be2112587d Mon Sep 17 00:00:00 2001
From: yuyi <yuyi98@163.com>
Date: Tue, 7 Dec 2021 17:12:12 +0800
Subject: [PATCH] cgen: fix comptime for_in methods call using str_intp
 (#12746)

---
 vlib/v/gen/c/str_intp.v                      |  4 ++--
 vlib/v/tests/comptime_for_method_call_test.v | 11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/vlib/v/gen/c/str_intp.v b/vlib/v/gen/c/str_intp.v
index 00343bd2fb..061728b899 100644
--- a/vlib/v/gen/c/str_intp.v
+++ b/vlib/v/gen/c/str_intp.v
@@ -126,7 +126,7 @@ fn (mut g Gen) str_val(node ast.StringInterLiteral, i int) {
 
 	typ := g.unwrap_generic(node.expr_types[i])
 	typ_sym := g.table.get_type_symbol(typ)
-	if typ == ast.string_type {
+	if typ == ast.string_type && g.comptime_for_method.len == 0 {
 		if g.inside_vweb_tmpl {
 			g.write('vweb__filter(')
 			if expr.is_auto_deref_var() {
@@ -153,7 +153,7 @@ fn (mut g Gen) str_val(node ast.StringInterLiteral, i int) {
 		mut exp_typ := typ
 		if expr is ast.Ident {
 			if expr.obj is ast.Var {
-				if g.comptime_var_type_map.len > 0 {
+				if g.comptime_var_type_map.len > 0 || g.comptime_for_method.len > 0 {
 					exp_typ = expr.obj.typ
 				} else if expr.obj.smartcasts.len > 0 {
 					cast_sym := g.table.get_type_symbol(expr.obj.smartcasts.last())
diff --git a/vlib/v/tests/comptime_for_method_call_test.v b/vlib/v/tests/comptime_for_method_call_test.v
index b15f3d7bf4..d14cc7cee9 100644
--- a/vlib/v/tests/comptime_for_method_call_test.v
+++ b/vlib/v/tests/comptime_for_method_call_test.v
@@ -14,10 +14,17 @@ fn test_comptime_for_method_call() {
 
 	$for method in Foo.methods {
 		x := f.$method()
+
 		println(x)
+		println(x.str())
+		println('$x')
+
 		rets << x.str()
+		rets << '$x'
 	}
-	assert rets.len == 2
+	assert rets.len == 4
 	assert rets[0] == '1'
-	assert rets[1] == '2'
+	assert rets[1] == '1'
+	assert rets[2] == '2'
+	assert rets[3] == '2'
 }