Skip to content

Commit

Permalink
[acgowt] (2) Change the 'floating point number' syntax to allow an ex…
Browse files Browse the repository at this point in the history 
…ponent.

git-svn-id: http://svn.whatwg.org/webapps@2242 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Sep 26, 2008
1 parent d5ae881 commit f5f7573
Show file tree
Hide file tree
Showing 2 changed files with 260 additions and 129 deletions.
188 changes: 126 additions & 62 deletions index
View file
Expand Up @@ -29,7 +29,7 @@

<h1 id=html-5>HTML 5</h1>

<h2 class="no-num no-toc" id=draft>Draft Recommendation &mdash; 25
<h2 class="no-num no-toc" id=draft>Draft Recommendation &mdash; 26
September 2008</h2>

<p>You can take part in this work. <a
Expand Down Expand Up @@ -3465,11 +3465,33 @@
<h5 id=real-numbers><span class=secno>2.4.3.3. </span>Real numbers</h5>

<p>A string is a <dfn id=valid1>valid floating point number</dfn> if it
consists of one of more characters in the range U+0030 DIGIT ZERO (0) to
U+0039 DIGIT NINE (9), optionally with a single U+002E FULL STOP (".")
character somewhere (either before these numbers, in between two numbers,
or after the numbers), all optionally prefixed with a U+002D HYPHEN-MINUS
("-") character.
consists of:

<ol class=brief>
<li>Optionally, a U+002D HYPHEN-MINUS ("-") character.

<li>A series of one or more characters in the range U+0030 DIGIT ZERO (0)
to U+0039 DIGIT NINE (9).

<li>Optionally:
<ol>
<li>A single U+002E FULL STOP (".") character.

<li>A series of one or more characters in the range U+0030 DIGIT ZERO
(0) to U+0039 DIGIT NINE (9).
</ol>

<li>Optionally:
<ol>
<li>Either a U+0065 LATIN SMALL LETTER E character or a U+0045 LATIN
CAPITAL LETTER E character.

<li>Optionally, a U+002D HYPHEN-MINUS ("-") character.

<li>A series of characters in the range U+0030 DIGIT ZERO (0) to U+0039
DIGIT NINE (9).
</ol>
</ol>

<p>The <dfn id=rules1>rules for parsing floating point number values</dfn>
are as given in the following algorithm. As with the previous algorithms,
Expand All @@ -3487,10 +3509,13 @@
title="">input</var>, initially pointing at the start of the string.

<li>
<p>Let <var title="">value</var> have the value 0.
<p>Let <var title="">value</var> have the value 1.

<li>
<p>Let <var title="">sign</var> have the value "positive".
<p>Let <var title="">divisor</var> have the value 1.

<li>
<p>Let <var title="">exponent</var> have the value 1.

<li>
<p><a href="#skip-whitespace">Skip whitespace</a>.
Expand All @@ -3500,11 +3525,12 @@
title="">input</var>, return an error.

<li>
<p>If the character indicated by <var title="">position</var> (the first
character) is a U+002D HYPHEN-MINUS ("-") character:</p>
<p>If the character indicated by <var title="">position</var> is a U+002D
HYPHEN-MINUS ("-") character:</p>

<ol>
<li>Let <var title="">sign</var> be "negative".
<li>Change <var title="">value</var> and <var title="">divisor</var> to
&#x2212;1.

<li>Advance <var title="">position</var> to the next character.

Expand All @@ -3513,75 +3539,106 @@
</ol>

<li>
<p>If the next character is not one of U+0030 DIGIT ZERO (0) .. U+0039
DIGIT NINE (9) or U+002E FULL STOP ("."), then return an error.

<li>
<p>If the next character is U+002E FULL STOP ("."), but either that is
the last character or the character after that one is not one of U+0030
DIGIT ZERO (0) .. U+0039 DIGIT NINE (9), then return an error.
<p>If the character indicated by <var title="">position</var> is not one
of U+0030 DIGIT ZERO (0) .. U+0039 DIGIT NINE (9), then return an error.
</li>
<!-- Ok. At this point we know we have a number. It might have
trailing garbage which we'll ignore, but it's a number, and we
won't return an error. -->

