Merge pull request #2381 from lf-lang/python-preamble

Fix to get get all preambles in Python + updated tests
lf-lang · Jul 31, 2024 · 2948f1f · 2948f1f
2 parents a088c1a + 55a1680
commit 2948f1f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/core/src/main/java/org/lflang/generator/python/PythonReactorGenerator.java b/core/src/main/java/org/lflang/generator/python/PythonReactorGenerator.java
@@ -46,7 +46,8 @@ public static String generatePythonClass(
       pythonClasses.pr(generatePythonClassHeader(className));
       // Generate preamble code
       pythonClasses.indent();
-      pythonClasses.pr(PythonPreambleGenerator.generatePythonPreambles(reactor.getPreambles()));
+      pythonClasses.pr(
+          PythonPreambleGenerator.generatePythonPreambles(ASTUtils.allPreambles(reactor)));
       // Handle runtime initializations
       pythonClasses.pr(generatePythonConstructor(decl, types));
       pythonClasses.pr(PythonParameterGenerator.generatePythonGetters(decl));

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
diff --git a/test/C/src/PreambleInherited.lf b/test/C/src/PreambleInherited.lf
@@ -12,6 +12,9 @@ reactor A {
 }
 
 reactor B extends A {
+  reaction(startup) {=
+    printf("FOO 2: %d\n", FOO);
+  =}
 }
 
 main reactor {

diff --git a/test/Python/src/PreambleInherited.lf b/test/Python/src/PreambleInherited.lf
@@ -0,0 +1,18 @@
+target Python
+
+reactor Base {
+  preamble {=
+    def initiation(self):
+      print("Hello World\n")
+  =}
+}
+
+reactor Extended extends Base {
+  reaction(startup) {=
+    self.initiation()
+  =}
+}
+
+main reactor {
+  e = new Extended()
+}