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

scanner: add check for bin/oct/hex with wrong digits

pull/3840/head
SleepyRoy 2020-02-25 18:11:12 +08:00 committed by GitHub
parent f859c7f93e
commit b17e49ad25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 72 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
vlib/compiler/scanner.v
View File

@ -135,6 +135,8 @@ len:i1}
}
fn (s mut Scanner) ident_bin_number() string {
mut has_wrong_digit := false
mut first_wrong_digit := `\0`
start_pos := s.pos
s.pos += 2 // skip '0b'
for {
@ -143,19 +145,30 @@ fn (s mut Scanner) ident_bin_number() string {
}
c := s.text[s.pos]
if !c.is_bin_digit() && c != num_sep {
if !c.is_digit() && !c.is_letter() {
break
}
else if !has_wrong_digit {
has_wrong_digit = true
first_wrong_digit = c
}
}
s.pos++
}
if start_pos + 2 == s.pos {
s.error('number part of this binary is not provided')
}
else if has_wrong_digit {
s.error('this binary number has unsuitable digit `${first_wrong_digit.str()}`')
}
number := filter_num_sep(s.text.str, start_pos, s.pos)
s.pos--
return number
}
fn (s mut Scanner) ident_hex_number() string {
mut has_wrong_digit := false
mut first_wrong_digit := `\0`
start_pos := s.pos
s.pos += 2 // skip '0x'
for {
@ -164,19 +177,30 @@ fn (s mut Scanner) ident_hex_number() string {
}
c := s.text[s.pos]
if !c.is_hex_digit() && c != num_sep {
if !c.is_letter() {
break
}
else if !has_wrong_digit {
has_wrong_digit = true
first_wrong_digit = c
}
}
s.pos++
}
if start_pos + 2 == s.pos {
s.error('number part of this hexadecimal is not provided')
}
else if has_wrong_digit {
s.error('this hexadecimal number has unsuitable digit `${first_wrong_digit.str()}`')
}
number := filter_num_sep(s.text.str, start_pos, s.pos)
s.pos--
return number
}
fn (s mut Scanner) ident_oct_number() string {
mut has_wrong_digit := false
mut first_wrong_digit := `\0`
start_pos := s.pos
s.pos += 2 // skip '0o'
for {
@ -185,13 +209,22 @@ fn (s mut Scanner) ident_oct_number() string {
}
c := s.text[s.pos]
if !c.is_oct_digit() && c != num_sep {
if !c.is_digit() && !c.is_letter() {
break
}
else if !has_wrong_digit {
has_wrong_digit = true
first_wrong_digit = c
}
}
s.pos++
}
if start_pos + 2 == s.pos {
s.error('number part of this octal is not provided')
}
else if has_wrong_digit {
s.error('this octal number has unsuitable digit `${first_wrong_digit.str()}`')
}
number := filter_num_sep(s.text.str, start_pos, s.pos)
s.pos--
return number

33
vlib/v/scanner/scanner.v
View File

@ -131,6 +131,8 @@ fn filter_num_sep(txt byteptr, start int, end int) string {
}
fn (s mut Scanner) ident_bin_number() string {
mut has_wrong_digit := false
mut first_wrong_digit := `\0`
start_pos := s.pos
s.pos += 2 // skip '0b'
for {
@ -139,19 +141,30 @@ fn (s mut Scanner) ident_bin_number() string {
}
c := s.text[s.pos]
if !c.is_bin_digit() && c != num_sep {
if !c.is_digit() && !c.is_letter() {
break
}
else if !has_wrong_digit {
has_wrong_digit = true
first_wrong_digit = c
}
}
s.pos++
}
if start_pos + 2 == s.pos {
s.error('number part of this binary is not provided')
}
else if has_wrong_digit {
s.error('this binary number has unsuitable digit `${first_wrong_digit.str()}`')
}
number := filter_num_sep(s.text.str, start_pos, s.pos)
s.pos--
return number
}
fn (s mut Scanner) ident_hex_number() string {
mut has_wrong_digit := false
mut first_wrong_digit := `\0`
start_pos := s.pos
s.pos += 2 // skip '0x'
for {
@ -160,19 +173,30 @@ fn (s mut Scanner) ident_hex_number() string {
}
c := s.text[s.pos]
if !c.is_hex_digit() && c != num_sep {
if !c.is_letter() {
break
}
else if !has_wrong_digit {
has_wrong_digit = true
first_wrong_digit = c
}
}
s.pos++
}
if start_pos + 2 == s.pos {
s.error('number part of this hexadecimal is not provided')
}
else if has_wrong_digit {
s.error('this hexadecimal number has unsuitable digit `${first_wrong_digit.str()}`')
}
number := filter_num_sep(s.text.str, start_pos, s.pos)
s.pos--
return number
}
fn (s mut Scanner) ident_oct_number() string {
mut has_wrong_digit := false
mut first_wrong_digit := `\0`
start_pos := s.pos
s.pos += 2 // skip '0o'
for {
@ -181,13 +205,22 @@ fn (s mut Scanner) ident_oct_number() string {
}
c := s.text[s.pos]
if !c.is_oct_digit() && c != num_sep {
if !c.is_digit() && !c.is_letter() {
break
}
else if !has_wrong_digit {
has_wrong_digit = true
first_wrong_digit = c
}
}
s.pos++
}
if start_pos + 2 == s.pos {
s.error('number part of this octal is not provided')
}
else if has_wrong_digit {
s.error('this octal number has unsuitable digit `${first_wrong_digit.str()}`')
}
number := filter_num_sep(s.text.str, start_pos, s.pos)
s.pos--
return number