[html5] r1832 - [e] (0) Make the language around parse errors and ignoring tokens more consisten [...]
whatwg at whatwg.org
whatwg at whatwg.org
Mon Jun 30 15:47:20 PDT 2008
Author: ianh
Date: 2008-06-30 15:47:19 -0700 (Mon, 30 Jun 2008)
New Revision: 1832
Modified:
index
source
Log:
[e] (0) Make the language around parse errors and ignoring tokens more consistent. (bug 5792) (credit: hs)
Modified: index
===================================================================
--- index 2008-06-30 21:58:13 UTC (rev 1831)
+++ index 2008-06-30 22:47:19 UTC (rev 1832)
@@ -47501,8 +47501,8 @@
<dd>
<p>If the <a href="#form-element"><code title=form>form</code> element
- pointer</a> is not null, ignore the token with a <a href="#parse2">parse
- error</a>.</p>
+ pointer</a> is not null, then this is a <a href="#parse2">parse
+ error</a>; ignore the token.</p>
<p>Otherwise:</p>
@@ -47644,7 +47644,7 @@
<p>If the <a href="#stack">stack of open elements</a> does not <a
href="#have-an" title="has an element in scope">have an element in
scope</a> with the same tag name as that of the token, then this is a <a
- href="#parse2">parse error</a>.</p>
+ href="#parse2">parse error</a>; ignore the token.</p>
<p>Otherwise, run these steps:</p>
@@ -47674,7 +47674,7 @@
<p>If the <a href="#stack">stack of open elements</a> does not <a
href="#have-an" title="has an element in scope">have an element in
scope</a> with the same tag name as that of the token, then this is a <a
- href="#parse2">parse error</a>.</p>
+ href="#parse2">parse error</a>; ignore the token.</p>
<p>Otherwise, run these steps:</p>
@@ -47731,7 +47731,7 @@
<p>If the <a href="#stack">stack of open elements</a> does not <a
href="#have-an" title="has an element in scope">have an element in
scope</a> with the same tag name as that of the token, then this is a <a
- href="#parse2">parse error</a>.</p>
+ href="#parse2">parse error</a>; ignore the token.</p>
<p>Otherwise, run these steps:</p>
@@ -47760,10 +47760,10 @@
<p>If the <a href="#stack">stack of open elements</a> does not <a
href="#have-an" title="has an element in scope">have an element in
scope</a> whose tag name is one of "h1", "h2", "h3", "h4", "h5", or
- "h6", then this is a <a href="#parse2">parse error</a>.
- <!-- XXX quirk: Act as if
- a start tag with the tag name given in the token had been seen,
- then reprocess the current token. --></p>
+ "h6", then this is a <a href="#parse2">parse error</a>; ignore the
+ token. <!--
+ XXX quirk: Act as if a start tag with the tag name given in the
+ token had been seen, then reprocess the current token. --></p>
<p>Otherwise, run these steps:</p>
@@ -47842,7 +47842,7 @@
<p>If the <a href="#stack">stack of open elements</a> <a href="#have-an"
title="has an element in scope">has a <code>nobr</code> element in
- scope</a>, then this is a <a href="#parse2">parse error</a>. Act as if
+ scope</a>, then this is a <a href="#parse2">parse error</a>; act as if
an end tag with the tag name "nobr" had been seen, then once again <a
href="#reconstruct">reconstruct the active formatting elements</a>, if
any.</p>
@@ -47874,8 +47874,8 @@
<p>If there is no such node, or, if that node is also in the <a
href="#stack">stack of open elements</a> but the element is not <a
href="#have-an" title="has an element in scope">in scope</a>, then
- this is a <a href="#parse2">parse error</a>. Abort these steps. The
- token is ignored.</p>
+ this is a <a href="#parse2">parse error</a>; ignore the token, and
+ abort these steps.</p>
<p>Otherwise, if there is such a node, but that node is not in the <a
href="#stack">stack of open elements</a>, then this is a <a
@@ -48059,7 +48059,7 @@
<p>If the <a href="#stack">stack of open elements</a> does not <a
href="#have-an" title="has an element in scope">have an element in
scope</a> with the same tag name as that of the token, then this is a <a
- href="#parse2">parse error</a>.</p>
+ href="#parse2">parse error</a>; ignore the token.</p>
<p>Otherwise, run these steps:</p>
@@ -48439,7 +48439,7 @@
<dt>Any other end tag
<dd>
- <p>Run the following algorithm:</p>
+ <p>Run the following steps:</p>
<ol>
<li>
@@ -48462,15 +48462,15 @@
<li>
<p>Pop all the nodes from the <a href="#current5">current node</a> up
to <var title="">node</var>, including <var title="">node</var>,
- then stop this algorithm.
+ then stop these steps.
</ol>
<li>
<p>Otherwise, if <var title="">node</var> is in neither the <a
href="#formatting">formatting</a> category nor the <a
href="#phrasing1">phrasing</a> category, then this is a <a
- href="#parse2">parse error</a>. Stop this algorithm. The end tag token
- is ignored.
+ href="#parse2">parse error</a>; ignore the token, and abort these
+ steps.
<li>
<p>Set <var title="">node</var> to the previous entry in the <a
@@ -48781,7 +48781,7 @@
<dd>
<p>If the <a href="#current5">current node</a> is the root <code><a
href="#html">html</a></code> element, then this is a <a
- href="#parse2">parse error</a>, ignore the token. (<a
+ href="#parse2">parse error</a>; ignore the token. (<a
href="#fragment">fragment case</a>)</p>
<p>Otherwise, pop the <a href="#current5">current node</a> (which will be
@@ -49160,14 +49160,14 @@
<p>If the <a href="#current5">current node</a> is an
<code>optgroup</code> element, then pop that node from the <a
href="#stack">stack of open elements</a>. Otherwise, this is a <a
- href="#parse2">parse error</a>, ignore the token.</p>
+ href="#parse2">parse error</a>; ignore the token.</p>
<dt>An end tag whose tag name is "option"
<dd>
<p>If the <a href="#current5">current node</a> is an <code>option</code>
element, then pop that node from the <a href="#stack">stack of open
- elements</a>. Otherwise, this is a <a href="#parse2">parse error</a>,
+ elements</a>. Otherwise, this is a <a href="#parse2">parse error</a>;
ignore the token.</p>
<dt>An end tag whose tag name is "select"
Modified: source
===================================================================
--- source 2008-06-30 21:58:13 UTC (rev 1831)
+++ source 2008-06-30 22:47:19 UTC (rev 1832)
@@ -44624,8 +44624,8 @@
<dd>
<p>If the <span><code title="form">form</code> element
- pointer</span> is not null, ignore the token with a
- <span>parse error</span>.</p>
+ pointer</span> is not null, then this is a <span>parse
+ error</span>; ignore the token.</p>
<p>Otherwise:</p>
@@ -44771,7 +44771,7 @@
<p>If the <span>stack of open elements</span> does not <span
title="has an element in scope">have an element in scope</span>
with the same tag name as that of the token, then this is a
- <span>parse error</span>.</p>
+ <span>parse error</span>; ignore the token.</p>
<p>Otherwise, run these steps:</p>
@@ -44801,7 +44801,7 @@
<p>If the <span>stack of open elements</span> does not <span
title="has an element in scope">have an element in scope</span>
with the same tag name as that of the token, then this is a
- <span>parse error</span>.</p>
+ <span>parse error</span>; ignore the token.</p>
<p>Otherwise, run these steps:</p>
@@ -44858,7 +44858,7 @@
<p>If the <span>stack of open elements</span> does not <span
title="has an element in scope">have an element in scope</span>
with the same tag name as that of the token, then this is a
- <span>parse error</span>.</p>
+ <span>parse error</span>; ignore the token.</p>
<p>Otherwise, run these steps:</p>
@@ -44886,9 +44886,9 @@
<p>If the <span>stack of open elements</span> does not <span
title="has an element in scope">have an element in scope</span>
whose tag name is one of "h1", "h2", "h3", "h4", "h5", or "h6",
- then this is a <span>parse error</span>. <!-- XXX quirk: Act as if
- a start tag with the tag name given in the token had been seen,
- then reprocess the current token. --></p>
+ then this is a <span>parse error</span>; ignore the token. <!--
+ XXX quirk: Act as if a start tag with the tag name given in the
+ token had been seen, then reprocess the current token. --></p>
<p>Otherwise, run these steps:</p>
@@ -44971,12 +44971,12 @@
<p><span>Reconstruct the active formatting elements</span>, if
any.</p>
- <p>If the <span>stack of open elements</span> <span title="has
- an element in scope">has a <code>nobr</code> element in
- scope</span>, then this is a <span>parse error</span>. Act as
- if an end tag with the tag name "nobr" had been
- seen, then once again <span>reconstruct the active formatting
- elements</span>, if any.</p>
+ <p>If the <span>stack of open elements</span> <span title="has an
+ element in scope">has a <code>nobr</code> element in scope</span>,
+ then this is a <span>parse error</span>; act as if an end tag with
+ the tag name "nobr" had been seen, then once again
+ <span>reconstruct the active formatting elements</span>, if
+ any.</p>
<p><span>Insert an HTML element</span> for the token. Add that
element to the <span>list of active formatting
@@ -45010,10 +45010,10 @@
</ul>
<p>If there is no such node, or, if that node is also in the
- <span>stack of open elements</span> but the element is not
- <span title="has an element in scope">in scope</span>, then
- this is a <span>parse error</span>. Abort these steps. The
- token is ignored.</p>
+ <span>stack of open elements</span> but the element is not <span
+ title="has an element in scope">in scope</span>, then this is a
+ <span>parse error</span>; ignore the token, and abort these
+ steps.</p>
<p>Otherwise, if there is such a node, but that node is not
in the <span>stack of open elements</span>, then this is a
@@ -45211,7 +45211,7 @@
<p>If the <span>stack of open elements</span> does not <span
title="has an element in scope">have an element in scope</span>
with the same tag name as that of the token, then this is a
- <span>parse error</span>.</p>
+ <span>parse error</span>; ignore the token.</p>
<p>Otherwise, run these steps:</p>
@@ -45616,7 +45616,7 @@
<dt>Any other end tag</dt>
<dd>
- <p>Run the following algorithm:</p>
+ <p>Run the following steps:</p>
<ol>
@@ -45636,17 +45636,16 @@
<li><p>Pop all the nodes from the <span>current node</span> up
to <var title="">node</var>, including <var
- title="">node</var>, then stop this algorithm.</p></li>
+ title="">node</var>, then stop these steps.</p></li>
</ol>
</li>
- <li><p>Otherwise, if <var title="">node</var> is in neither
- the <span>formatting</span> category nor the
- <span>phrasing</span> category, then this is a <span>parse
- error</span>. Stop this algorithm. The end tag token is
- ignored.</p></li>
+ <li><p>Otherwise, if <var title="">node</var> is in neither the
+ <span>formatting</span> category nor the <span>phrasing</span>
+ category, then this is a <span>parse error</span>; ignore the
+ token, and abort these steps.</p></li>
<li><p>Set <var title="">node</var> to the previous entry in the
<span>stack of open elements</span>.</p></li>
@@ -45978,7 +45977,7 @@
<p>If the <span>current node</span> is the root
<code>html</code> element, then this is a <span>parse
- error</span>, ignore the token. (<span>fragment
+ error</span>; ignore the token. (<span>fragment
case</span>)</p>
<p>Otherwise, pop the <span>current node</span> (which will be
@@ -46392,7 +46391,7 @@
<p>If the <span>current node</span> is an
<code>optgroup</code> element, then pop that node from the
<span>stack of open elements</span>. Otherwise, this is a
- <span>parse error</span>, ignore the token.</p>
+ <span>parse error</span>; ignore the token.</p>
</dd>
@@ -46402,7 +46401,7 @@
<p>If the <span>current node</span> is an <code>option</code>
element, then pop that node from the <span>stack of open
elements</span>. Otherwise, this is a <span>parse
- error</span>, ignore the token.</p>
+ error</span>; ignore the token.</p>
</dd>
More information about the Commit-Watchers
mailing list