basic: cleanup using parser.NewError()
Signed-off-by: Alejandro Mery <amery@jpi.io>
This commit is contained in:
+3
-12
@@ -4,28 +4,19 @@ import (
|
||||
"errors"
|
||||
|
||||
"asciigoat.org/core/lexer"
|
||||
"asciigoat.org/ini/parser"
|
||||
)
|
||||
|
||||
var (
|
||||
errInvalidToken = errors.New("invalid token")
|
||||
)
|
||||
|
||||
func newError(pos lexer.Position, content, hint string, err error) *lexer.Error {
|
||||
return &lexer.Error{
|
||||
Line: pos.Line,
|
||||
Column: pos.Column,
|
||||
Content: content,
|
||||
Hint: hint,
|
||||
Err: err,
|
||||
}
|
||||
}
|
||||
|
||||
func newErrInvalidToken(t *token) *lexer.Error {
|
||||
return newError(t.pos, t.value, "", errInvalidToken)
|
||||
return parser.NewError(t.pos, t.value, "", errInvalidToken)
|
||||
}
|
||||
|
||||
func (dec *decoder) OnError(pos lexer.Position, content string, err error) error {
|
||||
err = newError(pos, content, "", err)
|
||||
err = parser.NewError(pos, content, "", err)
|
||||
dec.executeFinal()
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user