[DRAFT] Lingua Franca Intermediate Representation

cmake/lfc.cmake

@@ -72,4 +72,4 @@ function(lf_build_generated_code MAIN_TARGET SOURCE_GEN_DIR)
   target_link_libraries(${MAIN_TARGET} PUBLIC reactor-uc)
   target_compile_definitions(reactor-uc PUBLIC LF_LOG_LEVEL_ALL=${LOG_LEVEL})
   target_compile_definitions(reactor-uc PUBLIC ${LFC_GEN_COMPILE_DEFS})
-endfunction()
+endfunction()

lfc/core/src/main/kotlin/org/lflang/generator/uc/UcFederate.kt → federated/UcFederate.kt

@@ -1,15 +1,16 @@
-package org.lflang.generator.uc
+package org.lflang.generator.uc.federated
 
 import org.lflang.AttributeUtils
 import org.lflang.TimeValue
 import org.lflang.generator.uc.UcInstanceGenerator.Companion.codeTypeFederate
+import org.lflang.generator.uc.mics.UcClockSyncParameters
+import org.lflang.ir.FederateInstantiation
 import org.lflang.isBank
 import org.lflang.lf.Attribute
-import org.lflang.lf.Instantiation
 import org.lflang.target.property.type.PlatformType
 
-class UcFederate(val inst: Instantiation, val bankIdx: Int) {
-  val isBank = inst.isBank
+class UcFederate(val inst: FederateInstantiation, val bankIdx: Int) {
+  val isBank = inst.codeWidth > 1
   val platform: PlatformType.Platform = AttributeUtils.getFederatePlatform(inst)
   val interfaces = mutableListOf<UcNetworkInterface>()
   val codeType = if (isBank) "${inst.codeTypeFederate}_${bankIdx}" else inst.codeTypeFederate
@@ -35,8 +36,8 @@ class UcFederate(val inst: Instantiation, val bankIdx: Int) {
   fun getJoiningPolicy(): JoiningPolicy {
     val attr: Attribute? = AttributeUtils.getJoiningPolicy(inst)
     return attr
-        ?.let { JoiningPolicy.parse(it.getAttrParms().get(0).getValue()) }
-        .run { JoiningPolicy.JOIN_IMMEDIATELY }
+        ?.let { JoiningPolicy.Companion.parse(it.getAttrParms().get(0).getValue()) }
+        .run { JoiningPolicy.IMMEDIATELY }
   }
 
   fun getDefaultInterface(): UcNetworkInterface = interfaces.first()

lfc/core/src/main/kotlin/org/lflang/generator/uc/UcFederateGenerator.kt → federated/UcFederateGenerator.kt

@@ -1,7 +1,14 @@
-package org.lflang.generator.uc
+package org.lflang.generator.uc.federated
 
 import org.lflang.*
 import org.lflang.generator.PrependOperator
+import org.lflang.generator.uc.UcConnectionGenerator
+import org.lflang.generator.uc.UcFileConfig
+import org.lflang.generator.uc.UcInstanceGenerator
+import org.lflang.generator.uc.UcParameterGenerator
+import org.lflang.generator.uc.UcPortGenerator
+import org.lflang.generator.uc.UcReactionGenerator
+import org.lflang.generator.uc.mics.UcClockSyncGenerator
 import org.lflang.lf.*
 import org.lflang.target.TargetConfig
 

lfc/core/src/main/kotlin/org/lflang/generator/uc/UcFederatedLaunchScriptGenerator.kt → federated/UcFederatedLaunchScriptGenerator.kt

@@ -1,6 +1,7 @@
-package org.lflang.generator.uc
+package org.lflang.generator.uc.federated
 
 import org.lflang.generator.PrependOperator
+import org.lflang.generator.uc.UcFileConfig
 import org.lflang.joinWithLn
 
 class UcFederatedLaunchScriptGenerator(private val fileConfig: UcFileConfig) {

lfc/core/src/main/kotlin/org/lflang/generator/uc/UcFederatedProjectTemplateGenerator.kt → federated/UcFederatedProjectTemplateGenerator.kt

@@ -1,4 +1,4 @@
-package org.lflang.generator.uc
+package org.lflang.generator.uc.federated
 
 import java.nio.file.Files
 import java.nio.file.Path

lfc/core/src/main/kotlin/org/lflang/generator/uc/UcGeneratorFederated.kt → federated/UcGeneratorFederated.kt

@@ -1,13 +1,16 @@
-package org.lflang.generator.uc
+package org.lflang.generator.uc.federated
 
 import java.nio.file.Path
 import java.nio.file.Paths
 import org.eclipse.emf.ecore.resource.Resource
 import org.lflang.generator.CodeMap
 import org.lflang.generator.GeneratorResult
-import org.lflang.generator.GeneratorUtils.canGenerate
+import org.lflang.generator.GeneratorUtils
 import org.lflang.generator.LFGeneratorContext
+import org.lflang.generator.uc.UcGenerator
+import org.lflang.generator.uc.UcGeneratorNonFederated
 import org.lflang.generator.uc.UcInstanceGenerator.Companion.width
+import org.lflang.generator.uc.UcPreambleGenerator
 import org.lflang.lf.LfFactory
 import org.lflang.lf.Reactor
 import org.lflang.reactor
@@ -41,7 +44,7 @@ class UcGeneratorFederated(context: LFGeneratorContext, scopeProvider: LFGlobalS
       srcGenPath: Path,
       federate: UcFederate
   ): GeneratorResult.Status {
-    if (!canGenerate(errorsOccurred(), federate.inst, messageReporter, context))
+    if (!GeneratorUtils.canGenerate(errorsOccurred(), federate.inst, messageReporter, context))
         return GeneratorResult.Status.FAILED
 
     super.copyUserFiles(targetConfig, fileConfig)

lfc/core/src/main/kotlin/org/lflang/generator/uc/UcIpAddress.kt → federated/UcIpAddress.kt

@@ -1,6 +1,8 @@
-package org.lflang.generator.uc
+package org.lflang.generator.uc.federated
 
 import java.math.BigInteger
+import java.net.Inet4Address
+import java.net.Inet6Address
 import java.net.InetAddress
 import java.net.UnknownHostException
 import java.util.concurrent.atomic.AtomicInteger
@@ -23,7 +25,7 @@ sealed class IPAddress {
     companion object {
       fun isValidIPv4(ip: String): Boolean {
         return try {
-          InetAddress.getByName(ip) is java.net.Inet4Address
+          InetAddress.getByName(ip) is Inet4Address
         } catch (e: UnknownHostException) {
           false
         }
@@ -39,7 +41,7 @@ sealed class IPAddress {
     companion object {
       fun isValidIPv6(ip: String): Boolean {
         return try {
-          InetAddress.getByName(ip) is java.net.Inet6Address
+          InetAddress.getByName(ip) is Inet6Address
         } catch (e: UnknownHostException) {
           false
         }

lfc/core/src/main/kotlin/org/lflang/generator/uc/UcNetworkChannel.kt → federated/UcNetworkChannel.kt

@@ -1,8 +1,11 @@
-package org.lflang.generator.uc
+package org.lflang.generator.uc.federated
 
 import org.lflang.AttributeUtils.getInterfaceAttributes
 import org.lflang.AttributeUtils.getLinkAttribute
-import org.lflang.generator.uc.NetworkChannelType.*
+import org.lflang.generator.uc.UcFederatedConnectionBundle
+import org.lflang.generator.uc.federated.NetworkChannelType.*
+import org.lflang.generator.uc.mics.getParamInt
+import org.lflang.generator.uc.mics.getParamString
 import org.lflang.lf.Attribute
 
 // An enumeration of the supported NetworkChannels

lfc/core/src/main/kotlin/org/lflang/generator/uc/UcPlatformGeneratorFederated.kt → federated/UcPlatformGeneratorFederated.kt

@@ -1,6 +1,11 @@
-package org.lflang.generator.uc
+package org.lflang.generator.uc.federated
 
 import java.nio.file.Path
+import org.lflang.generator.uc.UcCmakeGeneratorFederated
+import org.lflang.generator.uc.UcMainGeneratorFederated
+import org.lflang.generator.uc.UcMakeGeneratorFederated
+import org.lflang.generator.uc.UcPlatformGenerator
+import org.lflang.ir.Reactor
 import org.lflang.target.property.NoCompileProperty
 import org.lflang.target.property.PlatformProperty
 import org.lflang.target.property.type.PlatformType
@@ -9,8 +14,9 @@ import org.lflang.util.FileUtil
 class UcPlatformGeneratorFederated(
     generator: UcGeneratorFederated,
     override val srcGenPath: Path,
-    private val federate: UcFederate
-) : UcPlatformGenerator(generator) {
+    private val federate: UcFederate,
+    mainReactor: Reactor
+) : UcPlatformGenerator(generator, mainReactor) {
 
   override val buildPath = srcGenPath.resolve("build")
   override val targetName: String = federate.codeType

lfc/core/src/main/kotlin/org/lflang/generator/uc/UcStartupCoordinatorGenerator.kt → federated/UcStartupCoordinatorGenerator.kt

@@ -1,7 +1,27 @@
-package org.lflang.generator.uc
+package org.lflang.generator.uc.federated
 
-import org.lflang.*
-import org.lflang.lf.*
+import org.lflang.generator.uc.UcConnectionGenerator
+
+enum class JoiningPolicy {
+  IMMEDIATELY,
+  TIMER_ALIGNED;
+
+  companion object {
+    fun parse(str: String): JoiningPolicy =
+        when (str) {
+          "\"IMMEDIATELY\"" -> IMMEDIATELY
+          "\"TIMER_ALIGNED\"" -> TIMER_ALIGNED
+          else -> throw IllegalArgumentException("Unknown joining policy: $str")
+        }
+  }
+}
+
+fun JoiningPolicy.toCString() =
+    when (this) {
+      JoiningPolicy.IMMEDIATELY -> "JOIN_IMMEDIATELY"
+      JoiningPolicy.TIMER_ALIGNED -> "JOIN_INDIVIDUAL_TIMER_ALIGNED"
+      else -> throw IllegalArgumentException("Joining policy not handled")
+    }
 
 enum class JoiningPolicy {
   JOIN_IMMEDIATELY,

lfc/core/src/main/kotlin/org/lflang/generator/uc/UcUARTDevices.kt → federated/UcUARTDevices.kt

@@ -1,4 +1,4 @@
-package org.lflang.generator.uc
+package org.lflang.generator.uc.federated
 
 import java.util.concurrent.atomic.AtomicInteger
 

include/reactor-uc/platform.h

@@ -23,6 +23,13 @@ struct Mutex {
 /** Construct a Mutex*/
 void Mutex_ctor(Mutex *super);
 
+struct RealtimePlatform {
+  Platform platform;
+
+
+}
+
+
 struct Platform {
   /**
    * @brief Return the current physical time in nanoseconds.

lfc/bin/lfc-dev

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/nix/store/5mh7kaj2fyv8mk4sfq1brwxgc02884wi-bash-5.2p37/bin/bash
 
 #============================================================================
 # Description:      Build and run the Lingua Franca compiler (lfc).

lfc/cli/base/src/main/java/org/lflang/cli/CliBase.java

@@ -298,7 +298,7 @@ public List<LfIssue> printErrorsIfAny() {
    */
   public void validateResource(Resource resource) {
     assert resource != null;
-
+    System.out.println(resource.toString());
     List<Issue> issues = this.validator.validate(resource, CheckMode.ALL, CancelIndicator.NullImpl);
 
     for (Issue issue : issues) {

lfc/core/src/main/java/org/lflang/AttributeUtils.java

@@ -234,15 +234,6 @@ public static Attribute getJoiningPolicy(Instantiation node) {
     return findAttributeByName(node, "joining_policy");
   }
 
-  public static int getMaxNumberOfPendingEvents(Action node) {
-    Attribute attr = findAttributeByName(node, "max_pending_events");
-    if (attr != null) {
-      return Integer.valueOf(attr.getAttrParms().get(0).getValue());
-    } else {
-      return -1;
-    }
-  }
-
   public static int getConnectionBufferSize(Connection node) {
     Attribute attr = findAttributeByName(node, "buffer");
     if (attr != null) {

lfc/core/src/main/java/org/lflang/LinguaFranca.xtext

@@ -533,4 +533,4 @@ Token:
     '@' |
     // Single quotes
     "'"
-;
+;

lfc/core/src/main/java/org/lflang/generator/LFGenerator.java

@@ -1,7 +1,8 @@
 package org.lflang.generator;
 
-import static org.lflang.generator.uc.UcGeneratorKt.createUcGenerator;
+import static org.lflang.generator.uc2.UcGeneratorKt.createUcGenerator;
 
+import com.google.common.collect.Lists;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import java.nio.file.Path;
@@ -12,7 +13,12 @@
 import org.lflang.FileConfig;
 import org.lflang.MessageReporter;
 import org.lflang.ast.ASTUtils;
-import org.lflang.generator.uc.UcFileConfig;
+import org.lflang.generator.uc2.UcFileConfig;
+import org.lflang.generator.uc2.UcGenerator;
+import org.lflang.generator.uc2.UcGeneratorNonFederated;
+import org.lflang.ir.Environment;
+import org.lflang.ir.Federate;
+import org.lflang.ir.XTextConverter;
 import org.lflang.scoping.LFGlobalScopeProvider;
 import org.lflang.target.Target;
 
@@ -41,29 +47,27 @@ public static FileConfig createFileConfig(
     //        return new FederationFileConfig(resource, srcGenBasePath, useHierarchicalBin);
     //      }
 
-    return switch (target) {
-        // case CCPP, C -> new CFileConfig(resource, srcGenBasePath, useHierarchicalBin);
-        // case Python -> new PyFileConfig(resource, srcGenBasePath, useHierarchicalBin);
-        // case CPP -> new CppFileConfig(resource, srcGenBasePath, useHierarchicalBin);
-        // case Rust -> new RustFileConfig(resource, srcGenBasePath, useHierarchicalBin);
-        // case TS -> new TSFileConfig(resource, srcGenBasePath, useHierarchicalBin);
-      case UC -> new UcFileConfig(resource, srcGenBasePath, useHierarchicalBin, runtimeSymlink);
-    };
+    return new UcFileConfig(resource, srcGenBasePath, useHierarchicalBin, runtimeSymlink);
   }
 
   /** Create a generator object for the given target. */
-  private GeneratorBase createGenerator(LFGeneratorContext context) {
+  private UcGenerator createGenerator(Resource resource, LFGeneratorContext context, MessageReporter messageReporter) {
     final Target target = Target.fromDecl(ASTUtils.targetDecl(context.getFileConfig().resource));
-    assert target != null;
-    return switch (target) {
-        // case C -> new CGenerator(context, false);
-        // case CCPP -> new CGenerator(context, true);
-        // case Python -> new PythonGenerator(context);
-        // case CPP -> new CppGenerator(context, scopeProvider);
-        // case TS -> new TSGenerator(context);
-        // case Rust -> new RustGenerator(context, scopeProvider);
-      case UC -> createUcGenerator(context, scopeProvider);
-    };
+    var converter = new XTextConverter(resource);
+    var env = converter.convert();
+
+    var generator = createUcGenerator(
+            context,
+            scopeProvider,
+            env.getFirst(),
+            env.getFirst().getMainReactor(),
+            messageReporter
+    );
+
+    var gen1 = (UcGeneratorNonFederated) generator;
+    gen1.file = env.getSecond();
+
+    return generator;
   }
 
   @Override
@@ -76,18 +80,21 @@ public void doGenerate(Resource resource, IFileSystemAccess2 fsa, IGeneratorCont
       lfContext = LFGeneratorContext.lfGeneratorContextOf(resource, fsa, context);
     }
 
+
     // The fastest way to generate code is to not generate any code.
     if (lfContext.getMode() == LFGeneratorContext.Mode.LSP_FAST) return;
 
-    final GeneratorBase generator = createGenerator(lfContext);
-    if (generator != null) {
-      generatorErrorsOccurred = generator.errorsOccurred();
-      generator.doGenerate(resource, lfContext);
-    }
     final MessageReporter messageReporter = lfContext.getErrorReporter();
     if (messageReporter instanceof LanguageServerMessageReporter) {
       ((LanguageServerMessageReporter) messageReporter).publishDiagnostics();
     }
+
+    var generator = createGenerator(resource, lfContext, messageReporter);
+    var generator1 = (UcGeneratorNonFederated)generator;
+    generatorErrorsOccurred = generator.errorsOccurred();
+
+    generator.doGenerate(resource, lfContext);
+
   }
 
   /** Return true if errors occurred in the last call to doGenerate(). */