Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ba1d887a05 | |||
| faff5a7e2c | |||
| 36f6846a3f |
@@ -5,6 +5,7 @@
|
|||||||
package expr
|
package expr
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -128,8 +129,8 @@ func (self *ast) eval(ctx ExprContext, preset bool) (result any, err error) {
|
|||||||
if err == nil {
|
if err == nil {
|
||||||
result, err = self.root.compute(ctx)
|
result, err = self.root.compute(ctx)
|
||||||
}
|
}
|
||||||
// } else {
|
} else {
|
||||||
// err = errors.New("empty expression")
|
err = errors.New("empty expression")
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-7
@@ -18,19 +18,18 @@ func TestExpr(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
inputs := []inputType{
|
inputs := []inputType{
|
||||||
/* 1 */ {`0?{}`, nil, nil},
|
/* 1 */ {`fact=func(n){(n)?{1}::{n*fact(n-1)}}; fact(5)`, int64(120), nil},
|
||||||
/* 2 */ {`fact=func(n){(n)?{1}::{n*fact(n-1)}}; fact(5)`, int64(120), nil},
|
|
||||||
/* 3 */ {`f=openFile("test-file.txt"); line=readFile(f); closeFile(f); line`, "uno", nil},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
succeeded := 0
|
succeeded := 0
|
||||||
failed := 0
|
failed := 0
|
||||||
|
|
||||||
// inputs1 := []inputType{
|
inputs1 := []inputType{
|
||||||
// /* 1 */ {`0?{}`, nil, nil},
|
{`f=openFile("/tmp/test2.txt"); line=readFile(f); closeFile(f); line`, "ciao", nil},
|
||||||
// }
|
//{`f = func(op){op()}; f(func(){2})`, int64(2), nil},
|
||||||
|
}
|
||||||
|
|
||||||
for i, input := range inputs {
|
for i, input := range inputs1 {
|
||||||
var expr Expr
|
var expr Expr
|
||||||
var gotResult any
|
var gotResult any
|
||||||
var gotErr error
|
var gotErr error
|
||||||
|
|||||||
@@ -1,55 +0,0 @@
|
|||||||
// Copyright (c) 2024 Celestino Amoroso (celestino.amoroso@gmail.com).
|
|
||||||
// All rights reserved.
|
|
||||||
|
|
||||||
// func-builtins.go
|
|
||||||
package expr
|
|
||||||
|
|
||||||
import (
|
|
||||||
"math"
|
|
||||||
"strconv"
|
|
||||||
)
|
|
||||||
|
|
||||||
func isNilFunc(ctx ExprContext, name string, args []any) (result any, err error) {
|
|
||||||
if len(args) == 1 {
|
|
||||||
result = args[0] == nil
|
|
||||||
} else {
|
|
||||||
err = errOneParam(name)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
func intFunc(ctx ExprContext, name string, args []any) (result any, err error) {
|
|
||||||
if len(args) == 1 {
|
|
||||||
switch v := args[0].(type) {
|
|
||||||
case int64:
|
|
||||||
result = v
|
|
||||||
case float64:
|
|
||||||
result = int64(math.Trunc(v))
|
|
||||||
case bool:
|
|
||||||
if v {
|
|
||||||
result = int64(1)
|
|
||||||
} else {
|
|
||||||
result = int64(0)
|
|
||||||
}
|
|
||||||
case string:
|
|
||||||
var i int
|
|
||||||
if i, err = strconv.Atoi(v); err == nil {
|
|
||||||
result = int64(i)
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
err = errCantConvert(name, v, "int")
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
err = errOneParam(name)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
func ImportBuiltinsFuncs(ctx ExprContext) {
|
|
||||||
ctx.RegisterFunc("isNil", &simpleFunctor{f: isNilFunc}, 1, -1)
|
|
||||||
ctx.RegisterFunc("int", &simpleFunctor{f: intFunc}, 1, -1)
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
registerImport("builtins", ImportBuiltinsFuncs)
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
// Copyright (c) 2024 Celestino Amoroso (celestino.amoroso@gmail.com).
|
|
||||||
// All rights reserved.
|
|
||||||
|
|
||||||
// func-common.go
|
|
||||||
package expr
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
)
|
|
||||||
|
|
||||||
func errOneParam(funcName string) error {
|
|
||||||
return fmt.Errorf("%s() requires exactly one param", funcName)
|
|
||||||
}
|
|
||||||
|
|
||||||
func errCantConvert(funcName string, value any, kind string) error {
|
|
||||||
return fmt.Errorf("%s() can't convert %T to %s", funcName, value, kind)
|
|
||||||
}
|
|
||||||
@@ -1,82 +0,0 @@
|
|||||||
// Copyright (c) 2024 Celestino Amoroso (celestino.amoroso@gmail.com).
|
|
||||||
// All rights reserved.
|
|
||||||
|
|
||||||
// funcs_test.go
|
|
||||||
package expr
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"strings"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestFuncs(t *testing.T) {
|
|
||||||
type inputType struct {
|
|
||||||
source string
|
|
||||||
wantResult any
|
|
||||||
wantErr error
|
|
||||||
}
|
|
||||||
|
|
||||||
inputs := []inputType{
|
|
||||||
/* 1 */ {`isNil(nil)`, true, nil},
|
|
||||||
/* 2 */ {`v=nil; isNil(v)`, true, nil},
|
|
||||||
/* 3 */ {`v=5; isNil(v)`, false, nil},
|
|
||||||
/* 4 */ {`int(true)`, int64(1), nil},
|
|
||||||
/* 5 */ {`int(false)`, int64(0), nil},
|
|
||||||
/* 6 */ {`int(3.1)`, int64(3), nil},
|
|
||||||
/* 7 */ {`int(3.9)`, int64(3), nil},
|
|
||||||
/* 8 */ {`int("432")`, int64(432), nil},
|
|
||||||
/* 9 */ {`int("1.5")`, nil, errors.New(`strconv.Atoi: parsing "1.5": invalid syntax`)},
|
|
||||||
/* 10 */ {`int("432", 4)`, nil, errors.New(`int() requires exactly one param`)},
|
|
||||||
/* 11 */ {`int(nil)`, nil, errors.New(`int() can't convert <nil> to int`)},
|
|
||||||
}
|
|
||||||
|
|
||||||
succeeded := 0
|
|
||||||
failed := 0
|
|
||||||
|
|
||||||
// inputs1 := []inputType{
|
|
||||||
// /* 1 */ {`0?{}`, nil, nil},
|
|
||||||
// }
|
|
||||||
|
|
||||||
for i, input := range inputs {
|
|
||||||
var expr Expr
|
|
||||||
var gotResult any
|
|
||||||
var gotErr error
|
|
||||||
|
|
||||||
ctx := NewSimpleFuncStore()
|
|
||||||
// ImportMathFuncs(ctx)
|
|
||||||
// ImportImportFunc(ctx)
|
|
||||||
// ImportOsFuncs(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))
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
First test
|
||||||
|
next commit
|
||||||
|
nr 3
|
||||||
+48
-7
@@ -4,10 +4,52 @@
|
|||||||
// operand-const.go
|
// operand-const.go
|
||||||
package expr
|
package expr
|
||||||
|
|
||||||
// -------- const term
|
// -------- bool const term
|
||||||
func newConstTerm(tk *Token) *term {
|
func newBoolTerm(tk *Token) *term {
|
||||||
return &term{
|
return &term{
|
||||||
tk: *tk,
|
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,
|
||||||
|
children: nil,
|
||||||
|
position: posLeaf,
|
||||||
|
priority: priValue,
|
||||||
|
evalFunc: evalConst,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// -------- 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,
|
parent: nil,
|
||||||
children: nil,
|
children: nil,
|
||||||
position: posLeaf,
|
position: posLeaf,
|
||||||
@@ -24,9 +66,8 @@ func evalConst(ctx ExprContext, self *term) (v any, err error) {
|
|||||||
|
|
||||||
// init
|
// init
|
||||||
func init() {
|
func init() {
|
||||||
registerTermConstructor(SymString, newConstTerm)
|
registerTermConstructor(SymString, newStringTerm)
|
||||||
registerTermConstructor(SymInteger, newConstTerm)
|
registerTermConstructor(SymInteger, newIntegerTerm)
|
||||||
registerTermConstructor(SymFloat, newConstTerm)
|
registerTermConstructor(SymFloat, newFloatTerm)
|
||||||
registerTermConstructor(SymBool, newConstTerm)
|
registerTermConstructor(SymBool, newBoolTerm)
|
||||||
registerTermConstructor(SymKwNil, newConstTerm)
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -74,21 +74,18 @@ func newSelectorTerm(tk *Token) (inst *term) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func isSelectorCase(ctx ExprContext, exprValue, caseSel any, caseIndex int) (match bool, selectedValue any, err error) {
|
func isSelectorCase(ctx ExprContext, exprValue, caseSel any, caseIndex int) (selectedValue any, err error) {
|
||||||
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)
|
||||||
match = true
|
|
||||||
} else if filterList, ok := caseData.filterList.value().([]*term); ok {
|
} else if filterList, ok := caseData.filterList.value().([]*term); ok {
|
||||||
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)
|
||||||
match = true
|
|
||||||
} else {
|
} else {
|
||||||
var caseValue any
|
var caseValue any
|
||||||
for _, caseTerm := range filterList {
|
for _, caseTerm := range filterList {
|
||||||
if caseValue, err = caseTerm.compute(ctx); err != nil || caseValue == exprValue {
|
if caseValue, err = caseTerm.compute(ctx); err != nil || caseValue == exprValue {
|
||||||
selectedValue, err = caseData.caseExpr.eval(ctx, false)
|
selectedValue, err = caseData.caseExpr.eval(ctx, false)
|
||||||
match = true
|
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -99,7 +96,7 @@ func isSelectorCase(ctx ExprContext, exprValue, caseSel any, caseIndex int) (mat
|
|||||||
|
|
||||||
func evalSelector(ctx ExprContext, self *term) (v any, err error) {
|
func evalSelector(ctx ExprContext, self *term) (v any, err error) {
|
||||||
var exprValue any
|
var exprValue any
|
||||||
var match bool
|
// var caseList []*term
|
||||||
|
|
||||||
if err = self.checkOperands(); err != nil {
|
if err = self.checkOperands(); err != nil {
|
||||||
return
|
return
|
||||||
@@ -113,11 +110,11 @@ func evalSelector(ctx ExprContext, self *term) (v any, err error) {
|
|||||||
caseList, _ := caseListTerm.value().([]*term)
|
caseList, _ := caseListTerm.value().([]*term)
|
||||||
for i, caseTerm := range caseList {
|
for i, caseTerm := range caseList {
|
||||||
caseSel := caseTerm.value()
|
caseSel := caseTerm.value()
|
||||||
if match, v, err = isSelectorCase(ctx, exprValue, caseSel, i); err != nil || match {
|
if v, err = isSelectorCase(ctx, exprValue, caseSel, i); err != nil || v != nil {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if err == nil && !match {
|
if err == nil && v == nil {
|
||||||
err = exprTerm.tk.Errorf("no case catches the value (%v) of the selection expression", exprValue)
|
err = exprTerm.tk.Errorf("no case catches the value (%v) of the selection expression", exprValue)
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
|
|||||||
+14
-16
@@ -63,8 +63,8 @@ func TestParser(t *testing.T) {
|
|||||||
/* 42 */ {`"s" + true`, nil, errors.New(`[1:6] left operand 's' [string] and right operand 'true' [bool] are not compatible with operator "+"`)},
|
/* 42 */ {`"s" + true`, nil, errors.New(`[1:6] left operand 's' [string] and right operand 'true' [bool] are not compatible with operator "+"`)},
|
||||||
/* 43 */ {`+false`, nil, errors.New(`[1:2] prefix/postfix operator "+" do not support operand 'false' [bool]`)},
|
/* 43 */ {`+false`, nil, errors.New(`[1:2] prefix/postfix operator "+" do not support operand 'false' [bool]`)},
|
||||||
/* 44 */ {`false // very simple expression`, false, nil},
|
/* 44 */ {`false // very simple expression`, false, nil},
|
||||||
/* 45 */ {`1 + // Missing right operator`, nil, errors.New(`[1:4] infix operator "+" requires two non-nil operands, got 1`)},
|
/* 45 */ {`1 + // Missing right operator`, nil, errors.New(`[1:4] infix operator "+" requires two not nil operands, got 1`)},
|
||||||
/* 46 */ {"", nil, nil},
|
/* 46 */ {"", nil, errors.New(`empty expression`)},
|
||||||
/* 47 */ {"4!", int64(24), nil},
|
/* 47 */ {"4!", int64(24), nil},
|
||||||
/* 48 */ {"(-4)!", nil, errors.New(`factorial of a negative integer (-4) is not allowed`)},
|
/* 48 */ {"(-4)!", nil, errors.New(`factorial of a negative integer (-4) is not allowed`)},
|
||||||
/* 49 */ {"-4!", int64(-24), nil},
|
/* 49 */ {"-4!", int64(-24), nil},
|
||||||
@@ -78,16 +78,16 @@ func TestParser(t *testing.T) {
|
|||||||
/* 57 */ {`"1.5" > "7"`, false, nil},
|
/* 57 */ {`"1.5" > "7"`, false, nil},
|
||||||
/* 58 */ {`"1.5" == "7"`, false, nil},
|
/* 58 */ {`"1.5" == "7"`, false, nil},
|
||||||
/* 59 */ {`"1.5" != "7"`, true, nil},
|
/* 59 */ {`"1.5" != "7"`, true, nil},
|
||||||
/* 60 */ {"1.5 < ", nil, errors.New(`[1:6] infix operator "<" requires two non-nil operands, got 1`)},
|
/* 60 */ {"1.5 < ", nil, errors.New(`[1:6] infix operator "<" requires two not nil operands, got 1`)},
|
||||||
/* 61 */ {"1.5 > ", nil, errors.New(`[1:6] infix operator ">" requires two non-nil operands, got 1`)},
|
/* 61 */ {"1.5 > ", nil, errors.New(`[1:6] infix operator ">" requires two not nil operands, got 1`)},
|
||||||
/* 62 */ {"1.5 <= ", nil, errors.New(`[1:6] infix operator "<=" requires two non-nil operands, got 1`)},
|
/* 62 */ {"1.5 <= ", nil, errors.New(`[1:6] infix operator "<=" requires two not nil operands, got 1`)},
|
||||||
/* 63 */ {"1.5 >= ", nil, errors.New(`[1:6] infix operator ">=" requires two non-nil operands, got 1`)},
|
/* 63 */ {"1.5 >= ", nil, errors.New(`[1:6] infix operator ">=" requires two not nil operands, got 1`)},
|
||||||
/* 64 */ {"1.5 != ", nil, errors.New(`[1:6] infix operator "!=" requires two non-nil operands, got 1`)},
|
/* 64 */ {"1.5 != ", nil, errors.New(`[1:6] infix operator "!=" requires two not nil operands, got 1`)},
|
||||||
/* 65 */ {"1.5 == ", nil, errors.New(`[1:6] infix operator "==" requires two non-nil operands, got 1`)},
|
/* 65 */ {"1.5 == ", nil, errors.New(`[1:6] infix operator "==" requires two not nil operands, got 1`)},
|
||||||
/* 66 */ {`"1.5" < `, nil, errors.New(`[1:8] infix operator "<" requires two non-nil operands, got 1`)},
|
/* 66 */ {`"1.5" < `, nil, errors.New(`[1:8] infix operator "<" requires two not nil operands, got 1`)},
|
||||||
/* 67 */ {`"1.5" > `, nil, errors.New(`[1:8] infix operator ">" requires two non-nil operands, got 1`)},
|
/* 67 */ {`"1.5" > `, nil, errors.New(`[1:8] infix operator ">" requires two not nil operands, got 1`)},
|
||||||
/* 68 */ {`"1.5" == `, nil, errors.New(`[1:8] infix operator "==" requires two non-nil operands, got 1`)},
|
/* 68 */ {`"1.5" == `, nil, errors.New(`[1:8] infix operator "==" requires two not nil operands, got 1`)},
|
||||||
/* 69 */ {`"1.5" != `, nil, errors.New(`[1:8] infix operator "!=" requires two non-nil operands, got 1`)},
|
/* 69 */ {`"1.5" != `, nil, errors.New(`[1:8] infix operator "!=" requires two not nil operands, got 1`)},
|
||||||
/* 70 */ {"+1.5", float64(1.5), nil},
|
/* 70 */ {"+1.5", float64(1.5), nil},
|
||||||
/* 71 */ {"+", nil, errors.New(`[1:2] prefix operator "+" requires one not nil operand`)},
|
/* 71 */ {"+", nil, errors.New(`[1:2] prefix operator "+" requires one not nil operand`)},
|
||||||
/* 72 */ {"4 / 0", nil, errors.New(`division by zero`)},
|
/* 72 */ {"4 / 0", nil, errors.New(`division by zero`)},
|
||||||
@@ -134,7 +134,7 @@ func TestParser(t *testing.T) {
|
|||||||
/* 113 */ {`import("test-funcs.expr"); (double(3+a) + 1) * two()`, int64(34), nil},
|
/* 113 */ {`import("test-funcs.expr"); (double(3+a) + 1) * two()`, int64(34), nil},
|
||||||
/* 114 */ {`x ?? "default"`, "default", nil},
|
/* 114 */ {`x ?? "default"`, "default", nil},
|
||||||
/* 115 */ {`x="hello"; x ?? "default"`, "hello", nil},
|
/* 115 */ {`x="hello"; x ?? "default"`, "hello", nil},
|
||||||
/* 116 */ {`x ?? func(){}`, nil, errors.New(`[1:14] the right operand of a coalescing operation cannot be a function definition`)},
|
/* 116 */ {`x ?? func(){}"`, nil, errors.New(`[1:15] the right operand of a coalescing operation cannot be a function definition`)},
|
||||||
/* 117 */ {`x ?= "default"; x`, "default", nil},
|
/* 117 */ {`x ?= "default"; x`, "default", nil},
|
||||||
/* 118 */ {`x="hello"; x ?= "default"; x`, "hello", nil},
|
/* 118 */ {`x="hello"; x ?= "default"; x`, "hello", nil},
|
||||||
/* 119 */ {`@x="hello"; @x`, nil, errors.New(`[1:3] variable references are not allowed in top level expressions: "@x"`)},
|
/* 119 */ {`@x="hello"; @x`, nil, errors.New(`[1:3] variable references are not allowed in top level expressions: "@x"`)},
|
||||||
@@ -156,8 +156,6 @@ func TestParser(t *testing.T) {
|
|||||||
/* 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},
|
/* 137 */ {`2 + 1 ? {"a"} : {"b"} * 3`, "2bbb", nil},
|
||||||
/* 138 */ {`nil`, nil, nil},
|
|
||||||
/* 139 */ {`null`, nil, errors.New(`undefined variable "null"`)},
|
|
||||||
}
|
}
|
||||||
check_env_expr_path := 113
|
check_env_expr_path := 113
|
||||||
|
|
||||||
@@ -165,7 +163,7 @@ func TestParser(t *testing.T) {
|
|||||||
failed := 0
|
failed := 0
|
||||||
|
|
||||||
// inputs1 := []inputType{
|
// inputs1 := []inputType{
|
||||||
// /* 140 */ {`isNil(nil)`, true, nil},
|
// {`10 ? {"a"} :[true, 2+8] {"b"} :: {"c"}`, "b", nil},
|
||||||
// }
|
// }
|
||||||
|
|
||||||
for i, input := range inputs {
|
for i, input := range inputs {
|
||||||
|
|||||||
+2
-2
@@ -36,7 +36,7 @@ func TestScanner(t *testing.T) {
|
|||||||
/* 14 */ {`:`, SymColon, nil, nil},
|
/* 14 */ {`:`, SymColon, nil, nil},
|
||||||
/* 15 */ {`;`, SymSemiColon, nil, nil},
|
/* 15 */ {`;`, SymSemiColon, nil, nil},
|
||||||
/* 16 */ {`.`, SymDot, nil, nil},
|
/* 16 */ {`.`, SymDot, nil, nil},
|
||||||
/* 17 */ {`0.5`, SymFloat, float64(0.5), nil},
|
/* 17 */ {`.5`, SymFloat, float64(0.5), nil},
|
||||||
/* 18 */ {`\\`, SymBackSlash, nil, nil},
|
/* 18 */ {`\\`, SymBackSlash, nil, nil},
|
||||||
/* 19 */ {"`", SymBackTick, nil, nil},
|
/* 19 */ {"`", SymBackTick, nil, nil},
|
||||||
/* 20 */ {"?", SymQuestion, nil, nil},
|
/* 20 */ {"?", SymQuestion, nil, nil},
|
||||||
@@ -74,7 +74,7 @@ func TestScanner(t *testing.T) {
|
|||||||
scanner := NewScanner(r, nil)
|
scanner := NewScanner(r, nil)
|
||||||
|
|
||||||
if tk := scanner.Next(); tk == nil {
|
if tk := scanner.Next(); tk == nil {
|
||||||
t.Errorf("%d: %q -> got = (nil), want %v (value %v [%T])", i+1, input.source, input.wantSym, input.wantValue, input.wantValue)
|
t.Errorf("%d: %q -> got = (nil), want %v (value %v [%T)", i+1, input.source, input.wantSym, input.wantValue, input.wantValue)
|
||||||
} else if tk.Sym != input.wantSym || tk.Value != input.wantValue {
|
} else if tk.Sym != input.wantSym || tk.Value != input.wantValue {
|
||||||
if tk.Sym == SymError && input.wantSym == tk.Sym {
|
if tk.Sym == SymError && input.wantSym == tk.Sym {
|
||||||
if tkErr, tkOk := tk.Value.(error); tkOk {
|
if tkErr, tkOk := tk.Value.(error); tkOk {
|
||||||
|
|||||||
@@ -35,12 +35,10 @@ func (info *funcInfo) Functor() Functor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func NewSimpleFuncStore() *SimpleFuncStore {
|
func NewSimpleFuncStore() *SimpleFuncStore {
|
||||||
ctx := &SimpleFuncStore{
|
return &SimpleFuncStore{
|
||||||
SimpleVarStore: SimpleVarStore{varStore: make(map[string]any)},
|
SimpleVarStore: SimpleVarStore{varStore: make(map[string]any)},
|
||||||
funcStore: make(map[string]*funcInfo),
|
funcStore: make(map[string]*funcInfo),
|
||||||
}
|
}
|
||||||
ImportBuiltinsFuncs(ctx)
|
|
||||||
return ctx
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ctx *SimpleFuncStore) Clone() ExprContext {
|
func (ctx *SimpleFuncStore) Clone() ExprContext {
|
||||||
|
|||||||
@@ -90,7 +90,6 @@ const (
|
|||||||
SymKwBut
|
SymKwBut
|
||||||
SymKwFunc
|
SymKwFunc
|
||||||
SymKwBuiltin
|
SymKwBuiltin
|
||||||
SymKwNil
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var keywords map[string]Symbol
|
var keywords map[string]Symbol
|
||||||
@@ -104,6 +103,5 @@ func init() {
|
|||||||
"FUNC": SymKwFunc,
|
"FUNC": SymKwFunc,
|
||||||
"NOT": SymKwNot,
|
"NOT": SymKwNot,
|
||||||
"OR": SymKwOr,
|
"OR": SymKwOr,
|
||||||
"NIL": SymKwNil,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
uno
|
|
||||||
due
|
|
||||||
+2
-3
@@ -5,7 +5,6 @@
|
|||||||
package expr
|
package expr
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -18,8 +17,8 @@ func TestDevString(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
inputs := []inputType{
|
inputs := []inputType{
|
||||||
/* 1 */ {"100", SymInteger, 100, fmt.Sprintf(`[%d]"100"{100}`, SymInteger)},
|
/* 1 */ {"100", SymInteger, 100, `[55]"100"{100}`},
|
||||||
/* 2 */ {"+", SymPlus, nil, fmt.Sprintf(`[%d]"+"{}`, SymPlus)},
|
/* 2 */ {"+", SymPlus, nil, `[6]"+"{}`},
|
||||||
}
|
}
|
||||||
|
|
||||||
for i, input := range inputs {
|
for i, input := range inputs {
|
||||||
|
|||||||
Reference in New Issue
Block a user