FluentParser and FluentSerializer

Author: stasm

fluent/syntax/__init__.py

@@ -0,0 +1,12 @@
+from .parser import FluentParser
+from .serializer import FluentSerializer
+
+
+def parse(source, **kwargs):
+    parser = FluentParser(**kwargs)
+    return parser.parse(source)
+
+
+def serialize(resource, **kwargs):
+    serializer = FluentSerializer(**kwargs)
+    return serializer.serialize(resource)

fluent/syntax/parser.py

@@ -4,31 +4,31 @@
 from .errors import ParseError
 
 
-def parse(source):
-    comment = None
-
-    ps = FTLParserStream(source)
-    ps.skip_ws_lines()
+class FluentParser(object):
+    def parse(self, source):
+        comment = None
 
-    entries = []
+        ps = FTLParserStream(source)
+        ps.skip_ws_lines()
 
-    while ps.current():
-        entry = get_entry_or_junk(ps)
+        entries = []
 
-        if isinstance(entry, ast.Comment) and len(entries) == 0:
-            comment = entry
-        else:
-            entries.append(entry)
+        while ps.current():
+            entry = get_entry_or_junk(ps)
 
-        ps.skip_ws_lines()
+            if isinstance(entry, ast.Comment) and len(entries) == 0:
+                comment = entry
+            else:
+                entries.append(entry)
 
-    return ast.Resource(entries, comment)
+            ps.skip_ws_lines()
 
+        return ast.Resource(entries, comment)
 
-def parse_entry(source):
-    ps = FTLParserStream(source)
-    ps.skip_ws_lines()
-    return get_entry_or_junk(ps)
+    def parse_entry(self, source):
+        ps = FTLParserStream(source)
+        ps.skip_ws_lines()
+        return get_entry_or_junk(ps)
 
 
 def get_entry_or_junk(ps):

fluent/syntax/serializer.py

@@ -15,31 +15,34 @@ def contain_new_line(elems):
     ])
 
 
-def serialize(resource, with_junk=False):
-    parts = []
-    if resource.comment:
-        parts.append(
-            "{}\n\n".format(
-                serialize_comment(resource.comment)
+class FluentSerializer(object):
+    def __init__(self, with_junk=False):
+        self.with_junk = with_junk
+
+    def serialize(self, resource):
+        parts = []
+        if resource.comment:
+            parts.append(
+                "{}\n\n".format(
+                    serialize_comment(resource.comment)
+                )
             )
-        )
-    for entry in resource.body:
-        if not isinstance(entry, ast.Junk) or with_junk:
-            parts.append(serialize_entry(entry))
-
-    return "".join(parts)
-
-
-def serialize_entry(entry):
-    if isinstance(entry, ast.Message):
-        return serialize_message(entry)
-    if isinstance(entry, ast.Section):
-        return serialize_section(entry)
-    if isinstance(entry, ast.Comment):
-        return serialize_comment(entry)
-    if isinstance(entry, ast.Junk):
-        return serialize_junk(entry)
-    raise Exception('Unknown entry type: {}'.format(entry.type))
+        for entry in resource.body:
+            if not isinstance(entry, ast.Junk) or self.with_junk:
+                parts.append(self.serialize_entry(entry))
+
+        return "".join(parts)
+
+    def serialize_entry(self, entry):
+        if isinstance(entry, ast.Message):
+            return serialize_message(entry)
+        if isinstance(entry, ast.Section):
+            return serialize_section(entry)
+        if isinstance(entry, ast.Comment):
+            return serialize_comment(entry)
+        if isinstance(entry, ast.Junk):
+            return serialize_junk(entry)
+        raise Exception('Unknown entry type: {}'.format(entry.type))
 
 
 def serialize_comment(comment):

tests/syntax/test_ast_json.py

@@ -6,16 +6,19 @@
 
 from tests.syntax import dedent_ftl
 from fluent.syntax.ast import from_json
-from fluent.syntax.parser import parse
+from fluent.syntax.parser import FluentParser
 
 
 class TestASTJSON(unittest.TestCase):
+    def setUp(self):
+        self.parser = FluentParser()
+
     def test_simple_resource(self):
         input = """\
             foo = Foo
         """
 
-        ast1 = parse(dedent_ftl(input))
+        ast1 = self.parser.parse(dedent_ftl(input))
         json1 = ast1.to_json()
         ast2 = from_json(json1)
         json2 = ast2.to_json()
@@ -47,7 +50,7 @@ def test_complex_resource(self):
                 } post.
         """
 
-        ast1 = parse(dedent_ftl(input))
+        ast1 = self.parser.parse(dedent_ftl(input))
         json1 = ast1.to_json()
         ast2 = from_json(json1)
         json2 = ast2.to_json()
@@ -59,7 +62,7 @@ def test_syntax_error(self):
             foo = Foo {
         """
 
