diff options
| -rw-r--r-- | cmd/vartan/parse.go | 2 | ||||
| -rw-r--r-- | driver/parser/semantic_action.go | 20 | ||||
| -rw-r--r-- | tester/tester.go | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/cmd/vartan/parse.go b/cmd/vartan/parse.go index f21a03b..8b3e34e 100644 --- a/cmd/vartan/parse.go +++ b/cmd/vartan/parse.go @@ -60,7 +60,7 @@ func runParse(cmd *cobra.Command, args []string) error { var p *driver.Parser var treeAct *driver.SyntaxTreeActionSet - var tb *driver.DefaulSyntaxTreeBuilder + var tb *driver.DefaultSyntaxTreeBuilder { src := os.Stdin if *parseFlags.source != "" { diff --git a/driver/parser/semantic_action.go b/driver/parser/semantic_action.go index f709d4f..1e8079c 100644 --- a/driver/parser/semantic_action.go +++ b/driver/parser/semantic_action.go @@ -55,20 +55,20 @@ type SyntaxTreeBuilder interface { Accept(f SyntaxTreeNode) } -var _ SyntaxTreeBuilder = &DefaulSyntaxTreeBuilder{} +var _ SyntaxTreeBuilder = &DefaultSyntaxTreeBuilder{} -// DefaulSyntaxTreeBuilder is a implementation of SyntaxTreeBuilder. -type DefaulSyntaxTreeBuilder struct { +// DefaultSyntaxTreeBuilder is a implementation of SyntaxTreeBuilder. +type DefaultSyntaxTreeBuilder struct { tree *Node } // NewDefaultSyntaxTreeBuilder returns a new DefaultSyntaxTreeBuilder. -func NewDefaultSyntaxTreeBuilder() *DefaulSyntaxTreeBuilder { - return &DefaulSyntaxTreeBuilder{} +func NewDefaultSyntaxTreeBuilder() *DefaultSyntaxTreeBuilder { + return &DefaultSyntaxTreeBuilder{} } // Shift is a implementation of SyntaxTreeBuilder.Shift. -func (b *DefaulSyntaxTreeBuilder) Shift(kindName string, text string, row, col int) SyntaxTreeNode { +func (b *DefaultSyntaxTreeBuilder) Shift(kindName string, text string, row, col int) SyntaxTreeNode { return &Node{ Type: NodeTypeTerminal, KindName: kindName, @@ -79,7 +79,7 @@ func (b *DefaulSyntaxTreeBuilder) Shift(kindName string, text string, row, col i } // ShiftError is a implementation of SyntaxTreeBuilder.ShiftError. -func (b *DefaulSyntaxTreeBuilder) ShiftError(kindName string) SyntaxTreeNode { +func (b *DefaultSyntaxTreeBuilder) ShiftError(kindName string) SyntaxTreeNode { return &Node{ Type: NodeTypeError, KindName: kindName, @@ -87,7 +87,7 @@ func (b *DefaulSyntaxTreeBuilder) ShiftError(kindName string) SyntaxTreeNode { } // Reduce is a implementation of SyntaxTreeBuilder.Reduce. -func (b *DefaulSyntaxTreeBuilder) Reduce(kindName string, children []SyntaxTreeNode) SyntaxTreeNode { +func (b *DefaultSyntaxTreeBuilder) Reduce(kindName string, children []SyntaxTreeNode) SyntaxTreeNode { cNodes := make([]*Node, len(children)) for i, c := range children { cNodes[i] = c.(*Node) @@ -100,12 +100,12 @@ func (b *DefaulSyntaxTreeBuilder) Reduce(kindName string, children []SyntaxTreeN } // Accept is a implementation of SyntaxTreeBuilder.Accept. -func (b *DefaulSyntaxTreeBuilder) Accept(f SyntaxTreeNode) { +func (b *DefaultSyntaxTreeBuilder) Accept(f SyntaxTreeNode) { b.tree = f.(*Node) } // Tree returns a syntax tree when the parser has accepted an input. If a syntax error occurs, the return value is nil. -func (b *DefaulSyntaxTreeBuilder) Tree() *Node { +func (b *DefaultSyntaxTreeBuilder) Tree() *Node { return b.tree } diff --git a/tester/tester.go b/tester/tester.go index 3e6941f..0fb27b9 100644 --- a/tester/tester.go +++ b/tester/tester.go @@ -108,7 +108,7 @@ func (t *Tester) Run() []*TestResult { func runTest(g *gspec.CompiledGrammar, c *TestCaseWithMetadata) *TestResult { var p *driver.Parser - var tb *driver.DefaulSyntaxTreeBuilder + var tb *driver.DefaultSyntaxTreeBuilder { gram := driver.NewGrammar(g) toks, err := driver.NewTokenStream(g, bytes.NewReader(c.TestCase.Source)) |