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

sum and prod now support fraction too

Browse Source
This commit is contained in:
Celestino Amoroso 2024-05-01 21:51:43 +02:00
parent e00886b1ed
commit cd6b7982ee
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
operator-prod.go
View File

@ -42,6 +42,8 @@ func evalMultiply(ctx ExprContext, self *term) (v any, err error) {
rightInt, _ := rightValue.(int64) rightInt, _ := rightValue.(int64)
v = leftInt * rightInt v = leftInt * rightInt
} }
} else if isFraction(leftValue) || isFraction(rightValue) {
v, err = mulAnyFract(leftValue, rightValue)
} else { } else {
err = self.errIncompatibleTypes(leftValue, rightValue) err = self.errIncompatibleTypes(leftValue, rightValue)
} }
@ -85,6 +87,8 @@ func evalDivide(ctx ExprContext, self *term) (v any, err error) {
v = leftInt / rightInt v = leftInt / rightInt
} }
} }
} else if isFraction(leftValue) || isFraction(rightValue) {
v, err = divAnyFract(leftValue, rightValue)
} else { } else {
err = self.errIncompatibleTypes(leftValue, rightValue) err = self.errIncompatibleTypes(leftValue, rightValue)
} }

34
operator-sum.go
View File

@ -39,22 +39,24 @@ func evalPlus(ctx ExprContext, self *term) (v any, err error) {
v = leftInt + rightInt v = leftInt + rightInt
} }
} else if isList(leftValue) || isList(rightValue) { } else if isList(leftValue) || isList(rightValue) {
var leftList, rightList []any var leftList, rightList *ListType
var ok bool var ok bool
if leftList, ok = leftValue.([]any); !ok { if leftList, ok = leftValue.(*ListType); !ok {
leftList = []any{leftValue} leftList = &ListType{leftValue}
} }
if rightList, ok = rightValue.([]any); !ok { if rightList, ok = rightValue.(*ListType); !ok {
rightList = []any{rightValue} rightList = &ListType{rightValue}
} }
sumList := make([]any, 0, len(leftList)+len(rightList)) sumList := make(ListType, 0, len(*leftList)+len(*rightList))
for _, item := range leftList { for _, item := range *leftList {
sumList = append(sumList, item) sumList = append(sumList, item)
} }
for _, item := range rightList { for _, item := range *rightList {
sumList = append(sumList, item) sumList = append(sumList, item)
} }
v = sumList v = &sumList
} else if isFraction(leftValue) || isFraction(rightValue) {
v, err = sumAnyFract(leftValue, rightValue)
} else { } else {
err = self.errIncompatibleTypes(leftValue, rightValue) err = self.errIncompatibleTypes(leftValue, rightValue)
} }
@ -89,15 +91,17 @@ func evalMinus(ctx ExprContext, self *term) (v any, err error) {
v = leftInt - rightInt v = leftInt - rightInt
} }
} else if isList(leftValue) && isList(rightValue) { } else if isList(leftValue) && isList(rightValue) {
leftList, _ := leftValue.([]any) leftList, _ := leftValue.(*ListType)
rightList, _ := rightValue.([]any) rightList, _ := rightValue.(*ListType)
diffList := make([]any, 0, len(leftList)-len(rightList)) diffList := make(ListType, 0, len(*leftList)-len(*rightList))
for _, item := range leftList { for _, item := range *leftList {
if slices.Index(rightList, item) < 0 { if slices.Index(*rightList, item) < 0 {
diffList = append(diffList, item) diffList = append(diffList, item)
} }
} }
v = diffList v = &diffList
} else if isFraction(leftValue) || isFraction(rightValue) {
v, err = subAnyFract(leftValue, rightValue)
} else { } else {
err = self.errIncompatibleTypes(leftValue, rightValue) err = self.errIncompatibleTypes(leftValue, rightValue)
} }