mirror of
https://github.com/vlang/v.git
synced 2023-08-10 21:13:21 +03:00
string: fix trim_right
This commit is contained in:
parent
d984f2ccec
commit
60bf668281
@ -560,14 +560,12 @@ pub fn (s string) trim_space() string {
|
|||||||
}
|
}
|
||||||
mut end := s.len - 1
|
mut end := s.len - 1
|
||||||
for end >= 0 && is_space(s[end]) {
|
for end >= 0 && is_space(s[end]) {
|
||||||
// C.printf('end=%d c=%d %c\n', end, res.str[end])
|
|
||||||
end--
|
end--
|
||||||
}
|
}
|
||||||
if i > end + 1 {
|
if i > end + 1 {
|
||||||
return s
|
return s
|
||||||
}
|
}
|
||||||
res := s.substr(i, end + 1)
|
res := s.substr(i, end + 1)
|
||||||
// println('after SPACE "$res"')
|
|
||||||
return res
|
return res
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -600,11 +598,14 @@ pub fn (s string) trim_left(cutset string) string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn (s string) trim_right(cutset string) string {
|
pub fn (s string) trim_right(cutset string) string {
|
||||||
pos := s.last_index(cutset)
|
if s.len == 0 {
|
||||||
if pos == -1 {
|
|
||||||
return s
|
return s
|
||||||
}
|
}
|
||||||
return s.left(pos)
|
mut pos := s.len - 1
|
||||||
|
for s[pos] == cutset[0] {
|
||||||
|
pos--
|
||||||
|
}
|
||||||
|
return s.left(pos+1)
|
||||||
}
|
}
|
||||||
|
|
||||||
// fn print_cur_thread() {
|
// fn print_cur_thread() {
|
||||||
|
@ -294,6 +294,13 @@ fn test_trim_left() {
|
|||||||
assert s.trim_left(' ') == 'module main'
|
assert s.trim_left(' ') == 'module main'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn test_trim_right() {
|
||||||
|
mut s := 'module main'
|
||||||
|
assert s.trim_right(' ') == 'module main'
|
||||||
|
s = 'module main '
|
||||||
|
assert s.trim_right(' ') == 'module main'
|
||||||
|
}
|
||||||
|
|
||||||
fn test_all_after() {
|
fn test_all_after() {
|
||||||
s := 'fn hello'
|
s := 'fn hello'
|
||||||
q := s.all_after('fn ')
|
q := s.all_after('fn ')
|
||||||
|
Loading…
Reference in New Issue
Block a user