github
/
gixy
mirror of https://github.com/yandex/gixy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Try to parse inline comment in blocks

pull/87/head
Andrew Krasichkov 2018-09-27 19:41:19 +03:00
parent 0e032605b5
commit 84f79a3e04
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gixy/parser/raw_parser.py
View File

@ -126,6 +126,7 @@ class RawParser(object):
if_block << ( if_block << (
Keyword("if") + Keyword("if") +
Group(condition) + Group(condition) +
Suppress(Optional(comment)) +
Group( Group(
left_bracket + left_bracket +
Optional(sub_block) + Optional(sub_block) +
@ -137,6 +138,7 @@ class RawParser(object):
Group( Group(
Optional(space + location_modifier) + Optional(space + location_modifier) +
Optional(space) + value) + Optional(space) + value) +
Suppress(Optional(comment)) +
Group( Group(
left_bracket + left_bracket +
Optional(sub_block) + Optional(sub_block) +
@ -155,6 +157,7 @@ class RawParser(object):
generic_block << ( generic_block << (
keyword + keyword +
Group(ZeroOrMore(space + value)) + Group(ZeroOrMore(space + value)) +
Suppress(Optional(comment)) +
Group( Group(
left_bracket + left_bracket +
Optional(sub_block) + Optional(sub_block) +

8
tests/parser/test_raw_parser.py
View File

@ -488,6 +488,11 @@ add_header X-Padding-Comment padding;
# #
add_header X-Blank-Comment blank; add_header X-Blank-Comment blank;
if (1) # Comment
{
add_header X-Inline blank;
}
''' '''
expected = [ expected = [
@ -499,6 +504,9 @@ add_header X-Blank-Comment blank;
['add_header', 'X-Padding-Comment', 'padding'], ['add_header', 'X-Padding-Comment', 'padding'],
[''], [''],
['add_header', 'X-Blank-Comment', 'blank'], ['add_header', 'X-Blank-Comment', 'blank'],
['if', ['1'], [
['add_header', 'X-Inline', 'blank'],
]],
] ]
assert_config(config, expected) assert_config(config, expected)