Skip to content

Commit 8ccab4b

Browse files
tabatkinstabatkins
committed
[css-syntax] Fix an error where I'm consuming tokens rather than component values.
--HG-- extra : rebase_source : 4920eeaf3ff63ab7e56b73ed7c2f96e257c9217c
1 parent 08dfa30 commit 8ccab4b

2 files changed

Lines changed: 102 additions & 83 deletions

File tree

‎css-syntax/Overview.html‎

Lines changed: 97 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@
55
<meta content="text/html; charset=utf-8" http-equiv=Content-Type>
66
<title>CSS Syntax Module Level 3 (CSS3 Syntax)</title>
77
<!--
8-
<link href="http://purl.org/dc/terms/" rel="schema.dc">
9-
<link href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright" rel="dc.rights">
8+
<link href="http://purl.org/dc/terms/" rel="schema.dcterms">
9+
<link href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright" rel="dcterms.rights">
1010
-->
1111

12-
<meta content="CSS Syntax Module Level 3 (CSS3 Syntax)" name=dc.title>
13-
<meta content=text name=dc.type>
14-
<meta content=2013-04-04 name=dc.date>
15-
<meta content="Tab Atkins Jr." name=dc.creator>
16-
<meta content=W3C name=dc.publisher>
17-
<meta content="http://dev.w3.org/csswg/css3-syntax/" name=dc.identifier>
12+
<meta content="CSS Syntax Module Level 3 (CSS3 Syntax)" name=dcterms.title>
13+
<meta content=text name=dcterms.type>
14+
<meta content=2013-05-06 name=dcterms.date>
15+
<meta content="Tab Atkins Jr." name=dcterms.creator>
16+
<meta content=W3C name=dcterms.publisher>
17+
<meta content="http://dev.w3.org/csswg/css3-syntax/"
18+
name=dcterms.identifier>
1819
<link href="#contents" rel=contents>
1920
<link href="#index" rel=index>
2021
<link href="../default.css" rel=stylesheet type="text/css">
@@ -31,7 +32,7 @@
3132
<h1 class=p-name>CSS Syntax Module Level 3</h1>
3233

3334
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft <time
34-
class=dt-updated datetime=20130404> 4 April 2013</time></h2>
35+
class=dt-updated datetime=20130506> 6 May 2013</time></h2>
3536

3637
<dl>
3738
<dt>This version:
@@ -711,7 +712,10 @@ <h3 id=token-diagrams><span class=secno>4.1. </span> Token Railroad
711712
<p> These diagrams are <em>informative</em> and <em>incomplete</em>; they
712713
describe the grammar of "correct" tokens, but do not describe
713714
error-handling at all. They are provided solely to make it easier to get
714-
an intuitive grasp of the syntax of each token. <!--
715+
an intuitive grasp of the syntax of each token.
716+
717+
<p> Diagrams with names in all uppercase represent tokens. The rest are
718+
productions referred to by other diagrams. <!--
715719
The "source" of these diagrams is in ./Diagrams.src.html
716720
The generated SVG is copied here so that JavaScript is not required
717721
to view the spec.
@@ -1088,9 +1092,9 @@ <h3 id=token-diagrams><span class=secno>4.1. </span> Token Railroad
10881092
d="M458 31h10"></path><path
10891093
d="M 468 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
10901094

1091-
<dt id=number-diagram>NUMBER
1095+
<dt id=numeric-diagram>numeric
10921096

