Streamline tests, etc

dwarring · dwarring · commit ac1f8a411631 · 2025-10-22T07:51:21.000+13:00
diff --git a/lib/CSS/Specification/Compiler/RakuAST/Grammars.rakumod b/lib/CSS/Specification/Compiler/RakuAST/Grammars.rakumod
@@ -285,5 +285,5 @@ method build-grammar(@grammar-id) {
         :$name,
         :scope<unit>,
         :$body,
-    ).&expression.&statements;
+    );
 }
diff --git a/lib/CSS/Specification/Compiler/Runtime/Actions.rakumod b/lib/CSS/Specification/Compiler/Runtime/Actions.rakumod
@@ -46,7 +46,7 @@ method any-function($/)             {
 
 multi method declaration($/ where $<any-declaration>)  {
     with $<any-declaration>.ast -> $ast {
-        my ($key, $value) = $ast.kv;
+        my :($key, $value) := $ast.kv;
         if $.lax {
             make $key => $value;
         }
diff --git a/lib/CSS/Specification/Compiler/Runtime/Grammar.rakumod b/lib/CSS/Specification/Compiler/Runtime/Grammar.rakumod
@@ -6,10 +6,6 @@ token val( $*EXPR, $*USAGE='' ) {
     <proforma> || <rx={$*EXPR}> || <usage>
 }
 
-token seen($opt) {
-    <?{@*SEEN[$opt]++}>
-}
-
 token usage {
     <any-args>
 }
@@ -27,8 +23,6 @@ token frequency:sym<zero> {<number> <?{ +$<number> == 0 }> }
 token integer     {$<sign>=< + - >?<uint>}
 token number      {<num><!before ['%'|\w]>}
 token uri         {<url>}
-multi token keyw  {<id=.Ident>}         # keyword (case insensitive)
-# work-around for RT#117955 - conjunctive '&&' capture"
-multi token keyw($rx) {<id={$rx}>}      # keyword (case insensitive)
+token keyw        {<id=.Ident>}         # 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
@@ -130,17 +130,23 @@ for (
                        ''),
     },
     '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",
-                        ast => {:props['content'],
-                                :default<normal>,
-                                :spec{:alt[
-                                               {:keywords<normal none>},
-                                               {:occurs["+",
-                                                        {:group(${:alt[{:rule<string>}, {:rule<uri>}, {:rule<counter>}, {:rule<attr>}, {:keywords<open-quote close-quote no-open-quote no-close-quote>}]})}]},
-                                               {:keywords["inherit"]},
-                                           ]},
-                                :synopsis('normal | none | [ <string> | <uri> | <counter> | attr(<identifier>) | open-quote | close-quote | no-open-quote | no-close-quote ]+ | inherit'),
-                                :!inherit,
-                               },
+                        :ast{:props['content'],
+                             :default<normal>,
+                             :spec{
+                                 :alt[
+                                          {:keywords<normal none>},
+                                          {:occurs["+",
+                                                   {:group{
+                                                        :alt[{:rule<string>}, {:rule<uri>}, {:rule<counter>}, {:rule<attr>}, {:keywords<open-quote close-quote no-open-quote no-close-quote>}]}
+                                                   },
+                                                  ]
+                                          },
+                                          {:keywords["inherit"]},
+                                      ]
+                             },
+                             :synopsis('normal | none | [ <string> | <uri> | <counter> | attr(<identifier>) | open-quote | close-quote | no-open-quote | no-close-quote ]+ | inherit'),
+                             :!inherit,
+                            },
                         rule-refs => [<attr counter identifier string uri>],
                         deparse => join("\n",
                                         '#| content: normal | none | [ <string> | <uri> | <counter> | attr(<identifier>) | open-quote | close-quote | no-open-quote | no-close-quote ]+ | inherit',
diff --git a/t/build.t b/t/build.t
@@ -26,34 +26,36 @@ my $input-path = $*SPEC.catfile('examples', 'css21-aural.txt');
 my CSS::Specification::Compiler $compiler .= new;
 $compiler.load-defs($input-path);
 
+sub name(RakuAST::Package $p, $j) {
+    $p.name.parts>>.name.join: $j
+}
+
 my @summary = CSS::Specification::Build::summary( :$input-path );
 is +@summary, 25, 'number of summary items';
-is-deeply [@summary.grep({ .<box> })], [{:box, :!inherit, :name<border-color>, :edges["border-top-color", "border-right-color", "border-bottom-color", "border-left-color"], :synopsis("[ <color> | transparent ]\{1,4}")},], 'summary item';
+is-deeply @summary.first(*.<box>), {:box, :!inherit, :name<border-color>, :edges["border-top-color", "border-right-color", "border-bottom-color", "border-left-color"], :synopsis("[ <color> | transparent ]\{1,4}")}, 'summary item';
 
 {
     CSS::Specification::Build::generate( 'grammar', $grammar-name, :$input-path );
 }.&capture: 't/lib/Test/CSS/Aural/Spec/Grammar.rakumod';
 lives-ok {require ::($grammar-name)}, "$grammar-name compilation";
 
-my RakuAST::StatementList $grammar = $compiler.build-grammar(@grammar-id);
-
-'t/lib/Test/CSS/Aural/Spec/GrammarAST.rakumod'.IO.spurt: $grammar.DEPARSE
-.subst(/";\n;"/, ';', :g) # work-around for https://github.com/rakudo/rakudo/issues/5991
-.subst(/'Grammar'/, 'GrammarAST')
-.subst(/'  '/, ' ', :g);
+@grammar-id.tail ~= 'AST'; # parallel build for now
+my RakuAST::Package $grammar = $compiler.build-grammar(@grammar-id);
+"t/lib/{$grammar.&name('/')}.rakumod".IO.spurt: $grammar.DEPARSE
+.subst(/";\n;"/, ';', :g); # work-around for https://github.com/rakudo/rakudo/issues/5991
 
 {
     CSS::Specification::Build::generate( 'actions', $actions-name, :$input-path );
 }.&capture: 't/lib/Test/CSS/Aural/Spec/Actions.rakumod';
 lives-ok {require ::($actions-name)}, "$actions-name compilation";
 
+@actions-id.tail ~= 'AST'; # parallel build for now
 my RakuAST::Package $actions-pkg = $compiler.build-actions(@actions-id);
-
-'t/lib/Test/CSS/Aural/Spec/ActionsAST.rakumod'.IO.spurt: $actions-pkg.DEPARSE;
+"t/lib/{$actions-pkg.&name('/')}.rakumod".IO.spurt: $actions-pkg.DEPARSE;
 
 my $role-name = @role-id.join: '::';
 my RakuAST::Package $interface-pkg = $compiler.build-role(@role-id);
-'t/lib/Test/CSS/Aural/Spec/Interface.rakumod'.IO.spurt: $interface-pkg.DEPARSE;
+"t/lib/{$interface-pkg.&name('/')}.rakumod".IO.spurt: $interface-pkg.DEPARSE;
 lives-ok {require ::($role-name)}, "$role-name compilation";
 
 dies-ok {require ::("Test::CSS::Aural::BadGrammar")}, 'grammar composition, unimplemented interface - dies';
@@ -67,29 +69,27 @@ lives-ok {$actions = (require ::("Test::CSS::Aural::Actions")).new}, 'class comp
 ok $actions.defined, '::("Test::CSS::Aural::Actions").new';
 
 for ('.aural-test { stress: 42; speech-rate: fast; volume: inherit; voice-family: female; }' =>
-     {ast => { :stylesheet[
-               :ruleset{
-                   :selectors[ :selector[ :simple-selector[ :class<aural-test> ] ] ],
-                   :declarations[
-                       :property{ :ident<stress>, :expr[{ :num(42) }] },
-                       :property{ :ident<speech-rate>, :expr[{ :keyw<fast> }] },
-                       :property{ :ident<volume>, :expr[{ :keyw<inherit> }] },
-                       :property{ :ident<voice-family>, :expr[{ :keyw<female> }] },
-                       ],
-                    }
-                   ]}
-      },
+     ast => :stylesheet[
+                     :ruleset{
+                         :selectors[ :selector[ :simple-selector[ :class<aural-test> ] ] ],
+                         :declarations[
+                                  :property{ :ident<stress>, :expr[ :num(42) ] },
+                                  :property{ :ident<speech-rate>, :expr[ :keyw<fast> ] },
+                                  :property{ :ident<volume>, :expr[ :keyw<inherit> ] },
+                                  :property{ :ident<voice-family>, :expr[ :keyw<female> ] },
+                              ],
+                     }
+                 ],
      '.boxed-test { border-color: #aaa }' =>
-     {ast => { :stylesheet[
+     ast => :stylesheet[
                     :ruleset{
-                        :selectors[ :selector[ :simple-selector[{:class<boxed-test>}] ]],
+                        :selectors[ :selector[ :simple-selector[ :class<boxed-test> ] ]],
                         :declarations[ :property{
                             :ident<border-color>,
-                            :expr[{ :rgb[ :num(170), :num(170), :num(170) ]}]}],
+                            :expr[ :rgb[ :num(170), :num(170), :num(170) ]]}],
                     }
-                   ]}
-     },
-    ) {
+                  ],
+     ) {
     my ($input, $expected) = .kv;
 
     &CSS::Grammar::Test::parse-tests($aural-class, $input, 
diff --git a/t/lib/Test/CSS/Aural/Spec/ActionsAST.rakumod b/t/lib/Test/CSS/Aural/Spec/ActionsAST.rakumod
@@ -1 +1 @@
-unit class Test::CSS::Aural::Spec::Actions;
+unit class Test::CSS::Aural::Spec::ActionsAST;
diff --git a/t/lib/Test/CSS/Aural/Spec/GrammarAST.rakumod b/t/lib/Test/CSS/Aural/Spec/GrammarAST.rakumod
@@ -1,49 +1,49 @@
 unit grammar Test::CSS::Aural::Spec::GrammarAST;
 #| 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>]<!{
-  @S[0]++
+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><!{
-  @S[1]++
-}>]+] || [leftwards | rightwards ]& <keyw> }
+    @S[1]++
+}>]+] || [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><!{
-  @S[0]++
+rule expr-cue { :i [[:my @S;  <expr-cue-before><!{
+    @S[0]++
 }>| <expr-cue-after><!{
-  @S[1]++
+    @S[1]++
 }>]+] }
 #| 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] }
 #| pause-after: <time> | <percentage>
 rule decl:sym<pause-after> { :i ("pause-after") ":" <val(/<expr=.expr-pause-after> /, &?ROUTINE.WHY)> }
-rule expr-pause-after { :i <time> || <percentage> }
+rule expr-pause-after { :i <time> || <percentage>  }
 #| pause-before: <time> | <percentage>
 rule decl:sym<pause-before> { :i ("pause-before") ":" <val(/<expr=.expr-pause-before> /, &?ROUTINE.WHY)> }
-rule expr-pause-before { :i <time> || <percentage> }
+rule expr-pause-before { :i <time> || <percentage>  }
 #| pitch-range: <number>
 rule decl:sym<pitch-range> { :i ("pitch-range") ":" <val(/<expr=.expr-pitch-range> /, &?ROUTINE.WHY)> }
 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><!{
-  @S[0]++
+rule expr-play-during { :i <uri> [[:my @S;  mix & <keyw><!{
+    @S[0]++
 }>| repeat & <keyw><!{
-  @S[1]++
-}>]+]? || [auto | none ]& <keyw> }
+    @S[1]++
+}>]+]?  || [auto | none ]& <keyw>  }
 #| richness: <number>
 rule decl:sym<richness> { :i (richness) ":" <val(/<expr=.expr-richness> /, &?ROUTINE.WHY)> }
 rule expr-richness { :i <number> }