<li>
<p>If the next character is one of U+0030 DIGIT ZERO (0) .. U+0039 DIGIT
NINE (9):</p>
<p><a href="#collect">Collect a sequence of characters</a> in the range
U+0030 DIGIT ZERO (0) to U+0039 DIGIT NINE (9), and interpret the
resulting sequence as a base-ten integer. Multiply <var
title="">value</var> by that integer.

<li>If <var title="">position</var> is past the end of <var
title="">input</var>, return <var title="">value</var> and abort these
steps.

<li>
<p>If the character indicated by <var title="">position</var> is a U+002E
FULL STOP ("."), run these substeps:</p>

<ol>
<li>Multiply <var title="">value</var> by ten.
<li>
<p>Advance <var title="">position</var> to the next character.

<li>Add the value of the current character (0..9) to <var
title="">value</var>.
<li>
<p>If <var title="">position</var> is past the end of <var
title="">input</var>, or if the character indicated by <var
title="">position</var> is not one of U+0030 DIGIT ZERO (0) .. U+0039
DIGIT NINE (9), then return <var title="">value</var> and abort these
steps.

<li>Advance <var title="">position</var> to the next character.
<li>
<p><i>Fraction loop</i>: Multiply <var title="">divisor</var> by ten.

<li>If <var title="">position</var> is past the end of <var
title="">input</var>, then if <var title="">sign</var> is "positive",
return <var title="">value</var>, otherwise return 0-<var
<li>Add the value of the current character interpreted as a base-ten
digit (0..9) divided by <var title="">divisor</var>, to <var
title="">value</var>.

