[css-syntax] Fold number-fraction into number-rest, since the sole difference was the treatment of '.'.

--HG--
extra : rebase_source : 12fd2e005f4d5481e664de4357f3c4c3f76e0e4d

Author: tabatkins

css-syntax/Overview.html

@@ -220,34 +220,31 @@ <h2 class="no-num no-toc" id=contents> Table of contents</h2>
        <li><a href="#number-rest-state"><span class=secno>4.4.10. </span>
         Number-rest state</a>
 
-       <li><a href="#number-fraction-state"><span class=secno>4.4.11. </span>
-        Number-fraction state</a>
-
-       <li><a href="#dimension-state"><span class=secno>4.4.12. </span>
+       <li><a href="#dimension-state"><span class=secno>4.4.11. </span>
         Dimension state</a>
 
-       <li><a href="#sci-notation-state"><span class=secno>4.4.13. </span>
+       <li><a href="#sci-notation-state"><span class=secno>4.4.12. </span>
         Sci-notation state</a>
 
-       <li><a href="#url-state"><span class=secno>4.4.14. </span> URL
+       <li><a href="#url-state"><span class=secno>4.4.13. </span> URL
         state</a>
 
-       <li><a href="#url-double-quote-state"><span class=secno>4.4.15.
+       <li><a href="#url-double-quote-state"><span class=secno>4.4.14.
         </span> URL-double-quote state</a>
 
-       <li><a href="#url-single-quote-state"><span class=secno>4.4.16.
+       <li><a href="#url-single-quote-state"><span class=secno>4.4.15.
         </span> URL-single-quote state</a>
 
-       <li><a href="#url-end-state"><span class=secno>4.4.17. </span> URL-end
+       <li><a href="#url-end-state"><span class=secno>4.4.16. </span> URL-end
         state</a>
 
-       <li><a href="#url-unquoted-state"><span class=secno>4.4.18. </span>
+       <li><a href="#url-unquoted-state"><span class=secno>4.4.17. </span>
         URL-unquoted state</a>
 
-       <li><a href="#bad-url-state"><span class=secno>4.4.19. </span> Bad-URL
+       <li><a href="#bad-url-state"><span class=secno>4.4.18. </span> Bad-URL
         state</a>
 
-       <li><a href="#unicode-range-state"><span class=secno>4.4.20. </span>
+       <li><a href="#unicode-range-state"><span class=secno>4.4.19. </span>
         Unicode-range state</a>
       </ul>
 
@@ -2043,8 +2040,8 @@ <h4 id=number-state><span class=secno>4.4.9. </span> <dfn
      character</i></a> is U+002E FULL STOP (.), consume the <a
      href="#next-input-character"><i title="next input character">next two
      input characters</i></a> and append them to the number token's
-     representation. Switch to the <a
-     href="#number-fraction-state0"><i>number-fraction state</i></a>.
+     representation. Set the number token's type flag to "number". Switch to
+     the <a href="#number-rest-state0"><i>number-rest state</i></a>.
 
     <p> Otherwise, consume the <a href="#next-input-character"><i>next input
      character</i></a> and append it to the number token's representation.
@@ -2056,8 +2053,9 @@ <h4 id=number-state><span class=secno>4.4.9. </span> <dfn
    <dd> Append the <a href="#current-input-character"><i>current input
     character</i></a> to the number token's representation. Consume the <a
     href="#next-input-character"><i>next input character</i></a> and append
-    it to the number token's representation. Switch to the <a
-    href="#number-fraction-state0"><i>number-fraction state</i></a>.
+    it to the number token's representation. Set the number token's type flag
+    to "number". Switch to the <a href="#number-rest-state0"><i>number-rest
+    state</i></a>.
 
    <dt><a href="#digit"><i>digit</i></a>
 
@@ -2087,107 +2085,18 @@ <h4 id=number-rest-state><span class=secno>4.4.10. </span> <dfn
 
    <dt>U+002E FULL STOP (.)
 
