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

New operator %=

Browse Source
This commit is contained in:
Celestino Amoroso
2024-12-19 15:14:30 +01:00
parent 6ee21e10af
commit 8e5550bfa7
7 changed files with 21 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
operator-prod.go
+13 -50
View File
@@ -50,24 +50,6 @@ func evalMultiply(ctx ExprContext, prodTerm *term) (v any, err error) {
}
return mulValues(prodTerm, leftValue, rightValue)
// if IsString(leftValue) && IsInteger(rightValue) {
// s, _ := leftValue.(string)
// n, _ := rightValue.(int64)
// v = strings.Repeat(s, int(n))
// } else if isNumOrFract(leftValue) && isNumOrFract(rightValue) {
// if IsFloat(leftValue) || IsFloat(rightValue) {
// v = numAsFloat(leftValue) * numAsFloat(rightValue)
// } else if isFraction(leftValue) || isFraction(rightValue) {
// v, err = mulAnyFract(leftValue, rightValue)
// } else {
// leftInt, _ := leftValue.(int64)
// rightInt, _ := rightValue.(int64)
// v = leftInt * rightInt
// }
// } else {
// err = prodTerm.errIncompatibleTypes(leftValue, rightValue)
// }
// return
}
//-------- divide term
@@ -115,28 +97,6 @@ func evalDivide(ctx ExprContext, opTerm *term) (v any, err error) {
}
return divValues(opTerm, leftValue, rightValue)
// if isNumOrFract(leftValue) && isNumOrFract(rightValue) {
// if IsFloat(leftValue) || IsFloat(rightValue) {
// d := numAsFloat(rightValue)
// if d == 0.0 {
// err = errors.New("division by zero")
// } else {
// v = numAsFloat(leftValue) / d
// }
// } else if isFraction(leftValue) || isFraction(rightValue) {
// v, err = divAnyFract(leftValue, rightValue)
// } else {
// leftInt, _ := leftValue.(int64)
// if rightInt, _ := rightValue.(int64); rightInt == 0 {
// err = errors.New("division by zero")
// } else {
// v = leftInt / rightInt
// }
// }
// } else {
// err = opTerm.errIncompatibleTypes(leftValue, rightValue)
// }
// return
}
//-------- divide as float term
@@ -179,17 +139,10 @@ func newRemainderTerm(tk *Token) (inst *term) {
children: make([]*term, 0, 2),
position: posInfix,
priority: priProduct,
evalFunc: evalReminder,
evalFunc: evalRemainder,
}
}
func evalReminder(ctx ExprContext, ramainderTerm *term) (v any, err error) {
var leftValue, rightValue any
if leftValue, rightValue, err = ramainderTerm.evalInfix(ctx); err != nil {
return
}
func remainderValues(opTerm *term, leftValue, rightValue any) (v any, err error) {
if IsInteger(leftValue) && IsInteger(rightValue) {
rightInt, _ := rightValue.(int64)
if rightInt == 0 {
@@ -199,11 +152,21 @@ func evalReminder(ctx ExprContext, ramainderTerm *term) (v any, err error) {
v = leftInt % rightInt
}
} else {
err = ramainderTerm.errIncompatibleTypes(leftValue, rightValue)
err = opTerm.errIncompatibleTypes(leftValue, rightValue)
}
return
}
func evalRemainder(ctx ExprContext, remainderTerm *term) (v any, err error) {
var leftValue, rightValue any
if leftValue, rightValue, err = remainderTerm.evalInfix(ctx); err != nil {
return
}
return remainderValues(remainderTerm, leftValue, rightValue)
}
// init
func init() {
registerTermConstructor(SymStar, newMultiplyTerm)