[css-syntax] OMG, fix all the current/next token bugs in the parse/consume algos, and make the structures more consistent in general.

Author: tabatkins

css-syntax/Overview.bs

@@ -2164,8 +2164,7 @@ Parse a rule</h4>
 
 			Otherwise,
 			if the <a>next input token</a> is an <<at-keyword-token>>,
-			consume it
-			and <a>consume an at-rule</a>,
+			<a>consume an at-rule</a>,
 			and let <var>rule</var> be the return value.
 
 			Otherwise,
@@ -2340,6 +2339,7 @@ Consume an at-rule</h4>
 
 	To <dfn>consume an at-rule</dfn>:
 
+	<a>Consume the next input token</a>.
 	Create a new at-rule
 	with its name set to the value of the <a>current input token</a>,
 	its prelude initially set to an empty list,
@@ -2355,6 +2355,7 @@ Consume an at-rule</h4>
 
 		<dt><a href="#tokendef-open-curly">&lt;{-token></a>
 		<dd>
+			<a>Reconsume the current input token</a>.
 			<a>Consume a simple block</a>
 			and assign it to the at-rule's block.
 			Return the at-rule.
@@ -2391,6 +2392,7 @@ Consume a qualified rule</h4>
 
 		<dt><a href="#tokendef-open-curly">&lt;{-token></a>
 		<dd>
+			<a>Reconsume the current input token</a>.
 			<a>Consume a simple block</a>
 			and assign it to the qualified rule's block.
 			Return the qualified rule.
@@ -2429,56 +2431,57 @@ Consume a list of declarations</h4>
 
 		<dt><<at-keyword-token>>
 		<dd>
+			<a>Reconsume the current input token</a>.
 			<a>Consume an at-rule</a>.
 			Append the returned rule to the list of declarations.
 
 		<dt><<ident-token>>
 		<dd>
 			Initialize a temporary list initially filled with the <a>current input token</a>.
-			<a>Consume the next input token</a>.
-			While the <a>current input token</a> is anything other than a <<semicolon-token>> or <<EOF-token>>,
-			append it to the temporary list
-			and <a>consume the next input token</a>.
+			As long as the <a>next input token</a> is anything other than a <<semicolon-token>> or <<EOF-token>>,
+			<a>consume the next input token</a> and append it to the temporary list.
 			<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>
-			until it is a <<semicolon-token>> or <<EOF-token>>.
+			<a>Reconsume the current input token</a>.
+			As long as the <a>next input token</a> is anything other than a <<semicolon-token>> or <<EOF-token>>,
+			<a>consume a component value</a>
+			and throw away the returned value.
 	</dl>
 
 
 <h4 id="consume-a-declaration">
 Consume a declaration</h4>
 
+	Note: This algorithm assumes that the <a>next input token</a> has already been checked to be an <<ident-token>>.
+
 	To <dfn>consume a declaration</dfn>:
 
+	<a>Consume the next input token</a>.
 	Create a new declaration
 	with its name set to the value of the <a>current input token</a>
 	and its value initially set to the empty list.
 
 	<ol>
 		<li>
-			<a>Consume the next input token</a>.
-
-		<li>
-			While the <a>current input token</a> is a <<whitespace-token>>,
+			While the <a>next input token</a> is a <<whitespace-token>>,
 			<a>consume the next input token</a>.
 
 		<li>
-			If the <a>current input token</a> is anything other than a <<colon-token>>,
+			If the <a>next input token</a> is anything other than a <<colon-token>>,
 			this is a <a>parse error</a>.
 			Return nothing.
 
 			Otherwise, <a>consume the next input token</a>.
 
 		<li>
-			While the <a>current input token</a> is anything other than an <<EOF-token>>,
-			append it to the declaration's value
-			and <a>consume the next input token</a>.
+			As long as the <a>next input token</a> is anything other than an <<EOF-token>>,
+			<a>consume a component value</a>
+			and append it to the declaration's value.
 
 		<li>
 			If the last two non-<<whitespace-token>>s in the declaration's value are
@@ -2515,8 +2518,11 @@ Consume a component value</h4>
 <h4 id="consume-a-simple-block">
 Consume a simple block</h4>
 
+	Note: This algorithm assumes that the <a>next input token</a> has already been checked to be an <a href="#tokendef-open-curly">&lt;{-token></a>, <a href="#tokendef-open-square">&lt;[-token></a>, or <a href="#tokendef-open-paren">&lt;(-token></a>.
+
 	To <dfn>consume a simple block</dfn>:
 
+	<a>Consume the next input token</a>.
 	The <dfn>ending token</dfn> is the mirror variant of the <a>current input token</a>.
 	(E.g. if it was called with <a href="#tokendef-open-square">&lt;[-token></a>, the <a>ending token</a> is <a href="#tokendef-close-square">&lt;]-token></a>.)
 
@@ -2542,8 +2548,11 @@ Consume a simple block</h4>
 <h4 id="consume-a-function">
 Consume a function</h4>
 
+	Note: This algorithm assumes that the <a>next input token</a> has already been checked to be a <<function-token>>.
+
 	To <dfn>consume a function</dfn>:
 
+	<a>Consume the next input token</a>.
 	Create a function with a name equal to the value of the <a>current input token</a>,
 	and with a value which is initially an empty list.
 

css-syntax/Overview.html

@@ -3677,8 +3677,7 @@ <h4 class="heading settled heading" data-level=5.3.3 id=parse-a-rule><span class
 
 <p>			Otherwise,
 			if the <a data-link-type=dfn href=#next-input-token title="next input token">next input token</a> is an <a class="production css-code" data-link-type=type href=#typedef-at-keyword-token title="<at-keyword-token>">&lt;at-keyword-token&gt;</a>,
-			consume it
-			and <a data-link-type=dfn href=#consume-an-at-rule0 title="consume an at-rule">consume an at-rule</a>,
+			<a data-link-type=dfn href=#consume-an-at-rule0 title="consume an at-rule">consume an at-rule</a>,
 			and let <var>rule</var> be the return value.
 
 <p>			Otherwise,
@@ -3853,7 +3852,8 @@ <h4 class="heading settled heading" data-level=5.4.2 id=consume-an-at-rule><span
 
 <p>	To <dfn data-dfn-type=dfn data-noexport="" id=consume-an-at-rule0>consume an at-rule<a class=self-link href=#consume-an-at-rule0></a></dfn>:
 
-<p>	Create a new at-rule
+<p>	<a data-link-type=dfn href=#consume-the-next-input-token title="consume the next input token">Consume the next input token</a>.
+	Create a new at-rule
 	with its name set to the value of the <a data-link-type=dfn href=#current-input-token title="current input token">current input token</a>,
 	its prelude initially set to an empty list,
 	and its value initially set to nothing.
@@ -3868,6 +3868,7 @@ <h4 class="heading settled heading" data-level=5.4.2 id=consume-an-at-rule><span
 
 		<dt><a href=#tokendef-open-curly>&lt;{-token&gt;</a>
 		<dd>
+			<a data-link-type=dfn href=#reconsume-the-current-input-token title="reconsume the current input token">Reconsume the current input token</a>.
 			<a data-link-type=dfn href=#consume-a-simple-block0 title="consume a simple block">Consume a simple block</a>
 			and assign it to the at-rule’s block.
 			Return the at-rule.
@@ -3904,6 +3905,7 @@ <h4 class="heading settled heading" data-level=5.4.3 id=consume-a-qualified-rule
 
 		<dt><a href=#tokendef-open-curly>&lt;{-token&gt;</a>
 		<dd>
+			<a data-link-type=dfn href=#reconsume-the-current-input-token title="reconsume the current input token">Reconsume the current input token</a>.
 			<a data-link-type=dfn href=#consume-a-simple-block0 title="consume a simple block">Consume a simple block</a>
 			and assign it to the qualified rule’s block.
 			Return the qualified rule.
@@ -3942,56 +3944,57 @@ <h4 class="heading settled heading" data-level=5.4.4 id=consume-a-list-of-declar
 
 		<dt><a class="production css-code" data-link-type=type href=#typedef-at-keyword-token title="<at-keyword-token>">&lt;at-keyword-token&gt;</a>
 		<dd>
+			<a data-link-type=dfn href=#reconsume-the-current-input-token title="reconsume the current input token">Reconsume the current input token</a>.
 			<a data-link-type=dfn href=#consume-an-at-rule0 title="consume an at-rule">Consume an at-rule</a>.
 			Append the returned rule to the list of declarations.
 
 		<dt><a class="production css-code" data-link-type=type href=#typedef-ident-token title="<ident-token>">&lt;ident-token&gt;</a>
 		<dd>
 			Initialize a temporary list initially filled with the <a data-link-type=dfn href=#current-input-token title="current input token">current input token</a>.
-			<a data-link-type=dfn href=#consume-the-next-input-token title="consume the next input token">Consume the next input token</a>.
-			While the <a data-link-type=dfn href=#current-input-token title="current input token">current input token</a> is anything other than a <a class="production css-code" data-link-type=type href=#typedef-semicolon-token title="<semicolon-token>">&lt;semicolon-token&gt;</a> or <a class="production css-code" data-link-type=type href=#typedef-eof-token title="<eof-token>">&lt;EOF-token&gt;</a>,
-			append it to the temporary list
-			and <a data-link-type=dfn href=#consume-the-next-input-token title="consume the next input token">consume the next input token</a>.
+			As long as the <a data-link-type=dfn href=#next-input-token title="next input token">next input token</a> is anything other than a <a class="production css-code" data-link-type=type href=#typedef-semicolon-token title="<semicolon-token>">&lt;semicolon-token&gt;</a> or <a class="production css-code" data-link-type=type href=#typedef-eof-token title="<eof-token>">&lt;EOF-token&gt;</a>,
+			<a data-link-type=dfn href=#consume-the-next-input-token title="consume the next input token">consume the next input token</a> and append it to the temporary list.
 			<a data-link-type=dfn href=#consume-a-declaration0 title="consume a declaration">Consume a declaration</a> from the temporary list.
 			If anything was returned,
 			append it to the list of declarations.
 
 		<dt>anything else
 		<dd>
 			This is a <a data-link-type=dfn href=#parse-error title="parse error">parse error</a>.
-			Repeatedly <a data-link-type=dfn href=#consume-a-component-value0 title="consume a component value">consume a component value</a>
-			until it is a <a class="production css-code" data-link-type=type href=#typedef-semicolon-token title="<semicolon-token>">&lt;semicolon-token&gt;</a> or <a class="production css-code" data-link-type=type href=#typedef-eof-token title="<eof-token>">&lt;EOF-token&gt;</a>.
+			<a data-link-type=dfn href=#reconsume-the-current-input-token title="reconsume the current input token">Reconsume the current input token</a>.
+			As long as the <a data-link-type=dfn href=#next-input-token title="next input token">next input token</a> is anything other than a <a class="production css-code" data-link-type=type href=#typedef-semicolon-token title="<semicolon-token>">&lt;semicolon-token&gt;</a> or <a class="production css-code" data-link-type=type href=#typedef-eof-token title="<eof-token>">&lt;EOF-token&gt;</a>,
+			<a data-link-type=dfn href=#consume-a-component-value0 title="consume a component value">consume a component value</a>
+			and throw away the returned value.
 	</dl>
 
 
 <h4 class="heading settled heading" data-level=5.4.5 id=consume-a-declaration><span class=secno>5.4.5 </span><span class=content>
 Consume a declaration</span><a class=self-link href=#consume-a-declaration></a></h4>
 
+<p class=note>	Note: This algorithm assumes that the <a data-link-type=dfn href=#next-input-token title="next input token">next input token</a> has already been checked to be an <a class="production css-code" data-link-type=type href=#typedef-ident-token title="<ident-token>">&lt;ident-token&gt;</a>.
+
 <p>	To <dfn data-dfn-type=dfn data-noexport="" id=consume-a-declaration0>consume a declaration<a class=self-link href=#consume-a-declaration0></a></dfn>:
 
-<p>	Create a new declaration
+<p>	<a data-link-type=dfn href=#consume-the-next-input-token title="consume the next input token">Consume the next input token</a>.
+	Create a new declaration
 	with its name set to the value of the <a data-link-type=dfn href=#current-input-token title="current input token">current input token</a>
 	and its value initially set to the empty list.
 
 	<ol>
 		<li>
-			<a data-link-type=dfn href=#consume-the-next-input-token title="consume the next input token">Consume the next input token</a>.
-
-		<li>
-			While the <a data-link-type=dfn href=#current-input-token title="current input token">current input token</a> is a <a class="production css-code" data-link-type=type href=#typedef-whitespace-token title="<whitespace-token>">&lt;whitespace-token&gt;</a>,
+			While the <a data-link-type=dfn href=#next-input-token title="next input token">next input token</a> is a <a class="production css-code" data-link-type=type href=#typedef-whitespace-token title="<whitespace-token>">&lt;whitespace-token&gt;</a>,
 			<a data-link-type=dfn href=#consume-the-next-input-token title="consume the next input token">consume the next input token</a>.
 
 		<li>
-			If the <a data-link-type=dfn href=#current-input-token title="current input token">current input token</a> is anything other than a <a class="production css-code" data-link-type=type href=#typedef-colon-token title="<colon-token>">&lt;colon-token&gt;</a>,
+			If the <a data-link-type=dfn href=#next-input-token title="next input token">next input token</a> is anything other than a <a class="production css-code" data-link-type=type href=#typedef-colon-token title="<colon-token>">&lt;colon-token&gt;</a>,
 			this is a <a data-link-type=dfn href=#parse-error title="parse error">parse error</a>.
 			Return nothing.
 
 <p>			Otherwise, <a data-link-type=dfn href=#consume-the-next-input-token title="consume the next input token">consume the next input token</a>.
 
 		<li>
-			While the <a data-link-type=dfn href=#current-input-token title="current input token">current input token</a> is anything other than an <a class="production css-code" data-link-type=type href=#typedef-eof-token title="<eof-token>">&lt;EOF-token&gt;</a>,
-			append it to the declaration’s value
-			and <a data-link-type=dfn href=#consume-the-next-input-token title="consume the next input token">consume the next input token</a>.
+			As long as the <a data-link-type=dfn href=#next-input-token title="next input token">next input token</a> is anything other than an <a class="production css-code" data-link-type=type href=#typedef-eof-token title="<eof-token>">&lt;EOF-token&gt;</a>,
+			<a data-link-type=dfn href=#consume-a-component-value0 title="consume a component value">consume a component value</a>
+			and append it to the declaration’s value.
 
 		<li>
 			If the last two non-<a class="production css-code" data-link-type=type href=#typedef-whitespace-token title="<whitespace-token>">&lt;whitespace-token&gt;</a>s in the declaration’s value are
@@ -4028,9 +4031,12 @@ <h4 class="heading settled heading" data-level=5.4.6 id=consume-a-component-valu
 <h4 class="heading settled heading" data-level=5.4.7 id=consume-a-simple-block><span class=secno>5.4.7 </span><span class=content>
 Consume a simple block</span><a class=self-link href=#consume-a-simple-block></a></h4>
 
+<p class=note>	Note: This algorithm assumes that the <a data-link-type=dfn href=#next-input-token title="next input token">next input token</a> has already been checked to be an <a href=#tokendef-open-curly>&lt;{-token&gt;</a>, <a href=#tokendef-open-square>&lt;[-token&gt;</a>, or <a href=#tokendef-open-paren>&lt;(-token&gt;</a>.
+
 <p>	To <dfn data-dfn-type=dfn data-noexport="" id=consume-a-simple-block0>consume a simple block<a class=self-link href=#consume-a-simple-block0></a></dfn>:
 
-<p>	The <dfn data-dfn-type=dfn data-noexport="" id=ending-token>ending token<a class=self-link href=#ending-token></a></dfn> is the mirror variant of the <a data-link-type=dfn href=#current-input-token title="current input token">current input token</a>.
+<p>	<a data-link-type=dfn href=#consume-the-next-input-token title="consume the next input token">Consume the next input token</a>.
+	The <dfn data-dfn-type=dfn data-noexport="" id=ending-token>ending token<a class=self-link href=#ending-token></a></dfn> is the mirror variant of the <a data-link-type=dfn href=#current-input-token title="current input token">current input token</a>.
 	(E.g. if it was called with <a href=#tokendef-open-square>&lt;[-token&gt;</a>, the <a data-link-type=dfn href=#ending-token title="ending token">ending token</a> is <a href=#tokendef-close-square>&lt;]-token&gt;</a>.)
 
 <p>	Create a <a data-link-type=dfn href=#simple-block title="simple block">simple block</a> with its associated token set to the <a data-link-type=dfn href=#current-input-token title="current input token">current input token</a>
@@ -4055,9 +4061,12 @@ <h4 class="heading settled heading" data-level=5.4.7 id=consume-a-simple-block><
 <h4 class="heading settled heading" data-level=5.4.8 id=consume-a-function><span class=secno>5.4.8 </span><span class=content>
 Consume a function</span><a class=self-link href=#consume-a-function></a></h4>
 
+<p class=note>	Note: This algorithm assumes that the <a data-link-type=dfn href=#next-input-token title="next input token">next input token</a> has already been checked to be a <a class="production css-code" data-link-type=type href=#typedef-function-token title="<function-token>">&lt;function-token&gt;</a>.
+
 <p>	To <dfn data-dfn-type=dfn data-noexport="" id=consume-a-function0>consume a function<a class=self-link href=#consume-a-function0></a></dfn>:
 
-<p>	Create a function with a name equal to the value of the <a data-link-type=dfn href=#current-input-token title="current input token">current input token</a>,
+<p>	<a data-link-type=dfn href=#consume-the-next-input-token title="consume the next input token">Consume the next input token</a>.
+	Create a function with a name equal to the value of the <a data-link-type=dfn href=#current-input-token title="current input token">current input token</a>,
 	and with a value which is initially an empty list.
 
 <p>	Repeatedly consume the <a data-link-type=dfn href=#next-input-token title="next input token">next input token</a> and process it as follows: