Skip to content

Commit dd1d5bc

Browse files
authored
ast: clean up ast.StructInit (#18387)
1 parent 7a25c03 commit dd1d5bc

4 files changed

Lines changed: 0 additions & 41 deletions

File tree

cmd/tools/vast/vast.v

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1567,7 +1567,6 @@ fn (t Tree) struct_init(node ast.StructInit) &Node {
15671567
obj.add('name_pos', t.pos(node.name_pos))
15681568
obj.add('update_expr_comments', t.array_node_comment(node.update_expr_comments))
15691569
obj.add_terse('fields', t.array_node_struct_init_field(node.fields))
1570-
obj.add_terse('embeds', t.array_node_struct_init_embed(node.embeds))
15711570
obj.add('pre_comments', t.array_node_comment(node.pre_comments))
15721571
return obj
15731572
}
@@ -1587,19 +1586,6 @@ fn (t Tree) struct_init_field(node ast.StructInitField) &Node {
15871586
return obj
15881587
}
15891588

1590-
fn (t Tree) struct_init_embed(node ast.StructInitEmbed) &Node {
1591-
mut obj := new_object()
1592-
obj.add_terse('ast_type', t.string_node('StructInitEmbed'))
1593-
obj.add_terse('name', t.string_node(node.name))
1594-
obj.add_terse('expr', t.expr(node.expr))
1595-
obj.add_terse('typ', t.type_node(node.typ))
1596-
obj.add_terse('expected_type', t.type_node(node.expected_type))
1597-
obj.add('comments', t.array_node_comment(node.comments))
1598-
obj.add('next_comments', t.array_node_comment(node.next_comments))
1599-
obj.add('pos', t.pos(node.pos))
1600-
return obj
1601-
}
1602-
16031589
fn (t Tree) array_init(node ast.ArrayInit) &Node {
16041590
mut obj := new_object()
16051591
obj.add_terse('ast_type', t.string_node('ArrayInit'))
@@ -2306,14 +2292,6 @@ fn (t Tree) array_node_if_guard_var(nodes []ast.IfGuardVar) &Node {
23062292
return arr
23072293
}
23082294

2309-
fn (t Tree) array_node_struct_init_embed(nodes []ast.StructInitEmbed) &Node {
2310-
mut arr := new_array()
2311-
for node in nodes {
2312-
arr.add_item(t.struct_init_embed(node))
2313-
}
2314-
return arr
2315-
}
2316-
23172295
fn (t Tree) array_node_match_branch(nodes []ast.MatchBranch) &Node {
23182296
mut arr := new_array()
23192297
for node in nodes {

vlib/v/ast/ast.v

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -437,18 +437,6 @@ pub mut:
437437
parent_type Type
438438
}
439439

440-
pub struct StructInitEmbed {
441-
pub:
442-
pos token.Pos
443-
comments []Comment
444-
next_comments []Comment
445-
pub mut:
446-
expr Expr
447-
name string
448-
typ Type
449-
expected_type Type
450-
}
451-
452440
// `s := Foo{
453441
// ...a
454442
// field1: 'hello'
@@ -473,7 +461,6 @@ pub mut:
473461
is_update_embed bool
474462
has_update_expr bool // has `...a`
475463
fields []StructInitField
476-
embeds []StructInitEmbed
477464
generic_types []Type
478465
}
479466

vlib/v/markused/walker.v

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -418,9 +418,6 @@ fn (mut w Walker) expr(node_ ast.Expr) {
418418
for sif in node.fields {
419419
w.expr(sif.expr)
420420
}
421-
for sie in node.embeds {
422-
w.expr(sie.expr)
423-
}
424421
}
425422
ast.TypeOf {
426423
w.expr(node.expr)

vlib/v/transformer/transformer.v

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -662,9 +662,6 @@ pub fn (mut t Transformer) expr(mut node ast.Expr) ast.Expr {
662662
for mut field in node.fields {
663663
field.expr = t.expr(mut field.expr)
664664
}
665-
for mut embed in node.embeds {
666-
embed.expr = t.expr(mut embed.expr)
667-
}
668665
}
669666
ast.UnsafeExpr {
670667
node.expr = t.expr(mut node.expr)

0 commit comments

Comments
 (0)