Change/Remove Properties to annotation (#341)

* Changed properties to Annotation Timout Logging ClockSync

- Changed TimoutProperty to Annotation
- Changed Logging Property to Annotation
- Chnaged ClockSync Property to Annotation

* Removed Properties

The following properties are removed
- BuildTypeProperty
- PlatformProperty
- NoCompileProperty
- FilesProperty
- CmakeIncludeProperty

* Update test from properties to attributes

- Added more platform types as attribute
- Updated test from properties to attributes

* Updated Tests and Benchmark from properties to attributes

* Update keepalive to boolean attribute

* Revert Format Changes

* Fix merge error

* Update tests for RIOT,PATMOS,Fed examples

-Fix changes for failing tests

* Make format

* Fix for review comments

* removing a lot more  target properties

* removing all target properties

* add build_type annotation

* more stuff

* fix is compiled

---------

Co-authored-by: tanneberger <github@tanneberger.me>

Author: tauseef-a

README.md

@@ -37,10 +37,9 @@ a CMake project and compile it natively. E.g.
 
 ```sh
 cat > HelloWorld.lf << EOF
-target uC {
-  platform: Native
-}
+target uC
  
+@platform("native")
 main reactor {
   reaction(startup) {=
     printf("Hello World!\n");

benchmarks/src/PingPongUc.lf

@@ -18,11 +18,7 @@
  *
  * @author Edward A. Lee
  */
- target uC {
-  platform: Native,
-  fast: true,
-  build-type: Release
-}
+ target uC
 
 import BenchmarkRunner from "./BenchmarkRunnerUc.lf"
 
@@ -68,6 +64,8 @@ reactor Pong(expected: size_t = 1000000) {
   =}
 }
 
+@platform("Native")
+@fast(true)
 main reactor
 {
     runner = new BenchmarkRunner(num_iterations=12);
@@ -79,4 +77,4 @@ main reactor
     ping.finished -> pong.finish;
     ping.send -> pong.receive;
     pong.send -> ping.receive;
-}
+}

benchmarks/src/ReactionLatencyUc.lf

@@ -1,7 +1,4 @@
-target uC {
-  build-type: Release,
-  platform: Native,
-}
+target uC
 
 
 reactor LatencyProbe(num_iterations: size_t = 10000){
@@ -41,7 +38,7 @@ preamble {=
   =}
 }
 
-
+@platform("Native")
 main reactor {
   probe = new LatencyProbe(num_iterations=10000);
-}
+}

examples/flexpret/src/Smoke.lf

@@ -1,6 +1,4 @@
-target uC {
-  platform: FlexPRET
-}
+target uC
 
 reactor R1 {
   output out: int
@@ -23,8 +21,9 @@ reactor R2 {
   =}
 }
 
+@platform("flexpret")
 main reactor {
   r1 = new R1()
   r2 = new R2()
   r1.out -> r2.in
-}
+}

examples/patmos/hello_lf/src/HelloLF.lf

@@ -1,9 +1,8 @@
-target uC {
-  platform: Patmos
-}
+target uC
 
+@platform("Patmos")
 main reactor {
   reaction(startup) {=
     printf("Hello LF on PATMOS!\n");
   =}
-}
+}

examples/patmos/s4noc_fed_lf/src/S4NoCFedLF.lf

@@ -1,10 +1,4 @@
-target uC {
-  platform: PATMOS,
-  clock-sync: OFF,
-  keepalive: true,
-  build-type: debug, 
-  timeout: 120 sec
-}
+target uC
 
 reactor Src(id: int = 0) {
   output out: int
@@ -47,6 +41,10 @@ reactor Dst {
   =}
 }
 
+@platform("PATMOS")
+@clock_sync("off")
+@keepalive(true)
+@timeout(120s)
 federated reactor {
   @interface_s4noc(core=2) 
   r1 = new Src(id=42)

examples/riot/coap_federated_lf/src/CoapFederatedLF.lf

@@ -1,7 +1,4 @@
-target uC {
-  platform: RIOT,
-  timeout: 1sec
-}
+target uC
 
 reactor Src(id: int = 0) {
   output out: int
@@ -29,6 +26,8 @@ reactor Dst {
   =}
 }
 
+@platform("RIOT")
+@timeout(1s)
 federated reactor {
   @interface_coap(name="if1", address="fe80::44e5:1bff:fee4:dac8")
   r1 = new Src(id=42)
@@ -38,4 +37,4 @@ federated reactor {
 
   @link(left="if1", right="if1")
   r1.out -> r2.in 
-}
+}

examples/riot/hello_lf/src/HelloLF.lf

@@ -1,9 +1,8 @@
-target uC {
-  platform: RIOT
-}
+target uC
 
+@platform("RIOT")
 main reactor {
   reaction(startup) {=
     printf("Hello from LF my!\n");
   =}
-}
+}

lfc/cli/lfc/src/main/java/org/lflang/cli/Lfc.java

@@ -11,18 +11,9 @@
 import org.eclipse.xtext.util.CancelIndicator;
 import org.lflang.FileConfig;
 import org.lflang.ast.ASTUtils;
-import org.lflang.generator.Argument;
 import org.lflang.generator.GeneratorArguments;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.MainContext;
-import org.lflang.target.property.BuildTypeProperty;
-import org.lflang.target.property.NoCompileProperty;
-import org.lflang.target.property.type.BuildTypeType;
-import org.lflang.target.property.type.BuildTypeType.BuildType;
-import org.lflang.target.property.type.LoggingType;
-import org.lflang.target.property.type.LoggingType.LogLevel;
-import org.lflang.target.property.type.SchedulerType;
-import org.lflang.target.property.type.SchedulerType.Scheduler;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
@@ -263,36 +254,6 @@ private Path getActualOutputPath(Path root, Path path) {
     }
   }
 
-  /**
-   * Return a build type if one has been specified via the CLI arguments, or {@code null} otherwise.
-   */
-  private BuildType getBuildType() {
-    BuildType resolved = null;
-    if (buildType != null) {
-      // Validate build type.
-      resolved = new BuildTypeType().forName(buildType);
-      if (resolved == null) {
-        reporter.printFatalErrorAndExit(buildType + ": Invalid build type.");
-      }
-    }
-    return resolved;
-  }
-
-  /**
-   * Return a log level if one has been specified via the CLI arguments, or {@code null} otherwise.
-   */
-  private LogLevel getLogging() {
-    LogLevel resolved = null;
-    if (logging != null) {
-      // Validate log level.
-      resolved = new LoggingType().forName(logging);
-      if (resolved == null) {
-        reporter.printFatalErrorAndExit(logging + ": Invalid log level.");
-      }
-    }
-    return resolved;
-  }
-
   /**
    * Return a URI that points to the RTI if one has been specified via the CLI arguments, or {@code
    * null} otherwise.
@@ -309,19 +270,6 @@ private URI getRtiUri() {
     return uri;
   }
 
-  /** Return a scheduler one has been specified via the CLI arguments, or {@code null} otherwise. */
-  private Scheduler getScheduler() {
-    Scheduler resolved = null;
-    if (scheduler != null) {
-      // Validate scheduler.
-      resolved = new SchedulerType().forName(scheduler);
-      if (resolved == null) {
-        reporter.printFatalErrorAndExit(scheduler + ": Invalid scheduler.");
-      }
-    }
-    return resolved;
-  }
-
   /**
    * Return a URI that points to an external runtime if one has been specified via the CLI
    * arguments, or {@code null} otherwise.
@@ -334,31 +282,6 @@ private URI getExternalRuntimeUri() {
     return externalRuntimeUri;
   }
 
-  /**
-   * Return tracing options if tracing has been explicitly disabled or enabled via the CLI
-   * arguments, or {@code null} otherwise.
-   */
-
-  /** Return the single threaded mode has been specified, or {@code null} if none was specified. */
-  private Boolean getSingleThreaded() {
-    Boolean singleThreaded = null;
-    // Set one of the mutually-exclusive threading options.
-    if (threading != null) {
-      singleThreaded = threading.singleThreaded;
-    }
-    return singleThreaded;
-  }
-
-  /** Return the number of workers specified, or {@code null} if none was specified. */
-  private Integer getWorkers() {
-    Integer workers = null;
-    // Set one of the mutually-exclusive threading options.
-    if (threading != null) {
-      workers = threading.workers;
-    }
-    return workers;
-  }
-
   /** Check the values of the commandline arguments and return them. */
   public GeneratorArguments getArgs() {
 
@@ -372,8 +295,6 @@ public GeneratorArguments getArgs() {
         getRtiUri(),
         genFedTemplates != null,
         runtimeSymlink != null,
-        List.of(
-            new Argument<>(BuildTypeProperty.INSTANCE, getBuildType()),
-            new Argument<>(NoCompileProperty.INSTANCE, noCompile)));
+        List.of());
   }
 }

lfc/core/src/main/java/org/lflang/AttributeUtils.java

@@ -9,7 +9,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.lflang.ast.ASTUtils;
 import org.lflang.lf.*;
-import org.lflang.target.property.type.PlatformType;
+import org.lflang.target.PlatformType;
 import org.lflang.util.StringUtil;
 
 /**
@@ -274,15 +274,48 @@ public static void setEnclaveAttribute(Instantiation node) {
     }
   }
 
-  public static PlatformType.Platform getFederatePlatform(Instantiation node) {
+  // public static PlatformType.Platform getFederatePlatform(EObject node) {
+  public static PlatformType.Platform getPlatform(EObject node) {
     if (findAttributeByName(node, "platform_native") != null) {
       return PlatformType.Platform.NATIVE;
     } else if (findAttributeByName(node, "platform_riot") != null) {
       return PlatformType.Platform.RIOT;
     } else if (findAttributeByName(node, "platform_zephyr") != null) {
       return PlatformType.Platform.ZEPHYR;
     } else {
-      return PlatformType.Platform.AUTO;
+      Attribute attr = findAttributeByName(node, "platform");
+      if (attr != null) {
+        switch (StringUtil.removeQuotes(attr.getAttrParms().get(0).getValue()).toUpperCase()) {
+          case "NATIVE":
+            return PlatformType.Platform.NATIVE;
+          case "NRF52":
+            return PlatformType.Platform.NRF52;
+          case "RP2040":
+            return PlatformType.Platform.RP2040;
+          case "LINUX":
+            return PlatformType.Platform.LINUX;
+          case "DARWIN":
+            return PlatformType.Platform.MAC;
+          case "ZEPHYR":
+            return PlatformType.Platform.ZEPHYR;
+          case "RIOT":
+            return PlatformType.Platform.RIOT;
+          case "FLEXPRET":
+            return PlatformType.Platform.FLEXPRET;
+          case "WINDOWS":
+            return PlatformType.Platform.WINDOWS;
+          case "PATMOS":
+            return PlatformType.Platform.PATMOS;
+          case "ESP-IDF":
+            return PlatformType.Platform.ESPIDF;
+          case "FREERTOS":
+            return PlatformType.Platform.FREERTOS;
+          case "ARDUINO":
+            return PlatformType.Platform.ARDUINO;
+          default:
+            return PlatformType.Platform.AUTO;
+        }
+      } else return PlatformType.Platform.AUTO;
     }
   }
 
@@ -294,6 +327,39 @@ public static Attribute getClockSyncAttr(Instantiation inst) {
     return findAttributeByName(inst, "clock_sync");
   }
 
+  public static String getClockSyncAttrValue(Reactor node) {
+    Attribute attr = findAttributeByName(node, "clock_sync");
+    if (attr != null) {
+      return StringUtil.removeQuotes(attr.getAttrParms().get(0).getValue());
+    } else {
+      return "";
+    }
+  }
+
+  /*
+   * Return the Logging Attribute value set on the main reactor
+   */
+  public static String getLoggingAttrValue(Reactor node) {
+    Attribute attr = findAttributeByName(node, "logging");
+    if (attr != null) {
+      return StringUtil.removeQuotes(attr.getAttrParms().get(0).getValue());
+    } else {
+      return "";
+    }
+  }
+
+  /*
+   * Return the Fast Attribute value set on the main reactor
+   */
+  public static boolean getFastAttrValue(Reactor node) {
+    Attribute attr = findAttributeByName(node, "fast");
+    if (attr != null) {
+      return attr.getAttrParms().get(0).getValue().equalsIgnoreCase("true");
+    } else {
+      return false;
+    }
+  }
+
   /**
    * Return the value of the `@maxwait` attribute of the given node or TimeValue.ZERO if does not
    * have one.