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

string: update check if a char is a space

pull/3800/head
Alexey 2020-02-20 22:14:54 +03:00 committed by GitHub
parent e4de1e1e89
commit c85ccad0a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vlib/builtin/string.v
View File

@ -815,9 +815,10 @@ pub fn (a []string) to_c() voidptr {
}
*/
pub fn (c byte) is_space() bool {
return c in [` `, `\n`, `\t`, `\v`, `\f`, `\r`]
// 0x0085 is NEXT LINE (NEL)
// 0x00a0 is NO-BREAK SPACE
return c in [` `, `\n`, `\t`, `\v`, `\f`, `\r`, 0x85, 0xa0]
}
pub fn (s string) trim_space() string {
@ -1223,10 +1224,9 @@ pub fn (s string) limit(max int) string {
return u.substr(0, max)
}
// TODO is_white_space()
[deprecated]
pub fn (c byte) is_white() bool {
i := int(c)
return i == 10 || i == 32 || i == 9 || i == 13 || c == `\r`
panic('Use `string.is_space` instead of `string.is_white')
}
pub fn (s string) hash() int {

2
vlib/compiler/scanner.v
View File

@ -264,7 +264,7 @@ fn (s mut Scanner) ident_number() string {
fn (s mut Scanner) skip_whitespace() {
// if s.is_vh { println('vh') return }
for s.pos < s.text.len && s.text[s.pos].is_white() {
for s.pos < s.text.len && s.text[s.pos].is_space() {
if is_nl(s.text[s.pos]) && s.is_vh {
return
}

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

@ -258,7 +258,7 @@ fn (s mut Scanner) ident_number() string {
fn (s mut Scanner) skip_whitespace() {
// if s.is_vh { println('vh') return }
for s.pos < s.text.len && s.text[s.pos].is_white() {
for s.pos < s.text.len && s.text[s.pos].is_space() {
if is_nl(s.text[s.pos]) && s.is_vh {
return
}