Skip to content

Commit fce0305

Browse files
tabatkinstabatkins
committed
Whoops, I aborted the change about making ; and } a syntax error if they're the first thing you see in declaration-value mode, but left in a lot of edits related to that change. Removed.
1 parent 8a1d8c3 commit fce0305

2 files changed

Lines changed: 18 additions & 178 deletions

File tree

‎css3-syntax/Overview.html‎

Lines changed: 18 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -290,23 +290,20 @@ <h2 class="no-num no-toc" id=contents> Table of contents</h2>
290290
<li><a href="#declaration-value-mode"><span class=secno>3.5.9. </span>
291291
Declaration-value mode</a>
292292

293-
<li><a href="#declaration-value-rest-mode"><span class=secno>3.5.10.
294-
</span> Declaration-value-rest mode</a>
295-
296-
<li><a href="#next-block-error-mode"><span class=secno>3.5.11. </span>
293+
<li><a href="#next-block-error-mode"><span class=secno>3.5.10. </span>
297294
Next-block error mode</a>
298295

299-
<li><a href="#next-statement-error-mode"><span class=secno>3.5.12.
296+
<li><a href="#next-statement-error-mode"><span class=secno>3.5.11.
300297
</span> Next-statement error mode</a>
301298

302299
<li><a href="#next-block-or-statement-error-mode"><span
303-
class=secno>3.5.13. </span> Next-block-or-statement error mode</a>
300+
class=secno>3.5.12. </span> Next-block-or-statement error mode</a>
304301

305-
<li><a href="#consume-a-block"><span class=secno>3.5.14. </span>
302+
<li><a href="#consume-a-block"><span class=secno>3.5.13. </span>
306303
Consume a block</a>
307304

308305
<li><a href="#switch-to-the-current-rules-content-mode"><span
309-
class=secno>3.5.15. </span> Switch to the current rule's content
306+
class=secno>3.5.14. </span> Switch to the current rule's content
310307
mode</a>
311308
</ul>
312309
</ul>
@@ -2319,90 +2316,6 @@ <h4 id=declaration-value-mode><span class=secno>3.5.9. </span> <dfn
23192316

23202317
<p> Consume the <a href="#next-input-token"><i>next input token</i></a>.
23212318

