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

avoid panic if comment is found in statements #6

Merged
merged 1 commit into from
Aug 17, 2021
Merged

avoid panic if comment is found in statements #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions parser/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,14 @@ func (p *Parser) parseStatement() gonginx.IDirective {
return d
}

for {
if p.curTokenIs(token.Comment) {
p.nextToken()
} else {
break
}
}

//ok, it does not end with a semicolon but a block starts, we will convert that block if we have a converter
if p.curTokenIs(token.BlockStart) {
d.Block = p.parseBlock()
Expand Down
10 changes: 10 additions & 0 deletions parser/parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,16 @@ func TestParser_UnendedMultiParams(t *testing.T) {
`)).Parse()
}

func TestParser_SkipComment(t *testing.T) {
NewParserFromLexer(lex(`
if ($a ~* "")#comment
#comment
{#comment
return 400;
}
`)).Parse()
}

func Benchmark_ParseFullExample(t *testing.B) {
fullconf := `user www www;
worker_processes 5;
Expand Down