W3C home > Mailing lists > Public > public-html-commits@w3.org > October 2009

html5/spec Overview.html,1.3433,1.3434

From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 23 Oct 2009 06:40:21 +0000
To: public-html-commits@w3.org
Message-Id: <E1N1Doz-0002BA-JM@lionel-hutz.w3.org>
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv8356

Modified Files:
	Overview.html 
Log Message:
Make a bunch of parsing terminology more consistent. (whatwg r4298)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.3433
retrieving revision 1.3434
diff -u -d -r1.3433 -r1.3434
--- Overview.html	23 Oct 2009 06:22:19 -0000	1.3433
+++ Overview.html	23 Oct 2009 06:40:18 -0000	1.3434
@@ -2307,15 +2307,14 @@
 
    <li><p>If <var title="">position</var> is past the end of <var title="">input</var>, return an error.</li>
 
-   <li><p>If the next character is a U+002B PLUS SIGN character (+),
-   advance <var title="">position</var> to the next character.  (The
-   "<code title="">+</code>" is ignored, but it is not
-   conforming.)</li>
+   <li><p>If the character indicated by <var title="">position</var>
+   is a U+002B PLUS SIGN character (+), advance <var title="">position</var> to the next character. (The "<code title="">+</code>" is ignored, but it is not conforming.)</li>
 
    <li><p>If <var title="">position</var> is past the end of <var title="">input</var>, return an error.</li>
 
-   <li><p>If the next character is not one of U+0030 DIGIT ZERO (0)
-   to U+0039 DIGIT NINE (9), then return an error.</li>
+   <li><p>If the character indicated by <var title="">position</var>
+   is not one of U+0030 DIGIT ZERO (0) to 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
@@ -2323,12 +2322,12 @@
 
    <li>
 
-    <p><i>Loop</i>: If the next character is one of U+0030 DIGIT ZERO
-    (0) to U+0039 DIGIT NINE (9):</p>
+    <p><i>Loop</i>: If the character indicated by <var title="">position</var> is one of U+0030 DIGIT ZERO (0) to U+0039
+    DIGIT NINE (9):</p>
 
     <ol><li>Multiply <var title="">value</var> by ten.</li>
 
-     <li>Add the value of the current character (0..9) to <var title="">value</var>.</li>
+     <li>Add the value of the character indicated by <var title="">position</var> (0..9) to <var title="">value</var>.</li>
 
      <li>Advance <var title="">position</var> to the next
      character.</li>
@@ -2398,8 +2397,9 @@
 
     </ol></li>
 
-   <li><p>If the next character is not one of U+0030 DIGIT ZERO (0)
-   to U+0039 DIGIT NINE (9), then return an error.</li>
+   <li><p>If the character indicated by <var title="">position</var>
+   is not one of U+0030 DIGIT ZERO (0) to 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
@@ -2407,12 +2407,12 @@
 
    <li>
 
-    <p>If the next character is one of U+0030 DIGIT ZERO (0) to U+0039
-    DIGIT NINE (9):</p>
+    <p>If the character indicated by <var title="">position</var> is
+    one of U+0030 DIGIT ZERO (0) to U+0039 DIGIT NINE (9):</p>
 
     <ol><li>Multiply <var title="">value</var> by ten.</li>
 
-     <li>Add the value of the current character (0..9) to <var title="">value</var>.</li>
+     <li>Add the value of the character indicated by <var title="">position</var> (0..9) to <var title="">value</var>.</li>
 
      <li>Advance <var title="">position</var> to the next
      character.</li>
@@ -2536,9 +2536,8 @@
      <li><p><i>Fraction loop</i>: Multiply <var title="">divisor</var>
      by ten.</li>
 
-     <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>
+     <li>Add the value of the character indicated by <var title="">position</var>, interpreted as a base-ten digit (0..9)
+     and divided by <var title="">divisor</var>, to <var title="">value</var>.</li>
 
      <li><p>Advance <var title="">position</var> to the next
      character.</li>
@@ -2750,16 +2749,17 @@
 
    <li><p>If <var title="">position</var> is past the end of <var title="">input</var>, return an error.</li>
 
-   <li><p>If the next character is a U+002B PLUS SIGN character (+),
-   advance <var title="">position</var> to the next character.</li>
+   <li><p>If the character indicated by <var title="">position</var>
+   is a U+002B PLUS SIGN character (+), advance <var title="">position</var> to the next character.</li>
 
    <li><p><a href="#collect-a-sequence-of-characters">Collect a sequence of characters</a> that are
    U+0030 DIGIT ZERO (0) characters, and discard them.</li>
 
    <li><p>If <var title="">position</var> is past the end of <var title="">input</var>, return an error.</li>
 
