Unify ternary explanation

rakudo · Mar 2, 2017 · a53b84a · a53b84a
1 parent 1ebe41d
commit a53b84a
Showing 1 changed file with 13 additions and 16 deletions.
diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
@@ -4391,35 +4391,32 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
     token infix:sym<min>  { <sym> >> <O(|%tight_or_minmax)> }
     token infix:sym<max>  { <sym> >> <O(|%tight_or_minmax)> }
 
+    token ternary-explan {
+        || <?before '::' <.-[=]>> { self.typed_panic: "X::Syntax::ConditionalOperator::SecondPartInvalid", second-part => "::" }
+        || <?before ':' <.-[=\w]>> { self.typed_panic: "X::Syntax::ConditionalOperator::SecondPartInvalid", second-part => ":" }
+        || <infixish> { self.typed_panic: "X::Syntax::ConditionalOperator::PrecedenceTooLoose", operator => ~$<infixish> }
+        || <?{ ~$<EXPR> ~~ / $*GOAL / }> { self.typed_panic: "X::Syntax::ConditionalOperator::SecondPartGobbled" }
+        || <?before \N*? [\n\N*?]? $*GOAL> { self.typed_panic: "X::Syntax::Confused", reason => "Confused: Bogus code found before the !! of conditional operator" }
+        || { self.typed_panic: "X::Syntax::Confused", reason => "Confused: Found $*TERNARYBEGIN but no $*GOAL" }
+    }
+
     token infix:sym<?? !!> {
         :my $*GOAL := '!!';
         $<sym>='??'
+        :my $*TERNARYBEGIN := '??';
         <.ws>
         <EXPR('i=')>
-        [ '!!'
-        || <?before '::' <.-[=]>> { self.typed_panic: "X::Syntax::ConditionalOperator::SecondPartInvalid", second-part => "::" }
-        || <?before ':' <.-[=\w]>> { self.typed_panic: "X::Syntax::ConditionalOperator::SecondPartInvalid", second-part => ":" }
-        || <infixish> { self.typed_panic: "X::Syntax::ConditionalOperator::PrecedenceTooLoose", operator => ~$<infixish> }
-        || <?{ ~$<EXPR> ~~ / '!!' / }> { self.typed_panic: "X::Syntax::ConditionalOperator::SecondPartGobbled" }
-        || <?before \N*? [\n\N*?]? '!!'> { self.typed_panic: "X::Syntax::Confused", reason => "Confused: Bogus code found before the !! of conditional operator" }
-        || { self.typed_panic: "X::Syntax::Confused", reason => "Confused: Found ?? but no !!" }
-        ]
+        [ '!!' || <.ternary-explan> ]
         <O(|%conditional, :reducecheck<ternary>, :pasttype<if>)>
     }
 
     token infix:sym<⁇ ‼> {
         :my $*GOAL := '‼';
         $<sym>='⁇'
+        :my $*TERNARYBEGIN := '⁇';
         <.ws>
         <EXPR('i=')>
-        [ '‼'
-        || <?before '::' <.-[=]>> { self.typed_panic: "X::Syntax::ConditionalOperator::SecondPartInvalid", second-part => "::" }
-        || <?before ':' <.-[=\w]>> { self.typed_panic: "X::Syntax::ConditionalOperator::SecondPartInvalid", second-part => ":" }
-        || <infixish> { self.typed_panic: "X::Syntax::ConditionalOperator::PrecedenceTooLoose", operator => ~$<infixish> }
-        || <?{ ~$<EXPR> ~~ / '‼' / }> { self.typed_panic: "X::Syntax::ConditionalOperator::SecondPartGobbled" }
-        || <?before \N*? [\n\N*?]? '‼'> { self.typed_panic: "X::Syntax::Confused", reason => "Confused: Bogus code found before the ‼ of conditional operator" }
-        || { self.typed_panic: "X::Syntax::Confused", reason => "Confused: Found ⁇ but no ‼" }
-        ]
+        [ '‼' || <.ternary-explan> ]
         <O(|%conditional, :reducecheck<ternary>, :pasttype<if>)>
     }