Merge pull request #313 from stasm/zeroeight-part6-macro-attrs

Syntax 0.8, part 6: Parameterized term attributes

Author: stasm

fluent-syntax/src/errors.js

@@ -33,7 +33,7 @@ function getErrorMessage(code, args) {
     case "E0007":
       return "Keyword cannot end with a whitespace";
     case "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";
     case "E0009":
       return "The key has to be a simple identifier";
     case "E0010":

fluent-syntax/src/parser.js

@@ -678,11 +678,18 @@ export default class FluentParser {
 
       const variants = this.getVariants(ps, {allowVariantList: false});
       return new AST.SelectExpression(selector, variants);
-    } else if (selector.type === "AttributeExpression"
+    }
+
+    if (selector.type === "AttributeExpression"
         && selector.ref.type === "TermReference") {
       throw new ParseError("E0019");
     }
 
+    if (selector.type === "CallExpression"
+        && selector.callee.type === "AttributeExpression") {
+      throw new ParseError("E0019");
+    }
+
     return selector;
   }
 
@@ -691,20 +698,14 @@ export default class FluentParser {
       return this.getPlaceable(ps);
     }
 
-    const selector = this.getLiteral(ps);
+    let selector = this.getLiteral(ps);
     switch (selector.type) {
       case "StringLiteral":
       case "NumberLiteral":
       case "VariableReference":
         return selector;
     }
 
-    if (ps.currentChar === ".") {
-      ps.next();
-      const attr = this.getIdentifier(ps);
-      return new AST.AttributeExpression(selector, attr);
-    }
-
     if (ps.currentChar === "[") {
       ps.next();
 
@@ -717,6 +718,12 @@ export default class FluentParser {
       return new AST.VariantExpression(selector, key);
     }
 
+    if (ps.currentChar === ".") {
+      ps.next();
+      const attr = this.getIdentifier(ps);
+      selector = new AST.AttributeExpression(selector, attr);
+    }
+
     if (ps.currentChar === "(") {
       ps.next();
 
@@ -733,6 +740,11 @@ export default class FluentParser {
         }
       }
 
+      if (selector.type === "AttributeExpression"
+          && selector.ref.type === "MessageReference") {
+        throw new ParseError("E0008");
+      }
+
       const args = this.getCallArgs(ps);
       ps.expectChar(")");
 

fluent-syntax/test/fixtures_reference/call_expressions.ftl

@@ -1,16 +1,3 @@
-## Callees
-
-function-callee = {FUNCTION()}
-term-callee = {-term()}
-
-# ERROR Equivalent to a MessageReference callee.
-mixed-case-callee = {Function()}
-
-# ERROR MessageReference is not a valid callee.
-message-callee = {message()}
-# ERROR VariableReference is not a valid callee.
-variable-callee = {$variable()}
-
 ## Arguments
 
 positional-args = {FUN(1, "a", msg)}

fluent-syntax/test/fixtures_reference/call_expressions.json

@@ -1,95 +1,6 @@
 {
     "type": "Resource",
     "body": [
-        {
-            "type": "GroupComment",
-            "content": "Callees"
-        },
-        {
-            "type": "Message",
-            "id": {
-                "type": "Identifier",
-                "name": "function-callee"
-            },
-            "value": {
-                "type": "Pattern",
-                "elements": [
-                    {
-                        "type": "Placeable",
-                        "expression": {
-                            "type": "CallExpression",
-                            "callee": {
-                                "type": "FunctionReference",
-                                "id": {
-                                    "type": "Identifier",
-                                    "name": "FUNCTION"
-                                }
-                            },
-                            "positional": [],
-                            "named": []
-                        }
-                    }
-                ]
-            },
-            "attributes": [],
-            "comment": null
-        },
-        {
-            "type": "Message",
-            "id": {
-                "type": "Identifier",
-                "name": "term-callee"
-            },
-            "value": {
-                "type": "Pattern",
-                "elements": [
-                    {
-                        "type": "Placeable",
-                        "expression": {
-                            "type": "CallExpression",
-                            "callee": {
-                                "type": "TermReference",
-                                "id": {
-                                    "type": "Identifier",
-                                    "name": "term"
-                                }
-                            },
-                            "positional": [],
-                            "named": []
-                        }
-                    }
-                ]
-            },
-            "attributes": [],
-            "comment": null
-        },
-        {
-            "type": "Comment",
-            "content": "ERROR Equivalent to a MessageReference callee."
-        },
-        {
-            "type": "Junk",
-            "annotations": [],
-            "content": "mixed-case-callee = {Function()}\n\n"
-        },
-        {
-            "type": "Comment",
-            "content": "ERROR MessageReference is not a valid callee."
-        },
-        {
-            "type": "Junk",
-            "annotations": [],
-            "content": "message-callee = {message()}\n"
-        },
-        {
-            "type": "Comment",
-            "content": "ERROR VariableReference is not a valid callee."
-        },
-        {
-            "type": "Junk",
-            "annotations": [],
-            "content": "variable-callee = {$variable()}\n\n"
-        },
         {
             "type": "GroupComment",
             "content": "Arguments"

fluent-syntax/test/fixtures_reference/callee_expressions.ftl

@@ -0,0 +1,46 @@
+## Callees in placeables.
+
+function-callee-placeable = {FUNCTION()}
+term-callee-placeable = {-term()}
+
+# ERROR Messages cannot be parameterized.
+message-callee-placeable = {message()}
+# ERROR Equivalent to a MessageReference callee.
+mixed-case-callee-placeable = {Function()}
+# ERROR Message attributes cannot be parameterized.
+message-attr-callee-placeable = {message.attr()}
+# ERROR Term attributes may not be used in Placeables.
+term-attr-callee-placeable = {-term.attr()}
+# ERROR Variables cannot be parameterized.
+variable-callee-placeable = {$variable()}
+
+
+## Callees in selectors.
+
+function-callee-selector = {FUNCTION() ->
+   *[key] Value
+}
+term-attr-callee-selector = {-term.attr() ->
+   *[key] Value
+}
+
+# ERROR Messages cannot be parameterized.
+message-callee-selector = {message() ->
+   *[key] Value
+}
+# ERROR Equivalent to a MessageReference callee.
+mixed-case-callee-selector = {Function() ->
+   *[key] Value
+}
+# ERROR Message attributes cannot be parameterized.
+message-attr-callee-selector = {message.attr() ->
+   *[key] Value
+}
+# ERROR Term values may not be used as selectors.
+term-callee-selector = {-term() ->
+   *[key] Value
+}
+# ERROR Variables cannot be parameterized.
+variable-callee-selector = {$variable() ->
+   *[key] Value
+}