[css-syntax-3] Update to the new Nesting model.

Author: tabatkins

css-syntax-3/Overview.bs

@@ -2549,12 +2549,13 @@ Consume a qualified rule</h4>
 
 	Create a new qualified rule
 	with its prelude initially set to an empty [=list=],
-	and its value initially set to nothing.
+	and its block initially set to nothing.
 
 	Repeatedly consume the <a>next input token</a>:
 
 	<dl>
 		<dt><<EOF-token>>
+		<dt><<semicolon-token>>
 		<dd>
 			This is a <a>parse error</a>.
 			Return nothing.
@@ -2605,28 +2606,23 @@ Consume a style block's contents</h4>
 			and append the result to |rules|.
 
 		<dt><<ident-token>>
+		<dt><<function-token>>
+		<dt><<function>>
 		<dd>
-			Initialize a temporary list initially filled with the <a>current input token</a>.
+			<a>Reconsume the current input token</a>.
+			Initialize a temporary list, initially empty.
 			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 append it to the temporary list.
 			<a>Consume a declaration</a> from the temporary list.
 			If anything was returned,
 			append it to |decls|.
 
-		<dt><<delim-token>> with a value of "&" (U+0026 AMPERSAND)
+		<dt>anything else</dd>
 		<dd>
 			[=Reconsume the current input token=].
 			[=Consume a qualified rule=].
 			If anything was returned,
 			append it to |rules|.
-
-		<dt>anything else</dd>
-		<dd>
-			This is a <a>parse error</a>.
-			<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>
 
 
@@ -2677,16 +2673,33 @@ Consume a list of declarations</h4>
 <h4 id="consume-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 an empty [=list=].
-
+	Let |decl| be a new declaration,
+	with an initially empty name
+	and a value set to an empty [=list=].
 	<ol>
+		<li>
+			<a>Consume a component value</a>.
+
+			<dl class=switch>
+				: <<ident-token>>
+				::
+					Set |decl|'s name to the value of the <<ident-token>>.
+
+				: anything else
+				::
+					This is a [=parse error=].
+
+					While the [=next input token=]
+					is anything but a <<semicolon-token>>
+					or <<eof-token>>,
+					[=consume a component value=]
+					and throw it away.
+
+					Return nothing.
+			</dl>
+
 		<li>
 			While the <a>next input token</a> is a <<whitespace-token>>,
 			<a>consume the next input token</a>.
@@ -2705,21 +2718,21 @@ Consume a declaration</h4>
 		<li>
 			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.
+			and append it to |decl|'s value.
 
 		<li>
 			If the last two non-<<whitespace-token>>s in the declaration's value are
 			a <<delim-token>> with the value "!"
 			followed by an <<ident-token>> with a value that is an <a>ASCII case-insensitive</a> match for "important",
-			remove them from the declaration's value
-			and set the declaration's <var>important</var> flag to true.
+			remove them from |decl|'s value
+			and set |decl|'s <var>important</var> flag to true.
 
 		<li>
-			While the last token in the declaration's value is a <<whitespace-token>>,
+			While the last token in |decl|'s value is a <<whitespace-token>>,
 			[=list/remove=] that token.
 
 		<li>
-			Return the declaration.
+			Return |decl|.
 	</ol>