-   <dd> If the <a href="#next-input-character"><i>next input
-    character</i></a> is a <a href="#digit"><i>digit</i></a>, consume it.
-    Append U+002E FULL STOP (.) followed by the <a
-    href="#digit"><i>digit</i></a> to the number token's representation.
-    Switch to the <a href="#number-fraction-state0"><i>number-fraction
-    state</i></a>.
-    <p> Otherwise, set the number token's value to the number produced by
-     interpreting the number token's representation as a base-10 number and
-     emit it. Switch to the <a href="#data-state0"><i>data state</i></a>. <a
-     href="#reconsume-the-current-input-character"><i>Reconsume the current
-     input character</i></a>.
-
-   <dt>U+0025 PERCENT SIGN (%)
-
-   <dd> Emit a percentage token with its value set to the number produced by
-    interpreting the number token's representation as a base-10 number.
-    Switch to the <a href="#data-state0"><i>data state</i></a>.
-
-   <dt>U+0045 LATIN CAPITAL LETTER E (E)
-
-   <dt>U+0065 LATIN SMALL LETTER E (e)
-
-   <dd> If the <a href="#next-input-character"><i>next input
-    character</i></a> is a <a href="#digit"><i>digit</i></a>, or the <a
-    href="#next-input-character"><i title="next input character">next 2 input
-    characters</i></a> are U+002B PLUS SIGN (+) or U+002D HYPHEN-MINUS (-)
-    followed by a <a href="#digit"><i>digit</i></a>, consume them. Append
-    U+0065 LATIN SMALL LETTER E (e) and the consumed characters to the number
-    token's representation. Switch to the <a
-    href="#sci-notation-state0"><i>sci-notation state</i></a>.
-    <p> Otherwise, create a dimension token with its representation set to
-     the number token's representation, its value set to the number produced
-     by interpreting the number token's representation as a base-10 number,
-     and a unit initially set to the <a
-     href="#current-input-character"><i>current input character</i></a>.
-     Switch to the <a href="#dimension-state0"><i>dimension state</i></a>.
-
-   <dt>U+002D HYPHEN-MINUS (-)
-
-   <dd> If the input stream <a
-    href="#check-if-three-characters-would-start-an0"><i>starts with an
-    identifier</i></a>, create a dimension token with its representation set
-    to the number token's representation, its value set to the number
-    produced by interpreting the number token's representation as a base-10
-    number, and a unit initially set to the <a
-    href="#current-input-character"><i>current input character</i></a>.
-    Switch to the <a href="#dimension-state0"><i>dimension state</i></a>.
-    <p> Otherwise, set the number token's value to the number produced by
-     interpreting the number token's representation as a base-10 number and
-     emit it. Switch to the <a href="#data-state0"><i>data state</i></a>. <a
-     href="#reconsume-the-current-input-character"><i>Reconsume the current
-     input character</i></a>.
-
-   <dt><a href="#name-start-character"><i>name-start character</i></a>
-
-   <dd> Create a dimension token with its representation set to the number
-    token's representation, its value set to the number produced by
-    interpreting the number token's representation as a base-10 number, and a
-    unit initially set to the <a href="#current-input-character"><i>current
-    input character</i></a>. Switch to the <a
-    href="#dimension-state0"><i>dimension state</i></a>.
-
-   <dt>U+005C REVERSE SOLIDUS (\)
-
-   <dd> If the input stream <a
-    href="#check-if-two-characters-are-a-valid-esca0"><i>starts with a valid
-    escape</i></a>, <a href="#consume-an-escaped-character0"><i>consume an
-    escaped character</i></a>. Create a dimension token with its
-    representation set to the number token's representation, its value set to
-    the number produced by interpreting the number token's representation as
-    a base-10 number, and a unit initially set to the returned character.
-    Switch to the <a href="#dimension-state0"><i>dimension state</i></a>.
+   <dd> If the number token's type flag is currently "integer" and the <a
+    href="#next-input-character"><i>next input character</i></a> is a <a
+    href="#digit"><i>digit</i></a>, consume it. Append U+002E FULL STOP (.)
+    followed by the <a href="#digit"><i>digit</i></a> to the number token's
+    representation. Set the number token's type flag to "number". Remain in
+    this state.
     <p> Otherwise, set the number token's value to the number produced by
      interpreting the number token's representation as a base-10 number and
      emit it. Switch to the <a href="#data-state0"><i>data state</i></a>. <a
      href="#reconsume-the-current-input-character"><i>Reconsume the current
      input character</i></a>.
 
