expr_test.go

@@ -24,11 +24,11 @@ func TestExpr(t *testing.T) {
 	succeeded := 0
 	failed := 0
 
-	inputs1 := []inputType{
-		{`f = func(op){op()}; f(func(){2})`, int64(2), nil},
-	}
+	// inputs1 := []inputType{
+	// 	{`1 ? {"a"} : {"b"} ? ["a"] {"A"} :["b"] {"B"}`, "B", nil},
+	// }
 
-	for i, input := range inputs1 {
+	for i, input := range inputs {
 		var expr Expr
 		var gotResult any
 		var gotErr error

operand-func.go

@@ -89,12 +89,7 @@ type funcDefFunctor struct {
 func (functor *funcDefFunctor) Invoke(ctx ExprContext, name string, args []any) (result any, err error) {
 	for i, p := range functor.params {
 		if i < len(args) {
-			arg := args[i]
-			if functor, ok := arg.(Functor); ok {
-				ctx.RegisterFunc(p, functor, 0, -1)
-			} else {
-				ctx.setVar(p, arg)
-			}
+			ctx.setVar(p, args[i])
 		} else {
 			ctx.setVar(p, nil)
 		}

parser.go

@@ -176,6 +176,8 @@ func (self *parser) parseSelector(scanner *scanner, tree *ast, allowVarRef bool)
 
 	if caseTerm, err = self.parseSelectorCase(scanner, allowVarRef, false); err == nil {
 		addSelectorCase(selectorTerm, caseTerm)
+		// selectorTerm.children = append(selectorTerm.children, caseTerm)
+		// caseTerm.parent = selectorTerm
 	}
 	return
 }
@@ -198,6 +200,7 @@ func (self *parser) parseGeneral(scanner *scanner, allowForest bool, allowVarRef
 		if tk.Sym == SymComment {
 			continue
 		}
+		//resetSelector := true
 
 		if tk.Sym == SymSemiColon {
 			if allowForest {
@@ -265,12 +268,15 @@ func (self *parser) parseGeneral(scanner *scanner, allowForest bool, allowVarRef
 			if selectorTerm == nil {
 				err = tk.Errorf("selector-case outside of a selector context")
 			} else if caseTerm, err = self.parseSelectorCase(scanner, allowVarRef, tk.Sym == SymDoubleColon); err == nil {
+				// selectorTerm.children = append(selectorTerm.children, caseTerm)
+				// caseTerm.parent = selectorTerm
 				addSelectorCase(selectorTerm, caseTerm)
 				currentTerm = caseTerm
 				if tk.Sym == SymDoubleColon {
 					selectorTerm = nil
 				}
 			}
+			//resetSelector = tk.Sym == SymDoubleColon
 		default:
 			currentTerm, err = tree.addToken2(tk)
 		}
@@ -279,6 +285,9 @@ func (self *parser) parseGeneral(scanner *scanner, allowForest bool, allowVarRef
 			selectorTerm = nil
 
 		}
+		// if resetSelector {
+		// 	selectorTree = nil
+		// }
 		lastSym = tk.Sym
 	}
 	return