CCpp target

example/C/src/ROS/ROSBuiltInSerialization.lf

@@ -1,6 +1,6 @@
 /**
- * This example showcases the infrastructure that is built into LF
- * C runtime that can automatically serialize and deserialize ROS2
+ * This example showcases the infrastructure that is built into the
+ * CCpp target that can automatically serialize and deserialize ROS2
  * messages in federated programs.
  * 
  * This example contains a sender-receiver federated program in which  
@@ -21,11 +21,10 @@
  * 
  * @author Soroush Bateni <[email protected]>
  */
- target C {
+ target CCpp {
     cmake: true,  // Only CMake is supported
     cmake-include: "include/CMakeListsExtension.txt",
     threads: 1,
-    compiler: "g++"
 };
 
 preamble {=

example/C/src/ROS/ROSSerialization.lf

@@ -10,12 +10,11 @@
  * There is a variant of this example called ROSBuiltInSerialization.lf that uses
  * the built-in ROS 2 serialization feature that is provided in LF.
  */
-target C {
+target CCpp {
     coordination: decentralized,
     timeout: 10 sec,
     cmake-include: "include/CMakeListsExtension.txt",
     files: ["include/ament_target_dependencies.cmake"],
-    compiler: "g++",
 };
 
 preamble {=

example/ReflexGame/ReflexGameTest.lf

@@ -10,7 +10,7 @@ main reactor {
         // control-z) is received.
         void* read_char(void* a) {
             while(1) {
-                char* c = malloc(sizeof(char));
+                char* c = (char*)malloc(sizeof(char));
                 *c = getchar();
                 schedule_value(a, 0, c, 1);
                 if (*c == EOF) break;

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

@@ -26,10 +26,13 @@
 ***************/
 package org.lflang.tests.runtime;
 
+import java.util.EnumSet;
+
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-
+import org.lflang.ASTUtils;
 import org.lflang.Target;
+import org.lflang.tests.TestRegistry.TestCategory;
 
 /**
  * Collection of tests for the C target.
@@ -101,4 +104,29 @@ public void runConcurrentTests() {
     public void runFederatedTests() {
         super.runFederatedTests();
     }
+
+    /** Static description of test that runs C tests as CCpp. */
+    public static final String RUN_AS_CCPP_DESC = "Description: Running C tests as CCpp.";
+
+    /**
+     * Run C tests with the target CCpp.
+     */
+    @Test
+    public void runAsCCpp() {
+        printTestHeader(RUN_AS_CCPP_DESC);
+
+        EnumSet<TestCategory> categories = EnumSet.allOf(TestCategory.class);
+
+        categories.removeAll(EnumSet.of(
+                // Don't need to test examples.
+                // If any of them uses CCpp, it will
+                // be tested when compileExamples is
+                // run.
+                TestCategory.EXAMPLE));
+
+        runTestsAndPrintResults(target,
+                                categories::contains,
+                                it -> ASTUtils.changeTargetName(it.fileConfig.resource, "CCpp"),
+                                true);
+    }
 }

org.lflang/src/lib/core/federated/clock-sync.c

@@ -169,8 +169,9 @@ ushort setup_clock_synchronization_with_rti() {
 
     port_to_return = ntohs(federate_UDP_addr.sin_port);
 
-    // Set the option for this socket to reuse the same address 
-    if (setsockopt(_lf_rti_socket_UDP, SOL_SOCKET, SO_REUSEADDR, &(int){1}, sizeof(int)) < 0) {
+    // Set the option for this socket to reuse the same address
+    int option_value = 1; 
+    if (setsockopt(_lf_rti_socket_UDP, SOL_SOCKET, SO_REUSEADDR, &option_value, sizeof(int)) < 0) {
         error_print("Failed to set SO_REUSEADDR option on the socket: %s.", strerror(errno));
     }
     // Set the timeout on the UDP socket so that read and write operations don't block for too long

org.lflang/src/lib/core/reactor.h

@@ -152,13 +152,23 @@ do { \
  * struct to true (which causes the object message to be sent),
  * @param out The output port (by name).
  */
+#ifndef __cplusplus
 #define _LF_SET_NEW(out) \
 do { \
     out->is_present = true; \
     lf_token_t* token = __set_new_array_impl(out->token, 1, out->num_destinations); \
     out->value = token->value; \
     out->token = token; \
 } while(0)
+#else
+#define _LF_SET_NEW(out) \
+do { \
+    out->is_present = true; \
+    lf_token_t* token = __set_new_array_impl(out->token, 1, out->num_destinations); \
+    out->value = static_cast<decltype(out->value)>(token->value); \
+    out->token = token; \
+} while(0)
+#endif // __cplusplus
 
 /**
  * Version of set() for output types given as 'type[]'.

org.lflang/src/org/lflang/ASTUtils.xtend

@@ -162,6 +162,16 @@ class ASTUtils {
         return true
     }
 
+    /**
+     * Change the target name to 'newTargetName'.
+     * For example, change C to CCpp.
+     */
+    static def boolean changeTargetName(Resource resource, String newTargetName) {
+        val r = resource.targetDecl
+        r.name = newTargetName
+        return true
+    }
+
     /**
      * Return true if any port on the left or right of the connection involves
      * a bank of reactors or a multiport.

org.lflang/src/org/lflang/Target.java

@@ -371,7 +371,6 @@ public enum Target {
      */
     public final static Target[] ALL = Target.values();
 
-
     /**
      * Private constructor for targets.
      *

org.lflang/src/org/lflang/TargetProperty.java

@@ -26,7 +26,7 @@ public enum TargetProperty {
      * Directive to let the generator use the custom build command.
      */
     BUILD("build", UnionType.STRING_OR_STRING_ARRAY,
-            Arrays.asList(Target.C), (config, value) -> {
+            Arrays.asList(Target.C, Target.CCPP), (config, value) -> {
                 config.buildCommands = ASTUtils.toListOfStrings(value);
             }),
 
@@ -43,7 +43,7 @@ public enum TargetProperty {
      * Directive to let the federate execution handle clock synchronization in software.
      */
     CLOCK_SYNC("clock-sync", UnionType.CLOCK_SYNC_UNION,
-            Arrays.asList(Target.C), (config, value) -> {
+            Arrays.asList(Target.C, Target.CCPP), (config, value) -> {
                 config.clockSync = (ClockSyncMode) UnionType.CLOCK_SYNC_UNION
                         .forName(ASTUtils.toText(value));
             }),
@@ -52,7 +52,7 @@ public enum TargetProperty {
      * Key-value pairs giving options for clock synchronization.
      */
     CLOCK_SYNC_OPTIONS("clock-sync-options",
-            DictionaryType.CLOCK_SYNC_OPTION_DICT, Arrays.asList(Target.C),
+            DictionaryType.CLOCK_SYNC_OPTION_DICT, Arrays.asList(Target.C, Target.CCPP),
             (config, value) -> {
                 for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
                     ClockSyncOption option = (ClockSyncOption) DictionaryType.CLOCK_SYNC_OPTION_DICT
@@ -96,7 +96,7 @@ public enum TargetProperty {
      * can be adjusted in the included file.
      */
     CMAKE_INCLUDE("cmake-include", UnionType.FILE_OR_FILE_ARRAY,
-            Arrays.asList(Target.CPP, Target.C), (config, value) -> {
+            Arrays.asList(Target.CPP, Target.C, Target.CCPP), (config, value) -> {
                 config.cmakeIncludes = ASTUtils.toListOfStrings(value);
             }),
 
@@ -106,7 +106,7 @@ public enum TargetProperty {
      * The default is enabled.
      */
     CMAKE("cmake", PrimitiveType.BOOLEAN,
-            Arrays.asList(Target.C), (config, value) -> {
+            Arrays.asList(Target.C, Target.CCPP), (config, value) -> {
                 config.useCmake = ASTUtils.toBoolean(value);
             }),
 
@@ -123,7 +123,7 @@ public enum TargetProperty {
      * true or false, or a dictionary of options.
      */
     DOCKER("docker", UnionType.DOCKER_UNION,
-            Arrays.asList(Target.C), (config, value) -> {
+            Arrays.asList(Target.C, Target.CCPP), (config, value) -> {
                 if (value.getLiteral() != null) {
                     if (ASTUtils.toBoolean(value)) {
                         config.dockerOptions = new DockerOptions();
@@ -195,7 +195,7 @@ public enum TargetProperty {
      * Key-value pairs giving options for clock synchronization.
      */
     COORDINATION_OPTIONS("coordination-options",
-            DictionaryType.COORDINATION_OPTION_DICT, Arrays.asList(Target.C),
+            DictionaryType.COORDINATION_OPTION_DICT, Arrays.asList(Target.C, Target.CCPP),
             (config, value) -> {
                 for (KeyValuePair entry : value.getKeyvalue().getPairs()) {
                     CoordinationOption option = (CoordinationOption) DictionaryType.COORDINATION_OPTION_DICT
@@ -251,7 +251,7 @@ public enum TargetProperty {
      * code included in the sources.
      */
     PROTOBUFS("protobufs", UnionType.FILE_OR_FILE_ARRAY,
-            Arrays.asList(Target.C, Target.TS, Target.Python),
+            Arrays.asList(Target.C, Target.CCPP, Target.TS, Target.Python),
             (config, value) -> {
                 config.protoFiles = ASTUtils.toListOfStrings(value);
             }),
@@ -286,7 +286,7 @@ public enum TargetProperty {
      * true or false, or a dictionary of options.
      */
     TRACING("tracing", UnionType.TRACING_UNION,
-            Arrays.asList(Target.C, Target.CPP), (config, value) -> {
+            Arrays.asList(Target.C, Target.CCPP, Target.CPP), (config, value) -> {
                 if (value.getLiteral() != null) {
                     if (ASTUtils.toBoolean(value)) {
                         config.tracing = new TracingOptions();