Merge pull request #415 from malthe/issue-414-import-order

Imports must appear first, and produced after processing defines

CHANGES.rst

@@ -3,7 +3,9 @@ Changes
 
 In next release ...
 
--
+- Fix a regression where a static symbol would not get correctly
+  imported.
+  (`#414 <https://github.com/malthe/chameleon/issues/414>`_)
 
 4.5.1 (2024-01-28)
 ------------------

src/chameleon/codegen.py

@@ -162,8 +162,9 @@ def visit_Module(self, module) -> AST:
 
         for name, node in self.defines.items():
             assignment = Assign(targets=[store(name)], value=node, lineno=None)
-            preamble.append(assignment)
+            preamble.append(self.visit(assignment))
 
+        imports: list[AST] = []
         for value, node in self.imports.items():
             stmt: AST
 
@@ -183,10 +184,9 @@ def visit_Module(self, module) -> AST:
             else:
                 raise TypeError(value)
 
-            preamble.append(stmt)
+            imports.append(stmt)
 
-        preamble = [self.visit(stmt) for stmt in preamble]
-        return Module(preamble + module.body, ())
+        return Module(imports + preamble + module.body, ())
 
     def visit_Comment(self, node) -> AST:
         self.comments.append(node.text)