Add a more abstract 'consume a primitive' function and collapse all the places where I differentiated between blocks, functions, and tokens to just use this new function.

--HG--
extra : rebase_source : a5404c95777809ac212fc23391c1f2fabe354301

Author: tabatkins

css3-syntax/Overview.html

@@ -305,14 +305,17 @@ <h2 class="no-num no-toc" id=contents> Table of contents</h2>
        <li><a href="#next-block-or-statement-error-mode"><span
         class=secno>3.6.12. </span> Next-block-or-statement error mode</a>
 
-       <li><a href="#consume-a-simple-block"><span class=secno>3.6.13.
+       <li><a href="#consume-a-primitive-"><span class=secno>3.6.13. </span>
+        Consume a primitive </a>
+
+       <li><a href="#consume-a-simple-block"><span class=secno>3.6.14.
         </span> Consume a simple block</a>
 
-       <li><a href="#consume-a-function"><span class=secno>3.6.14. </span>
+       <li><a href="#consume-a-function"><span class=secno>3.6.15. </span>
         Consume a function</a>
 
        <li><a href="#switch-to-the-current-rules-content-mode"><span
-        class=secno>3.6.15. </span> Switch to the current rule's content
+        class=secno>3.6.16. </span> Switch to the current rule's content
         mode</a>
       </ul>
 