-   <dt>anything else
-
-   <dd> Emit a number token with its value set to the number produced by
-    interpreting the string token's value as a base-10 number. Switch to the
-    <a href="#data-state0"><i>data state</i></a>. <a
-    href="#reconsume-the-current-input-character"><i>Reconsume the current
-    input character</i></a>.
-  </dl>
-
-  <h4 id=number-fraction-state><span class=secno>4.4.11. </span> <dfn
-   id=number-fraction-state0>Number-fraction state</dfn></h4>
-
-  <p> Set the number token's type flag to "number".
-
-  <p> Consume the <a href="#next-input-character"><i>next input
-   character</i></a>.
-
-  <dl>
-   <dt><a href="#digit"><i>digit</i></a>
-
-   <dd> Append the <a href="#current-input-character"><i>current input
-    character</i></a> to the string token's value. Remain in this state.
-
    <dt>U+0025 PERCENT SIGN (%)
 
    <dd> Emit a percentage token with its value set to the number produced by
@@ -2263,7 +2172,7 @@ <h4 id=number-fraction-state><span class=secno>4.4.11. </span> <dfn
     input character</i></a>.
   </dl>
 
-  <h4 id=dimension-state><span class=secno>4.4.12. </span> <dfn
+  <h4 id=dimension-state><span class=secno>4.4.11. </span> <dfn
    id=dimension-state0>Dimension state</dfn></h4>
   <!--
 		This state is currently always entered with a dimension token
@@ -2303,7 +2212,7 @@ <h4 id=dimension-state><span class=secno>4.4.12. </span> <dfn
     input character</i></a>.
   </dl>
 
-  <h4 id=sci-notation-state><span class=secno>4.4.13. </span> <dfn
+  <h4 id=sci-notation-state><span class=secno>4.4.12. </span> <dfn
    id=sci-notation-state0>Sci-notation state</dfn></h4>
 
   <p> Set the number token's type flag to "number".
@@ -2336,7 +2245,7 @@ <h4 id=sci-notation-state><span class=secno>4.4.13. </span> <dfn
      input character</i></a>.
   </dl>
 
-  <h4 id=url-state><span class=secno>4.4.14. </span> <dfn id=url-state0>URL
+  <h4 id=url-state><span class=secno>4.4.13. </span> <dfn id=url-state0>URL
    state</dfn></h4>
 
   <p> Consume the <a href="#next-input-character"><i>next input
@@ -2376,7 +2285,7 @@ <h4 id=url-state><span class=secno>4.4.14. </span> <dfn id=url-state0>URL
     input character</i></a>.
   </dl>
 
-  <h4 id=url-double-quote-state><span class=secno>4.4.15. </span> <dfn
+  <h4 id=url-double-quote-state><span class=secno>4.4.14. </span> <dfn
    id=url-double-quote-state0>URL-double-quote state</dfn></h4>
 
   <p> If a url token has not yet been created since entering this state,
@@ -2422,7 +2331,7 @@ <h4 id=url-double-quote-state><span class=secno>4.4.15. </span> <dfn
     character</i></a> to the url token's value. Remain in this state.
   </dl>
 
-  <h4 id=url-single-quote-state><span class=secno>4.4.16. </span> <dfn
+  <h4 id=url-single-quote-state><span class=secno>4.4.15. </span> <dfn
    id=url-single-quote-state0>URL-single-quote state</dfn></h4>
 
   <p> If a url token has not yet been created since entering this state,
@@ -2468,7 +2377,7 @@ <h4 id=url-single-quote-state><span class=secno>4.4.16. </span> <dfn
     character</i></a> to the url token's value. Remain in this state.
   </dl>
 
-  <h4 id=url-end-state><span class=secno>4.4.17. </span> <dfn
+  <h4 id=url-end-state><span class=secno>4.4.16. </span> <dfn
    id=url-end-state0>URL-end state</dfn></h4>
 
   <p> Consume the <a href="#next-input-character"><i>next input
@@ -2494,7 +2403,7 @@ <h4 id=url-end-state><span class=secno>4.4.17. </span> <dfn
     input character</i></a>.
   </dl>
 
-  <h4 id=url-unquoted-state><span class=secno>4.4.18. </span> <dfn
+  <h4 id=url-unquoted-state><span class=secno>4.4.17. </span> <dfn
    id=url-unquoted-state0>URL-unquoted state</dfn></h4>
 
   <p> If a url token has not yet been created since entering this state,
@@ -2542,7 +2451,7 @@ <h4 id=url-unquoted-state><span class=secno>4.4.18. </span> <dfn
     character</i></a> to the url token's value. Remain in this state.
   </dl>
 
