commit

doc/Expr.adoc

@@ -22,6 +22,8 @@ Expressions calculator
 
 toc::[]
 
+#TODO: Work in progress#
+
 == Expr
 _Expr_ is a GO package capable of analysing, interpreting and calculating expressions.
 
@@ -182,7 +184,7 @@ a=1; b=2; c=3; a+b+c    // returns 6
 === [blue]`but` operator
 [blue]`but` is an infixed operator. Its operands can be any type of expression. It evaluates the left expression first, then the right expression. The value of the right expression is the final result. Examples: [blue]`5 but 2` returns 2, [blue]`x=2*3 but x-1` returns 5.
 
-[blue]`but` is very similar to [blue]`;`. The only difference is that [blue]`;` can't be used inside parenthesis [blue]`;(` and [blue]`)`.
+[blue]`but` is very similar to [blue]`;`. The only difference is that [blue]`;` can't be used inside parenthesis [blue]`(` and [blue]`)`.
 
 === Assignment operator [blue]`=`
 The assignment operator [blue]`=` is used to define variable in the evaluation context or to change their value (see _ExprContext_).

func-math.go

@@ -108,3 +108,7 @@ func ImportMathFuncs(ctx ExprContext) {
 	ctx.RegisterFunc("add", &simpleFunctor{f: addFunc}, 0, -1)
 	ctx.RegisterFunc("mul", &simpleFunctor{f: mulFunc}, 0, -1)
 }
+
+func init() {
+	registerImport("math.arith", ImportMathFuncs)
+}

function-register.go

@@ -0,0 +1,47 @@
+// Copyright (c) 2024 Celestino Amoroso (celestino.amoroso@gmail.com).
+// All rights reserved.
+
+// function-register.go
+package expr
+
+import (
+	"path/filepath"
+)
+
+var functionRegister map[string]func(ExprContext)
+
+func registerImport(name string, importFunc func(ExprContext)) {
+	if functionRegister == nil {
+		functionRegister = make(map[string]func(ExprContext))
+	}
+	functionRegister[name] = importFunc
+}
+
+func ImportInContext(ctx ExprContext, name string) (exists bool) {
+	var importFunc func(ExprContext)
+	if importFunc, exists = functionRegister[name]; exists {
+		importFunc(ctx)
+	}
+	return
+}
+
+func ImportInContextByGlobPattern(ctx ExprContext, pattern string) (count int, err error) {
+	var matched bool
+	for name, importFunc := range functionRegister {
+		if matched, err = filepath.Match(pattern, name); err == nil {
+			if matched {
+				count++
+				importFunc(ctx)
+			}
+		} else {
+			break
+		}
+	}
+	return
+}
+
+func init() {
+	if functionRegister == nil {
+		functionRegister = make(map[string]func(ExprContext))
+	}
+}

hook_test.txt

@@ -0,0 +1,3 @@
+First test
+next commit
+nr 3

operator-builtin.go

@@ -0,0 +1,57 @@
+// Copyright (c) 2024 Celestino Amoroso (celestino.amoroso@gmail.com).
+// All rights reserved.
+
+// operator-length.go
+package expr
+
+//-------- builtin term
+
+func newBuiltinTerm(tk *Token) (inst *term) {
+	return &term{
+		tk:       *tk,
+		children: make([]*term, 0, 1),
+		position: posPrefix,
+		priority: priSign,
+		evalFunc: evalBuiltin,
+	}
+}
+
+func evalBuiltin(ctx ExprContext, self *term) (v any, err error) {
+	var rightValue any
+
+	if rightValue, err = self.evalPrefix(ctx); err != nil {
+		return
+	}
+
+	count := 0
+	if isList(rightValue) {
+		list, _ := rightValue.([]any)
+		for i, moduleSpec := range list {
+			if module, ok := moduleSpec.(string); ok {
+				if ImportInContext(ctx, module) {
+					count++
+				} else {
+					err = self.Errorf("unknown module %q", module)
+					break
+				}
+			} else {
+				err = self.Errorf("expected string at item nr %d, got %T", i+1, moduleSpec)
+				break
+			}
+		}
+	} else if isString(rightValue) {
+		module, _ := rightValue.(string)
+		count, err = ImportInContextByGlobPattern(ctx, module)
+	} else {
+		err = self.errIncompatibleType(rightValue)
+	}
+	if err == nil {
+		v = count
+	}
+	return
+}
+
+// init
+func init() {
+	registerTermConstructor(SymKwBuiltin, newBuiltinTerm)
+}

operator-dot.go

