moved scanner sources to package 'scan'
This commit is contained in:
+17
-15
@@ -7,47 +7,49 @@ package expr
|
||||
import (
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
"git.portale-stac.it/go-pkg/expr/scan"
|
||||
)
|
||||
|
||||
func TestAstString(t *testing.T) {
|
||||
tree := NewAst()
|
||||
tree := scan.NewAst()
|
||||
if gotResult := tree.String(); gotResult != "(nil)" {
|
||||
t.Errorf(`result: got %q, want "(nil)"`, gotResult)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAddTokensGood(t *testing.T) {
|
||||
tk1 := NewValueToken(0, 0, SymInteger, "100", 100)
|
||||
tk2 := NewToken(0, 0, SymPlus, "+")
|
||||
tk3 := NewValueToken(0, 0, SymInteger, "50", 500)
|
||||
tk1 := scan.NewValueToken(0, 0, scan.SymInteger, "100", 100)
|
||||
tk2 := scan.NewToken(0, 0, scan.SymPlus, "+")
|
||||
tk3 := scan.NewValueToken(0, 0, scan.SymInteger, "50", 500)
|
||||
|
||||
tree := NewAst()
|
||||
if gotErr := tree.addTokens(tk1, tk2, tk3); gotErr != nil {
|
||||
tree := scan.NewAst()
|
||||
if gotErr := tree.AddTokens(tk1, tk2, tk3); gotErr != nil {
|
||||
t.Errorf("err: got <%v>, want <nil>", gotErr)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAddTokensBad(t *testing.T) {
|
||||
tk0 := NewValueToken(0, 0, SymInteger, "200", 200)
|
||||
tk1 := NewValueToken(0, 0, SymInteger, "100", 100)
|
||||
tk2 := NewToken(0, 0, SymPlus, "+")
|
||||
tk3 := NewValueToken(0, 0, SymInteger, "50", 500)
|
||||
tk0 := scan.NewValueToken(0, 0, scan.SymInteger, "200", 200)
|
||||
tk1 := scan.NewValueToken(0, 0, scan.SymInteger, "100", 100)
|
||||
tk2 := scan.NewToken(0, 0, scan.SymPlus, "+")
|
||||
tk3 := scan.NewValueToken(0, 0, scan.SymInteger, "50", 500)
|
||||
|
||||
wantErr := errors.New(`[0:0] two adjacent operators: "200" and "100"`)
|
||||
|
||||
tree := NewAst()
|
||||
if gotErr := tree.addTokens(tk0, tk1, tk2, tk3); gotErr != nil && gotErr.Error() != wantErr.Error() {
|
||||
tree := scan.NewAst()
|
||||
if gotErr := tree.AddTokens(tk0, tk1, tk2, tk3); gotErr != nil && gotErr.Error() != wantErr.Error() {
|
||||
t.Errorf("err: got <%v>, want <nil>", gotErr)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAddUnknownTokens(t *testing.T) {
|
||||
tk0 := NewToken(0, 0, SymPercent, "%")
|
||||
tk0 := scan.NewToken(0, 0, scan.SymPercent, "%")
|
||||
|
||||
wantErr := errors.New(`unexpected token "%"`)
|
||||
|
||||
tree := NewAst()
|
||||
if _, gotErr := tree.addToken(tk0); gotErr != nil && gotErr.Error() != wantErr.Error() {
|
||||
tree := scan.NewAst()
|
||||
if _, gotErr := tree.AddToken(tk0); gotErr != nil && gotErr.Error() != wantErr.Error() {
|
||||
t.Errorf("err: got <%v>, want <%v>", gotErr, wantErr)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user