Generated structs exposed in header files, reactions linkable from separate source files, and updated C target preamble visibility

.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
 
   # Run the unit tests.
   unit-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/unit-tests.yml@master
+    uses: lf-lang/lingua-franca/.github/workflows/unit-tests.yml@bodyless-reactions
     needs: cancel
 
   # Run tests for the standalone compiler.
@@ -51,6 +51,8 @@ jobs:
     uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
     with:
       target: 'C'
+      benchmarks-ref: 'c-separate-gen-files'
+      compiler-ref: bodyless-reactions
     needs: cancel
 
   # Run language server tests.

.github/workflows/unit-tests.yml

@@ -12,6 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
+          submodules: true
           fetch-depth: 0
       - name: Prepare build environment
         uses: ./.github/actions/prepare-build-env

org.lflang.tests/resources/org/lflang/tests/cli/issue490.stderr

@@ -6,23 +6,19 @@ lfc: error: Name of main reactor must match the file name (or be omitted).
   |              ^ Name of main reactor must match the file name (or be omitted).
   |
 5 |   state liss(2, 3);
-
-lfc: error: missing '{=' at '{'
+lfc: error: no viable alternative at input '{'
 --> %%%PATH.lf%%%:6:22
   |
 5 |   state liss(2, 3);
 6 |   reaction (startup) {
-  |                      ^ missing '{=' at '{'
+  |                      ^ no viable alternative at input '{'
   |
 7 |     print(self.liss)
-
-lfc: error: mismatched input '<EOF>' expecting '=}'
- --> %%%PATH.lf%%%:9:2
-   |
- 8 | }
-   | >>>>>>>>>>>>>>
- 9 | }
-10 | 
-   | < mismatched input '<EOF>' expecting '=}'
-11 | 
-
+lfc: error: no viable alternative at input '('
+--> %%%PATH.lf%%%:7:5
+  |
+6 |   reaction (startup) {
+7 |     print(self.liss)
+  |     ^^^^^ no viable alternative at input '('
+  |
+8 | }

org.lflang.tests/src/org/lflang/tests/TestRegistry.java

