[html5] r3895 - [e] (0) Make the order of the tokeniser lines more consistent.

whatwg at whatwg.org whatwg at whatwg.org
Fri Sep 18 01:30:38 PDT 2009


Author: ianh
Date: 2009-09-18 01:30:37 -0700 (Fri, 18 Sep 2009)
New Revision: 3895

Modified:
   index
   source
Log:
[e] (0) Make the order of the tokeniser lines more consistent.

Modified: index
===================================================================
--- index	2009-09-18 08:24:19 UTC (rev 3894)
+++ index	2009-09-18 08:30:37 UTC (rev 3895)
@@ -62857,9 +62857,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>
 
@@ -63527,11 +63526,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>
@@ -63545,6 +63539,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
@@ -63562,15 +63561,15 @@
 
   <p>Consume the <a href=#next-input-character>next input character</a>:</p>
 
-  <dl class=switch><dt>U+003E GREATER-THAN SIGN (>)</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 (>)</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
@@ -63586,14 +63585,7 @@
 
   <p>Consume the <a href=#next-input-character>next input character</a>:</p>
 
-  <dl class=switch><dt>U+003E GREATER-THAN SIGN (>)</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>-->
@@ -63601,6 +63593,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 (>)</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
@@ -63641,17 +63640,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 (>)</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 (>)</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

Modified: source
===================================================================
--- source	2009-09-18 08:24:19 UTC (rev 3894)
+++ source	2009-09-18 08:30:37 UTC (rev 3895)
@@ -72003,7 +72003,7 @@
   network error if the <span>origin</span> of the <span>URL</span> of
   the resource to be <span title="fetch">fetched</span> is not the
   <span>same origin</span> as that of the <span>first script</span>
-  when the <span title="dom-EventSource">EventSource()</code>
+  when the <code title="dom-EventSource">EventSource()</code>
   constructor is invoked.</p>
 
   <!-- v2: add CORS support -->
@@ -77616,9 +77616,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><dfn>Data state</dfn></h5>
 
@@ -78380,11 +78379,6 @@
    <dd>Emit the comment token. Switch to the <span>data
    state</span>.</dd>
 
-   <dt>U+002D HYPHEN-MINUS (-)</dt>
-   <dd><span>Parse error</span>. Append a U+002D HYPHEN-MINUS
-   (-) character to the comment token's data. Stay in the
-   <span>comment end state</span>.</dd>
-
    <dt>U+0009 CHARACTER TABULATION</dt>
    <dt>U+000A LINE FEED (LF)</dt>
    <dt>U+000C FORM FEED (FF)</dt>
@@ -78398,6 +78392,11 @@
    <dd><span>Parse error</span>. Switch to the <span>comment end bang
    state</span>.</dd>
 
+   <dt>U+002D HYPHEN-MINUS (-)</dt>
+   <dd><span>Parse error</span>. Append a U+002D HYPHEN-MINUS
+   (-) character to the comment token's data. Stay in the
+   <span>comment end state</span>.</dd>
+
    <dt>EOF</dt>
    <dd><span>Parse error</span>. Emit the comment token. Reconsume
    the EOF character in the <span>data state</span>.</dd> <!-- For
@@ -78420,15 +78419,15 @@
 
   <dl class="switch">
 
-   <dt>U+003E GREATER-THAN SIGN (>)</dt>
-   <dd>Emit the comment token. Switch to the <span>data
-   state</span>.</dd>
-
    <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 <span>comment end dash state</span>.</dd>
 
+   <dt>U+003E GREATER-THAN SIGN (>)</dt>
+   <dd>Emit the comment token. Switch to the <span>data
+   state</span>.</dd>
+
    <dt>EOF</dt>
    <dd><span>Parse error</span>. Emit the comment token. Reconsume
    the EOF character in the <span>data state</span>.</dd> <!-- see
@@ -78449,13 +78448,6 @@
 
   <dl class="switch">
 
-   <dt>U+003E GREATER-THAN SIGN (>)</dt>
-   <dd>Emit the comment token. Switch to the <span>data
-   state</span>.</dd>
-
-   <dt>U+002D HYPHEN-MINUS (-)</dt>
-   <dd>Switch to the <span>comment end dash state</span>.</dd>
-
    <dt>U+0009 CHARACTER TABULATION</dt>
    <dt>U+000A LINE FEED (LF)</dt>
    <dt>U+000C FORM FEED (FF)</dt>
@@ -78464,6 +78456,13 @@
    <dd>Append the input character to the comment token's data. Stay in
    the <span>comment end space state</span>.</dd>
 
+   <dt>U+002D HYPHEN-MINUS (-)</dt>
+   <dd>Switch to the <span>comment end dash state</span>.</dd>
+
+   <dt>U+003E GREATER-THAN SIGN (>)</dt>
+   <dd>Emit the comment token. Switch to the <span>data
+   state</span>.</dd>
+
    <dt>EOF</dt>
    <dd><span>Parse error</span>. Emit the comment token. Reconsume
    the EOF character in the <span>data state</span>.</dd> <!-- see
@@ -78514,17 +78513,17 @@
    <dt>U+0020 SPACE</dt>
    <dd>Stay in the <span>before DOCTYPE name state</span>.</dd>
 
-   <dt>U+003E GREATER-THAN SIGN (>)</dt>
-   <dd><span>Parse error</span>. Create a new DOCTYPE token. Set its
-   <i>force-quirks flag</i> to <i>on</i>. Emit the token. Switch to
-   the <span>data state</span>.</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 <span>DOCTYPE name
    state</span>.</dd>
 
+   <dt>U+003E GREATER-THAN SIGN (>)</dt>
+   <dd><span>Parse error</span>. Create a new DOCTYPE token. Set its
+   <i>force-quirks flag</i> to <i>on</i>. Emit the token. Switch to
+   the <span>data state</span>.</dd>
+
    <dt>EOF</dt>
    <dd><span>Parse error</span>. Create a new DOCTYPE token. Set its
    <i>force-quirks flag</i> to <i>on</i>. Emit the token. Reconsume




More information about the Commit-Watchers mailing list