mirror of
https://github.com/mikefarah/yq.git
synced 2024-12-19 20:19:04 +00:00
Added better error reporting
This commit is contained in:
parent
09a9e1e7f0
commit
a96b74e779
@ -1,6 +1,7 @@
|
|||||||
package yqlib
|
package yqlib
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
lex "github.com/timtadh/lexmachine"
|
lex "github.com/timtadh/lexmachine"
|
||||||
@ -288,7 +289,7 @@ func (p *pathTokeniser) Tokenise(path string) ([]*Token, error) {
|
|||||||
scanner, err := p.lexer.Scanner([]byte(path))
|
scanner, err := p.lexer.Scanner([]byte(path))
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, fmt.Errorf("Parsing expression: %v", err)
|
||||||
}
|
}
|
||||||
var tokens []*Token
|
var tokens []*Token
|
||||||
for tok, err, eof := scanner.Next(); !eof; tok, err, eof = scanner.Next() {
|
for tok, err, eof := scanner.Next(); !eof; tok, err, eof = scanner.Next() {
|
||||||
@ -299,7 +300,7 @@ func (p *pathTokeniser) Tokenise(path string) ([]*Token, error) {
|
|||||||
tokens = append(tokens, token)
|
tokens = append(tokens, token)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, fmt.Errorf("Parsing expression: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var postProcessedTokens = make([]*Token, 0)
|
var postProcessedTokens = make([]*Token, 0)
|
||||||
|
@ -1,6 +1,9 @@
|
|||||||
package yqlib
|
package yqlib
|
||||||
|
|
||||||
import "fmt"
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
var myPathTokeniser = NewPathTokeniser()
|
var myPathTokeniser = NewPathTokeniser()
|
||||||
var myPathPostfixer = NewPathPostFixer()
|
var myPathPostfixer = NewPathPostFixer()
|
||||||
@ -49,10 +52,16 @@ func (p *pathTreeCreator) CreatePathTree(postFixPath []*Operation) (*PathTreeNod
|
|||||||
if Operation.OperationType.NumArgs > 0 {
|
if Operation.OperationType.NumArgs > 0 {
|
||||||
numArgs := Operation.OperationType.NumArgs
|
numArgs := Operation.OperationType.NumArgs
|
||||||
if numArgs == 1 {
|
if numArgs == 1 {
|
||||||
|
if len(stack) < 1 {
|
||||||
|
return nil, fmt.Errorf("'%v' expects 1 arg but received none", strings.TrimSpace(Operation.StringValue))
|
||||||
|
}
|
||||||
remaining, rhs := stack[:len(stack)-1], stack[len(stack)-1]
|
remaining, rhs := stack[:len(stack)-1], stack[len(stack)-1]
|
||||||
newNode.Rhs = rhs
|
newNode.Rhs = rhs
|
||||||
stack = remaining
|
stack = remaining
|
||||||
} else if numArgs == 2 {
|
} else if numArgs == 2 {
|
||||||
|
if len(stack) < 2 {
|
||||||
|
return nil, fmt.Errorf("'%v' expects 2 args but there is %v", strings.TrimSpace(Operation.StringValue), len(stack))
|
||||||
|
}
|
||||||
remaining, lhs, rhs := stack[:len(stack)-2], stack[len(stack)-2], stack[len(stack)-1]
|
remaining, lhs, rhs := stack[:len(stack)-2], stack[len(stack)-2], stack[len(stack)-1]
|
||||||
newNode.Lhs = lhs
|
newNode.Lhs = lhs
|
||||||
newNode.Rhs = rhs
|
newNode.Rhs = rhs
|
||||||
|
37
pkg/yqlib/path_tree_test.go
Normal file
37
pkg/yqlib/path_tree_test.go
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
package yqlib
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/mikefarah/yq/v4/test"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestPathTreeNoArgsForTwoArgOp(t *testing.T) {
|
||||||
|
_, err := treeCreator.ParsePath("=")
|
||||||
|
test.AssertResultComplex(t, "'=' expects 2 args but there is 0", err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPathTreeOneLhsArgsForTwoArgOp(t *testing.T) {
|
||||||
|
_, err := treeCreator.ParsePath(".a =")
|
||||||
|
test.AssertResultComplex(t, "'=' expects 2 args but there is 1", err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPathTreeOneRhsArgsForTwoArgOp(t *testing.T) {
|
||||||
|
_, err := treeCreator.ParsePath("= .a")
|
||||||
|
test.AssertResultComplex(t, "'=' expects 2 args but there is 1", err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPathTreeTwoArgsForTwoArgOp(t *testing.T) {
|
||||||
|
_, err := treeCreator.ParsePath(".a = .b")
|
||||||
|
test.AssertResultComplex(t, nil, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPathTreeNoArgsForOneArgOp(t *testing.T) {
|
||||||
|
_, err := treeCreator.ParsePath("explode")
|
||||||
|
test.AssertResultComplex(t, "'explode' expects 1 arg but received none", err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPathTreeOneArgForOneArgOp(t *testing.T) {
|
||||||
|
_, err := treeCreator.ParsePath("explode(.)")
|
||||||
|
test.AssertResultComplex(t, nil, err)
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user