Update ** quantifier a bit, recognize trailing spaces as request to

add <.ws> between each element. (This isn't completely what S05 specifies, but it's a good first cut.)
perl6 · Jun 3, 2010 · a68924f · a68924f
1 parent b338c2b
commit a68924f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/Regex/P6Regex/Actions.pm b/src/Regex/P6Regex/Actions.pm
@@ -117,8 +117,19 @@ method quantifier:sym<?>($/) {
 method quantifier:sym<**>($/) {
     my $past;
     if $<quantified_atom> {
+        my $ast := $<quantified_atom>.ast;
+        if $<normspace> && @MODIFIERS[0]<s> {
+            $ast := PAST::Regex.new( 
+                        :pasttype('concat'),
+                        PAST::Regex.new( 'ws', :pasttype('subrule'), 
+                                         :subtype('method') ),
+                        $ast,
+                        PAST::Regex.new( 'ws', :pasttype('subrule'), 
+                                         :subtype('method') )
+                    );
+        }
         $past := PAST::Regex.new( :pasttype('quant'), :min(1),
-                                  :sep( $<quantified_atom>.ast ), :node($/) );
+                                  :sep( $ast ), :node($/) );
     }
     else {
         $past := PAST::Regex.new( :pasttype('quant'), :min(+$<min>), :node($/) );

diff --git a/src/Regex/P6Regex/Grammar.pm b/src/Regex/P6Regex/Grammar.pm
@@ -54,7 +54,7 @@ grammar Regex::P6Regex::Grammar is HLL::Grammar;
     token quantifier:sym<+> { <sym> <backmod> }
     token quantifier:sym<?> { <sym> <backmod> }
     token quantifier:sym<**> {
-        <sym> \s* <backmod> \s*
+        <sym> <normspace>? <backmod> <normspace>?
         [
         ||  $<min>=[\d+] 
             [   '..'