Compare commits

..

21 Commits

Author SHA1 Message Date
camoroso ed6af6603a commented out some test code 2024-04-13 22:15:20 +02:00
camoroso 51e740d243 expr_test.go: fixed test expression 2024-04-13 22:14:28 +02:00
camoroso 53dacd5332 operator-selector.go: fixed the case match algorithm 2024-04-13 22:13:16 +02:00
camoroso e297f2a1d3 expr_test.go: new test file to verify complex expressions 2024-04-13 10:11:44 +02:00
camoroso 70cdb9367e changed the structer of the selector components: now all case are a list value assigned as right operand of the selector operator 2024-04-13 10:10:25 +02:00
camoroso efd9af9030 graph.go: remove unused Reticle code 2024-04-13 06:05:04 +02:00
camoroso b67d896415 Merge branch 'main' into feat_graph 2024-04-13 06:01:06 +02:00
camoroso f03ae555fc added the copywrite comment header in source files that lacked it 2024-04-13 06:00:22 +02:00
camoroso f36ae33acc added the graph source files 2024-04-13 05:54:34 +02:00
camoroso b9ea96f649 merge: solved a lot of conflicts caused by an incorect commit removal 2024-04-13 05:47:10 +02:00
camoroso 838ab9fd7e control: exported all control variables by renaming them in upper case 2024-04-13 05:16:23 +02:00
camoroso ad6b4b872f token_test.go: rewritten using a more structured form 2024-04-13 05:08:38 +02:00
camoroso c75e6485e0 term_test.go: changed some fmt.Println() to t.Log() 2024-04-13 05:07:38 +02:00
camoroso 7b80f7f03b helpers_test.go: removed the printed messages "Hello World!" 2024-04-13 05:06:43 +02:00
camoroso 7f9fd570b2 parser_test.go: changed the notice message about EXPR_PATH 2024-04-13 04:40:48 +02:00
camoroso b17d2250a4 parser.go: fixed a problem on the selector operator 2024-04-13 04:37:15 +02:00
camoroso dda10749d0 token.go: better implementation of the function String() 2024-04-13 04:33:59 +02:00
camoroso 07ca84170e operand-selector-case.go: String() function added to the selectorCase type 2024-04-13 04:32:54 +02:00
camoroso 55e136e9bc ast.go: String() function addedd to the Expr interface 2024-04-13 04:31:53 +02:00
camoroso e493c40c7b builtin-funcs: export import functions (made their names uppercase) 2024-04-13 04:18:14 +02:00
camoroso 95605232ab README.adoc: updated draft 2024-04-09 09:11:47 +02:00
23 changed files with 466 additions and 53 deletions
+22 -3
View File
@@ -135,6 +135,9 @@ func main() {
} }
---- ----
=== Concepts and terminology
#TODO#
=== Data types === Data types
_Expr_ supports numerical, string, relational, boolean expressions, and mixed-type lists. _Expr_ supports numerical, string, relational, boolean expressions, and mixed-type lists.
@@ -260,7 +263,15 @@ _Expr_ supports list of mixed-type values, also specified by normal expressions.
|=== |===
=== Variables === Variables
#TODO: variables# A variable is an identifier with an assigned value. Variables are stored in the object that implements the _ExprContext_ interface.
.Examples
[source,go]
----
a=1
x = 5.2 * (9-3)
x = 1; y = 2*x
----
=== Other operations === Other operations
@@ -346,12 +357,15 @@ The table below shows all supported operators by decreasing priorities.
.2+|*AND*| [blue]`and` | _Infix_ | _and_ | _boolean_ "and" _boolean_ -> _boolean_ .2+|*AND*| [blue]`and` | _Infix_ | _and_ | _boolean_ "and" _boolean_ -> _boolean_
| [blue]`&&` | _Infix_ | _and_ | _boolean_ "&&" _boolean_ -> _boolean_ | [blue]`&&` | _Infix_ | _and_ | _boolean_ "&&" _boolean_ -> _boolean_
.2+|*OR*| [blue]`or` | _Infix_ | _or_ | _boolean_ "or" _boolean_ -> _boolean_ .2+|*OR*| [blue]`or` | _Infix_ | _or_ | _boolean_ "or" _boolean_ -> _boolean_
| [blue]`||` | _Infix_ | _or_ | _boolean_ "||" _boolean_ -> _boolean_ | [blue]`\|\|` | _Infix_ | _or_ | _boolean_ "\|\|" _boolean_ -> _boolean_
.1+|*ASSIGN*| [blue]`=` | _Infix_ | _assignment_ | _identifier_ "=" _any_ -> _any_ .1+|*ASSIGN*| [blue]`=` | _Infix_ | _assignment_ | _identifier_ "=" _any_ -> _any_
.1+|*BUT*| [blue]`but` | _Infix_ | _but_ | _any_ "but" _any_ -> _any_ .1+|*BUT*| [blue]`but` | _Infix_ | _but_ | _any_ "but" _any_ -> _any_
|=== |===
=== Functions === Functions
Functions in _Expr_ are very similar to functions in many programming languages.
In _Expr_ functions compute values in a local context (scope) that do not make effects on the calling context. This is the normal behavior. Using the reference operator [blue]`@` it is possibile to export local definition to the calling context.
==== Function calls ==== Function calls
#TODO: function calls operations# #TODO: function calls operations#
@@ -359,8 +373,13 @@ The table below shows all supported operators by decreasing priorities.
==== Function definitions ==== Function definitions
#TODO: function definitions operations# #TODO: function definitions operations#
==== Builtins === Builtins
#TODO: builtins# #TODO: builtins#
==== Builtin functions
==== [blue]_import()_
[blue]_import([grey]#<source-file>#)_ loads the multi-expression contained in the specified source and returns its value.
+2 -1
View File
@@ -12,6 +12,7 @@ import (
type Expr interface { type Expr interface {
Eval(ctx ExprContext) (result any, err error) Eval(ctx ExprContext) (result any, err error)
eval(ctx ExprContext, preset bool) (result any, err error) eval(ctx ExprContext, preset bool) (result any, err error)
String() string
} }
//-------- ast //-------- ast
@@ -118,7 +119,7 @@ func (self *ast) eval(ctx ExprContext, preset bool) (result any, err error) {
if self.forest != nil { if self.forest != nil {
for _, root := range self.forest { for _, root := range self.forest {
if result, err = root.compute(ctx); err == nil { if result, err = root.compute(ctx); err == nil {
ctx.setVar(control_last_result, result) ctx.setVar(ControlLastResult, result)
} else { } else {
//err = fmt.Errorf("error in expression nr %d: %v", i+1, err) //err = fmt.Errorf("error in expression nr %d: %v", i+1, err)
break break
+13 -10
View File
@@ -1,13 +1,16 @@
// preset.go // Copyright (c) 2024 Celestino Amoroso (celestino.amoroso@gmail.com).
// All rights reserved.
// control.go
package expr package expr
import "strings" import "strings"
// Preset control variables // Preset control variables
const ( const (
control_last_result = "_last" ControlLastResult = "last"
control_bool_shortcut = "_bool_shortcut" ControlBoolShortcut = "_bool_shortcut"
control_import_path = "_import_path" ControlImportPath = "_import_path"
) )
// Other control variables // Other control variables
@@ -21,23 +24,23 @@ const (
) )
func initDefaultVars(ctx ExprContext) { func initDefaultVars(ctx ExprContext) {
ctx.setVar(control_bool_shortcut, true) ctx.SetVar(ControlBoolShortcut, true)
ctx.setVar(control_import_path, init_import_path) ctx.SetVar(ControlImportPath, init_import_path)
} }
func enable(ctx ExprContext, name string) { func enable(ctx ExprContext, name string) {
if strings.HasPrefix(name, "_") { if strings.HasPrefix(name, "_") {
ctx.setVar(name, true) ctx.SetVar(name, true)
} else { } else {
ctx.setVar("_"+name, true) ctx.SetVar("_"+name, true)
} }
} }
func disable(ctx ExprContext, name string) { func disable(ctx ExprContext, name string) {
if strings.HasPrefix(name, "_") { if strings.HasPrefix(name, "_") {
ctx.setVar(name, false) ctx.SetVar(name, false)
} else { } else {
ctx.setVar("_"+name, false) ctx.SetVar("_"+name, false)
} }
} }
+70
View File
@@ -0,0 +1,70 @@
// Copyright (c) 2024 Celestino Amoroso (celestino.amoroso@gmail.com).
// All rights reserved.
// expr_test.go
package expr
import (
"fmt"
"strings"
"testing"
)
func TestExpr(t *testing.T) {
type inputType struct {
source string
wantResult any
wantErr error
}
inputs := []inputType{
/* 1 */ {`fact=func(n){(n)?{1}::{n*fact(n-1)}}; fact(5)`, int64(120), nil},
}
succeeded := 0
failed := 0
// inputs1 := []inputType{
// {`1 ? {"a"} : {"b"} ? ["a"] {"A"} :["b"] {"B"}`, "B", nil},
// }
for i, input := range inputs {
var expr Expr
var gotResult any
var gotErr error
ctx := NewSimpleFuncStore()
// ImportMathFuncs(ctx)
// ImportImportFunc(ctx)
parser := NewParser(ctx)
logTest(t, i+1, input.source, input.wantResult, input.wantErr)
r := strings.NewReader(input.source)
scanner := NewScanner(r, DefaultTranslations())
good := true
if expr, gotErr = parser.Parse(scanner); gotErr == nil {
gotResult, gotErr = expr.Eval(ctx)
}
if gotResult != input.wantResult {
t.Errorf("%d: %q -> result = %v [%T], want %v [%T]", i+1, input.source, gotResult, gotResult, input.wantResult, input.wantResult)
good = false
}
if gotErr != input.wantErr {
if input.wantErr == nil || gotErr == nil || (gotErr.Error() != input.wantErr.Error()) {
t.Errorf("%d: %q -> err = <%v>, want <%v>", i+1, input.source, gotErr, input.wantErr)
good = false
}
}
if good {
succeeded++
} else {
failed++
}
}
t.Log(fmt.Sprintf("test count: %d, succeeded count: %d, failed count: %d", len(inputs), succeeded, failed))
}
+5 -2
View File
@@ -1,3 +1,6 @@
// Copyright (c) 2024 Celestino Amoroso (celestino.amoroso@gmail.com).
// All rights reserved.
// func-import.go // func-import.go
package expr package expr
@@ -51,7 +54,7 @@ func addEnvImportDirs(dirList []string) []string {
} }
func addPresetImportDirs(ctx ExprContext, dirList []string) []string { func addPresetImportDirs(ctx ExprContext, dirList []string) []string {
if dirSpec, exists := getControlString(ctx, control_import_path); exists { if dirSpec, exists := getControlString(ctx, ControlImportPath); exists {
dirs := strings.Split(dirSpec, ":") dirs := strings.Split(dirSpec, ":")
if dirList == nil { if dirList == nil {
dirList = dirs dirList = dirs
@@ -133,7 +136,7 @@ func doImport(ctx ExprContext, name string, dirList []string, it Iterator) (resu
return return
} }
func importImportFunc(ctx ExprContext) { func ImportImportFunc(ctx ExprContext) {
ctx.RegisterFunc("import", &simpleFunctor{f: importFunc}, 1, -1) ctx.RegisterFunc("import", &simpleFunctor{f: importFunc}, 1, -1)
ctx.RegisterFunc("include", &simpleFunctor{f: includeFunc}, 1, -1) ctx.RegisterFunc("include", &simpleFunctor{f: includeFunc}, 1, -1)
} }
+4 -1
View File
@@ -1,3 +1,6 @@
// Copyright (c) 2024 Celestino Amoroso (celestino.amoroso@gmail.com).
// All rights reserved.
// funcs-math.go // funcs-math.go
package expr package expr
@@ -101,7 +104,7 @@ func mulFunc(ctx ExprContext, name string, args []any) (result any, err error) {
return return
} }
func importMathFuncs(ctx ExprContext) { func ImportMathFuncs(ctx ExprContext) {
ctx.RegisterFunc("add", &simpleFunctor{f: addFunc}, 0, -1) ctx.RegisterFunc("add", &simpleFunctor{f: addFunc}, 0, -1)
ctx.RegisterFunc("mul", &simpleFunctor{f: mulFunc}, 0, -1) ctx.RegisterFunc("mul", &simpleFunctor{f: mulFunc}, 0, -1)
} }
+122
View File
@@ -0,0 +1,122 @@
// Copyright (c) 2024 Celestino Amoroso (celestino.amoroso@gmail.com).
// All rights reserved.
// graph.go
package expr
import (
"fmt"
"strings"
)
func BuildGraph(root *term) (g string) {
//var sb strings.Builder
g = fmt.Sprintf("tree: %v", root)
r := NewReticle(root)
fmt.Println(r)
return
}
type NodeRef struct {
node *term
pos int
label string
}
type Level []*NodeRef
type Reticle struct {
levels []Level
left, right int
colsWidth []int
}
func NewExprReticle(e Expr) *Reticle {
tree, _ := e.(*ast)
return NewReticle(tree.root)
}
func NewReticle(tree *term) *Reticle {
r := &Reticle{levels: make([]Level, 0)}
r.build(tree, 0, 0)
r.computeCharWidth()
return r
}
func (r *Reticle) computeCharWidth() {
numCol := r.right - r.left + 1
r.colsWidth = make([]int, numCol)
for _, level := range r.levels {
for _, ref := range level {
c := ref.pos - r.left
if v := ref.node.value(); v != nil {
ref.label = fmt.Sprintf("%v", v)
} else {
ref.label = ref.node.source()
}
r.colsWidth[c] = max(r.colsWidth[c], len(ref.label)+2) // +2 to make room for brakets
}
}
}
func (r *Reticle) build(node *term, depth, pos int) {
var level Level
if node == nil {
return
}
if len(r.levels) == depth {
level = make(Level, 0)
r.levels = append(r.levels, level)
} else {
level = r.levels[depth]
}
ref := &NodeRef{node: node, pos: pos}
level = append(level, ref)
if r.left > pos {
r.left = pos
}
if r.right < pos {
r.right = pos
}
if node.children != nil {
halfPos := len(node.children) / 2
childPos := pos - halfPos - 1
for _, child := range node.children {
childPos++
if childPos == pos && (len(node.children)&1) == 0 {
childPos++
}
r.build(child, depth+1, childPos)
}
}
r.levels[depth] = level
}
func (r *Reticle) nodeInLevel(level []*NodeRef, index int) (node *NodeRef) {
for _, ref := range level {
if ref.pos-r.left == index {
node = ref
break
}
}
return
}
func (r *Reticle) String() string {
var sb strings.Builder
for _, level := range r.levels {
for j, w := range r.colsWidth {
var label string
if ref := r.nodeInLevel(level, j); ref != nil {
s := "(" + ref.label + ")"
label = fmt.Sprintf("%[1]*s", -w, fmt.Sprintf("%[1]*s", (w+len(s))/2, s))
} else {
label = strings.Repeat(" ", w)
}
sb.WriteString(label)
}
sb.WriteByte('\n')
}
return sb.String()
}
+33
View File
@@ -0,0 +1,33 @@
// Copyright (c) 2024 Celestino Amoroso (celestino.amoroso@gmail.com).
// All rights reserved.
// Copyright (c) 2024 Celestino Amoroso (celestino.amoroso@gmail.com).
// All rights reserved.
// graph_test.go
package expr
import (
"fmt"
"testing"
)
func TestGraph(t *testing.T) {
// tk0 := NewToken(0, 0, SymChangeSign, "-")
tk1 := NewValueToken(0, 0, SymInteger, "100", 100)
tk2 := NewToken(0, 0, SymPlus, "+")
tk3 := NewValueToken(0, 0, SymInteger, "200", 200)
tree := NewAst()
// tree.addToken(tk0)
tree.addToken(tk1)
tree.addToken(tk2)
tree.addToken(tk3)
tk4 := NewToken(0, 0, SymPlus, "-")
tk5 := NewValueToken(0, 0, SymInteger, "50", 50)
tree.addToken(tk4)
tree.addToken(tk5)
g := BuildGraph(tree.root)
fmt.Println(g)
}
+3
View File
@@ -1,3 +1,6 @@
// Copyright (c) 2024 Celestino Amoroso (celestino.amoroso@gmail.com).
// All rights reserved.
// helpers.go // helpers.go
package expr package expr
+3 -2
View File
@@ -1,3 +1,6 @@
// Copyright (c) 2024 Celestino Amoroso (celestino.amoroso@gmail.com).
// All rights reserved.
// helpers_test.go // helpers_test.go
package expr package expr
@@ -45,7 +48,6 @@ func TestEvalStringA(t *testing.T) {
t.Errorf("Source %q got %v, want %v", source, gotResult, wantResult) t.Errorf("Source %q got %v, want %v", source, gotResult, wantResult)
t.Errorf("Error: %v", gotErr) t.Errorf("Error: %v", gotErr)
} }
fmt.Println("Hello World!")
} }
func TestEvalString(t *testing.T) { func TestEvalString(t *testing.T) {
@@ -76,5 +78,4 @@ func TestEvalString(t *testing.T) {
t.Errorf("Source %q got %v, want %v", source, gotResult, wantResult) t.Errorf("Source %q got %v, want %v", source, gotResult, wantResult)
t.Errorf("Error: %v", gotErr) t.Errorf("Error: %v", gotErr)
} }
fmt.Println("Hello World!")
} }
+3
View File
@@ -1,3 +1,6 @@
// Copyright (c) 2024 Celestino Amoroso (celestino.amoroso@gmail.com).
// All rights reserved.
// it-range.go // it-range.go
package expr package expr
+3
View File
@@ -1,3 +1,6 @@
// Copyright (c) 2024 Celestino Amoroso (celestino.amoroso@gmail.com).
// All rights reserved.
// iterator.go // iterator.go
package expr package expr
+37 -4
View File
@@ -5,11 +5,15 @@
package expr package expr
// -------- list term // -------- list term
func newListTermA(args ...*term) *term {
return newListTerm(args)
}
func newListTerm(args []*term) *term { func newListTerm(args []*term) *term {
return &term{ return &term{
tk: *NewToken(0, 0, SymList, "[]"), tk: *NewValueToken(0, 0, SymList, "[]", args),
parent: nil, parent: nil,
children: args, children: nil,
position: posLeaf, position: posLeaf,
priority: priValue, priority: priValue,
evalFunc: evalList, evalFunc: evalList,
@@ -18,8 +22,9 @@ func newListTerm(args []*term) *term {
// -------- list func // -------- list func
func evalList(ctx ExprContext, self *term) (v any, err error) { func evalList(ctx ExprContext, self *term) (v any, err error) {
items := make([]any, len(self.children)) list, _ := self.value().([]*term)
for i, tree := range self.children { items := make([]any, len(list))
for i, tree := range list {
var param any var param any
if param, err = tree.compute(ctx); err != nil { if param, err = tree.compute(ctx); err != nil {
break break
@@ -31,3 +36,31 @@ func evalList(ctx ExprContext, self *term) (v any, err error) {
} }
return return
} }
// // -------- list term
// func newListTerm(args []*term) *term {
// return &term{
// tk: *NewToken(0, 0, SymList, "[]"),
// parent: nil,
// children: args,
// position: posLeaf,
// priority: priValue,
// evalFunc: evalList,
// }
// }
// // -------- list func
// func evalList(ctx ExprContext, self *term) (v any, err error) {
// items := make([]any, len(self.children))
// for i, tree := range self.children {
// var param any
// if param, err = tree.compute(ctx); err != nil {
// break
// }
// items[i] = param
// }
// if err == nil {
// v = items
// }
// return
// }
+16 -1
View File
@@ -4,7 +4,10 @@
// operand-selector-case.go // operand-selector-case.go
package expr package expr
import "fmt" import (
"fmt"
"strings"
)
// -------- selector case term // -------- selector case term
@@ -13,6 +16,18 @@ type selectorCase struct {
caseExpr Expr caseExpr Expr
} }
func (sc *selectorCase) String() string {
var sb strings.Builder
if sc.filterList != nil {
sc.filterList.toString(&sb)
sb.WriteByte(' ')
}
sb.WriteByte('{')
sb.WriteString(sc.caseExpr.String())
sb.WriteByte('}')
return sb.String()
}
func newSelectorCaseTerm(row, col int, filterList *term, caseExpr Expr) *term { func newSelectorCaseTerm(row, col int, filterList *term, caseExpr Expr) *term {
tk := NewValueToken(row, col, SymSelectorCase, "", &selectorCase{filterList: filterList, caseExpr: caseExpr}) tk := NewValueToken(row, col, SymSelectorCase, "", &selectorCase{filterList: filterList, caseExpr: caseExpr})
return &term{ return &term{
+2 -2
View File
@@ -48,7 +48,7 @@ func newAndTerm(tk *Token) (inst *term) {
} }
func evalAnd(ctx ExprContext, self *term) (v any, err error) { func evalAnd(ctx ExprContext, self *term) (v any, err error) {
if isEnabled(ctx, control_bool_shortcut) { if isEnabled(ctx, ControlBoolShortcut) {
v, err = evalAndWithShortcut(ctx, self) v, err = evalAndWithShortcut(ctx, self)
} else { } else {
v, err = evalAndWithoutShortcut(ctx, self) v, err = evalAndWithoutShortcut(ctx, self)
@@ -117,7 +117,7 @@ func newOrTerm(tk *Token) (inst *term) {
} }
func evalOr(ctx ExprContext, self *term) (v any, err error) { func evalOr(ctx ExprContext, self *term) (v any, err error) {
if isEnabled(ctx, control_bool_shortcut) { if isEnabled(ctx, ControlBoolShortcut) {
v, err = evalOrWithShortcut(ctx, self) v, err = evalOrWithShortcut(ctx, self)
} else { } else {
v, err = evalOrWithoutShortcut(ctx, self) v, err = evalOrWithoutShortcut(ctx, self)
+62 -4
View File
@@ -4,13 +4,71 @@
// operator-selector.go // operator-selector.go
package expr package expr
// //-------- export all term
// func newSelectorTerm(tk *Token) (inst *term) {
// return &term{
// tk: *tk,
// children: make([]*term, 0, 3),
// position: posMultifix,
// priority: priSelector,
// evalFunc: evalSelector,
// }
// }
// func isSelectorCase(ctx ExprContext, exprValue, caseSel any, caseIndex int) (selectedValue any, err error) {
// caseData, _ := caseSel.(*selectorCase)
// if caseData.filterList == nil {
// selectedValue, err = caseData.caseExpr.eval(ctx, false)
// } else {
// filterList := caseData.filterList.children
// if len(filterList) == 0 && exprValue == int64(caseIndex) {
// selectedValue, err = caseData.caseExpr.eval(ctx, false)
// } else {
// var caseValue any
// for _, caseTerm := range filterList {
// if caseValue, err = caseTerm.compute(ctx); err != nil || caseValue == exprValue {
// selectedValue, err = caseData.caseExpr.eval(ctx, false)
// break
// }
// }
// }
// }
// return
// }
// func evalSelector(ctx ExprContext, self *term) (v any, err error) {
// var exprValue any
// // var caseList []*term
// if err = self.checkOperands(); err != nil {
// return
// }
// exprTerm := self.children[0]
// if exprValue, err = exprTerm.compute(ctx); err != nil {
// return
// }
// caseList := self.children[1:]
// for i, caseTerm := range caseList {
// caseSel := caseTerm.value()
// if v, err = isSelectorCase(ctx, exprValue, caseSel, i); err != nil || v != nil {
// break
// }
// }
// if err == nil && v == nil {
// err = exprTerm.tk.Errorf("no case catches the value (%v) of the selection expression", exprValue)
// }
// return
// }
//-------- export all term //-------- export all term
func newSelectorTerm(tk *Token) (inst *term) { func newSelectorTerm(tk *Token) (inst *term) {
return &term{ return &term{
tk: *tk, tk: *tk,
children: make([]*term, 0, 3), children: make([]*term, 0, 3),
position: posMultifix, position: posInfix,
priority: priSelector, priority: priSelector,
evalFunc: evalSelector, evalFunc: evalSelector,
} }
@@ -20,8 +78,7 @@ func isSelectorCase(ctx ExprContext, exprValue, caseSel any, caseIndex int) (sel
caseData, _ := caseSel.(*selectorCase) caseData, _ := caseSel.(*selectorCase)
if caseData.filterList == nil { if caseData.filterList == nil {
selectedValue, err = caseData.caseExpr.eval(ctx, false) selectedValue, err = caseData.caseExpr.eval(ctx, false)
} else { } else if filterList, ok := caseData.filterList.value().([]*term); ok {
filterList := caseData.filterList.children
if len(filterList) == 0 && exprValue == int64(caseIndex) { if len(filterList) == 0 && exprValue == int64(caseIndex) {
selectedValue, err = caseData.caseExpr.eval(ctx, false) selectedValue, err = caseData.caseExpr.eval(ctx, false)
} else { } else {
@@ -49,7 +106,8 @@ func evalSelector(ctx ExprContext, self *term) (v any, err error) {
return return
} }
caseList := self.children[1:] caseListTerm := self.children[1]
caseList, _ := caseListTerm.value().([]*term)
for i, caseTerm := range caseList { for i, caseTerm := range caseList {
caseSel := caseTerm.value() caseSel := caseTerm.value()
if v, err = isSelectorCase(ctx, exprValue, caseSel, i); err != nil || v != nil { if v, err = isSelectorCase(ctx, exprValue, caseSel, i); err != nil || v != nil {
+21 -8
View File
@@ -154,6 +154,19 @@ func (self *parser) parseSelectorCase(scanner *scanner, allowVarRef bool, defaul
return return
} }
func addSelectorCase(selectorTerm, caseTerm *term) {
if len(selectorTerm.children) < 2 {
caseListTerm := newListTermA(caseTerm)
selectorTerm.children = append(selectorTerm.children, caseListTerm)
} else {
caseListTerm := selectorTerm.children[1]
caseList, _ := caseListTerm.value().([]*term)
caseList = append(caseList, caseTerm)
caseListTerm.tk.Value = caseList
}
caseTerm.parent = selectorTerm
}
func (self *parser) parseSelector(scanner *scanner, tree *ast, allowVarRef bool) (selectorTerm *term, err error) { func (self *parser) parseSelector(scanner *scanner, tree *ast, allowVarRef bool) (selectorTerm *term, err error) {
var caseTerm *term var caseTerm *term
tk := scanner.makeToken(SymSelector, '?') tk := scanner.makeToken(SymSelector, '?')
@@ -162,8 +175,9 @@ func (self *parser) parseSelector(scanner *scanner, tree *ast, allowVarRef bool)
} }
if caseTerm, err = self.parseSelectorCase(scanner, allowVarRef, false); err == nil { if caseTerm, err = self.parseSelectorCase(scanner, allowVarRef, false); err == nil {
selectorTerm.children = append(selectorTerm.children, caseTerm) addSelectorCase(selectorTerm, caseTerm)
caseTerm.parent = selectorTerm // selectorTerm.children = append(selectorTerm.children, caseTerm)
// caseTerm.parent = selectorTerm
} }
return return
} }
@@ -246,9 +260,7 @@ func (self *parser) parseGeneral(scanner *scanner, allowForest bool, allowVarRef
currentTerm, err = tree.addToken2(tk) currentTerm, err = tree.addToken2(tk)
} }
case SymQuestion: case SymQuestion:
/*if selectorTerm != nil { if selectorTerm, err = self.parseSelector(scanner, tree, allowVarRef); err == nil {
err = tk.Errorf("nested selectors must be enclosed in parentheses")
} else*/if selectorTerm, err = self.parseSelector(scanner, tree, allowVarRef); err == nil {
currentTerm = selectorTerm currentTerm = selectorTerm
} }
case SymColon, SymDoubleColon: case SymColon, SymDoubleColon:
@@ -256,8 +268,9 @@ func (self *parser) parseGeneral(scanner *scanner, allowForest bool, allowVarRef
if selectorTerm == nil { if selectorTerm == nil {
err = tk.Errorf("selector-case outside of a selector context") err = tk.Errorf("selector-case outside of a selector context")
} else if caseTerm, err = self.parseSelectorCase(scanner, allowVarRef, tk.Sym == SymDoubleColon); err == nil { } else if caseTerm, err = self.parseSelectorCase(scanner, allowVarRef, tk.Sym == SymDoubleColon); err == nil {
selectorTerm.children = append(selectorTerm.children, caseTerm) // selectorTerm.children = append(selectorTerm.children, caseTerm)
caseTerm.parent = selectorTerm // caseTerm.parent = selectorTerm
addSelectorCase(selectorTerm, caseTerm)
currentTerm = caseTerm currentTerm = caseTerm
if tk.Sym == SymDoubleColon { if tk.Sym == SymDoubleColon {
selectorTerm = nil selectorTerm = nil
@@ -268,7 +281,7 @@ func (self *parser) parseGeneral(scanner *scanner, allowForest bool, allowVarRef
currentTerm, err = tree.addToken2(tk) currentTerm, err = tree.addToken2(tk)
} }
if currentTerm != nil && currentTerm.parent != nil && currentTerm.parent.tk.Sym != SymSelector { if currentTerm != nil && currentTerm.tk.Sym != SymSelector && currentTerm.parent != nil && currentTerm.parent.tk.Sym != SymSelector {
selectorTerm = nil selectorTerm = nil
} }
+6 -5
View File
@@ -155,6 +155,7 @@ func TestParser(t *testing.T) {
/* 134 */ {`10 ? {"a"} : {"b"}`, nil, errors.New(`[1:3] no case catches the value (10) of the selection expression`)}, /* 134 */ {`10 ? {"a"} : {"b"}`, nil, errors.New(`[1:3] no case catches the value (10) of the selection expression`)},
/* 135 */ {`10 ? {"a"} :: {"b"} : {"c"}`, nil, errors.New(`[1:22] selector-case outside of a selector context`)}, /* 135 */ {`10 ? {"a"} :: {"b"} : {"c"}`, nil, errors.New(`[1:22] selector-case outside of a selector context`)},
/* 136 */ {`1 ? {"a"} : {"b"} ? ["a"] {"A"} :["b"] {"B"}`, "B", nil}, /* 136 */ {`1 ? {"a"} : {"b"} ? ["a"] {"A"} :["b"] {"B"}`, "B", nil},
/* 137 */ {`2 + 1 ? {"a"} : {"b"} * 3`, "2bbb", nil},
} }
check_env_expr_path := 113 check_env_expr_path := 113
@@ -162,7 +163,7 @@ func TestParser(t *testing.T) {
failed := 0 failed := 0
// inputs1 := []inputType{ // inputs1 := []inputType{
// {`1 ? {"a"} : {"b"} ? ["a"] {"A"} :["b"] {"B"}`, "B", nil}, // {`10 ? {"a"} :[true, 2+8] {"b"} :: {"c"}`, "b", nil},
// } // }
for i, input := range inputs { for i, input := range inputs {
@@ -173,8 +174,8 @@ func TestParser(t *testing.T) {
ctx := NewSimpleFuncStore() ctx := NewSimpleFuncStore()
ctx.SetVar("var1", int64(123)) ctx.SetVar("var1", int64(123))
ctx.SetVar("var2", "abc") ctx.SetVar("var2", "abc")
importMathFuncs(ctx) ImportMathFuncs(ctx)
importImportFunc(ctx) ImportImportFunc(ctx)
parser := NewParser(ctx) parser := NewParser(ctx)
logTest(t, i+1, input.source, input.wantResult, input.wantErr) logTest(t, i+1, input.source, input.wantResult, input.wantErr)
@@ -204,7 +205,7 @@ func TestParser(t *testing.T) {
} else { } else {
failed++ failed++
if i+1 == check_env_expr_path { if i+1 == check_env_expr_path {
t.Logf(`NOTICE: Test nr %d requires EXPR_PATH environment variable with value "."`, check_env_expr_path) t.Logf(`NOTICE: Test nr %d requires EXPR_PATH="."`, check_env_expr_path)
} }
} }
} }
@@ -249,7 +250,7 @@ func TestListParser(t *testing.T) {
ctx := NewSimpleFuncStore() ctx := NewSimpleFuncStore()
ctx.SetVar("var1", int64(123)) ctx.SetVar("var1", int64(123))
ctx.SetVar("var2", "abc") ctx.SetVar("var2", "abc")
importMathFuncs(ctx) ImportMathFuncs(ctx)
parser := NewParser(ctx) parser := NewParser(ctx)
logTest(t, i+1, input.source, input.wantResult, input.wantErr) logTest(t, i+1, input.source, input.wantResult, input.wantErr)
+3
View File
@@ -1,3 +1,6 @@
// Copyright (c) 2024 Celestino Amoroso (celestino.amoroso@gmail.com).
// All rights reserved.
// simple-func-store.go // simple-func-store.go
package expr package expr
+3
View File
@@ -1,3 +1,6 @@
// Copyright (c) 2024 Celestino Amoroso (celestino.amoroso@gmail.com).
// All rights reserved.
// simple-var-store.go // simple-var-store.go
package expr package expr
+3 -4
View File
@@ -5,7 +5,6 @@
package expr package expr
import ( import (
"fmt"
"testing" "testing"
) )
@@ -16,7 +15,7 @@ func TestString(t *testing.T) {
tree := NewAst() tree := NewAst()
if gotErr := tree.addTokens(tk1, tk2, tk3); gotErr == nil { if gotErr := tree.addTokens(tk1, tk2, tk3); gotErr == nil {
fmt.Println("Tree:", tree) t.Log("Tree:", tree)
} else { } else {
t.Errorf("err: got <%v>, want <nil>", gotErr) t.Errorf("err: got <%v>, want <nil>", gotErr)
} }
@@ -27,7 +26,7 @@ func TestGetRoom(t *testing.T) {
tree := NewAst() tree := NewAst()
if gotErr := tree.addTokens(tk1); gotErr == nil { if gotErr := tree.addTokens(tk1); gotErr == nil {
fmt.Println("Tree-root room:", tree.root.getRoom()) t.Log("Tree-root room:", tree.root.getRoom())
} else { } else {
t.Errorf("err: got <%v>, want <nil>", gotErr) t.Errorf("err: got <%v>, want <nil>", gotErr)
} }
@@ -37,7 +36,7 @@ func TestGetChildrenCount(t *testing.T) {
tree := NewAst() tree := NewAst()
if gotErr := tree.addTokens(tk1); gotErr == nil { if gotErr := tree.addTokens(tk1); gotErr == nil {
fmt.Println("Tree-root children count:", tree.root.getChildrenCount()) t.Log("Tree-root children count:", tree.root.getChildrenCount())
} else { } else {
t.Errorf("err: got <%v>, want <nil>", gotErr) t.Errorf("err: got <%v>, want <nil>", gotErr)
} }
+5 -1
View File
@@ -27,7 +27,11 @@ func (tk *Token) DevString() string {
func (tk *Token) String() string { func (tk *Token) String() string {
if tk.Value != nil { if tk.Value != nil {
return fmt.Sprintf("%#v", tk.Value) if s, ok := tk.Value.(string); ok {
return fmt.Sprintf("%q", s)
} else {
return fmt.Sprintf("%v", tk.Value)
}
} }
return fmt.Sprintf("%s", tk.source) return fmt.Sprintf("%s", tk.source)
} }
+25 -5
View File
@@ -5,14 +5,34 @@
package expr package expr
import ( import (
"fmt"
"testing" "testing"
) )
func TestDevString(t *testing.T) { func TestDevString(t *testing.T) {
tk1 := NewValueToken(0, 0, SymInteger, "100", 100) type inputType struct {
tk2 := NewToken(0, 0, SymPlus, "+") source string
sym Symbol
value any
wantResult string
}
fmt.Println("Token '100':", tk1.DevString()) inputs := []inputType{
fmt.Println("Token '+':", tk2.DevString()) /* 1 */ {"100", SymInteger, 100, `[55]"100"{100}`},
/* 2 */ {"+", SymPlus, nil, `[6]"+"{}`},
}
for i, input := range inputs {
var tk *Token
if input.value == nil {
tk = NewToken(0, 0, input.sym, input.source)
} else {
tk = NewValueToken(0, 0, input.sym, input.source, input.value)
}
t.Logf("Test nr %2d: %q --> %q", i+1, input.source, input.wantResult)
if s := tk.DevString(); s != input.wantResult {
t.Errorf("wrong token from symbol '+': expected %q, got %q", input.wantResult, s)
}
}
} }