Improve error position reporting

doc_test.go

@@ -70,6 +70,20 @@ func ExampleEval_error() {
 	//----------^
 }
 
+func ExampleEval_matches() {
+	output, err := expr.Eval(`"a" matches "a("`, nil)
+
+	if err != nil {
+		fmt.Printf("err: %v", err)
+		return
+	}
+
+	fmt.Printf("%v", output)
+	// Output: err: error parsing regexp: missing closing ): `a(`
+	//"a" matches "a("
+	//----------------^
+}
+
 func ExampleParse() {
 	env := map[string]interface{}{
 		"foo": 1,
@@ -128,7 +142,7 @@ func ExampleNames() {
 
 	// Output: err: unknown name baz
 	//foo + bar + baz
-	//---------------^
+	//------------^
 }
 
 func ExampleFuncs() {
@@ -141,7 +155,7 @@ func ExampleFuncs() {
 
 	// Output: err: unknown func baz
 	//foo(bar(baz()))
-	//-----------^
+	//--------^
 }
 
 func ExampleNode() {

error.go

@@ -18,3 +18,8 @@ func (e *syntaxError) Error() string {
 	}
 	return e.message + snippet
 }
+
+func (e *syntaxError) at(t token) error {
+	e.pos = t.pos
+	return e
+}

parser.go

@@ -124,7 +124,7 @@ func Funcs(funcs ...string) OptionFn {
 	}
 }
 
-func (p *parser) errorf(format string, args ...interface{}) error {
+func (p *parser) errorf(format string, args ...interface{}) *syntaxError {
 	return &syntaxError{
 		message: fmt.Sprintf(format, args...),
 		input:   p.input,
@@ -309,7 +309,7 @@ func (p *parser) parsePrimaryExpression() (Node, error) {
 				} else {
 					if p.options.funcs != nil {
 						if _, ok := p.options.funcs[token.value]; !ok {
-							return nil, p.errorf("unknown func %v", token.value)
+							return nil, p.errorf("unknown func %v", token.value).at(token)
 						}
 					}
 					arguments, err := p.parseArguments()
@@ -321,7 +321,7 @@ func (p *parser) parsePrimaryExpression() (Node, error) {
 			} else {
 				if p.options.names != nil {
 					if _, ok := p.options.names[token.value]; !ok {
-						return nil, p.errorf("unknown name %v", token.value)
+						return nil, p.errorf("unknown name %v", token.value).at(token)
 					}
 				}
 				node = nameNode{name: token.value}
@@ -356,7 +356,7 @@ func (p *parser) parsePrimaryExpression() (Node, error) {
 				return nil, err
 			}
 		} else {
-			return nil, p.errorf("unexpected token %v", token)
+			return nil, p.errorf("unexpected token %v", token).at(token)
 		}
 	}
 
@@ -453,7 +453,7 @@ func (p *parser) parsePostfixExpression(node Node) (Node, error) {
 				// As a result, if token is NOT an operator OR token.value is NOT a valid property or method name,
 				// an error shall be returned.
 				(token.kind != operator || !isValidIdentifier(token.value)) {
-				return nil, p.errorf("expected name")
+				return nil, p.errorf("expected name").at(token)
 			}
 
 			property := identifierNode{value: token.value}