Merge remote-tracking branch 'origin/master' into icon-attribute

lf-lang · Aug 23, 2022 · c028a8c · c028a8c
2 parents aa99002 + 8ded940
commit c028a8c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 8 deletions.
diff --git a/.github/workflows/rs-tests.yml b/.github/workflows/rs-tests.yml
@@ -26,15 +26,29 @@ jobs:
           ref: ${{ inputs.compiler-ref }}
       - name: Prepare build environment
         uses: ./.github/actions/prepare-build-env
+      - name: Check out specific ref of reactor-rs
+        uses: actions/checkout@v3
+        with:
+          repository: lf-lang/reactor-rs
+          path: org.lflang/src/lib/rs/reactor-rs
+          ref: ${{ inputs.runtime-ref }}
+        if: ${{ inputs.runtime-ref }}
       - name: Setup Rust
+        id: rustup
+        uses: ATiltedTree/setup-rust@v1
+        with:
+          rust-version: ${{ matrix.rust }}
+          components: clippy
+        continue-on-error: true
+      - name: Delete rustup cache
+        run: rm -r ~/.rustup
+        if: ${{ steps.rustup.outcome }} != "success"
+      - name: Setup Rust (again)
+        if: ${{ steps.rustup.outcome }} != "success"
         uses: ATiltedTree/setup-rust@v1
         with:
           rust-version: ${{ matrix.rust }}
           components: clippy
-      - name: Set rust runtime version
-        run: |
-            echo ${{ inputs.runtime-ref }} > org.lflang/src/org/lflang/generator/rust/rust-runtime-version.txt
-        if: ${{ inputs.runtime-ref }}  
       - name: Run Rust tests
         run: |
           ./gradlew test --tests org.lflang.tests.runtime.RustTest.*

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/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(", ")))+" };",
+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