Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions parser/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ go_library(
"errors.go",
"helper.go",
"input.go",
"lexer.go",
"macro.go",
"options.go",
"parser.go",
"pratt_parser.go",
"unescape.go",
"unparser.go",
],
Expand All @@ -38,17 +40,21 @@ go_test(
size = "small",
srcs = [
"helper_test.go",
"lexer_test.go",
"parser_test.go",
"pratt_parser_test.go",
"unescape_test.go",
"unparser_test.go",
],
embed = [
":go_default_library",
],
deps = [
"//common:go_default_library",
"//common/ast:go_default_library",
"//common/debug:go_default_library",
"//common/operators:go_default_library",
"//common/runes:go_default_library",
"//common/types:go_default_library",
"//parser/gen:go_default_library",
"//test:go_default_library",
Expand Down
10 changes: 10 additions & 0 deletions parser/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@ func (p *parserHelper) id(ctx any) int64 {
case antlr.Token:
offset.Start = p.sourceInfo.ComputeOffset(int32(c.GetLine()), int32(c.GetColumn()))
offset.Stop = offset.Start + int32(len(c.GetText()))
case token:
offset.Start = c.start
offset.Stop = c.end
case common.Location:
offset.Start = p.sourceInfo.ComputeOffsetAbsolute(int32(c.Line()), int32(c.Column()))
offset.Stop = offset.Start
Expand All @@ -177,6 +180,13 @@ func (p *parserHelper) id(ctx any) int64 {
return id
}

func (p *parserHelper) idFromOffsets(start, stop int32) int64 {
id := p.nextID
p.sourceInfo.SetOffsetRange(id, ast.OffsetRange{Start: start, Stop: stop})
p.nextID++
return id
}

func (p *parserHelper) deleteID(id int64) {
p.sourceInfo.ClearOffsetRange(id)
if id == p.nextID-1 {
Expand Down
Loading
Loading