self param replaced as opTerm

2024-07-09 07:50:06 +02:00
parent 867806155e
commit 6b3bfa2a11
31 changed files with 159 additions and 180 deletions
@@ -21,10 +21,10 @@ func newFuncCallTerm(tk *Token, args []*term) *term {
 }

 // -------- eval func call
-func evalFuncCall(ctx ExprContext, self *term) (v any, err error) {
-	name, _ := self.tk.Value.(string)
-	params := make([]any, len(self.children), len(self.children)+5)
-	for i, tree := range self.children {
+func evalFuncCall(ctx ExprContext, opTerm *term) (v any, err error) {
+	name, _ := opTerm.tk.Value.(string)
+	params := make([]any, len(opTerm.children), len(opTerm.children)+5)
+	for i, tree := range opTerm.children {
 		var param any
 		if param, err = tree.compute(ctx); err != nil {
 			break
@@ -51,11 +51,11 @@ func newFuncDefTerm(tk *Token, args []*term) *term {
 }

 // -------- eval func def
-func evalFuncDef(ctx ExprContext, self *term) (v any, err error) {
-	bodySpec := self.value()
+func evalFuncDef(ctx ExprContext, opTerm *term) (v any, err error) {
+	bodySpec := opTerm.value()
 	if expr, ok := bodySpec.(*ast); ok {
-		paramList := make([]ExprFuncParam, 0, len(self.children))
-		for _, param := range self.children {
+		paramList := make([]ExprFuncParam, 0, len(opTerm.children))
+		for _, param := range opTerm.children {
 			var defValue any
 			flags := paramFlags(0)
 			if len(param.children) > 0 {