diff options
author | Ryo Nihei <nihei.dev@gmail.com> | 2021-05-05 13:35:45 +0900 |
---|---|---|
committer | Ryo Nihei <nihei.dev@gmail.com> | 2021-05-05 13:35:45 +0900 |
commit | 7e8f997b3093962c55b001c62619438f473610a5 (patch) | |
tree | 70ced0a088256aca018b4340f2279a242da8ea75 /driver | |
parent | Improve performance of the symbolPositionSet (diff) | |
download | tre-7e8f997b3093962c55b001c62619438f473610a5.tar.gz tre-7e8f997b3093962c55b001c62619438f473610a5.tar.xz |
Remove Peek* functions
Diffstat (limited to 'driver')
-rw-r--r-- | driver/lexer.go | 26 | ||||
-rw-r--r-- | driver/lexer_test.go | 60 |
2 files changed, 0 insertions, 86 deletions
diff --git a/driver/lexer.go b/driver/lexer.go index 72a6f69..486ff7d 100644 --- a/driver/lexer.go +++ b/driver/lexer.go @@ -201,32 +201,6 @@ func (l *lexer) Next() (*Token, error) { return errTok, nil } -func (l *lexer) Peek1() (*Token, error) { - return l.peekN(0) -} - -func (l *lexer) Peek2() (*Token, error) { - return l.peekN(1) -} - -func (l *lexer) Peek3() (*Token, error) { - return l.peekN(2) -} - -func (l *lexer) peekN(n int) (*Token, error) { - if n < 0 || n > 2 { - return nil, fmt.Errorf("peekN() can handle only [0..2]") - } - for len(l.tokBuf) < n+1 { - tok, err := l.nextAndTranMode() - if err != nil { - return nil, err - } - l.tokBuf = append(l.tokBuf, tok) - } - return l.tokBuf[n], nil -} - func (l *lexer) nextAndTranMode() (*Token, error) { tok, err := l.next() if err != nil { diff --git a/driver/lexer_test.go b/driver/lexer_test.go index d3edb3c..e819078 100644 --- a/driver/lexer_test.go +++ b/driver/lexer_test.go @@ -551,66 +551,6 @@ func TestLexer_Next(t *testing.T) { } } -func TestLexer_PeekN(t *testing.T) { - clspec, err := compiler.Compile(&spec.LexSpec{ - Entries: []*spec.LexEntry{ - newLexEntryDefaultNOP("t1", "foo"), - newLexEntryDefaultNOP("t2", "bar"), - }, - }) - if err != nil { - t.Fatalf("unexpected error occurred: %v", err) - } - lex, err := NewLexer(clspec, strings.NewReader("foobar")) - if err != nil { - t.Fatalf("unexpected error occurred: %v", err) - } - - expectedTokens := []*Token{ - newTokenDefault(1, "t1", []byte("foo")), - newTokenDefault(2, "t2", []byte("bar")), - newEOFTokenDefault(), - } - - tok, err := lex.Peek1() - if err != nil { - t.Fatalf("unexpected error occurred: %v", err) - } - if tok == nil { - t.Fatalf("token is nil") - } - testToken(t, expectedTokens[0], tok) - - tok, err = lex.Peek2() - if err != nil { - t.Fatalf("unexpected error occurred: %v", err) - } - if tok == nil { - t.Fatalf("token is nil") - } - testToken(t, expectedTokens[1], tok) - - tok, err = lex.Peek3() - if err != nil { - t.Fatalf("unexpected error occurred: %v", err) - } - if tok == nil { - t.Fatalf("token is nil") - } - testToken(t, expectedTokens[2], tok) - - for _, eTok := range expectedTokens { - tok, err = lex.Next() - if err != nil { - t.Fatalf("unexpected error occurred: %v", err) - } - if tok == nil { - t.Fatalf("token is nil") - } - testToken(t, eTok, tok) - } -} - func testToken(t *testing.T, expected, actual *Token) { t.Helper() |