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

Tidy up divide operator logic

Browse Source
This commit is contained in:
TJ Miller 2023-03-09 14:16:11 -08:00
parent c1b58f7199
commit 880298de68
1 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkg/yqlib/operator_divide.go
View File

@ -38,21 +38,14 @@ func divide(d *dataTreeNavigator, context Context, lhs *CandidateNode, rhs *Cand
Anchor: lhs.Node.Anchor, Anchor: lhs.Node.Anchor,
}) })
switch lhsNode.Kind { if lhsNode.Kind == yaml.ScalarNode && rhs.Node.Kind == yaml.ScalarNode {
case yaml.MappingNode:
return nil, fmt.Errorf("%v (%v) cannot be divided by %v (%v)", lhsNode.Tag, lhs.GetNicePath(), rhs.Node.Tag, rhs.GetNicePath())
case yaml.SequenceNode:
return nil, fmt.Errorf("%v (%v) cannot be divided by %v (%v)", lhsNode.Tag, lhs.GetNicePath(), rhs.Node.Tag, rhs.GetNicePath())
case yaml.ScalarNode:
if rhs.Node.Kind != yaml.ScalarNode {
return nil, fmt.Errorf("%v (%v) cannot be divided by %v (%v)", lhsNode.Tag, lhs.GetNicePath(), rhs.Node.Tag, rhs.GetNicePath())
}
if err := divideScalars(context, target, lhsNode, rhs.Node); err != nil { if err := divideScalars(context, target, lhsNode, rhs.Node); err != nil {
return nil, err return nil, err
} }
} else {
return nil, fmt.Errorf("%v (%v) cannot be divided by %v (%v)", lhsNode.Tag, lhs.GetNicePath(), rhs.Node.Tag, rhs.GetNicePath())
} }
return target, nil return target, nil
} }
@ -69,22 +62,6 @@ func divideScalars(context Context, target *CandidateNode, lhs *yaml.Node, rhs *
if lhsTag == "!!str" && rhsTag == "!!str" { if lhsTag == "!!str" && rhsTag == "!!str" {
target.Node = split(lhs.Value, rhs.Value) target.Node = split(lhs.Value, rhs.Value)
target.Node.Anchor = lhs.Anchor target.Node.Anchor = lhs.Anchor
} else if lhsTag == "!!int" && rhsTag == "!!int" {
target.Node.Kind = yaml.ScalarNode
target.Node.Style = lhs.Style
format, lhsNum, err := parseInt64(lhs.Value)
if err != nil {
return err
}
_, rhsNum, err := parseInt64(rhs.Value)
if err != nil {
return err
}
quotient := float64(lhsNum) / float64(rhsNum)
target.Node.Tag = "!!float"
target.Node.Value = fmt.Sprintf(format, quotient)
} else if (lhsTag == "!!int" || lhsTag == "!!float") && (rhsTag == "!!int" || rhsTag == "!!float") { } else if (lhsTag == "!!int" || lhsTag == "!!float") && (rhsTag == "!!int" || rhsTag == "!!float") {
target.Node.Kind = yaml.ScalarNode target.Node.Kind = yaml.ScalarNode
target.Node.Style = lhs.Style target.Node.Style = lhs.Style