mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-14 06:52:36 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

compiler: cast correctly strings between byte* and char* when needed

Browse source
This commit is contained in:
Henrixounez 2019-08-25 00:12:11 +02:00 • committed by Alexander Medvednikov
parent 0a0d6536c2
commit ad32a3770b
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/parser.v
View file

@ -2088,7 +2088,7 @@ fn (p mut Parser) index_expr(typ_ string, fn_ph int) string {
// TODO what about user types?
if is_map && typ == 'string' {
// p.cgen.insert_before('if (!${tmp}.str) $tmp = tos("", 0);')
p.cgen.insert_before('if (!$tmp_ok) $tmp = tos("", 0);')
p.cgen.insert_before('if (!$tmp_ok) $tmp = tos((byte *)"", 0);')
}
}
// else if is_arr && is_indexer{}
@ -2608,7 +2608,7 @@ fn (p mut Parser) map_init() string {
mut i := 0
for {
key := p.lit
keys_gen += 'tos2("$key"), '
keys_gen += 'tos2((byte*)"$key"), '
p.check(.str)
p.check(.colon)
p.cgen.start_tmp()
@ -2974,7 +2974,7 @@ fn (p mut Parser) cast(typ string) string {
if is_byteptr || is_bytearr {
if p.tok == .comma {
p.check(.comma)
p.cgen.set_placeholder(pos, 'tos(')
p.cgen.set_placeholder(pos, 'tos((byte *)')
if is_bytearr {
p.gen('.data')
}
@ -2984,7 +2984,7 @@ fn (p mut Parser) cast(typ string) string {
if is_bytearr {
p.gen('.data')
}
p.cgen.set_placeholder(pos, 'tos2(')
p.cgen.set_placeholder(pos, 'tos2((byte *)')
}
}
// `string(234)` => error
@ -3359,7 +3359,7 @@ fn (p mut Parser) assert_statement() {
filename := p.file_path.replace('\\', '\\\\')
p.genln(';\n
if (!$tmp) {
println(tos2("\\x1B[31mFAILED: $p.cur_fn.name() in $filename:$p.scanner.line_nr\\x1B[0m"));
println(tos2((byte *)"\\x1B[31mFAILED: $p.cur_fn.name() in $filename:$p.scanner.line_nr\\x1B[0m"));
g_test_ok = 0 ;
// TODO
// Maybe print all vars in a test function if it fails?