all constant value are now stored in the same data struct (same constructor). Also nil const added

operand-const.go

@@ -4,22 +4,8 @@
 // operand-const.go
 package expr
 
-// -------- bool const term
+// -------- const term
-func newBoolTerm(tk *Token) *term {
+func newConstTerm(tk *Token) *term {
-	return &term{
-		tk: *tk,
-		// class:    classConst,
-		// kind:     kindBool,
-		parent:   nil,
-		children: nil,
-		position: posLeaf,
-		priority: priValue,
-		evalFunc: evalConst,
-	}
-}
-
-// -------- integer const term
-func newIntegerTerm(tk *Token) *term {
 	return &term{
 		tk:       *tk,
 		parent:   nil,
@@ -30,34 +16,6 @@ func newIntegerTerm(tk *Token) *term {
 	}
 }
 
-// -------- float const term
-func newFloatTerm(tk *Token) *term {
-	return &term{
-		tk: *tk,
-		// class:    classConst,
-		// kind:     kindFloat,
-		parent:   nil,
-		children: nil,
-		position: posLeaf,
-		priority: priValue,
-		evalFunc: evalConst,
-	}
-}
-
-// -------- string const term
-func newStringTerm(tk *Token) *term {
-	return &term{
-		tk: *tk,
-		// class:    classConst,
-		// kind:     kindString,
-		parent:   nil,
-		children: nil,
-		position: posLeaf,
-		priority: priValue,
-		evalFunc: evalConst,
-	}
-}
-
 // -------- eval func
 func evalConst(ctx ExprContext, self *term) (v any, err error) {
 	v = self.tk.Value
@@ -66,8 +24,9 @@ func evalConst(ctx ExprContext, self *term) (v any, err error) {
 
 // init
 func init() {
-	registerTermConstructor(SymString, newStringTerm)
+	registerTermConstructor(SymString, newConstTerm)
-	registerTermConstructor(SymInteger, newIntegerTerm)
+	registerTermConstructor(SymInteger, newConstTerm)
-	registerTermConstructor(SymFloat, newFloatTerm)
+	registerTermConstructor(SymFloat, newConstTerm)
-	registerTermConstructor(SymBool, newBoolTerm)
+	registerTermConstructor(SymBool, newConstTerm)
+	registerTermConstructor(SymKwNil, newConstTerm)
 }