<li>Otherwise return to the top of step 10 in the overall algorithm
(that's the step within which these substeps find themselves).
<li>
<p>Advance <var title="">position</var> to the next character.

<li>
<p>If <var title="">position</var> is past the end of <var
title="">input</var>, then return <var title="">value</var> and abort
these steps.

<li>
<p>If the character indicated by <var title="">position</var> is one of
U+0030 DIGIT ZERO (0) .. U+0039 DIGIT NINE (9), return to the step
labeled <i>fraction loop</i> in these substeps.
</ol>

<li>
<p>Otherwise, if the next character is not a U+002E FULL STOP ("."), then
if <var title="">sign</var> is "positive", return <var
title="">value</var>, otherwise return 0-<var title="">value</var>.
<p>If the character indicated by <var title="">position</var> is a U+0065
LATIN SMALL LETTER E character or a U+0045 LATIN CAPITAL LETTER E
character, run these substeps:</p>

<li>
<p>The next character is a U+002E FULL STOP ("."). Advance <var
title="">position</var> to the character after that.
<ol>
<li>
<p>Advance <var title="">position</var> to the next character.

<li>
<p>Let <var title="">divisor</var> be 1.
<li>
<p>If <var title="">position</var> is past the end of <var
title="">input</var>, then return <var title="">value</var> and abort
these steps.

<li>
<p>If the next character is one of U+0030 DIGIT ZERO (0) .. U+0039 DIGIT
NINE (9):</p>
<li>
<p>If the character indicated by <var title="">position</var> is a
U+002D HYPHEN-MINUS ("-") character:</p>

<ol>
<li>Multiply <var title="">divisor</var> by ten.
<ol>
<li>Change <var title="">exponent</var> to &#x2212;1.

<li>Add the value of the current character (0..9) divided by <var
title="">divisor</var>, to <var title="">value</var>.
<li>Advance <var title="">position</var> to the next character.

<li>Advance <var title="">position</var> to the next character.
<li>
<p>If <var title="">position</var> is past the end of <var
title="">input</var>, then return <var title="">value</var> and
abort these steps.
</ol>

<li>If <var title="">position</var> is past the end of <var
title="">input</var>, then if <var title="">sign</var> is "positive",
return <var title="">value</var>, otherwise return 0-<var
title="">value</var>.
<li>
<p>If the character indicated by <var title="">position</var> is not
one of U+0030 DIGIT ZERO (0) .. U+0039 DIGIT NINE (9), then return
<var title="">value</var> and abort these steps.

<li>Otherwise return to the top of step 14 in the overall algorithm
(that's the step within which these substeps find themselves).
<li>
<p><a href="#collect">Collect a sequence of characters</a> in the range
U+0030 DIGIT ZERO (0) to U+0039 DIGIT NINE (9), and interpret the
resulting sequence as a base-ten integer. Multiply <var
title="">exponent</var> by that integer.

<li>
<p>Multiply <var title="">value</var> by ten raised to the <var
title="">exponent</var>th power.
</ol>

<li>
<p>Otherwise, if <var title="">sign</var> is "positive", return <var
title="">value</var>, otherwise return 0-<var title="">value</var>.
<p>Return <var title="">value</var>.
</ol>

<h5 id=ratios><span class=secno>2.4.3.4. </span>Ratios</h5>
Expand Down Expand Up @@ -29844,10 +29901,10 @@ function AddCloud(data, x, y) { ... }</pre>
the URL represented by its <a href="#value12"
title=concept-fe-value>value</a>. User agents may allow the user to set
the <a href="#value12" title=concept-fe-value>value</a> to a string that
is not a <span>value URL</span>. User agents should allow the user to set
the <a href="#value12" title=concept-fe-value>value</a> to the empty
string. User agents must not allow users to insert U+000A LINE FEED (LF)
or U+000D CARRIAGE RETURN (CR) characters into the <a href="#value12"
is not a <a href="#valid9">valid URL</a>. User agents should allow the
user to set the <a href="#value12" title=concept-fe-value>value</a> to the
empty string. User agents must not allow users to insert U+000A LINE FEED
(LF) or U+000D CARRIAGE RETURN (CR) characters into the <a href="#value12"
title=concept-fe-value>value</a>.

<p><strong>The <a href="#value8">value sanitization algorithm</a> is as
Expand Down Expand Up @@ -30022,8 +30079,8 @@ function AddCloud(data, x, y) { ... }</pre>
<p><strong>Constraint validation:</strong> When there is both a <a
href="#selected" title=concept-input-value-datetime>selected UTC date and
time</a> and a <a href="#minimum" title=concept-input-min-datetime>minimum
UTC date and time</a>, if the former is less than the latter, the element
is <a href="#suffering1">suffering from an underflow</a>.
UTC date and time</a>, if the former is earlier than the latter, the
element is <a href="#suffering1">suffering from an underflow</a>.

<p>The <code title=attr-input-max><a href="#max4">max</a></code> attribute,
if specified, must have a value that is a <a href="#valid6">valid UTC date
Expand All @@ -30037,11 +30094,18 @@ function AddCloud(data, x, y) { ... }</pre>
<p><strong>Constraint validation:</strong> When there is both a <a
href="#selected" title=concept-input-value-datetime>selected UTC date and
time</a> and a <a href="#maximum" title=concept-input-max-datetime>maximum
UTC date and time</a>, if the former is more than the latter, the element
UTC date and time</a>, if the former is later than the latter, the element
is <a href="#suffering2">suffering from an overflow</a>.

<p class=big-issue>... <code title=attr-input-step><a
href="#step0">step</a></code>
<p class=big-issue>The <code title=attr-input-step><a
href="#step0">step</a></code> attribute, if specified, must have a value
that is a ...</p>
<!-- values: positive non-zero floating point, or "any" -->
<!-- units: seconds -->
<!-- default: 60 -->
<!-- zero point: min, or 1970-01-01T00:00:00.0Z -->
<!-- allow rounding -->
<!-- <span>suffering from a step mismatch</span> -->

<p>The following common <code><a href="#input0">input</a></code> element
content attributes, DOM attributes, and methods apply to the element:
Expand Down

0 comments on commit f5f7573

Please sign in to comment.