Add ast.Placeable

Author: stasm

fluent/syntax/ast.py

@@ -187,6 +187,11 @@ def __init__(self, value, **kwargs):
         super(TextElement, self).__init__(**kwargs)
         self.value = value
 
+class Placeable(SyntaxNode):
+    def __init__(self, expression, **kwargs):
+        super(Placeable, self).__init__(**kwargs)
+        self.expression = expression
+
 class Expression(SyntaxNode):
     def __init__(self, **kwargs):
         super(Expression, self).__init__(**kwargs)

fluent/syntax/ftlstream.py

@@ -2,17 +2,28 @@
 from .stream import ParserStream
 from .errors import ParseError
 
+
+ws = (' ', '\t', '\n')
+
+
 class FTLParserStream(ParserStream):
-    def peek_line_ws(self):
+    def peek_ws(self):
+        ch = self.current_peek()
+        while ch:
+            if ch not in ws:
+                break
+            ch = self.peek()
+
+    def peek_inline_ws(self):
         ch = self.current_peek()
         while ch:
             if ch != ' ' and ch != '\t':
                 break
             ch = self.peek()
 
-    def skip_ws_lines(self):
+    def skip_ws(self):
         while True:
-            self.peek_line_ws()
+            self.peek_inline_ws()
 
             if self.current_peek_is('\n'):
                 self.skip_to_peek()
@@ -21,7 +32,7 @@ def skip_ws_lines(self):
                 self.reset_peek()
                 break
 
-    def skip_line_ws(self):
+    def skip_inline_ws(self):
         while self.ch:
             if self.ch != ' ' and self.ch != '\t':
                 break
@@ -66,6 +77,16 @@ def is_number_start(self):
 
         return (cc >= 48 and cc <= 57) or cc == 45
 
+    def is_peek_placeable_start(self):
+        self.peek_ws()
+
+        if self.current_peek_is('{'):
+            self.reset_peek()
+            return True
+
+        self.reset_peek()
+        return False
+
     def is_peek_next_line_indented(self):
         if not self.current_peek_is('\n'):
             return False
@@ -87,7 +108,7 @@ def is_peek_next_line_variant_start(self):
 
         ptr = self.get_peek_index()
 
-        self.peek_line_ws()
+        self.peek_inline_ws()
 
         if (self.get_peek_index() - ptr == 0):
             self.reset_peek()
@@ -111,7 +132,7 @@ def is_peek_next_line_attribute_start(self):
 
         ptr = self.get_peek_index()
 
-        self.peek_line_ws()
+        self.peek_inline_ws()
 
         if (self.get_peek_index() - ptr == 0):
             self.reset_peek()
@@ -132,7 +153,7 @@ def is_peek_next_line_pattern(self):
 
         ptr = self.get_peek_index()
 
-        self.peek_line_ws()
+        self.peek_inline_ws()
 
         if (self.get_peek_index() - ptr == 0):
             self.reset_peek()
@@ -158,7 +179,7 @@ def is_peek_next_line_tag_start(self):
 
         ptr = self.get_peek_index()
 
-        self.peek_line_ws()
+        self.peek_inline_ws()
 
         if (self.get_peek_index() - ptr == 0):
             self.reset_peek()