From 880298de68b2d7ca7e27c850c8598e0b198ae5b0 Mon Sep 17 00:00:00 2001
From: TJ Miller <millert@us.ibm.com>
Date: Thu, 9 Mar 2023 14:16:11 -0800
Subject: [PATCH] Tidy up divide operator logic

---
 pkg/yqlib/operator_divide.go | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

diff --git a/pkg/yqlib/operator_divide.go b/pkg/yqlib/operator_divide.go
index 67cfb7da..acdca79d 100644
--- a/pkg/yqlib/operator_divide.go
+++ b/pkg/yqlib/operator_divide.go
@@ -38,21 +38,14 @@ func divide(d *dataTreeNavigator, context Context, lhs *CandidateNode, rhs *Cand
 		Anchor: lhs.Node.Anchor,
 	})
 
-	switch lhsNode.Kind {
-	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 lhsNode.Kind == yaml.ScalarNode && rhs.Node.Kind == yaml.ScalarNode {
 		if err := divideScalars(context, target, lhsNode, rhs.Node); err != nil {
 			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
 }
 
@@ -69,22 +62,6 @@ func divideScalars(context Context, target *CandidateNode, lhs *yaml.Node, rhs *
 	if lhsTag == "!!str" && rhsTag == "!!str" {
 		target.Node = split(lhs.Value, rhs.Value)
 		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") {
 		target.Node.Kind = yaml.ScalarNode
 		target.Node.Style = lhs.Style