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

New, more flexible, parser context datatype that includes and extends

Browse Source 
the previous flags allowForest and allowVarRef.
Added binary operator (work in progress).
Better implementation of +=,-=,*=, and /= (new) operators.
This commit is contained in:
Celestino Amoroso
2024-12-19 14:48:27 +01:00
parent 5c44532790
commit 6ee21e10af
16 changed files with 537 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
operator-prod.go
+66 -18
View File
@@ -13,7 +13,7 @@ import (
func newMultiplyTerm(tk *Token) (inst *term) {
return &term{
tk: *tk,
tk: *tk,
children: make([]*term, 0, 2),
position: posInfix,
priority: priProduct,
@@ -21,13 +21,7 @@ func newMultiplyTerm(tk *Token) (inst *term) {
}
}
func evalMultiply(ctx ExprContext, prodTerm *term) (v any, err error) {
var leftValue, rightValue any
if leftValue, rightValue, err = prodTerm.evalInfix(ctx); err != nil {
return
}
func mulValues(opTerm *term, leftValue, rightValue any) (v any, err error) {
if IsString(leftValue) && IsInteger(rightValue) {
s, _ := leftValue.(string)
n, _ := rightValue.(int64)
@@ -43,16 +37,44 @@ func evalMultiply(ctx ExprContext, prodTerm *term) (v any, err error) {
v = leftInt * rightInt
}
} else {
err = prodTerm.errIncompatibleTypes(leftValue, rightValue)
err = opTerm.errIncompatibleTypes(leftValue, rightValue)
}
return
}
func evalMultiply(ctx ExprContext, prodTerm *term) (v any, err error) {
var leftValue, rightValue any
if leftValue, rightValue, err = prodTerm.evalInfix(ctx); err != nil {
return
}
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
func newDivideTerm(tk *Token) (inst *term) {
return &term{
tk: *tk,
tk: *tk,
children: make([]*term, 0, 2),
position: posInfix,
priority: priProduct,
@@ -60,13 +82,7 @@ func newDivideTerm(tk *Token) (inst *term) {
}
}
func evalDivide(ctx ExprContext, opTerm *term) (v any, err error) {
var leftValue, rightValue any
if leftValue, rightValue, err = opTerm.evalInfix(ctx); err != nil {
return
}
func divValues(opTerm *term, leftValue, rightValue any) (v any, err error) {
if isNumOrFract(leftValue) && isNumOrFract(rightValue) {
if IsFloat(leftValue) || IsFloat(rightValue) {
d := numAsFloat(rightValue)
@@ -91,6 +107,38 @@ func evalDivide(ctx ExprContext, opTerm *term) (v any, err error) {
return
}
func evalDivide(ctx ExprContext, opTerm *term) (v any, err error) {
var leftValue, rightValue any
if leftValue, rightValue, err = opTerm.evalInfix(ctx); err != nil {
return
}
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
func newDivideAsFloatTerm(tk *Token) (inst *term) {
@@ -127,7 +175,7 @@ func evalDivideAsFloat(ctx ExprContext, floatDivTerm *term) (v any, err error) {
func newRemainderTerm(tk *Token) (inst *term) {
return &term{
tk: *tk,
tk: *tk,
children: make([]*term, 0, 2),
position: posInfix,
priority: priProduct,