Simplify ;; parsing in signature handling

Fixes #125502, already has a test
rakudo · Jun 28, 2015 · 24236f4 · 24236f4
1 parent 8e82716
commit 24236f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/Perl6/Actions.nqp b/src/Perl6/Actions.nqp
@@ -3809,20 +3809,15 @@ Compilation unit '$file' contained the following violations:
         my %signature;
         my @parameter_infos;
         my int $param_idx := 0;
-        my int $multi_invocant := 1;
         for $<parameter> {
             my %info := $_.ast;
-            %info<is_multi_invocant> := $multi_invocant;
             my $sep := @*seps[$param_idx];
             if ~$sep eq ':' {
                 if $param_idx != 0 {
                     $*W.throw($/, 'X::Syntax::Signature::InvocantMarker')
                 }
                 %info<is_invocant> := 1;
             }
-            elsif ~$sep eq ';;' {
-                $multi_invocant := 0;
-            }
             @parameter_infos.push(%info);
             $param_idx := $param_idx + 1;
         }

diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
@@ -2583,8 +2583,8 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
         '' $<sep>=[','|':'|';;'|';'] {
             if $<sep> eq ';;' {
                 $/.CURSOR.panic("Can only specify ';;' once in a signature")
-                  if $*seen_semicoloncolon;
-                $*seen_semicoloncolon := 1;
+                  if $*multi_invocant == 0;
+                $*multi_invocant := 0;
             }
             @*seps.push($<sep>);
         }
@@ -2609,7 +2609,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
     token signature {
         :my $*IN_DECL := 'sig';
         :my $*zone := 'posreq';
-        :my $*seen_semicoloncolon := 0;
+        :my $*multi_invocant := 1;
         :my @*seps := nqp::list();
         :my $*INVOCANT_OK := 1;
         <.ws>
@@ -2695,6 +2695,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
                 $*zone := 'var';
             }
 
+            %*PARAM_INFO<is_multi_invocant> := $*multi_invocant;
             %*PARAM_INFO<node> := $/;
         }
     }