@@ -61,7 +61,7 @@ rule decl:sym<speak-punctuation> { :i ("speak-punctuation") ":" <val(/<expr=.exp
 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> }
@@ -71,22 +71,22 @@ rule expr-voice-family { :i [<generic-voice> || <specific-voice> ]+% <op(",")> }
 #| male | female | child
 rule generic-voice { :i [male | female | child ]& <keyw> }
 #| <identifier> | <string>
-rule specific-voice { :i <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> /, &?ROUTINE.WHY)> }
 rule expr-border-color { :i [<color> || transparent & <keyw> ]** 1..4 }
 #| 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>  }

Original file line number	Diff line number	Diff line change
`@@ -285,5 +285,5 @@ method build-grammar(@grammar-id) {`
`285`	`285`	`:$name,`
`286`	`286`	`:scope<unit>,`
`287`	`287`	`:$body,`
`288`		`- ).&expression.&statements;`
	`288`	`+ );`
`289`	`289`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ method any-function($/) {`
`46`	`46`
`47`	`47`	`multi method declaration($/ where $<any-declaration>) {`
`48`	`48`	`with $<any-declaration>.ast -> $ast {`
`49`		`- my ($key, $value) = $ast.kv;`
	`49`	`+ my :($key, $value) := $ast.kv;`
`50`	`50`	`if $.lax {`
`51`	`51`	`make $key => $value;`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-unit class Test::CSS::Aural::Spec::Actions;`
	`1`	`+unit class Test::CSS::Aural::Spec::ActionsAST;`