Skip to content

Commit 78deed1

Browse files
tabatkinstabatkins
committed
Use the term 'simple block' more consistently.
--HG-- extra : rebase_source : 2d51ca9c03c4b4829a0355e7ec4f86e53f72a3e6
1 parent 7a90084 commit 78deed1

2 files changed

Lines changed: 60 additions & 58 deletions

File tree

‎css3-syntax/Overview.html‎

Lines changed: 47 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,8 @@ <h2 class="no-num no-toc" id=contents> Table of contents</h2>
305305
<li><a href="#next-block-or-statement-error-mode"><span
306306
class=secno>3.6.12. </span> Next-block-or-statement error mode</a>
307307

308-
<li><a href="#consume-a-block"><span class=secno>3.6.13. </span>
309-
Consume a block</a>
308+
<li><a href="#consume-a-simple-block"><span class=secno>3.6.13.
309+
</span> Consume a simple block</a>
310310

311311
<li><a href="#consume-a-function"><span class=secno>3.6.14. </span>
312312
Consume a function</a>
@@ -2195,9 +2195,10 @@ <h4 id=top-level-mode-><span class=secno>3.6.2. </span> <dfn
21952195

21962196
<dt>{ token
21972197

2198-
<dd> This is a <i>parse error</i>. <a href="#consume-a-block0"><i>Consume
2199-
a block</i></a> with the <a href="#current-input-token"><i>current input
2200-
token</i></a>. Ignore the return value. Remain in this state.
2198+
<dd> This is a <i>parse error</i>. <a
2199+
href="#consume-a-simple-block0"><i>Consume a simple block</i></a> with
2200+
the <a href="#current-input-token"><i>current input token</i></a>. Ignore
2201+
the return value. Remain in this state.
22012202

22022203
<dt>anything else
22032204

@@ -2238,10 +2239,10 @@ <h4 id=at-rule-mode><span class=secno>3.6.3. </span> <dfn
22382239

22392240
<dt>( token
22402241

2241-
<dd> <a href="#consume-a-block0"><i>Consume a block</i></a> with the <a
2242-
href="#current-input-token"><i>current input token</i></a>. Append the
2243-
returned block to the prelude of the <a href="#current-rule"><i>current
2244-
rule</i></a> and remain in this mode.
2242+
<dd> <a href="#consume-a-simple-block0"><i>Consume a simple block</i></a>
2243+
with the <a href="#current-input-token"><i>current input token</i></a>.
2244+
Append the returned block to the prelude of the <a
2245+
href="#current-rule"><i>current rule</i></a> and remain in this mode.
22452246

22462247
<dt>function token
22472248

@@ -2309,10 +2310,10 @@ <h4 id=style-rule-mode><span class=secno>3.6.5. </span> <dfn
23092310

23102311
<dt>( token
23112312

2312-
<dd> <a href="#consume-a-block0"><i>Consume a block</i></a> with the <a
2313-
href="#current-input-token"><i>current input token</i></a>. Append the
2314-
returned block to the selector of the <a href="#current-rule"><i>current
2315-
rule</i></a> and remain in this mode.
2313+
<dd> <a href="#consume-a-simple-block0"><i>Consume a simple block</i></a>
2314+
with the <a href="#current-input-token"><i>current input token</i></a>.
2315+
Append the returned block to the selector of the <a
2316+
href="#current-rule"><i>current rule</i></a> and remain in this mode.
23162317

23172318
<dt>function token
23182319

@@ -2410,9 +2411,9 @@ <h4 id=declaration-value-mode><span class=secno>3.6.8. </span> <dfn
24102411

24112412
<dt>( token
24122413

2413-
<dd> <a href="#consume-a-block0"><i>Consume a block</i></a> with the <a
2414-
href="#current-input-token"><i>current input token</i></a>. Append the
2415-
returned block to the value of the <a
2414+
<dd> <a href="#consume-a-simple-block0"><i>Consume a simple block</i></a>
2415+
with the <a href="#current-input-token"><i>current input token</i></a>.
2416+
Append the returned block to the value of the <a
24162417
href="#current-declaration"><i>current declaration</i></a> and remain in
24172418
this mode.
24182419

@@ -2514,19 +2515,19 @@ <h4 id=next-block-error-mode><span class=secno>3.6.10. </span> <dfn
25142515
<dl>
25152516
<dt>{ token
25162517

2517-
<dd> <a href="#consume-a-block0"><i>Consume a block</i></a> with the <a
2518-
href="#current-input-token"><i>current input token</i></a>. Ignore the
2519-
return value. <a
2518+
<dd> <a href="#consume-a-simple-block0"><i>Consume a simple block</i></a>
2519+
with the <a href="#current-input-token"><i>current input token</i></a>.
2520+
Ignore the return value. <a
25202521
href="#switch-to-the-current-rules-content-mode0"><i>Switch to the
25212522
current rule's content mode</i></a>.
25222523

25232524
<dt>[ token
25242525

25252526
<dt>( token
25262527

2527-
<dd> <a href="#consume-a-block0"><i>Consume a block</i></a> with the <a
2528-
href="#current-input-token"><i>current input token</i></a>. Ignore the
2529-
return value. Remain in this mode.
2528+
<dd> <a href="#consume-a-simple-block0"><i>Consume a simple block</i></a>
2529+
with the <a href="#current-input-token"><i>current input token</i></a>.
2530+
Ignore the return value. Remain in this mode.
25302531

25312532
<dt>function token
25322533

@@ -2562,9 +2563,9 @@ <h4 id=next-declaration-error-mode><span class=secno>3.6.11. </span> <dfn
25622563

25632564
<dt>( token
25642565

2565-
<dd> <a href="#consume-a-block0"><i>Consume a block</i></a> with the <a
2566-
href="#current-input-token"><i>current input token</i></a>. Ignore the
2567-
return value. Remain in this mode.
2566+
<dd> <a href="#consume-a-simple-block0"><i>Consume a simple block</i></a>
2567+
with the <a href="#current-input-token"><i>current input token</i></a>.
2568+
Ignore the return value. Remain in this mode.
25682569

25692570
<dt>function token
25702571

@@ -2592,19 +2593,19 @@ <h4 id=next-block-or-statement-error-mode><span class=secno>3.6.12. </span>
25922593

25932594
<dt>{ token
25942595

2595-
<dd> <a href="#consume-a-block0"><i>Consume a block</i></a> with the <a
2596-
href="#current-input-token"><i>current input token</i></a>. Ignore the
2597-
return value. <a
2596+
<dd> <a href="#consume-a-simple-block0"><i>Consume a simple block</i></a>
2597+
with the <a href="#current-input-token"><i>current input token</i></a>.
2598+
Ignore the return value. <a
25982599
href="#switch-to-the-current-rules-content-mode0"><i>Switch to the
25992600
current rule's content mode</i></a>.
26002601

26012602
<dt>[ token
26022603

26032604
<dt>( token
26042605

2605-
<dd> <a href="#consume-a-block0"><i>Consume a block</i></a> with the <a
2606-
href="#current-input-token"><i>current input token</i></a>. Ignore the
2607-
return value. Remain in this mode.
2606+
<dd> <a href="#consume-a-simple-block0"><i>Consume a simple block</i></a>
2607+
with the <a href="#current-input-token"><i>current input token</i></a>.
2608+
Ignore the return value. Remain in this mode.
26082609

26092610
<dt>function token
26102611

@@ -2617,11 +2618,12 @@ <h4 id=next-block-or-statement-error-mode><span class=secno>3.6.12. </span>
26172618
<dd> Do nothing. Remain in this mode.
26182619
</dl>
26192620

2620-
<h4 id=consume-a-block><span class=secno>3.6.13. </span> <dfn
2621-
id=consume-a-block0>Consume a block</dfn></h4>
2621+
<h4 id=consume-a-simple-block><span class=secno>3.6.13. </span> <dfn
2622+
id=consume-a-simple-block0>Consume a simple block</dfn></h4>
26222623

2623-
<p> This section describes how to <a href="#consume-a-block0"><i>consume a
2624-
block</i></a>. It must be called with an {, [, or ( token.
2624+
<p> This section describes how to <a
2625+
href="#consume-a-simple-block0"><i>consume a simple block</i></a>. It must
2626+
be called with an {, [, or ( token.
26252627

26262628
<p> The <dfn id=ending-token>ending token</dfn> is the mirror variant of
26272629
the token this algorithm was called with. (E.g. if it was called with [,
@@ -2647,10 +2649,10 @@ <h4 id=consume-a-block><span class=secno>3.6.13. </span> <dfn
26472649

26482650
<dt>( token
26492651

2650-
<dd> <a href="#consume-a-block0"><i>Consume a block</i></a> with the <a
2651-
href="#current-input-token"><i>current input token</i></a>. Append the
2652-
returned block to the value of the <a href="#current-block"><i>current
2653-
block</i></a>.
2652+
<dd> <a href="#consume-a-simple-block0"><i>Consume a simple block</i></a>
2653+
with the <a href="#current-input-token"><i>current input token</i></a>.
2654+
Append the returned block to the value of the <a
2655+
href="#current-block"><i>current block</i></a>.
26542656

26552657
<dt>function token
26562658

@@ -2698,9 +2700,9 @@ <h4 id=consume-a-function><span class=secno>3.6.14. </span> <dfn
26982700

26992701
<dt>( token
27002702

2701-
<dd> <a href="#consume-a-block0"><i>Consume a block</i></a> with the <a
2702-
href="#current-input-token"><i>current input token</i></a>. Append the
2703-
returned block to the value of the <i>current argument</i>.
2703+
<dd> <a href="#consume-a-simple-block0"><i>Consume a simple block</i></a>
2704+
with the <a href="#current-input-token"><i>current input token</i></a>.
2705+
Append the returned block to the value of the <i>current argument</i>.
27042706

27052707
<dt>function token
27062708

@@ -3030,15 +3032,15 @@ <h2 class=no-num id=index> Index</h2>
30303032
<li>Comment state, <a href="#comment-state0"
30313033
title="Comment state"><strong>3.4.8.</strong></a>
30323034

3033-
<li>Consume a block, <a href="#consume-a-block0"
3034-
title="Consume a block"><strong>3.6.13.</strong></a>
3035-
30363035
<li>Consume a function, <a href="#consume-a-function0"
30373036
title="Consume a function"><strong>3.6.14.</strong></a>
30383037

30393038
<li>Consume an escaped character, <a href="#consume-an-escaped-character0"
30403039
title="Consume an escaped character"><strong>3.4.26.</strong></a>
30413040

3041+
<li>Consume a simple block, <a href="#consume-a-simple-block0"
3042+
title="Consume a simple block"><strong>3.6.13.</strong></a>
3043+
30423044
<li>current block, <a href="#current-block"
30433045
title="current block"><strong>3.6.13.</strong></a>
30443046

‎css3-syntax/Overview.src.html‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2223,7 +2223,7 @@ <h4>
22232223
<dt>{ token
22242224
<dd>
22252225
This is a <i>parse error</i>.
2226-
<i>Consume a block</i> with the <i>current input token</i>.
2226+
<i>Consume a simple block</i> with the <i>current input token</i>.
22272227
Ignore the return value.
22282228
Remain in this state.
22292229

@@ -2265,7 +2265,7 @@ <h4>
22652265
<dt>[ token
22662266
<dt>( token
22672267
<dd>
2268-
<i>Consume a block</i> with the <i>current input token</i>.
2268+
<i>Consume a simple block</i> with the <i>current input token</i>.
22692269
Append the returned block to the prelude of the <i>current rule</i>
22702270
and remain in this mode.
22712271

@@ -2332,7 +2332,7 @@ <h4>
23322332
<dt>[ token
23332333
<dt>( token
23342334
<dd>
2335-
<i>Consume a block</i> with the <i>current input token</i>.
2335+
<i>Consume a simple block</i> with the <i>current input token</i>.
23362336
Append the returned block to the selector of the <i>current rule</i>
23372337
and remain in this mode.
23382338

@@ -2431,7 +2431,7 @@ <h4>
24312431
<dt>[ token
24322432
<dt>( token
24332433
<dd>
2434-
<i>Consume a block</i> with the <i>current input token</i>.
2434+
<i>Consume a simple block</i> with the <i>current input token</i>.
24352435
Append the returned block to the value of the <i>current declaration</i>
24362436
and remain in this mode.
24372437

@@ -2525,14 +2525,14 @@ <h4>
25252525
<dl>
25262526
<dt>{ token
25272527
<dd>
2528-
<i>Consume a block</i> with the <i>current input token</i>.
2528+
<i>Consume a simple block</i> with the <i>current input token</i>.
25292529
Ignore the return value.
25302530
<i>Switch to the current rule's content mode</i>.
25312531

25322532
<dt>[ token
25332533
<dt>( token
25342534
<dd>
2535-
<i>Consume a block</i> with the <i>current input token</i>.
2535+
<i>Consume a simple block</i> with the <i>current input token</i>.
25362536
Ignore the return value.
25372537
Remain in this mode.
25382538

@@ -2571,7 +2571,7 @@ <h4>
25712571
<dt>[ token
25722572
<dt>( token
25732573
<dd>
2574-
<i>Consume a block</i> with the <i>current input token</i>.
2574+
<i>Consume a simple block</i> with the <i>current input token</i>.
25752575
Ignore the return value.
25762576
Remain in this mode.
25772577

@@ -2602,14 +2602,14 @@ <h4>
26022602

26032603
<dt>{ token
26042604
<dd>
2605-
<i>Consume a block</i> with the <i>current input token</i>.
2605+
<i>Consume a simple block</i> with the <i>current input token</i>.
26062606
Ignore the return value.
26072607
<i>Switch to the current rule's content mode</i>.
26082608

26092609
<dt>[ token
26102610
<dt>( token
26112611
<dd>
2612-
<i>Consume a block</i> with the <i>current input token</i>.
2612+
<i>Consume a simple block</i> with the <i>current input token</i>.
26132613
Ignore the return value.
26142614
Remain in this mode.
26152615

@@ -2627,10 +2627,10 @@ <h4>
26272627

26282628

26292629
<h4>
2630-
<dfn>Consume a block</dfn></h4>
2630+
<dfn>Consume a simple block</dfn></h4>
26312631

26322632
<p>
2633-
This section describes how to <i>consume a block</i>.
2633+
This section describes how to <i>consume a simple block</i>.
26342634
It must be called with an
26352635
{,
26362636
[,
@@ -2658,7 +2658,7 @@ <h4>
26582658
<dt>[ token
26592659
<dt>( token
26602660
<dd>
2661-
<i>Consume a block</i> with the <i>current input token</i>.
2661+
<i>Consume a simple block</i> with the <i>current input token</i>.
26622662
Append the returned block
26632663
to the value of the <i>current block</i>.
26642664

@@ -2706,7 +2706,7 @@ <h4>
27062706
<dt>[ token
27072707
<dt>( token
27082708
<dd>
2709-
<i>Consume a block</i> with the <i>current input token</i>.
2709+
<i>Consume a simple block</i> with the <i>current input token</i>.
27102710
Append the returned block
27112711
to the value of the <i>current argument</i>.
27122712

0 commit comments

Comments
 (0)