Allow spaces in character class compositions.

perl6 · Oct 13, 2009 · f00fd0d · f00fd0d
1 parent 3de5a4f
commit f00fd0d
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/Regex/P6Regex/Grammar.pm b/src/Regex/P6Regex/Grammar.pm
@@ -2,6 +2,8 @@ grammar Regex::P6Regex::Grammar is PCT::Grammar;
 
     token ws { [ \s+ | '#' \N*\n ]* }
 
+    token normspace { <?before \s | '#' > <.ws> }
+
     token TOP {
         <nibbler>
         [ <.ws> $ || <.panic: "Syntax error"> ]
@@ -118,14 +120,16 @@ grammar Regex::P6Regex::Grammar is PCT::Grammar;
 
     token cclass_elem {
         $<sign>=['+'|'-'|<?>]
+        <.normspace>?
         [
         | '[' $<charspec>=(
-                  | '-' <.obs: "hyphen in enumerated character class;..">
-                  | [ \\ (.) | (<-[\]\\]>) ] [ '..' (.) ]?
+                  | \s* '-' <.obs: "hyphen in enumerated character class;..">
+                  | \s* [ \\ (.) | (<-[\]\\]>) ] [ \s* '..' \s* (.) ]?
               )*
-          ']'
+          \s* ']'
         | $<name>=[\w+]
         ]
+        <.normspace>?
         {*}
     }