mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-14 23:12:33 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

compiler: use token.pos instead of token.col, calculate col when needed

Browse source
This commit is contained in:
joe-conigliaro 2019-11-24 03:31:28 +11:00 • committed by Alexander Medvednikov
parent f42be0622e
commit 666509623e
3 changed files with 15 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

5
vlib/compiler/parser.v
View file

@ -188,7 +188,7 @@ fn (p mut Parser) scan_tokens() {
tok: res.tok
lit: res.lit
line_nr: p.scanner.line_nr
col: p.scanner.pos - p.scanner.last_nl_pos
pos: p.scanner.pos
}
if res.tok == .eof {
break
@ -2384,7 +2384,8 @@ fn (p mut Parser) array_init() string {
if is_integer && p.tok == .rsbr && p.peek() == .name &&
p.cur_tok().line_nr == p.peek_token().line_nr {
// there is no space between `[10]` and `byte`
if p.cur_tok().col + p.peek_token().lit.len == p.peek_token().col {
// if p.cur_tok().col + p.peek_token().lit.len == p.peek_token().col {
if p.cur_tok().pos + p.peek_token().lit.len == p.peek_token().pos {
p.check(.rsbr)
array_elem_typ := p.get_type()
if !p.table.known_type(array_elem_typ) {