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

parser: better syntax error for unexpected tokens

pull/2927/head
Alexander Medvednikov 2019-11-29 17:06:42 +03:00
parent 11aaee685a
commit 71378b8041
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vlib/compiler/parser.v
View File

@ -847,8 +847,8 @@ fn (p mut Parser) check_space(expected TokenKind) {
fn (p mut Parser) check(expected TokenKind) {
if p.tok != expected {
println('check()')
s := 'expected `${expected.str()}` but got `${p.strtok()}`'
//println('check()')
s := 'syntax error: unexpected `${p.strtok()}`, expecting `${expected.str()}`'
p.next()
println('next token = `${p.strtok()}`')
if p.pref.is_debug {
@ -2556,7 +2556,7 @@ fn (p mut Parser) array_init() string {
p.check(.rsbr)
// type after `]`? (e.g. "[]string")
exp_array := p.expected_type.starts_with('array_')
if p.tok != .name && i == 0 && !exp_array {
if p.tok != .name && p.tok != .lsbr && i == 0 && !exp_array {
p.error('specify array type: `[]typ` instead of `[]`')
}
if p.tok == .name && i == 0 &&