preserve source location info of dialect-import in example dialects

Technologicat · Technologicat · commit d370a89dcc28 · 2022-01-27T11:37:20.000+02:00
Any code coming in from the template will be marked as if it came from the line
containing the dialect-import statement. (Invoke the
`mcpyrate.debug.StepExpansion` dialect before any other dialects to see the line
numbers.)

Preserving the source location info requires `mcpyrate` 3.6.0 or later.

This will also run on earlier versions, without preserving the source location
info, just like before; then it will look like all dialect template code came
from the beginning of the unexpanded user code.
diff --git a/unpythonic/dialects/lispython.py b/unpythonic/dialects/lispython.py
@@ -39,7 +39,15 @@ def transform_ast(self, tree):  # tree is an ast.Module
             from unpythonic import cons, car, cdr, ll, llist, nil, prod, dyn, Values  # noqa: F401, F811
             with autoreturn, quicklambda, multilambda, namedlambda, tco:
                 __paste_here__  # noqa: F821, just a splicing marker.
-        tree.body = splice_dialect(tree.body, template, "__paste_here__")
+
+        # Beginning with 3.6.0, `mcpyrate` makes available the source location info
+        # of the dialect-import that imported this dialect.
+        if hasattr(self, "lineno"):  # mcpyrate 3.6.0+
+            tree.body = splice_dialect(tree.body, template, "__paste_here__",
+                                       lineno=self.lineno, col_offset=self.col_offset)
+        else:
+            tree.body = splice_dialect(tree.body, template, "__paste_here__")
+
         return tree
 
 
@@ -68,5 +76,13 @@ def transform_ast(self, tree):  # tree is an ast.Module
             # of the template.
             with autoreturn, quicklambda, multilambda, namedlambda, tco:
                 __paste_here__  # noqa: F821, just a splicing marker.
-        tree.body = splice_dialect(tree.body, template, "__paste_here__")
+
+        # Beginning with 3.6.0, `mcpyrate` makes available the source location info
+        # of the dialect-import that imported this dialect.
+        if hasattr(self, "lineno"):  # mcpyrate 3.6.0+
+            tree.body = splice_dialect(tree.body, template, "__paste_here__",
+                                       lineno=self.lineno, col_offset=self.col_offset)
+        else:
+            tree.body = splice_dialect(tree.body, template, "__paste_here__")
+
         return tree
diff --git a/unpythonic/dialects/listhell.py b/unpythonic/dialects/listhell.py
@@ -23,5 +23,13 @@ def transform_ast(self, tree):  # tree is an ast.Module
             from unpythonic import composerc as compose  # compose from Right, Currying  # noqa: F401
             with prefix, autocurry:
                 __paste_here__  # noqa: F821, just a splicing marker.
-        tree.body = splice_dialect(tree.body, template, "__paste_here__")
+
+        # Beginning with 3.6.0, `mcpyrate` makes available the source location info
+        # of the dialect-import that imported this dialect.
+        if hasattr(self, "lineno"):  # mcpyrate 3.6.0+
+            tree.body = splice_dialect(tree.body, template, "__paste_here__",
+                                       lineno=self.lineno, col_offset=self.col_offset)
+        else:
+            tree.body = splice_dialect(tree.body, template, "__paste_here__")
+
         return tree
diff --git a/unpythonic/dialects/pytkell.py b/unpythonic/dialects/pytkell.py
@@ -39,5 +39,13 @@ def transform_ast(self, tree):  # tree is an ast.Module
             from unpythonic import cons, car, cdr, ll, llist, nil  # noqa: F401
             with lazify, autocurry:
                 __paste_here__  # noqa: F821, just a splicing marker.
-        tree.body = splice_dialect(tree.body, template, "__paste_here__")
+
+        # Beginning with 3.6.0, `mcpyrate` makes available the source location info
+        # of the dialect-import that imported this dialect.
+        if hasattr(self, "lineno"):  # mcpyrate 3.6.0+
+            tree.body = splice_dialect(tree.body, template, "__paste_here__",
+                                       lineno=self.lineno, col_offset=self.col_offset)
+        else:
+            tree.body = splice_dialect(tree.body, template, "__paste_here__")
+
         return tree
