Merge branch 'master' into reactor-ts-npm

lf-lang · Aug 26, 2022 · f2f04d6 · f2f04d6
2 parents 9be1ad9 + 3d91524
commit f2f04d6
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
diff --git a/org.lflang/src/lib/cpp/reactor-cpp b/org.lflang/src/lib/cpp/reactor-cpp
diff --git a/org.lflang/src/lib/py/reactor-c-py b/org.lflang/src/lib/py/reactor-c-py
diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java
@@ -2678,6 +2678,7 @@ private void generateSelfStructs(ReactorInstance r) {
         // create references to the runtime instances aware of this exception.
         // For now, we just create a larger array than needed.
         initializeTriggerObjects.pr(CUtil.selfType(r)+"* "+CUtil.reactorRefName(r)+"["+r.getTotalWidth()+"];");
+        initializeTriggerObjects.pr("SUPPRESS_UNUSED_WARNING("+CUtil.reactorRefName(r)+");");
         for (ReactorInstance child : r.children) {
             generateSelfStructs(child);
         }

diff --git a/org.lflang/src/org/lflang/generator/c/CMainGenerator.java b/org.lflang/src/org/lflang/generator/c/CMainGenerator.java
@@ -37,7 +37,7 @@ public String generateCode() {
      */
     private String generateMainFunction() {
         return String.join("\n",
-            "int main(int argc, char* argv[]) {",
+            "int main(int argc, const char* argv[]) {",
             "    return lf_reactor_c_main(argc, argv);",
             "}"
         );
@@ -53,7 +53,7 @@ private String generateSetDefaultCliOption() {
         // so start with that.
         return runCommand.size() > 0 ?
             String.join("\n",
-                "char* _lf_default_argv[] = { " +
+                "const char* _lf_default_argv[] = { " +
                         StringUtil.addDoubleQuotes(
                             StringUtil.joinObjects(runCommand,
                                 StringUtil.addDoubleQuotes(", ")))+" };",

diff --git a/org.lflang/src/org/lflang/generator/ts/TSConstructorGenerator.kt b/org.lflang/src/org/lflang/generator/ts/TSConstructorGenerator.kt
@@ -126,8 +126,8 @@ class TSConstructorGenerator (
         val federateConfigurations = LinkedList<String>()
         if (reactor.isFederated) {
             for ((key, _) in federate.dependsOn) {
-                // FIXME: Get delay properly considering the unit instead of hardcoded BigInt(0).
-                federateConfigurations.add("this.addUpstreamFederate(${key.id}, BigInt(0));")
+                // FIXME: Get delay properly considering the unit instead of hardcoded TimeValue.NEVER().
+                federateConfigurations.add("this.addUpstreamFederate(${key.id}, TimeValue.NEVER());")
             }
             for ((key, _) in federate.sendsTo) {
                 federateConfigurations.add("this.addDownstreamFederate(${key.id});")
+1 −0		.gitignore
+3 −3		core/federated/federate.c
+1 −1		core/federated/federate.h
+6 −6		core/federated/net_util.c
+5 −4		core/federated/net_util.h
+3 −1		core/platform.h
+3 −0		core/platform/Platform.cmake
+82 −0		core/platform/lf_arduino_support.c
+115 −0		core/platform/lf_arduino_support.h
+9 −2		core/reactor.c
+4 −0		core/reactor.h
+34 −16		core/reactor_common.c
+35 −4		core/tag.h
+4 −3		core/threaded/reactor_threaded.c
+11 −11		core/threaded/scheduler_GEDF_NP.c
+15 −3		include/reactor-cpp/action.hh
+26 −13		include/reactor-cpp/impl/action_impl.hh
+62 −0		include/reactor-cpp/safe_vector.hh
+12 −5		include/reactor-cpp/scheduler.hh
+55 −34		include/reactor-cpp/value_ptr.hh
+5 −5		lib/action.cc
+0 −1		lib/port.cc
+68 −40		lib/scheduler.cc