[css-syntax] More algo tweaks, including making 'consume a component value' start with a token consumption.

Author: tabatkins

css-syntax/Overview.html

@@ -2015,7 +2015,8 @@ <h4 id="parse-a-component-value" data-level="5.3.6"><span class="secno">5.3.6 </
 			return a syntax error.
 
 		</li><li>
-			<a data-autolink="link" href="#consume-a-component-value0">Consume a component value</a>.
+			<a data-autolink="link">Reconsume the current input token.
+			</a><a data-autolink="link" href="#consume-a-component-value0">Consume a component value</a>.
 			If nothing is returned,
 			return a syntax error.
 
@@ -2134,7 +2135,8 @@ <h4 id="consume-an-at-rule" data-level="5.4.2"><span class="secno">5.4.2 </span>
 
 		</dd><dt>anything else
 		</dt><dd>
-			<a data-autolink="link" href="#consume-a-component-value0">Consume a component value</a>.
+			<a data-autolink="link">Reconsume the current input token.
+			</a><a data-autolink="link" href="#consume-a-component-value0">Consume a component value</a>.
 			Append the returned value to the at-rule's prelude.
 	</dd></dl>
 
@@ -2171,7 +2173,8 @@ <h4 id="consume-a-qualified-rule" data-level="5.4.3"><span class="secno">5.4.3 <
 
 		</dd><dt>anything else
 		</dt><dd>
-			<a data-autolink="link" href="#consume-a-component-value0">Consume a component value</a>.
+			<a data-autolink="link">Reconsume the current input token.
+			</a><a data-autolink="link" href="#consume-a-component-value0">Consume a component value</a>.
 			Append the returned value to the qualified rule's prelude.
 	</dd></dl>
 
@@ -2201,17 +2204,18 @@ <h4 id="consume-a-list-of-declarations" data-level="5.4.4"><span class="secno">5
 		</dd><dt>&#9001;ident&#9002;
 		</dt><dd>
 			Initialize a temporary list initially filled with the <a data-autolink="link" href="#current-input-token">current input token</a>.
-			Repeatedly <a data-autolink="link" href="#consume-a-component-value0">consume a component value</a> from the <a data-autolink="link" href="#next-input-token">next input token</a>
-			until a &#9001;semicolon&#9002; or &#9001;EOF&#9002; is returned,
-			appending all of the returned values up to that point to the temporary list.
-			<a data-autolink="link" href="#consume-a-declaration0">Consume a declaration</a> from the temporary list.
+			<a data-autolink="link">Consume the next input token.
+			While the <a data-autolink="link" href="#current-input-token">current input token</a> is anything but a &#9001;semicolon&#9002; or &#9001;EOF&#9002;,
+			append it to the temporary list
+			and <a data-autolink="link" href="#consume-the-next-input-token">consume the next input token</a>.
+			</a><a data-autolink="link" href="#consume-a-declaration0">Consume a declaration</a> from the temporary list.
 			If anything was returned,
 			append it to the list of declarations.
 
 		</dd><dt>anything else
 		</dt><dd>
 			This is a <a data-autolink="link" href="#parse-errors">parse error</a>.
-			Repeatedly <a data-autolink="link" href="#consume-a-component-value0">consume a component value</a> from the <a data-autolink="link" href="#next-input-token">next input token</a>
+			Repeatedly <a data-autolink="link" href="#consume-a-component-value0">consume a component value</a>
 			until it is a &#9001;semicolon&#9002; or &#9001;EOF&#9002;.
 	</dd></dl>
 
@@ -2260,6 +2264,8 @@ <h4 id="consume-a-component-value" data-level="5.4.6"><span class="secno">5.4.6
 
 <p>	This section describes how to <a data-autolink="link" href="#consume-a-component-value0">consume a component value</a>.
 
