Adds workaround for #419 and #605

adds parantheses around the parameters in the code generator
lf-lang · Nov 10, 2021 · 5eca37e · 5eca37e
1 parent fca5fa8
commit 5eca37e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/org.lflang/src/org/lflang/generator/cpp/CppParameterGenerator.kt b/org.lflang/src/org/lflang/generator/cpp/CppParameterGenerator.kt
@@ -50,8 +50,8 @@ class CppParameterGenerator(private val reactor: Reactor) {
         /** Get the default value of the receiver parameter in C++ code */
         val Parameter.defaultValue: String
             get() =
-                if (braces?.size == 2) "$targetType{${getInitializerList().joinToString(", ")}}"
-                else "$targetType(${getInitializerList().joinToString(", ")})"
+                if (braces?.size == 2) "($targetType){${getInitializerList().joinToString(", ")}}"
+                else "($targetType)(${getInitializerList().joinToString(", ")})"
 
         /** Get a C++ type that is a const reference to the parameter type */
         val Parameter.constRefType: String

diff --git a/test/Cpp/src/target/PointerParameter.lf b/test/Cpp/src/target/PointerParameter.lf
@@ -0,0 +1,15 @@
+target Cpp;
+
+reactor Foo(ptr: int*({=nullptr=})) {
+    reaction (startup) {=
+            std::cout << "Got " << *ptr << "\n";
+    =}
+}
+
+main reactor {
+    private preamble {=
+        int bar{42};
+    =}
+    // don't do this at home
+    foo = new Foo(ptr={=&bar=});
+}