2322-
<dl>
2323-
<dt>cdo token
2324-
2325-
<dt>cdc token
2326-
2327-
<dt><span class=temp>]</span> token
2328-
2329-
<dt><span class=temp>)</span> token
2330-
2331-
<dt>bad-string token
2332-
2333-
<dt>bad-url token
2334-
2335-
<dd> This is a <i>parse error</i>. Discard the <a
2336-
href="#current-declaration"><i>current declaration</i></a> and switch to
2337-
the <a href="#next-statement-error-mode0"><i>next-statement error
2338-
mode</i></a>.
2339-
2340-
<dt>whitespace token
2341-
2342-
<dd> Do nothing. Remain in this mode.
2343-
2344-
<dt><span class=temp>{</span> token
2345-
2346-
<dt><span class=temp>[</span> token
2347-
2348-
<dt><span class=temp>(</span> token
2349-
2350-
<dd> <a href="#consume-a-block0"><i>Consume a block</i></a> with the
2351-
<i>current input token</i>. If a block is returned, append it to the
2352-
value of the <a href="#current-declaration"><i>current
2353-
declaration</i></a> and switch to the <a
2354-
href="#declaration-value-rest-mode0"><i>declaration-value-rest
2355-
mode</i></a>.
2356-
<p> Otherwise, discard the <a href="#current-declaration"><i>current
2357-
declaration</i></a> and switch to the <a
2358-
href="#next-statement-error-mode0"><i>next-statement error mode</i></a>.
2359-
2360-
2361-
<dt>function token
2362-
2363-
<dd> <i>Consume a function</i> with the <i>current input token</i>. If a
2364-
function is returned, append it to the value of the <a
2365-
href="#current-declaration"><i>current declaration</i></a>. and switch to
2366-
the <a href="#declaration-value-rest-mode0"><i>declaration-value-rest
2367-
mode</i></a>.
2368-
<p> Otherwise, discard the <a href="#current-declaration"><i>current
2369-
declaration</i></a> and switch to the <a
2370-
href="#next-statement-error-mode0"><i>next-statement error mode</i></a>.
2371-
2372-
2373-
<dt>semicolon token
2374-
2375-
<dd> Append the <a href="#current-declaration"><i>current
2376-
declaration</i></a> to the list of declarations for the <a
2377-
href="#current-rule"><i>current rule</i></a>. <a
2378-
href="#switch-to-the-current-rules-content-mode0"><i>Switch to the
2379-
current rule's content mode</i></a>.
2380-
2381-
<dt><span class=temp>}</span> token
2382-
2383-
<dd> Append the <a href="#current-declaration"><i>current
2384-
declaration</i></a> to the list of declarations for the <a
2385-
href="#current-rule"><i>current rule</i></a>. Pop the <a
2386-
href="#current-rule"><i>current rule</i></a> from the <a
2387-
href="#stack-of-open-rules"><i>stack of open rules</i></a>, and append it
2388-
to the list of rules for the new <a href="#current-rule"><i>current
2389-
rule</i></a>. <a
2390-
href="#switch-to-the-current-rules-content-mode0"><i>Switch to the
2391-
current rule's content mode</i></a>.
2392-
2393-
<dt>anything else
2394-
2395-
<dd> Append the <i>current input token</i> to the value of the <a
2396-
href="#current-declaration"><i>current declaration</i></a>. Switch to the
2397-
<a href="#declaration-value-rest-mode0"><i>declaration-value-rest
2398-
mode</i></a>.
2399-
</dl>
2400-
2401-
<h4 id=declaration-value-rest-mode><span class=secno>3.5.10. </span> <dfn
2402-
id=declaration-value-rest-mode0>Declaration-value-rest mode</dfn></h4>
2403-
2404-
<p> Consume the <a href="#next-input-token"><i>next input token</i></a>.
2405-
24062319
<dl>
24072320
<dt>cdo token
24082321

@@ -2478,7 +2391,7 @@ <h4 id=declaration-value-rest-mode><span class=secno>3.5.10. </span> <dfn
24782391
this mode.
24792392
</dl>
24802393

2481-
<h4 id=next-block-error-mode><span class=secno>3.5.11. </span> <dfn
2394+
<h4 id=next-block-error-mode><span class=secno>3.5.10. </span> <dfn
24822395
id=next-block-error-mode0>Next-block error mode</dfn></h4>
24832396

24842397
<p> Consume the <a href="#next-input-token"><i>next input token</i></a>.
@@ -2509,7 +2422,7 @@ <h4 id=next-block-error-mode><span class=secno>3.5.11. </span> <dfn
25092422
<dd> Do nothing. Remain in this mode.
25102423
</dl>
25112424

2512-
<h4 id=next-statement-error-mode><span class=secno>3.5.12. </span> <dfn
2425+
<h4 id=next-statement-error-mode><span class=secno>3.5.11. </span> <dfn
25132426
id=next-statement-error-mode0>Next-statement error mode</dfn></h4>
25142427

25152428
<p> Consume the <a href="#next-input-token"><i>next input token</i></a>.
@@ -2548,7 +2461,7 @@ <h4 id=next-statement-error-mode><span class=secno>3.5.12. </span> <dfn
25482461
<dd> Do nothing. Remain in this mode.
25492462
</dl>
25502463

2551-
<h4 id=next-block-or-statement-error-mode><span class=secno>3.5.13. </span>
2464+
<h4 id=next-block-or-statement-error-mode><span class=secno>3.5.12. </span>
25522465
<dfn id=next-block-or-statement-error-mode0>Next-block-or-statement error
25532466
mode</dfn></h4>
25542467

@@ -2586,7 +2499,7 @@ <h4 id=next-block-or-statement-error-mode><span class=secno>3.5.13. </span>
25862499
<dd> Do nothing. Remain in this mode.
25872500
</dl>
25882501

2589-
<h4 id=consume-a-block><span class=secno>3.5.14. </span> <dfn
2502+
<h4 id=consume-a-block><span class=secno>3.5.13. </span> <dfn
25902503
id=consume-a-block0>Consume a block</dfn></h4>
25912504

25922505
<p> This section describes how to <a href="#consume-a-block0"><i>consume a
@@ -2670,7 +2583,7 @@ <h4 id=consume-a-block><span class=secno>3.5.14. </span> <dfn
26702583
href="#current-block"><i>current block</i></a>.
26712584
</dl>
26722585

2673-
<h4 id=switch-to-the-current-rules-content-mode><span class=secno>3.5.15.
2586+
<h4 id=switch-to-the-current-rules-content-mode><span class=secno>3.5.14.
26742587
</span> <dfn id=switch-to-the-current-rules-content-mode0>Switch to the
26752588
current rule's content mode</dfn></h4>
26762589

@@ -2967,13 +2880,13 @@ <h2 class=no-num id=index> Index</h2>
29672880
title="Comment state"><strong>3.4.8.</strong></a>
29682881

29692882
<li>Consume a block, <a href="#consume-a-block0"
2970-
title="Consume a block"><strong>3.5.14.</strong></a>
2883+
title="Consume a block"><strong>3.5.13.</strong></a>
29712884

29722885
<li>Consume an escaped character, <a href="#consume-an-escaped-character0"
29732886
title="Consume an escaped character"><strong>3.4.25.</strong></a>
29742887

29752888
<li>current block, <a href="#current-block"
2976-
title="current block"><strong>3.5.14.</strong></a>
2889+
title="current block"><strong>3.5.13.</strong></a>
29772890

29782891
<li>current declaration, <a href="#current-declaration"
29792892
title="current declaration"><strong>3.5.2.</strong></a>
@@ -2993,9 +2906,6 @@ <h2 class=no-num id=index> Index</h2>
29932906
<li>Declaration-value mode, <a href="#declaration-value-mode0"
29942907
title="Declaration-value mode"><strong>3.5.9.</strong></a>
29952908

2996-
<li>Declaration-value-rest mode, <a href="#declaration-value-rest-mode0"
2997-
title="Declaration-value-rest mode"><strong>3.5.10.</strong></a>
2998-
29992909
<li>digit, <a href="#digit" title=digit><strong>3.4.2.</strong></a>
30002910

30012911
<li>Dimension state, <a href="#dimension-state0"
@@ -3005,13 +2915,13 @@ <h2 class=no-num id=index> Index</h2>
30052915
title="Double-quote-string state"><strong>3.4.4.</strong></a>
30062916

30072917
<li>ending token, <a href="#ending-token"
3008-
title="ending token"><strong>3.5.14.</strong></a>
2918+
title="ending token"><strong>3.5.13.</strong></a>
30092919

30102920
<li>end of the range, <a href="#end-of-the-range"
30112921
title="end of the range"><strong>3.4.26.</strong></a>
30122922

30132923
<li>error flag, <a href="#error-flag"
3014-
title="error flag"><strong>3.5.14.</strong></a>
2924+
title="error flag"><strong>3.5.13.</strong></a>
30152925

30162926
<li>Hash-rest state, <a href="#hash-rest-state0"
30172927
title="Hash-rest state"><strong>3.4.7.</strong></a>
@@ -3045,11 +2955,11 @@ <h2 class=no-num id=index> Index</h2>
30452955
<li>newline, <a href="#newline" title=newline><strong>3.4.2.</strong></a>
30462956

30472957
<li>Next-block error mode, <a href="#next-block-error-mode0"
3048-
title="Next-block error mode"><strong>3.5.11.</strong></a>
2958+
title="Next-block error mode"><strong>3.5.10.</strong></a>
30492959

30502960
<li>Next-block-or-statement error mode, <a
30512961
href="#next-block-or-statement-error-mode0"
3052-
title="Next-block-or-statement error mode"><strong>3.5.13.</strong></a>
2962+
title="Next-block-or-statement error mode"><strong>3.5.12.</strong></a>
30532963

30542964
<li>next input character, <a href="#next-input-character"
30552965
title="next input character"><strong>3.2.2.</strong></a>
@@ -3058,7 +2968,7 @@ <h2 class=no-num id=index> Index</h2>
30582968
title="next input token"><strong>3.5.2.</strong></a>
30592969

30602970
<li>Next-statement error mode, <a href="#next-statement-error-mode0"
3061-
title="Next-statement error mode"><strong>3.5.12.</strong></a>
2971+
title="Next-statement error mode"><strong>3.5.11.</strong></a>
30622972

30632973
<li>non-ASCII character, <a href="#non-ascii-character"
30642974
title="non-ASCII character"><strong>3.4.2.</strong></a>
@@ -3110,7 +3020,7 @@ <h2 class=no-num id=index> Index</h2>
31103020

31113021
<li>Switch to the current rule's content mode, <a
31123022
href="#switch-to-the-current-rules-content-mode0"
3113-
title="Switch to the current rule's content mode"><strong>3.5.15.</strong></a>
3023+
title="Switch to the current rule's content mode"><strong>3.5.14.</strong></a>
31143024

31153025

31163026
<li>Top-level mode, <a href="#top-level-mode"

‎css3-syntax/Overview.src.html‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -2290,76 +2290,6 @@ <h4>
22902290
<h4>
22912291
<dfn>Declaration-value mode</dfn></h4>
22922292

2293-
<p>
2294-
Consume the <i>next input token</i>.
2295-
2296-
<dl>
2297-
<dt>cdo token
2298-
<dt>cdc token
2299-
<dt><span class='temp'>]</span> token
2300-
<dt><span class='temp'>)</span> token
2301-
<dt>bad-string token
2302-
<dt>bad-url token
2303-
<dd>
2304-
This is a <i>parse error</i>.
2305-
Discard the <i>current declaration</i>
2306-
and switch to the <i>next-statement error mode</i>.
2307-
2308-
<dt>whitespace token
2309-
<dd>
2310-
Do nothing.
2311-
Remain in this mode.
2312-
2313-
<dt><span class='temp'>{</span> token
2314-
<dt><span class='temp'>[</span> token
2315-
<dt><span class='temp'>(</span> token
2316-
<dd>
2317-
<i>Consume a block</i> with the <i>current input token</i>.
2318-
If a block is returned,
2319-
append it to the value of the <i>current declaration</i>
2320-
and switch to the <i>declaration-value-rest mode</i>.
2321-
2322-
<p>
2323-
Otherwise,
2324-
discard the <i>current declaration</i>
2325-
and switch to the <i>next-statement error mode</i>.
2326-
2327-
<dt>function token
2328-
<dd>
2329-
<i>Consume a function</i> with the <i>current input token</i>.
2330-
If a function is returned,
2331-
append it to the value of the <i>current declaration</i>.
2332-
and switch to the <i>declaration-value-rest mode</i>.
2333-
2334-
<p>
2335-
Otherwise, discard the <i>current declaration</i>
2336-
and switch to the <i>next-statement error mode</i>.
2337-
2338-
<dt>semicolon token
2339-
<dd>
2340-
Append the <i>current declaration</i>
2341-
to the list of declarations for the <i>current rule</i>.
2342-
<i>Switch to the current rule's content mode</i>.
2343-
2344-
<dt><span class='temp'>}</span> token
2345-
<dd>
2346-
Append the <i>current declaration</i>
2347-
to the list of declarations for the <i>current rule</i>.
2348-
Pop the <i>current rule</i> from the <i>stack of open rules</i>,
2349-
and append it to the list of rules for the new <i>current rule</i>.
2350-
<i>Switch to the current rule's content mode</i>.
2351-
2352-
<dt>anything else
2353-
<dd>
2354-
Append the <i>current input token</i>
2355-
to the value of the <i>current declaration</i>.
2356-
Switch to the <i>declaration-value-rest mode</i>.
2357-
</dl>
2358-
2359-
2360-
<h4>
2361-
<dfn>Declaration-value-rest mode</dfn></h4>
2362-
23632293
<p>
23642294
Consume the <i>next input token</i>.
23652295

0 commit comments

Comments
 (0)