-  <h4 id=bad-url-state><span class=secno>4.4.19. </span> <dfn
+  <h4 id=bad-url-state><span class=secno>4.4.18. </span> <dfn
    id=bad-url-state0>Bad-URL state</dfn></h4>
 
   <p> Consume the <a href="#next-input-character"><i>next input
@@ -2573,7 +2482,7 @@ <h4 id=bad-url-state><span class=secno>4.4.19. </span> <dfn
    <dd> Do nothing. Remain in this state.
   </dl>
 
-  <h4 id=unicode-range-state><span class=secno>4.4.20. </span> <dfn
+  <h4 id=unicode-range-state><span class=secno>4.4.19. </span> <dfn
    id=unicode-range-state0>Unicode-range state</dfn></h4>
 
   <p> Create a new unicode-range token with an empty range.
@@ -4273,7 +4182,7 @@ <h2 class=no-num id=index> Index</h2>
     title="section 7.2."><strong>7.2.</strong></a>
 
    <li>Bad-URL state, <a href="#bad-url-state0"
-    title="section 4.4.19."><strong>4.4.19.</strong></a>
+    title="section 4.4.18."><strong>4.4.18.</strong></a>
 
    <li>check if three characters would start an identifier, <a
     href="#check-if-three-characters-would-start-an0"
@@ -4339,7 +4248,7 @@ <h2 class=no-num id=index> Index</h2>
    <li>digit, <a href="#digit" title="section 4.3."><strong>4.3.</strong></a>
 
    <li>Dimension state, <a href="#dimension-state0"
-    title="section 4.4.12."><strong>4.4.12.</strong></a>
+    title="section 4.4.11."><strong>4.4.11.</strong></a>
 
    <li>Double-quote-string state, <a href="#double-quote-string-state0"
     title="section 4.4.2."><strong>4.4.2.</strong></a>
@@ -4401,9 +4310,6 @@ <h2 class=no-num id=index> Index</h2>
    <li>non-printable character, <a href="#non-printable-character"
     title="section 4.3."><strong>4.3.</strong></a>
 
-   <li>Number-fraction state, <a href="#number-fraction-state0"
-    title="section 4.4.11."><strong>4.4.11.</strong></a>
-
    <li>Number-rest state, <a href="#number-rest-state0"
     title="section 4.4.10."><strong>4.4.10.</strong></a>
 
@@ -4458,7 +4364,7 @@ <h2 class=no-num id=index> Index</h2>
     title="section 7.2."><strong>7.2.</strong></a>
 
    <li>Sci-notation state, <a href="#sci-notation-state0"
-    title="section 4.4.13."><strong>4.4.13.</strong></a>
+    title="section 4.4.12."><strong>4.4.12.</strong></a>
 
    <li>Set the unicode-range token's range, <a
     href="#set-the-unicode-range-tokens-range0"
@@ -4508,25 +4414,25 @@ <h2 class=no-num id=index> Index</h2>
     title="section 4.4.8."><strong>4.4.8.</strong></a>
 
    <li>Unicode-range state, <a href="#unicode-range-state0"
-    title="section 4.4.20."><strong>4.4.20.</strong></a>
+    title="section 4.4.19."><strong>4.4.19.</strong></a>
 
    <li>uppercase letter, <a href="#uppercase-letter"
     title="section 4.3."><strong>4.3.</strong></a>
 
    <li>URL-double-quote state, <a href="#url-double-quote-state0"
-    title="section 4.4.15."><strong>4.4.15.</strong></a>
+    title="section 4.4.14."><strong>4.4.14.</strong></a>
 
    <li>URL-end state, <a href="#url-end-state0"
-    title="section 4.4.17."><strong>4.4.17.</strong></a>
+    title="section 4.4.16."><strong>4.4.16.</strong></a>
 
    <li>URL-single-quote state, <a href="#url-single-quote-state0"
-    title="section 4.4.16."><strong>4.4.16.</strong></a>
+    title="section 4.4.15."><strong>4.4.15.</strong></a>
 
    <li>URL state, <a href="#url-state0"
-    title="section 4.4.14."><strong>4.4.14.</strong></a>
+    title="section 4.4.13."><strong>4.4.13.</strong></a>
 
    <li>URL-unquoted state, <a href="#url-unquoted-state0"
-    title="section 4.4.18."><strong>4.4.18.</strong></a>
+    title="section 4.4.17."><strong>4.4.17.</strong></a>
 
    <li>whitespace, <a href="#whitespace"
     title="section 4.3."><strong>4.3.</strong></a>