Flatten reference expressions into InlineExpression

projectfluent · Mar 20, 2019 · 9ef072a · 9ef072a
1 parent e100d19
commit 9ef072a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/spec/fluent.ebnf b/spec/fluent.ebnf
@@ -52,18 +52,17 @@ block_placeable     ::= blank_block blank_inline? inline_placeable
  * syntax/abstract.mjs. */
 InlineExpression    ::= StringLiteral
                       | NumberLiteral
-                      | ReferenceExpression
+                      | FunctionReference
+                      | MessageReference
+                      | TermReference
+                      | VariableReference
                       | inline_placeable
 
 /* Literals */
 StringLiteral       ::= "\"" quoted_char* "\""
 NumberLiteral       ::= "-"? digits ("." digits)?
 
 /* Inline Expressions */
-ReferenceExpression ::= FunctionReference
-                      | MessageReference
-                      | TermReference
-                      | VariableReference
 FunctionReference   ::= Identifier CallArguments
 MessageReference    ::= Identifier AttributeAccessor?
 TermReference       ::= "-" Identifier AttributeAccessor? CallArguments?

diff --git a/syntax/grammar.mjs b/syntax/grammar.mjs
@@ -196,7 +196,10 @@ let InlineExpression = defer(() =>
     either(
         StringLiteral,
         NumberLiteral,
-        ReferenceExpression,
+        FunctionReference,
+        MessageReference,
+        TermReference,
+        VariableReference,
         inline_placeable));
 
 /* -------- */
@@ -226,13 +229,6 @@ let NumberLiteral = defer(() =>
 
 /* ------------------ */
 /* Inline Expressions */
-let ReferenceExpression = defer(() =>
-    either(
-        FunctionReference,
-        MessageReference,
-        TermReference,
-        VariableReference));
-
 let FunctionReference = defer(() =>
     sequence(
         Identifier,