Merge pull request #38 from stasm/fix-compare-locales

Parser fixes required to update compare-locales to 0.6
projectfluent · Jan 31, 2018 · 32bca38 · 32bca38
2 parents 7b80850 + 1f3aeb6
commit 32bca38
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 29 deletions.
diff --git a/fluent/syntax/ast.py b/fluent/syntax/ast.py
@@ -285,10 +285,7 @@ def __init__(self, content=None, **kwargs):
 
 class Comment(BaseComment):
     def __init__(self, content=None, **kwargs):
-        zero_four_style = kwargs.pop("zero_four_style", False)
         super(Comment, self).__init__(content, **kwargs)
-        if zero_four_style:
-            self.zero_four_style = True
 
 
 class GroupComment(BaseComment):

diff --git a/fluent/syntax/parser.py b/fluent/syntax/parser.py
@@ -101,10 +101,12 @@ def get_entry(self, ps):
             ps.expect_char('\n' if ps.current() else None)
 
         if ps.current_is('['):
-            self.skip_section(ps)
-            if comment:
-                return ast.GroupComment(comment.content)
-            return None
+            group_comment = self.get_group_comment_from_section(ps, comment)
+            if comment and self.with_spans:
+                # The Group Comment should start where the section comment
+                # starts.
+                group_comment.span.start = comment.span.start
+            return group_comment
 
         if ps.is_entry_id_start() \
            and (comment is None or isinstance(comment, ast.Comment)):
@@ -182,7 +184,8 @@ def get_comment(self, ps):
         elif level == 2:
             return ast.ResourceComment(content)
 
-    def skip_section(self, ps):
+    @with_span
+    def get_group_comment_from_section(self, ps, comment):
         ps.expect_char('[')
         ps.expect_char('[')
 
@@ -195,8 +198,12 @@ def skip_section(self, ps):
         ps.expect_char(']')
         ps.expect_char(']')
 
-        ps.skip_inline_ws()
-        ps.next()
+        if comment:
+            return ast.GroupComment(comment.content)
+
+        # A Section without a comment is like an empty Group Comment.
+        # Semantically it ends the previous group and starts a new one.
+        return ast.GroupComment('')
 
     @with_span
     def get_message(self, ps, comment):
@@ -231,7 +238,6 @@ def get_message(self, ps, comment):
 
     @with_span
     def get_attribute(self, ps):
-        ps.expect_indent()
         ps.expect_char('.')
 
         key = self.get_identifier(ps)
@@ -250,6 +256,7 @@ def get_attributes(self, ps):
         attrs = []
 
         while True:
+            ps.expect_indent()
             attr = self.get_attribute(ps)
             attrs.append(attr)
 
@@ -287,8 +294,6 @@ def get_variant_key(self, ps):
 
     @with_span
     def get_variant(self, ps, has_default):
-        ps.expect_indent()
-
         default_index = False
 
         if ps.current_is('*'):
@@ -315,6 +320,7 @@ def get_variants(self, ps):
         has_default = False
 
         while True:
+            ps.expect_indent()
             variant = self.get_variant(ps, has_default)
 
             if variant.default:

diff --git a/tests/syntax/fixtures_structure/elements_indent.json b/tests/syntax/fixtures_structure/elements_indent.json
@@ -126,7 +126,7 @@
           },
           "span": {
             "type": "Span",
-            "start": 37,
+            "start": 42,
             "end": 61
           }
         }

