moved a subset of source file to the kern package
This commit is contained in:
+11
-9
@@ -7,6 +7,8 @@ package expr
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
|
||||
"git.portale-stac.it/go-pkg/expr/kern"
|
||||
)
|
||||
|
||||
//-------- join term
|
||||
@@ -21,35 +23,35 @@ func newJoinTerm(tk *Token) (inst *term) {
|
||||
}
|
||||
}
|
||||
|
||||
func evalJoin(ctx ExprContext, opTerm *term) (v any, err error) {
|
||||
func evalJoin(ctx kern.ExprContext, opTerm *term) (v any, err error) {
|
||||
var leftValue, rightValue any
|
||||
var itLeft, itRight Iterator
|
||||
var itLeft, itRight kern.Iterator
|
||||
var item any
|
||||
|
||||
if err = opTerm.checkOperands(); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
if leftValue, err = opTerm.children[0].compute(ctx); err != nil {
|
||||
if leftValue, err = opTerm.children[0].Compute(ctx); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
if rightValue, err = opTerm.children[1].compute(ctx); err != nil {
|
||||
if rightValue, err = opTerm.children[1].Compute(ctx); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
if itLeft, err = NewIterator(leftValue); err != nil {
|
||||
return nil, fmt.Errorf("left operand of JOIN must be an iterable data-source; got %s", TypeName(leftValue))
|
||||
return nil, fmt.Errorf("left operand of JOIN must be an iterable data-source; got %s", kern.TypeName(leftValue))
|
||||
}
|
||||
|
||||
if itRight, err = NewIterator(rightValue); err != nil {
|
||||
return nil, fmt.Errorf("right operand of JOIN must be an iterable data-source; got %s", TypeName(rightValue))
|
||||
return nil, fmt.Errorf("right operand of JOIN must be an iterable data-source; got %s", kern.TypeName(rightValue))
|
||||
}
|
||||
|
||||
values := newListA()
|
||||
for _, it := range []Iterator{itLeft, itRight} {
|
||||
values := kern.NewListA()
|
||||
for _, it := range []kern.Iterator{itLeft, itRight} {
|
||||
for item, err = it.Next(); err == nil; item, err = it.Next() {
|
||||
values.appendItem(item)
|
||||
values.AppendItem(item)
|
||||
}
|
||||
}
|
||||
if err == io.EOF {
|
||||
|
||||
Reference in New Issue
Block a user