Merge pull request #317 from projectfluent/zeroeight

Implement Syntax 0.8

Author: stasm

eslint_src.json

@@ -32,17 +32,6 @@
         ],
         "no-implied-eval": 2,
         "no-loop-func": 2,
-        "no-magic-numbers": [
-            1,
-            {
-                "ignore": [
-                    -1,
-                    0,
-                    1,
-                    2
-                ]
-            }
-        ],
         "no-useless-call": 2,
         "no-useless-concat": 2,
         "no-delete-var": 2,
@@ -59,7 +48,6 @@
         "no-extend-native": 2,
         "no-global-assign": 2,
         "no-extra-bind": 2,
-        "no-redeclare": 2,
         "array-bracket-spacing": 2,
         "brace-style": [
             1,

fluent-syntax/.gitattributes

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

fluent-syntax/src/ast.js

@@ -96,9 +96,10 @@ export class Placeable extends PatternElement {
 export class Expression extends SyntaxNode {}
 
 export class StringLiteral extends Expression {
-  constructor(value) {
+  constructor(raw, value) {
     super();
     this.type = "StringLiteral";
+    this.raw = raw;
     this.value = value;
   }
 }
@@ -135,6 +136,14 @@ export class VariableReference extends Expression {
   }
 }
 
+export class FunctionReference extends Expression {
+  constructor(id) {
+    super();
+    this.type = "FunctionReference";
+    this.id = id;
+  }
+}
+
 export class SelectExpression extends Expression {
   constructor(selector, variants) {
     super();
@@ -236,13 +245,6 @@ export class ResourceComment extends BaseComment {
   }
 }
 
-export class Function extends Identifier {
-  constructor(name) {
-    super(name);
-    this.type = "Function";
-  }
-}
-
 export class Junk extends SyntaxNode {
   constructor(content) {
     super();

fluent-syntax/src/errors.js

@@ -28,12 +28,12 @@ function getErrorMessage(code, args) {
     }
     case "E0006": {
       const [id] = args;
-      return `Expected term "${id}" to have a value`;
+      return `Expected term "-${id}" to have a value`;
     }
     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":
@@ -51,7 +51,7 @@ function getErrorMessage(code, args) {
     case "E0016":
       return "Message references cannot be used as selectors";
     case "E0017":
-      return "Variants cannot be used as selectors";
+      return "Terms cannot be used as selectors";
     case "E0018":
       return "Attributes of messages cannot be used as selectors";
     case "E0019":
@@ -62,18 +62,20 @@ function getErrorMessage(code, args) {
       return "Positional arguments must not follow named arguments";
     case "E0022":
       return "Named arguments must be unique";
-    case "E0023":
-      return "VariantLists are only allowed inside of other VariantLists.";
     case "E0024":
       return "Cannot access variants of a message.";
     case "E0025": {
       const [char] = args;
       return `Unknown escape sequence: \\${char}.`;
     }
     case "E0026": {
-      const [char] = args;
-      return `Invalid Unicode escape sequence: \\u${char}.`;
+      const [sequence] = args;
+      return `Invalid Unicode escape sequence: ${sequence}.`;
     }
+    case "E0027":
+      return "Unbalanced closing brace in TextElement.";
+    case "E0028":
+      return "Expected an inline expression";
     default:
       return code;
   }