1 files changed, 18 insertions, 33 deletions

diff --git a/driver/spec.go b/driver/spec.go
index 71935b4..a935577 100644
--- a/driver/spec.go
+++ b/driver/spec.go
@@ -1,84 +1,69 @@
 package driver
 
-import (
-	mldriver "github.com/nihei9/maleeni/driver"
-	"github.com/nihei9/vartan/spec"
-)
+import "github.com/nihei9/vartan/spec"
 
-type gram struct {
+type grammarImpl struct {
 	g *spec.CompiledGrammar
 }
 
-func NewGrammar(g *spec.CompiledGrammar) *gram {
-	return &gram{
+func NewGrammar(g *spec.CompiledGrammar) *grammarImpl {
+	return &grammarImpl{
 		g: g,
 	}
 }
 
-func (g *gram) LexicalSpecification() mldriver.LexSpec {
-	return mldriver.NewLexSpec(g.g.LexicalSpecification.Maleeni.Spec)
-}
-
-func (g *gram) Class() string {
+func (g *grammarImpl) Class() string {
 	return g.g.ParsingTable.Class
 }
 
-func (g *gram) InitialState() int {
+func (g *grammarImpl) InitialState() int {
 	return g.g.ParsingTable.InitialState
 }
 
-func (g *gram) StartProduction() int {
+func (g *grammarImpl) StartProduction() int {
 	return g.g.ParsingTable.StartProduction
 }
 
-func (g *gram) RecoverProduction(prod int) bool {
+func (g *grammarImpl) RecoverProduction(prod int) bool {
 	return g.g.ParsingTable.RecoverProductions[prod] != 0
 }
 
-func (g *gram) Action(state int, terminal int) int {
+func (g *grammarImpl) Action(state int, terminal int) int {
 	return g.g.ParsingTable.Action[state*g.g.ParsingTable.TerminalCount+terminal]
 }
 
-func (g *gram) GoTo(state int, lhs int) int {
+func (g *grammarImpl) GoTo(state int, lhs int) int {
 	return g.g.ParsingTable.GoTo[state*g.g.ParsingTable.NonTerminalCount+lhs]
 }
 
-func (g *gram) AlternativeSymbolCount(prod int) int {
+func (g *grammarImpl) AlternativeSymbolCount(prod int) int {
 	return g.g.ParsingTable.AlternativeSymbolCounts[prod]
 }
 
-func (g *gram) TerminalCount() int {
+func (g *grammarImpl) TerminalCount() int {
 	return g.g.ParsingTable.TerminalCount
 }
 
-func (g *gram) ErrorTrapperState(state int) bool {
+func (g *grammarImpl) ErrorTrapperState(state int) bool {
 	return g.g.ParsingTable.ErrorTrapperStates[state] != 0
 }
 
-func (g *gram) LHS(prod int) int {
+func (g *grammarImpl) LHS(prod int) int {
 	return g.g.ParsingTable.LHSSymbols[prod]
 }
 
-func (g *gram) EOF() int {
+func (g *grammarImpl) EOF() int {
 	return g.g.ParsingTable.EOFSymbol
 }
 
-func (g *gram) Error() int {
+func (g *grammarImpl) Error() int {
 	return g.g.ParsingTable.ErrorSymbol
 }
 
-func (g *gram) Terminal(terminal int) string {
+func (g *grammarImpl) Terminal(terminal int) string {
 	return g.g.ParsingTable.Terminals[terminal]
 }
 
-func (g *gram) TerminalAlias(terminal int) string {
+func (g *grammarImpl) TerminalAlias(terminal int) string {
 	return g.g.LexicalSpecification.Maleeni.KindAliases[terminal]
 }
-
-func (g *gram) Skip(kind mldriver.KindID) bool {
-	return g.g.LexicalSpecification.Maleeni.Skip[kind] > 0
-}
-
-func (g *gram) LexicalKindToTerminal(kind mldriver.KindID) int {
-	return g.g.LexicalSpecification.Maleeni.KindToTerminal[kind]
-}