Fix some CSS::Module regressions

dwarring · dwarring · commit f17165081795 · 2025-10-25T08:42:19.000+13:00
diff --git a/lib/CSS/Specification/Compiler/Grammars.rakumod b/lib/CSS/Specification/Compiler/Grammars.rakumod
@@ -100,7 +100,7 @@ multi sub compile(Str :$rule!, :$spec!, Str :$synopsis!) {
 }
 
 multi sub compile(:@occurs! ($quant!, *%term)) {
-    my RakuAST::Regex $atom = (|%term).&compile.&group;
+    my RakuAST::Regex $atom = (|%term).&compile.&group.&ws;
     my RakuAST::Regex $separator = compile(:op<,>)
         if $quant.tail ~~ ',';
 
@@ -232,7 +232,7 @@ multi sub compile(Str:D :$rule!) {
 }
 
 multi sub compile(:@keywords!) {
-    _choice @keywords.map(&lit-ws), 'keyw'.&assertion;
+    _choice @keywords.map(&lit-ws), 'keyw'.&assertion.&ws;
 }
 
 multi sub compile(:@numbers!) {
@@ -242,7 +242,7 @@ multi sub compile(:@numbers!) {
 sub lit-ws(Str:D() $_) is export { .&lit.&ws }
 
 multi sub compile(Str:D :$op!) {
-    my RakuAST::ArgList $args = ','.&arg;
+    my RakuAST::ArgList $args = $op.&arg;
     'op'.&assertion(:$args);
 }
 
diff --git a/lib/CSS/Specification/Runtime/Grammar.rakumod b/lib/CSS/Specification/Runtime/Grammar.rakumod
@@ -3,10 +3,10 @@ unit grammar CSS::Specification::Runtime::Grammar;
 proto rule proforma {*}
 
 token val( $*EXPR, $*USAGE='' ) {
-    <proforma> || <rx={$*EXPR}> || <usage>
+    <proforma> || <rx={$*EXPR}> || <usage($*USAGE)>
 }
 
-token usage {
+token usage($*USAGE) {
     <any-args>
 }
 
@@ -23,6 +23,7 @@ token frequency:sym<zero> {<number> <?{ +$<number> == 0 }> }
 token integer     {$<sign>=< + - >?<uint>}
 token number      {<num><!before ['%'|\w]>}
 token uri         {<url>}
-token keyw        {<id=.Ident>}         # keyword (case insensitive)
+multi token keyw  {<id=.Ident>}         # keyword (case insensitive)
+multi token keyw($rx) {<id={$rx}>}      # keyword (case insensitive)
 token identifier  {<name>}              # identifier (case sensitive)
 rule identifiers  {[ <identifier> ]+}   # E.g. font name: Times New Roman
diff --git a/t/00compile.t b/t/00compile.t
@@ -16,7 +16,7 @@ for (
     'spec' => {
         input => 'thin',
         ast   => :keywords['thin'],
-        deparse => 'thin & <keyw>',
+        deparse => 'thin & <keyw> ',
     },
     'spec' => {
         input => 'thin?',
@@ -26,7 +26,7 @@ for (
     'spec' => {
         input => 'thick | thin',
         ast => :keywords[ 'thick', 'thin' ],
-        deparse => '[thick | thin ]& <keyw>',
+        deparse => '[thick | thin ]& <keyw> ',
     },
     'spec' => {
         input => '35 | 7',
@@ -106,13 +106,13 @@ for (
     'spec' => {
         input => 'bold thin && <length>',
         ast => :required[:seq[:keywords["bold"], :keywords["thin"]], :rule("length")],
-        deparse => "[:my \@S\n;  bold \& <keyw> thin \& <keyw> <!\{\n    \@S[0]++\n}>| <length><!\{\n    \@S[1]++\n}>]** 2",
+        deparse => "[:my \@S\n;  bold \& <keyw>  thin \& <keyw>  <!\{\n    \@S[0]++\n}>| <length><!\{\n    \@S[1]++\n}>]** 2",
         rule-refs => ['length'],
     },
     'spec' => {
         input => 'bold || thin && <length>',
         ast => :combo[:keywords["bold"], :required[:keywords["thin"], :rule("length")]],
-        deparse => "[:my \@S\n;  bold \& <keyw><!\{\n    \@S[0]++\n}>| [:my \@S\n;  thin \& <keyw><!\{\n    \@S[0]++\n}>| <length><!\{\n    \@S[1]++\n}>]** 2<!\{\n    \@S[1]++\n}>]+",
+        deparse => "[:my \@S\n;  bold \& <keyw> <!\{\n    \@S[0]++\n}>| [:my \@S\n;  thin \& <keyw> <!\{\n    \@S[0]++\n}>| <length><!\{\n    \@S[1]++\n}>]** 2<!\{\n    \@S[1]++\n}>]+",
         rule-refs => ['length'],
     },
     'property-spec' => {
@@ -142,7 +142,7 @@ for (
         deparse => join("\n",
                         '#| min-width: <length> | <percentage> | inherit',
                         'rule decl:sym<min-width> { :i ("min-width") ":" <val(/<expr=.expr-min-width> /, &?ROUTINE.WHY)> }',
-                        'rule expr-min-width { :i <length> || <percentage> || inherit & <keyw>  }',
+                        'rule expr-min-width { :i <length> || <percentage> || inherit & <keyw>   }',
                        ''),
     },
     'property-spec' => {input => "'content'\tnormal | none | [ <string> | <uri> | <counter> | attr(<identifier>) | open-quote | close-quote | no-open-quote | no-close-quote ]+ | inherit\tnormal	:before and :after pseudo-elements	no",
@@ -167,7 +167,7 @@ for (
                         deparse => join("\n",
                                         '#| content: normal | none | [ <string> | <uri> | <counter> | attr(<identifier>) | open-quote | close-quote | no-open-quote | no-close-quote ]+ | inherit',
                                         'rule decl:sym<content> { :i (content) ":" <val(/<expr=.expr-content> /, &?ROUTINE.WHY)> }',
-                                        'rule expr-content { :i [normal | none ]& <keyw> || [<string> || <uri> || <counter> || <attr> || ["open-quote" | "close-quote" | "no-open-quote" | "no-close-quote" ]& <keyw> ]+ || inherit & <keyw>  }',
+                                        'rule expr-content { :i [normal | none ]& <keyw>  || [<string> || <uri> || <counter> || <attr> || ["open-quote" | "close-quote" | "no-open-quote" | "no-close-quote" ]& <keyw>  ]+ || inherit & <keyw>   }',
                                         ''
                                        ),
 
diff --git a/t/META6.json b/t/META6.json
@@ -8,8 +8,7 @@
       "Test::CSS::Aural::Grammar": "lib/Test/CSS/Aural/Grammar.rakumod",
       "Test::CSS::Aural::Spec::Actions": "lib/Test/CSS/Aural/Spec/Actions.rakumod",
       "Test::CSS::Aural::Spec::Interface": "lib/Test/CSS/Aural/Spec/Interface.rakumod",
-      "Test::CSS::Aural::Spec::Grammar": "lib/Test/CSS/Aural/Spec/Grammar.rakumod",
-      "Test::CSS::Aural::Spec::GrammarAST": "lib/Test/CSS/Aural/Spec/GrammarAST.rakumod"
+      "Test::CSS::Aural::Spec::Grammar": "lib/Test/CSS/Aural/Spec/Grammar.rakumod"
   },
   "source-url": "git://github.com/p6-css/CSS-Specification-p6.git",
   "version": "0.0.1"
diff --git a/t/lib/Test/CSS/Aural/Spec/ActionsAST.rakumod b/t/lib/Test/CSS/Aural/Spec/ActionsAST.rakumod
diff --git a/t/lib/Test/CSS/Aural/Spec/Grammar.rakumod b/t/lib/Test/CSS/Aural/Spec/Grammar.rakumod
@@ -1,17 +1,17 @@
 unit grammar Test::CSS::Aural::Spec::Grammar;
 #| azimuth: <angle> | [[ left-side | far-left | left | center-left | center | center-right | right | far-right | right-side ] || behind ] | leftwards | rightwards
 rule decl:sym<azimuth> { :i (azimuth) ":" <val(/<expr=.expr-azimuth> /, &?ROUTINE.WHY)> }
-rule expr-azimuth { :i <angle> || [[:my @S;  [["left-side" | "far-left" | left | "center-left" | center | "center-right" | right | "far-right" | "right-side" ]& <keyw>]<!{
+rule expr-azimuth { :i <angle> || [[:my @S;  [["left-side" | "far-left" | left | "center-left" | center | "center-right" | right | "far-right" | "right-side" ]& <keyw> ]<!{
     @S[0]++
-}>| behind & <keyw><!{
+}>| behind & <keyw> <!{
     @S[1]++
-}>]+] || [leftwards | rightwards ]& <keyw>  }
+}>]+] || [leftwards | rightwards ]& <keyw>   }
 #| cue-after: <uri> | none
 rule decl:sym<cue-after> { :i ("cue-after") ":" <val(/<expr=.expr-cue-after> /, &?ROUTINE.WHY)> }
-rule expr-cue-after { :i <uri> || none & <keyw>  }
+rule expr-cue-after { :i <uri> || none & <keyw>   }
 #| cue-before: <uri> | none
 rule decl:sym<cue-before> { :i ("cue-before") ":" <val(/<expr=.expr-cue-before> /, &?ROUTINE.WHY)> }
-rule expr-cue-before { :i <uri> || none & <keyw>  }
+rule expr-cue-before { :i <uri> || none & <keyw>   }
 #| cue: [ 'cue-before' || 'cue-after' ]
 rule decl:sym<cue> { :i (cue) ":" <val(/<expr=.expr-cue> /, &?ROUTINE.WHY)> }
 rule expr-cue { :i [[:my @S;  <expr-cue-before><!{
@@ -21,7 +21,7 @@ rule expr-cue { :i [[:my @S;  <expr-cue-before><!{
 }>]+] }
 #| elevation: <angle> | below | level | above | higher | lower
 rule decl:sym<elevation> { :i (elevation) ":" <val(/<expr=.expr-elevation> /, &?ROUTINE.WHY)> }
-rule expr-elevation { :i <angle> || [below | level | above | higher | lower ]& <keyw>  }
+rule expr-elevation { :i <angle> || [below | level | above | higher | lower ]& <keyw>   }
 #| pause: [ [<time> | <percentage>]{1,2} ]
 rule decl:sym<pause> { :i (pause) ":" <val(/<expr=.expr-pause> /, &?ROUTINE.WHY)> }
 rule expr-pause { :i [[<time> || <percentage> ]** 1..2] }
@@ -36,57 +36,57 @@ rule decl:sym<pitch-range> { :i ("pitch-range") ":" <val(/<expr=.expr-pitch-rang
 rule expr-pitch-range { :i <number> }
 #| pitch: <frequency> | x-low | low | medium | high | x-high
 rule decl:sym<pitch> { :i (pitch) ":" <val(/<expr=.expr-pitch> /, &?ROUTINE.WHY)> }
-rule expr-pitch { :i <frequency> || ["x-low" | low | medium | high | "x-high" ]& <keyw>  }
+rule expr-pitch { :i <frequency> || ["x-low" | low | medium | high | "x-high" ]& <keyw>   }
 #| play-during: <uri> [ mix || repeat ]? | auto | none
 rule decl:sym<play-during> { :i ("play-during") ":" <val(/<expr=.expr-play-during> /, &?ROUTINE.WHY)> }
-rule expr-play-during { :i <uri> [[:my @S;  mix & <keyw><!{
+rule expr-play-during { :i <uri> [[:my @S;  mix & <keyw> <!{
     @S[0]++
-}>| repeat & <keyw><!{
+}>| repeat & <keyw> <!{
     @S[1]++
-}>]+]?  || [auto | none ]& <keyw>  }
+}>]+]?  || [auto | none ]& <keyw>   }
 #| richness: <number>
 rule decl:sym<richness> { :i (richness) ":" <val(/<expr=.expr-richness> /, &?ROUTINE.WHY)> }
 rule expr-richness { :i <number> }
 #| speak: normal | none | spell-out
 rule decl:sym<speak> { :i (speak) ":" <val(/<expr=.expr-speak> /, &?ROUTINE.WHY)> }
-rule expr-speak { :i [normal | none | "spell-out" ]& <keyw> }
+rule expr-speak { :i [normal | none | "spell-out" ]& <keyw>  }
 #| speak-header: once | always
 rule decl:sym<speak-header> { :i ("speak-header") ":" <val(/<expr=.expr-speak-header> /, &?ROUTINE.WHY)> }
-rule expr-speak-header { :i [once | always ]& <keyw> }
+rule expr-speak-header { :i [once | always ]& <keyw>  }
 #| speak-numeral: digits | continuous
 rule decl:sym<speak-numeral> { :i ("speak-numeral") ":" <val(/<expr=.expr-speak-numeral> /, &?ROUTINE.WHY)> }
-rule expr-speak-numeral { :i [digits | continuous ]& <keyw> }
+rule expr-speak-numeral { :i [digits | continuous ]& <keyw>  }
 #| speak-punctuation: code | none
 rule decl:sym<speak-punctuation> { :i ("speak-punctuation") ":" <val(/<expr=.expr-speak-punctuation> /, &?ROUTINE.WHY)> }
-rule expr-speak-punctuation { :i [code | none ]& <keyw> }
+rule expr-speak-punctuation { :i [code | none ]& <keyw>  }
 #| speech-rate: <number> | x-slow | slow | medium | fast | x-fast | faster | slower
 rule decl:sym<speech-rate> { :i ("speech-rate") ":" <val(/<expr=.expr-speech-rate> /, &?ROUTINE.WHY)> }
-rule expr-speech-rate { :i <number> || ["x-slow" | slow | medium | fast | "x-fast" | faster | slower ]& <keyw>  }
+rule expr-speech-rate { :i <number> || ["x-slow" | slow | medium | fast | "x-fast" | faster | slower ]& <keyw>   }
 #| stress: <number>
 rule decl:sym<stress> { :i (stress) ":" <val(/<expr=.expr-stress> /, &?ROUTINE.WHY)> }
 rule expr-stress { :i <number> }
 #| voice-family: [<generic-voice> | <specific-voice> ]#
 rule decl:sym<voice-family> { :i ("voice-family") ":" <val(/<expr=.expr-voice-family> /, &?ROUTINE.WHY)> }
 rule expr-voice-family { :i [<generic-voice> || <specific-voice> ]+% <op(",")> }
 #| male | female | child
-rule generic-voice { :i [male | female | child ]& <keyw> }
+rule generic-voice { :i [male | female | child ]& <keyw>  }
 #| <identifier> | <string>
 rule specific-voice { :i <identifier> || <string>  }
 #| volume: <number> | <percentage> | silent | x-soft | soft | medium | loud | x-loud
 rule decl:sym<volume> { :i (volume) ":" <val(/<expr=.expr-volume> /, &?ROUTINE.WHY)> }
-rule expr-volume { :i <number> || <percentage> || [silent | "x-soft" | soft | medium | loud | "x-loud" ]& <keyw>  }
+rule expr-volume { :i <number> || <percentage> || [silent | "x-soft" | soft | medium | loud | "x-loud" ]& <keyw>   }
 #| border-color: [ <color> | transparent ]{1,4}
 rule decl:sym<border-color> { :i ("border-color") ":" <val(/<expr=.expr-border-color>** 1..4 /, &?ROUTINE.WHY)> }
-rule expr-border-color { :i [<color> || transparent & <keyw> ] }
+rule expr-border-color { :i [<color> || transparent & <keyw>  ] }
 #| border-top-color: <color> | transparent
 rule decl:sym<border-top-color> { :i ("border-top-color") ":" <val(/<expr=.expr-border-top-color> /, &?ROUTINE.WHY)> }
-rule expr-border-top-color { :i <color> || transparent & <keyw>  }
+rule expr-border-top-color { :i <color> || transparent & <keyw>   }
 #| border-top-color: <color> | transparent
 rule decl:sym<border-right-color> { :i ("border-right-color") ":" <val(/<expr=.expr-border-right-color> /, &?ROUTINE.WHY)> }
-rule expr-border-right-color { :i <color> || transparent & <keyw>  }
+rule expr-border-right-color { :i <color> || transparent & <keyw>   }
 #| border-top-color: <color> | transparent
 rule decl:sym<border-bottom-color> { :i ("border-bottom-color") ":" <val(/<expr=.expr-border-bottom-color> /, &?ROUTINE.WHY)> }
-rule expr-border-bottom-color { :i <color> || transparent & <keyw>  }
+rule expr-border-bottom-color { :i <color> || transparent & <keyw>   }
 #| border-top-color: <color> | transparent
 rule decl:sym<border-left-color> { :i ("border-left-color") ":" <val(/<expr=.expr-border-left-color> /, &?ROUTINE.WHY)> }
-rule expr-border-left-color { :i <color> || transparent & <keyw>  }
+rule expr-border-left-color { :i <color> || transparent & <keyw>   }
diff --git a/t/lib/Test/CSS/Aural/Spec/GrammarAST.rakumod b/t/lib/Test/CSS/Aural/Spec/GrammarAST.rakumod

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ multi sub compile(Str :$rule!, :$spec!, Str :$synopsis!) {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`multi sub compile(:@occurs! ($quant!, *%term)) {`
`103`		`- my RakuAST::Regex $atom = (\|%term).&compile.&group;`
	`103`	`+ my RakuAST::Regex $atom = (\|%term).&compile.&group.&ws;`
`104`	`104`	`my RakuAST::Regex $separator = compile(:op<,>)`
`105`	`105`	`if $quant.tail ~~ ',';`
`106`	`106`
`@@ -232,7 +232,7 @@ multi sub compile(Str:D :$rule!) {`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`multi sub compile(:@keywords!) {`
`235`		`- _choice @keywords.map(&lit-ws), 'keyw'.&assertion;`
	`235`	`+ _choice @keywords.map(&lit-ws), 'keyw'.&assertion.&ws;`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`multi sub compile(:@numbers!) {`
`@@ -242,7 +242,7 @@ multi sub compile(:@numbers!) {`
`242`	`242`	`sub lit-ws(Str:D() $_) is export { .&lit.&ws }`
`243`	`243`
`244`	`244`	`multi sub compile(Str:D :$op!) {`
`245`		`- my RakuAST::ArgList $args = ','.&arg;`
	`245`	`+ my RakuAST::ArgList $args = $op.&arg;`
`246`	`246`	`'op'.&assertion(:$args);`
`247`	`247`	`}`
`248`	`248`