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

accessing to the Reset() and Clean()functions of an iterator is now done by identifiers, i.e. reset, not by string, i.e. "reset".

Browse Source
This commit is contained in:
Celestino Amoroso 2024-04-28 04:44:19 +02:00
parent 2ccbdb2254
commit 06ab303b9e
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
operator-dot.go
View File

@ -17,15 +17,18 @@ func newDotTerm(tk *Token) (inst *term) {
}
}
func verifyIndex(indexTerm *term, indexValue any, maxValue int) (index int, err error) {
func verifyIndex(ctx ExprContext, indexTerm *term, maxValue int) (index int, err error) {
var v int
if v, err = indexTerm.toInt(indexValue, "index expression value must be integer"); err == nil {
if v >= 0 && v < maxValue {
index = v
} else if index >= -maxValue {
index = maxValue + v
} else {
err = indexTerm.Errorf("index %d out of bounds", v)
var indexValue any
if indexValue, err = indexTerm.compute(ctx); err == nil {
if v, err = indexTerm.toInt(indexValue, "index expression value must be integer"); err == nil {
if v >= 0 && v < maxValue {
index = v
} else if index >= -maxValue {
index = maxValue + v
} else {
err = indexTerm.Errorf("index %d out of bounds", v)
}
}
}
return
@ -34,7 +37,10 @@ func verifyIndex(indexTerm *term, indexValue any, maxValue int) (index int, err
func evalDot(ctx ExprContext, self *term) (v any, err error) {
var leftValue, rightValue any
if leftValue, rightValue, err = self.evalInfix(ctx); err != nil {
if err = self.checkOperands(); err != nil {
return
}
if leftValue, err = self.children[0].compute(ctx); err != nil {
return
}
@ -43,22 +49,25 @@ func evalDot(ctx ExprContext, self *term) (v any, err error) {
switch unboxedValue := leftValue.(type) {
case []any:
var index int
if index, err = verifyIndex(indexTerm, rightValue, len(unboxedValue)); err == nil {
if index, err = verifyIndex(ctx, indexTerm, len(unboxedValue)); err == nil {
v = unboxedValue[index]
}
case string:
var index int
if index, err = verifyIndex(indexTerm, rightValue, len(unboxedValue)); err == nil {
if index, err = verifyIndex(ctx, indexTerm, len(unboxedValue)); err == nil {
v = unboxedValue[index]
}
case map[any]any:
var ok bool
if v, ok = unboxedValue[rightValue]; !ok {
err = fmt.Errorf("key %v does not belong to the dictionary", rightValue)
var indexValue any
if indexValue, err = indexTerm.compute(ctx); err == nil {
if v, ok = unboxedValue[indexValue]; !ok {
err = fmt.Errorf("key %v does not belong to the dictionary", rightValue)
}
}
case *dataCursor:
if indexTerm.symbol() == SymString {
opName := indexTerm.value()
if indexTerm.symbol() == SymIdentifier {
opName := indexTerm.source()
if opName == resetName {
err = unboxedValue.Reset()
} else if opName == cleanName {