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

Merge branch 'master' into split-packages

Browse Source
This commit is contained in:
Mike Farah 2024-03-12 15:58:19 +11:00
commit 836d50ac9f
3 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/yqlib/lexer_participle.go
View File

@ -542,8 +542,8 @@ func decodeOp(format *Format) yqAction {
return opTokenWithPrefs(decodeOpType, nil, prefs) return opTokenWithPrefs(decodeOpType, nil, prefs)
} }
func loadOp(decoder Decoder, loadAsString bool) yqAction { func loadOp(decoder Decoder) yqAction {
prefs := loadPrefs{decoder: decoder, loadAsString: loadAsString} prefs := loadPrefs{decoder}
return opTokenWithPrefs(loadOpType, nil, prefs) return opTokenWithPrefs(loadOpType, nil, prefs)
} }

3
pkg/yqlib/operation.go
View File

@ -155,7 +155,8 @@ var trimOpType = &operationType{Type: "TRIM", NumArgs: 0, Precedence: 50, Handle
var toStringOpType = &operationType{Type: "TO_STRING", NumArgs: 0, Precedence: 50, Handler: toStringOperator} var toStringOpType = &operationType{Type: "TO_STRING", NumArgs: 0, Precedence: 50, Handler: toStringOperator}
var stringInterpolationOpType = &operationType{Type: "STRING_INT", NumArgs: 0, Precedence: 50, Handler: stringInterpolationOperator, ToString: valueToStringFunc} var stringInterpolationOpType = &operationType{Type: "STRING_INT", NumArgs: 0, Precedence: 50, Handler: stringInterpolationOperator, ToString: valueToStringFunc}
var loadOpType = &operationType{Type: "LOAD", NumArgs: 1, Precedence: 52, Handler: loadYamlOperator} var loadOpType = &operationType{Type: "LOAD", NumArgs: 1, Precedence: 52, Handler: loadOperator}
var loadStringOpType = &operationType{Type: "LOAD_STRING", NumArgs: 1, Precedence: 52, Handler: loadStringOperator}
var keysOpType = &operationType{Type: "KEYS", NumArgs: 0, Precedence: 50, Handler: keysOperator} var keysOpType = &operationType{Type: "KEYS", NumArgs: 0, Precedence: 50, Handler: keysOperator}

46
pkg/yqlib/operator_load.go
View File

@ -15,7 +15,6 @@ var LoadYamlPreferences = YamlPreferences{
} }
type loadPrefs struct { type loadPrefs struct {
loadAsString bool
decoder Decoder decoder Decoder
} }
@ -31,7 +30,7 @@ func loadString(filename string) (*CandidateNode, error) {
return &CandidateNode{Kind: ScalarNode, Tag: "!!str", Value: string(filebytes)}, nil return &CandidateNode{Kind: ScalarNode, Tag: "!!str", Value: string(filebytes)}, nil
} }
func loadYaml(filename string, decoder Decoder) (*CandidateNode, error) { func loadWithDecoder(filename string, decoder Decoder) (*CandidateNode, error) {
if decoder == nil { if decoder == nil {
return nil, fmt.Errorf("could not load %s", filename) return nil, fmt.Errorf("could not load %s", filename)
} }
@ -62,8 +61,39 @@ func loadYaml(filename string, decoder Decoder) (*CandidateNode, error) {
return sequenceNode, nil return sequenceNode, nil
} }
func loadYamlOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) { func loadStringOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
log.Debugf("loadYamlOperator") log.Debugf("loadString")
var results = list.New()
for el := context.MatchingNodes.Front(); el != nil; el = el.Next() {
candidate := el.Value.(*CandidateNode)
rhs, err := d.GetMatchingNodes(context.SingleReadonlyChildContext(candidate), expressionNode.RHS)
if err != nil {
return Context{}, err
}
if rhs.MatchingNodes.Front() == nil {
return Context{}, fmt.Errorf("filename expression returned nil")
}
nameCandidateNode := rhs.MatchingNodes.Front().Value.(*CandidateNode)
filename := nameCandidateNode.Value
contentsCandidate, err := loadString(filename)
if err != nil {
return Context{}, fmt.Errorf("Failed to load %v: %w", filename, err)
}
results.PushBack(contentsCandidate)
}
return context.ChildContext(results), nil
}
func loadOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
log.Debugf("loadOperator")
loadPrefs := expressionNode.Operation.Preferences.(loadPrefs) loadPrefs := expressionNode.Operation.Preferences.(loadPrefs)
@ -86,13 +116,7 @@ func loadYamlOperator(d *dataTreeNavigator, context Context, expressionNode *Exp
filename := nameCandidateNode.Value filename := nameCandidateNode.Value
var contentsCandidate *CandidateNode contentsCandidate, err := loadWithDecoder(filename, loadPrefs.decoder)
if loadPrefs.loadAsString {
contentsCandidate, err = loadString(filename)
} else {
contentsCandidate, err = loadYaml(filename, loadPrefs.decoder)
}
if err != nil { if err != nil {
return Context{}, fmt.Errorf("Failed to load %v: %w", filename, err) return Context{}, fmt.Errorf("Failed to load %v: %w", filename, err)
} }