@@ -2194,9 +2197,8 @@ <h4 id=top-level-mode-><span class=secno>3.6.2. </span> <dfn
    <dt>{ token
 
    <dd> This is a <i>parse error</i>. <a
-    href="#consume-a-simple-block0"><i>Consume a simple block</i></a> with
-    the <a href="#current-input-token"><i>current input token</i></a>. Ignore
-    the return value. Remain in this state.
+    href="#consume-a-primitive"><i>Consume a primitive</i></a> and ignore the
+    return value. Remain in this state.
 
    <dt>anything else
 
@@ -2234,27 +2236,11 @@ <h4 id=at-rule-mode><span class=secno>3.6.3. </span> <dfn
      Reconsume the <a href="#current-input-token"><i>current input
      token</i></a>.
 
-   <dt>[ token
-
-   <dt>( token
-
-   <dd> <a href="#consume-a-simple-block0"><i>Consume a simple block</i></a>
-    with the <a href="#current-input-token"><i>current input token</i></a>.
-    Append the returned block to the prelude of the <a
-    href="#current-rule"><i>current rule</i></a> and remain in this mode.
-
-   <dt>function token
-
-   <dd> <a href="#consume-a-function0"><i>Consume a function</i></a> with the
-    <a href="#current-input-token"><i>current input token</i></a>. Append the
-    returned function to the prelude of the <a
-    href="#current-rule"><i>current rule</i></a> and remain in this mode.
-
    <dt>anything else
 
-   <dd> Append the <a href="#current-input-token"><i>current input
-    token</i></a> to the prelude of the <a href="#current-rule"><i>current
-    rule</i></a> and remain in this mode.
+   <dd> <a href="#consume-a-primitive"><i>Consume a primitive</i></a> and
+    append the returned value to the prelude of the <a
+    href="#current-rule"><i>current rule</i></a>. Remain in this mode.
   </dl>
 
   <h4 id=rule-mode><span class=secno>3.6.4. </span> <dfn id=rule-mode0>Rule
@@ -2304,25 +2290,10 @@ <h4 id=selector-mode><span class=secno>3.6.5. </span> <dfn
    <dd> Switch to the <a href="#declaration-mode0"><i>declaration
     mode</i></a>.
 
-   <dt>[ token
-
-   <dt>( token
-
-   <dd> <a href="#consume-a-simple-block0"><i>Consume a simple block</i></a>
-    with the <a href="#current-input-token"><i>current input token</i></a>.
-    Append the returned block to the selector of the <a
-    href="#current-rule"><i>current rule</i></a> and remain in this mode.
-
-   <dt>function token
-
-   <dd> <a href="#consume-a-function0"><i>Consume a function</i></a> with the
-    <a href="#current-input-token"><i>current input token</i></a>. Append the
-    returned function to the selector of the <a
-    href="#current-rule"><i>current rule</i></a> and remain in this mode.
-
    <dt>anything else
 
-   <dd> Append the token to the selector of the <a
+   <dd> <a href="#consume-a-primitive"><i>Consume a primitive</i></a> and
+    append the returned value to the selector of the <a
     href="#current-rule"><i>current rule</i></a>. Remain in this mode.
   </dl>
 
@@ -2403,26 +2374,6 @@ <h4 id=declaration-value-mode><span class=secno>3.6.8. </span> <dfn
   <p> Consume the <a href="#next-input-token"><i>next input token</i></a>.
 
   <dl>
-   <dt>{ token
-
-   <dt>[ token
-
-   <dt>( token
-
-   <dd> <a href="#consume-a-simple-block0"><i>Consume a simple block</i></a>
-    with the <a href="#current-input-token"><i>current input token</i></a>.
-    Append the returned block to the value of the <a
-    href="#current-declaration"><i>current declaration</i></a> and remain in
-    this mode.
-
-   <dt>function token
-
-   <dd> <a href="#consume-a-function0"><i>Consume a function</i></a> with the
-    <a href="#current-input-token"><i>current input token</i></a>. Append the
-    returned function to the value of the <a
-    href="#current-declaration"><i>current declaration</i></a>. and remain in
-    this mode.
-
    <dt>delim token with a value of "!"
 
    <dd> If the <a href="#next-input-token"><i>next input token</i></a> is an
@@ -2455,8 +2406,8 @@ <h4 id=declaration-value-mode><span class=secno>3.6.8. </span> <dfn
 
    <dt>anything else
 
-   <dd> Append the <a href="#current-input-token"><i>current input
-    token</i></a> to the value of the <a
+   <dd> <a href="#consume-a-primitive"><i>Consume a primitive</i></a> and
+    append the returned value to the value of the <a
     href="#current-declaration"><i>current declaration</i></a>. Remain in
     this mode.
   </dl>
@@ -2511,29 +2462,15 @@ <h4 id=next-block-error-mode><span class=secno>3.6.10. </span> <dfn
   <dl>
    <dt>{ token
 
-   <dd> <a href="#consume-a-simple-block0"><i>Consume a simple block</i></a>
-    with the <a href="#current-input-token"><i>current input token</i></a>.
-    Ignore the return value. <a
+   <dd> <a href="#consume-a-primitive"><i>Consume a primitive</i></a>. Ignore
+    the return value. <a
     href="#switch-to-the-current-rules-content-mode0"><i>Switch to the
     current rule's content mode</i></a>.
 
-   <dt>[ token
-
-   <dt>( token
-
-   <dd> <a href="#consume-a-simple-block0"><i>Consume a simple block</i></a>
-    with the <a href="#current-input-token"><i>current input token</i></a>.
-    Ignore the return value. Remain in this mode.
-
-   <dt>function token
-
-   <dd> <a href="#consume-a-function0"><i>Consume a function</i></a> with the
-    <a href="#current-input-token"><i>current input token</i></a>. Ignore the
-    return value. Remain in this mode.
-
    <dt>anything else
 
-   <dd> Do nothing. Remain in this mode.
+   <dd> <a href="#consume-a-primitive"><i>Consume a primitive</i></a>. Ignore
+    the return value. Remain in this mode.
   </dl>
 
   <h4 id=next-declaration-error-mode><span class=secno>3.6.11. </span> <dfn
@@ -2553,25 +2490,10 @@ <h4 id=next-declaration-error-mode><span class=secno>3.6.11. </span> <dfn
     mode</i></a>. Reprocess the <a href="#current-input-token"><i>current
     input token</i></a>.
 
-   <dt>{ token
-
-   <dt>[ token
-
-   <dt>( token
-
-   <dd> <a href="#consume-a-simple-block0"><i>Consume a simple block</i></a>
-    with the <a href="#current-input-token"><i>current input token</i></a>.
-    Ignore the return value. Remain in this mode.
-
-   <dt>function token
-
-   <dd> <a href="#consume-a-function0"><i>Consume a function</i></a> with the
-    <a href="#current-input-token"><i>current input token</i></a>. Ignore the
-    return value. Remain in this mode.
-
    <dt>anything else
 
-   <dd> Do nothing. Remain in this mode.
+   <dd> <a href="#consume-a-primitive"><i>Consume a primitive</i></a>. Ignore
+    the return value. Remain in this mode.
   </dl>
 
   <h4 id=next-block-or-statement-error-mode><span class=secno>3.6.12. </span>
@@ -2589,45 +2511,48 @@ <h4 id=next-block-or-statement-error-mode><span class=secno>3.6.12. </span>
 
    <dt>{ token
 
-   <dd> <a href="#consume-a-simple-block0"><i>Consume a simple block</i></a>
-    with the <a href="#current-input-token"><i>current input token</i></a>.
-    Ignore the return value. <a
+   <dd> <a href="#consume-a-primitive"><i>Consume a primitive</i></a>. Ignore
+    the return value. <a
     href="#switch-to-the-current-rules-content-mode0"><i>Switch to the
     current rule's content mode</i></a>.
 
-   <dt>[ token
+   <dt>anything else
 
-   <dt>( token
+   <dd> <a href="#consume-a-primitive"><i>Consume a primitive</i></a>. Ignore
+    the return value. Remain in this mode.
+  </dl>
 
-   <dd> <a href="#consume-a-simple-block0"><i>Consume a simple block</i></a>
-    with the <a href="#current-input-token"><i>current input token</i></a>.
-    Ignore the return value. Remain in this mode.
+  <h4 id=consume-a-primitive-><span class=secno>3.6.13. </span> <dfn
+   id=consume-a-primitive>Consume a primitive</dfn></h4>
 
-   <dt>function token
+  <p> This section describes how to <a href="#consume-a-primitive"><i>consume
+   a primitive</i></a>.
 
-   <dd> <a href="#consume-a-function0"><i>Consume a function</i></a> with the
-    <a href="#current-input-token"><i>current input token</i></a>. Ignore the
-    return value. Remain in this mode.
+  <p> If the <a href="#current-input-token"><i>current input token</i></a> is
+   a {, [, or ( token, <a href="#consume-a-simple-block0"><i>consume a simple
+   block</i></a> and return it.
 
-   <dt>anything else
+  <p> Otherwise, if the <a href="#current-input-token"><i>current input
+   token</i></a> is a function token, <a
+   href="#consume-a-function0"><i>consume a function</i></a> and return it.
 
-   <dd> Do nothing. Remain in this mode.
-  </dl>
+  <p> Otherwise, return the <a href="#current-input-token"><i>current input
+   token</i></a>.
 
-  <h4 id=consume-a-simple-block><span class=secno>3.6.13. </span> <dfn
+  <h4 id=consume-a-simple-block><span class=secno>3.6.14. </span> <dfn
    id=consume-a-simple-block0>Consume a simple block</dfn></h4>
 
   <p> This section describes how to <a
-   href="#consume-a-simple-block0"><i>consume a simple block</i></a>. It must
-   be called with an {, [, or ( token.
+   href="#consume-a-simple-block0"><i>consume a simple block</i></a>.
 
   <p> The <dfn id=ending-token>ending token</dfn> is the mirror variant of
-   the token this algorithm was called with. (E.g. if it was called with [,
-   the <a href="#ending-token"><i>ending token</i></a> is ].)
+   the <a href="#current-input-token"><i>current input token</i></a>. (E.g.
+   if it was called with [, the <a href="#ending-token"><i>ending
+   token</i></a> is ].)
 
-  <p> Create a simple block with its associated token set to the token this
-   algorithm was called with. This is the <dfn id=current-block>current
-   block</dfn>.
+  <p> Create a simple block with its associated token set to the <a
+   href="#current-input-token"><i>current input token</i></a>. This is the
+   <dfn id=current-block>current block</dfn>.
 
   <p> Repeatedly consume the <a href="#next-input-token"><i>next input
    token</i></a> and process it as follows:
@@ -2639,32 +2564,14 @@ <h4 id=consume-a-simple-block><span class=secno>3.6.13. </span> <dfn
 
    <dd> Return the block.
 
-   <dt>{ token
-
-   <dt>[ token
-
-   <dt>( token
-
-   <dd> <a href="#consume-a-simple-block0"><i>Consume a simple block</i></a>
-    with the <a href="#current-input-token"><i>current input token</i></a>.
-    Append the returned block to the value of the <a
-    href="#current-block"><i>current block</i></a>.
-
-   <dt>function token
-
-   <dd> <a href="#consume-a-function0"><i>Consume a function</i></a> with the
-    <a href="#current-input-token"><i>current input token</i></a>. Append the
-    returned function to the value of the <a href="#current-block"><i>current
-    block</i></a>.
-
    <dt>anything else
 
-   <dd> Append the <a href="#current-input-token"><i>current input
-    token</i></a> to the value of the <a href="#current-block"><i>current
-    block</i></a>.
+   <dd> <a href="#consume-a-primitive"><i>Consume a primitive</i></a> and
+    append the returned value to the value of the <a
+    href="#current-block"><i>current block</i></a>.
   </dl>
 
-  <h4 id=consume-a-function><span class=secno>3.6.14. </span> <dfn
+  <h4 id=consume-a-function><span class=secno>3.6.15. </span> <dfn
    id=consume-a-function0>Consume a function</dfn></h4>
 
   <p> This section describes how to <a href="#consume-a-function0"><i>consume
@@ -2690,29 +2597,13 @@ <h4 id=consume-a-function><span class=secno>3.6.14. </span> <dfn
    <dd> Append the <i>current argument</i> to the function's argument list.
     Create a new <i>current argument</i> which is initially empty.
 
-   <dt>{ token
-
-   <dt>[ token
-
-   <dt>( token
-
-   <dd> <a href="#consume-a-simple-block0"><i>Consume a simple block</i></a>
-    with the <a href="#current-input-token"><i>current input token</i></a>.
-    Append the returned block to the value of the <i>current argument</i>.
-
-   <dt>function token
-
-   <dd> <a href="#consume-a-function0"><i>Consume a function</i></a> with the
-    <a href="#current-input-token"><i>current input token</i></a>. Append the
-    returned function to the value of the <i>current argument</i>.
-
    <dt>anything else
 
-   <dd> Append the <a href="#current-input-token"><i>current input
-    token</i></a> to the value of the <i>current argument</i>.
+   <dd> <a href="#consume-a-primitive"><i>Consume a primitive</i></a> and
+    append the returned value to the value of the <i>current argument</i>.
   </dl>
 
-  <h4 id=switch-to-the-current-rules-content-mode><span class=secno>3.6.15.
+  <h4 id=switch-to-the-current-rules-content-mode><span class=secno>3.6.16.
    </span> <dfn id=switch-to-the-current-rules-content-mode0>Switch to the
    current rule's content mode</dfn></h4>
 
@@ -3029,16 +2920,19 @@ <h2 class=no-num id=index> Index</h2>
     title="Comment state"><strong>3.4.8.</strong></a>
 
    <li>Consume a function, <a href="#consume-a-function0"
-    title="Consume a function"><strong>3.6.14.</strong></a>
+    title="Consume a function"><strong>3.6.15.</strong></a>
 
    <li>Consume an escaped character, <a href="#consume-an-escaped-character0"
     title="Consume an escaped character"><strong>3.4.26.</strong></a>
 
+   <li>Consume a primitive, <a href="#consume-a-primitive"
+    title="Consume a primitive"><strong>3.6.13.</strong></a>
+
    <li>Consume a simple block, <a href="#consume-a-simple-block0"
-    title="Consume a simple block"><strong>3.6.13.</strong></a>
+    title="Consume a simple block"><strong>3.6.14.</strong></a>
 
    <li>current block, <a href="#current-block"
-    title="current block"><strong>3.6.13.</strong></a>
+    title="current block"><strong>3.6.14.</strong></a>
 
    <li>current declaration, <a href="#current-declaration"
     title="current declaration"><strong>3.6.1.</strong></a>
@@ -3076,7 +2970,7 @@ <h2 class=no-num id=index> Index</h2>
     title="Double-quote-string state"><strong>3.4.4.</strong></a>
 
    <li>ending token, <a href="#ending-token"
-    title="ending token"><strong>3.6.13.</strong></a>
+    title="ending token"><strong>3.6.14.</strong></a>
 
    <li>end of the range, <a href="#end-of-the-range"
     title="end of the range"><strong>3.4.27.</strong></a>
@@ -3184,7 +3078,7 @@ <h2 class=no-num id=index> Index</h2>
 
    <li>Switch to the current rule's content mode, <a
     href="#switch-to-the-current-rules-content-mode0"
-    title="Switch to the current rule's content mode"><strong>3.6.15.</strong></a>
+    title="Switch to the current rule's content mode"><strong>3.6.16.</strong></a>
 
 
    <li>Top-level mode, <a href="#top-level-mode"