Skip to content

Commit 403c817

Browse files
committed
[css-syntax] Remove the now-extraneous opening steps of 'consume a url token', as they were subsumed by the rest of the algo returning bad-url less.
--HG-- extra : rebase_source : c915f0ccfff346ec4951d5a558a24f2a3ab40809
1 parent 241fa6c commit 403c817

File tree

2 files changed

+381
-597
lines changed

2 files changed

+381
-597
lines changed

css-syntax/Overview.bs

+44-55
Original file line numberDiff line numberDiff line change
@@ -1285,64 +1285,53 @@ Consume a url token</h4>
12851285

12861286
Note: This algorithm assumes that the initial "url(" has already been consumed.
12871287

1288-
<ol>
1289-
<li>
1290-
Initially create a <<url-token>> with its value set to the empty string.
1288+
Initially create a <<url-token>> with its value set to the empty string.
12911289

1292-
<li>
1290+
Repeatedly consume the <a>next input code point</a> from the stream:
1291+
1292+
<dl>
1293+
<dt>U+0029 RIGHT PARENTHESIS ())
1294+
<dt>EOF
1295+
<dd>
1296+
Return the <<url-token>>.
1297+
1298+
<dt><a>whitespace</a>
1299+
<dd>
12931300
Consume as much <a>whitespace</a> as possible.
1301+
If the <a>next input code point</a> is U+0029 RIGHT PARENTHESIS ()) or EOF,
1302+
consume it and return the <<url-token>>;
1303+
otherwise,
1304+
<a>consume the remnants of a bad url</a>,
1305+
create a <<bad-url-token>>,
1306+
and return it.
12941307

1295-
<li>
1296-
If the <a>next input code point</a> is EOF,
1297-
return the <<url-token>>.
1298-
1299-
<li>
1300-
Repeatedly consume the <a>next input code point</a> from the stream:
1301-
1302-
<dl>
1303-
<dt>U+0029 RIGHT PARENTHESIS ())
1304-
<dt>EOF
1305-
<dd>
1306-
Return the <<url-token>>.
1307-
1308-
<dt><a>whitespace</a>
1309-
<dd>
1310-
Consume as much <a>whitespace</a> as possible.
1311-
If the <a>next input code point</a> is U+0029 RIGHT PARENTHESIS ()) or EOF,
1312-
consume it and return the <<url-token>>;
1313-
otherwise,
1314-
<a>consume the remnants of a bad url</a>,
1315-
create a <<bad-url-token>>,
1316-
and return it.
1317-
1318-
<dt>U+0022 QUOTATION MARK (")
1319-
<dt>U+0027 APOSTROPHE (&apos;)
1320-
<dt>U+0028 LEFT PARENTHESIS (()
1321-
<dt><a>non-printable code point</a>
1322-
<dd>
1323-
This is a <a>parse error</a>.
1324-
<a>Consume the remnants of a bad url</a>,
1325-
create a <<bad-url-token>>,
1326-
and return it.
1327-
1328-
<dt>U+005C REVERSE SOLIDUS
1329-
<dd>
1330-
If the stream <a>starts with a valid escape</a>,
1331-
<a>consume an escaped code point</a>
1332-
and append the returned <a>code point</a> to the <<url-token>>’s value.
1333-
1334-
Otherwise,
1335-
this is a <a>parse error</a>.
1336-
<a>Consume the remnants of a bad url</a>,
1337-
create a <<bad-url-token>>,
1338-
and return it.
1339-
1340-
<dt>anything else
1341-
<dd>
1342-
Append the <a>current input code point</a>
1343-
to the <<url-token>>’s value.
1344-
</dl>
1345-
</ol>
1308+
<dt>U+0022 QUOTATION MARK (")
1309+
<dt>U+0027 APOSTROPHE (&apos;)
1310+
<dt>U+0028 LEFT PARENTHESIS (()
1311+
<dt><a>non-printable code point</a>
1312+
<dd>
1313+
This is a <a>parse error</a>.
1314+
<a>Consume the remnants of a bad url</a>,
1315+
create a <<bad-url-token>>,
1316+
and return it.
1317+
1318+
<dt>U+005C REVERSE SOLIDUS
1319+
<dd>
1320+
If the stream <a>starts with a valid escape</a>,
1321+
<a>consume an escaped code point</a>
1322+
and append the returned <a>code point</a> to the <<url-token>>’s value.
1323+
1324+
Otherwise,
1325+
this is a <a>parse error</a>.
1326+
<a>Consume the remnants of a bad url</a>,
1327+
create a <<bad-url-token>>,
1328+
and return it.
1329+
1330+
<dt>anything else
1331+
<dd>
1332+
Append the <a>current input code point</a>
1333+
to the <<url-token>>’s value.
1334+
</dl>
13461335

13471336

13481337
<h4 id="consume-a-unicode-range-token">

0 commit comments

Comments
 (0)