Refactor string formatting a little

lf-lang · Feb 4, 2025 · baf2922 · baf2922
1 parent 22a2d2b
commit baf2922
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt b/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt
@@ -28,7 +28,6 @@ abstract class UcMakeGenerator(private val mainTarget: String, private val numEv
             |REACTION_QUEUE_SIZE = ${max(numReactions, 1)}
             |EVENT_QUEUE_SIZE = ${max(numEvents, 2)}
             |
-            |
         """.trimMargin()
     }
 }
@@ -43,15 +42,16 @@ class UcMakeGeneratorFederated(private val federate: UcFederate, targetConfig: T
     : UcMakeGenerator(federate.codeType, numEvents, numReactions) {
     override fun generateMake(sources: List<Path>): String {
         val channelTypes = federate.interfaces.map { it.type }.toSet()
-
-        return """
-        ${"|"..doGenerateMake(sources, federate.getCompileDefs())}
-        ${channelTypes.map { when (it) {
+        val channelTypesCompileDefs = channelTypes.joinWithLn { when(it) {
             NetworkChannelType.TCP_IP -> "|CFLAGS += -DNETWORK_CHANNEL_TCP_RIOT"
             NetworkChannelType.COAP_UDP_IP -> "|CFLAGS += -DNETWORK_CHANNEL_COAP_RIOT" //TODO: Abstract RIOT away!
             NetworkChannelType.NONE -> ""
             NetworkChannelType.CUSTOM -> ""
-        }}.joinWithLn { it }}
+        } }
+
+        return """
+            |${doGenerateMake(sources, federate.getCompileDefs())}
+            |${channelTypesCompileDefs}
         """.trimMargin()
     }
 }