diff --git a/tests/syntax/fixtures_structure/section.json b/tests/syntax/fixtures_structure/section.json
@@ -1,6 +1,17 @@
 {
   "type": "Resource",
-  "body": [],
+  "body": [
+    {
+      "type": "GroupComment",
+      "annotations": [],
+      "content": "",
+      "span": {
+        "type": "Span",
+        "start": 1,
+        "end": 24
+      }
+    }
+  ],
   "span": {
     "type": "Span",
     "start": 0,

diff --git a/tests/syntax/fixtures_structure/section_with_comment.ftl b/tests/syntax/fixtures_structure/section_with_comment.ftl
@@ -0,0 +1,2 @@
+// Comment
+[[ Section ]]
diff --git a/tests/syntax/fixtures_structure/section_with_comment.json b/tests/syntax/fixtures_structure/section_with_comment.json
@@ -0,0 +1,20 @@
+{
+  "type": "Resource",
+  "body": [
+    {
+      "type": "GroupComment",
+      "annotations": [],
+      "content": "Comment",
+      "span": {
+        "type": "Span",
+        "start": 0,
+        "end": 24
+      }
+    }
+  ],
+  "span": {
+    "type": "Span",
+    "start": 0,
+    "end": 25
+  }
+}
diff --git a/tests/syntax/fixtures_structure/sparse-messages.json b/tests/syntax/fixtures_structure/sparse-messages.json
@@ -86,7 +86,7 @@
           },
           "span": {
             "type": "Span",
-            "start": 23,
+            "start": 30,
             "end": 47
           }
         }
@@ -162,7 +162,7 @@
           },
           "span": {
             "type": "Span",
-            "start": 102,
+            "start": 110,
             "end": 125
           }
         }
@@ -267,7 +267,7 @@
                   "default": false,
                   "span": {
                     "type": "Span",
-                    "start": 152,
+                    "start": 164,
                     "end": 173
                   }
                 },
@@ -304,7 +304,7 @@
                   "default": true,
                   "span": {
                     "type": "Span",
-                    "start": 173,
+                    "start": 186,
                     "end": 196
                   }
                 }

diff --git a/tests/syntax/fixtures_structure/syntax_zero_four.json b/tests/syntax/fixtures_structure/syntax_zero_four.json
@@ -47,7 +47,7 @@
           },
           "span": {
             "type": "Span",
-            "start": 4,
+            "start": 9,
             "end": 24
           }
         }
@@ -105,7 +105,7 @@
           },
           "span": {
             "type": "Span",
-            "start": 30,
+            "start": 35,
             "end": 50
           }
         },
@@ -141,7 +141,7 @@
           },
           "span": {
             "type": "Span",
-            "start": 50,
+            "start": 55,
             "end": 70
           }
         }

diff --git a/tests/syntax/fixtures_structure/term.json b/tests/syntax/fixtures_structure/term.json
@@ -55,7 +55,7 @@
                   "default": true,
                   "span": {
                     "type": "Span",
-                    "start": 19,
+                    "start": 27,
                     "end": 48
                   }
                 },
@@ -92,7 +92,7 @@
                   "default": false,
                   "span": {
                     "type": "Span",
-                    "start": 48,
+                    "start": 57,
                     "end": 78
                   }
                 }
@@ -149,7 +149,7 @@
           },
           "span": {
             "type": "Span",
-            "start": 84,
+            "start": 89,
             "end": 108
           }
         }
@@ -347,7 +347,7 @@
                   "default": false,
                   "span": {
                     "type": "Span",
-                    "start": 220,
+                    "start": 229,
                     "end": 289
                   }
                 },
@@ -409,7 +409,7 @@
                   "default": false,
                   "span": {
                     "type": "Span",
-                    "start": 289,
+                    "start": 298,
                     "end": 358
                   }
                 },
@@ -480,7 +480,7 @@
                   "default": true,
                   "span": {
                     "type": "Span",
-                    "start": 358,
+                    "start": 366,
                     "end": 431
                   }
                 }

diff --git a/tests/syntax/fixtures_structure/variant_with_empty_pattern.json b/tests/syntax/fixtures_structure/variant_with_empty_pattern.json
@@ -71,7 +71,7 @@
                   "default": true,
                   "span": {
                     "type": "Span",
-                    "start": 17,
+                    "start": 25,
                     "end": 36
                   }
                 }