go/hcl
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hcl/parser: scan errors should come through as well

Browse Source
This commit is contained in:
Mitchell Hashimoto 2015-11-06 23:42:45 -08:00
parent 98b069abb0
commit 5aaa3e75b9
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hcl/parser/parser.go
View File

@ -44,8 +44,15 @@ var errEofToken = errors.New("EOF token found")
// Parse returns the fully parsed source and returns the abstract syntax tree. // Parse returns the fully parsed source and returns the abstract syntax tree.
func (p *Parser) Parse() (*ast.File, error) { func (p *Parser) Parse() (*ast.File, error) {
f := &ast.File{} f := &ast.File{}
var err error var err, scerr error
p.sc.Error = func(pos token.Pos, msg string) {
scerr = fmt.Errorf("%s: %s", pos, msg)
}
f.Node, err = p.objectList() f.Node, err = p.objectList()
if scerr != nil {
return nil, scerr
}
if err != nil { if err != nil {
return nil, err return nil, err
} }