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

scanner: minor cleanup in scanner.v (#14565)

master
yuyi 2022-05-31 16:52:47 +08:00 committed by GitHub
parent db34adaec8
commit 80cc88427b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
vlib/v/scanner/scanner.v
View File

@ -26,20 +26,19 @@ const (
[minify] [minify]
pub struct Scanner { pub struct Scanner {
pub mut: pub mut:
file_path string // '/path/to/file.v' file_path string // '/path/to/file.v'
file_base string // 'file.v' file_base string // 'file.v'
text string // the whole text of the file text string // the whole text of the file
pos int // current position in the file, first character is s.text[0] pos int // current position in the file, first character is s.text[0]
line_nr int // current line number line_nr int // current line number
last_nl_pos int = -1 // for calculating column last_nl_pos int = -1 // for calculating column
is_crlf bool // special check when computing columns is_crlf bool // special check when computing columns
is_inside_string bool // set to true in a string, *at the start* of an $var or ${expr} is_inside_string bool // set to true in a string, *at the start* of an $var or ${expr}
is_inter_start bool // for hacky string interpolation TODO simplify is_inter_start bool // for hacky string interpolation TODO simplify
is_inter_end bool is_inter_end bool
is_enclosed_inter bool is_enclosed_inter bool
line_comment string line_comment string
last_lt int = -1 // position of latest < last_lt int = -1 // position of latest <
// prev_tok TokenKind
is_started bool is_started bool
is_print_line_on_error bool is_print_line_on_error bool
is_print_colored_error bool is_print_colored_error bool
@ -240,15 +239,15 @@ fn (s Scanner) num_lit(start int, end int) string {
unsafe { unsafe {
txt := s.text.str txt := s.text.str
mut b := malloc_noscan(end - start + 1) // add a byte for the endstring 0 mut b := malloc_noscan(end - start + 1) // add a byte for the endstring 0
mut i1 := 0 mut i_no_sep := 0
for i := start; i < end; i++ { for i in start .. end {
if txt[i] != scanner.num_sep { if txt[i] != scanner.num_sep {
b[i1] = txt[i] b[i_no_sep] = txt[i]
i1++ i_no_sep++
} }
} }
b[i1] = 0 // C string compatibility b[i_no_sep] = 0 // C string compatibility
return b.vstring_with_len(i1) return b.vstring_with_len(i_no_sep)
} }
} }
@ -1053,7 +1052,6 @@ fn (mut s Scanner) text_scan() token.Token {
} }
return s.new_token(.comment, comment, comment.len + 2) return s.new_token(.comment, comment, comment.len + 2)
} }
// s.fgenln('// ${s.prev_tok.str()} "$s.line_comment"')
// Skip the comment (return the next token) // Skip the comment (return the next token)
continue continue
} else if nextc == `*` { // Multiline comments } else if nextc == `*` { // Multiline comments