-   <li><p>If the next character is not one of U+0031 DIGIT ONE (1)
-   to U+0039 DIGIT NINE (9), then return an error.</li>
+   <li><p>If the character indicated by <var title="">position</var>
+   is not one of U+0031 DIGIT ONE (1) to 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
@@ -2774,14 +2774,15 @@
 
    <li>
 
-    <p>If the next character is a U+002E FULL STOP character (.):</p>
+    <p>If the character indicated by <var title="">position</var> is a
+    U+002E FULL STOP character (.):</p>
 
     <ol><li><p>Advance <var title="">position</var> to the next
      character.</li>
 
-     <li><p>If the next character is not one of U+0030 DIGIT ZERO (0)
-     to U+0039 DIGIT NINE (9), then return <var title="">value</var>
-     as an integer.</li>
+     <li><p>If the character indicated by <var title="">position</var>
+     is not one of U+0030 DIGIT ZERO (0) to U+0039 DIGIT NINE (9),
+     then return <var title="">value</var> as an integer.</li>
 
      <li><p><a href="#collect-a-sequence-of-characters">Collect a sequence of characters</a> in the range
      U+0030 DIGIT ZERO (0) to U+0039 DIGIT NINE (9). Let <var title="">length</var> be the number of characters collected. Let
@@ -2796,8 +2797,8 @@
    <li><p>If <var title="">position</var> is past the end of <var title="">input</var>, return <var title="">value</var> as a
    length.</li>
 
-   <li><p>If the next character is a U+0025 PERCENT SIGN character
-   (%), return <var title="">value</var> as a percentage.</li>
+   <li><p>If the character indicated by <var title="">position</var>
+   is a U+0025 PERCENT SIGN character (%), return <var title="">value</var> as a percentage.</li>
 
    <li><p>Return <var title="">value</var> as a length.</li>
 
@@ -4094,7 +4095,7 @@
     <ol><li><p>Append the character at <var title="">position</var> to
      the end of <var title="">output</var>.</li>
 
-     <li><p>Increment <var title="">position</var> so it points at the
+     <li><p>Advance <var title="">position</var> so it points at the
      next character in <var title="">input</var>.</li>
 
      <li><p>Return to step 5 in the overall set of steps.</li>
@@ -56778,8 +56779,8 @@
    the EOF character in the <a href="#data-state">data state</a>.</dd>
 
    <dt>Anything else</dt>
-   <dd><a href="#parse-error">Parse error</a>. Reconsume the current
-   character in the <a href="#before-doctype-name-state">before DOCTYPE name state</a>.</dd>
+   <dd><a href="#parse-error">Parse error</a>. Reconsume the character in the
+   <a href="#before-doctype-name-state">before DOCTYPE name state</a>.</dd>
 
   </dl><h5 id="before-doctype-name-state"><span class="secno">9.2.4.53 </span><dfn>Before DOCTYPE name state</dfn></h5>
 
@@ -56902,8 +56903,8 @@
    Reconsume the EOF character in the <a href="#data-state">data state</a>.</dd>
 
    <dt>Anything else</dt>
-   <dd><a href="#parse-error">Parse error</a>. Reconsume the current character in
-   the <a href="#before-doctype-public-identifier-state">before DOCTYPE public identifier state</a>.</dd>
+   <dd><a href="#parse-error">Parse error</a>. Reconsume the character in the
+   <a href="#before-doctype-public-identifier-state">before DOCTYPE public identifier state</a>.</dd>
 
   </dl><h5 id="before-doctype-public-identifier-state"><span class="secno">9.2.4.57 </span><dfn>Before DOCTYPE public identifier state</dfn></h5>
 
@@ -57075,8 +57076,8 @@
    Reconsume the EOF character in the <a href="#data-state">data state</a>.</dd>
 
    <dt>Anything else</dt>
-   <dd><a href="#parse-error">Parse error</a>. Reconsume the current character in
-   the <a href="#before-doctype-system-identifier-state">before DOCTYPE system identifier state</a>.</dd>
+   <dd><a href="#parse-error">Parse error</a>. Reconsume the character in the
+   <a href="#before-doctype-system-identifier-state">before DOCTYPE system identifier state</a>.</dd>
 
   </dl><h5 id="before-doctype-system-identifier-state"><span class="secno">9.2.4.63 </span><dfn>Before DOCTYPE system identifier state</dfn></h5>
 
Received on Friday, 23 October 2009 06:40:23 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Friday, 23 October 2009 06:40:42 GMT