Merge pull request #148 from stasm/0.4.x-update-parser

Backport MessageContext parser changes from fluent 0.6.0

Author: stasm

compat_config.js

@@ -13,6 +13,7 @@ export default {
       ],
       'plugins': [
         'external-helpers',
+        'babel-plugin-optimize-starts-with',
         ['babel-plugin-transform-builtin-extend', {
           globals: ['Error']
         }]

fluent-syntax/src/ast.js

@@ -40,13 +40,12 @@ export class Entry extends SyntaxNode {
 }
 
 export class Message extends Entry {
-  constructor(id, value = null, attributes = [], tags = [], comment = null) {
+  constructor(id, value = null, attributes = [], comment = null) {
     super();
     this.type = 'Message';
     this.id = id;
     this.value = value;
     this.attributes = attributes;
-    this.tags = tags;
     this.comment = comment;
   }
 }
@@ -159,14 +158,6 @@ export class Attribute extends SyntaxNode {
   }
 }
 
-export class Tag extends SyntaxNode {
-  constructor(name) {
-    super();
-    this.type = 'Tag';
-    this.name = name;
-  }
-}
-
 export class Variant extends SyntaxNode {
   constructor(key, value, def = false) {
     super();

fluent-syntax/src/errors.js

@@ -39,8 +39,6 @@ function getErrorMessage(code, args) {
       return 'Expected one of the variants to be marked as default (*)';
     case 'E0011':
       return 'Expected at least one variant after "->"';
-    case 'E0012':
-      return 'Tags cannot be added to messages with attributes';
     case 'E0013':
       return 'Expected variant key';
     case 'E0014':

fluent-syntax/src/ftlstream.js

@@ -205,7 +205,6 @@ export class FTLParserStream extends ParserStream {
 
     if (this.currentPeekIs('}') ||
         this.currentPeekIs('.') ||
-        this.currentPeekIs('#') ||
         this.currentPeekIs('[') ||
         this.currentPeekIs('*')) {
       this.resetPeek();
@@ -216,33 +215,6 @@ export class FTLParserStream extends ParserStream {
     return true;
   }
 
-  isPeekNextLineTagStart() {
-    if (!this.currentPeekIs('\n')) {
-      return false;
-    }
-
-    this.peek();
-
-    this.peekBlankLines();
-
-    const ptr = this.getPeekIndex();
-
-    this.peekInlineWS();
-
-    if (this.getPeekIndex() - ptr === 0) {
-      this.resetPeek();
-      return false;
-    }
-
-    if (this.currentPeekIs('#')) {
-      this.resetPeek();
-      return true;
-    }
-
-    this.resetPeek();
-    return false;
-  }
-
   skipToNextEntryStart() {
     while (this.ch) {
       if (this.currentIs('\n') && !this.peekCharIs('\n')) {

fluent-syntax/src/parser.js

@@ -42,7 +42,7 @@ export default class FluentParser {
 
     // Poor man's decorators.
     [
-      'getComment', 'getSection', 'getMessage', 'getAttribute', 'getTag',
+      'getComment', 'getSection', 'getMessage', 'getAttribute',
       'getIdentifier', 'getVariant', 'getSymbol', 'getNumber', 'getPattern',
       'getTextElement', 'getPlaceable', 'getExpression',
       'getSelectorExpression', 'getCallArg', 'getString', 'getLiteral',
@@ -189,7 +189,6 @@ export default class FluentParser {
 
     let pattern;
     let attrs;
-    let tags;
 
     if (ps.currentIs('=')) {
       ps.next();
@@ -203,18 +202,11 @@ export default class FluentParser {
       attrs = this.getAttributes(ps);
     }
 
-    if (ps.isPeekNextLineTagStart()) {
-      if (attrs !== undefined) {
-        throw new ParseError('E0012');
-      }
-      tags = this.getTags(ps);
-    }
-
     if (pattern === undefined && attrs === undefined) {
       throw new ParseError('E0005', id.name);
     }
 
-    return new AST.Message(id, pattern, attrs, tags, comment);
+    return new AST.Message(id, pattern, attrs, comment);
   }
 
   getAttribute(ps) {
@@ -251,28 +243,6 @@ export default class FluentParser {
     return attrs;
   }
 
-  getTag(ps) {
-    ps.expectChar('#');
-    const symb = this.getSymbol(ps);
-    return new AST.Tag(symb);
-  }
-
-  getTags(ps) {
-    const tags = [];
-
-    while (true) {
-      ps.expectIndent();
-
-      const tag = this.getTag(ps);
-      tags.push(tag);
-
-      if (!ps.isPeekNextLineTagStart()) {
-        break;
-      }
-    }
-    return tags;
-  }
-
   getIdentifier(ps) {
     let name = '';
 

fluent-syntax/src/serializer.js

@@ -92,10 +92,6 @@ function serializeMessage(message) {
     parts.push(serializeValue(message.value));
   }
 
-  for (const tag of message.tags) {
-    parts.push(serializeTag(tag));
-  }
-
   for (const attribute of message.attributes) {
     parts.push(serializeAttribute(attribute));
   }
@@ -105,12 +101,6 @@ function serializeMessage(message) {
 }
 
 
-function serializeTag(tag) {
-  const name = serializeSymbol(tag.name);
-  return `\n    #${name}`;
-}
-
-
 function serializeAttribute(attribute) {
   const id = serializeIdentifier(attribute.id);
   const value = indent(serializeValue(attribute.value));

fluent-syntax/test/entry_test.js

@@ -19,7 +19,6 @@ suite('Parse entry', function() {
         "end": 9,
         "type": "Span"
       },
-      "tags": [],
       "value": {
         "elements": [
           {
@@ -72,7 +71,6 @@ suite('Serialize entry', function() {
         "end": 9,
         "type": "Span"
       },
-      "tags": [],
       "value": {
         "elements": [
           {