break on newline

Author: stasm

fluent/syntax/parser.py

@@ -351,18 +351,20 @@ def get_pattern(self, ps):
         elements = []
         ps.skip_ws()
 
-        while ps.current():
-            ch = ps.current()
+        ch = ps.current()
+        while ch:
+            if ch == '\n':
+                break
 
             if ch == '{':
                 element = self.get_placeable(ps)
                 elements.append(element)
-            elif ch == '\n':
-                break
             else:
                 element = self.get_text_element(ps)
                 elements.append(element)
 
+            ch = ps.current()
+
         return ast.Pattern(elements)
 
     @with_span
@@ -387,13 +389,12 @@ def get_text_element(self, ps):
                 continue
 
             elif ch == '\\':
-                ch2 = ps.peek()
+                ch2 = ps.next()
 
                 if ch2 == '{' or ch2 == '"':
                     buf += ch2
                 else:
                     buf += ch + ch2
-                ps.next()
 
             else:
                 buf += ch