go-pkg/expr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

operator-{sum,prod}.go: Fixed sum and prod operation with a fraction and a float

Browse Source
This commit is contained in:
Celestino Amoroso
2024-05-06 17:32:39 +02:00
parent 8b4dad1381
commit 5910345c08
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
operator-sum.go
+3 -3
View File
@@ -86,9 +86,11 @@ func evalMinus(ctx ExprContext, self *term) (v any, err error) {
return
}
if isNumber(leftValue) && isNumber(rightValue) {
if isNumOrFract(leftValue) && isNumOrFract(rightValue) {
if isFloat(leftValue) || isFloat(rightValue) {
v = numAsFloat(leftValue) - numAsFloat(rightValue)
} else if isFraction(leftValue) || isFraction(rightValue) {
v, err = subAnyFract(leftValue, rightValue)
} else {
leftInt, _ := leftValue.(int64)
rightInt, _ := rightValue.(int64)
@@ -104,8 +106,6 @@ func evalMinus(ctx ExprContext, self *term) (v any, err error) {
}
}
v = &diffList
} else if isFraction(leftValue) || isFraction(rightValue) {
v, err = subAnyFract(leftValue, rightValue)
} else {
err = self.errIncompatibleTypes(leftValue, rightValue)
}