simplify and remove dead code

Author: diegommm

checker/nature/nature.go

@@ -88,11 +88,6 @@ type Cache struct {
 	structs map[reflect.Type]Nature
 }
 
-type rTypeWithKey struct {
-	t   reflect.Type
-	key string
-}
-
 // NatureOf returns a Nature describing "i". If "i" is nil then it returns a
 // Nature describing the value "nil".
 func (c *Cache) NatureOf(i any) Nature {

checker/nature/utils.go

@@ -1,7 +1,6 @@
 package nature
 
 import (
-	"fmt"
 	"reflect"
 )
 
@@ -46,23 +45,6 @@ func (s *structData) finished() bool {
 		s.curChild == nil // no child in process of visiting
 }
 
-func (s *structData) structDebug(prefix string) { // TODO: DEBUG
-	if len(s.fields) == 0 {
-		fmt.Printf("%s[%s]\n", prefix, s.rType)
-		return
-	}
-	fmt.Printf("%s[%s] fields:\n", prefix, s.rType)
-	prefix += "  "
-	for k, v := range s.fields {
-		fmt.Printf("%s%s at index %v:", prefix, k, v.Index)
-		if v.Nature.Kind == reflect.Struct {
-			v.Nature.structDebug(prefix)
-		} else {
-			fmt.Printf("%s[%s]\n", prefix, v.Nature.Type)
-		}
-	}
-}
-
 func (s *structData) structField(parentEmbed *structData, name string) (structField, bool) {
 	if s.fields == nil {
 		if s.numField > 0 {

compiler/compiler.go

@@ -10,7 +10,6 @@ import (
 	"github.com/expr-lang/expr/ast"
 	"github.com/expr-lang/expr/builtin"
 	"github.com/expr-lang/expr/checker"
-	"github.com/expr-lang/expr/checker/nature"
 	. "github.com/expr-lang/expr/checker/nature"
 	"github.com/expr-lang/expr/conf"
 	"github.com/expr-lang/expr/file"
@@ -41,7 +40,7 @@ func Compile(tree *parser.Tree, config *conf.Config) (program *Program, err erro
 	if config != nil {
 		c.ntCache = &c.config.NtCache
 	} else {
-		c.ntCache = new(nature.Cache)
+		c.ntCache = new(Cache)
 	}
 
 	c.compile(tree.Node)
@@ -82,7 +81,7 @@ func Compile(tree *parser.Tree, config *conf.Config) (program *Program, err erro
 
 type compiler struct {
 	config         *conf.Config
-	ntCache        *nature.Cache
+	ntCache        *Cache
 	locations      []file.Location
 	bytecode       []Opcode
 	variables      int

parser/parser.go

@@ -12,7 +12,6 @@ import (
 	"github.com/expr-lang/expr/builtin"
 	"github.com/expr-lang/expr/conf"
 	"github.com/expr-lang/expr/file"
-	"github.com/expr-lang/expr/parser/lexer"
 	. "github.com/expr-lang/expr/parser/lexer"
 	"github.com/expr-lang/expr/parser/operator"
 	"github.com/expr-lang/expr/parser/utils"
@@ -49,7 +48,7 @@ var predicates = map[string]struct {
 
 // Parser is a reusable parser. The zero value is ready for use.
 type Parser struct {
-	lexer            *lexer.Lexer
+	lexer            *Lexer
 	current, stashed Token
 	hasStash         bool
 	err              *file.Error
@@ -60,7 +59,7 @@ type Parser struct {
 
 func (p *Parser) Parse(input string, config *conf.Config) (*Tree, error) {
 	if p.lexer == nil {
-		p.lexer = lexer.New()
+		p.lexer = New()
 	}
 	p.config = config
 	source := file.NewSource(input)