1093-
<dd><svg class=railroad-diagram height=179 width=713><g
1097+
<dd><svg class=railroad-diagram height=178 width=437><g
10941098
transform="translate(.5 .5)"><path
10951099
d="M 20 50 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path><g><path
10961100
d="M40 60h0"></path><path d="M108 60h0"></path><path
@@ -1149,70 +1153,80 @@ <h3 id=token-diagrams><span class=secno>4.1. </span> Token Railroad
11491153
d="M246 158h60"></path></g><path
11501154
d="M306 158a10 10 0 0 0 10 -10v0a10 10 0 0 0 -10 -10"></path></g><path
11511155
d="M316 138h10"></path></g><path
1152-
d="M376 138a10 10 0 0 0 10 -10v-58a10 10 0 0 1 10 -10"></path></g><g><path
1153-
d="M396 60h0"></path><path d="M672 60h0"></path><path
1154-
d="M396 60h20"></path><g><path d="M416 60h236"></path></g><path
1155-
d="M652 60h20"></path><path
1156-
d="M396 60a10 10 0 0 1 10 10v28a10 10 0 0 0 10 10"></path><g><path
1157-
d="M416 108h0"></path><path d="M652 108h0"></path><g><path
1158-
d="M416 108h0"></path><path d="M484 108h0"></path><path
1159-
d="M416 108h20"></path><g><path d="M436 108h0"></path><path
1160-
d="M464 108h0"></path><rect height=22 rx=10 ry=10 width=28 x=436
1161-
y=97></rect><text x=450 y=112>e</text></g><path
1162-
d="M464 108h20"></path><path
1163-
d="M416 108a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path><g><path
1164-
d="M436 138h0"></path><path d="M464 138h0"></path><rect height=22 rx=10
1165-
ry=10 width=28 x=436 y=127></rect><text x=450 y=142>E</text></g><path
1166-
d="M464 138a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path></g><g><path
1167-
d="M484 108h0"></path><path d="M552 108h0"></path><path
1168-
d="M484 108a10 10 0 0 0 10 -10v0a10 10 0 0 1 10 -10"></path><g><path
1169-
d="M504 88h0"></path><path d="M532 88h0"></path><rect height=22 rx=10
1170-
ry=10 width=28 x=504 y=77></rect><text x=518 y=92>+</text></g><path
1171-
d="M532 88a10 10 0 0 1 10 10v0a10 10 0 0 0 10 10"></path><path
1172-
d="M484 108h20"></path><g><path d="M504 108h28"></path></g><path
1173-
d="M532 108h20"></path><path
1174-
d="M484 108a10 10 0 0 1 10 10v0a10 10 0 0 0 10 10"></path><g><path
1175-
d="M504 128h0"></path><path d="M532 128h0"></path><rect height=22 rx=10
1176-
ry=10 width=28 x=504 y=117></rect><text x=518 y=132>-</text></g><path
1177-
d="M532 128a10 10 0 0 0 10 -10v0a10 10 0 0 1 10 -10"></path></g><path
1178-
d="M552 108h10"></path><g><path d="M562 108h0"></path><path
1179-
d="M642 108h0"></path><path d="M562 108h10"></path><g><path
1180-
d="M572 108h0"></path><path d="M632 108h0"></path><rect height=22
1181-
width=60 x=572 y=97></rect><text x=602 y=112>digit</text></g><path
1182-
d="M632 108h10"></path><path
1183-
d="M572 108a10 10 0 0 0 -10 10v0a10 10 0 0 0 10 10"></path><g><path
1184-
d="M572 128h60"></path></g><path
1185-
d="M632 128a10 10 0 0 0 10 -10v0a10 10 0 0 0 -10 -10"></path></g><path
1186-
d="M642 108h10"></path></g><path
1187-
d="M652 108a10 10 0 0 0 10 -10v-28a10 10 0 0 1 10 -10"></path></g><path
1188-
d="M 672 60 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
1156+
d="M376 138a10 10 0 0 0 10 -10v-58a10 10 0 0 1 10 -10"></path></g><path
1157+
d="M 396 60 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
1158+
1159+
<dt id=number-diagram>NUMBER
1160+
1161+
<dd><svg class=railroad-diagram height=150 width=453><g
1162+
transform="translate(.5 .5)"><path
1163+
d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path><path
1164+
d="M40 31h10"></path><g><path d="M50 31h0"></path><path
1165+
d="M126 31h0"></path><rect height=22 width=76 x=50 y=20></rect><text x=88
1166+
y=35>numeric</text></g><path d="M126 31h10"></path><g><path
1167+
d="M136 31h0"></path><path d="M412 31h0"></path><path
1168+
d="M136 31h20"></path><g><path d="M156 31h236"></path></g><path
1169+
d="M392 31h20"></path><path
1170+
d="M136 31a10 10 0 0 1 10 10v28a10 10 0 0 0 10 10"></path><g><path
1171+
d="M156 79h0"></path><path d="M392 79h0"></path><g><path
1172+
d="M156 79h0"></path><path d="M224 79h0"></path><path
1173+
d="M156 79h20"></path><g><path d="M176 79h0"></path><path
1174+
d="M204 79h0"></path><rect height=22 rx=10 ry=10 width=28 x=176
1175+
y=68></rect><text x=190 y=83>e</text></g><path
1176+
d="M204 79h20"></path><path
1177+
d="M156 79a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path><g><path
1178+
d="M176 109h0"></path><path d="M204 109h0"></path><rect height=22 rx=10
1179+
ry=10 width=28 x=176 y=98></rect><text x=190 y=113>E</text></g><path
1180+
d="M204 109a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path></g><g><path
1181+
d="M224 79h0"></path><path d="M292 79h0"></path><path
1182+
d="M224 79a10 10 0 0 0 10 -10v0a10 10 0 0 1 10 -10"></path><g><path
1183+
d="M244 59h0"></path><path d="M272 59h0"></path><rect height=22 rx=10
1184+
ry=10 width=28 x=244 y=48></rect><text x=258 y=63>+</text></g><path
1185+
d="M272 59a10 10 0 0 1 10 10v0a10 10 0 0 0 10 10"></path><path
1186+
d="M224 79h20"></path><g><path d="M244 79h28"></path></g><path
1187+
d="M272 79h20"></path><path
1188+
d="M224 79a10 10 0 0 1 10 10v0a10 10 0 0 0 10 10"></path><g><path
1189+
d="M244 99h0"></path><path d="M272 99h0"></path><rect height=22 rx=10
1190+
ry=10 width=28 x=244 y=88></rect><text x=258 y=103>-</text></g><path
1191+
d="M272 99a10 10 0 0 0 10 -10v0a10 10 0 0 1 10 -10"></path></g><path
1192+
d="M292 79h10"></path><g><path d="M302 79h0"></path><path
1193+
d="M382 79h0"></path><path d="M302 79h10"></path><g><path
1194+
d="M312 79h0"></path><path d="M372 79h0"></path><rect height=22 width=60
1195+
x=312 y=68></rect><text x=342 y=83>digit</text></g><path
1196+
d="M372 79h10"></path><path
1197+
d="M312 79a10 10 0 0 0 -10 10v0a10 10 0 0 0 10 10"></path><g><path
1198+
d="M312 99h60"></path></g><path
1199+
d="M372 99a10 10 0 0 0 10 -10v0a10 10 0 0 0 -10 -10"></path></g><path
1200+
d="M382 79h10"></path></g><path
1201+
d="M392 79a10 10 0 0 0 10 -10v-28a10 10 0 0 1 10 -10"></path></g><path
1202+
d="M 412 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
11891203

