vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

assert: generate tos3/1 calls instead of _STR (bugfix)

pull/4349/head
Delyan Angelov 2020-04-11 16:18:00 +03:00
parent 30714d16d9
commit 61c1535199
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vlib/v/gen/cgen.v
View File

@ -633,10 +633,10 @@ fn (g mut Gen) gen_assert_stmt(a ast.AssertStmt) {
if g.is_test { if g.is_test {
g.writeln('{') g.writeln('{')
g.writeln(' g_test_oks++;') g.writeln(' g_test_oks++;')
g.writeln(' cb_assertion_ok( _STR("${mod_path}"), ${a.pos.line_nr+1}, _STR("assert ${s_assertion}"), _STR("${g.fn_decl.name}()") );') g.writeln(' cb_assertion_ok( tos3("${mod_path}"), ${a.pos.line_nr+1}, tos3("assert ${s_assertion}"), tos3("${g.fn_decl.name}()") );')
g.writeln('}else{') g.writeln('}else{')
g.writeln(' g_test_fails++;') g.writeln(' g_test_fails++;')
g.writeln(' cb_assertion_failed( _STR("${mod_path}"), ${a.pos.line_nr+1}, _STR("assert ${s_assertion}"), _STR("${g.fn_decl.name}()") );') g.writeln(' cb_assertion_failed( tos3("${mod_path}"), ${a.pos.line_nr+1}, tos3("assert ${s_assertion}"), tos3("${g.fn_decl.name}()") );')
g.writeln(' exit(1);') g.writeln(' exit(1);')
g.writeln(' // TODO') g.writeln(' // TODO')
g.writeln(' // Maybe print all vars in a test function if it fails?') g.writeln(' // Maybe print all vars in a test function if it fails?')
@ -644,7 +644,7 @@ fn (g mut Gen) gen_assert_stmt(a ast.AssertStmt) {
return return
} }
g.writeln('{}else{') g.writeln('{}else{')
g.writeln(' eprintln(_STR("${mod_path}:${a.pos.line_nr+1}: FAIL: fn ${g.fn_decl.name}(): assert $s_assertion"));') g.writeln(' eprintln( tos3("${mod_path}:${a.pos.line_nr+1}: FAIL: fn ${g.fn_decl.name}(): assert $s_assertion"));')
g.writeln(' exit(1);') g.writeln(' exit(1);')
g.writeln('}') g.writeln('}')
} }