diff options
Diffstat (limited to '')
| -rw-r--r-- | driver/parser/token_stream.go (renamed from driver/token_stream.go) | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/driver/token_stream.go b/driver/parser/token_stream.go index eaf56c6..0bc9e32 100644 --- a/driver/token_stream.go +++ b/driver/parser/token_stream.go @@ -1,15 +1,15 @@ -package driver +package parser import ( "io" - mldriver "github.com/nihei9/maleeni/driver" + "github.com/nihei9/vartan/driver/lexer" spec "github.com/nihei9/vartan/spec/grammar" ) type vToken struct { terminalID int - tok *mldriver.Token + tok *lexer.Token } func (t *vToken) TerminalID() int { @@ -33,19 +33,19 @@ func (t *vToken) Position() (int, int) { } type tokenStream struct { - lex *mldriver.Lexer + lex *lexer.Lexer kindToTerminal []int } func NewTokenStream(g *spec.CompiledGrammar, src io.Reader) (TokenStream, error) { - lex, err := mldriver.NewLexer(mldriver.NewLexSpec(g.LexicalSpecification.Maleeni.Spec), src) + lex, err := lexer.NewLexer(lexer.NewLexSpec(g.Lexical), src) if err != nil { return nil, err } return &tokenStream{ lex: lex, - kindToTerminal: g.LexicalSpecification.Maleeni.KindToTerminal, + kindToTerminal: g.Syntactic.KindToTerminal, }, nil } |