11901204
<dt id=dimension-diagram>DIMENSION
11911205

1192-
<dd><svg class=railroad-diagram height=62 width=249><g
1206+
<dd><svg class=railroad-diagram height=62 width=257><g
11931207
transform="translate(.5 .5)"><path
11941208
d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path><path
11951209
d="M40 31h10"></path><g><path d="M50 31h0"></path><path
1196-
d="M118 31h0"></path><rect height=22 width=68 x=50 y=20></rect><text x=84
1197-
y=35>NUMBER</text></g><path d="M118 31h10"></path><path
1198-
d="M128 31h10"></path><g><path d="M138 31h0"></path><path
1199-
d="M198 31h0"></path><rect height=22 width=60 x=138 y=20></rect><text
1200-
x=168 y=35>IDENT</text></g><path d="M198 31h10"></path><path
1201-
d="M 208 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
1210+
d="M126 31h0"></path><rect height=22 width=76 x=50 y=20></rect><text x=88
1211+
y=35>numeric</text></g><path d="M126 31h10"></path><path
1212+
d="M136 31h10"></path><g><path d="M146 31h0"></path><path
1213+
d="M206 31h0"></path><rect height=22 width=60 x=146 y=20></rect><text
1214+
x=176 y=35>IDENT</text></g><path d="M206 31h10"></path><path
1215+
d="M 216 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
12021216

