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

scanner: more checks for `_` as num_sep (#5992)

pull/6002/head
Swastik Baranwal 2020-07-28 11:39:19 +05:30 committed by GitHub
parent 5d49034c31
commit 8b66816bdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vlib/builtin/int_test.v
View File

@ -148,21 +148,18 @@ fn test_num_separator() {
// int // int
assert 100_000_0 == 1000000 assert 100_000_0 == 1000000
assert -2_23_4_6 == -22346 assert -2_23_4_6 == -22346
assert 230_ == 230
// bin // bin
assert 0b0_11 == 3 assert 0b0_11 == 3
assert -0b0_100 == -4 assert -0b0_100 == -4
assert 0b010_ == 2
// oct // oct
assert 0o1_73 == 123 assert 0o1_73 == 123
assert -0o17_5 == -125 assert -0o17_5 == -125
assert -0o175_ == -125 assert -0o175 == -125
// hex // hex
assert 0xFF == 255 assert 0xFF == 255
assert 0xFF_ == 255
assert 0xF_F == 255 assert 0xF_F == 255
// f32 or f64 // f32 or f64

30
vlib/v/scanner/scanner.v
View File

@ -338,6 +338,9 @@ fn (mut s Scanner) ident_bin_number() string {
} }
for s.pos < s.text.len { for s.pos < s.text.len {
c := s.text[s.pos] c := s.text[s.pos]
if c == num_sep && s.text[s.pos + 1] == num_sep {
s.error('cannot use `_` consecutively')
}
if !c.is_bin_digit() && c != num_sep { if !c.is_bin_digit() && c != num_sep {
if (!c.is_digit() && !c.is_letter()) || s.is_inside_string { if (!c.is_digit() && !c.is_letter()) || s.is_inside_string {
break break
@ -349,7 +352,10 @@ fn (mut s Scanner) ident_bin_number() string {
} }
s.pos++ s.pos++
} }
if start_pos + 2 == s.pos { if s.text[s.pos - 1] == num_sep {
s.error('cannot use `_` at the end of a numeric literal')
}
else if start_pos + 2 == s.pos {
s.pos-- // adjust error position s.pos-- // adjust error position
s.error('number part of this binary is not provided') s.error('number part of this binary is not provided')
} else if has_wrong_digit { } else if has_wrong_digit {
@ -372,6 +378,9 @@ fn (mut s Scanner) ident_hex_number() string {
} }
for s.pos < s.text.len { for s.pos < s.text.len {
c := s.text[s.pos] c := s.text[s.pos]
if c == num_sep && s.text[s.pos + 1] == num_sep {
s.error('cannot use `_` consecutively')
}
if !c.is_hex_digit() && c != num_sep { if !c.is_hex_digit() && c != num_sep {
if !c.is_letter() || s.is_inside_string { if !c.is_letter() || s.is_inside_string {
break break
@ -383,7 +392,10 @@ fn (mut s Scanner) ident_hex_number() string {
} }
s.pos++ s.pos++
} }
if start_pos + 2 == s.pos { if s.text[s.pos - 1] == num_sep {
s.error('cannot use `_` at the end of a numeric literal')
}
else if start_pos + 2 == s.pos {
s.pos-- // adjust error position s.pos-- // adjust error position
s.error('number part of this hexadecimal is not provided') s.error('number part of this hexadecimal is not provided')
} else if has_wrong_digit { } else if has_wrong_digit {
@ -406,6 +418,9 @@ fn (mut s Scanner) ident_oct_number() string {
} }
for s.pos < s.text.len { for s.pos < s.text.len {
c := s.text[s.pos] c := s.text[s.pos]
if c == num_sep && s.text[s.pos + 1] == num_sep {
s.error('cannot use `_` consecutively')
}
if !c.is_oct_digit() && c != num_sep { if !c.is_oct_digit() && c != num_sep {
if (!c.is_digit() && !c.is_letter()) || s.is_inside_string { if (!c.is_digit() && !c.is_letter()) || s.is_inside_string {
break break
@ -417,7 +432,10 @@ fn (mut s Scanner) ident_oct_number() string {
} }
s.pos++ s.pos++
} }
if start_pos + 2 == s.pos { if s.text[s.pos - 1] == num_sep {
s.error('cannot use `_` at the end of a numeric literal')
}
else if start_pos + 2 == s.pos {
s.pos-- // adjust error position s.pos-- // adjust error position
s.error('number part of this octal is not provided') s.error('number part of this octal is not provided')
} else if has_wrong_digit { } else if has_wrong_digit {
@ -437,6 +455,9 @@ fn (mut s Scanner) ident_dec_number() string {
// scan integer part // scan integer part
for s.pos < s.text.len { for s.pos < s.text.len {
c := s.text[s.pos] c := s.text[s.pos]
if c == num_sep && s.text[s.pos + 1] == num_sep {
s.error('cannot use `_` consecutively')
}
if !c.is_digit() && c != num_sep { if !c.is_digit() && c != num_sep {
if !c.is_letter() || c in [`e`, `E`] || s.is_inside_string { if !c.is_letter() || c in [`e`, `E`] || s.is_inside_string {
break break
@ -448,6 +469,9 @@ fn (mut s Scanner) ident_dec_number() string {
} }
s.pos++ s.pos++
} }
if s.text[s.pos - 1] == num_sep {
s.error('cannot use `_` at the end of a numeric literal')
}
mut call_method := false // true for, e.g., 5.str(), 5.5.str(), 5e5.str() mut call_method := false // true for, e.g., 5.str(), 5.5.str(), 5e5.str()
mut is_range := false // true for, e.g., 5..10 mut is_range := false // true for, e.g., 5..10
mut is_float_without_fraction := false // true for, e.g. 5. mut is_float_without_fraction := false // true for, e.g. 5.