Remove VariantName

Author: unclenachoduh

fluent/syntax/ast.py

@@ -303,11 +303,6 @@ def __init__(self, name, **kwargs):
         self.name = name
 
 
-class VariantName(Identifier):
-    def __init__(self, name, **kwargs):
-        super(VariantName, self).__init__(name, **kwargs)
-
-
 class BaseComment(Entry):
     def __init__(self, content=None, **kwargs):
         super(BaseComment, self).__init__(**kwargs)

fluent/syntax/ftlstream.py

@@ -263,17 +263,6 @@ def closure(ch):
                     cc == 95 or cc == 45)
         return self.take_char(closure)
 
-    def take_variant_name_char(self):
-        def closure(ch):
-            if ch is None:
-                return False
-            cc = ord(ch)
-            return (cc >= 97 and cc <= 122) or \
-                   (cc >= 65 and cc <= 90) or \
-                   (cc >= 48 and cc <= 57) or \
-                cc == 95 or cc == 45 or cc == 32
-        return self.take_char(closure)
-
     def take_digit(self):
         def closure(ch):
             cc = ord(ch)

fluent/syntax/parser.py

@@ -217,15 +217,13 @@ def get_comment(self, ps):
 
     @with_span
     def get_group_comment_from_section(self, ps):
+        def until_closing_bracket_or_eol(ch):
+            return ch not in (']', '\n')
+
         ps.expect_char('[')
         ps.expect_char('[')
-
-        ps.skip_blank_inline()
-
-        self.get_variant_name(ps)
-
-        ps.skip_blank_inline()
-
+        while ps.take_char(until_closing_bracket_or_eol):
+            pass
         ps.expect_char(']')
         ps.expect_char(']')
 
@@ -328,7 +326,7 @@ def get_variant_key(self, ps):
         if ((cc >= 48 and cc <= 57) or cc == 45):  # 0-9, -
             return self.get_number(ps)
 
-        return self.get_variant_name(ps)
+        return self.get_identifier(ps)
 
     @with_span
     def get_variant(self, ps, has_default):
@@ -376,18 +374,6 @@ def get_variants(self, ps):
 
         return variants
 
-    @with_span
-    def get_variant_name(self, ps):
-        name = ps.take_id_start()
-        while True:
-            ch = ps.take_variant_name_char()
-            if ch:
-                name += ch
-            else:
-                break
-
-        return ast.VariantName(name.rstrip(' \t\n\r'))
-
     def get_digits(self, ps):
         num = ''
 

fluent/syntax/serializer.py

@@ -276,8 +276,8 @@ def serialize_variant_name(symbol):
 
 
 def serialize_variant_key(key):
-    if isinstance(key, ast.VariantName):
-        return serialize_variant_name(key)
+    if isinstance(key, ast.Identifier):
+        return serialize_identifier(key)
     if isinstance(key, ast.NumberLiteral):
         return serialize_number_literal(key)
     raise Exception('Unknown variant key type: {}'.format(type(key)))

tests/syntax/test_serializer.py

@@ -269,15 +269,6 @@ def test_variant_multiline_first_inline(self):
         """
         self.assertEqual(self.pretty_ftl(input), dedent_ftl(output))
 
-    def test_variant_key_words(self):
-        input = """\
-            foo =
-                { $sel ->
-                   *[a b c] A B C
-                }
-        """
-        self.assertEqual(self.pretty_ftl(input), dedent_ftl(input))
-
     def test_variant_key_number(self):
         input = """\
             foo =