From abde1cd73d06b3a2a2c3ec32c6d08b5737b874b5 Mon Sep 17 00:00:00 2001
From: yuyi <yuyi98@163.com>
Date: Thu, 4 Feb 2021 23:52:14 +0800
Subject: [PATCH] cgen: fix array/map of alias to string (#8549)

---
 vlib/v/gen/c/auto_str_methods.v               | 27 ++++++++++++++-----
 .../v/tests/string_interpolation_alias_test.v | 17 ++++++++++++
 2 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 vlib/v/tests/string_interpolation_alias_test.v

diff --git a/vlib/v/gen/c/auto_str_methods.v b/vlib/v/gen/c/auto_str_methods.v
index db6db299dc..4bcf35136a 100644
--- a/vlib/v/gen/c/auto_str_methods.v
+++ b/vlib/v/gen/c/auto_str_methods.v
@@ -224,6 +224,8 @@ fn (mut g Gen) gen_str_for_array(info table.Array, styp string, str_fn_name stri
 			g.auto_str_funcs.writeln('\t\tstring x = _STR("%g", 1, it);')
 		} else if sym.kind == .rune {
 			g.auto_str_funcs.writeln('\t\tstring x = _STR("`%.*s\\000`", 2, ${elem_str_fn_name}(it));')
+		} else if sym.kind == .string {
+			g.auto_str_funcs.writeln('\t\tstring x = _STR("\'%.*s\\000\'", 2, it);')
 		} else {
 			// There is a custom .str() method, so use it.
 			// NB: we need to take account of whether the user has defined
@@ -315,18 +317,30 @@ fn (mut g Gen) gen_str_for_array_fixed(info table.ArrayFixed, styp string, str_f
 }
 
 fn (mut g Gen) gen_str_for_map(info table.Map, styp string, str_fn_name string) {
-	key_sym := g.table.get_type_symbol(info.key_type)
-	key_styp := g.typ(info.key_type)
+	mut key_typ := info.key_type
+	mut key_sym := g.table.get_type_symbol(key_typ)
+	if mut key_sym.info is table.Alias {
+		key_typ = key_sym.info.parent_type
+		key_sym = g.table.get_type_symbol(key_typ)
+	}
+	key_styp := g.typ(key_typ)
 	key_str_fn_name := key_styp.replace('*', '') + '_str'
 	if !key_sym.has_method('str') {
-		g.gen_str_for_type(info.key_type)
+		g.gen_str_for_type(key_typ)
 	}
-	val_sym := g.table.get_type_symbol(info.value_type)
-	val_styp := g.typ(info.value_type)
+
+	mut val_typ := info.value_type
+	mut val_sym := g.table.get_type_symbol(val_typ)
+	if mut val_sym.info is table.Alias {
+		val_typ = val_sym.info.parent_type
+		val_sym = g.table.get_type_symbol(val_typ)
+	}
+	val_styp := g.typ(val_typ)
 	elem_str_fn_name := val_styp.replace('*', '') + '_str'
 	if !val_sym.has_method('str') {
-		g.gen_str_for_type(info.value_type)
+		g.gen_str_for_type(val_typ)
 	}
+
 	g.type_definitions.writeln('static string ${str_fn_name}($styp m); // auto')
 	g.auto_str_funcs.writeln('static string ${str_fn_name}($styp m) { return indent_${str_fn_name}(m, 0);}')
 	g.type_definitions.writeln('static string indent_${str_fn_name}($styp m, int indent_count); // auto')
@@ -335,6 +349,7 @@ fn (mut g Gen) gen_str_for_map(info table.Map, styp string, str_fn_name string)
 	g.auto_str_funcs.writeln('\tstrings__Builder_write(&sb, _SLIT("{"));')
 	g.auto_str_funcs.writeln('\tfor (int i = 0; i < m.key_values.len; ++i) {')
 	g.auto_str_funcs.writeln('\t\tif (!DenseArray_has_index(&m.key_values, i)) { continue; }')
+
 	if key_sym.kind == .string {
 		g.auto_str_funcs.writeln('\t\tstring key = *(string*)DenseArray_key(&m.key_values, i);')
 	} else {
diff --git a/vlib/v/tests/string_interpolation_alias_test.v b/vlib/v/tests/string_interpolation_alias_test.v
new file mode 100644
index 0000000000..6d620eb180
--- /dev/null
+++ b/vlib/v/tests/string_interpolation_alias_test.v
@@ -0,0 +1,17 @@
+type Literal = string
+
+fn test_array_alias_string() {
+	a := [Literal('aaa'), Literal('bbb')]
+	assert '$a' == "['aaa', 'bbb']"
+}
+
+fn test_fixed_array_alias_string() {
+	a := [Literal('aaa'), Literal('bbb')]!
+	assert '$a' == "['aaa', 'bbb']"
+}
+
+fn test_map_alias_string() {
+	m := {'one': Literal('1'), 'two': Literal('2')}
+	assert '$m'.contains("'one': '1'")
+	assert '$m'.contains("'two': '2'")
+}