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

refactored data-types to reduce plugin sizes

Browse Source
This commit is contained in:
Celestino Amoroso
2026-06-08 07:02:56 +02:00
parent fec7cc546c
commit b6da9bcad4
90 changed files with 1039 additions and 803 deletions
Download Patch File Download Diff File Expand all files Collapse all files
operator-prod.go
+25 -20
View File
@@ -9,6 +9,11 @@ import (
"git.portale-stac.it/go-pkg/expr/kern"
"git.portale-stac.it/go-pkg/expr/scan"
"git.portale-stac.it/go-pkg/expr/types"
"git.portale-stac.it/go-pkg/expr/types/array"
"git.portale-stac.it/go-pkg/expr/types/float"
"git.portale-stac.it/go-pkg/expr/types/fract"
"git.portale-stac.it/go-pkg/expr/types/str"
)
//-------- multiply term
@@ -24,15 +29,15 @@ func newMultiplyTerm(tk *scan.Token) (inst *scan.Term) {
}
func mulValues(opTerm *scan.Term, leftValue, rightValue any) (v any, err error) {
if kern.IsString(leftValue) && kern.IsInteger(rightValue) {
if str.IsString(leftValue) && types.IsInteger(rightValue) {
s, _ := leftValue.(string)
n, _ := rightValue.(int64)
v = strings.Repeat(s, int(n))
} else if kern.IsNumOrFract(leftValue) && kern.IsNumOrFract(rightValue) {
if kern.IsFloat(leftValue) || kern.IsFloat(rightValue) {
v = kern.NumAsFloat(leftValue) * kern.NumAsFloat(rightValue)
} else if kern.IsFraction(leftValue) || kern.IsFraction(rightValue) {
v, err = kern.MulAnyFract(leftValue, rightValue)
} else if types.IsNumOrFract(leftValue) && types.IsNumOrFract(rightValue) {
if float.IsFloat(leftValue) || float.IsFloat(rightValue) {
v = types.NumAsFloat(leftValue) * types.NumAsFloat(rightValue)
} else if fract.IsFraction(leftValue) || fract.IsFraction(rightValue) {
v, err = fract.MulAnyFract(leftValue, rightValue)
} else {
leftInt, _ := leftValue.(int64)
rightInt, _ := rightValue.(int64)
@@ -67,16 +72,16 @@ func newDivideTerm(tk *scan.Token) (inst *scan.Term) {
}
func divValues(opTerm *scan.Term, leftValue, rightValue any) (v any, err error) {
if kern.IsNumOrFract(leftValue) && kern.IsNumOrFract(rightValue) {
if kern.IsFloat(leftValue) || kern.IsFloat(rightValue) {
d := kern.NumAsFloat(rightValue)
if types.IsNumOrFract(leftValue) && types.IsNumOrFract(rightValue) {
if float.IsFloat(leftValue) || float.IsFloat(rightValue) {
d := types.NumAsFloat(rightValue)
if d == 0.0 {
err = opTerm.ErrDivisionByZero()
} else {
v = kern.NumAsFloat(leftValue) / d
v = types.NumAsFloat(leftValue) / d
}
} else if kern.IsFraction(leftValue) || kern.IsFraction(rightValue) {
v, err = kern.DivAnyFract(leftValue, rightValue)
} else if fract.IsFraction(leftValue) || fract.IsFraction(rightValue) {
v, err = fract.DivAnyFract(leftValue, rightValue)
} else {
leftInt, _ := leftValue.(int64)
if rightInt, _ := rightValue.(int64); rightInt == 0 {
@@ -85,11 +90,11 @@ func divValues(opTerm *scan.Term, leftValue, rightValue any) (v any, err error)
v = leftInt / rightInt
}
}
} else if kern.IsString(leftValue) && kern.IsString(rightValue) {
} else if str.IsString(leftValue) && str.IsString(rightValue) {
source := leftValue.(string)
sep := rightValue.(string)
v = kern.ListFromStrings(strings.Split(source, sep))
} else if kern.IsString(leftValue) && kern.IsInteger(rightValue) {
v = array.ListFromStrings(strings.Split(source, sep))
} else if str.IsString(leftValue) && types.IsInteger(rightValue) {
source := leftValue.(string)
partSize := int(rightValue.(int64))
if partSize == 0 {
@@ -108,7 +113,7 @@ func divValues(opTerm *scan.Term, leftValue, rightValue any) (v any, err error)
if remainder > 0 {
parts = append(parts, source[len(source)-remainder:])
}
v = kern.NewList(parts)
v = array.NewList(parts)
}
} else {
err = opTerm.ErrIncompatibleTypes(leftValue, rightValue)
@@ -145,12 +150,12 @@ func evalDivideAsFloat(ctx kern.ExprContext, floatDivTerm *scan.Term) (v any, er
return
}
if kern.IsNumOrFract(leftValue) && kern.IsNumOrFract(rightValue) {
d := kern.NumAsFloat(rightValue)
if types.IsNumOrFract(leftValue) && types.IsNumOrFract(rightValue) {
d := types.NumAsFloat(rightValue)
if d == 0.0 {
err = floatDivTerm.ErrDivisionByZero()
} else {
v = kern.NumAsFloat(leftValue) / d
v = types.NumAsFloat(leftValue) / d
}
} else {
err = floatDivTerm.ErrIncompatibleTypes(leftValue, rightValue)
@@ -170,7 +175,7 @@ func newRemainderTerm(tk *scan.Token) (inst *scan.Term) {
}
}
func remainderValues(opTerm *scan.Term, leftValue, rightValue any) (v any, err error) {
if kern.IsInteger(leftValue) && kern.IsInteger(rightValue) {
if types.IsInteger(leftValue) && types.IsInteger(rightValue) {
rightInt, _ := rightValue.(int64)
if rightInt == 0 {
err = opTerm.ErrDivisionByZero()