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

Fixed bug in splice operator #1511

Browse Source
This commit is contained in:
Mike Farah 2023-01-13 13:45:19 +11:00
parent d7da0cca3c
commit 3b84c03131
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/yqlib/operator_slice.go
View File

@ -48,6 +48,8 @@ func sliceArrayOperator(d *dataTreeNavigator, context Context, expressionNode *E
relativeSecondNumber := secondNumber relativeSecondNumber := secondNumber
if relativeSecondNumber < 0 { if relativeSecondNumber < 0 {
relativeSecondNumber = len(original.Content) + secondNumber relativeSecondNumber = len(original.Content) + secondNumber
} else if relativeSecondNumber > len(original.Content) {
relativeSecondNumber = len(original.Content)
} }
log.Debug("calculateIndicesToTraverse: slice from %v to %v", relativeFirstNumber, relativeSecondNumber) log.Debug("calculateIndicesToTraverse: slice from %v to %v", relativeFirstNumber, relativeSecondNumber)

18
pkg/yqlib/operator_slice_test.go
View File

@ -55,6 +55,24 @@ var sliceArrayScenarios = []expressionScenario{
"D0, P[1], (!!seq)::- banana\n- grape\n", "D0, P[1], (!!seq)::- banana\n- grape\n",
}, },
}, },
{
skipDoc: true,
description: "second index beyond array clamps",
document: `[cat]`,
expression: `.[:3]`,
expected: []string{
"D0, P[], (!!seq)::- cat\n",
},
},
{
skipDoc: true,
description: "first index beyond array returns nothing",
document: `[cat]`,
expression: `.[3:]`,
expected: []string{
"D0, P[], (!!seq)::[]\n",
},
},
{ {
skipDoc: true, skipDoc: true,
document: `[[cat, dog, frog, cow], [apple, banana, grape, mango]]`, document: `[[cat, dog, frog, cow], [apple, banana, grape, mango]]`,