Allow hyphens and single-quotes in subrule calls.

perl6 · Jun 24, 2010 · 9157c78 · 9157c78
1 parent b6defec
commit 9157c78
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Regex/P6Regex/Grammar.pm b/src/Regex/P6Regex/Grammar.pm
@@ -9,6 +9,8 @@ grammar Regex::P6Regex::Grammar is HLL::Grammar;
 
     token normspace { <?before \s | '#' > <.ws> }
 
+    token identifier { <.ident> [ <[\-']> <.ident> ]* }
+
     token arg {
         [
         | <?[']> <quote_EXPR: ':q'>
@@ -145,7 +147,7 @@ grammar Regex::P6Regex::Grammar is HLL::Grammar;
     }
 
     token assertion:sym<name> {
-        $<longname>=[\w+]
+        <longname=.identifier>
             [
             | <?before '>'>
             | '=' <assertion>

diff --git a/t/p6regex/01-regex.t b/t/p6regex/01-regex.t
@@ -52,6 +52,8 @@ Description of the test.
 
 =cut
 
+.loadlib 'io_ops'
+
 .const string TESTS = 'no_plan'
 
 .sub main :main