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

bare: fix str[idx]

Browse Source
This commit is contained in:
Alexander Medvednikov 2019-11-16 23:22:40 +03:00
parent 0c5854e371
commit 5a1de13e10
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vlib/compiler/gen_c.v
View File

@ -211,8 +211,11 @@ fn (p mut Parser) index_get(typ string, fn_ph int, cfg IndexConfig) {
}
}
}
else if cfg.is_str && !p.builtin_mod && !p.pref.is_bare {
if cfg.is_slice {
else if cfg.is_str && !p.builtin_mod {
if p.pref.is_bare {
p.gen(index_expr)
}
else if cfg.is_slice {
p.gen('string_substr2($index_expr)')
} else {
p.gen('string_at($index_expr)')

4
vlib/compiler/parser.v
View File

@ -1856,10 +1856,10 @@ fn (p mut Parser) index_expr(typ_ string, fn_ph int) string {
if is_str {
typ = 'byte'
// Direct faster access to .str[i] in builtin modules
if p.builtin_mod {
if p.builtin_mod || p.pref.is_bare {
p.gen('.str[')
close_bracket = true
}
}
else {
// Bounds check everywhere else
p.gen(', ')

7
vlib/os/bare/bare_example_linux.v
View File

@ -1,6 +1,6 @@
fn syscall5(number, arg1, arg2, arg3, arg4, arg5 voidptr) voidptr
fn write(fd int, data voidptr, nbytes u64) int {
fn write(fd int, data voidptr, nbytes int) int {
return syscall5(
1, // SYS_write
fd,
@ -12,6 +12,9 @@ fn write(fd int, data voidptr, nbytes u64) int {
}
fn main() {
write(1, c'hallo\n', 6)
write(1, c'hello\n', 6)
s := 'test string'
write(1, s.str, s.len)
a := s[0]
}