Try to parse inline comment in blocks

jjsdub556 · Sep 28, 2018 · 84f79a3 · 84f79a3
1 parent 0e03260
commit 84f79a3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/gixy/parser/raw_parser.py b/gixy/parser/raw_parser.py
@@ -126,6 +126,7 @@ def script(self):
         if_block << (
             Keyword("if") +
             Group(condition) +
+            Suppress(Optional(comment)) +
             Group(
                 left_bracket +
                 Optional(sub_block) +
@@ -137,6 +138,7 @@ def script(self):
             Group(
                 Optional(space + location_modifier) +
                 Optional(space) + value) +
+            Suppress(Optional(comment)) +
             Group(
                 left_bracket +
                 Optional(sub_block) +
@@ -155,6 +157,7 @@ def script(self):
         generic_block << (
             keyword +
             Group(ZeroOrMore(space + value)) +
+            Suppress(Optional(comment)) +
             Group(
                 left_bracket +
                 Optional(sub_block) +

diff --git a/tests/parser/test_raw_parser.py b/tests/parser/test_raw_parser.py
@@ -488,6 +488,11 @@ def test_comments():
 
 #
 add_header X-Blank-Comment blank;
+
+if (1) # Comment 
+{
+    add_header X-Inline blank;
+}
         '''
 
     expected = [
@@ -499,6 +504,9 @@ def test_comments():
         ['add_header', 'X-Padding-Comment', 'padding'],
         [''],
         ['add_header', 'X-Blank-Comment', 'blank'],
+        ['if', ['1'], [
+            ['add_header', 'X-Inline', 'blank'],
+        ]],
     ]
 
     assert_config(config, expected)