+</p><p>	<a data-autolink="link" href="#consume-the-next-input-token">Consume the next input token</a>.
+
 </p><p>	If the <a data-autolink="link" href="#current-input-token">current input token</a>
 	is a &#9001;{&#9002;, &#9001;[&#9002;, or &#9001;(&#9002;,
 	<a data-autolink="link" href="#consume-a-simple-block0">consume a simple block</a>
@@ -2294,7 +2300,8 @@ <h4 id="consume-a-component-value" data-level="5.4.6"><span class="secno">5.4.6
 
 		</dd><dt>anything else
 		</dt><dd>
-			<a data-autolink="link" href="#consume-a-component-value0">Consume a component value</a>
+			<a data-autolink="link">Reconsume the current input token.
+			</a><a data-autolink="link" href="#consume-a-component-value0">Consume a component value</a>
 			and append it to the value of the block.
 	</dd></dl>
 
@@ -2317,7 +2324,8 @@ <h4 id="consume-a-function" data-level="5.4.8"><span class="secno">5.4.8 </span>
 
 		</dd><dt>anything else
 		</dt><dd>
-			<a data-autolink="link" href="#consume-a-component-value0">Consume a component value</a>
+			<a data-autolink="link">Reconsume the current input token.
+			</a><a data-autolink="link" href="#consume-a-component-value0">Consume a component value</a>
 			and append the returned value
 			to the function's value.
 	</dd></dl>

css-syntax/Overview.src.html

@@ -1902,6 +1902,7 @@ <h4>
 			return a syntax error.
 
 		<li>
+			<a>Reconsume the current input token</i>.
 			<a>Consume a component value</a>.
 			If nothing is returned,
 			return a syntax error.
@@ -2021,6 +2022,7 @@ <h4>
 
 		<dt>anything else
 		<dd>
+			<a>Reconsume the current input token</i>.
 			<a>Consume a component value</a>.
 			Append the returned value to the at-rule's prelude.
 	</dl>
@@ -2058,6 +2060,7 @@ <h4>
 
 		<dt>anything else
 		<dd>
+			<a>Reconsume the current input token</i>.
 			<a>Consume a component value</a>.
 			Append the returned value to the qualified rule's prelude.
 	</dl>
@@ -2088,17 +2091,18 @@ <h4>
 		<dt>〈ident〉
 		<dd>
 			Initialize a temporary list initially filled with the <a>current input token</a>.
-			Repeatedly <a>consume a component value</a> from the <a>next input token</a>
-			until a 〈semicolon〉 or 〈EOF〉 is returned,
-			appending all of the returned values up to that point to the temporary list.
+			<a>Consume the next input token</i>.
+			While the <i>current input token</i> is anything but a 〈semicolon〉 or 〈EOF〉,
+			append it to the temporary list
+			and <i>consume the next input token</i>.
 			<a>Consume a declaration</a> from the temporary list.
 			If anything was returned,
 			append it to the list of declarations.
 
 		<dt>anything else</dd>
 		<dd>
 			This is a <a>parse error</a>.
-			Repeatedly <a>consume a component value</a> from the <a>next input token</a>
+			Repeatedly <a>consume a component value</a>
 			until it is a 〈semicolon〉 or 〈EOF〉.
 	</dl>
 
@@ -2147,6 +2151,8 @@ <h4>
 
 	This section describes how to <a>consume a component value</a>.
 
+	<i>Consume the next input token</i>.
+
 	If the <a>current input token</a>
 	is a 〈{〉, 〈[〉, or 〈(〉,
 	<a>consume a simple block</a>
@@ -2181,6 +2187,7 @@ <h4>
 
 		<dt>anything else
 		<dd>
+			<a>Reconsume the current input token</i>.
 			<a>Consume a component value</a>
 			and append it to the value of the block.
 	</dl>
@@ -2204,6 +2211,7 @@ <h4>
 
 		<dt>anything else
 		<dd>
+			<a>Reconsume the current input token</i>.
 			<a>Consume a component value</a>
 			and append the returned value
 			to the function's value.