Merge pull request #2284 from lf-lang/cpp-generic-composition

Fixed code generation for nested generic reactor instances

core/src/main/kotlin/org/lflang/generator/cpp/CppInstanceGenerator.kt

@@ -103,7 +103,7 @@ class CppInstanceGenerator(
         // by iterating over the reactor parameters we make sure that the parameters are assigned in declaration order
         return reactor.parameters.mapNotNull {
             if (it.name in assignments) ".${it.name} = ${assignments[it.name]}" else null
-        }.joinToString(", ", "$reactorType::Parameters{", "}")
+        }.joinToString(", ", "typename $reactorType::Parameters{", "}")
     }
 
     private fun generateInitializer(inst: Instantiation): String? = with(inst) {

test/Cpp/src/target/GenericComposition.lf

@@ -0,0 +1,33 @@
+target Cpp {
+  timeout: 1 sec
+}
+
+reactor Counter<T> {
+  state count: T(0)
+  timer t(0, 1 sec)
+  output out: T
+
+  reaction(t) -> out {=
+    out.set(count);
+    count += 1;
+  =}
+}
+
+reactor Printer<T> {
+  input in: T
+
+  reaction(in) {=
+    auto msg = *in.get();
+    std::cout << msg << std::endl;
+  =}
+}
+
+reactor MyWrapper<T> {
+  c = new Counter<T>()
+  p = new Printer<T>()
+  c.out -> p.in
+}
+
+main reactor {
+  m = new MyWrapper<int>()
+}