suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-07-09 16:09:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
Mike Farah 2026-04-06 18:41:54 +10:00 committed by GitHub
parent b3b4478839
commit 6f94991c2a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/yqlib/operator_system.go
View File

@ -9,17 +9,38 @@ import (
) )
func resolveSystemArgs(argsNode *CandidateNode) []string { func resolveSystemArgs(argsNode *CandidateNode) []string {
if argsNode == nil {
return nil
}
if argsNode.Kind == SequenceNode { if argsNode.Kind == SequenceNode {
args := make([]string, 0, len(argsNode.Content)) args := make([]string, 0, len(argsNode.Content))
for _, child := range argsNode.Content { for _, child := range argsNode.Content {
// Only non-null scalar children are valid arguments.
if child == nil {
continue
}
if child.Kind != ScalarNode || child.Tag == "!!null" {
log.Warningf("system operator: argument must be a non-null scalar; got kind=%v tag=%v - ignoring", child.Kind, child.Tag)
continue
}
args = append(args, child.Value) args = append(args, child.Value)
} }
if len(args) == 0 {
return nil
}
return args return args
} }
if argsNode.Tag != "!!null" {
return []string{argsNode.Value} // Single-argument case: only accept a non-null scalar node.
if argsNode.Tag == "!!null" {
return nil
} }
return nil if argsNode.Kind != ScalarNode {
log.Warningf("system operator: args must be a non-null scalar or sequence of non-null scalars; got kind=%v tag=%v - ignoring", argsNode.Kind, argsNode.Tag)
return nil
}
return []string{argsNode.Value}
} }
func resolveCommandNode(commandNodes Context) (string, error) { func resolveCommandNode(commandNodes Context) (string, error) {