go-pkg/expr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated some error messages; add some tests on the dict data-type; Use of reflect.DeepEqual() to compare the test results with the desired results.

Browse Source
This commit is contained in:
Celestino Amoroso 2024-04-26 04:43:36 +02:00
parent b14dc2f1ee
commit 7a88449cd1
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
parser_test.go
View File

@ -7,6 +7,7 @@ package expr
import ( import (
"errors" "errors"
"fmt" "fmt"
"reflect"
"strings" "strings"
"testing" "testing"
) )
@ -117,9 +118,9 @@ func TestParser(t *testing.T) {
/* 96 */ {`x=2 but x*10`, int64(20), nil}, /* 96 */ {`x=2 but x*10`, int64(20), nil},
/* 97 */ {`false and true`, false, nil}, /* 97 */ {`false and true`, false, nil},
/* 98 */ {`false and (x==2)`, false, nil}, /* 98 */ {`false and (x==2)`, false, nil},
/* 99 */ {`false and (x=2 but x==2) or x==2`, nil, errors.New(`undefined variable "x"`)}, /* 99 */ {`false and (x=2 but x==2) or x==2`, nil, errors.New(`undefined variable or function "x"`)},
/* 100 */ {`false or true`, true, nil}, /* 100 */ {`false or true`, true, nil},
/* 101 */ {`false or (x==2)`, nil, errors.New(`undefined variable "x"`)}, /* 101 */ {`false or (x==2)`, nil, errors.New(`undefined variable or function "x"`)},
/* 102 */ {`a=5; a`, int64(5), nil}, /* 102 */ {`a=5; a`, int64(5), nil},
/* 103 */ {`a=5; b=2; add(a, b*3)`, int64(11), nil}, /* 103 */ {`a=5; b=2; add(a, b*3)`, int64(11), nil},
/* 104 */ {`2=5`, nil, errors.New(`assign operator ("=") must be preceded by a variable`)}, /* 104 */ {`2=5`, nil, errors.New(`assign operator ("=") must be preceded by a variable`)},
@ -140,7 +141,7 @@ func TestParser(t *testing.T) {
/* 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"`)},
/* 120 */ {`f=func(){@x="hello"}; f(); x`, "hello", nil}, /* 120 */ {`f=func(){@x="hello"}; f(); x`, "hello", nil},
/* 121 */ {`f=func(@y){@y=@y+1}; f(2); y`, int64(3), nil}, /* 121 */ {`f=func(@y){@y=@y+1}; f(2); y`, int64(3), nil},
/* 122 */ {`f=func(@y){g=func(){@x=5}; @y=@y+g()}; f(2); y+x`, nil, errors.New(`undefined variable "x"`)}, /* 122 */ {`f=func(@y){g=func(){@x=5}; @y=@y+g()}; f(2); y+x`, nil, errors.New(`undefined variable or function "x"`)},
/* 123 */ {`f=func(@y){g=func(){@x=5}; @z=g(); @y=@y+@z}; f(2); y+z`, int64(12), nil}, /* 123 */ {`f=func(@y){g=func(){@x=5}; @z=g(); @y=@y+@z}; f(2); y+z`, int64(12), nil},
/* 124 */ {`f=func(@y){g=func(){@x=5}; g(); @z=x; @y=@y+@z}; f(2); y+z`, int64(12), nil}, /* 124 */ {`f=func(@y){g=func(){@x=5}; g(); @z=x; @y=@y+@z}; f(2); y+z`, int64(12), nil},
/* 125 */ {`f=func(@y){g=func(){@x=5}; g(); @z=x; @x=@y+@z}; f(2); y+x`, int64(9), nil}, /* 125 */ {`f=func(@y){g=func(){@x=5}; g(); @z=x; @x=@y+@z}; f(2); y+x`, int64(9), nil},
@ -157,8 +158,11 @@ func TestParser(t *testing.T) {
/* 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}, /* 138 */ {`nil`, nil, nil},
/* 139 */ {`null`, nil, errors.New(`undefined variable "null"`)}, /* 139 */ {`null`, nil, errors.New(`undefined variable or function "null"`)},
/* 140 */ //{`3^2`, int64(9), nil}, /* 140 */ {`{"key"}`, nil, errors.New(`[1:8] expected ":", got "}"`)},
/* 141 */ {`{"key":}`, nil, errors.New(`[1:9] expected dictionary value, got "}"`)},
/* 142 */ {`{}`, map[any]any{}, nil},
/* 144 */ //{`3^2`, int64(9), nil},
} }
check_env_expr_path := 113 check_env_expr_path := 113
@ -166,7 +170,7 @@ func TestParser(t *testing.T) {
failed := 0 failed := 0
// inputs1 := []inputType{ // inputs1 := []inputType{
// /* 140 */ {`3^2`, int64(9), nil}, // /* 140 */ {`ds={}; $(ds)`, nil, nil},
// } // }
for i, input := range inputs { for i, input := range inputs {
@ -191,7 +195,9 @@ func TestParser(t *testing.T) {
gotResult, gotErr = expr.Eval(ctx) gotResult, gotErr = expr.Eval(ctx)
} }
if gotResult != input.wantResult { eq := reflect.DeepEqual(gotResult, input.wantResult)
if !eq /*gotResult != input.wantResult*/ {
t.Errorf("%d: %q -> result = %v [%T], want %v [%T]", i+1, input.source, gotResult, gotResult, input.wantResult, input.wantResult) t.Errorf("%d: %q -> result = %v [%T], want %v [%T]", i+1, input.source, gotResult, gotResult, input.wantResult, input.wantResult)
good = false good = false
} }
@ -222,10 +228,6 @@ func TestListParser(t *testing.T) {
wantErr error wantErr error
} }
// inputs1 := []inputType{
// {`add(1,2,3)`, int64(6), nil},
// }
inputs := []inputType{ inputs := []inputType{
/* 1 */ {`[]`, []any{}, nil}, /* 1 */ {`[]`, []any{}, nil},
/* 2 */ {`[1,2,3]`, []any{int64(1), int64(2), int64(3)}, nil}, /* 2 */ {`[1,2,3]`, []any{int64(1), int64(2), int64(3)}, nil},
@ -245,6 +247,10 @@ func TestListParser(t *testing.T) {
succeeded := 0 succeeded := 0
failed := 0 failed := 0
// inputs1 := []inputType{
// /* 7 */ {`add([1,4,3,2])`, int64(10), nil},
// }
for i, input := range inputs { for i, input := range inputs {
var expr *ast var expr *ast
var gotResult any var gotResult any