12031217
<dt id=percentage-diagram>PERCENTAGE
12041218

1205-
<dd><svg class=railroad-diagram height=62 width=217><g
1219+
<dd><svg class=railroad-diagram height=62 width=225><g
12061220
transform="translate(.5 .5)"><path
12071221
d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path><path
12081222
d="M40 31h10"></path><g><path d="M50 31h0"></path><path
1209-
d="M118 31h0"></path><rect height=22 width=68 x=50 y=20></rect><text x=84
1210-
y=35>NUMBER</text></g><path d="M118 31h10"></path><path
1211-
d="M128 31h10"></path><g><path d="M138 31h0"></path><path
1212-
d="M166 31h0"></path><rect height=22 rx=10 ry=10 width=28 x=138
1213-
y=20></rect><text x=152 y=35>%</text></g><path
1214-
d="M166 31h10"></path><path
1215-
d="M 176 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
1223+
d="M126 31h0"></path><rect height=22 width=76 x=50 y=20></rect><text x=88
1224+
y=35>numeric</text></g><path d="M126 31h10"></path><path
1225+
d="M136 31h10"></path><g><path d="M146 31h0"></path><path
1226+
d="M174 31h0"></path><rect height=22 rx=10 ry=10 width=28 x=146
1227+
y=20></rect><text x=160 y=35>%</text></g><path
1228+
d="M174 31h10"></path><path
1229+
d="M 184 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
12161230

12171231
<dt id=unicode-range-diagram>UNICODE-RANGE
12181232

@@ -3616,16 +3630,18 @@ <h3 id=definitions0><span class=secno>5.3. </span> Definitions</h3>
36163630
<dl>
36173631
<dt><dfn id=current-input-token>current input token</dfn>
36183632

3619-
<dd> The token currently being operated on, from the list of tokens
3620-
produced by the tokenizer.
3633+
<dd> The token or <a href="#component-value"><i>component value</i></a>
3634+
currently being operated on, from the list of tokens produced by the
3635+
tokenizer.
36213636

36223637
<dt><dfn id=next-input-token>next input token</dfn>
36233638

3624-
<dd> The token following the <a href="#current-input-token"><i>current
3625-
input token</i></a> in the list of tokens produced by the tokenizer. If
3626-
there isn't a token following the <a
3627-
href="#current-input-token"><i>current input token</i></a>, the <a
3628-
href="#next-input-token"><i>next input token</i></a> is an EOF token.
3639+
<dd> The token or <a href="#component-value"><i>component value</i></a>
3640+
following the <a href="#current-input-token"><i>current input
3641+
token</i></a> in the list of tokens produced by the tokenizer. If there
3642+
isn't a token following the <a href="#current-input-token"><i>current
3643+
input token</i></a>, the <a href="#next-input-token"><i>next input
3644+
token</i></a> is an EOF token.
36293645

36303646
<dt><dfn id=eof-token>EOF token</dfn>
36313647

@@ -3637,9 +3653,11 @@ <h3 id=definitions0><span class=secno>5.3. </span> Definitions</h3>
36373653
<dt><dfn id=reconsume-the-current-input-token>reconsume the current input
36383654
token</dfn>
36393655

