Fix return 1, :a(2)

Though return is implemented as a function call, we may not promote pairs to named arguments, because we cannot demote them afterwards. Fixes RT #75118
rakudo · Sep 19, 2015 · 0d40e00 · 0d40e00
1 parent 0f699bb
commit 0d40e00
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Perl6/Actions.nqp b/src/Perl6/Actions.nqp
@@ -5198,7 +5198,7 @@ Compilation unit '$file' contained the following violations:
                 if nqp::istype($_, QAST::Op) && istype($_.returns, $Pair) {
                     my $name := compile_time_value_str($_[1], 'LHS of pair', $/);
                     %named_counts{$name} := +%named_counts{$name} + 1;
-                    unless $*IN_DECL eq 'use' || $*IN_DECL eq 'no' || $*IN_DECL eq 'import' {
+                    unless $*IN_DECL eq 'use' || $*IN_DECL eq 'no' || $*IN_DECL eq 'import' || $*IN_RETURN {
                         $_[2].named($name);
                     }
                 }
@@ -5207,7 +5207,7 @@ Compilation unit '$file' contained the following violations:
             # Make result.
             for @args {
                 if nqp::istype($_, QAST::Op) && istype($_.returns, $Pair) {
-                    my $name := $_[2].named();
+                    my $name := compile_time_value_str($_[1], 'LHS of pair', $/);
                     if %named_counts{$name} == 1 {
                         $past.push($_[2]);
                         $_[2].annotate('before_promotion', $_);

diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
@@ -1048,6 +1048,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
         :my $*IN_META := '';                       # parsing a metaoperator like [..]
         :my $*IN_REDUCE := 0;                      # attempting to parse an [op] construct
         :my $*IN_DECL;                             # what declaration we're in
+        :my $*IN_RETURN := 0;                      # are we in a return?
         :my $*HAS_SELF := '';                      # is 'self' available? (for $.foo style calls)
         :my $*begin_compunit := 1;                 # whether we're at start of a compilation unit
         :my $*DECLARAND;                           # the current thingy we're declaring, and subject of traits
@@ -3140,7 +3141,9 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
         <longname>
         :my $*longname;
         :my $pos;
+        :my $*IN_RETURN;
         { $*longname := $*W.dissect_longname($<longname>); $pos := $/.CURSOR.pos }
+        { $*IN_RETURN := $<longname>.Str eq 'return'; }
         [
         ||  <?{ nqp::eqat($<longname>.Str, '::', 0) || $*W.is_name($*longname.components()) }>
             <.unsp>?
@@ -3669,6 +3672,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
     method EXPR(str $preclim = '') {
         # Override this so we can set $*LEFTSIGIL.
         my $*LEFTSIGIL := '';
+        my $*IN_RETURN := 0;
         nqp::findmethod(HLL::Grammar, 'EXPR')(self, $preclim, :noinfix($preclim eq 'y='));
     }