diff options
Diffstat (limited to 'conf/parser.go')
| -rw-r--r-- | conf/parser.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/conf/parser.go b/conf/parser.go index cc85054..3d584f6 100644 --- a/conf/parser.go +++ b/conf/parser.go @@ -59,10 +59,12 @@ func (p *parser) advanceOneToken(place string) { p.last = p.cur p.cur, err = p.s.Scan() - if err != nil { - fmt.Fprintf(os.Stderr, "error when parsing %s. Scanner returned an error %v.\n", place, err) - os.Exit(1) + for err == nil { + fmt.Fprintf(os.Stderr, "tokentype: %v, token: %q offset: %d, line: %d\n", p.cur.Type, p.cur.Lit, p.cur.Offset, p.cur.LineNr) + p.last = p.cur + p.cur, err = p.s.Scan() } + fmt.Fprintf(os.Stderr, "Error: tokentype: %v, token: %q, err: %v\n", p.cur.Type, p.cur.Lit, err) } func (p *parser) module(firstname string) { @@ -75,7 +77,7 @@ func (p *parser) module(firstname string) { } p.advanceOneToken("module") - if p.cur.Type != ObjectDelimiter { + if p.cur.Type != ObjectOpen { fmt.Fprintf(os.Stderr, "error when parsing module. We were expecting an opening bracket but got %q at line %d offset %d.\n", p.cur.Lit, p.cur.LineNr, p.cur.Offset) } @@ -110,7 +112,6 @@ func (p *parser) object() { break } } - } func (p *parser) keyvalue() bool { @@ -138,7 +139,7 @@ func (p *parser) keyvalue() bool { } fmt.Fprintf(os.Stderr, "peeked %q (type %d) at line %d offset %d.\n", tok.Lit, tok.Type, tok.LineNr, tok.Offset) - if tok.Type == ObjectDelimiter { + if tok.Type == ObjectClose { p.advanceOneToken("keyvaluelast") return false } |