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

stasm · web-flow · commit 32bca389d2ec · 2018-01-31T18:12:05.000+01:00
Parser fixes required to update compare-locales to 0.6
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
                   }
                 }

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@`
`126`	`126`	`},`
`127`	`127`	`"span": {`
`128`	`128`	`"type": "Span",`
`129`		`- "start": 37,`
	`129`	`+ "start": 42,`
`130`	`130`	`"end": 61`
`131`	`131`	`}`
`132`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@`
`86`	`86`	`},`
`87`	`87`	`"span": {`
`88`	`88`	`"type": "Span",`
`89`		`- "start": 23,`
	`89`	`+ "start": 30,`
`90`	`90`	`"end": 47`
`91`	`91`	`}`
`92`	`92`	`}`
`@@ -162,7 +162,7 @@`
`162`	`162`	`},`
`163`	`163`	`"span": {`
`164`	`164`	`"type": "Span",`
`165`		`- "start": 102,`
	`165`	`+ "start": 110,`
`166`	`166`	`"end": 125`
`167`	`167`	`}`
`168`	`168`	`}`
`@@ -267,7 +267,7 @@`
`267`	`267`	`"default": false,`
`268`	`268`	`"span": {`
`269`	`269`	`"type": "Span",`
`270`		`- "start": 152,`
	`270`	`+ "start": 164,`
`271`	`271`	`"end": 173`
`272`	`272`	`}`
`273`	`273`	`},`
`@@ -304,7 +304,7 @@`
`304`	`304`	`"default": true,`
`305`	`305`	`"span": {`
`306`	`306`	`"type": "Span",`
`307`		`- "start": 173,`
	`307`	`+ "start": 186,`
`308`	`308`	`"end": 196`
`309`	`309`	`}`
`310`	`310`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`	`},`
`48`	`48`	`"span": {`
`49`	`49`	`"type": "Span",`
`50`		`- "start": 4,`
	`50`	`+ "start": 9,`
`51`	`51`	`"end": 24`
`52`	`52`	`}`
`53`	`53`	`}`
`@@ -105,7 +105,7 @@`
`105`	`105`	`},`
`106`	`106`	`"span": {`
`107`	`107`	`"type": "Span",`
`108`		`- "start": 30,`
	`108`	`+ "start": 35,`
`109`	`109`	`"end": 50`
`110`	`110`	`}`
`111`	`111`	`},`
`@@ -141,7 +141,7 @@`
`141`	`141`	`},`
`142`	`142`	`"span": {`
`143`	`143`	`"type": "Span",`
`144`		`- "start": 50,`
	`144`	`+ "start": 55,`
`145`	`145`	`"end": 70`
`146`	`146`	`}`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@`
`55`	`55`	`"default": true,`
`56`	`56`	`"span": {`
`57`	`57`	`"type": "Span",`
`58`		`- "start": 19,`
	`58`	`+ "start": 27,`
`59`	`59`	`"end": 48`
`60`	`60`	`}`
`61`	`61`	`},`
`@@ -92,7 +92,7 @@`
`92`	`92`	`"default": false,`
`93`	`93`	`"span": {`
`94`	`94`	`"type": "Span",`
`95`		`- "start": 48,`
	`95`	`+ "start": 57,`
`96`	`96`	`"end": 78`
`97`	`97`	`}`
`98`	`98`	`}`
`@@ -149,7 +149,7 @@`
`149`	`149`	`},`
`150`	`150`	`"span": {`
`151`	`151`	`"type": "Span",`
`152`		`- "start": 84,`
	`152`	`+ "start": 89,`
`153`	`153`	`"end": 108`
`154`	`154`	`}`
`155`	`155`	`}`
`@@ -347,7 +347,7 @@`
`347`	`347`	`"default": false,`
`348`	`348`	`"span": {`
`349`	`349`	`"type": "Span",`
`350`		`- "start": 220,`
	`350`	`+ "start": 229,`
`351`	`351`	`"end": 289`
`352`	`352`	`}`
`353`	`353`	`},`
`@@ -409,7 +409,7 @@`
`409`	`409`	`"default": false,`
`410`	`410`	`"span": {`
`411`	`411`	`"type": "Span",`
`412`		`- "start": 289,`
	`412`	`+ "start": 298,`
`413`	`413`	`"end": 358`
`414`	`414`	`}`
`415`	`415`	`},`
`@@ -480,7 +480,7 @@`
`480`	`480`	`"default": true,`
`481`	`481`	`"span": {`
`482`	`482`	`"type": "Span",`
`483`		`- "start": 358,`
	`483`	`+ "start": 366,`
`484`	`484`	`"end": 431`
`485`	`485`	`}`
`486`	`486`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@`
`71`	`71`	`"default": true,`
`72`	`72`	`"span": {`
`73`	`73`	`"type": "Span",`
`74`		`- "start": 17,`
	`74`	`+ "start": 25,`
`75`	`75`	`"end": 36`
`76`	`76`	`}`
`77`	`77`	`}`