v: tag more low level functions with `[direct_array_access]`

pull/10020/head
Delyan Angelov 2021-05-06 00:31:25 +03:00
parent 3405f517a4
commit 84f9789e72
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
4 changed files with 25 additions and 12 deletions

View File

@ -9,6 +9,7 @@ __global (
) )
// isnil returns true if an object is nil (only for C objects). // isnil returns true if an object is nil (only for C objects).
[inline]
pub fn isnil(v voidptr) bool { pub fn isnil(v voidptr) bool {
return v == 0 return v == 0
} }

View File

@ -274,6 +274,7 @@ pub fn (s string) replace_once(rep string, with string) string {
} }
// replace replaces all occurences of `rep` with the string passed in `with`. // replace replaces all occurences of `rep` with the string passed in `with`.
[direct_array_access]
pub fn (s string) replace(rep string, with string) string { pub fn (s string) replace(rep string, with string) string {
if s.len == 0 || rep.len == 0 || rep.len > s.len { if s.len == 0 || rep.len == 0 || rep.len > s.len {
return s.clone() return s.clone()
@ -355,6 +356,7 @@ fn (mut a []RepIndex) sort2() {
// replace_each replaces all occurences of the string pairs given in `vals`. // replace_each replaces all occurences of the string pairs given in `vals`.
// Example: assert 'ABCD'.replace_each(['B','C/','C','D','D','C']) == 'AC/DC' // Example: assert 'ABCD'.replace_each(['B','C/','C','D','D','C']) == 'AC/DC'
[direct_array_access]
pub fn (s string) replace_each(vals []string) string { pub fn (s string) replace_each(vals []string) string {
if s.len == 0 || vals.len == 0 { if s.len == 0 || vals.len == 0 {
return s.clone() return s.clone()
@ -575,6 +577,7 @@ pub fn (s string) split(delim string) []string {
// It returns the first Nth parts. When N=0, return all the splits. // It returns the first Nth parts. When N=0, return all the splits.
// The last returned element has the remainder of the string, even if // The last returned element has the remainder of the string, even if
// the remainder contains more `delim` substrings. // the remainder contains more `delim` substrings.
[direct_array_access]
pub fn (s string) split_nth(delim string, nth int) []string { pub fn (s string) split_nth(delim string, nth int) []string {
mut res := []string{} mut res := []string{}
mut i := 0 mut i := 0
@ -653,8 +656,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] } == 10
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] == 13 && s.str[i + 1] == 10 }
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 {
@ -978,6 +981,7 @@ pub fn (s string) to_lower() string {
// is_lower returns `true` if all characters in the string is lowercase. // is_lower returns `true` if all characters in the string is lowercase.
// Example: assert 'hello developer'.is_lower() == true // Example: assert 'hello developer'.is_lower() == true
[direct_array_access]
pub fn (s string) is_lower() bool { pub fn (s string) is_lower() bool {
for i in 0 .. s.len { for i in 0 .. s.len {
if s[i] >= `A` && s[i] <= `Z` { if s[i] >= `A` && s[i] <= `Z` {
@ -1006,6 +1010,7 @@ pub fn (s string) to_upper() string {
// is_upper returns `true` if all characters in the string is uppercase. // is_upper returns `true` if all characters in the string is uppercase.
// Example: assert 'HELLO V'.is_upper() == true // Example: assert 'HELLO V'.is_upper() == true
[direct_array_access]
pub fn (s string) is_upper() bool { pub fn (s string) is_upper() bool {
for i in 0 .. s.len { for i in 0 .. s.len {
if s[i] >= `a` && s[i] <= `z` { if s[i] >= `a` && s[i] <= `z` {
@ -1017,6 +1022,7 @@ pub fn (s string) is_upper() bool {
// capitalize returns the string with the first character capitalized. // capitalize returns the string with the first character capitalized.
// Example: assert 'hello'.capitalize() == 'Hello' // Example: assert 'hello'.capitalize() == 'Hello'
[direct_array_access]
pub fn (s string) capitalize() string { pub fn (s string) capitalize() string {
if s.len == 0 { if s.len == 0 {
return '' return ''
@ -1034,6 +1040,7 @@ pub fn (s string) capitalize() string {
// is_capital returns `true` if the first character in the string is a capital letter. // is_capital returns `true` if the first character in the string is a capital letter.
// Example: assert 'Hello'.is_capital() == true // Example: assert 'Hello'.is_capital() == true
[direct_array_access]
pub fn (s string) is_capital() bool { pub fn (s string) is_capital() bool {
if s.len == 0 || !(s[0] >= `A` && s[0] <= `Z`) { if s.len == 0 || !(s[0] >= `A` && s[0] <= `Z`) {
return false return false
@ -1104,6 +1111,7 @@ pub fn (s string) trim_space() string {
// trim strips any of the characters given in `cutset` from the start and end of the string. // trim strips any of the characters given in `cutset` from the start and end of the string.
// Example: assert ' ffHello V ffff'.trim(' f') == 'Hello V' // Example: assert ' ffHello V ffff'.trim(' f') == 'Hello V'
[direct_array_access]
pub fn (s string) trim(cutset string) string { pub fn (s string) trim(cutset string) string {
if s.len < 1 || cutset.len < 1 { if s.len < 1 || cutset.len < 1 {
return s.clone() return s.clone()
@ -1136,6 +1144,7 @@ pub fn (s string) trim(cutset string) string {
// trim_left strips any of the characters given in `cutset` from the left of the string. // trim_left strips any of the characters given in `cutset` from the left of the string.
// Example: assert 'd Hello V developer'.trim_left(' d') == 'Hello V developer' // Example: assert 'd Hello V developer'.trim_left(' d') == 'Hello V developer'
[direct_array_access]
pub fn (s string) trim_left(cutset string) string { pub fn (s string) trim_left(cutset string) string {
if s.len < 1 || cutset.len < 1 { if s.len < 1 || cutset.len < 1 {
return s.clone() return s.clone()
@ -1159,6 +1168,7 @@ pub fn (s string) trim_left(cutset string) string {
// trim_right strips any of the characters given in `cutset` from the right of the string. // trim_right strips any of the characters given in `cutset` from the right of the string.
// Example: assert ' Hello V d'.trim_right(' d') == ' Hello V' // Example: assert ' Hello V d'.trim_right(' d') == ' Hello V'
[direct_array_access]
pub fn (s string) trim_right(cutset string) string { pub fn (s string) trim_right(cutset string) string {
if s.len < 1 || cutset.len < 1 { if s.len < 1 || cutset.len < 1 {
return s.clone() return s.clone()
@ -1731,7 +1741,7 @@ pub fn (s string) fields() []string {
mut is_in_word := false mut is_in_word := false
mut is_space := false mut is_space := false
for i, c in s { for i, c in s {
is_space = c in [` `, `\t`, `\n`] is_space = c in [32, 9, 10]
if !is_space { if !is_space {
word_len++ word_len++
} }
@ -1773,6 +1783,7 @@ pub fn (s string) strip_margin() string {
} }
// strip_margin_custom does the same as `strip_margin` but will use `del` as delimiter instead of `|` // strip_margin_custom does the same as `strip_margin` but will use `del` as delimiter instead of `|`
[direct_array_access]
pub fn (s string) strip_margin_custom(del byte) string { pub fn (s string) strip_margin_custom(del byte) string {
mut sep := del mut sep := del
if sep.is_space() { if sep.is_space() {
@ -1785,13 +1796,13 @@ pub fn (s string) strip_margin_custom(del byte) string {
mut ret := unsafe { malloc(s.len + 1) } mut ret := unsafe { malloc(s.len + 1) }
mut count := 0 mut count := 0
for i := 0; i < s.len; i++ { for i := 0; i < s.len; i++ {
if s[i] in [`\n`, `\r`] { if s[i] in [10, 13] {
unsafe { unsafe {
ret[count] = s[i] ret[count] = s[i]
} }
count++ count++
// CRLF // CRLF
if s[i] == `\r` && i < s.len - 1 && s[i + 1] == `\n` { if s[i] == 13 && i < s.len - 1 && s[i + 1] == 10 {
unsafe { unsafe {
ret[count] = s[i + 1] ret[count] = s[i + 1]
} }

View File

@ -290,6 +290,7 @@ fn (mut s Scanner) ident_bin_number() string {
return number return number
} }
[direct_array_access]
fn (mut s Scanner) ident_hex_number() string { fn (mut s Scanner) ident_hex_number() string {
mut has_wrong_digit := false mut has_wrong_digit := false
mut first_wrong_digit_pos := 0 mut first_wrong_digit_pos := 0
@ -373,6 +374,7 @@ fn (mut s Scanner) ident_oct_number() string {
return number return number
} }
[direct_array_access]
fn (mut s Scanner) ident_dec_number() string { fn (mut s Scanner) ident_dec_number() string {
mut has_wrong_digit := false mut has_wrong_digit := false
mut first_wrong_digit_pos := 0 mut first_wrong_digit_pos := 0
@ -572,6 +574,7 @@ pub fn (mut s Scanner) scan() token.Token {
return s.buffer_scan() return s.buffer_scan()
} }
[direct_array_access]
pub fn (mut s Scanner) buffer_scan() token.Token { pub fn (mut s Scanner) buffer_scan() token.Token {
for { for {
cidx := s.tidx cidx := s.tidx
@ -589,7 +592,7 @@ pub fn (mut s Scanner) buffer_scan() token.Token {
return s.new_eof_token() return s.new_eof_token()
} }
[inline] [direct_array_access; inline]
pub fn (s &Scanner) peek_token(n int) token.Token { pub fn (s &Scanner) peek_token(n int) token.Token {
idx := s.tidx + n idx := s.tidx + n
if idx >= s.all_tokens.len { if idx >= s.all_tokens.len {
@ -608,6 +611,7 @@ fn (s &Scanner) look_ahead(n int) byte {
} }
} }
[direct_array_access]
fn (mut s Scanner) text_scan() token.Token { fn (mut s Scanner) text_scan() token.Token {
// The for loop here is so that instead of doing // The for loop here is so that instead of doing
// `return s.scan()` (which will use a new call stack frame), // `return s.scan()` (which will use a new call stack frame),

View File

@ -6,6 +6,7 @@ const (
invalid_escapes = ['(', '{', '$', '`', '.'] invalid_escapes = ['(', '{', '$', '`', '.']
) )
[direct_array_access]
pub fn smart_quote(str string, raw bool) string { pub fn smart_quote(str string, raw bool) string {
len := str.len len := str.len
if len == 0 { if len == 0 {
@ -27,16 +28,12 @@ pub fn smart_quote(str string, raw bool) string {
break break
} }
if pos + 1 < len { if pos + 1 < len {
unsafe { next = str[pos + 1].ascii_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 { current = str[pos].ascii_str()
current = str.str[pos].ascii_str()
}
toadd = current toadd = current
} }
// double quote // double quote