[CSS22] Updated for errata s.4.1.1e, about parsing at-rules in declaration lists.

Author: bert-github

css2/syndata.src

@@ -149,7 +149,10 @@ stylesheet  : [ CDO | CDC | S | statement ]*;
 statement   : ruleset | at-rule;
 at-rule     : ATKEYWORD S* any* [ block | ';' S* ];
 block       : '{' S* [ any | block | ATKEYWORD S* | ';' S* ]* '}' S*;
-ruleset     : selector? '{' S* declaration? [ ';' S* declaration? ]* '}' S*;
+ruleset     : selector? '{' S* declaration-list '}' S*;
+declaration-list: declaration [ ';' S* declaration-list ]?
+              | at-rule declaration-list
+              | /* empty */;
 selector    : any+;
 declaration : property S* ':' S* value;
 property    : IDENT;
@@ -475,8 +478,12 @@ a declaration block.
 title="declaration block"><dfn>declaration block</dfn></span>
 starts with a left curly
 brace ({) and ends with the matching right curly brace (}). In between
-there must be a list of zero or more semicolon-separated (;)
-declarations.
+there must be a list of zero or more declarations and at-rules.
+Declarations must end with a semicolon (;) unless they are last in the
+list.
+</p>
+<p class=note>Note: CSS level&nbsp;2 has no at-rules that may appear
+inside rule sets, but such at-rules may be defined in future levels.
 </p>
 <p>The <span class="index-def"
 title="selector"><em>selector</em></span> (see also the section on <a
@@ -689,11 +696,20 @@ unexpected tokens encountered while parsing a declaration by reading
 until the end of the declaration, while observing the rules for matching
 pairs of (), [], {}, "", and '', and correctly handling escapes. For
 example, a malformed declaration may be missing a property name, colon (:), or
-property value. The following are all equivalent:
+property value.
+
+<p>When the UA expects the start of a declaration or at-rule (i.e., an
+IDENT token or an ATKEYWORD token) but finds an unexpected token
+instead, that token is considered to be the first token of a malformed
+declaration. I.e., the rule for malformed declarations, rather than
+malformed statements is used to determine which tokens to ignore in
+that case.
 
+<p>The following are all equivalent:
 
 <pre class="example"><code>
 p { color:green }
+p { @foo { bar: baz } color:green }  /* unknown at-rule */
 p { color:green; color }  /* malformed declaration missing ':', value */
 p { color:red;   color; color:green }  /* same with expected recovery */
 p { color:green; color: } /* malformed declaration missing value */