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

builtin: document existing behaviour of .before() methods on strings

pull/10613/head
Delyan Angelov 2021-06-29 14:40:37 +03:00
parent d5ee60b4a1
commit 1b5d0ba8fd
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
1 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
vlib/builtin/string.v
View File

@ -244,7 +244,6 @@ fn (a string) clone_static() string {
// clone returns a copy of the V string `a`. // clone returns a copy of the V string `a`.
pub fn (a string) clone() string { pub fn (a string) clone() string {
if a.len == 0 { if a.len == 0 {
// TODO perf? an extra check in each clone() is not nice.
return '' return ''
} }
mut b := string{ mut b := string{
@ -1514,74 +1513,88 @@ pub fn (s &string) free() {
s.is_lit = -98761234 s.is_lit = -98761234
} }
// before returns the contents before `dot` in the string. // before returns the contents before `sub` in the string.
// Example: assert '23:34:45.234'.all_before('.') == '23:34:45' // If the substring is not found, it returns the full input string.
pub fn (s string) before(dot string) string { // Example: assert '23:34:45.234'.before('.') == '23:34:45'
pos := s.index_(dot) // Example: assert 'abcd'.before('.') == 'abcd'
// TODO: deprecate and remove either .before or .all_before
pub fn (s string) before(sub string) string {
pos := s.index_(sub)
if pos == -1 { if pos == -1 {
return s.clone() return s.clone()
} }
return s[..pos] return s[..pos]
} }
// all_before returns the contents before `dot` in the string. // all_before returns the contents before `sub` in the string.
// If the substring is not found, it returns the full input string.
// Example: assert '23:34:45.234'.all_before('.') == '23:34:45' // Example: assert '23:34:45.234'.all_before('.') == '23:34:45'
pub fn (s string) all_before(dot string) string { // Example: assert 'abcd'.all_before('.') == 'abcd'
pub fn (s string) all_before(sub string) string {
// TODO remove dup method // TODO remove dup method
pos := s.index_(dot) pos := s.index_(sub)
if pos == -1 { if pos == -1 {
return s.clone() return s.clone()
} }
return s[..pos] return s[..pos]
} }
// all_before_last returns the contents before the last occurence of `dot` in the string. // all_before_last returns the contents before the last occurence of `sub` in the string.
// If the substring is not found, it returns the full input string.
// Example: assert '23:34:45.234'.all_before_last(':') == '23:34' // Example: assert '23:34:45.234'.all_before_last(':') == '23:34'
pub fn (s string) all_before_last(dot string) string { // Example: assert 'abcd'.all_before_last('.') == 'abcd'
pos := s.last_index_(dot) pub fn (s string) all_before_last(sub string) string {
pos := s.last_index_(sub)
if pos == -1 { if pos == -1 {
return s.clone() return s.clone()
} }
return s[..pos] return s[..pos]
} }
// all_after returns the contents after `dot` in the string. // all_after returns the contents after `sub` in the string.
// If the substring is not found, it returns the full input string.
// Example: assert '23:34:45.234'.all_after('.') == '234' // Example: assert '23:34:45.234'.all_after('.') == '234'
pub fn (s string) all_after(dot string) string { // Example: assert 'abcd'.all_after('z') == ''
pos := s.index_(dot) pub fn (s string) all_after(sub string) string {
pos := s.index_(sub)
if pos == -1 { if pos == -1 {
return s.clone() return s.clone()
} }
return s[pos + dot.len..] return s[pos + sub.len..]
} }
// all_after_last returns the contents after the last occurence of `dot` in the string. // all_after_last returns the contents after the last occurence of `sub` in the string.
// If the substring is not found, it returns the full string.
// Example: assert '23:34:45.234'.all_after_last(':') == '45.234' // Example: assert '23:34:45.234'.all_after_last(':') == '45.234'
pub fn (s string) all_after_last(dot string) string { // Example: assert 'abcd'.all_after_last('z') == 'abcd'
pos := s.last_index_(dot) pub fn (s string) all_after_last(sub string) string {
pos := s.last_index_(sub)
if pos == -1 { if pos == -1 {
return s.clone() return s.clone()
} }
return s[pos + dot.len..] return s[pos + sub.len..]
} }
// after returns the contents after the last occurence of `dot` in the string. // after returns the contents after the last occurence of `sub` in the string.
// If the substring is not found, it returns an empty string.
// Example: assert '23:34:45.234'.after(':') == '45.234' // Example: assert '23:34:45.234'.after(':') == '45.234'
pub fn (s string) after(dot string) string { // Example: assert 'abcd'.after('z') == 'abcd'
return s.all_after_last(dot) // TODO: deprecate either .all_after_last or .after
pub fn (s string) after(sub string) string {
return s.all_after_last(sub)
} }
// after_char returns the contents after the first occurence of `dot` character in the string. // after_char returns the contents after the first occurence of `sub` character in the string.
// Example: assert '23:34:45.234'.after_char(`:`) == '34:45.234' // Example: assert '23:34:45.234'.after_char(`:`) == '34:45.234'
pub fn (s string) after_char(dot byte) string { pub fn (s string) after_char(sub byte) string {
mut pos := 0 mut pos := -1
for i, c in s { for i, c in s {
if c == dot { if c == sub {
pos = i pos = i
break break
} }
} }
if pos == 0 { if pos == -1 {
return s.clone() return s.clone()
} }
return s[pos + 1..] return s[pos + 1..]