Skip to content

Commit b2cb5b4

Browse files
committed
[css-syntax] Fix bug in 'parse a component value'.
--HG-- extra : rebase_source : a54d0044f409aed5cfc9aab5d94e4fe7ebe5ba64
1 parent c26f3bc commit b2cb5b4

2 files changed

Lines changed: 17 additions & 17 deletions

File tree

css-syntax/Overview.bs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2238,29 +2238,25 @@ Parse a component value</h4>
22382238

22392239
<ol>
22402240
<li>
2241-
<a>Consume the next input token</a>.
2242-
2243-
<li>
2244-
While the <a>current input token</a> is a <<whitespace-token>>,
2241+
While the <a>next input token</a> is a <<whitespace-token>>,
22452242
<a>consume the next input token</a>.
22462243

22472244
<li>
2248-
If the <a>current input token</a> is an <<EOF-token>>,
2245+
If the <a>next input token</a> is an <<EOF-token>>,
22492246
return a syntax error.
22502247

22512248
<li>
2252-
<a>Reconsume the current input token</a>.
22532249
<a>Consume a component value</a>
22542250
and let <var>value</var> be the return value.
22552251
If nothing is returned,
22562252
return a syntax error.
22572253

22582254
<li>
2259-
While the <a>current input token</a> is a <<whitespace-token>>,
2255+
While the <a>next input token</a> is a <<whitespace-token>>,
22602256
<a>consume the next input token</a>.
22612257

22622258
<li>
2263-
If the <a>current input token</a> is an <<EOF-token>>,
2259+
If the <a>next input token</a> is an <<EOF-token>>,
22642260
return <var>value</var>.
22652261
Otherwise,
22662262
return a syntax error.
@@ -3414,6 +3410,10 @@ Changes Since the 20 Feb 2014 CR Publication</h2>
34143410
<li>
34153411
Fixed a bug in the "Consume a URL token" algorithm,
34163412
where it didn't consume the quote character starting a string before attempting to consume the string.
3413+
3414+
<li>
3415+
Fixed a bug in the "Parse a component value" algorithm,
3416+
where it failed to trim whitespace from the end of the value.
34173417
</ul>
34183418

34193419
The following editorial changes were made:

css-syntax/Overview.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
</p>
5959
<h1 class="p-name no-ref" id=title>CSS Syntax Module Level 3</h1>
6060
<h2 class="no-num no-toc no-ref heading settled heading" id=subtitle><span class=content>Editor’s Draft,
61-
<span class=dt-updated><span class=value-title title=20140303>3 March 2014</span></span></span></h2>
61+
<span class=dt-updated><span class=value-title title=20140304>4 March 2014</span></span></span></h2>
6262
<div data-fill-with=spec-metadata><dl><dt>This version:<dd><a class=u-url href=http://dev.w3.org/csswg/css-syntax/>http://dev.w3.org/csswg/css-syntax/</a><dt>Latest version:<dd><a href=http://www.w3.org/TR/css-syntax-3/>http://www.w3.org/TR/css-syntax-3/</a><dt>Editor’s Draft:<dd><a href=http://dev.w3.org/csswg/css-syntax/>http://dev.w3.org/csswg/css-syntax/</a><dt>Previous Versions:<dd><a href=http://www.w3.org/TR/2014/CR-css-syntax-3-20140220/ rel=previous>http://www.w3.org/TR/2014/CR-css-syntax-3-20140220/</a><dd><a href=http://www.w3.org/TR/2013/WD-css-syntax-3-20131105/ rel=previous>http://www.w3.org/TR/2013/WD-css-syntax-3-20131105/</a><dd><a href=http://www.w3.org/TR/2013/WD-css-syntax-3-20130919/ rel=previous>http://www.w3.org/TR/2013/WD-css-syntax-3-20130919/</a>
6363
<dt>Feedback:</dt>
6464
<dd><a href="mailto:www-style@w3.org?subject=%5Bcss-syntax%5D%20feedback">www-style@w3.org</a>
@@ -3751,29 +3751,25 @@ <h4 class="heading settled heading" data-level=5.3.6 id=parse-a-component-value>
37513751

37523752
<ol>
37533753
<li>
3754-
<a data-link-type=dfn href=#consume-the-next-input-token title="consume the next input token">Consume the next input token</a>.
3755-
3756-
<li>
3757-
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>,
3754+
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>,
37583755
<a data-link-type=dfn href=#consume-the-next-input-token title="consume the next input token">consume the next input token</a>.
37593756

37603757
<li>
3761-
If the <a data-link-type=dfn href=#current-input-token title="current input token">current input token</a> is an <a class="production css-code" data-link-type=type href=#typedef-eof-token title="<eof-token>">&lt;EOF-token&gt;</a>,
3758+
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-eof-token title="<eof-token>">&lt;EOF-token&gt;</a>,
37623759
return a syntax error.
37633760

37643761
<li>
3765-
<a data-link-type=dfn href=#reconsume-the-current-input-token title="reconsume the current input token">Reconsume the current input token</a>.
37663762
<a data-link-type=dfn href=#consume-a-component-value0 title="consume a component value">Consume a component value</a>
37673763
and let <var>value</var> be the return value.
37683764
If nothing is returned,
37693765
return a syntax error.
37703766

37713767
<li>
3772-
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>,
3768+
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>,
37733769
<a data-link-type=dfn href=#consume-the-next-input-token title="consume the next input token">consume the next input token</a>.
37743770

37753771
<li>
3776-
If the <a data-link-type=dfn href=#current-input-token title="current input token">current input token</a> is an <a class="production css-code" data-link-type=type href=#typedef-eof-token title="<eof-token>">&lt;EOF-token&gt;</a>,
3772+
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-eof-token title="<eof-token>">&lt;EOF-token&gt;</a>,
37773773
return <var>value</var>.
37783774
Otherwise,
37793775
return a syntax error.
@@ -4894,6 +4890,10 @@ <h2 class="no-num heading settled heading" id=changes><span class=content>
48944890
<li>
48954891
Fixed a bug in the "Consume a URL token" algorithm,
48964892
where it didn’t consume the quote character starting a string before attempting to consume the string.
4893+
4894+
<li>
4895+
Fixed a bug in the "Parse a component value" algorithm,
4896+
where it failed to trim whitespace from the end of the value.
48974897
</ul>
48984898

48994899
<p> The following editorial changes were made:

0 commit comments

Comments
 (0)