checker,parser,ast: make type MyBuilder = strings.Builder work (part 1); add mod fields to ast.SumTypeDecl and ast.AliasTypeDecl (#25943)

spytheman · web-flow · commit 218e24f19298 · 2025-12-12T14:21:02.000+02:00
diff --git a/cmd/tools/vast/vast.v b/cmd/tools/vast/vast.v
@@ -873,6 +873,7 @@ fn (t Tree) alias_type_decl(node ast.AliasTypeDecl) &Node {
 	mut obj := create_object()
 	obj.add_terse('ast_type', t.string_node('AliasTypeDecl'))
 	obj.add_terse('name', t.string_node(node.name))
+	obj.add_terse('mod', t.string_node(node.mod))
 	obj.add_terse('typ', t.type_node(node.typ))
 	obj.add_terse('parent_type', t.type_node(node.parent_type))
 	obj.add_terse('is_pub', t.bool_node(node.is_pub))
@@ -885,6 +886,7 @@ fn (t Tree) sum_type_decl(node ast.SumTypeDecl) &Node {
 	mut obj := create_object()
 	obj.add_terse('ast_type', t.string_node('SumTypeDecl'))
 	obj.add_terse('name', t.string_node(node.name))
+	obj.add_terse('mod', t.string_node(node.mod))
 	obj.add_terse('is_pub', t.bool_node(node.is_pub))
 	obj.add('pos', t.pos(node.pos))
 	obj.add_terse('typ', t.type_node(node.typ))
diff --git a/vlib/v/ast/ast.v b/vlib/v/ast/ast.v
@@ -1508,6 +1508,7 @@ pub mut:
 pub struct AliasTypeDecl {
 pub:
 	name     string
+	mod      string
 	is_pub   bool
 	typ      Type
 	pos      token.Pos
@@ -1523,6 +1524,7 @@ pub mut:
 pub struct SumTypeDecl {
 pub:
 	name          string
+	mod           string
 	is_pub        bool
 	pos           token.Pos
 	name_pos      token.Pos
diff --git a/vlib/v/checker/checker.v b/vlib/v/checker/checker.v
@@ -618,7 +618,10 @@ fn (mut c Checker) alias_type_decl(mut node ast.AliasTypeDecl) {
 		}
 		.alias {
 			orig_sym := c.table.sym((parent_typ_sym.info as ast.Alias).parent_type)
-			if !node.name.starts_with('C.') {
+			if !node.name.starts_with('C.')
+				&& parent_typ_sym.name !in ['strings.Builder', 'StringBuilder', 'builtin.StringBuilder'] {
+				// TODO: remove the whole check, or at least the need for special casing `strings.Builder` and `StringBuilder` here
+				// after more testing and bootstrapping of the strings.Builder -> builtin.StringBuilder change
 				c.error('type `${parent_typ_sym.str()}` is an alias, use the original alias type `${orig_sym.name}` instead',
 					node.type_pos)
 			}
diff --git a/vlib/v/parser/parser.v b/vlib/v/parser/parser.v
@@ -3007,6 +3007,7 @@ fn (mut p Parser) type_decl() ast.TypeDecl {
 		}
 		node := ast.SumTypeDecl{
 			name:          name
+			mod:           p.mod
 			typ:           typ
 			is_pub:        is_pub
 			variants:      sum_variants
@@ -3072,6 +3073,7 @@ fn (mut p Parser) type_decl() ast.TypeDecl {
 	p.attrs = []
 	alias_type_decl := ast.AliasTypeDecl{
 		name:        name
+		mod:         p.mod
 		is_pub:      is_pub
 		typ:         idx
 		parent_type: parent_type

Original file line number	Diff line number	Diff line change
`@@ -618,7 +618,10 @@ fn (mut c Checker) alias_type_decl(mut node ast.AliasTypeDecl) {`
`618`	`618`	`}`
`619`	`619`	`.alias {`
`620`	`620`	`orig_sym := c.table.sym((parent_typ_sym.info as ast.Alias).parent_type)`
`621`		`- if !node.name.starts_with('C.') {`
	`621`	`+ if !node.name.starts_with('C.')`
	`622`	`+ && parent_typ_sym.name !in ['strings.Builder', 'StringBuilder', 'builtin.StringBuilder'] {`
	`623`	+ // TODO: remove the whole check, or at least the need for special casing `strings.Builder` and `StringBuilder` here
	`624`	`+ // after more testing and bootstrapping of the strings.Builder -> builtin.StringBuilder change`
`622`	`625`	c.error('type `${parent_typ_sym.str()}` is an alias, use the original alias type `${orig_sym.name}` instead',
`623`	`626`	`node.type_pos)`
`624`	`627`	`}`