From 3495b5be54ed4b268eaab60e5011bb00b5069f3a Mon Sep 17 00:00:00 2001 From: eal Date: Sat, 13 Aug 2022 10:19:00 -0400 Subject: [PATCH 1/8] Added const modifier to silence warnings --- org.lflang/src/org/lflang/generator/c/CMainGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.lflang/src/org/lflang/generator/c/CMainGenerator.java b/org.lflang/src/org/lflang/generator/c/CMainGenerator.java index 7e15f0a4cb..499edda949 100644 --- a/org.lflang/src/org/lflang/generator/c/CMainGenerator.java +++ b/org.lflang/src/org/lflang/generator/c/CMainGenerator.java @@ -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(", ")))+" };", From a28f429c14dbb7ee387fa8a07bbee0a8d5c6b91f Mon Sep 17 00:00:00 2001 From: eal Date: Sat, 13 Aug 2022 10:58:07 -0400 Subject: [PATCH 2/8] Added const qualifiers and suppression of unused variable --- org.lflang/src/lib/c/reactor-c | 2 +- org.lflang/src/lib/py/reactor-c-py | 2 +- org.lflang/src/org/lflang/generator/c/CGenerator.java | 1 + org.lflang/src/org/lflang/generator/c/CMainGenerator.java | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c index b9549a5f3a..097d34238f 160000 --- a/org.lflang/src/lib/c/reactor-c +++ b/org.lflang/src/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit b9549a5f3a8d2fe49bfbad3e7e7d04364baf6494 +Subproject commit 097d34238fc4fedeb6b6537b8628e75375b4e7b4 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 499edda949..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);", "}" ); From 1465f640886b8c4659e04dc38d47fa1026189de3 Mon Sep 17 00:00:00 2001 From: eal Date: Mon, 15 Aug 2022 16:56:00 -0400 Subject: [PATCH 3/8] Align with fewer-warnings branch of reactor-c --- org.lflang/src/lib/c/reactor-c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c index 097d34238f..7f6f51d3b3 160000 --- a/org.lflang/src/lib/c/reactor-c +++ b/org.lflang/src/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit 097d34238fc4fedeb6b6537b8628e75375b4e7b4 +Subproject commit 7f6f51d3b3528b07e120bc3f480a4aa158309162 From 8e03a42f982565ea810288fa117e5a1f1b88ba57 Mon Sep 17 00:00:00 2001 From: eal Date: Fri, 19 Aug 2022 08:44:54 -0400 Subject: [PATCH 4/8] Align with reactor-c --- org.lflang/src/lib/c/reactor-c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c index 7f6f51d3b3..1666e3d308 160000 --- a/org.lflang/src/lib/c/reactor-c +++ b/org.lflang/src/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit 7f6f51d3b3528b07e120bc3f480a4aa158309162 +Subproject commit 1666e3d308dd1c50029e15e7c7cb5f9f63643d72 From 4d96d19af1bf986f30f907fd2bc7ae09f0e86d89 Mon Sep 17 00:00:00 2001 From: eal Date: Fri, 19 Aug 2022 09:32:31 -0400 Subject: [PATCH 5/8] Align with reactor-c --- org.lflang/src/lib/c/reactor-c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c index 1666e3d308..454d08505e 160000 --- a/org.lflang/src/lib/c/reactor-c +++ b/org.lflang/src/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit 1666e3d308dd1c50029e15e7c7cb5f9f63643d72 +Subproject commit 454d08505e80fdff5056f88d2d8242f4731f9540 From 59663f5952975e57f311d2144cc5d3c2cf85bf6c Mon Sep 17 00:00:00 2001 From: Christian Menard Date: Mon, 22 Aug 2022 15:09:32 +0200 Subject: [PATCH 6/8] Pull in reactor-cpp optimizations Specifically, this includes the following PRs: - https://github.com/lf-lang/reactor-cpp/pull/22 - https://github.com/lf-lang/reactor-cpp/pull/23 --- org.lflang/src/lib/cpp/reactor-cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From e5cf04c23744034bf461acad37f09a9dc0224f2b Mon Sep 17 00:00:00 2001 From: Byeonggil-Jun Date: Wed, 24 Aug 2022 15:42:45 +0900 Subject: [PATCH 7/8] Quick fix to adjust upstreamFedDelays as never tag --- .../src/org/lflang/generator/ts/TSConstructorGenerator.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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});") From 3670a83ee2f76696cd260937ac144b17dafaa2cd Mon Sep 17 00:00:00 2001 From: Hokeun Kim Date: Wed, 24 Aug 2022 00:42:05 -0700 Subject: [PATCH 8/8] Update reactor-ts version. --- org.lflang/src/lib/ts/reactor-ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.lflang/src/lib/ts/reactor-ts b/org.lflang/src/lib/ts/reactor-ts index e5c9020c39..05f87e5542 160000 --- a/org.lflang/src/lib/ts/reactor-ts +++ b/org.lflang/src/lib/ts/reactor-ts @@ -1 +1 @@ -Subproject commit e5c9020c3971868b0670b0d78116e38ca64741a5 +Subproject commit 05f87e55422607882a9b0b15f86c8e21c1cfa36d