class and kind types removed

operand-const.go

@@ -7,9 +7,9 @@ package expr
 // -------- bool const term
 func newBoolTerm(tk *Token) *term {
 	return &term{
-		tk:       *tk,
+		tk: *tk,
-		class:    classConst,
+		// class:    classConst,
-		kind:     kindBool,
+		// kind:     kindBool,
 		parent:   nil,
 		children: nil,
 		position: posLeaf,
@@ -22,8 +22,6 @@ func newBoolTerm(tk *Token) *term {
 func newIntegerTerm(tk *Token) *term {
 	return &term{
 		tk:       *tk,
-		class:    classConst,
-		kind:     kindInteger,
 		parent:   nil,
 		children: nil,
 		position: posLeaf,
@@ -35,9 +33,9 @@ func newIntegerTerm(tk *Token) *term {
 // -------- float const term
 func newFloatTerm(tk *Token) *term {
 	return &term{
-		tk:       *tk,
+		tk: *tk,
-		class:    classConst,
+		// class:    classConst,
-		kind:     kindFloat,
+		// kind:     kindFloat,
 		parent:   nil,
 		children: nil,
 		position: posLeaf,
@@ -49,9 +47,9 @@ func newFloatTerm(tk *Token) *term {
 // -------- string const term
 func newStringTerm(tk *Token) *term {
 	return &term{
-		tk:       *tk,
+		tk: *tk,
-		class:    classConst,
+		// class:    classConst,
-		kind:     kindString,
+		// kind:     kindString,
 		parent:   nil,
 		children: nil,
 		position: posLeaf,

operand-expr.go

@@ -10,8 +10,6 @@ import "fmt"
 func newExprTerm(tk *Token) *term {
 	return &term{
 		tk:       *tk,
-		class:    classVar,
-		kind:     kindUnknown,
 		parent:   nil,
 		children: nil,
 		position: posLeaf,

operand-func.go

@@ -11,9 +11,9 @@ import (
 // -------- function call term
 func newFuncCallTerm(tk *Token, args []*term) *term {
 	return &term{
-		tk:       *tk,
+		tk: *tk,
-		class:    classVar,
+		// class:    classVar,
-		kind:     kindUnknown,
+		// kind:     kindUnknown,
 		parent:   nil,
 		children: args,
 		position: posLeaf,
@@ -71,8 +71,6 @@ func exportFunc(ctx ExprContext, name string, info ExprFunc) {
 func newFuncDefTerm(tk *Token, args []*term) *term {
 	return &term{
 		tk:       *tk,
-		class:    classVar,
-		kind:     kindUnknown,
 		parent:   nil,
 		children: args, // arg[0]=formal-param-list, arg[1]=*ast
 		position: posLeaf,

operand-list.go

@@ -8,8 +8,6 @@ package expr
 func newListTerm(args []*term) *term {
 	return &term{
 		tk:       *NewToken(0, 0, SymList, "[]"),
-		class:    classVar,
-		kind:     kindUnknown,
 		parent:   nil,
 		children: args,
 		position: posLeaf,

operand-selector-case.go

@@ -17,8 +17,6 @@ func newSelectorCaseTerm(row, col int, filterList *term, caseExpr Expr) *term {
 	tk := NewValueToken(row, col, SymSelectorCase, "", &selectorCase{filterList: filterList, caseExpr: caseExpr})
 	return &term{
 		tk:       *tk,
-		class:    classVar,
-		kind:     kindUnknown,
 		parent:   nil,
 		children: nil,
 		position: posLeaf,

operand-var.go

@@ -9,9 +9,9 @@ import "fmt"
 // -------- variable term
 func newVarTerm(tk *Token) *term {
 	return &term{
-		tk:       *tk,
+		tk: *tk,
-		class:    classVar,
+		// class:    classVar,
-		kind:     kindUnknown,
+		// kind:     kindUnknown,
 		parent:   nil,
 		children: nil,
 		position: posLeaf,

operator-assign.go

@@ -9,8 +9,6 @@ package expr
 func newAssignTerm(tk *Token) (inst *term) {
 	return &term{
 		tk:       *tk,
-		class:    classOperator,
-		kind:     kindUnknown,
 		children: make([]*term, 0, 2),
 		position: posInfix,
 		priority: priAssign,

operator-bool.go

@@ -11,8 +11,6 @@ import "fmt"
 func newNotTerm(tk *Token) (inst *term) {
 	return &term{
 		tk:       *tk,
-		class:    classOperator,
-		kind:     kindBool,
 		children: make([]*term, 0, 1),
 		position: posPrefix,
 		priority: priNot,
@@ -39,9 +37,9 @@ func evalNot(ctx ExprContext, self *term) (v any, err error) {
 
 func newAndTerm(tk *Token) (inst *term) {
 	return &term{
-		tk:       *tk,
+		tk: *tk,
-		class:    classOperator,
+		// class:    classOperator,
-		kind:     kindBool,
+		// kind:     kindBool,
 		children: make([]*term, 0, 2),
 		position: posInfix,
 		priority: priAnd,
@@ -108,9 +106,9 @@ func evalAndWithShortcut(ctx ExprContext, self *term) (v any, err error) {
 
 func newOrTerm(tk *Token) (inst *term) {
 	return &term{
-		tk:       *tk,
+		tk: *tk,
-		class:    classOperator,
+		// class:    classOperator,
-		kind:     kindBool,
+		// kind:     kindBool,
 		children: make([]*term, 0, 2),
 		position: posInfix,
 		priority: priOr,

operator-but.go

@@ -9,8 +9,6 @@ package expr
 func newButTerm(tk *Token) (inst *term) {
 	return &term{
 		tk:       *tk,
-		class:    classOperator,
-		kind:     kindUnknown,
 		children: make([]*term, 0, 2),
 		position: posInfix,
 		priority: priBut,

operator-coalesce.go

@@ -8,9 +8,9 @@ package expr
 
 func newNullCoalesceTerm(tk *Token) (inst *term) {
 	return &term{
-		tk:       *tk,
+		tk: *tk,
-		class:    classOperator,
+		// class:    classOperator,
-		kind:     kindUnknown,
+		// kind:     kindUnknown,
 		children: make([]*term, 0, 2),
 		position: posInfix,
 		priority: priCoalesce,
@@ -48,8 +48,6 @@ func evalNullCoalesce(ctx ExprContext, self *term) (v any, err error) {
 func newCoalesceAssignTerm(tk *Token) (inst *term) {
 	return &term{
 		tk:       *tk,
-		class:    classOperator,
-		kind:     kindUnknown,
 		children: make([]*term, 0, 2),
 		position: posInfix,
 		priority: priCoalesce,

operator-ctrl.go

@@ -9,8 +9,6 @@ package expr
 func newExportAllTerm(tk *Token) (inst *term) {
 	return &term{
 		tk:       *tk,
-		class:    classOperator,
-		kind:     kindUnknown,
 		children: nil,
 		position: posLeaf,
 		priority: priValue,

operator-fact.go

@@ -11,8 +11,6 @@ import "fmt"
 func newFactTerm(tk *Token) (inst *term) {
 	return &term{
 		tk:       *tk,
-		class:    classOperator,
-		kind:     kindInteger,
 		children: make([]*term, 0, 1),
 		position: posPostfix,
 		priority: priFact,

operator-prod.go

@@ -13,9 +13,9 @@ import (
 
 func newMultiplyTerm(tk *Token) (inst *term) {
 	return &term{
-		tk:       *tk,
+		tk: *tk,
-		class:    classOperator,
+		// class:    classOperator,
-		kind:     kindUnknown,
+		// kind:     kindUnknown,
 		children: make([]*term, 0, 2),
 		position: posInfix,
 		priority: priProduct,
@@ -52,9 +52,9 @@ func evalMultiply(ctx ExprContext, self *term) (v any, err error) {
 
 func newDivideTerm(tk *Token) (inst *term) {
 	return &term{
-		tk:       *tk,
+		tk: *tk,
-		class:    classOperator,
+		// class:    classOperator,
-		kind:     kindUnknown,
+		// kind:     kindUnknown,
 		children: make([]*term, 0, 2),
 		position: posInfix,
 		priority: priProduct,
@@ -96,8 +96,6 @@ func evalDivide(ctx ExprContext, self *term) (v any, err error) {
 func newDivideAsFloatTerm(tk *Token) (inst *term) {
 	return &term{
 		tk:       *tk,
-		class:    classOperator,
-		kind:     kindUnknown,
 		children: make([]*term, 0, 2),
 		position: posInfix,
 		priority: priProduct,
@@ -129,9 +127,9 @@ func evalDivideAsFloat(ctx ExprContext, self *term) (v any, err error) {
 
 func newReminderTerm(tk *Token) (inst *term) {
 	return &term{
-		tk:       *tk,
+		tk: *tk,
-		class:    classOperator,
+		// class:    classOperator,
-		kind:     kindUnknown,
+		// kind:     kindUnknown,
 		children: make([]*term, 0, 2),
 		position: posInfix,
 		priority: priProduct,

operator-rel.go

@@ -8,9 +8,9 @@ package expr
 
 func newEqualTerm(tk *Token) (inst *term) {
 	return &term{
-		tk:       *tk,
+		tk: *tk,
-		class:    classOperator,
+		// class:    classOperator,
-		kind:     kindBool,
+		// kind:     kindBool,
 		children: make([]*term, 0, 2),
 		position: posInfix,
 		priority: priRelational,
@@ -47,9 +47,9 @@ func evalEqual(ctx ExprContext, self *term) (v any, err error) {
 
 func newNotEqualTerm(tk *Token) (inst *term) {
 	return &term{
-		tk:       *tk,
+		tk: *tk,
-		class:    classOperator,
+		// class:    classOperator,
-		kind:     kindBool,
+		// kind:     kindBool,
 		children: make([]*term, 0, 2),
 		position: posInfix,
 		priority: priRelational,
@@ -94,9 +94,9 @@ func evalNotEqual(ctx ExprContext, self *term) (v any, err error) {
 
 func newLessTerm(tk *Token) (inst *term) {
 	return &term{
-		tk:       *tk,
+		tk: *tk,
-		class:    classOperator,
+		// class:    classOperator,
-		kind:     kindBool,
+		// kind:     kindBool,
 		children: make([]*term, 0, 2),
 		position: posInfix,
 		priority: priRelational,
@@ -134,8 +134,6 @@ func evalLess(ctx ExprContext, self *term) (v any, err error) {
 func newLessEqualTerm(tk *Token) (inst *term) {
 	return &term{
 		tk:       *tk,
-		class:    classOperator,
-		kind:     kindUnknown,
 		children: make([]*term, 0, 2),
 		position: posInfix,
 		priority: priRelational,
@@ -172,9 +170,9 @@ func evalLessEqual(ctx ExprContext, self *term) (v any, err error) {
 
 func newGreaterTerm(tk *Token) (inst *term) {
 	return &term{
-		tk:       *tk,
+		tk: *tk,
-		class:    classOperator,
+		// class:    classOperator,
-		kind:     kindBool,
+		// kind:     kindBool,
 		children: make([]*term, 0, 2),
 		position: posInfix,
 		priority: priRelational,
@@ -194,9 +192,9 @@ func evalGreater(ctx ExprContext, self *term) (v any, err error) {
 
 func newGreaterEqualTerm(tk *Token) (inst *term) {
 	return &term{
-		tk:       *tk,
+		tk: *tk,
-		class:    classOperator,
+		// class:    classOperator,
-		kind:     kindBool,
+		// kind:     kindBool,
 		children: make([]*term, 0, 2),
 		position: posInfix,
 		priority: priRelational,

operator-selector.go

@@ -9,8 +9,6 @@ package expr
 func newSelectorTerm(tk *Token) (inst *term) {
 	return &term{
 		tk:       *tk,
-		class:    classOperator,
-		kind:     kindUnknown,
 		children: make([]*term, 0, 3),
 		position: posMultifix,
 		priority: priSelector,

operator-sign.go

@@ -8,9 +8,9 @@ package expr
 
 func newPlusSignTerm(tk *Token) (inst *term) {
 	return &term{
-		tk:       *tk,
+		tk: *tk,
-		class:    classOperator,
+		// class:    classOperator,
-		kind:     kindUnknown,
+		// kind:     kindUnknown,
 		children: make([]*term, 0, 1),
 		position: posPrefix,
 		priority: priSign,
@@ -21,8 +21,6 @@ func newPlusSignTerm(tk *Token) (inst *term) {
 func newMinusSignTerm(tk *Token) (inst *term) {
 	return &term{
 		tk:       *tk,
-		class:    classOperator,
-		kind:     kindUnknown,
 		children: make([]*term, 0, 1),
 		position: posPrefix,
 		priority: priSign,

operator-sum.go

@@ -14,8 +14,6 @@ import (
 func newPlusTerm(tk *Token) (inst *term) {
 	return &term{
 		tk:       *tk,
-		class:    classOperator,
-		kind:     kindUnknown,
 		children: make([]*term, 0, 2),
 		position: posInfix,
 		priority: priSum,
@@ -67,9 +65,9 @@ func evalPlus(ctx ExprContext, self *term) (v any, err error) {
 
 func newMinusTerm(tk *Token) (inst *term) {
 	return &term{
-		tk:       *tk,
+		tk: *tk,
-		class:    classOperator,
+		// class:    classOperator,
-		kind:     kindUnknown,
+		// kind:     kindUnknown,
 		children: make([]*term, 0, 2),
 		position: posInfix,
 		priority: priSum,

term.go

@@ -8,27 +8,6 @@ import (
 	"strings"
 )
 
-type termKind uint16
-
-const (
-	kindUnknown termKind = iota
-	kindBool
-	kindInteger
-	kindFloat
-	kindString
-	kindIdentifier
-)
-
-type termClass uint16
-
-const (
-	classNull termClass = iota
-	classConst
-	classVar
-	classFunc
-	classOperator
-)
-
 type termPriority uint32
 
 const (
@@ -60,23 +39,11 @@ const (
 
 type evalFuncType func(ctx ExprContext, self *term) (v any, err error)
 
-// type iterm interface {
-// 	getClass() termClass
-// 	getKind() termKind
-// 	compute(ctx exprContext) (v any, err error)
-// 	// isOperator() bool
-// 	// isOperand() bool
-// 	source() string
-// 	setParent(parentNode term)
-// }
-
 type term struct {
 	tk       Token
-	class    termClass
-	kind     termKind
 	parent   *term
 	children []*term
-	position termPosition // operator position: infix, prefix, suffix
+	position termPosition // operator position: leaf, infix, prefix, postfix, multifix
 	priority termPriority // operator priority: higher value means higher priority
 	evalFunc evalFuncType
 }
@@ -169,7 +136,7 @@ func (self *term) value() any {
 
 func (self *term) compute(ctx ExprContext) (v any, err error) {
 	if self.evalFunc == nil {
-		err = self.tk.Errorf("undefined eval-func for %v term type", self.kind)
+		err = self.tk.Errorf("undefined eval-func for %q term", self.source())
 	} else {
 		v, err = self.evalFunc(ctx, self)
 	}