Skip to content

Commit 6fea04c

Browse files
committed
v3: fix forced self-host transform tests
1 parent 51e50b8 commit 6fea04c

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

vlib/v3/transform/array.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1605,7 +1605,7 @@ fn (mut t Transformer) lower_array_prepend_call(node flat.Node, fn_node flat.Nod
16051605
short_struct_value := if value_node.kind == .field_init {
16061606
t.transform_trailing_field_init_struct_arg(node, 1, elem_type)
16071607
} else {
1608-
none
1608+
?flat.NodeId(none)
16091609
}
16101610
value_id := short_struct_value or { raw_value_id }
16111611
raw_rhs_type := if short_struct_value != none { elem_type } else { t.node_type(value_id) }
@@ -1657,7 +1657,7 @@ fn (mut t Transformer) lower_array_insert_call(node flat.Node, fn_node flat.Node
16571657
short_struct_value := if value_node.kind == .field_init {
16581658
t.transform_trailing_field_init_struct_arg(node, 2, elem_type)
16591659
} else {
1660-
none
1660+
?flat.NodeId(none)
16611661
}
16621662
value_id := short_struct_value or { raw_value_id }
16631663
raw_rhs_type := if short_struct_value != none { elem_type } else { t.node_type(value_id) }

vlib/v3/transform/transform_parallel_test.v

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,17 @@ fn test_merge_worker_shifts_private_specialization_metadata() {
6868
base_nodes := master.a.nodes.len
6969
base_children := master.a.children.len
7070

71-
worker_ast := master.clone_ast_base(base_nodes, base_children)
72-
worker_tc := tc.fork_for_parallel_transform(worker_ast)
71+
mut worker_ast := master.clone_ast_base(base_nodes, base_children)
72+
mut worker_tc := tc.fork_for_parallel_transform(worker_ast)
7373
mut worker := master.fork_worker(worker_ast, worker_tc)
7474
assert worker.a.specialized_fn_modules[int(base_id)] == 'base_module'
75-
worker_id := worker.a.add_node(flat.Node{
75+
worker_id := worker_ast.add_node(flat.Node{
7676
kind: .fn_decl
7777
value: 'worker_specialization'
7878
})
79-
worker.a.specialized_fn_nodes[int(worker_id)] = true
80-
worker.a.specialized_fn_modules[int(worker_id)] = 'worker_module'
81-
worker.a.specialized_fn_files[int(worker_id)] = 'worker.v'
79+
worker_ast.specialized_fn_nodes[int(worker_id)] = true
80+
worker_ast.specialized_fn_modules[int(worker_id)] = 'worker_module'
81+
worker_ast.specialized_fn_files[int(worker_id)] = 'worker.v'
8282
assert int(worker_id) == base_nodes
8383
assert int(worker_id) !in master.a.specialized_fn_nodes
8484

@@ -103,7 +103,7 @@ fn test_merge_worker_signatures_updates_checker_method_suffix_index() {
103103
mut tc := types.TypeChecker.new(&a)
104104
mut master := new_transformer(mut a, &tc, map[string]bool{})
105105

106-
worker_ast := master.clone_ast_base(master.a.nodes.len, master.a.children.len)
106+
mut worker_ast := master.clone_ast_base(master.a.nodes.len, master.a.children.len)
107107
mut worker_tc := tc.fork_for_parallel_transform(worker_ast)
108108
worker_tc.ensure_private_transform_signatures()
109109
worker_tc.fn_ret_types['widgets.Box.open'] = types.Type(types.bool_)
@@ -134,7 +134,7 @@ fn test_parallel_master_detaches_metadata_maps_before_writing() {
134134
}
135135
tc.structs['main.Base'] = []types.StructField{}
136136

137-
worker_ast := master.clone_ast_base(master.a.nodes.len, master.a.children.len)
137+
mut worker_ast := master.clone_ast_base(master.a.nodes.len, master.a.children.len)
138138
worker_tc := tc.fork_for_parallel_transform(worker_ast)
139139
worker := master.fork_worker(worker_ast, worker_tc)
140140
master.mark_parallel_worker_maps_shared()
@@ -175,8 +175,8 @@ fn test_transform_worker_records_struct_operators_in_private_map() {
175175
mut master := new_transformer(mut a, &tc, map[string]bool{})
176176
master.used_struct_operator_fns['main.Box.+'] = true
177177

178-
worker_ast := master.clone_ast_base(master.a.nodes.len, master.a.children.len)
179-
worker_tc := tc.fork_for_parallel_transform(worker_ast)
178+
mut worker_ast := master.clone_ast_base(master.a.nodes.len, master.a.children.len)
179+
mut worker_tc := tc.fork_for_parallel_transform(worker_ast)
180180
mut worker := master.fork_worker(worker_ast, worker_tc)
181181
worker.mark_struct_operator_used_name('main.Point.==')
182182

0 commit comments

Comments
 (0)