Fix multi return values handling

Author: filipsajdak

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_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

@@ -253,6 +253,7 @@ class sema
                 assert(decl.declaration);
                 if (
                     decl.declaration->type.index() == declaration_node::function //  Don't look beyond the current function
+                    && decl.declaration->identifier // nullptr if lambda
                 ) {
                     return nullptr;
                 }