3640-
<dd> Push the current input token back onto the list of tokens produced by
3641-
the tokenizer, so that the next time a mode instructs you to consume the
3642-
next input token, it will instead reconsume the current input token.
3656+
<dd> Push the <a href="#current-input-token"><i>current input
3657+
token</i></a> back onto the list of tokens produced by the tokenizer, so
3658+
that the next time a mode instructs you to consume the next input token,
3659+
it will instead reconsume the <a href="#current-input-token"><i>current
3660+
input token</i></a>.
36433661

36443662
<dt><dfn id=ascii-case-insensitive>ASCII case-insensitive</dfn>
36453663

@@ -4094,8 +4112,9 @@ <h4 id=consume-a-list-of-declarations><span class=secno>5.5.4. </span> <dfn
40944112
<dt>anything else
40954113

40964114
<dd> This is a <a href="#parse-errors"><i>parse error</i></a>. Repeatedly
4097-
consume the <a href="#next-input-token"><i>next input token</i></a> until
4098-
it is a semicolon token or EOF token.
4115+
<a href="#consume-a-component-value0"><i>consume a component
4116+
value</i></a> from the <a href="#next-input-token"><i>next input
4117+
token</i></a> until it is a semicolon token or EOF token.
40994118
</dl>
41004119

41014120
<h4 id=consume-a-declaration><span class=secno>5.5.5. </span> <dfn
@@ -4520,7 +4539,7 @@ <h3 class=no-num id=normative-references> Normative references</h3>
45204539
<!-- Sorted by label -->
45214540

45224541
<dl class=bibliography>
4523-
<dt style="display: none"><!-- keeps the doc valid if the DL is empty -->
4542+
<dd style="display: none"><!-- keeps the doc valid if the DL is empty -->
45244543
<!---->
45254544

45264545
<dt id=RFC2119>[RFC2119]
@@ -4539,7 +4558,7 @@ <h3 class=no-num id=other-references> Other references</h3>
45394558
<!-- Sorted by label -->
45404559

45414560
<dl class=bibliography>
4542-
<dt style="display: none"><!-- keeps the doc valid if the DL is empty -->
4561+
<dd style="display: none"><!-- keeps the doc valid if the DL is empty -->
45434562
<!---->
45444563

45454564
<dt id=SELECT>[SELECT]

‎css-syntax/Overview.src.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2576,11 +2576,11 @@ <h3>
25762576
<dl>
25772577
<dt><dfn>current input token</dfn>
25782578
<dd>
2579-
The token currently being operated on, from the list of tokens produced by the tokenizer.
2579+
The token or <i>component value</i> currently being operated on, from the list of tokens produced by the tokenizer.
25802580

25812581
<dt><dfn>next input token</dfn>
25822582
<dd>
2583-
The token following the <i>current input token</i> in the list of tokens produced by the tokenizer.
2583+
The token or <i>component value</i> following the <i>current input token</i> in the list of tokens produced by the tokenizer.
25842584
If there isn't a token following the <i>current input token</i>,
25852585
the <i>next input token</i> is an EOF token.
25862586

@@ -2592,9 +2592,9 @@ <h3>
25922592

25932593
<dt><dfn>reconsume the current input token</dfn>
25942594
<dd>
2595-
Push the current input token back onto the list of tokens produced by the tokenizer,
2595+
Push the <i>current input token</i> back onto the list of tokens produced by the tokenizer,
25962596
so that the next time a mode instructs you to consume the next input token,
2597-
it will instead reconsume the current input token.
2597+
it will instead reconsume the <i>current input token</i>.
25982598

25992599
<dt><dfn>ASCII case-insensitive</dfn>
26002600
<dd>
@@ -3131,7 +3131,7 @@ <h4>
31313131
<dt>anything else</dd>
31323132
<dd>
31333133
This is a <i>parse error</i>.
3134-
Repeatedly consume the <i>next input token</i>
3134+
Repeatedly <i>consume a component value</i> from the <i>next input token</i>
31353135
until it is a semicolon token or EOF token.
31363136
</dl>
31373137

0 commit comments

Comments
 (0)