Handle the two different kinds of at-rules. Generalize the declaration mode to accept at-rules as well, so I can just reuse it for rule-filled at-rule contents (and so that future stuff that wants to put at-rules inside of style rules will Just Work).

tabatkins · tabatkins · commit 1a2fbc5d292a · 2012-06-13T17:40:27.000-07:00
diff --git a/css3-syntax/Overview.html b/css3-syntax/Overview.html
@@ -281,8 +281,8 @@ <h2 class="no-num no-toc" id=contents> Table of contents</h2>
        <li><a href="#at-rule-mode"><span class=secno>3.6.4. </span> At-rule
         mode</a>
 
-       <li><a href="#at-rule-block-mode"><span class=secno>3.6.5. </span>
-        At-rule-block mode</a>
+       <li><a href="#rule-mode"><span class=secno>3.6.5. </span> Rule
+        mode</a>
 
        <li><a href="#style-rule-mode"><span class=secno>3.6.6. </span>
         Style-rule mode</a>
@@ -2101,6 +2101,23 @@ <h4 id=definitions0><span class=secno>3.6.2. </span> Definitions</h4>
 
    <dd> The declaration currently being built. There may or may not be a
     current declaration at any given time, but there is never more than one.
+
+   <dt><dfn id=rule-filled>rule-filled</dfn>
+
+   <dd> An at-rule that takes a block, and within that block accepts at-rules
+    and/or style rules (or a close variant of style rules, like a keyframe
+    rule), is called <a href="#rule-filled"><i>rule-filled</i></a>. Examples
+    of <a href="#rule-filled"><i>rule-filled</i></a> at-rules are ‘<code
+    class=css>@media</code>’ and ‘<code class=css>@keyframes</code>’.
+
+   <dt><dfn id=declaration-filled>declaration-filled</dfn>
+
+   <dd> An at-rule that takes a block, and within that block accepts at-rules
+    and/or declarations, is called <a
+    href="#declaration-filled"><i>declaration-filled</i></a>. Examples of <a
+    href="#declaration-filled"><i>declaration-filled</i></a> at-rules are
+    ‘<code class=css>@font-face</code>’ and ‘<code
+    class=css>@page</code>’.
   </dl>
 
   <h4 id=top-level-mode-><span class=secno>3.6.3. </span> <dfn
@@ -2119,7 +2136,7 @@ <h4 id=top-level-mode-><span class=secno>3.6.3. </span> <dfn
 
    <dt>at-keyword token
 
-   <dd> <i>Create an at-rule</i> with its name set to the value of the <a
+   <dd> Create an at-rule with its name set to the value of the <a
     href="#current-input-token"><i>current input token</i></a> and push it
     onto the <a href="#stack-of-open-rules"><i>stack of open rules</i></a>.
     Switch to the <a href="#at-rule-mode0"><i>at-rule mode</i></a>.
