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

builtin: fix byte.str() (part 1)

pull/7902/head
Alexander Medvednikov 2021-01-05 18:59:51 +01:00
parent fada097b47
commit 3e04dfc79f
9 changed files with 67 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vlib/builtin/int.v
View File

@ -452,6 +452,19 @@ pub fn (b byte) str() string {
return str return str
} }
pub fn (b byte) ascii_str() string {
mut str := string{
str: malloc(2)
len: 1
}
unsafe {
str.str[0] = b
str.str[1] = `\0`
}
// println(str)
return str
}
// str_escaped returns the contents of `byte` as an escaped `string`. // str_escaped returns the contents of `byte` as an escaped `string`.
// Example: assert byte(0).str_escaped() == r'`\0`' // Example: assert byte(0).str_escaped() == r'`\0`'
pub fn (b byte) str_escaped() string { pub fn (b byte) str_escaped() string {
@ -464,7 +477,7 @@ pub fn (b byte) str_escaped() string {
11 { r'`\v`' } 11 { r'`\v`' }
12 { r'`\f`' } 12 { r'`\f`' }
13 { r'`\r`' } 13 { r'`\r`' }
32...126 { b.str() } 32...126 { b.ascii_str() }
else { '0x' + b.hex() } else { '0x' + b.hex() }
} }
return str return str

62
vlib/builtin/string.v
View File

@ -68,7 +68,7 @@ pub mut:
// vstrlen returns the V length of the C string `s` (0 terminator is not counted). // vstrlen returns the V length of the C string `s` (0 terminator is not counted).
[unsafe] [unsafe]
pub fn vstrlen(s byteptr) int { pub fn vstrlen(s byteptr) int {
return unsafe {C.strlen(charptr(s))} return unsafe { C.strlen(charptr(s)) }
} }
// tos converts a C string to a V string. // tos converts a C string to a V string.
@ -109,7 +109,7 @@ pub fn tos3(s charptr) string {
} }
return string{ return string{
str: byteptr(s) str: byteptr(s)
len: unsafe {C.strlen(s)} len: unsafe { C.strlen(s) }
} }
} }
@ -134,7 +134,7 @@ pub fn tos_lit(s charptr) string {
eprintln('warning: `tos_lit` has been deprecated, use `_SLIT` instead') eprintln('warning: `tos_lit` has been deprecated, use `_SLIT` instead')
return string{ return string{
str: byteptr(s) str: byteptr(s)
len: unsafe {C.strlen(s)} len: unsafe { C.strlen(s) }
is_lit: 1 is_lit: 1
} }
} }
@ -144,7 +144,7 @@ pub fn tos_lit(s charptr) string {
pub fn (bp byteptr) vstring() string { pub fn (bp byteptr) vstring() string {
return string{ return string{
str: bp str: bp
len: unsafe {C.strlen(charptr(bp))} len: unsafe { C.strlen(charptr(bp)) }
} }
} }
@ -162,7 +162,7 @@ pub fn (bp byteptr) vstring_with_len(len int) string {
pub fn (cp charptr) vstring() string { pub fn (cp charptr) vstring() string {
return string{ return string{
str: byteptr(cp) str: byteptr(cp)
len: unsafe {C.strlen(cp)} len: unsafe { C.strlen(cp) }
} }
} }
@ -188,7 +188,7 @@ pub fn (a string) clone() string {
return '' return ''
} }
mut b := string{ mut b := string{
str: unsafe {malloc(a.len + 1)} str: unsafe { malloc(a.len + 1) }
len: a.len len: a.len
} }
unsafe { unsafe {
@ -225,7 +225,7 @@ pub fn (s string) replace(rep string, with string) string {
// Get locations of all reps within this string // Get locations of all reps within this string
mut idxs := []int{} mut idxs := []int{}
defer { defer {
unsafe {idxs.free()} unsafe { idxs.free() }
} }
mut idx := 0 mut idx := 0
for { for {
@ -529,7 +529,7 @@ pub fn (s string) split_nth(delim string, nth int) []string {
res << s.right(i) res << s.right(i)
break break
} }
res << ch.str() res << ch.ascii_str()
i++ i++
} }
return res return res
@ -567,8 +567,8 @@ pub fn (s string) split_into_lines() []string {
} }
mut start := 0 mut start := 0
for i := 0; i < s.len; i++ { for i := 0; i < s.len; i++ {
is_lf := unsafe {s.str[i]} == `\n` is_lf := unsafe { s.str[i] } == `\n`
is_crlf := i != s.len - 1 && unsafe {s.str[i] == `\r` && s.str[i + 1] == `\n`} is_crlf := i != s.len - 1 && unsafe { s.str[i] == `\r` && s.str[i + 1] == `\n` }
is_eol := is_lf || is_crlf is_eol := is_lf || is_crlf
is_last := if is_crlf { i == s.len - 2 } else { i == s.len - 1 } is_last := if is_crlf { i == s.len - 2 } else { i == s.len - 1 }
if is_eol || is_last { if is_eol || is_last {
@ -651,7 +651,7 @@ pub fn (s string) index_old(p string) int {
mut i := 0 mut i := 0
for i < s.len { for i < s.len {
mut j := 0 mut j := 0
for j < p.len && unsafe {s.str[i + j] == p.str[j]} { for j < p.len && unsafe { s.str[i + j] == p.str[j] } {
j++ j++
} }
if j == p.len { if j == p.len {
@ -671,7 +671,7 @@ pub fn (s string) index(p string) ?int {
mut i := 0 mut i := 0
for i < s.len { for i < s.len {
mut j := 0 mut j := 0
for j < p.len && unsafe {s.str[i + j] == p.str[j]} { for j < p.len && unsafe { s.str[i + j] == p.str[j] } {
j++ j++
} }
if j == p.len { if j == p.len {
@ -690,20 +690,20 @@ fn (s string) index_kmp(p string) int {
mut prefix := []int{len: p.len} mut prefix := []int{len: p.len}
mut j := 0 mut j := 0
for i := 1; i < p.len; i++ { for i := 1; i < p.len; i++ {
for unsafe {p.str[j] != p.str[i]} && j > 0 { for unsafe { p.str[j] != p.str[i] } && j > 0 {
j = prefix[j - 1] j = prefix[j - 1]
} }
if unsafe {p.str[j] == p.str[i]} { if unsafe { p.str[j] == p.str[i] } {
j++ j++
} }
prefix[i] = j prefix[i] = j
} }
j = 0 j = 0
for i in 0 .. s.len { for i in 0 .. s.len {
for unsafe {p.str[j] != s.str[i]} && j > 0 { for unsafe { p.str[j] != s.str[i] } && j > 0 {
j = prefix[j - 1] j = prefix[j - 1]
} }
if unsafe {p.str[j] == s.str[i]} { if unsafe { p.str[j] == s.str[i] } {
j++ j++
} }
if j == p.len { if j == p.len {
@ -716,7 +716,7 @@ fn (s string) index_kmp(p string) int {
// index_any returns the position of any of the characters in the input string - if found. // index_any returns the position of any of the characters in the input string - if found.
pub fn (s string) index_any(chars string) int { pub fn (s string) index_any(chars string) int {
for c in chars { for c in chars {
index := s.index(c.str()) or { continue } index := s.index(c.ascii_str()) or { continue }
return index return index
} }
return -1 return -1
@ -730,7 +730,7 @@ pub fn (s string) last_index(p string) ?int {
mut i := s.len - p.len mut i := s.len - p.len
for i >= 0 { for i >= 0 {
mut j := 0 mut j := 0
for j < p.len && unsafe {s.str[i + j] == p.str[j]} { for j < p.len && unsafe { s.str[i + j] == p.str[j] } {
j++ j++
} }
if j == p.len { if j == p.len {
@ -757,7 +757,7 @@ pub fn (s string) index_after(p string, start int) int {
for i < s.len { for i < s.len {
mut j := 0 mut j := 0
mut ii := i mut ii := i
for j < p.len && unsafe {s.str[ii] == p.str[j]} { for j < p.len && unsafe { s.str[ii] == p.str[j] } {
j++ j++
ii++ ii++
} }
@ -773,7 +773,7 @@ pub fn (s string) index_after(p string, start int) int {
// index_byte returns -1 if the byte can not be found. // index_byte returns -1 if the byte can not be found.
pub fn (s string) index_byte(c byte) int { pub fn (s string) index_byte(c byte) int {
for i in 0 .. s.len { for i in 0 .. s.len {
if unsafe {s.str[i]} == c { if unsafe { s.str[i] } == c {
return i return i
} }
} }
@ -784,7 +784,7 @@ pub fn (s string) index_byte(c byte) int {
// last_index_byte returns -1 if the byte is not found. // last_index_byte returns -1 if the byte is not found.
pub fn (s string) last_index_byte(c byte) int { pub fn (s string) last_index_byte(c byte) int {
for i := s.len - 1; i >= 0; i-- { for i := s.len - 1; i >= 0; i-- {
if unsafe {s.str[i] == c} { if unsafe { s.str[i] == c } {
return i return i
} }
} }
@ -825,7 +825,7 @@ pub fn (s string) contains(substr string) bool {
// contains_any returns `true` if the string contains any chars in `chars`. // contains_any returns `true` if the string contains any chars in `chars`.
pub fn (s string) contains_any(chars string) bool { pub fn (s string) contains_any(chars string) bool {
for c in chars { for c in chars {
if c.str() in s { if c.ascii_str() in s {
return true return true
} }
} }
@ -851,7 +851,7 @@ pub fn (s string) starts_with(p string) bool {
return false return false
} }
for i in 0 .. p.len { for i in 0 .. p.len {
if unsafe {s.str[i] != p.str[i]} { if unsafe { s.str[i] != p.str[i] } {
return false return false
} }
} }
@ -923,7 +923,7 @@ pub fn (s string) capitalize() string {
if s.len == 0 { if s.len == 0 {
return '' return ''
} }
return s[0].str().to_upper() + s[1..] return s[0].ascii_str().to_upper() + s[1..]
// sl := s.to_lower() // sl := s.to_lower()
// cap := sl[0].str().to_upper() + sl.right(1) // cap := sl[0].str().to_upper() + sl.right(1)
// return cap // return cap
@ -1152,7 +1152,7 @@ pub fn (s string) ustring() ustring {
runes: __new_array(0, s.len, int(sizeof(int))) runes: __new_array(0, s.len, int(sizeof(int)))
} }
for i := 0; i < s.len; i++ { for i := 0; i < s.len; i++ {
char_len := utf8_char_len(unsafe {s.str[i]}) char_len := utf8_char_len(unsafe { s.str[i] })
res.runes << i res.runes << i
i += char_len - 1 i += char_len - 1
res.len++ res.len++
@ -1176,7 +1176,7 @@ pub fn (s string) ustring_tmp() ustring {
res.runes.len = s.len res.runes.len = s.len
mut j := 0 mut j := 0
for i := 0; i < s.len; i++ { for i := 0; i < s.len; i++ {
char_len := utf8_char_len(unsafe {s.str[i]}) char_len := utf8_char_len(unsafe { s.str[i] })
res.runes[j] = i res.runes[j] = i
j++ j++
i += char_len - 1 i += char_len - 1
@ -1226,14 +1226,14 @@ pub fn (u ustring) add(a ustring) ustring {
} }
mut j := 0 mut j := 0
for i := 0; i < u.s.len; i++ { for i := 0; i < u.s.len; i++ {
char_len := utf8_char_len(unsafe {u.s.str[i]}) char_len := utf8_char_len(unsafe { u.s.str[i] })
res.runes << j res.runes << j
i += char_len - 1 i += char_len - 1
j += char_len j += char_len
res.len++ res.len++
} }
for i := 0; i < a.s.len; i++ { for i := 0; i < a.s.len; i++ {
char_len := utf8_char_len(unsafe {a.s.str[i]}) char_len := utf8_char_len(unsafe { a.s.str[i] })
res.runes << j res.runes << j
i += char_len - 1 i += char_len - 1
j += char_len j += char_len
@ -1555,7 +1555,7 @@ pub fn (s string) bytes() []byte {
return [] return []
} }
mut buf := []byte{len: s.len} mut buf := []byte{len: s.len}
unsafe {C.memcpy(buf.data, s.str, s.len)} unsafe { C.memcpy(buf.data, s.str, s.len) }
return buf return buf
} }
@ -1669,7 +1669,7 @@ pub fn (s string) split_by_whitespace() []string {
} }
if is_space && is_in_word { if is_space && is_in_word {
word_end = i word_end = i
res << s[word_start .. word_end] res << s[word_start..word_end]
is_in_word = false is_in_word = false
word_end = 0 word_end = 0
word_start = 0 word_start = 0
@ -1678,7 +1678,7 @@ pub fn (s string) split_by_whitespace() []string {
} }
if is_in_word && word_start > 0 { if is_in_word && word_start > 0 {
// collect the remainder word at the end // collect the remainder word at the end
res << s[word_start .. s.len] res << s[word_start..s.len]
} }
return res return res
} }

2
vlib/flag/flag.v
View File

@ -383,7 +383,7 @@ pub fn (fs FlagParser) usage() string {
for f in fs.flags { for f in fs.flags {
mut onames := []string{} mut onames := []string{}
if f.abbr != 0 { if f.abbr != 0 {
onames << '-$f.abbr.str()' onames << '-$f.abbr.ascii_str()'
} }
if f.name != '' { if f.name != '' {
if !f.val_desc.contains('<bool>') { if !f.val_desc.contains('<bool>') {

4
vlib/strconv/number_to_base.v
View File

@ -19,7 +19,7 @@ pub fn format_int(n i64, radix int) string {
} }
mut res := '' mut res := ''
for n_copy != 0 { for n_copy != 0 {
res = base_digits[n_copy % radix].str() + res res = base_digits[n_copy % radix].ascii_str() + res
n_copy /= radix n_copy /= radix
} }
return '$sign$res' return '$sign$res'
@ -38,7 +38,7 @@ pub fn format_uint(n u64, radix int) string {
mut res := '' mut res := ''
uradix := u64(radix) uradix := u64(radix)
for n_copy != 0 { for n_copy != 0 {
res = base_digits[n_copy % uradix].str() + res res = base_digits[n_copy % uradix].ascii_str() + res
n_copy /= uradix n_copy /= uradix
} }
return res return res

5
vlib/v/checker/checker.v
View File

@ -1222,6 +1222,11 @@ pub fn (mut c Checker) call_method(mut call_expr ast.CallExpr) table.Type {
} }
// call_expr.generic_type = c.unwrap_generic(call_expr.generic_type) // call_expr.generic_type = c.unwrap_generic(call_expr.generic_type)
} }
/*
if left_type == table.byte_type && method_name == 'str' {
c.warn('byte str', call_expr.pos)
}
*/
// TODO: remove this for actual methods, use only for compiler magic // TODO: remove this for actual methods, use only for compiler magic
// FIXME: Argument count != 1 will break these // FIXME: Argument count != 1 will break these
if left_type_sym.kind == .array && method_name in array_builtin_methods { if left_type_sym.kind == .array && method_name in array_builtin_methods {

2
vlib/v/scanner/scanner.v
View File

@ -973,7 +973,7 @@ fn (mut s Scanner) text_scan() token.Token {
return s.end_of_file() return s.end_of_file()
} }
} }
s.error('invalid character `$c.str()`') s.error('invalid character `$c.ascii_str()`')
break break
} }
return s.end_of_file() return s.end_of_file()

2
vlib/v/util/errors.v
View File

@ -131,7 +131,7 @@ pub fn source_context(kind string, source string, column int, pos token.Position
mut pointerline := '' mut pointerline := ''
for bchar in sline[..start_column] { for bchar in sline[..start_column] {
x := if bchar.is_space() { bchar } else { ` ` } x := if bchar.is_space() { bchar } else { ` ` }
pointerline += x.str() pointerline += x.ascii_str()
} }
underline := if pos.len > 1 { '~'.repeat(end_column - start_column) } else { '^' } underline := if pos.len > 1 { '~'.repeat(end_column - start_column) } else { '^' }
pointerline += bold(color(kind, underline)) pointerline += bold(color(kind, underline))

4
vlib/v/util/quote.v
View File

@ -28,14 +28,14 @@ pub fn smart_quote(str string, raw bool) string {
} }
if pos + 1 < len { if pos + 1 < len {
unsafe { unsafe {
next = str.str[pos + 1].str() next = str.str[pos + 1].ascii_str()
} }
} }
mut current := str mut current := str
mut toadd := str mut toadd := str
if len > 1 { if len > 1 {
unsafe { unsafe {
current = str.str[pos].str() current = str.str[pos].ascii_str()
} }
toadd = current toadd = current
} }

18
vlib/v/vmod/parser.v
View File

@ -87,7 +87,7 @@ fn (mut s Scanner) create_string(q byte) string {
str += s.text[s.pos..s.pos + 1] str += s.text[s.pos..s.pos + 1]
s.pos += 2 s.pos += 2
} else { } else {
str += s.text[s.pos].str() str += s.text[s.pos].ascii_str()
s.pos++ s.pos++
} }
} }
@ -97,7 +97,7 @@ fn (mut s Scanner) create_string(q byte) string {
fn (mut s Scanner) create_ident() string { fn (mut s Scanner) create_ident() string {
mut text := '' mut text := ''
for is_name_alpha(s.text[s.pos]) { for is_name_alpha(s.text[s.pos]) {
text += s.text[s.pos].str() text += s.text[s.pos].ascii_str()
s.pos++ s.pos++
} }
return text return text
@ -138,13 +138,13 @@ fn (mut s Scanner) scan_all() {
continue continue
} }
match c { match c {
`{` { s.tokenize(.lcbr, c.str()) } `{` { s.tokenize(.lcbr, c.ascii_str()) }
`}` { s.tokenize(.rcbr, c.str()) } `}` { s.tokenize(.rcbr, c.ascii_str()) }
`[` { s.tokenize(.labr, c.str()) } `[` { s.tokenize(.labr, c.ascii_str()) }
`]` { s.tokenize(.rabr, c.str()) } `]` { s.tokenize(.rabr, c.ascii_str()) }
`:` { s.tokenize(.colon, c.str()) } `:` { s.tokenize(.colon, c.ascii_str()) }
`,` { s.tokenize(.comma, c.str()) } `,` { s.tokenize(.comma, c.ascii_str()) }
else { s.tokenize(.unknown, c.str()) } else { s.tokenize(.unknown, c.ascii_str()) }
} }
s.pos++ s.pos++
} }