Apply 113 and add test case, closes #113

Author: hsutter

regression-tests/pure2-look-up-parameter-across-unnamed-function.cpp2

@@ -0,0 +1,13 @@
+
+f: () -> (ri : int = 0) = {
+    pred := :(e:_) -> bool = { return e == 1; };
+    ri = 42;
+    return;
+}
+
+g: () -> (ri : int) = {
+    ri = 0;
+    pred := :(e:_) -> bool = { return e == 1; };
+    ri = 42;
+    return;
+}

regression-tests/test-results/pure2-look-up-parameter-across-unnamed-function.cpp

@@ -0,0 +1,38 @@
+// ----- Cpp2 support -----
+#define CPP2_USE_MODULES         Yes
+#include "cpp2util.h"
+
+
+#line 2 "pure2-look-up-parameter-across-unnamed-function.cpp2"
+struct f__ret {
+    int ri;
+    };
+#line 3 "pure2-look-up-parameter-across-unnamed-function.cpp2"
+[[nodiscard]] auto f() -> f__ret;
+#line 8 "pure2-look-up-parameter-across-unnamed-function.cpp2"
+struct g__ret {
+    int ri;
+    };
+#line 9 "pure2-look-up-parameter-across-unnamed-function.cpp2"
+[[nodiscard]] auto g() -> g__ret;
+
+//=== Cpp2 definitions ==========================================================
+
+#line 1 "pure2-look-up-parameter-across-unnamed-function.cpp2"
+
+[[nodiscard]] auto f() -> f__ret{
+    int ri = 0;
+#line 3 "pure2-look-up-parameter-across-unnamed-function.cpp2"
+    auto pred { [](auto const& e) -> bool{return e == 1; } }; 
+    ri = 42;
+    return  { std::move(ri) }; 
+}
+
+[[nodiscard]] auto g() -> g__ret{
+        cpp2::deferred_init<int> ri;
+#line 9 "pure2-look-up-parameter-across-unnamed-function.cpp2"
+    ri.construct(0);
+    auto pred { [](auto const& e) -> bool{return e == 1; } }; 
+    ri.value() = 42;
+    return  { std::move(ri.value()) }; 
+}

regression-tests/test-results/pure2-look-up-parameter-across-unnamed-function.cpp2.output

@@ -0,0 +1,2 @@
+pure2-look-up-parameter-across-unnamed-function.cpp2... ok (all Cpp2, passes safety checks)
+

source/cppfront.cpp

@@ -1086,15 +1086,12 @@ class cppfront
         }
 
         in_definite_init = is_definite_initialization(n.identifier);
-        if (in_synthesized_multi_return) {
-            printer.print_cpp2(".value()", n.position());
-        }
-        else if (!in_definite_init && !in_parameter_list) {
+        if (!in_definite_init && !in_parameter_list) {
             if (auto decl = sema.get_local_declaration_of(*n.identifier);
                 is_local_name &&
                 decl &&
                 //  note pointer equality: if we're not in the actual declaration of n.identifier
-                decl->identifier != n.identifier &&
+                (in_synthesized_multi_return || decl->identifier != n.identifier) &&
                 //  and this variable was uninitialized
                 !decl->initializer &&
                 //  and it's either a non-parameter or an out parameter
@@ -1104,6 +1101,9 @@ class cppfront
                 printer.print_cpp2(".value()", n.position());
             }
         }
+        else if (in_synthesized_multi_return) {
+            printer.print_cpp2(".value()", n.position());
+        }
 
         if (add_std_move || add_std_forward) {
             printer.print_cpp2(")", n.position());

source/sema.h

@@ -226,7 +226,7 @@ class sema
     {
     }
 
-    //  Get the declaration of t within the same function
+    //  Get the declaration of t within the same named function
     //
     auto get_local_declaration_of(token const& t) -> declaration_sym const*
     {
@@ -252,9 +252,12 @@ class sema
             {
                 auto const& decl = std::get<symbol::active::declaration>(ri->sym);
 
-                //  Don't look beyond the current function
+                //  Don't look beyond the start of the current named (has identifier) function
+                //  (an unnamed function is ok to look beyond)
                 assert(decl.declaration);
-                if (decl.declaration->type.index() == declaration_node::function) {
+                if (decl.declaration->type.index() == declaration_node::function &&
+                    decl.declaration->identifier)
+                {
                     return nullptr;
                 }