diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c index b9549a5f3a..454d08505e 160000 --- a/org.lflang/src/lib/c/reactor-c +++ b/org.lflang/src/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit b9549a5f3a8d2fe49bfbad3e7e7d04364baf6494 +Subproject commit 454d08505e80fdff5056f88d2d8242f4731f9540 diff --git a/org.lflang/src/lib/cpp/reactor-cpp b/org.lflang/src/lib/cpp/reactor-cpp index 0097e793ca..e294554170 160000 --- a/org.lflang/src/lib/cpp/reactor-cpp +++ b/org.lflang/src/lib/cpp/reactor-cpp @@ -1 +1 @@ -Subproject commit 0097e793caa38b11948e6933715cef52684d647c +Subproject commit e294554170ad0cda497b23b29627ff8046cbd3ad diff --git a/org.lflang/src/lib/py/reactor-c-py b/org.lflang/src/lib/py/reactor-c-py index 61433a39c9..3c8843e944 160000 --- a/org.lflang/src/lib/py/reactor-c-py +++ b/org.lflang/src/lib/py/reactor-c-py @@ -1 +1 @@ -Subproject commit 61433a39c98d6cdec3e317ce3692e98abadcc5fc +Subproject commit 3c8843e94477f3972d149f2768985364b716f56b diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java index bd125e6104..505fcf8a27 100644 --- 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 index 7e15f0a4cb..e717d755a2 100644 --- 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 index 5b2a40b06e..070e6434d6 100644 --- 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() 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});")