mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

cgen: do not generate the stringified values for assert x in y, for the pass case (#17908)

Browse Source
This commit is contained in:
Delyan Angelov 2023-04-08 18:51:46 +03:00 committed by GitHub
parent ebfc4b4663
commit cd629cfeab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
vlib/v/gen/c/assert.v
View File

@ -5,6 +5,12 @@ module c
import v.ast
enum AssertMetainfoKind {
pass
fail
panic
}
fn (mut g Gen) assert_stmt(original_assert_statement ast.AssertStmt) {
if !original_assert_statement.is_used {
return
@ -29,10 +35,10 @@ fn (mut g Gen) assert_stmt(original_assert_statement ast.AssertStmt) {
g.write(')')
g.decrement_inside_ternary()
g.writeln(' {')
metaname_ok := g.gen_assert_metainfo(node)
metaname_ok := g.gen_assert_metainfo(node, .pass)
g.writeln('\tmain__TestRunner_name_table[test_runner._typ]._method_assert_pass(test_runner._object, &${metaname_ok});')
g.writeln('} else {')
metaname_fail := g.gen_assert_metainfo(node)
metaname_fail := g.gen_assert_metainfo(node, .fail)
g.writeln('\tmain__TestRunner_name_table[test_runner._typ]._method_assert_fail(test_runner._object, &${metaname_fail});')
g.gen_assert_postfailure_mode(node)
g.writeln('}')
@ -45,7 +51,7 @@ fn (mut g Gen) assert_stmt(original_assert_statement ast.AssertStmt) {
g.write('))')
g.decrement_inside_ternary()
g.writeln(' {')
metaname_panic := g.gen_assert_metainfo(node)
metaname_panic := g.gen_assert_metainfo(node, .panic)
g.writeln('\t__print_assert_failure(&${metaname_panic});')
g.gen_assert_postfailure_mode(node)
g.writeln('}')
@ -107,7 +113,7 @@ fn (mut g Gen) gen_assert_postfailure_mode(node ast.AssertStmt) {
}
}
fn (mut g Gen) gen_assert_metainfo(node ast.AssertStmt) string {
fn (mut g Gen) gen_assert_metainfo(node ast.AssertStmt, kind AssertMetainfoKind) string {
mod_path := cestring(g.file.path)
fn_name := g.fn_decl.name
line_nr := node.pos.line_nr
@ -131,12 +137,14 @@ fn (mut g Gen) gen_assert_metainfo(node ast.AssertStmt) string {
g.writeln('\t${metaname}.op = ${expr_op_str};')
g.writeln('\t${metaname}.llabel = ${expr_left_str};')
g.writeln('\t${metaname}.rlabel = ${expr_right_str};')
g.write('\t${metaname}.lvalue = ')
g.gen_assert_single_expr(node.expr.left, node.expr.left_type)
g.writeln(';')
g.write('\t${metaname}.rvalue = ')
g.gen_assert_single_expr(node.expr.right, node.expr.right_type)
g.writeln(';')
if kind != .pass {
g.write('\t${metaname}.lvalue = ')
g.gen_assert_single_expr(node.expr.left, node.expr.left_type)
g.writeln(';')
g.write('\t${metaname}.rvalue = ')
g.gen_assert_single_expr(node.expr.right, node.expr.right_type)
g.writeln(';')
}
}
ast.CallExpr {
g.writeln('\t${metaname}.op = _SLIT("call");')