html5/spec Overview.html,1.3056,1.3057

Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv29034

Modified Files:
	Overview.html 
Log Message:
Make the order of the tokeniser lines more consistent. (whatwg r3895)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.3056
retrieving revision 1.3057
diff -u -d -r1.3056 -r1.3057
--- Overview.html	18 Sep 2009 08:18:14 -0000	1.3056
+++ Overview.html	18 Sep 2009 08:24:31 -0000	1.3057
@@ -56579,9 +56579,8 @@
   <p>The tokenizer state machine consists of the states defined in the
   following subsections.</p>
 
-  <!-- XXX should go through these reordering the entries so that
-  they're in some consistent order, like, by Unicode, errors last, or
-  something -->
+  <!-- Order of the lists below is supposed to be non-error then
+  error, by unicode, then EOF, ending with "anything else" -->
 
   <h5 id="data-state"><span class="secno">9.2.4.1 </span><dfn>Data state</dfn></h5>
 
@@ -57249,11 +57248,6 @@
    <dd>Emit the comment token. Switch to the <a href="#data-state">data
    state</a>.</dd>
 
-   <dt>U+002D HYPHEN-MINUS (-)</dt>
-   <dd><a href="#parse-error">Parse error</a>. Append a U+002D HYPHEN-MINUS
-   (-) character to the comment token's data. Stay in the
-   <a href="#comment-end-state">comment end state</a>.</dd>
-
    <dt>U+0009 CHARACTER TABULATION</dt>
    <dt>U+000A LINE FEED (LF)</dt>
    <dt>U+000C FORM FEED (FF)</dt>
@@ -57267,6 +57261,11 @@
    <dd><a href="#parse-error">Parse error</a>. Switch to the <a href="#comment-end-bang-state">comment end bang
    state</a>.</dd>
 
+   <dt>U+002D HYPHEN-MINUS (-)</dt>
+   <dd><a href="#parse-error">Parse error</a>. Append a U+002D HYPHEN-MINUS
+   (-) character to the comment token's data. Stay in the
+   <a href="#comment-end-state">comment end state</a>.</dd>
+
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Emit the comment token. Reconsume
    the EOF character in the <a href="#data-state">data state</a>.</dd> <!-- For
@@ -57284,15 +57283,15 @@
 
   <p>Consume the <a href="#next-input-character">next input character</a>:</p>
 
-  <dl class="switch"><dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit the comment token. Switch to the <a href="#data-state">data
-   state</a>.</dd>
-
-   <dt>U+002D HYPHEN-MINUS (-)</dt>
+  <dl class="switch"><dt>U+002D HYPHEN-MINUS (-)</dt>
    <dd>Append two U+002D HYPHEN-MINUS (-) characters and a U+0021
    EXCLAMATION MARK (!) character to the comment token's data. Switch
    to the <a href="#comment-end-dash-state">comment end dash state</a>.</dd>
 
+   <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
+   <dd>Emit the comment token. Switch to the <a href="#data-state">data
+   state</a>.</dd>
+
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Emit the comment token. Reconsume
    the EOF character in the <a href="#data-state">data state</a>.</dd> <!-- see
@@ -57308,14 +57307,7 @@
 
   <p>Consume the <a href="#next-input-character">next input character</a>:</p>
 
-  <dl class="switch"><dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit the comment token. Switch to the <a href="#data-state">data
-   state</a>.</dd>
-
-   <dt>U+002D HYPHEN-MINUS (-)</dt>
-   <dd>Switch to the <a href="#comment-end-dash-state">comment end dash state</a>.</dd>
-
-   <dt>U+0009 CHARACTER TABULATION</dt>
+  <dl class="switch"><dt>U+0009 CHARACTER TABULATION</dt>
    <dt>U+000A LINE FEED (LF)</dt>
    <dt>U+000C FORM FEED (FF)</dt>
    <!--<dt>U+000D CARRIAGE RETURN (CR)</dt>-->
@@ -57323,6 +57315,13 @@
    <dd>Append the input character to the comment token's data. Stay in
    the <a href="#comment-end-space-state">comment end space state</a>.</dd>
 
+   <dt>U+002D HYPHEN-MINUS (-)</dt>
+   <dd>Switch to the <a href="#comment-end-dash-state">comment end dash state</a>.</dd>
+
+   <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
+   <dd>Emit the comment token. Switch to the <a href="#data-state">data
+   state</a>.</dd>
+
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Emit the comment token. Reconsume
    the EOF character in the <a href="#data-state">data state</a>.</dd> <!-- see
@@ -57363,17 +57362,17 @@
    <dt>U+0020 SPACE</dt>
    <dd>Stay in the <a href="#before-doctype-name-state">before DOCTYPE name state</a>.</dd>
 
-   <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd><a href="#parse-error">Parse error</a>. Create a new DOCTYPE token. Set its
-   <i>force-quirks flag</i> to <i>on</i>. Emit the token. Switch to
-   the <a href="#data-state">data state</a>.</dd>
-
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
    <dd>Create a new DOCTYPE token. Set the token's name to the
    lowercase version of the input character (add 0x0020 to the
    character's code point). Switch to the <a href="#doctype-name-state">DOCTYPE name
    state</a>.</dd>
 
+   <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
+   <dd><a href="#parse-error">Parse error</a>. Create a new DOCTYPE token. Set its
+   <i>force-quirks flag</i> to <i>on</i>. Emit the token. Switch to
+   the <a href="#data-state">data state</a>.</dd>
+
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Create a new DOCTYPE token. Set its
    <i>force-quirks flag</i> to <i>on</i>. Emit the token. Reconsume

Received on Friday, 18 September 2009 08:24:43 UTC