aboutsummaryrefslogtreecommitdiff
path: root/driver/parser
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--driver/parser/conflict_test.go (renamed from driver/conflict_test.go)13
-rw-r--r--driver/parser/lac_test.go (renamed from driver/lac_test.go)13
-rw-r--r--driver/parser/parser.go (renamed from driver/parser.go)2
-rw-r--r--driver/parser/parser_test.go (renamed from driver/parser_test.go)13
-rw-r--r--driver/parser/semantic_action.go (renamed from driver/semantic_action.go)2
-rw-r--r--driver/parser/semantic_action_test.go (renamed from driver/semantic_action_test.go)18
-rw-r--r--driver/parser/spec.go (renamed from driver/spec.go)30
-rw-r--r--driver/parser/syntax_error_test.go (renamed from driver/syntax_error_test.go)22
-rw-r--r--driver/parser/template.go (renamed from driver/template.go)34
-rw-r--r--driver/parser/token_stream.go (renamed from driver/token_stream.go)12
10 files changed, 65 insertions, 94 deletions
diff --git a/driver/conflict_test.go b/driver/parser/conflict_test.go
index 3b0c5fb..21b829a 100644
--- a/driver/conflict_test.go
+++ b/driver/parser/conflict_test.go
@@ -1,11 +1,11 @@
-package driver
+package parser
import (
"strings"
"testing"
"github.com/nihei9/vartan/grammar"
- spec "github.com/nihei9/vartan/spec/grammar"
+ "github.com/nihei9/vartan/spec/grammar/parser"
)
func TestParserWithConflicts(t *testing.T) {
@@ -486,7 +486,7 @@ assign: '=';
for _, tt := range tests {
t.Run(tt.caption, func(t *testing.T) {
- ast, err := spec.Parse(strings.NewReader(tt.specSrc))
+ ast, err := parser.Parse(strings.NewReader(tt.specSrc))
if err != nil {
t.Fatal(err)
}
@@ -494,12 +494,7 @@ assign: '=';
b := grammar.GrammarBuilder{
AST: ast,
}
- g, err := b.Build()
- if err != nil {
- t.Fatal(err)
- }
-
- cg, _, err := grammar.Compile(g)
+ cg, _, err := b.Build()
if err != nil {
t.Fatal(err)
}
diff --git a/driver/lac_test.go b/driver/parser/lac_test.go
index 2274583..14bd2cf 100644
--- a/driver/lac_test.go
+++ b/driver/parser/lac_test.go
@@ -1,11 +1,11 @@
-package driver
+package parser
import (
"strings"
"testing"
"github.com/nihei9/vartan/grammar"
- spec "github.com/nihei9/vartan/spec/grammar"
+ "github.com/nihei9/vartan/spec/grammar/parser"
)
func TestParserWithLAC(t *testing.T) {
@@ -43,7 +43,7 @@ d: 'd';
"miss",
}
- ast, err := spec.Parse(strings.NewReader(specSrc))
+ ast, err := parser.Parse(strings.NewReader(specSrc))
if err != nil {
t.Fatal(err)
}
@@ -51,12 +51,7 @@ d: 'd';
b := grammar.GrammarBuilder{
AST: ast,
}
- g, err := b.Build()
- if err != nil {
- t.Fatal(err)
- }
-
- gram, _, err := grammar.Compile(g)
+ gram, _, err := b.Build()
if err != nil {
t.Fatal(err)
}
diff --git a/driver/parser.go b/driver/parser/parser.go
index a152c3d..05f7d38 100644
--- a/driver/parser.go
+++ b/driver/parser/parser.go
@@ -1,4 +1,4 @@
-package driver
+package parser
import (
"fmt"
diff --git a/driver/parser_test.go b/driver/parser/parser_test.go
index da4f714..b1b9e4f 100644
--- a/driver/parser_test.go
+++ b/driver/parser/parser_test.go
@@ -1,4 +1,4 @@
-package driver
+package parser
import (
"fmt"
@@ -6,7 +6,7 @@ import (
"testing"
"github.com/nihei9/vartan/grammar"
- spec "github.com/nihei9/vartan/spec/grammar"
+ "github.com/nihei9/vartan/spec/grammar/parser"
)
func termNode(kind string, text string, children ...*Node) *Node {
@@ -765,7 +765,7 @@ bar: 'bar';
for i, tt := range tests {
t.Run(fmt.Sprintf("#%v", i), func(t *testing.T) {
- ast, err := spec.Parse(strings.NewReader(tt.specSrc))
+ ast, err := parser.Parse(strings.NewReader(tt.specSrc))
if err != nil {
t.Fatal(err)
}
@@ -773,12 +773,7 @@ bar: 'bar';
b := grammar.GrammarBuilder{
AST: ast,
}
- g, err := b.Build()
- if err != nil {
- t.Fatal(err)
- }
-
- cg, _, err := grammar.Compile(g)
+ cg, _, err := b.Build()
if err != nil {
t.Fatal(err)
}
diff --git a/driver/semantic_action.go b/driver/parser/semantic_action.go
index 7e5a773..f709d4f 100644
--- a/driver/semantic_action.go
+++ b/driver/parser/semantic_action.go
@@ -1,4 +1,4 @@
-package driver
+package parser
import (
"encoding/json"
diff --git a/driver/semantic_action_test.go b/driver/parser/semantic_action_test.go
index 3d5f711..c98a12f 100644
--- a/driver/semantic_action_test.go
+++ b/driver/parser/semantic_action_test.go
@@ -1,4 +1,4 @@
-package driver
+package parser
import (
"fmt"
@@ -7,6 +7,7 @@ import (
"github.com/nihei9/vartan/grammar"
spec "github.com/nihei9/vartan/spec/grammar"
+ "github.com/nihei9/vartan/spec/grammar/parser"
)
type testSemAct struct {
@@ -15,7 +16,7 @@ type testSemAct struct {
}
func (a *testSemAct) Shift(tok VToken, recovered bool) {
- t := a.gram.ParsingTable.Terminals[tok.TerminalID()]
+ t := a.gram.Syntactic.Terminals[tok.TerminalID()]
if recovered {
a.actLog = append(a.actLog, fmt.Sprintf("shift/%v/recovered", t))
} else {
@@ -24,8 +25,8 @@ func (a *testSemAct) Shift(tok VToken, recovered bool) {
}
func (a *testSemAct) Reduce(prodNum int, recovered bool) {
- lhsSym := a.gram.ParsingTable.LHSSymbols[prodNum]
- lhsText := a.gram.ParsingTable.NonTerminals[lhsSym]
+ lhsSym := a.gram.Syntactic.LHSSymbols[prodNum]
+ lhsText := a.gram.Syntactic.NonTerminals[lhsSym]
if recovered {
a.actLog = append(a.actLog, fmt.Sprintf("reduce/%v/recovered", lhsText))
} else {
@@ -181,7 +182,7 @@ char
}
for _, tt := range tests {
t.Run(tt.caption, func(t *testing.T) {
- ast, err := spec.Parse(strings.NewReader(tt.specSrc))
+ ast, err := parser.Parse(strings.NewReader(tt.specSrc))
if err != nil {
t.Fatal(err)
}
@@ -189,12 +190,7 @@ char
b := grammar.GrammarBuilder{
AST: ast,
}
- g, err := b.Build()
- if err != nil {
- t.Fatal(err)
- }
-
- gram, _, err := grammar.Compile(g)
+ gram, _, err := b.Build()
if err != nil {
t.Fatal(err)
}
diff --git a/driver/spec.go b/driver/parser/spec.go
index cf3c7b0..1d57bae 100644
--- a/driver/spec.go
+++ b/driver/parser/spec.go
@@ -1,4 +1,4 @@
-package driver
+package parser
import spec "github.com/nihei9/vartan/spec/grammar"
@@ -13,59 +13,59 @@ func NewGrammar(g *spec.CompiledGrammar) *grammarImpl {
}
func (g *grammarImpl) InitialState() int {
- return g.g.ParsingTable.InitialState
+ return g.g.Syntactic.InitialState
}
func (g *grammarImpl) StartProduction() int {
- return g.g.ParsingTable.StartProduction
+ return g.g.Syntactic.StartProduction
}
func (g *grammarImpl) RecoverProduction(prod int) bool {
- return g.g.ParsingTable.RecoverProductions[prod] != 0
+ return g.g.Syntactic.RecoverProductions[prod] != 0
}
func (g *grammarImpl) Action(state int, terminal int) int {
- return g.g.ParsingTable.Action[state*g.g.ParsingTable.TerminalCount+terminal]
+ return g.g.Syntactic.Action[state*g.g.Syntactic.TerminalCount+terminal]
}
func (g *grammarImpl) GoTo(state int, lhs int) int {
- return g.g.ParsingTable.GoTo[state*g.g.ParsingTable.NonTerminalCount+lhs]
+ return g.g.Syntactic.GoTo[state*g.g.Syntactic.NonTerminalCount+lhs]
}
func (g *grammarImpl) AlternativeSymbolCount(prod int) int {
- return g.g.ParsingTable.AlternativeSymbolCounts[prod]
+ return g.g.Syntactic.AlternativeSymbolCounts[prod]
}
func (g *grammarImpl) TerminalCount() int {
- return g.g.ParsingTable.TerminalCount
+ return g.g.Syntactic.TerminalCount
}
func (g *grammarImpl) SkipTerminal(terminal int) bool {
- return g.g.ParsingTable.TerminalSkip[terminal] == 1
+ return g.g.Syntactic.TerminalSkip[terminal] == 1
}
func (g *grammarImpl) ErrorTrapperState(state int) bool {
- return g.g.ParsingTable.ErrorTrapperStates[state] != 0
+ return g.g.Syntactic.ErrorTrapperStates[state] != 0
}
func (g *grammarImpl) NonTerminal(nonTerminal int) string {
- return g.g.ParsingTable.NonTerminals[nonTerminal]
+ return g.g.Syntactic.NonTerminals[nonTerminal]
}
func (g *grammarImpl) LHS(prod int) int {
- return g.g.ParsingTable.LHSSymbols[prod]
+ return g.g.Syntactic.LHSSymbols[prod]
}
func (g *grammarImpl) EOF() int {
- return g.g.ParsingTable.EOFSymbol
+ return g.g.Syntactic.EOFSymbol
}
func (g *grammarImpl) Error() int {
- return g.g.ParsingTable.ErrorSymbol
+ return g.g.Syntactic.ErrorSymbol
}
func (g *grammarImpl) Terminal(terminal int) string {
- return g.g.ParsingTable.Terminals[terminal]
+ return g.g.Syntactic.Terminals[terminal]
}
func (g *grammarImpl) ASTAction(prod int) []int {
diff --git a/driver/syntax_error_test.go b/driver/parser/syntax_error_test.go
index 683e355..71175be 100644
--- a/driver/syntax_error_test.go
+++ b/driver/parser/syntax_error_test.go
@@ -1,4 +1,4 @@
-package driver
+package parser
import (
"fmt"
@@ -7,7 +7,7 @@ import (
"testing"
"github.com/nihei9/vartan/grammar"
- spec "github.com/nihei9/vartan/spec/grammar"
+ "github.com/nihei9/vartan/spec/grammar/parser"
)
func TestParserWithSyntaxErrors(t *testing.T) {
@@ -123,7 +123,7 @@ c
}
for i, tt := range tests {
t.Run(fmt.Sprintf("#%v", i), func(t *testing.T) {
- ast, err := spec.Parse(strings.NewReader(tt.specSrc))
+ ast, err := parser.Parse(strings.NewReader(tt.specSrc))
if err != nil {
t.Fatal(err)
}
@@ -131,12 +131,7 @@ c
b := grammar.GrammarBuilder{
AST: ast,
}
- g, err := b.Build()
- if err != nil {
- t.Fatal(err)
- }
-
- gram, _, err := grammar.Compile(g)
+ gram, _, err := b.Build()
if err != nil {
t.Fatal(err)
}
@@ -253,7 +248,7 @@ foo
}
for i, tt := range tests {
t.Run(fmt.Sprintf("#%v", i), func(t *testing.T) {
- ast, err := spec.Parse(strings.NewReader(tt.specSrc))
+ ast, err := parser.Parse(strings.NewReader(tt.specSrc))
if err != nil {
t.Fatal(err)
}
@@ -261,12 +256,7 @@ foo
b := grammar.GrammarBuilder{
AST: ast,
}
- g, err := b.Build()
- if err != nil {
- t.Fatal(err)
- }
-
- gram, _, err := grammar.Compile(g)
+ gram, _, err := b.Build()
if err != nil {
t.Fatal(err)
}
diff --git a/driver/template.go b/driver/parser/template.go
index 321b2dd..96eb71f 100644
--- a/driver/template.go
+++ b/driver/parser/template.go
@@ -1,4 +1,4 @@
-package driver
+package parser
import (
"bytes"
@@ -49,12 +49,12 @@ func GenParser(cgram *spec.CompiledGrammar, pkgName string) ([]byte, error) {
var b strings.Builder
err = t.Execute(&b, map[string]interface{}{
- "initialState": cgram.ParsingTable.InitialState,
- "startProduction": cgram.ParsingTable.StartProduction,
- "terminalCount": cgram.ParsingTable.TerminalCount,
- "nonTerminalCount": cgram.ParsingTable.NonTerminalCount,
- "eofSymbol": cgram.ParsingTable.EOFSymbol,
- "errorSymbol": cgram.ParsingTable.ErrorSymbol,
+ "initialState": cgram.Syntactic.InitialState,
+ "startProduction": cgram.Syntactic.StartProduction,
+ "terminalCount": cgram.Syntactic.TerminalCount,
+ "nonTerminalCount": cgram.Syntactic.NonTerminalCount,
+ "eofSymbol": cgram.Syntactic.EOFSymbol,
+ "errorSymbol": cgram.Syntactic.ErrorSymbol,
})
if err != nil {
return nil, err
@@ -233,7 +233,7 @@ func genGrammarTemplateFuncs(cgram *spec.CompiledGrammar) template.FuncMap {
var b strings.Builder
fmt.Fprintf(&b, "[]int{\n")
c := 1
- for _, v := range cgram.ParsingTable.RecoverProductions {
+ for _, v := range cgram.Syntactic.RecoverProductions {
fmt.Fprintf(&b, "%v, ", v)
if c == 20 {
fmt.Fprintf(&b, "\n")
@@ -252,7 +252,7 @@ func genGrammarTemplateFuncs(cgram *spec.CompiledGrammar) template.FuncMap {
var b strings.Builder
fmt.Fprintf(&b, "[]int{\n")
c := 1
- for _, v := range cgram.ParsingTable.Action {
+ for _, v := range cgram.Syntactic.Action {
fmt.Fprintf(&b, "%v, ", v)
if c == 20 {
fmt.Fprintf(&b, "\n")
@@ -271,7 +271,7 @@ func genGrammarTemplateFuncs(cgram *spec.CompiledGrammar) template.FuncMap {
var b strings.Builder
fmt.Fprintf(&b, "[]int{\n")
c := 1
- for _, v := range cgram.ParsingTable.GoTo {
+ for _, v := range cgram.Syntactic.GoTo {
fmt.Fprintf(&b, "%v, ", v)
if c == 20 {
fmt.Fprintf(&b, "\n")
@@ -290,7 +290,7 @@ func genGrammarTemplateFuncs(cgram *spec.CompiledGrammar) template.FuncMap {
var b strings.Builder
fmt.Fprintf(&b, "[]int{\n")
c := 1
- for _, v := range cgram.ParsingTable.AlternativeSymbolCounts {
+ for _, v := range cgram.Syntactic.AlternativeSymbolCounts {
fmt.Fprintf(&b, "%v, ", v)
if c == 20 {
fmt.Fprintf(&b, "\n")
@@ -309,7 +309,7 @@ func genGrammarTemplateFuncs(cgram *spec.CompiledGrammar) template.FuncMap {
var b strings.Builder
fmt.Fprintf(&b, "[]int{\n")
c := 1
- for _, v := range cgram.ParsingTable.ErrorTrapperStates {
+ for _, v := range cgram.Syntactic.ErrorTrapperStates {
fmt.Fprintf(&b, "%v, ", v)
if c == 20 {
fmt.Fprintf(&b, "\n")
@@ -327,7 +327,7 @@ func genGrammarTemplateFuncs(cgram *spec.CompiledGrammar) template.FuncMap {
"genNonTerminals": func() string {
var b strings.Builder
fmt.Fprintf(&b, "[]string{\n")
- for _, v := range cgram.ParsingTable.NonTerminals {
+ for _, v := range cgram.Syntactic.NonTerminals {
fmt.Fprintf(&b, "%v,\n", strconv.Quote(v))
}
fmt.Fprintf(&b, "}")
@@ -337,7 +337,7 @@ func genGrammarTemplateFuncs(cgram *spec.CompiledGrammar) template.FuncMap {
var b strings.Builder
fmt.Fprintf(&b, "[]int{\n")
c := 1
- for _, v := range cgram.ParsingTable.LHSSymbols {
+ for _, v := range cgram.Syntactic.LHSSymbols {
fmt.Fprintf(&b, "%v, ", v)
if c == 20 {
fmt.Fprintf(&b, "\n")
@@ -355,7 +355,7 @@ func genGrammarTemplateFuncs(cgram *spec.CompiledGrammar) template.FuncMap {
"genTerminals": func() string {
var b strings.Builder
fmt.Fprintf(&b, "[]string{\n")
- for _, v := range cgram.ParsingTable.Terminals {
+ for _, v := range cgram.Syntactic.Terminals {
fmt.Fprintf(&b, "%v,\n", strconv.Quote(v))
}
fmt.Fprintf(&b, "}")
@@ -365,7 +365,7 @@ func genGrammarTemplateFuncs(cgram *spec.CompiledGrammar) template.FuncMap {
var b strings.Builder
fmt.Fprintf(&b, "[]int{\n")
c := 1
- for _, v := range cgram.ParsingTable.TerminalSkip {
+ for _, v := range cgram.Syntactic.TerminalSkip {
fmt.Fprintf(&b, "%v, ", v)
if c == 20 {
fmt.Fprintf(&b, "\n")
@@ -473,7 +473,7 @@ func genLexerTemplateFuncs(cgram *spec.CompiledGrammar) template.FuncMap {
var b strings.Builder
fmt.Fprintf(&b, "[]int{\n")
c := 1
- for _, v := range cgram.LexicalSpecification.Maleeni.KindToTerminal {
+ for _, v := range cgram.Syntactic.KindToTerminal {
fmt.Fprintf(&b, "%v, ", v)
if c == 20 {
fmt.Fprintf(&b, "\n")
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
}
generated by cgit v1.2.3 (git 2.49.0) at 2025-07-22 23:12:50 +0000