revised expressions and func-specs

Author: dwarring

lib/CSS/Specification/Actions.rakumod

@@ -7,6 +7,7 @@ use Method::Also;
 has %.rules is rw;
 has %.rule-refs is rw;
 has %.funcs is rw;
+has %.protos is rw;
 has %.func-refs is rw;
 has %.props is rw;
 has %.child-props is rw;
@@ -57,26 +58,27 @@ method func-spec($/) {
     my $func = $<func-ref>.ast,
     my $proto = $<func-proto>.ast<proto>;
     my $synopsis = ~$<func-proto>;
-    my $spec = $proto<signature>;
+    my $signature = $proto<signature>;
 
-    my %func-def = (
-        :$func, :$synopsis, :$spec
+    my %func-spec = (
+        :$func, :$signature, :$synopsis,
         );
 
-    make %func-def;
+    %!funcs{$func}++;
+    make (:%func-spec);
 }
 
 method func-proto($/) {
     my $synopsis = $/.trim;
     my $func = $<id>.ast;
     my %proto = :$func, :$synopsis;
     %proto<signature> = .ast with $<signature>;
-    with %!funcs{$func} {
-       warn "inconsistant function declaration: {$synopsis.raku} vs {.<proto><synopsis>.raku}"
-           unless .<proto><signature> eqv %proto<signature>;
+    with %!protos{$func} {
+       warn "inconsistant function declaration: {$synopsis.raku} vs {.<synopsis>.raku}"
+           unless .<signature> eqv %proto<signature>;
     }
     else {
-        $_ = :%proto;
+        $_ = %proto;
     }
 
     make (:%proto);
@@ -202,7 +204,7 @@ method property-ref:sym<css3>($/) { make 'ref' => $<id>.ast }
 method value:sym<prop-ref>($/)        {
     my Pair $prop-ref = $<property-ref>.ast;
     my $prop =  $prop-ref.value;
-    my $rule = 'val-' ~ $prop;;
+    my $rule = 'prop-val-' ~ $prop;;
     %!rule-refs{ $rule }++;
     %!child-props{$_}.push: $prop for @*PROP-NAMES;
     make (:$rule);

t/00basic.t

@@ -37,16 +37,16 @@ for (
         ast => :rule<rule-ref>,
     },
     'values' => {
-        input => "<rule-ref> [ 'css21-prop-ref' <'css3-prop-ref'> ]?",
+        input => "<rule-ref> [ 'css21-prop' <'css3-prop'> ]?",
         ast => :seq[ :rule<rule-ref>,
-                     :occurs['?', :group(:seq[:rule<val-css21-prop-ref>, :rule<val-css3-prop-ref>]) ]
+                     :occurs['?', :group(:seq[:rule<prop-val-css21-prop>, :rule<prop-val-css3-prop>]) ]
                    ],
     },
     'values' => {
-        input => "<rule-ref> [, [ 'css21-prop-ref' | <'css3-prop-ref'> ] ]*",
+        input => "<rule-ref> [, [ 'css21-prop' | <'css3-prop'> ] ]*",
         ast => :seq[ :rule<rule-ref>,
                      :occurs['*',
-                             :group(:seq[:op<,>, :group(:alt[:rule<val-css21-prop-ref>, :rule<val-css3-prop-ref>]) ])
+                             :group(:seq[:op<,>, :group(:alt[:rule<prop-val-css21-prop>, :rule<prop-val-css3-prop>]) ])
                             ],
                    ]
     },
@@ -86,7 +86,7 @@ for (
     },
     'func-spec' => {
         input => '<linear-gradient()> = linear-gradient( [ <linear-gradient-syntax> ] )',
-        ast => {:func<linear-gradient>, :spec(:group(:rule<linear-gradient-syntax>)), :synopsis("linear-gradient( [ <linear-gradient-syntax> ] )")}
+        ast => :func-spec{:func<linear-gradient>, :signature(:group(:rule<linear-gradient-syntax>)), :synopsis("linear-gradient( [ <linear-gradient-syntax> ] )")}
     },
    'values' => {
         input => '[ <length-percentage [0,∞]> | auto ]{1,2} | cover | contain',