diff --git a/parser/test-common.go b/parser/test-common.go index 6cb90a7..74e3f82 100644 --- a/parser/test-common.go +++ b/parser/test-common.go @@ -3,12 +3,18 @@ package parser import "io" import "testing" import "strings" +import "git.tebibyte.media/sashakoshka/fspl/lexer" import "git.tebibyte.media/sashakoshka/fspl/errors" import "git.tebibyte.media/sashakoshka/fspl/testcommon" func testString (test *testing.T, correct string, input string) { ast := Tree { } - err := ast.Parse("input.fspl", strings.NewReader(input)) + lx, err := lexer.LexReader("input.fspl", strings.NewReader(input)) + if err != nil && err != io.EOF{ + test.Error("lexer returned error:\n" + errors.Format(err)) + return + } + err = ast.Parse(lx) if err != nil && err != io.EOF{ test.Error("parser returned error:\n" + errors.Format(err)) return