implement \x{} for P5 regexes

Raku · Jan 16, 2014 · 8688e89 · 8688e89
1 parent ea681df
commit 8688e89
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/QRegex/P5Regex/Actions.nqp b/src/QRegex/P5Regex/Actions.nqp
@@ -229,7 +229,9 @@ class QRegex::P5Regex::Actions is HLL::Actions {
     }
 
     method p5backslash:sym<x>($/) {
-        my $hexlit := HLL::Actions.ints_to_string( $<hexint> );
+        my $hexlit := nqp::chars($<hexint>)
+            ?? nqp::chr( self.string_to_int($<hexint>, 16) )
+            !! nqp::chr(0);
         make QAST::Regex.new( $hexlit, :rxtype('literal'), :node($/) );
     }
 

diff --git a/src/QRegex/P5Regex/Grammar.nqp b/src/QRegex/P5Regex/Grammar.nqp
@@ -136,7 +136,13 @@ grammar QRegex::P5Regex::Grammar is HLL::Grammar {
     token p5backslash:sym<R> { <sym> }
     token p5backslash:sym<s> { $<sym>=[<[dDnNsSwW]>] }
     token p5backslash:sym<t> { <sym> }
-    token p5backslash:sym<x> { <sym> <hexint> }
+    token p5backslash:sym<x> {
+        <sym>
+        [
+        |           $<hexint>=[ <[ 0..9 a..f A..F ]>**0..2 ]
+        | '{' ~ '}' $<hexint>=[ <[ 0..9 a..f A..F ]>**0..2 ]
+        ]
+    }
     token p5backslash:sym<z> { <sym> }
     token p5backslash:sym<Z> { <sym> }
     token p5backslash:sym<Q> { <sym> <!!{ $*INTERPOLATE := 0; 1 }> }

diff --git a/t/p5regex/rx_metachars b/t/p5regex/rx_metachars
@@ -54,3 +54,5 @@ a\Z				a\nb	n	basic \Z - (2)
 a\z				a		y	basic \z +
 a\z				a\n		n	basic \z - (1)
 a\z				a\nb	n	basic \z - (2)
+a\x6565				ae65	y	\x
+a\x{65}				ae	y	\x{}