suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2024-11-12 13:48:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed equals number issue

Browse Source
This commit is contained in:
Mike Farah 2020-10-09 17:07:53 +11:00
parent 93aaa8ccee
commit 23083ed974
4 changed files with 64 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/yqlib/treeops/data_tree_navigator_test.go
View File

@ -390,6 +390,34 @@ func TestDataTreeNavigatorArrayEquals(t *testing.T) {
test.AssertResult(t, expected, resultsToString(results))
}
func TestDataTreeNavigatorArrayEqualsDeep(t *testing.T) {
nodes := readDoc(t, `apples:
- { b: apple, animal: {legs: 2} }
- { b: banana, animal: {legs: 4} }
- { b: corn, animal: {legs: 6} }
`)
path, errPath := treeCreator.ParsePath("apples(animal.legs == 4)")
if errPath != nil {
t.Error(errPath)
}
results, errNav := treeNavigator.GetMatchingNodes(nodes, path)
if errNav != nil {
t.Error(errNav)
}
expected := `
-- Node --
Document 0, path: [apples 1]
Tag: !!map, Kind: MappingNode, Anchor:
{b: banana, animal: {legs: 4}}
`
test.AssertResult(t, expected, resultsToString(results))
}
func TestDataTreeNavigatorEqualsTrickey(t *testing.T) {
nodes := readDoc(t, `a:

32
pkg/yqlib/treeops/path_postfix_test.go
View File

@ -25,6 +25,20 @@ func testExpression(expression string) (string, error) {
return formatted, nil
}
func TestPostFixArrayEquals(t *testing.T) {
var infix = "a"
var expectedOutput = `PathKey - 'a'
--------
`
actual, err := testExpression(infix)
if err != nil {
t.Error(err)
}
test.AssertResultComplex(t, expectedOutput, actual)
}
func TestPostFixSimpleExample(t *testing.T) {
var infix = "a"
var expectedOutput = `PathKey - 'a'
@ -167,6 +181,24 @@ Operation - OR
test.AssertResultComplex(t, expectedOutput, actual)
}
func TestPostFixEqualsNumberExample(t *testing.T) {
var infix = "(animal == 3)"
var expectedOutput = `PathKey - 'animal'
--------
PathKey - '3'
--------
Operation - EQUALS
--------
`
actual, err := testExpression(infix)
if err != nil {
t.Error(err)
}
test.AssertResultComplex(t, expectedOutput, actual)
}
func TestPostFixOrWithEqualsExample(t *testing.T) {
var infix = "a==thing OR b==thongs"
var expectedOutput = `PathKey - 'a'

4
pkg/yqlib/treeops/path_tokeniser.go
View File

@ -142,14 +142,14 @@ func (p *pathTokeniser) Tokenise(path string) ([]*lex.Token, error) {
for index, token := range tokens {
for _, literalTokenDef := range append(Literals, "ARRAY_INDEX", "(") {
if index > 0 && token.Type == TokenIds[literalTokenDef] && tokens[index-1].Type != TokenIds["TRAVERSE_OPERATOR"] {
if index > 0 && token.Type == TokenIds[literalTokenDef] && tokens[index-1].Type != TokenIds["TRAVERSE_OPERATOR"] && tokens[index-1].Type != TokenIds["EQUALS_OPERATOR"] && tokens[index-1].Type != TokenIds["EQUALS_SELF_OPERATOR"] {
postProcessedTokens = append(postProcessedTokens, &lex.Token{Type: TokenIds["TRAVERSE_OPERATOR"], Value: "."})
}
}
postProcessedTokens = append(postProcessedTokens, token)
for _, literalTokenDef := range append(Literals, "ARRAY_INDEX", ")") {
if index != len(tokens)-1 && token.Type == TokenIds[literalTokenDef] && tokens[index+1].Type != TokenIds["TRAVERSE_OPERATOR"] {
if index != len(tokens)-1 && token.Type == TokenIds[literalTokenDef] && tokens[index+1].Type != TokenIds["TRAVERSE_OPERATOR"] && tokens[index+1].Type != TokenIds[")"] {
postProcessedTokens = append(postProcessedTokens, &lex.Token{Type: TokenIds["TRAVERSE_OPERATOR"], Value: "."})
}
}

2
pkg/yqlib/treeops/path_tokeniser_test.go
View File

@ -11,6 +11,8 @@ var tokeniserTests = []struct {
expectedTokens []interface{}
}{ // TODO: Ensure ALL documented examples have tests! sheesh
{"(animal==3)", append(make([]interface{}, 0), "(", "animal", "==", int64(3), ")")},
{"(animal==f3)", append(make([]interface{}, 0), "(", "animal", "==", "f3", ")")},
{"apples.BANANAS", append(make([]interface{}, 0), "apples", ".", "BANANAS")},
{"appl*.BANA*", append(make([]interface{}, 0), "appl*", ".", "BANA*")},
{"a.b.**", append(make([]interface{}, 0), "a", ".", "b", ".", "**")},