@@ -0,0 +1,61 @@
+// Copyright (c) 2024 Celestino Amoroso (celestino.amoroso@gmail.com).
+// All rights reserved.
+
+// operator-dot.go
+package expr
+
+// -------- dot term
+func newDotTerm(tk *Token) (inst *term) {
+	return &term{
+		tk:       *tk,
+		children: make([]*term, 0, 2),
+		position: posInfix,
+		priority: priDot,
+		evalFunc: evalDot,
+	}
+}
+
+func evalDot(ctx ExprContext, self *term) (v any, err error) {
+	var leftValue, rightValue any
+
+	if leftValue, rightValue, err = self.evalInfix(ctx); err != nil {
+		return
+	}
+
+	indexTerm := self.children[1]
+	if !isInteger(rightValue) {
+		err = indexTerm.Errorf("index expression must be integer, got %T", rightValue)
+		return
+	}
+
+	index64, _ := rightValue.(int64)
+	index := int(index64)
+
+	if isList(leftValue) {
+		list, _ := leftValue.([]any)
+		if index >= 0 && index < len(list) {
+			v = list[index]
+		} else if index >= -len(list) {
+			v = list[len(list)+index]
+		} else {
+			err = indexTerm.Errorf("index %v out of bounds", index)
+		}
+	} else if isString(leftValue) {
+		s, _ := leftValue.(string)
+		if index >= 0 && index < len(s) {
+			v = string(s[index])
+		} else if index >= -len(s) {
+			v = string(s[len(s)+index])
+		} else {
+			err = indexTerm.Errorf("index %v out of bounds", index)
+		}
+	} else {
+		err = self.errIncompatibleTypes(leftValue, rightValue)
+	}
+	return
+}
+
+// init
+func init() {
+	registerTermConstructor(SymDot, newDotTerm)
+}

operator-insert.go

@@ -4,7 +4,6 @@
 // operator-insert.go
 package expr
 
-
 //-------- insert term
 
 func newInsertTerm(tk *Token) (inst *term) {
@@ -12,7 +11,7 @@ func newInsertTerm(tk *Token) (inst *term) {
 		tk:       *tk,
 		children: make([]*term, 0, 2),
 		position: posInfix,
-		priority: priSign,
+		priority: priAssign,
 		evalFunc: evalInsert,
 	}
 }
@@ -22,7 +21,7 @@ func newAppendTerm(tk *Token) (inst *term) {
 		tk:       *tk,
 		children: make([]*term, 0, 2),
 		position: posInfix,
-		priority: priSign,
+		priority: priAssign,
 		evalFunc: evalAppend,
 	}
 }
@@ -38,7 +37,7 @@ func evalInsert(ctx ExprContext, self *term) (v any, err error) {
 		list, _ := rightValue.([]any)
 		v = append([]any{leftValue}, list...)
 	} else {
-		err = self.errIncompatibleType(rightValue)
+		err = self.errIncompatibleTypes(leftValue, rightValue)
 	}
 	return
 }
@@ -54,7 +53,7 @@ func evalAppend(ctx ExprContext, self *term) (v any, err error) {
 		list, _ := leftValue.([]any)
 		v = append(list, rightValue)
 	} else {
-		err = self.errIncompatibleType(leftValue)
+		err = self.errIncompatibleTypes(leftValue, rightValue)
 	}
 	return
 }

scanner.go

@@ -152,9 +152,10 @@ func (self *scanner) fetchNextToken() (tk *Token) {
 		case ';':
 			tk = self.makeToken(SymSemiColon, ch)
 		case '.':
-			if next, _ := self.peek(); next >= '0' && next <= '9' {
-				tk = self.parseNumber(ch)
-			} else if next == '/' {
+			//if next, _ := self.peek(); next >= '0' && next <= '9' {
+			//	tk = self.parseNumber(ch)
+			//} else if next == '/' {
+			if next, _ := self.peek(); next == '/' {
 				tk = self.moveOn(SymDotSlash, ch, next)
 			} else {
 				tk = self.makeToken(SymDot, ch)

symbol.go

@@ -89,6 +89,7 @@ const (
 	SymKwOr
 	SymKwBut
 	SymKwFunc
+	SymKwBuiltin
 )
 
 var keywords map[string]Symbol
@@ -96,10 +97,11 @@ var keywords map[string]Symbol
 func init() {
 	//keywords = make(map[string]Symbol)
 	keywords = map[string]Symbol{
-		"AND":  SymKwAnd,
-		"BUT":  SymKwBut,
-		"FUNC": SymKwFunc,
-		"NOT":  SymKwNot,
-		"OR":   SymKwOr,
+		"AND":     SymKwAnd,
+		"BUILTIN": SymKwBuiltin,
+		"BUT":     SymKwBut,
+		"FUNC":    SymKwFunc,
+		"NOT":     SymKwNot,
+		"OR":      SymKwOr,
 	}
 }

term.go

@@ -24,6 +24,7 @@ const (
 	priSign
 	priFact
 	priCoalesce
+	priDot
 	priValue
 )
 
@@ -166,7 +167,7 @@ func (self *term) checkOperands() (err error) {
 	switch self.position {
 	case posInfix:
 		if self.children == nil || len(self.children) != 2 || self.anyChildrenNil() {
-			err = self.tk.Errorf("infix operator %q requires two not nil operands, got %d", self.source(), self.getChildrenCount())
+			err = self.tk.Errorf("infix operator %q requires two non-nil operands, got %d", self.source(), self.getChildrenCount())
 		}
 	case posPrefix:
 		if self.children == nil || len(self.children) != 1 || self.children[0] == nil {