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

builtin: reduce memory allocations for s.trim, s.trim_left and s.trim_right

Browse Source
This commit is contained in:
Delyan Angelov 2021-03-18 19:52:33 +02:00
parent 09802707b1
commit d4e16b6ddd
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
vlib/builtin/string.v
View File

@ -1066,19 +1066,24 @@ pub fn (s string) trim(cutset string) string {
if s.len < 1 || cutset.len < 1 { if s.len < 1 || cutset.len < 1 {
return s return s
} }
cs_arr := cutset.bytes()
mut pos_left := 0 mut pos_left := 0
mut pos_right := s.len - 1 mut pos_right := s.len - 1
mut cs_match := true mut cs_match := true
for pos_left <= s.len && pos_right >= -1 && cs_match { for pos_left <= s.len && pos_right >= -1 && cs_match {
cs_match = false cs_match = false
if s[pos_left] in cs_arr { for cs in cutset {
pos_left++ if s[pos_left] == cs {
cs_match = true pos_left++
cs_match = true
break
}
} }
if s[pos_right] in cs_arr { for cs in cutset {
pos_right-- if s[pos_right] == cs {
cs_match = true pos_right--
cs_match = true
break
}
} }
if pos_left > pos_right { if pos_left > pos_right {
return '' return ''
@ -1093,9 +1098,18 @@ 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 return s
} }
cs_arr := cutset.bytes()
mut pos := 0 mut pos := 0
for pos < s.len && s[pos] in cs_arr { for pos < s.len {
mut found := false
for cs in cutset {
if s[pos] == cs {
found = true
break
}
}
if !found {
break
}
pos++ pos++
} }
return s[pos..] return s[pos..]
@ -1107,9 +1121,17 @@ 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 return s
} }
cs_arr := cutset.bytes()
mut pos := s.len - 1 mut pos := s.len - 1
for pos >= 0 && s[pos] in cs_arr { for pos >= 0 {
mut found := false
for cs in cutset {
if s[pos] == cs {
found = true
}
}
if !found {
break
}
pos-- pos--
} }
return if pos < 0 { '' } else { s[..pos + 1] } return if pos < 0 { '' } else { s[..pos + 1] }