Restructuring of mechanism for compiling federated programs

.gitignore

@@ -12,6 +12,7 @@
 **/build/
 **/test-bin/
 **/src-gen/
+**/fed-gen/
 **/xtend-gen/
 # Created by https://www.toptal.com/developers/gitignore/api/intellij,gradle,eclipse,maven,visualstudiocode
 # Edit at https://www.toptal.com/developers/gitignore?templates=intellij,gradle,eclipse,maven,visualstudiocode

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

@@ -76,7 +76,7 @@ public Set<LFTest> getTests(Target t, TestCategory c) {
      * 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"};
+    public static final String[] IGNORED_DIRECTORIES = {"failing", "knownfailed", "failed", "fed-gen"};
 
     /**
      * Path to the root of the repository.

org.lflang/src/org/lflang/ASTUtils.java

@@ -284,18 +284,23 @@ public static Reactor getEnclosingReactor(EObject obj) {
         }
         return null;
     }
-
+
+
+    public static Reactor findMainReactor(Resource resource) {
+        return IteratorExtensions.findFirst(
+                Iterators.filter(resource.getAllContents(), Reactor.class),
+                Reactor::isMain
+        );
+    }
+
     /**
      * Find the main reactor and change it to a federated reactor.
      * Return true if the transformation was successful (or the given resource
      * already had a federated reactor); return false otherwise.
      */
     public static boolean makeFederated(Resource resource) {
         // Find the main reactor
-        Reactor r = IteratorExtensions.findFirst(
-            Iterators.filter(resource.getAllContents(), Reactor.class),
-            Reactor::isMain
-        );
+        Reactor r = findMainReactor(resource);
         if (r == null) {
             return false;
         }
@@ -879,6 +884,55 @@ public static List<String> elementToListOfStrings(Element value) {
         }
         return elements;
     }
+
+    // Various utility methods to convert various data types to Elements
+
+    /**
+     * Given a single string, convert it into its AST representation.
+     */
+    public static Element toElement(String str) {
+        Element e = LfFactory.eINSTANCE.createElement();
+        e.setLiteral(str);
+        return e;
+    }
+
+    /**
+     * Given a list of strings, convert it into its AST representation.
+     * Stores the list in the Array field of the element, unless the list only has one string,
+     * in which case it is stored in the Literal field. Returns null if the provided list is empty.
+     */
+    public static Element toElement(List<String> list) {
+        Element e = LfFactory.eINSTANCE.createElement();
+        if (list.size() == 0) return null;
+        else if (list.size() == 1) {
+            e.setLiteral(list.get(0));
+        } else {
+            var arr = LfFactory.eINSTANCE.createArray();
+            for (String s : list) {
+                arr.getElements().add(ASTUtils.toElement(s));
+            }
+            e.setArray(arr);
+        }
+        return e;
+    }
+
+    /**
+     * Converts a TimeValue to its AST representation. The value is type-cast to int in order to fit inside an Element.
+     */
+    public static Element toElement(TimeValue tv) {
+        Element e = LfFactory.eINSTANCE.createElement();
+        e.setTime((int)tv.time);
+        e.setUnit(tv.unit.toString());
+        return e;
+    }
+
+    public static Element toElement(boolean val) {
+        return toElement(Boolean.toString(val));
+    }
+
+    public static Element toElement(int val) {
+        return toElement(Integer.toString(val));
+    }
 
     /**
      * Translate the given type into its textual representation, but

org.lflang/src/org/lflang/TargetConfig.java

@@ -29,6 +29,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 import org.lflang.TargetProperty.BuildType;
@@ -325,6 +326,18 @@ public static class DockerOptions {
          * The base image and tag from which to build the Docker image. The default is "alpine:latest".
          */
         public String from = "alpine:latest";
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            DockerOptions that = (DockerOptions) o;
+            return from.equals(that.from);
+        }
     }
 
     /**
@@ -336,6 +349,18 @@ public static class TracingOptions {
          * This defaults to the name of the .lf file.
          */
         public String traceFileName = null;
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            TracingOptions that = (TracingOptions) o;
+            return Objects.equals(traceFileName, that.traceFileName); // traceFileName may be null
+        }
     }
 
 }