Merge pull request #2164 from lf-lang/cpp-parameter-forwarding

Fixed parameter forwarding for non-trivial types in C++

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

@@ -94,6 +94,7 @@ class CppReactorGenerator(private val reactor: Reactor, fileConfig: CppFileConfi
         ${" |  "..reactions.generateReactionViewForwardDeclarations()}
             |
             |  class Inner: public lfutil::LFScope {
+            |    const Inner& __lf_inner = *this;
             |    const Parameters __lf_parameters;
         ${" |    "..parameters.generateInnerAliasDeclarations()}
         ${" |    "..state.generateDeclarations()}

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

@@ -51,7 +51,7 @@ object CppTypes : TargetTypes {
         }
 
     override fun getTargetParamRef(expr: ParameterReference, type: InferredType?): String {
-        return "__lf_parameters.${expr.parameter.name}"
+        return "__lf_inner.${expr.parameter.name}"
     }
 }
 

test/Cpp/src/ParameterHierarchy.lf

@@ -7,25 +7,30 @@
  */
 target Cpp
 
-reactor Deep(p: int = 0) {
+reactor Deep(p: int = 0, s: std::string = "foo") {
   reaction(startup) {=
     if(p != 42) {
-      reactor::log::Error() << "Parameter value is: " << p << ". Should have been 42.";
+      reactor::log::Error() << "Parameter value p is: " << p << ". Should have been 42.";
       exit(1);
-    } else {
-      reactor::log::Info() << "Success.";
     }
+     if(s != "bar") {
+      reactor::log::Error() << "Parameter value s is: " << s << ". Should have been bar.";
+      exit(2);
+    }
+
+    reactor::log::Info() << "Success.";
   =}
 }
 
-reactor Intermediate(p: int = 10) {
-  a = new Deep(p=p)
+reactor Intermediate(p: int = 10, s: std::string = "default") {
+  a = new Deep(p=p, s=s)
 }
 
-reactor Another(p: int = 20) {
-  a = new Intermediate(p = {= p =})  // also test forwarding parameters via target code blocks
+reactor Another(p: int = 20, s: std::string = "default") {
+  // also test forwarding parameters via target code blocks
+  a = new Intermediate(p = {= p =}, s = {= s =})
 }
 
 main reactor ParameterHierarchy {
-  a = new Intermediate(p=42)
+  a = new Intermediate(p=42, s="bar")
 }