[css-syntax-3] Fix handling of nested constructs. w3c#8738

Author: tabatkins

css-syntax-3/Overview.bs

@@ -2365,7 +2365,7 @@ Parse a list of declarations</h4>
 				and set |input| to the result.
 
 			<li>
-				<a>Consume a list of declarations</a> from |input|,
+				<a>Consume a block's contents</a> from |input|,
 				and return the result.
 		</ol>
 	</div>
@@ -2515,8 +2515,9 @@ Consume a list of rules</h4>
 
 		<dt><<at-keyword-token>>
 		<dd>
-			<a>Consume an at-rule</a> from |input|,
-			and append the returned value to |rules|.
+			<a>Consume an at-rule</a> from |input|.
+			If anything is returned,
+			append it to |rules|.
 
 		<dt>anything else
 		<dd>
@@ -2530,52 +2531,61 @@ Consume a list of rules</h4>
 Consume an at-rule</h4>
 
 	To <dfn>consume an at-rule</dfn>
-	from a [=token stream=] |input|:
+	from a [=token stream=] |input|,
+	given an optional bool |nested| (default false):
 
 	Assert: The [=next token=] is an <<at-keyword-token>>.
 
 	[=token stream/Consume a token=] from |input|,
 	and let |rule| be a new [=at-rule=]
 	with its name set to the returned token's value,
-	and its prelude initially set to an empty [=list=].
+	its prelude initially set to an empty [=list=],
+	and no declarations or child rules.
 
 	[=token stream/Process=] |input|:
 
 	<dl>
 		<dt><<semicolon-token>>
+		<dt><<EOF-token>>
 		<dd>
 			[=Discard a token=] from |input|.
 			If |rule| is valid in the current context,
 			return it;
 			otherwise return nothing.
 
-		<dt><<EOF-token>>
+		<dt><a href="#tokendef-close-curly">&lt;}-token></a>
 		<dd>
-			This is a <a>parse error</a>.
-			If |rule| is valid in the current context,
-			return it;
-			otherwise return nothing.
+			If |nested| is true:
+			* If |rule| is valid in the current context,
+				return it.
+			* Otherwise, return nothing.
+
+			Otherwise, [=token stream/consume a token=]
+			and append the result to |rule|'s prelude.
 
 		<dt><a href="#tokendef-open-curly">&lt;{-token></a>
 		<dd>
 			[=Consume a block=] from |input|,
 			and assign the results to |rule|'s
 			lists of [=declarations=] and child [=rules=].
 
-			Return |at-rule|.
+			If |rule| is valid in the current context,
+			return it.
+			Otherwise, return nothing.
 
 		<dt>anything else
 		<dd>
-			<a>Consume a component value</a> from |input|.
-			Append the returned value to |rule|'s prelude.
+			<a>Consume a component value</a> from |input|
+			and append the returned value to |rule|'s prelude.
 	</dl>
 
 
 <h4 id="consume-qualified-rule">
 Consume a qualified rule</h4>
 
 	To <dfn>consume a qualified rule</dfn>,
-	from a [=token stream=] |input|:
+	from a [=token stream=] |input|,
+	given an optional bool |nested| (default false):
 
 	Let |rule| be a new [=qualified rule=]
 	with its prelude, declarations, and child rules
@@ -2588,9 +2598,17 @@ Consume a qualified rule</h4>
 		<dt><<semicolon-token>>
 		<dd>
 			This is a <a>parse error</a>.
-			[=Discard a token=] from |input|.
 			Return nothing.
 
+		<dt><a href="#tokendef-close-curly">&lt;}-token></a>
+		<dd>
+			This is a <a>parse error</a>.
+			If |nested| is true,
+			return nothing.
+			Otherwise,
+			[=token stream/consume a token=]
+			and append the result to |rule|'s prelude.
+
 		<dt><a href="#tokendef-open-curly">&lt;{-token></a>
 		<dd>
 			[=Consume a block=] from |input|,
@@ -2603,8 +2621,8 @@ Consume a qualified rule</h4>
 
 		<dt>anything else
 		<dd>
-			<a>Consume a component value</a> from |input|.
-			Append the returned value to |rule|'s prelude.
+			<a>Consume a component value</a> from |input|
+			and append the result to |rule|'s prelude.
 	</dl>
 
 
@@ -2621,23 +2639,18 @@ Consume a block</h4>
 	and |rules| be an empty [=list=] of [=rules=].
 
 	[=Discard a token=] from |input|.
-	[=Consume a list of declarations=] from |input|
-	with <a href="#tokendef-close-curly">&lt;}-token></a> as the stop token,
+	[=Consume a block's contents=] from |input|
 	and assign the results to |decls| and |rules|.
 	[=Discard a token=] from |input|.
 
 	Return |decls| and |rules|.
 
 
-<h4 id="consume-list-of-declarations">
-Consume a list of declarations</h4>
+<h4 id="consume-block-contents" oldids="consume-list-of-declarations">
+Consume a block's contents</h4>
 
-	Note: This algorithm actually parses both declarations and rules,
-	and returns the two in separate lists.
-
-	To <dfn>consume a list of declarations</dfn>
-	from a [=token stream=] |input|,
-	with an optional |stop token|:
+	To <dfn>consume a block's contents</dfn>
+	from a [=token stream=] |input|:
 
 	Let |decls| be an empty [=list=] of [=declarations=],
 	and |rules| be an empty [=list=] of [=rules=].
@@ -2651,27 +2664,30 @@ Consume a list of declarations</h4>
 			[=Discard a token=] from |input|.
 
 		<dt><<EOF-token>>
-		<dt>|stop token| (if provided)
+		<dt><a href="#tokendef-close-curly">&lt;}-token></a>
 		<dd>
 			Return |decls| and |rules|.
 
 		<dt><<at-keyword-token>>
 		<dd>
