cli/q
1
0
Fork 0
Code Issues Pull requests Releases Activity

Reduced token size

Browse source
This commit is contained in:
Eduard Urbach 2024-07-21 14:35:06 +02:00
parent 7bfd0e731d
commit 1e3705df55
Signed by: eduard
GPG key ID: 49226B848C78F6C8
47 changed files with 543 additions and 764 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/build/expression/Expression_test.go
View file

@ -95,7 +95,7 @@ func TestParse(t *testing.T) {
defer expr.Reset()
assert.NotNil(t, expr)
assert.Equal(t, expr.String(), test.Result)
assert.Equal(t, expr.String(src), test.Result)
})
}
}
@ -104,11 +104,11 @@ func TestCount(t *testing.T) {
src := []byte("(a+b-c*d)+(a*b-c+d)")
tokens := token.Tokenize(src)
expr := expression.Parse(tokens)
assert.Equal(t, expr.Count(token.Identifier, "a"), 2)
assert.Equal(t, expr.Count(token.Identifier, "b"), 2)
assert.Equal(t, expr.Count(token.Identifier, "c"), 2)
assert.Equal(t, expr.Count(token.Identifier, "d"), 2)
assert.Equal(t, expr.Count(token.Identifier, "e"), 0)
assert.Equal(t, expr.Count(src, token.Identifier, "a"), 2)
assert.Equal(t, expr.Count(src, token.Identifier, "b"), 2)
assert.Equal(t, expr.Count(src, token.Identifier, "c"), 2)
assert.Equal(t, expr.Count(src, token.Identifier, "d"), 2)
assert.Equal(t, expr.Count(src, token.Identifier, "e"), 0)
}
func TestEachLeaf(t *testing.T) {
@ -118,7 +118,7 @@ func TestEachLeaf(t *testing.T) {
leaves := []string{}
err := expr.EachLeaf(func(leaf *expression.Expression) error {
leaves = append(leaves, leaf.Token.Text())
leaves = append(leaves, leaf.Token.Text(src))
return nil
})
@ -140,7 +140,7 @@ func TestEachParameter(t *testing.T) {
err := expression.EachParameter(tokens, func(parameter token.List) error {
expr := expression.Parse(parameter)
parameters = append(parameters, expr.String())
parameters = append(parameters, expr.String(src))
return nil
})
@ -178,17 +178,3 @@ func TestNilGroup(t *testing.T) {
expr := expression.Parse(tokens)
assert.Nil(t, expr)
}
func TestInvalidOperator(t *testing.T) {
src := []byte("a +++ 2")
tokens := token.Tokenize(src)
expr := expression.Parse(tokens)
assert.Equal(t, expr.String(), "(+++ a 2)")
}
func TestInvalidOperatorCall(t *testing.T) {
src := []byte("+++()")
tokens := token.Tokenize(src)
expr := expression.Parse(tokens)
assert.NotNil(t, expr)
}