parser: fix wrong string parsing (fix #24297) (#24298)

felipensp · web-flow · commit 72f45e44340e · 2025-04-24T13:53:31.000+03:00
diff --git a/vlib/v/parser/parser.v b/vlib/v/parser/parser.v
@@ -2762,7 +2762,8 @@ fn (mut p Parser) name_expr() ast.Expr {
 		}
 	}
 	// Raw string (`s := r'hello \n ')
-	if p.peek_tok.kind == .string && !p.inside_str_interp && p.peek_token(2).kind != .colon {
+	if p.peek_tok.kind == .string && p.tok.line_nr == p.peek_tok.line_nr && !p.inside_str_interp
+		&& p.peek_token(2).kind != .colon {
 		if p.tok.kind == .name && p.tok.lit in ['r', 'c', 'js'] {
 			return p.string_expr()
 		} else {
diff --git a/vlib/v/tests/if_elseif_else_test.v b/vlib/v/tests/if_elseif_else_test.v
@@ -0,0 +1,28 @@
+module main
+
+fn if_expt(this int) (string, int) {
+	inc := 1
+	mut count := 0
+	thing := if this in [0, 1, 2] {
+		count += 1
+		'0..2'
+	} else if this in [3, 4, 5] {
+		count += inc
+		'3..5'
+	} else {
+		'not 0..5'
+	}
+	return thing, count
+}
+
+fn test_main() {
+	a, b := if_expt(1)
+	assert a == '0..2'
+	assert b == 1
+	c, d := if_expt(4)
+	assert c == '3..5'
+	assert d == 1
+	e, f := if_expt(7)
+	assert e == 'not 0..5'
+	assert f == 0
+}

Original file line number	Diff line number	Diff line change
`@@ -2762,7 +2762,8 @@ fn (mut p Parser) name_expr() ast.Expr {`
`2762`	`2762`	`}`
`2763`	`2763`	`}`
`2764`	`2764`	// Raw string (`s := r'hello \n ')
`2765`		`- if p.peek_tok.kind == .string && !p.inside_str_interp && p.peek_token(2).kind != .colon {`
	`2765`	`+ if p.peek_tok.kind == .string && p.tok.line_nr == p.peek_tok.line_nr && !p.inside_str_interp`
	`2766`	`+ && p.peek_token(2).kind != .colon {`
`2766`	`2767`	`if p.tok.kind == .name && p.tok.lit in ['r', 'c', 'js'] {`
`2767`	`2768`	`return p.string_expr()`
`2768`	`2769`	`} else {`