Merge branch 'main' of github.com:lf-lang/reactor-uc

lf-lang · Dec 3, 2024 · abf025c · abf025c
2 parents 32963f2 + 330e9d2
commit abf025c
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 12 deletions.
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcPreambleGenerator.kt b/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcPreambleGenerator.kt
@@ -10,5 +10,5 @@ class UcPreambleGenerator(
     private val reactor: Reactor,
 ) {
     fun generateReactorPrivatePreamble() = reactor.preambles.joinToString(prefix= "// Private preambles\n", separator = "\n", postfix = "\n") { it.code.toText()}
-    fun generateReactorPublicPreamble() = resource.model.preambles.joinToString(prefix = "// Public preambles ", separator = "\n", postfix = "\n") {it.code.toText()}
+    fun generateReactorPublicPreamble() = resource.model.preambles.joinToString(prefix = "// Public preambles\n", separator = "\n", postfix = "\n") {it.code.toText()}
 }
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcReactionGenerator.kt b/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcReactionGenerator.kt
@@ -48,18 +48,15 @@ class UcReactionGenerator(private val reactor: Reactor) {
             return res
         }
 
-
     private val Reaction.allContainedEffectsTriggersAndSources
         get() = run {
             val res = mutableMapOf<Instantiation, List<VarRef>>()
-            for (effect in allContainedEffects) {
-                res.getOrPut(effect.container!!) { mutableListOf(effect) }.plus(effect)
-            }
-            for (trigger in allContainedTriggers) {
-                res.getOrPut((trigger as VarRef).container!!) { mutableListOf(trigger) }.plus(trigger)
-            }
-            for (source in allContainedSources) {
-                res.getOrPut((source as VarRef).container!!) { mutableListOf(source) }.plus(source)
+            for (varRef in allContainedEffects.plus(allContainedSources).plus(allContainedTriggers)) {
+                val varRef = varRef as VarRef
+                if (varRef.container!! !in res.keys) {
+                    res[varRef.container] = mutableListOf()
+                }
+                res[varRef.container] = res[varRef.container]!!.plus(varRef)
             }
             res
         }
@@ -238,7 +235,7 @@ class UcReactionGenerator(private val reactor: Reactor) {
         """|
            |// Generated struct providing access to ports of child reactor `${inst.name}`
            |struct _${inst.reactor.codeType}_${inst.name} {
-        ${"|  "..triggers.joinToString { generateContainedTriggerInScope(it) }}
+        ${"|  "..triggers.joinToString(separator = "\n") { generateContainedTriggerInScope(it) }}
            |};
            |struct _${inst.reactor.codeType}_${inst.name} ${inst.name};
         ${"|"..triggers.joinToString(separator = "\n") {generateContainedTriggerFieldInit("${inst.name}", it)}}

diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcReactorGenerator.kt b/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcReactorGenerator.kt
@@ -37,7 +37,7 @@ class UcReactorGenerator(private val reactor: Reactor, fileConfig: UcFileConfig,
     private val timers = UcTimerGenerator(reactor)
     private val actions = UcActionGenerator(reactor)
     private val reactions = UcReactionGenerator(reactor)
-    private val preambles = UcPreambleGenerator(fileConfig.resource, reactor)
+    private val preambles = UcPreambleGenerator(reactor.eResource(), reactor)
     private val instances =
         UcInstanceGenerator(reactor, parameters, ports, connections, reactions, fileConfig, messageReporter)
 

diff --git a/test/lf/src/Preamble.lf b/test/lf/src/Preamble.lf
@@ -1,11 +1,19 @@
 target uC
 
+import ImportedPreamble from "./lib/ImportedPreamble.lf"
+preamble {=
+  static int test2 = 32;
+=}
 
 main reactor {
+  imported = new ImportedPreamble()
+
 preamble {=
     static int test = 42;
 =}
   reaction(startup) {=
     validate(test == 42);
+    validate(test2 == 32);
+    validate(test3 == 22);
   =}
 }
diff --git a/test/lf/src/lib/ImportedPreamble.lf b/test/lf/src/lib/ImportedPreamble.lf
@@ -0,0 +1,11 @@
+target uC
+
+preamble {=
+  static int test3 = 22;
+=}
+
+reactor ImportedPreamble {
+  reaction(startup) {=
+    validate(test3 == 22);
+  =}
+}