Some whitespace handling issues.

perl6 · Oct 17, 2009 · 1239272 · 1239272
1 parent 2c73bfa
commit 1239272
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Regex/P6Grammar/Grammar.pm b/src/Regex/P6Grammar/Grammar.pm
@@ -22,7 +22,7 @@ grammar Regex::P6Grammar::Grammar is Regex::P6Regex::Grammar;
         $<sym>=[regex|token|rule]
         <longname>
         {*} #= open
-        '{' <nibbler> '}'
+        '{'<nibbler>'}'
         {*}
     }
 
diff --git a/src/Regex/P6Regex/Grammar.pm b/src/Regex/P6Regex/Grammar.pm
@@ -22,9 +22,9 @@ grammar Regex::P6Regex::Grammar;
         {*}
     }
 
-    rule nibbler {
+    token nibbler {
         {*} #= open
-        ['||'|'|'|'&&'|'&']?
+        [ <.ws> ['||'|'|'|'&&'|'&'] ]?
         <termish> 
         [ ['||'|'|'] 
           [ <termish> || <.panic: 'Null pattern not allowed'> ]
@@ -85,7 +85,7 @@ grammar Regex::P6Regex::Grammar;
 
     token metachar:sym<{*}> { 
         $<sym>=['{*}'] 
-        [ \h* '#= ' \h* $<key>=[[\S+] ** [\h+]] ]?
+        [ \h* '#= ' \h* $<key>=[\S+ [\h+ \S+]*] ]?
         {*} 
     }
     token metachar:sym<assert> {