remove Number.Equal()

Author: xrstf

pkg/eval/builtin/comparisons.go

@@ -59,8 +59,8 @@ func makeNumberComparatorFunc(inter intProcessor, floater floatProcessor, desc s
 			return inter(leftInt, rightInt)
 		}
 
-		leftFloat := numbers[0].ToFloat()
-		rightFloat := numbers[1].ToFloat()
+		leftFloat := numbers[0].MustToFloat()
+		rightFloat := numbers[1].MustToFloat()
 
 		return floater(leftFloat, rightFloat)
 	}, desc)

pkg/eval/builtin/math.go

@@ -59,7 +59,7 @@ func sumFunction(ctx types.Context, args []ast.Expression) (any, error) {
 
 	sum := float64(0)
 	for _, num := range values {
-		sum += num.ToFloat()
+		sum += num.MustToFloat()
 	}
 
 	return sum, nil
@@ -85,9 +85,9 @@ func subFunction(ctx types.Context, args []ast.Expression) (any, error) {
 		return difference, nil
 	}
 
-	difference := values[0].ToFloat()
+	difference := values[0].MustToFloat()
 	for _, num := range values[1:] {
-		difference -= num.ToFloat()
+		difference -= num.MustToFloat()
 	}
 
 	return difference, nil
@@ -115,7 +115,7 @@ func multiplyFunction(ctx types.Context, args []ast.Expression) (any, error) {
 
 	product := float64(1)
 	for _, num := range values {
-		product *= num.ToFloat()
+		product *= num.MustToFloat()
 	}
 
 	return product, nil
@@ -131,13 +131,14 @@ func divideFunction(ctx types.Context, args []ast.Expression) (any, error) {
 		return nil, err
 	}
 
-	result := values[0].ToFloat()
+	result := values[0].MustToFloat()
 
 	for _, num := range values[1:] {
-		divisor := num.ToFloat()
+		divisor := num.MustToFloat()
 		if divisor == 0 {
 			return nil, errors.New("division by zero")
 		}
+
 		result /= divisor
 	}
 

pkg/lang/ast/types.go

@@ -272,27 +272,6 @@ type Number struct {
 var _ Expression = Number{}
 var _ Literal = Number{}
 
-func (n Number) Equal(other Number) bool {
-	// handle technically invalid numbers
-	if other.Value == nil || n.Value == nil {
-		return (other.Value == nil) == (n.Value == nil)
-	}
-
-	selfInt, selfOk := n.ToInteger()
-	otherInt, otherOk := other.ToInteger()
-
-	// not the same type
-	if selfOk != otherOk {
-		return false
-	}
-
-	if selfOk {
-		return otherInt == selfInt
-	}
-
-	return n.ToFloat() == other.ToFloat()
-}
-
 func (n Number) ToInteger() (int64, bool) {
 	switch asserted := n.Value.(type) {
 	case int:
@@ -306,31 +285,32 @@ func (n Number) ToInteger() (int64, bool) {
 	}
 }
 
-func (n Number) IsFloat() bool {
-	_, ok := n.Value.(float64)
-	return ok
-}
-
-func (n Number) ToFloat() float64 {
+func (n Number) ToFloat() (float64, bool) {
 	switch asserted := n.Value.(type) {
-	case int:
-		return float64(asserted)
-	case int32:
-		return float64(asserted)
-	case int64:
-		return float64(asserted)
 	case float32:
-		return float64(asserted)
+		return float64(asserted), true
 	case float64:
-		return asserted
+		return asserted, true
 	default:
-		panic(fmt.Sprintf("Number with non-numeric value %v (%T)", n.Value, n.Value))
+		return 0, false
 	}
 }
 
+func (n Number) MustToFloat() float64 {
+	if i, ok := n.ToInteger(); ok {
+		return float64(i)
+	}
+
+	if f, ok := n.ToFloat(); ok {
+		return f
+	}
+
+	panic(fmt.Sprintf("invalid number value %#v (%T)", n.Value, n.Value))
+}
+
 func (n Number) String() string {
-	if n.IsFloat() {
-		return fmt.Sprintf("%f", n.Value)
+	if f, ok := n.ToFloat(); ok {
+		return fmt.Sprintf("%f", f)
 	}
 
 	return fmt.Sprintf("%d", n.Value)