Handle quantization of box properties

Author: dwarring

lib/CSS/Specification/Compiler/Grammars.rakumod

@@ -20,8 +20,17 @@ sub rule(RakuAST::Name:D :$name!, RakuAST::Regex:D :$body!) {
         )
 }
 
-sub property-decl(Str:D $prop-name) {
+sub property-decl(Str:D $prop-name, :$quant) {
     my RakuAST::Name $name = "decl:sym<$prop-name>".&name;
+    my RakuAST::Regex $regex-body = RakuAST::Regex::Assertion::Alias.new(
+        name      => "expr",
+        assertion => ("expr-" ~ $prop-name).&assertion(:!capturing),
+    );
+    if $quant ~~ Array:D {
+        my RakuAST::Regex::Quantifier $quantifier = quant($quant);
+        $regex-body = RakuAST::Regex::QuantifiedAtom.new: :atom($regex-body), :$quantifier;
+    }
+
     rule(
       :$name,
       body => seq (
@@ -40,10 +49,7 @@ sub property-decl(Str:D $prop-name) {
             name      => 'val'.&name,
             args      => RakuAST::ArgList.new(
                 RakuAST::QuotedRegex.new(
-                    body => RakuAST::Regex::Assertion::Alias.new(
-                        name      => "expr",
-                        assertion => ("expr-" ~ $prop-name).&assertion(:!capturing),
-                    ).&ws,
+                    body => $regex-body.&ws,
                 ),
                 RakuAST::Var::Compiler::Routine.new.&postfix('WHY'.&call),
             ),
@@ -53,7 +59,11 @@ sub property-decl(Str:D $prop-name) {
     );
 }
 
-multi sub compile(:@props!, :$default, :$spec!, Str :$synopsis!, Bool :$inherit = True) {
+multi sub compile(:@props!, :$default, Pair :$spec! is copy, Str :$synopsis!, Bool :$inherit = True) {
+    my $quant;
+    if $spec.key eq 'occurs' && $spec.value.head ~~ [1,4]  {
+        ($quant, $spec) = $spec.value.List;
+    }
     my RakuAST::Regex $body = $spec.&compile;
     $body = ('i'.&modifier,  $body.&ws, ).&seq;
 
@@ -64,10 +74,10 @@ multi sub compile(:@props!, :$default, :$spec!, Str :$synopsis!, Bool :$inherit
 
     for @props -> $prop {
         @exprs.append: (
-        $prop.&property-decl.declarator-docs(
+        $prop.&property-decl(:$quant).declarator-docs(
             :$leading
         ).&expression,
-        rule(name => ('expr-' ~ $prop).&name, :$body).&expression,
+       rule(name => ('expr-' ~ $prop).&name, :$body).&expression,
     )
     }
     @exprs;
@@ -274,6 +284,7 @@ multi sub compile(:@combo!, Bool :$required) {
     RakuAST::Regex::QuantifiedAtom.new: :$atom, :$quantifier;
 }
 
+
 multi sub compile($arg) { compile |$arg }
 
 method build-grammar(@grammar-id) {

t/00compile.t

@@ -115,6 +115,21 @@ for (
         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' => {
+        input => join("\t", 'border-color','<color>{1,4}', 'transparent'),
+        ast => {
+            :props['border-color'],
+            :default<transparent>,
+            :synopsis('<color>{1,4}'),
+            :spec(:occurs[[1, 4], :rule<color>]),
+        },
+        rule-refs => ['color'],
+        deparse => join("\n",
+                        '#| border-color: <color>{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> }',
+                       ''),
+    },
    'property-spec' => {
         input => "'min-width'\t<length> | <percentage> | inherit\t0",
         ast => {

t/lib/Test/CSS/Aural/Spec/Grammar.rakumod

@@ -76,8 +76,8 @@ rule specific-voice { :i <identifier> || <string>  }
 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>  }
 #| 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 }
+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> ] }
 #| 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>  }