Skip to content

Commit 42ac688

Browse files
authored
cgen: fix showing the expression, as literal value, in case of assert s[x..y] == "literal" (fix #24103) (#24105)
1 parent a59b717 commit 42ac688

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

vlib/v/gen/c/assert.v

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,7 @@ fn (mut g Gen) gen_assert_single_expr(expr ast.Expr, typ ast.Type) {
207207
g.write(ctoslit(expr_str))
208208
}
209209
ast.IndexExpr {
210-
if expr.index is ast.RangeExpr {
211-
g.write(ctoslit(expr_str))
212-
} else {
213-
g.gen_expr_to_string(expr, typ)
214-
}
210+
g.gen_expr_to_string(expr, typ)
215211
}
216212
ast.PrefixExpr {
217213
if expr.right is ast.CastExpr {

vlib/v/tests/skip_unused/assert_works_test.run.out

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,8 @@ vlib/v/tests/skip_unused/assert_works_test.vv:2: fn test_abc
33
Left value (len: 3): `abc`
44
Right value (len: 3): `xyz`
55

6+
vlib/v/tests/skip_unused/assert_works_test.vv:7: fn test_index_expr
7+
> assert example_string[1 .. 4] == 'abcdef'
8+
Left value (len: 3): `his`
9+
Right value (len: 6): `abcdef`
10+

vlib/v/tests/skip_unused/assert_works_test.skip_unused.run.out

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,8 @@ vlib/v/tests/skip_unused/assert_works_test.vv:2: fn test_abc
33
Left value (len: 3): `abc`
44
Right value (len: 3): `xyz`
55

6+
vlib/v/tests/skip_unused/assert_works_test.vv:7: fn test_index_expr
7+
> assert example_string[1 .. 4] == 'abcdef'
8+
Left value (len: 3): `his`
9+
Right value (len: 6): `abcdef`
10+
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
fn test_abc() {
22
assert 'abc' == 'xyz'
33
}
4+
5+
fn test_index_expr() {
6+
example_string := 'This is an example string'
7+
assert example_string[1..4] == 'abcdef'
8+
}

0 commit comments

Comments
 (0)