@@ -2155,8 +2172,15 @@ <h4 id=at-rule-mode><span class=secno>3.6.4. </span> <dfn
 
    <dt><span class=temp>{</span> token
 
-   <dd> Switch to the <a href="#at-rule-block-mode0"><i>at-rule-block
-    mode</i></a>.
+   <dd> If the <a href="#current-rule"><i>current rule</i></a> is <a
+    href="#rule-filled"><i>rule-filled</i></a>, switch to the <a
+    href="#rule-mode0"><i>rule mode</i></a>.
+    <p> Otherwise, if the <a href="#current-rule"><i>current rule</i></a> is
+     <a href="#declaration-filled"><i>declaration-filled</i></a>, switch to
+     the <a href="#declaration-mode0"><i>declaration mode</i></a>.
+
+    <p> Otherwise, this is a <i>parse error</i>. Switch to the
+     <i>next-statement error mode</i>.
 
    <dt><span class=temp>[</span> token
 
@@ -2181,23 +2205,18 @@ <h4 id=at-rule-mode><span class=secno>3.6.4. </span> <dfn
     rule</i></a> and remain in this mode.
   </dl>
 
-  <h4 id=at-rule-block-mode><span class=secno>3.6.5. </span> <dfn
-   id=at-rule-block-mode0>At-rule-block mode</dfn></h4>
+  <h4 id=rule-mode><span class=secno>3.6.5. </span> <dfn id=rule-mode0>Rule
+   mode</dfn></h4>
 
   <p>Consume the <a href="#next-input-token"><i>next input token</i></a>.
 
   <dl>
-   <dt>cdo token
-
-   <dt>cdc token
-
    <dt>bad-string token
 
    <dt>bad-url token
 
    <dd> This is a <i>parse error</i>. Switch to the <a
-    href="#next-block-or-statement-error-mode0"><i>next-block-or-statement
-    error mode</i></a>.
+    href="#next-block-error-mode0"><i>next-block error mode</i></a>.
 
    <dt><span class=temp>}</span> token
 
@@ -2210,18 +2229,18 @@ <h4 id=at-rule-block-mode><span class=secno>3.6.5. </span> <dfn
 
    <dt>at-keyword token
 
-   <dd> <i>Create an at-rule</i> with its name set to the value of the <a
+   <dd> Create an at-rule with its name set to the value of the <a
     href="#current-input-token"><i>current input token</i></a> and push it
     onto the <a href="#stack-of-open-rules"><i>stack of open rules</i></a>.
     Switch to the <a href="#at-rule-mode0"><i>at-rule mode</i></a>.
-  </dl>
 
-  <p class=issue> Not done yet. Every at-rule allows more at-rules in its
-   body, but must choose whether it allows declarations or "style rules" in
-   its body (things with a selector). Need to decide whether I should just
-   specialize on that, or if I should fully specialize on the at-keyword
-   name, so that, for example, @keyframes goes down a special parser rule
-   that ends up accepting only keyframes.
+   <dt>anything else
+
+   <dd> <i>Create a style rule</i> and push it onto the <a
+    href="#stack-of-open-rules"><i>stack of open rules</i></a>. Switch to the
+    <a href="#style-rule-mode0"><i>style-rule mode</i></a>. Reprocess the <a
+    href="#current-input-token"><i>current input token</i></a>.
+  </dl>
 
   <h4 id=style-rule-mode><span class=secno>3.6.6. </span> <dfn
    id=style-rule-mode0>Style-rule mode</dfn></h4>
@@ -2277,6 +2296,13 @@ <h4 id=declaration-mode><span class=secno>3.6.7. </span> <dfn
     href="#switch-to-the-current-rules-content-mode0"><i>Switch to the
     current rule's content mode</i></a>.
 
+   <dt>at-rule token
+
+   <dd> Create an at-rule with its name set to the value of the <a
+    href="#current-input-token"><i>current input token</i></a> and push it
+    onto the <a href="#stack-of-open-rules"><i>stack of open rules</i></a>.
+    Switch to the <a href="#at-rule-mode0"><i>at-rule mode</i></a>.
+
    <dt>ident token
 
    <dd> Create a declaration with its name set to the value of the <a
@@ -2598,12 +2624,13 @@ <h4 id=switch-to-the-current-rules-content-mode><span class=secno>3.6.15.
    rule's content mode</i></a>. It is invoked whenever a declaration or rule
    has been successfully completed, or when an error has finished recovery.
 
-  <p> If the <a href="#current-rule"><i>current rule</i></a> is a style rule,
+  <p> If the <a href="#current-rule"><i>current rule</i></a> is a style rule
+   or a <a href="#declaration-filled"><i>declaration-filled</i></a> at-rule,
    switch to the <a href="#declaration-mode0"><i>declaration mode</i></a>.
 
-  <p> If the <a href="#current-rule"><i>current rule</i></a> is an at-rule,
-   switch to the <a href="#at-rule-block-mode0"><i>at-rule-block
-   mode</i></a>.
+  <p> If the <a href="#current-rule"><i>current rule</i></a> is a <a
+   href="#rule-filled"><i>rule-filled</i></a> at-rule, switch to the <a
+   href="#rule-mode0"><i>rule mode</i></a>.
 
   <p> If the <a href="#current-rule"><i>current rule</i></a> is a stylesheet,
    switch to the <a href="#top-level-mode"><i>top-level mode</i></a>.
@@ -2892,9 +2919,6 @@ <h2 class=no-num id=index> Index</h2>
 
    <li>at-rule, <a href="#at-rules" title=at-rule><strong>2.</strong></a>
 
-   <li>At-rule-block mode, <a href="#at-rule-block-mode0"
-    title="At-rule-block mode"><strong>3.6.5.</strong></a>
-
    <li>At-rule mode, <a href="#at-rule-mode0"
     title="At-rule mode"><strong>3.6.4.</strong></a>
 
@@ -2934,6 +2958,9 @@ <h2 class=no-num id=index> Index</h2>
    <li>Declaration-end mode, <a href="#declaration-end-mode0"
     title="Declaration-end mode"><strong>3.6.10.</strong></a>
 
+   <li>declaration-filled, <a href="#declaration-filled"
+    title=declaration-filled><strong>3.6.2.</strong></a>
+
    <li>Declaration mode, <a href="#declaration-mode0"
     title="Declaration mode"><strong>3.6.7.</strong></a>
 
@@ -3021,6 +3048,12 @@ <h2 class=no-num id=index> Index</h2>
 
    <li>rule, <a href="#rule" title=rule><strong>2.</strong></a>
 
+   <li>rule-filled, <a href="#rule-filled"
+    title=rule-filled><strong>3.6.2.</strong></a>
+
+   <li>Rule mode, <a href="#rule-mode0"
+    title="Rule mode"><strong>3.6.5.</strong></a>
+
    <li>Sci-notation state, <a href="#sci-notation-state0"
     title="Sci-notation state"><strong>3.4.18.</strong></a>
 
diff --git a/css3-syntax/Overview.src.html b/css3-syntax/Overview.src.html
@@ -2097,6 +2097,21 @@ <h4>
 			The declaration currently being built.
 			There may or may not be a current declaration at any given time,
 			but there is never more than one.
+
+		<dt><dfn>rule-filled</dfn>
+		<dd>
+			An at-rule that takes a block,
+			and within that block accepts at-rules and/or style rules 
+			(or a close variant of style rules, like a keyframe rule),
+			is called <i>rule-filled</i>.
+			Examples of <i>rule-filled</i> at-rules are ''@media'' and ''@keyframes''.
+
+		<dt><dfn>declaration-filled</dfn>
+		<dd>
+			An at-rule that takes a block,
+			and within that block accepts at-rules and/or declarations,
+			is called <i>declaration-filled</i>.
+			Examples of <i>declaration-filled</i> at-rules are ''@font-face'' and ''@page''.
 	</dl>
 
 <h4>
@@ -2115,7 +2130,7 @@ <h4>
 
 		<dt>at-keyword token
 		<dd>
-			<i>Create an at-rule</i>
+			Create an at-rule
 			with its name set to the value of the <i>current input token</i>
 			and push it onto the <i>stack of open rules</i>.
 			Switch to the <i>at-rule mode</i>.
@@ -2150,7 +2165,17 @@ <h4>
 
 		<dt><span class='temp'>{</span> token
 		<dd>
-			Switch to the <i>at-rule-block mode</i>.
+			If the <i>current rule</i> is <i>rule-filled</i>,
+			switch to the <i>rule mode</i>.
+
+			<p>
+				Otherwise,
+				if the <i>current rule</i> is <i>declaration-filled</i>,
+				switch to the <i>declaration mode</i>.
+
+			<p>
+				Otherwise, this is a <i>parse error</i>.
+				Switch to the <i>next-statement error mode</i>.
 
 		<dt><span class='temp'>[</span> token
 		<dt><span class='temp'>(</span> token
@@ -2174,18 +2199,16 @@ <h4>
 
 
 <h4>
-<dfn>At-rule-block mode</dfn></h4>
+<dfn>Rule mode</dfn></h4>
 
 	<p>Consume the <i>next input token</i>.
 
 	<dl>
-		<dt>cdo token
-		<dt>cdc token
 		<dt>bad-string token
 		<dt>bad-url token
 		<dd>
 			This is a <i>parse error</i>.
-			Switch to the <i>next-block-or-statement error mode</i>.
+			Switch to the <i>next-block error mode</i>.
 		
 		<dt><span class='temp'>}</span> token
 		<dd>
@@ -2195,21 +2218,19 @@ <h4>
 
 		<dt>at-keyword token
 		<dd>
-			<i>Create an at-rule</i>
+			Create an at-rule
 			with its name set to the value of the <i>current input token</i>
 			and push it onto the <i>stack of open rules</i>.
 			Switch to the <i>at-rule mode</i>.
 
-	</dl>
+		<dt>anything else
+		<dd>
+			<i>Create a style rule</i>
+			and push it onto the <i>stack of open rules</i>.
+			Switch to the <i>style-rule mode</i>.
+			Reprocess the <i>current input token</i>.
 
-	<p class='issue'>
-		Not done yet.
-		Every at-rule allows more at-rules in its body,
-		but must choose whether it allows declarations or "style rules" in its body (things with a selector).
-		Need to decide whether I should just specialize on that,
-		or if I should fully specialize on the at-keyword name,
-		so that, for example, @keyframes goes down a special parser rule
-		that ends up accepting only keyframes.
+	</dl>
 
 
 <h4>
@@ -2263,6 +2284,13 @@ <h4>
 			and append it to the list of rules for the new <i>current rule</i>.
 			<i>Switch to the current rule's content mode</i>.
 
+		<dt>at-rule token
+		<dd>
+			Create an at-rule
+			with its name set to the value of the <i>current input token</i>
+			and push it onto the <i>stack of open rules</i>.
+			Switch to the <i>at-rule mode</i>.
+
 		<dt>ident token
 		<dd>
 			Create a declaration
@@ -2571,12 +2599,12 @@ <h4>
 		or when an error has finished recovery.
 
 	<p>
-		If the <i>current rule</i> is a style rule,
+		If the <i>current rule</i> is a style rule or a <i>declaration-filled</i> at-rule,
 		switch to the <i>declaration mode</i>.
 
 	<p>
-		If the <i>current rule</i> is an at-rule,
-		switch to the <i>at-rule-block mode</i>.
+		If the <i>current rule</i> is a <i>rule-filled</i> at-rule,
+		switch to the <i>rule mode</i>.
 
 	<p>
 		If the <i>current rule</i> is a stylesheet,
