ast, parser: fixed residual old syntax '<', '>' in generic type names

vlang · Dec 1, 2023 · 4cb5a8e · 4cb5a8e
1 parent e30af86
commit 4cb5a8e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/vlib/v/ast/table.v b/vlib/v/ast/table.v
@@ -1955,7 +1955,7 @@ pub fn (mut t Table) unwrap_generic_type(typ Type, generic_names []string, concr
 							if mut parent_info is Struct {
 								for mut embed in parent_info.embeds {
 									if embed == orig_type {
-										embed = fields[i].typ.set_flag(.generic)
+										embed = fields[i].typ
 										break
 									}
 								}
@@ -2138,7 +2138,7 @@ pub fn (mut t Table) generic_insts_to_concrete() {
 								if fields[i].name.len > 1 && fields[i].name[0].is_capital() {
 									for mut embed in parent_info.embeds {
 										if embed == orig_type {
-											embed = fields[i].typ.set_flag(.generic)
+											embed = fields[i].typ
 											break
 										}
 									}

diff --git a/vlib/v/parser/parse_type.v b/vlib/v/parser/parse_type.v
@@ -718,14 +718,14 @@ fn (mut p Parser) find_type_or_add_placeholder(name string, language ast.Languag
 					&& p.struct_init_generic_types != sym.info.generic_types {
 					generic_names := p.types_to_names(p.struct_init_generic_types, p.tok.pos(),
 						'struct_init_generic_types') or { return ast.Type(0) }
-					mut sym_name := sym.name + '<'
+					mut sym_name := sym.name + '['
 					for i, gt in generic_names {
 						sym_name += gt
 						if i != generic_names.len - 1 {
 							sym_name += ','
 						}
 					}
-					sym_name += '>'
+					sym_name += ']'
 					existing_idx := p.table.type_idxs[sym_name]
 					if existing_idx > 0 {
 						idx = existing_idx