-        ast1 = parse(dedent_ftl(input))
+        ast1 = self.parser.parse(dedent_ftl(input))
         json1 = ast1.to_json()
         ast2 = from_json(json1)
         json2 = ast2.to_json()

tests/syntax/test_entry.py

@@ -6,11 +6,14 @@
 
 from tests.syntax import dedent_ftl
 from fluent.syntax.ast import from_json
-from fluent.syntax.parser import parse_entry
-from fluent.syntax.serializer import serialize_entry
+from fluent.syntax.parser import FluentParser
+from fluent.syntax.serializer import FluentSerializer
 
 
 class TestParseEntry(unittest.TestCase):
+    def setUp(self):
+        self.parser = FluentParser()
+
     def test_simple_message(self):
         input = """\
             foo = Foo
@@ -41,11 +44,14 @@ def test_simple_message(self):
             }
         }
 
-        message = parse_entry(dedent_ftl(input))
+        message = self.parser.parse_entry(dedent_ftl(input))
         self.assertEqual(message.to_json(), output)
 
 
 class TestSerializeEntry(unittest.TestCase):
+    def setUp(self):
+        self.serializer = FluentSerializer()
+
     def test_simple_message(self):
         input = {
             "comment": None,
@@ -76,5 +82,5 @@ def test_simple_message(self):
             foo = Foo
         """
 
-        message = serialize_entry(from_json(input))
+        message = self.serializer.serialize_entry(from_json(input))
         self.assertEqual(message, dedent_ftl(output))

tests/syntax/test_serializer.py

@@ -5,8 +5,7 @@
 sys.path.append('.')
 
 from tests.syntax import dedent_ftl
-from fluent.syntax.parser import parse
-from fluent.syntax.serializer import serialize
+from fluent.syntax import parse, serialize
 
 
 def pretty_ftl(text):

tools/fluentfmt.py

@@ -4,8 +4,7 @@
 
 sys.path.append('./')
 import codecs
-import fluent.syntax.parser
-import fluent.syntax.serializer
+from fluent.syntax import parse, serialize
 
 
 def read_file(path):
@@ -15,8 +14,8 @@ def read_file(path):
 
 
 def pretty_print(fileType, data):
-    ast = fluent.syntax.parser.parse(data)
-    print(fluent.syntax.serializer.serialize(ast))
+    ast = parse(data)
+    print(serialize(ast))
 
 if __name__ == "__main__":
     file_type = 'ftl'

tools/parse.py

@@ -4,7 +4,7 @@
 
 sys.path.append('./')
 import codecs
-import fluent.syntax.parser
+from fluent.syntax import parse
 import json
 
 
@@ -15,7 +15,7 @@ def read_file(path):
 
 
 def print_ast(fileType, data):
-    ast = fluent.syntax.parser.parse(data)
+    ast = parse(data)
     print(json.dumps(ast.to_json(), indent=2, ensure_ascii=False))
 
 

tools/serialize.py

@@ -5,8 +5,7 @@
 
 sys.path.append('./')
 import codecs
-import fluent.syntax.ast
-import fluent.syntax.serializer
+from fluent.syntax import ast, serialize
 
 
 def read_json(path):
@@ -15,8 +14,8 @@ def read_json(path):
 
 
 def pretty_print(fileType, data):
-    ast = fluent.syntax.ast.from_json(data)
-    print(fluent.syntax.serializer.serialize(ast))
+    resource = ast.from_json(data)
+    print(serialize(resource))
 
 if __name__ == "__main__":
     file_type = 'ftl'