v3: address transitive init and mut for reviews

Author: medvednikov

vlib/v3/gen/c/cleanc.v

@@ -366,9 +366,7 @@ fn (g &FlatGen) visit_module_init(mod string, module_to_init map[string]string,
 	}
 	visiting[mod] = true
 	for dep in g.module_imports[mod] or { []string{} } {
-		if dep in module_to_init {
-			g.visit_module_init(dep, module_to_init, mut visiting, mut visited, mut result)
-		}
+		g.visit_module_init(dep, module_to_init, mut visiting, mut visited, mut result)
 	}
 	visiting.delete(mod)
 	visited[mod] = true

vlib/v3/tests/type_checker_errors_test.v

@@ -180,6 +180,9 @@ fn test_type_checker_reports_core_semantic_errors() {
 	mut_array_for_out := run_good(v3_bin, 'mut_array_for_in',
 		'struct Item {\nmut:\n\tn int\n}\n\nfn main() {\n\tmut xs := []Item{}\n\txs << Item{n: 1}\n\tfor mut item in xs {\n\t\titem.n = 7\n\t}\n\tprintln(int_str(xs[0].n))\n}\n')
 	assert mut_array_for_out == '7'
+	mut_array_for_scalar_out := run_good(v3_bin, 'mut_array_for_scalar_updates',
+		'fn main() {\n\tmut xs := []int{}\n\txs << 1\n\txs << 2\n\tfor mut x in xs {\n\t\tx++\n\t\tx += 10\n\t}\n\tprintln(int_str(xs[0]))\n\tprintln(int_str(xs[1]))\n}\n')
+	assert mut_array_for_scalar_out == '12\n13'
 	const_forward_out := run_good(v3_bin, 'const_forward',
 		'const first_value = second_value\nconst second_value = 2\nfn main() {\n\tprintln(int_str(first_value))\n}\n')
 	assert const_forward_out == '2'
@@ -206,6 +209,12 @@ fn test_type_checker_reports_core_semantic_errors() {
 		'parent/child/child.v': 'module child\n\n__global flag int\n\nfn init() {\n\tflag = 41\n}\n\npub fn value() int {\n\treturn flag\n}\n'
 	}, 'main.v')
 	assert hier_init_order_out == '41\n41'
+	transitive_init_order_out := run_good_project(v3_bin, 'transitive_module_init_order', {
+		'main.v':      'module main\n\nimport moda\n\n__global seen int\n\nfn init() {\n\tseen = moda.value()\n}\n\nfn main() {\n\tprintln(int_str(seen))\n\tprintln(int_str(moda.value()))\n}\n'
+		'moda/moda.v': 'module moda\n\nimport modb\n\npub fn value() int {\n\treturn modb.value()\n}\n'
+		'modb/modb.v': 'module modb\n\n__global flag int\n\nfn init() {\n\tflag = 41\n}\n\npub fn value() int {\n\treturn flag\n}\n'
+	}, 'main.v')
+	assert transitive_init_order_out == '41\n41'
 	global_amp_out := run_good(v3_bin, 'global_amp_initializers',
 		'struct Point {\n\tx int\n\ty int\n}\n\ninterface Reader {\n\tn int\n\tread() int\n}\n\nstruct Box {\n\tn int\n}\n\nfn (b Box) read() int {\n\treturn b.n + 1\n}\n\n__global (\n\tbase_point = Point{x: 1, y: 2}\n\tassoc_point = &Point{...base_point, y: 5}\n\treader_box = Box{n: 7}\n\treader_ref = &Reader(reader_box)\n)\n\nfn main() {\n\tprintln(int_str(assoc_point.y))\n\tprintln(int_str(reader_ref.n))\n\tprintln(int_str(reader_ref.read()))\n}\n')
 	assert global_amp_out == '5\n7\n8'

vlib/v3/transform/for.v

@@ -329,9 +329,22 @@ fn (mut t Transformer) lower_indexed_for_in(id flat.NodeId, node flat.Node, key_
 		t.make_index(container, t.make_ident(idx_name), elem_type)
 	}
 	elem_decl := t.make_decl_assign_typed(elem_name, elem_expr, elem_var_type)
+	mut transformed_body := []flat.NodeId{}
+	if elem_needs_ref {
+		had_pointer_value_lvalue := t.pointer_value_lvalues[elem_name] or { false }
+		t.pointer_value_lvalues[elem_name] = true
+		transformed_body = t.transform_stmts(body_ids)
+		if had_pointer_value_lvalue {
+			t.pointer_value_lvalues[elem_name] = true
+		} else {
+			t.pointer_value_lvalues.delete(elem_name)
+		}
+	} else {
+		transformed_body = t.transform_stmts(body_ids)
+	}
 	mut new_body := []flat.NodeId{}
 	new_body << elem_decl
-	new_body << t.transform_stmts(body_ids)
+	new_body << transformed_body
 	prefix << t.make_for_stmt(init, cond, post, new_body, node)
 	return prefix
 }

vlib/v3/transform/transform.v

@@ -59,6 +59,7 @@ mut:
 	cur_fn_name         string
 	cur_fn_ret_type     string
 	var_types           []VarTypeBinding
+	pointer_value_lvalues map[string]bool
 	temp_counter        int
 	pending_stmts       []flat.NodeId
 	smartcast_stack     []SmartcastContext
@@ -113,8 +114,9 @@ struct VarTypeBinding {
 
 pub fn transform(mut a flat.FlatAst, tc &types.TypeChecker) {
 	mut t := Transformer{
-		a:  a
-		tc: unsafe { tc }
+		a:                     a
+		tc:                    unsafe { tc }
+		pointer_value_lvalues: map[string]bool{}
 	}
 	t.collect_types()
 	t.collect_const_suffixes()
@@ -1475,7 +1477,7 @@ fn (t &Transformer) type_info_sum_name() ?string {
 }
 
 fn (mut t Transformer) try_lower_pointer_value_assign(node flat.Node) ?[]flat.NodeId {
-	if node.kind != .assign || node.op != .assign || node.children_count != 2 {
+	if node.kind != .assign || node.children_count != 2 {
 		return none
 	}
 	lhs_id := t.a.child(&node, 0)
@@ -1493,6 +1495,13 @@ fn (mut t Transformer) try_lower_pointer_value_assign(node flat.Node) ?[]flat.No
 	rhs_id := t.a.child(&node, 1)
 	rhs_type := t.node_type(rhs_id)
 	lhs_value_type := t.normalize_type_alias(lhs_type[1..])
+	if node.op != .assign {
+		if !t.pointer_value_lvalues[lhs.value] {
+			return none
+		}
+		new_lhs := t.make_prefix(.mul, t.make_ident(lhs.value))
+		return arr1(t.make_assign_op(new_lhs, t.transform_expr(rhs_id), node.op))
+	}
 	if rhs_type.len == 0
 		|| (rhs_type != lhs_value_type && !t.type_alias_targets_type(lhs_type[1..], rhs_type)) {
 		return none
@@ -3446,7 +3455,12 @@ fn (mut t Transformer) transform_postfix_expr(id flat.NodeId, node flat.Node) fl
 		return id
 	}
 	child_id := t.a.child(&node, 0)
-	new_child := t.transform_expr(child_id)
+	child := t.a.nodes[int(child_id)]
+	new_child := if child.kind == .ident && t.pointer_value_lvalues[child.value] {
+		t.make_paren(t.make_prefix(.mul, t.make_ident(child.value)))
+	} else {
+		t.transform_expr(child_id)
+	}
 	start := t.a.children.len
 	t.a.children << new_child
 	return t.a.add_node(flat.Node{