@@ -32,14 +32,14 @@
 
 /**
  * A registry to retrieve tests from, organized by target and category.
- * 
+ *
  * @author Marten Lohstroh
  */
 public class TestRegistry {
-    
+
     static class TestMap {
         /**
-         * Registry that maps targets to maps from categories to sets of tests. 
+         * Registry that maps targets to maps from categories to sets of tests.
          */
         protected final Map<Target,
                 Map<TestCategory, Set<LFTest>>> map = new HashMap<>();
@@ -57,7 +57,7 @@ public TestMap() {
                 map.put(target, categories);
             }
         }
-        
+
         /**
          * Return a set of tests given a target and test category.
          * @param t The target.
@@ -68,26 +68,26 @@ public Set<LFTest> getTests(Target t, TestCategory c) {
             return this.map.get(t).get(c);
         }
     }
-    
+
     /**
      * List of directories that should be skipped when indexing test files. Any
      * test file that has a directory in its path that matches an entry in this
      * array will not be discovered.
      */
     public static final String[] IGNORED_DIRECTORIES = {"failing", "knownfailed", "failed", "fed-gen"};
-    
+
     /**
      * Path to the root of the repository.
      */
     public static final Path LF_REPO_PATH = Paths.get("").toAbsolutePath();
-        
+
     /**
      * Path to the test directory in the repository.
      */
     public static final Path LF_TEST_PATH = LF_REPO_PATH.resolve("test");
 
     /**
-     * Internal data structure that stores registered tests. 
+     * Internal data structure that stores registered tests.
      */
     protected static final TestMap registered = new TestMap();
 
@@ -96,31 +96,31 @@ public Set<LFTest> getTests(Target t, TestCategory c) {
      * source files with no main reactor are indexed here.
      */
     protected static final TestMap ignored = new TestMap();
-    
+
     /**
      * A map from each test category to a set of tests that is the union of
      * all registered tests in that category across all targets.
      */
     protected static final Map<TestCategory, Set<LFTest>> allTargets = new HashMap<>();
-    
+
     /**
      * Enumeration of test categories, used to map tests to categories. The
      * nearest containing directory that matches any of the categories will
      * determine the category that the test is mapped to. Matching is case
      * insensitive.
-     * 
+     *
      * For example, the following files will all map to THREADED:
      * - C/threaded/Foo.lf
-     * - C/THREADED/Foo.lf 
+     * - C/THREADED/Foo.lf
      * - C/Threaded/Foo.lf
-     * - C/foo/threaded/Bar.lf 
-     * - C/foo/bar/threaded/Threaded.lf 
+     * - C/foo/threaded/Bar.lf
+     * - C/foo/bar/threaded/Threaded.lf
      * - C/federated/threaded/bar.lf
-     * but the following will not: 
+     * but the following will not:
      * - C/Foo.lf (maps to COMMON)
      * - C/Threaded.lf (maps to COMMON)
      * - C/threaded/federated/foo.lf (maps to FEDERATED)
-     * 
+     *
      * @author Marten Lohstroh
      */
     public enum TestCategory {
@@ -140,7 +140,7 @@ public enum TestCategory {
         PROPERTIES(true),
         /** Tests concerning modal reactors */
         MODAL_MODELS(true),
-
+        NO_INLINING(false),
         // non-shared tests
         DOCKER(true),
         DOCKER_FEDERATED(true, "docker" + File.separator + "federated"),
@@ -155,7 +155,7 @@ public enum TestCategory {
         public final boolean isCommon;
         public final String path;
         public final TestLevel level ;
-        
+
         /**
          * Create a new test category.
          */
@@ -189,14 +189,14 @@ public String getPath() {
 
         /**
          * Return a header associated with the category.
-         * 
+         *
          * @return A header to print in the test report.
          */
         public String getHeader() {
             return TestBase.THICK_LINE + "Category: " + this.name();
         }
     }
-    
+
     // Static code that performs the file system traversal and discovers
     // all .lf files to be included in the registry.
     static {
@@ -220,7 +220,7 @@ public String getHeader() {
                 } else {
                     System.out.println("WARNING: No test directory for target " + target + "\n");
                 }
-                
+
             } catch (IOException e) {
                 System.err.println(
                         "ERROR: Caught exception while indexing tests for target " + target);
@@ -231,18 +231,18 @@ public String getHeader() {
                     c -> allTargets.get(c).addAll(getRegisteredTests(target, c, false)));
         }
     }
-    
+
     /**
      * Calling this function forces the lazy initialization of the static code
      * that indexes all files. It is advisable to do this prior to executing
      * other code that prints to standard out so that any error messages
      * printed while indexing are printed first.
      */
     public static void initialize() {}
-    
+
     /**
      * Return the tests that were indexed for a given target and category.
-     * 
+     *
      * @param target The target to get indexed tests for.
      * @param category The category of tests to include in the returned tests.
      * @param copy Whether to return copies of the indexed tests instead of the indexed tests themselves.
@@ -260,7 +260,7 @@ public static Set<LFTest> getRegisteredTests(Target target,
             return registered.getTests(target, category);
         }
     }
-    
+
     /**
      * Return the test that were found but not indexed because they did not
      * have a main reactor.
@@ -275,11 +275,11 @@ public static String getCoverageReport(Target target, TestCategory category) {
         s.append(TestBase.THIN_LINE);
         s.append("Ignored: ").append(ignored.size()).append("\n");
         s.append(TestBase.THIN_LINE);
-        
+
         for (LFTest test : ignored) {
             s.append("No main reactor in: ").append(test).append("\n");
         }
-        
+
         Set<LFTest> own = getRegisteredTests(target, category, false);
         if (category.isCommon) {
             Set<LFTest> all = allTargets.get(category);
@@ -301,17 +301,17 @@ public static String getCoverageReport(Target target, TestCategory category) {
 
     /**
      * FileVisitor implementation that maintains a stack to map found tests to
-     * the appropriate category and excludes directories that are listed as 
+     * the appropriate category and excludes directories that are listed as
      * "ignored" from walks.
-     * 
+     *
      * Specifically, when a directory is encountered that matches a category,
      * this category is pushed onto the stack. Similarly, when the DFS leaves
      * such a directory, its corresponding category is popped from the stack.
      * Any test (*.lf) file that is encountered will be mapped to the category
-     * that is on top of the stack. Initially, the stack has one element that 
+     * that is on top of the stack. Initially, the stack has one element that
      * is TestCategory.COMMON, meaning that test files in the top-level test
      * directory for a given target will be mapped to that category.
-     * 
+     *
      * @author Marten Lohstroh
      */
     public static class TestDirVisitor extends SimpleFileVisitor<Path> {
@@ -325,7 +325,7 @@ public static class TestDirVisitor extends SimpleFileVisitor<Path> {
          * The target that all encountered tests belong to.
          */
         protected Target target;
-        
+
         protected ResourceSet rs;
 
         protected Path srcBasePath;
@@ -342,7 +342,7 @@ public TestDirVisitor(ResourceSet rs, Target target, Path srcBasePath) {
             this.target = target;
             this.srcBasePath = srcBasePath;
         }
-        
+
         /**
          * Push categories onto the stack as appropriate and skip directories
          * that should be ignored.
@@ -363,7 +363,7 @@ public FileVisitResult preVisitDirectory(Path dir,
             }
             return CONTINUE;
         }
-               
+
         /**
          * Pop categories from the stack as appropriate.
          */
@@ -377,7 +377,7 @@ public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
             }
             return CONTINUE;
         }
-        
+
         /**
          * Add test files to the registry if they end with ".lf", but only if they have a main reactor.
          */

org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaValidationTest.java

@@ -1150,7 +1150,7 @@ private List<String> synthesizeExamples(UnionType type, boolean correct) {
      */
     private List<String> synthesizeExamples(DictionaryType type, boolean correct) {
         List<String> examples = new LinkedList<>();
-        // Produce a set of singleton dictionaries. 
+        // Produce a set of singleton dictionaries.
         // If incorrect examples are wanted, garble the key.
         for (DictionaryElement option : type.options) {
             synthesizeExamples(option.getType(), correct).forEach(it -> examples.add(
@@ -1629,7 +1629,7 @@ public void testMainReactorHasHost() throws Exception {
             """;
         // TODO: Uncomment and fix test
         // List<Issue> issues = validator.validate(parseWithoutError(testCase));
-        // Assertions.assertTrue(issues.size() == 1 && 
+        // Assertions.assertTrue(issues.size() == 1 &&
         //     issues.get(0).getMessage().contains("Cannot assign a host to reactor '") &&
         //     issues.get(0).getMessage().contains("' because it is not federated."));
     }
@@ -1810,7 +1810,7 @@ public void testMissingModeStateResetInstance() throws Exception {
             "This reactor contains state variables that are not reset upon mode entry: "
                 + "s in R"
                 + ".\nThe state variables are neither marked for automatic reset nor have a dedicated reset reaction. "
-                + "It is usafe to instatiate this reactor inside a mode entered with reset.");
+                + "It is unsafe to instantiate this reactor inside a mode entered with reset.");
     }
 
     @Test
@@ -1841,11 +1841,9 @@ public void testUnspecifiedTransitionType() throws Exception {
                 }
             """;
         validator.assertWarning(parseWithoutError(testCase), LfPackage.eINSTANCE.getReaction(), null,
-            "You should specifiy a transition type! "
+            "You should specify a transition type! "
                 + "Reset and history transitions have different effects on this target mode. "
                 + "Currently, a reset type is implicitly assumed.");
     }
 
 }
-
-

org.lflang.tests/src/org/lflang/tests/compiler/RoundTripTests.java

@@ -45,6 +45,7 @@ public void roundTripTest() {
 
     private void run(Path file) throws Exception {
         Model originalModel = LfParsingUtil.parse(file);
+        System.out.println(file);
         assertThat(originalModel.eResource().getErrors(), equalTo(emptyList()));
         // TODO: Check that the output is a fixed point
         final int smallLineLength = 20;

org.lflang.tests/src/org/lflang/tests/lsp/MockReportProgress.java

@@ -17,7 +17,7 @@ public MockReportProgress() {
 
     @Override
     public void apply(String message, Integer percentage) {
-        System.out.printf("%s [%d -> %d]%n", message, previousPercentProgress, percentage);
+        System.out.printf("MockReportProgress: %s [%d -> %d]%n", message, previousPercentProgress, percentage);
         if (percentage == null) return;
         if (percentage < previousPercentProgress || percentage < 0 || percentage > 100) failed = true;
         previousPercentProgress = percentage;

org.lflang.tests/src/org/lflang/tests/runtime/CCppTest.java

@@ -46,6 +46,7 @@ private static boolean isExcludedFromCCpp(TestCategory category) {
         excluded |= isMac() && (category == TestCategory.DOCKER_FEDERATED || category == TestCategory.DOCKER);
         excluded |= category == TestCategory.ZEPHYR;
         excluded |= category == TestCategory.ARDUINO;
+        excluded |= category == TestCategory.NO_INLINING;
         return !excluded;
     }
 }