added indirection and typed exception for X::Backslash::UnrecognizedS…

…equence
rakudo · Nov 27, 2012 · aa635da · aa635da
1 parent e6e1585
commit aa635da
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/Perl6/Grammar.pm b/src/Perl6/Grammar.pm
@@ -3231,6 +3231,11 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
 }
 
 grammar Perl6::QGrammar is HLL::Grammar does STD {
+
+    method throw_unrecog_backslash_seq ($sequence) {
+        $*W.throw(self.MATCH(), <X Backslash UnrecognizedSequence>, :$sequence);
+    }
+
     proto token escape {*}
     proto token backslash {*}
 
@@ -3383,7 +3388,8 @@ grammar Perl6::QGrammar is HLL::Grammar does STD {
 
     role qq does b1 does c1 does s1 does a1 does h1 does f1 {
         token stopper { \" }
-        token backslash:sym<misc> { {} [ (\W) | $<x>=(\w) <.sorry("Unrecognized backslash sequence: '\\" ~ $<x>.Str ~ "'")> ] }
+        token backslash:sym<unrec> { {} (\w) { self.throw_unrecog_backslash_seq: $/[0].Str } }
+        token backslash:sym<misc> { \W }
 
         method tweak_q($v) { self.panic("Too late for :q") }
         method tweak_qq($v) { self.panic("Too late for :qq") }

diff --git a/src/core/Exception.pm b/src/core/Exception.pm
@@ -801,6 +801,11 @@ my class X::Sequence::Deduction is Exception {
     method message() { 'Unable to deduce sequence' }
 }
 
+my class X::Backslash::UnrecognizedSequence does X::Syntax {
+    has $.sequence;
+    method message() { "Unrecognized backslash sequence: '\\$.sequence'" }
+}
+
 my class X::ControlFlow is Exception {
     has $.illegal;   # something like 'next'
     has $.enclosing; # ....  outside a loop