Merge branch 'namespace_packages' into implement_format

Author: spookylukey

.gitattributes

@@ -1,2 +1,3 @@
-tests/syntax/fixtures_reference/crlf.ftl eol=crlf
-tests/syntax/fixtures_structure/crlf.ftl eol=crlf
+fluent-syntax/tests/syntax/fixtures_reference/crlf.ftl eol=crlf
+fluent-syntax/tests/syntax/fixtures_reference/cr.ftl eol=cr
+fluent-syntax/tests/syntax/fixtures_structure/crlf.ftl eol=crlf

.travis.yml

@@ -7,8 +7,10 @@ python:
   - "pypy"
   - "pypy3"
   - "nightly"
+env:
+  - PACKAGE=fluent-syntax
 install: pip install tox-travis
-script: tox
+script: cd $PACKAGE; tox
 notifications:
   irc:
     channels:

CHANGELOG.md fluent-syntax/CHANGELOG.mdCHANGELOG.md renamed to fluent-syntax/CHANGELOG.md

@@ -1,5 +1,62 @@
 # Changelog
 
+## fluent-syntax 0.10.0 (December 13, 2018)
+
+This release brings support for version 0.8 of the Fluent Syntax spec. The API
+remains unchanged. Files written in valid Syntax 0.7 may not parse correctly in
+this release. See the summary of backwards-incompatible changes below.
+
+  - Implement Fluent Syntax 0.8. (#303)
+
+    This is only a quick summary of the spec changes in Syntax 0.8. Consult the
+    full [changelog][chlog0.8] for details.
+
+    [chlog0.8]: https://github.com/projectfluent/fluent/releases/tag/v0.8.0
+
+    In multiline `Patterns`, all common indent is now removed from each
+    indented line in the final value of the pattern.
+
+    ```properties
+    multiline =
+        This message has 2 spaces of indent
+          on the second line of its value.
+    ```
+
+    `Terms` can now be parameterized via the call expression syntax.
+
+    ```properties
+    # A parametrized Term with a Pattern as a value.
+    -thing = { $article ->
+       *[definite] the thing
+        [indefinite] a thing
+    }
+
+    this = This is { -thing(article: "indefinite") }.
+    ```
+
+    `VariantLists` are now deprecated and will be removed from the Syntax
+    before version 1.0.
+
+    All escapes sequences can only be used in `StringLiterals` now (see below).
+    `\UHHHHHH` is a new escape sequence format suitable for codepoints above
+    U+FFFF, e.g. `{"\U01F602"}`.
+
+### Backward-incompatible changes:
+
+  - The backslash character (`\`) is now considered a regular character in
+    `TextElements`. It's no longer possible to use escape sequences in
+    `TextElements`. Please use `StringLiterals` instead, e.g. `{"\u00A0"}`.
+  - The closing curly brace character (`}`) is not allowed in `TextElements`
+    now. Please use `StringLiterals` instead: `{"}"}`.
+  - `StringLiteral.value` was changed to store the unescaped ("cooked") value.
+    `StringLiteral.raw` has been added to store the raw value.
+  - The AST of `CallExpressions` was changed to better accommodate the
+    introduction of parameterized `Terms`. The `Function` AST node has been
+    replaced by the `FunctionReference` node.
+  - The leading dash (`-`) is no longer part of the `Identifier` node in
+    `Terms` and `TermReferences`.
+
+
 ## fluent 0.9.0 (October 23, 2018)
 
 This release brings support for version 0.7 of the Fluent Syntax spec. The

fluent/__init__.py fluent-syntax/fluent/__init__.pyfluent/__init__.py renamed to fluent-syntax/fluent/__init__.py

@@ -3,13 +3,13 @@
 import json
 
 
-def to_json(value):
+def to_json(value, fn=None):
     if isinstance(value, BaseNode):
-        return value.to_json()
+        return value.to_json(fn)
     if isinstance(value, list):
-        return list(map(to_json, value))
+        return list(to_json(item, fn) for item in value)
     if isinstance(value, tuple):
-        return list(map(to_json, value))
+        return list(to_json(item, fn) for item in value)
     else:
         return value
 
@@ -119,15 +119,15 @@ def equals(self, other, ignored_fields=['span']):
 
         return True
 
-    def to_json(self):
+    def to_json(self, fn=None):
         obj = {
-            name: to_json(value)
+            name: to_json(value, fn)
             for name, value in vars(self).items()
         }
         obj.update(
             {'type': self.__class__.__name__}
         )
-        return obj
+        return fn(obj) if fn else obj
 
     def __str__(self):
         return json.dumps(self.to_json())
@@ -207,8 +207,9 @@ class Expression(SyntaxNode):
 
 
 class StringLiteral(Expression):
-    def __init__(self, value, **kwargs):
+    def __init__(self, raw, value, **kwargs):
         super(StringLiteral, self).__init__(**kwargs)
+        self.raw = raw
         self.value = value
 
 
@@ -236,6 +237,12 @@ def __init__(self, id, **kwargs):
         self.id = id
 
 
+class FunctionReference(Expression):
+    def __init__(self, id, **kwargs):
+        super(FunctionReference, self).__init__(**kwargs)
+        self.id = id
+
+
 class SelectExpression(Expression):
     def __init__(self, selector, variants, **kwargs):
         super(SelectExpression, self).__init__(**kwargs)
@@ -324,11 +331,6 @@ def __init__(self, content=None, **kwargs):
         super(ResourceComment, self).__init__(content, **kwargs)
 
 
-class Function(Identifier):
-    def __init__(self, name, **kwargs):
-        super(Function, self).__init__(name, **kwargs)
-
-
 class Junk(SyntaxNode):
     def __init__(self, content=None, annotations=None, **kwargs):
         super(Junk, self).__init__(**kwargs)

fluent/syntax/__init__.py fluent-syntax/fluent/syntax/__init__.pyfluent/syntax/__init__.py renamed to fluent-syntax/fluent/syntax/__init__.py

@@ -21,12 +21,12 @@ def get_error_message(code, args):
         msg = 'Expected message "{}" to have a value or attributes'
         return msg.format(args[0])
     if code == 'E0006':
-        msg = 'Expected term "{}" to have a value'
+        msg = 'Expected term "-{}" to have a value'
         return msg.format(args[0])
     if code == 'E0007':
         return 'Keyword cannot end with a whitespace'
     if code == 'E0008':
-        return 'The callee has to be a simple, upper-case identifier'
+        return 'The callee has to be an upper-case identifier or a term'
     if code == 'E0009':
         return 'The key has to be a simple identifier'
     if code == 'E0010':
@@ -44,7 +44,7 @@ def get_error_message(code, args):
     if code == 'E0016':
         return 'Message references cannot be used as selectors'
     if code == 'E0017':
-        return 'Variants cannot be used as selectors'
+        return 'Terms cannot be used as selectors'
     if code == 'E0018':
         return 'Attributes of messages cannot be used as selectors'
     if code == 'E0019':
@@ -55,12 +55,14 @@ def get_error_message(code, args):
         return 'Positional arguments must not follow named arguments'
     if code == 'E0022':
         return 'Named arguments must be unique'
-    if code == 'E0023':
-        return 'VariantLists are only allowed inside of other VariantLists.'
     if code == 'E0024':
         return 'Cannot access variants of a message.'
     if code == 'E0025':
-        return 'Unknown escape sequence: {}'.format(args[0])
+        return 'Unknown escape sequence: \\{}.'.format(args[0])
     if code == 'E0026':
         return 'Invalid Unicode escape sequence: {}'.format(args[0])
+    if code == 'E0027':
+        return 'Unbalanced closing brace in TextElement.'
+    if code == 'E0028':
+        return 'Expected an inline expression'
     return code