Swift: tweaks for use in the PoC branch

Author: redsun82

swift/codegen/lib/generator.py

@@ -5,7 +5,7 @@
 import sys
 from typing import Set
 
-from . import options, render
+from . import options, render, paths
 
 
 def _parse(tags: Set[str]) -> argparse.Namespace:
@@ -25,7 +25,8 @@ def run(*modules, **kwargs):
             opts = _parse({t for m in modules for t in m.tags})
         log_level = logging.DEBUG if opts.verbose else logging.INFO
         logging.basicConfig(format="{levelname} {message}", style='{', level=log_level)
+        exe_path = paths.exe_file.relative_to(opts.swift_dir)
         for m in modules:
-            m.generate(opts, render.Renderer())
+            m.generate(opts, render.Renderer(exe_path))
     else:
         run(sys.modules["__main__"], **kwargs)

swift/codegen/lib/paths.py

@@ -15,7 +15,4 @@
 lib_dir = swift_dir / 'codegen' / 'lib'
 templates_dir = swift_dir / 'codegen' / 'templates'
 
-try:
-    exe_file = pathlib.Path(sys.argv[0]).resolve().relative_to(swift_dir)
-except ValueError:
-    exe_file = pathlib.Path(sys.argv[0]).name
+exe_file = pathlib.Path(sys.argv[0]).resolve()

swift/codegen/lib/render.py

@@ -18,9 +18,10 @@
 class Renderer:
     """ Template renderer using mustache templates in the `templates` directory """
 
-    def __init__(self):
+    def __init__(self, generator):
         self._r = pystache.Renderer(search_dirs=str(paths.templates_dir), escape=lambda u: u)
         self.written = set()
+        self._generator = generator
 
     def render(self, data, output: pathlib.Path):
         """ Render `data` to `output`.
@@ -34,7 +35,7 @@ def render(self, data, output: pathlib.Path):
         """
         mnemonic = type(data).__name__
         output.parent.mkdir(parents=True, exist_ok=True)
-        data = self._r.render_name(data.template, data, generator=paths.exe_file)
+        data = self._r.render_name(data.template, data, generator=self._generator)
         with open(output, "w") as out:
             out.write(data)
         log.debug(f"generated {mnemonic} {output.name}")

swift/codegen/templates/ql_class.mustache

@@ -1,4 +1,5 @@
 // generated by {{generator}}
+
 {{#imports}}
 import {{.}}
 {{/imports}}

swift/codegen/templates/ql_stub.mustache

@@ -1,4 +1,5 @@
 // generated by {{generator}}, remove this comment if you wish to edit this file
+
 private import {{base_import}}
 
-class {{name}} extends {{name}}Base { }
+class {{name}} extends {{name}}Base {}

swift/codegen/test/test_render.py

@@ -7,6 +7,9 @@
 from swift.codegen.lib import render
 
 
+generator = "test/foogen"
+
+
 @pytest.fixture
 def pystache_renderer_cls():
     with mock.patch("pystache.Renderer") as ret:
@@ -22,7 +25,7 @@ def pystache_renderer(pystache_renderer_cls):
 
 @pytest.fixture
 def sut(pystache_renderer):
-    return render.Renderer()
+    return render.Renderer(generator)
 
 
 def test_constructor(pystache_renderer_cls, sut):
@@ -40,7 +43,7 @@ def test_render(pystache_renderer, sut):
     with mock.patch("builtins.open", mock.mock_open()) as output_stream:
         sut.render(data, output)
     assert pystache_renderer.mock_calls == [
-        mock.call.render_name(data.template, data, generator=paths.exe_file),
+        mock.call.render_name(data.template, data, generator=generator),
     ]
     assert output_stream.mock_calls == [
         mock.call(output, 'w'),

swift/codegen/test/utils.py

@@ -18,7 +18,7 @@ def write(out, contents=""):
 
 @pytest.fixture
 def renderer():
-    return mock.Mock(spec=render.Renderer())
+    return mock.Mock(spec=render.Renderer(""))
 
 
 @pytest.fixture