native: for statement : add support for all expressions handled by g.condition (#23752)

Eliyaan · web-flow · commit 4a197d776660 · 2025-02-17T20:12:08.000+02:00
diff --git a/vlib/v/gen/native/expr.v b/vlib/v/gen/native/expr.v
@@ -152,8 +152,9 @@ fn (mut g Gen) local_var_ident(ident ast.Ident, var LocalVar) {
 }
 
 fn (mut g Gen) condition(expr ast.Expr, neg bool) i32 {
+	g.println('; condition cjmp if ${neg}:')
 	g.expr(expr)
-	g.code_gen.cmp_zero(g.code_gen.main_reg())
+	g.code_gen.cmp_zero(g.code_gen.main_reg()) // 0 is false
 	return g.code_gen.cjmp(if neg { .jne } else { .je })
 }
 
diff --git a/vlib/v/gen/native/gen.v b/vlib/v/gen/native/gen.v
@@ -180,8 +180,8 @@ mut:
 }
 
 struct LabelPatch {
-	id  i32
-	pos i32
+	id  i32 // id of the needed label address
+	pos i32 // where (in the generated code) to fix the address (of a jump for example)
 }
 
 struct BranchLabel {
diff --git a/vlib/v/gen/native/stmt.c.v b/vlib/v/gen/native/stmt.c.v
@@ -110,7 +110,7 @@ fn (mut g Gen) stmt(node ast.Stmt) {
 		ast.TypeDecl {}
 		ast.InterfaceDecl {}
 		else {
-			eprintln('native.stmt(): bad node: ' + node.type_name())
+			g.n_error('native.stmt(): bad node: ' + node.type_name())
 		}
 	}
 }
@@ -208,62 +208,23 @@ fn (mut g Gen) for_stmt(node ast.ForStmt) {
 		g.println('; label ${end_label}')
 		return
 	}
-	infix_expr := node.cond as ast.InfixExpr
-	mut jump_addr := i32(0) // location of `jne *00 00 00 00*`
+	g.println('; for stmt {')
+
 	start := g.pos()
 	start_label := g.labels.new_label()
 	g.labels.addrs[start_label] = start
-	g.println('; label ${start_label}')
-	match infix_expr.left {
-		ast.Ident {
-			match infix_expr.right {
-				ast.Ident {
-					reg := g.code_gen.main_reg()
-					g.code_gen.mov_var_to_reg(reg, infix_expr.right as ast.Ident)
-					g.code_gen.cmp_var_reg(infix_expr.left as ast.Ident, reg)
-				}
-				ast.IntegerLiteral {
-					lit := infix_expr.right as ast.IntegerLiteral
-					g.code_gen.cmp_var(infix_expr.left as ast.Ident, i32(lit.val.int()))
-				}
-				else {
-					g.n_error('unhandled expression type')
-				}
-			}
-			match infix_expr.left.tok_kind {
-				.lt {
-					jump_addr = g.code_gen.cjmp(.jge)
-				}
-				.gt {
-					jump_addr = g.code_gen.cjmp(.jle)
-				}
-				.le {
-					jump_addr = g.code_gen.cjmp(.jg)
-				}
-				.ge {
-					jump_addr = g.code_gen.cjmp(.jl)
-				}
-				.ne {
-					jump_addr = g.code_gen.cjmp(.je)
-				}
-				.eq {
-					jump_addr = g.code_gen.cjmp(.jne)
-				}
-				else {
-					g.n_error('unhandled infix cond token')
-				}
-			}
-		}
-		else {
-			g.n_error('unhandled infix.left')
-		}
-	}
+	g.println('; label ${start_label} (start of for loop)')
+
+	// Condition
+	mut cjmp_addr := g.condition(node.cond, false) // jmp if false, location of `jne *00 00 00 00*` (to be patched by LabelPatch)
 	end_label := g.labels.new_label()
 	g.labels.patches << LabelPatch{
 		id:  end_label
-		pos: jump_addr
+		pos: cjmp_addr
 	}
-	g.println('; jump to label ${end_label}')
+	g.println('; cjmp to label ${end_label} (out of loop)')
+
+	// Body of the loop
 	g.labels.branches << BranchLabel{
 		name:  node.label
 		start: start_label
@@ -273,10 +234,11 @@ fn (mut g Gen) for_stmt(node ast.ForStmt) {
 	g.labels.branches.pop()
 	// Go back to `cmp ...`
 	g.code_gen.jmp_back(start)
-	// Update the jump addr to current pos
+
+	g.println('; for stmt }')
+	// Set the jump (out of the loop) addr to current pos
 	g.labels.addrs[end_label] = g.pos()
-	g.println('; label ${end_label}')
-	g.println('jmp after for')
+	g.println('; label ${end_label} (out of for loop)')
 }
 
 fn (mut g Gen) for_in_stmt(node ast.ForInStmt) { // Work on that
diff --git a/vlib/v/gen/native/tests/for.vv b/vlib/v/gen/native/tests/for.vv
@@ -23,6 +23,16 @@ fn simple_for_test() {
 		println('loop5')
 		i--
 	}
+	i = 0
+	for i * i < 3 {
+		println('loop6')
+		i++
+	}
+	i = 0
+	for 3 > i * i {
+		println('loop7')
+		i++
+	}
 }
 
 fn break_continue_test() {
diff --git a/vlib/v/gen/native/tests/for.vv.out b/vlib/v/gen/native/tests/for.vv.out
@@ -16,6 +16,10 @@ loop4
 loop5
 loop5
 loop5
+loop6
+loop6
+loop7
+loop7
 loop1
 loop1
 loop2

Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,9 @@ fn (mut g Gen) local_var_ident(ident ast.Ident, var LocalVar) {`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`fn (mut g Gen) condition(expr ast.Expr, neg bool) i32 {`
	`155`	`+ g.println('; condition cjmp if ${neg}:')`
`155`	`156`	`g.expr(expr)`
`156`		`- g.code_gen.cmp_zero(g.code_gen.main_reg())`
	`157`	`+ g.code_gen.cmp_zero(g.code_gen.main_reg()) // 0 is false`
`157`	`158`	`return g.code_gen.cjmp(if neg { .jne } else { .je })`
`158`	`159`	`}`
`159`	`160`
Original file line number	Diff line number	Diff line change
`@@ -180,8 +180,8 @@ mut:`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`struct LabelPatch {`
`183`		`- id i32`
`184`		`- pos i32`
	`183`	`+ id i32 // id of the needed label address`
	`184`	`+ pos i32 // where (in the generated code) to fix the address (of a jump for example)`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`struct BranchLabel {`
-Original file line number
+Diff line change
 loop5
 loop5
 loop5
 +loop6
 +loop6
 +loop7
 +loop7
 loop1
 loop1
 loop2