Don't put named (slurpy) parameters into multi-signature. Closes TT #…

…1736
perl6 · Aug 26, 2010 · 83747bd · 83747bd
1 parent e71d569
commit 83747bd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/NQP/Actions.pm b/src/NQP/Actions.pm
@@ -490,7 +490,7 @@ method signature($/) {
     if $*MULTINESS eq "multi" {
         my @params;
         for $BLOCKINIT.list {
-            @params.push($_.multitype // '_');
+            @params.push($_.multitype // '_') unless $_<skip_multi>;
         }
         @BLOCK[0].multi(@params);
     }
@@ -504,15 +504,18 @@ method parameter($/) {
         if $quant ne '!' {
             $past.viviself( vivitype($<named_param><param_var><sigil>) );
         }
+        $past<skip_multi> := 1;
     }
     else {
         $past := $<param_var>.ast;
         if $quant eq '*' {
             $past.slurpy(1);
             $past.named( $<param_var><sigil> eq '%' );
+            $past<skip_multi> := 1;
         }
         elsif $quant eq '?' {
             $past.viviself( vivitype($<param_var><sigil>) );
+            $past<skip_multi> := 1;
         }
     }
     if $<default_value> {

diff --git a/t/nqp/51-multi.t b/t/nqp/51-multi.t
@@ -1,6 +1,6 @@
 #! nqp
 
-say("1..5");
+say("1..7");
 
 our multi sub foo(Float $f) {
     say("ok 1");
@@ -32,3 +32,18 @@ my $f := Foo.new;
 $f.bar(43.5 - 0.5);
 $f.bar("ok 5");
 
+
+class Bar {
+    our multi method foo($x, :$opt?) {
+        say($x);
+    }
+
+    our multi method foo(Float $x, :$opt?) {
+        say("ok 6");
+    }
+}
+
+my $b := Bar.new;
+$b.foo(43.5 - 0.5);
+$b.foo("ok 7");
+