-			<a>Consume an at-rule</a> from |input|.
+			[=Consume an at-rule=] from |input|,
+			with |nested| set to true.
 			If a [=rule=] was returned,
 			append it to |rules|.
 
 		<dt>anything else</dd>
 		<dd>
 			[=Mark=] |input|.
 
-			[=Consume a declaration=] from |input|.
+			[=Consume a declaration=] from |input|,
+			with |nested| set to true.
 			If a [=declaration=] was returned,
 			append it to |decls|,
 			and [=discard a mark=] from |input|.
 
 			Otherwise, [=restore a mark=] from |input|,
-			then [=consume a qualified rule=].
+			then [=consume a qualified rule=] from |input|,
+			with |nested| set to true.
 			If a [=rule=] was returned,
 			append it to |rules|.
 	</dl>
@@ -2681,7 +2697,8 @@ Consume a list of declarations</h4>
 Consume a declaration</h4>
 
 	To <dfn>consume a declaration</dfn>
-	from a [=token stream=] |input|:
+	from a [=token stream=] |input|,
+	given an optional bool |nested| (default false):
 
 	Let |decl| be a new [=declaration=],
 	with an initially empty name
@@ -2690,12 +2707,13 @@ Consume a declaration</h4>
 	<ol>
 		<li>
 			If the [=next token=] is an <<ident-token>>,
-			[=token stream/Consume a token=] from |input|
+			[=token stream/consume a token=] from |input|
 			and set |decl|&apos;s name
 			to the token's value.
 
 			Otherwise,
-			[=consume the remnants of a bad declaration=] from |input|
+			[=consume the remnants of a bad declaration=] from |input|,
+			with |nested|,
 			and return nothing.
 
 		<li>
@@ -2706,15 +2724,17 @@ Consume a declaration</h4>
 			[=discard a token=] from |input|.
 
 			Otherwise,
-			[=consume the remnants of a bad declaration=] from |input|
+			[=consume the remnants of a bad declaration=] from |input|,
+			with |nested|,
 			and return nothing.
 
 		<li>
 			[=Discard whitespace=] from |input|.
 
 		<li>
 			[=Consume a list of component values=] from |input|,
-			with <<semicolon-token>> as the stop token,
+			with |nested|,
+			and with <<semicolon-token>> as the stop token,
 			and set |decl|'s value to the result.
 
 		<li>
@@ -2737,13 +2757,22 @@ Consume a declaration</h4>
 	<div algorithm>
 		To <dfn>consume the remnants of a bad declaration</dfn>
 		from a [=token stream=] |input|,
-		[=token stream/process=] |input|:
+		given a bool |nested|:
+
+		[=token stream/Process=] |input|:
 
 		: <<eof-token>>
 		: <<semicolon-token>>
 		:: [=Discard a token=] from |input|,
 			and return nothing.
 
+		: <a href="#tokendef-close-curly">&lt;}-token></a>
+		::
+			If |nested| is true,
+			return nothing.
+			Otherwise,
+			[=discard a token=].
+
 		: anything else
 		:: [=Consume a component value=] from |input|,
 			and do nothing.
@@ -2755,7 +2784,8 @@ Consume a list of component values</h4>
 
 	To <dfn>consume a list of component values</dfn>
 	from a [=token stream=] |input|,
-	optionally given a [=token=] |stop token|:
+	given an optional [=token=] |stop token|
+	and an optional boolean |nested| (default false):
 
 	Let |values| be an empty [=list=] of [=component values=].
 
@@ -2765,8 +2795,18 @@ Consume a list of component values</h4>
 	: |stop token| (if passed)
 	:: Return |values|.
 
+	: <a href="#tokendef-close-curly">&lt;}-token></a>
+	::
+		If |nested| is true,
+		return |values|.
+
+		Otherwise,
+		this is a <a>parse error</a>.
+		[=token stream/Consume a token=] from |input|
+		and append the result to |values|.
+
 	: anything else
-	:: [=Consume a component value=],
+	:: [=Consume a component value=] from |input|,
 		and append the result to |values|.
 
 
@@ -2777,7 +2817,7 @@ Consume a component value</h4>
 	To <dfn>consume a component value</dfn>
 	from a [=token stream=] |input|:
 
-	[=token stream/Process=] |input:
+	[=token stream/Process=] |input|:
 
 	: <a href="#tokendef-open-curly">&lt;{-token></a>
 	: <a href="#tokendef-open-square">&lt;[-token></a>