Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

protoparse: make lexer do fewer allocations #251

Merged
merged 2 commits into from Jul 26, 2019
Merged

protoparse: make lexer do fewer allocations #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c021b0
don't allocate so many comment and SourcePos structs in heap
jhump Jul 26, 2019
ea3c16c
hoist lambdas out to methods on protoLex
jhump Jul 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
76 changes: 38 additions & 38 deletions desc/protoparse/ast.go
View file
Open in desktop
Expand Up @@ -33,14 +33,14 @@ func unknownPos(filename string) *SourcePos {
type node interface {
start() *SourcePos
end() *SourcePos
leadingComments() []*comment
trailingComments() []*comment
leadingComments() []comment
trailingComments() []comment
}

type terminalNode interface {
node
popLeadingComment() *comment
pushTrailingComment(*comment)
popLeadingComment() comment
pushTrailingComment(comment)
}

var _ terminalNode = (*basicNode)(nil)
Expand Down Expand Up @@ -120,38 +120,38 @@ var _ methodDecl = (*methodNode)(nil)
var _ methodDecl = (*noSourceNode)(nil)

type posRange struct {
start, end *SourcePos
start, end SourcePos
}

type basicNode struct {
posRange
leading []*comment
trailing []*comment
leading []comment
trailing []comment
}

func (n *basicNode) start() *SourcePos {
return n.posRange.start
return &n.posRange.start
}

func (n *basicNode) end() *SourcePos {
return n.posRange.end
return &n.posRange.end
}

func (n *basicNode) leadingComments() []*comment {
func (n *basicNode) leadingComments() []comment {
return n.leading
}

func (n *basicNode) trailingComments() []*comment {
func (n *basicNode) trailingComments() []comment {
return n.trailing
}

func (n *basicNode) popLeadingComment() *comment {
func (n *basicNode) popLeadingComment() comment {
c := n.leading[0]
n.leading = n.leading[1:]
return c
}

func (n *basicNode) pushTrailingComment(c *comment) {
func (n *basicNode) pushTrailingComment(c comment) {
n.trailing = append(n.trailing, c)
}

Expand All @@ -173,11 +173,11 @@ func (n *basicCompositeNode) end() *SourcePos {
return n.last.end()
}

func (n *basicCompositeNode) leadingComments() []*comment {
func (n *basicCompositeNode) leadingComments() []comment {
return n.first.leadingComments()
}

func (n *basicCompositeNode) trailingComments() []*comment {
func (n *basicCompositeNode) trailingComments() []comment {
return n.last.trailingComments()
}

Expand Down Expand Up @@ -216,11 +216,11 @@ func (n *fileElement) end() *SourcePos {
return n.get().end()
}

func (n *fileElement) leadingComments() []*comment {
func (n *fileElement) leadingComments() []comment {
return n.get().leadingComments()
}

func (n *fileElement) trailingComments() []*comment {
func (n *fileElement) trailingComments() []comment {
return n.get().trailingComments()
}

Expand Down Expand Up @@ -282,11 +282,11 @@ func (n *identNode) value() interface{} {
return identifier(n.val)
}

func (n *identNode) popLeadingComment() *comment {
func (n *identNode) popLeadingComment() comment {
return n.first.(terminalNode).popLeadingComment()
}

func (n *identNode) pushTrailingComment(c *comment) {
func (n *identNode) pushTrailingComment(c comment) {
n.last.(terminalNode).pushTrailingComment(c)
}

Expand Down Expand Up @@ -380,11 +380,11 @@ func (n *stringLiteralNode) value() interface{} {
return n.val
}

func (n *stringLiteralNode) popLeadingComment() *comment {
func (n *stringLiteralNode) popLeadingComment() comment {
return n.first.(terminalNode).popLeadingComment()
}

func (n *stringLiteralNode) pushTrailingComment(c *comment) {
func (n *stringLiteralNode) pushTrailingComment(c comment) {
n.last.(terminalNode).pushTrailingComment(c)
}

Expand Down Expand Up @@ -415,11 +415,11 @@ func (n *floatLiteralNode) value() interface{} {
return n.val
}

func (n *floatLiteralNode) popLeadingComment() *comment {
func (n *floatLiteralNode) popLeadingComment() comment {
return n.first.(terminalNode).popLeadingComment()
}

func (n *floatLiteralNode) pushTrailingComment(c *comment) {
func (n *floatLiteralNode) pushTrailingComment(c comment) {
n.last.(terminalNode).pushTrailingComment(c)
}

Expand Down Expand Up @@ -591,11 +591,11 @@ func (n *oneOfElement) end() *SourcePos {
return n.get().end()
}

func (n *oneOfElement) leadingComments() []*comment {
func (n *oneOfElement) leadingComments() []comment {
return n.get().leadingComments()
}

func (n *oneOfElement) trailingComments() []*comment {
func (n *oneOfElement) trailingComments() []comment {
return n.get().trailingComments()
}

Expand Down Expand Up @@ -664,7 +664,7 @@ func (n *mapFieldNode) valueField() *syntheticMapField {
func newSyntheticMapField(ident *identNode, tagNum uint64) *syntheticMapField {
tag := &intLiteralNode{
basicNode: basicNode{
posRange: posRange{start: ident.start(), end: ident.end()},
posRange: posRange{start: *ident.start(), end: *ident.end()},
},
val: tagNum,
}
Expand All @@ -684,11 +684,11 @@ func (n *syntheticMapField) end() *SourcePos {
return n.ident.end()
}

func (n *syntheticMapField) leadingComments() []*comment {
func (n *syntheticMapField) leadingComments() []comment {
return nil
}

func (n *syntheticMapField) trailingComments() []*comment {
func (n *syntheticMapField) trailingComments() []comment {
return nil
}

Expand Down Expand Up @@ -764,11 +764,11 @@ func (n *enumElement) end() *SourcePos {
return n.get().end()
}

func (n *enumElement) leadingComments() []*comment {
func (n *enumElement) leadingComments() []comment {
return n.get().leadingComments()
}

func (n *enumElement) trailingComments() []*comment {
func (n *enumElement) trailingComments() []comment {
return n.get().trailingComments()
}

Expand Down Expand Up @@ -838,11 +838,11 @@ func (n *messageElement) end() *SourcePos {
return n.get().end()
}

func (n *messageElement) leadingComments() []*comment {
func (n *messageElement) leadingComments() []comment {
return n.get().leadingComments()
}

func (n *messageElement) trailingComments() []*comment {
func (n *messageElement) trailingComments() []comment {
return n.get().trailingComments()
}

Expand Down Expand Up @@ -894,11 +894,11 @@ func (n *extendElement) end() *SourcePos {
return n.get().end()
}

func (n *extendElement) leadingComments() []*comment {
func (n *extendElement) leadingComments() []comment {
return n.get().leadingComments()
}

func (n *extendElement) trailingComments() []*comment {
func (n *extendElement) trailingComments() []comment {
return n.get().trailingComments()
}

Expand Down Expand Up @@ -934,11 +934,11 @@ func (n *serviceElement) end() *SourcePos {
return n.get().end()
}

func (n *serviceElement) leadingComments() []*comment {
func (n *serviceElement) leadingComments() []comment {
return n.get().leadingComments()
}

func (n *serviceElement) trailingComments() []*comment {
func (n *serviceElement) trailingComments() []comment {
return n.get().trailingComments()
}

Expand Down Expand Up @@ -987,11 +987,11 @@ func (n noSourceNode) end() *SourcePos {
return n.pos
}

func (n noSourceNode) leadingComments() []*comment {
func (n noSourceNode) leadingComments() []comment {
return nil
}

func (n noSourceNode) trailingComments() []*comment {
func (n noSourceNode) trailingComments() []comment {
return nil
}

Expand Down