Merge pull request #18 from projectfluent/ast-mistakes

Port projectfluent/fluent.js#47 to python

Author: zbraniecki

fluent/syntax/errors.py

@@ -18,7 +18,7 @@ def get_error_message(code, args):
     if code == 'E0004':
         return 'Expected a character from range: "{}"'.format(args[0])
     if code == 'E0005':
-        msg = 'Expected entry "{}" to have a value, attributes or tags'
+        msg = 'Expected entry "{}" to have a value or attributes'
         return msg.format(args[0])
     if code == 'E0006':
         return 'Expected field: "{}"'.format(args[0])

fluent/syntax/ftlstream.py

@@ -2,6 +2,7 @@
 from .stream import ParserStream
 from .errors import ParseError
 
+
 class FTLParserStream(ParserStream):
     def peek_line_ws(self):
         ch = self.current_peek()
@@ -187,7 +188,7 @@ def take_id_start(self):
             self.next()
             return ret
 
-        raise ParseError('E0004', 'a-zA-Z')
+        raise ParseError('E0004', 'a-zA-Z_')
 
     def take_id_char(self):
         def closure(ch):
@@ -212,5 +213,5 @@ def closure(ch):
     def take_digit(self):
         def closure(ch):
             cc = ord(ch)
-            return (cc >= 48 and cc <= 57) 
+            return (cc >= 48 and cc <= 57)
         return self.take_char(closure)

fluent/syntax/parser.py

@@ -1,4 +1,5 @@
 from __future__ import unicode_literals
+import re
 from .ftlstream import FTLParserStream
 from . import ast
 from .errors import ParseError
@@ -173,7 +174,7 @@ def get_message(self, ps, comment):
                 raise ParseError('E0012')
             tags = self.get_tags(ps)
 
-        if pattern is None and attrs is None and tags is None:
+        if pattern is None and attrs is None:
             raise ParseError('E0005', id.name)
 
         return ast.Message(id, pattern, attrs, tags, comment)
@@ -479,7 +480,13 @@ def get_selector_expression(self, ps):
 
             ps.expect_char(')')
 
-            return ast.CallExpression(literal.id, args)
+            if not re.match('^[A-Z_-]+$', literal.id.name):
+                raise ParseError('E0008')
+
+            return ast.CallExpression(
+                ast.Function(literal.id.name),
+                args
+            )
 
         return literal
 

tests/syntax/fixtures_behavior/attribute_expression_with_wrong_attr.ftl

@@ -1,7 +1,7 @@
 key = { foo.23 }
 
-//~ ERROR E0004, pos 12, args "a-zA-Z"
+//~ ERROR E0004, pos 12, args "a-zA-Z_"
 
 key = { foo. }
 
-//~ ERROR E0004, pos 31, args "a-zA-Z"
+//~ ERROR E0004, pos 31, args "a-zA-Z_"

tests/syntax/fixtures_behavior/call_expression_with_bad_id.ftl

@@ -0,0 +1,3 @@
+key = { no-caps-name() }
+
+//~ ERROR E0008, pos 22

tests/syntax/fixtures_behavior/non_id_attribute_name.ftl

@@ -1,3 +1,3 @@
 key = Value
     .2 = Foo
-//~ ERROR E0004, pos 17, args "a-zA-Z"
+//~ ERROR E0004, pos 17, args "a-zA-Z_"

tests/syntax/fixtures_behavior/unclosed_empty_placeable_error.ftl

@@ -1,2 +1,2 @@
 bar = Bar {
-//~ ERROR E0004, pos 11, args "a-zA-Z"
+//~ ERROR E0004, pos 11, args "a-zA-Z_"

tests/syntax/fixtures_behavior/variant_ends_abruptly.ftl

@@ -1,3 +1,3 @@
 key = { $foo ->
     *[
-//~ ERROR E0004, pos 22, args "a-zA-Z"
+//~ ERROR E0004, pos 22, args "a-zA-Z_"

tests/syntax/fixtures_behavior/variant_expression_empty_key.ftl

@@ -1,2 +1,2 @@
 key = { foo[] }
-//~ ERROR E0004, pos 12, args "a-zA-Z"
+//~ ERROR E0004, pos 12, args "a-zA-Z_"

tests/syntax/fixtures_behavior/variant_starts_from_nl.ftl

@@ -1,4 +1,4 @@
 key = {
 *[one] Value
     }
-//~ ERROR E0004, pos 7, args "a-zA-Z"
+//~ ERROR E0004, pos 7, args "a-zA-Z_"

tests/syntax/fixtures_behavior/variant_with_leading_space_in_name.ftl

@@ -1,4 +1,4 @@
 key = {
         *[  one] Foo
     }
-//~ ERROR E0004, pos 18, args "a-zA-Z"
+//~ ERROR E0004, pos 18, args "a-zA-Z_"