[html5] r8116 - [e] (0) Move some steps around to allow for some refactoring in the parser (this [...]

whatwg at whatwg.org whatwg at whatwg.org
Thu Aug 1 13:20:22 PDT 2013


Author: ianh
Date: 2013-08-01 13:20:20 -0700 (Thu, 01 Aug 2013)
New Revision: 8116

Modified:
   complete.html
   index
   source
Log:
[e] (0) Move some steps around to allow for some refactoring in the parser (this diff should have no effect on normative requirements in practice)
Affected topics: HTML Syntax and Parsing

Modified: complete.html
===================================================================
--- complete.html	2013-08-01 20:14:39 UTC (rev 8115)
+++ complete.html	2013-08-01 20:20:20 UTC (rev 8116)
@@ -89336,6 +89336,12 @@
 
    </li>
 
+   <li><p>If the newly created element has an <code title="">xmlns</code> attribute <em>in the
+   <a href=#xmlns-namespace>XMLNS namespace</a></em> whose value is not exactly the same as the element's namespace, that
+   is a <a href=#parse-error>parse error</a>. Similarly, if the newly created element has an <code title="">xmlns:xlink</code> attribute in the <a href=#xmlns-namespace>XMLNS namespace</a> whose value is not the
+   <a href=#xlink-namespace>XLink Namespace</a>, that is a <a href=#parse-error>parse error</a>.</li>
+
+<!--CLEANUP-->
    <li>
 
     <p>If the newly created element is a <a href=#category-reset title=category-reset>resettable element</a>,
@@ -89344,6 +89350,14 @@
 
    </li>
 
+   <li><p>If the element is a <a href=#form-associated-element>form-associated element</a>, and the <a href=#form-element-pointer><code title="">form</code> element pointer</a> is not null,
+   and there is no <code><a href=#the-template-element>template</a></code> element on the <a href=#stack-of-open-elements>stack of open elements</a>,
+   and the newly created element is either not <a href=#category-form-attr title=category-form-attr>reassociateable</a> or doesn't
+   have a <code title=attr-fae-form><a href=#attr-fae-form>form</a></code> attribute, <a href=#concept-form-association title=concept-form-association>associate</a> the newly created element with the
+   <code><a href=#the-form-element>form</a></code> element pointed to by the <a href=#form-element-pointer><code title="">form</code> element
+   pointer</a>, and suppress the running of the <a href=#reset-the-form-owner>reset the form owner</a> algorithm in
+   the next step.</li>
+
    <li><p>Return the newly created element.</li>
 
   </ol><hr><!-- The names of these algorithms are kinda confusing; e.g. see the confusion in
@@ -89358,16 +89372,6 @@
    intended parent being the element in which the <var title="">adjusted insertion location</var>
    finds itself.</li>
 
-<!--CLEANUP-->
-   <!-- this could just as easily be in the "create..." algorithm I guess -->
-   <li><p>If the element is a <a href=#form-associated-element>form-associated element</a>, and the <a href=#form-element-pointer><code title="">form</code> element pointer</a> is not null,
-   and there is no <code><a href=#the-template-element>template</a></code> element on the <a href=#stack-of-open-elements>stack of open elements</a>,
-   and the newly created element is either not <a href=#category-form-attr title=category-form-attr>reassociateable</a> or doesn't
-   have a <code title=attr-fae-form><a href=#attr-fae-form>form</a></code> attribute, <a href=#concept-form-association title=concept-form-association>associate</a> the newly created element with the
-   <code><a href=#the-form-element>form</a></code> element pointed to by the <a href=#form-element-pointer><code title="">form</code> element
-   pointer</a>, and suppress the running of the <a href=#reset-the-form-owner>reset the form owner</a> algorithm in
-   the next step.</li>
-
    <li>
 
     <p>If it is possible to insert an element at the <var title="">adjusted insertion
@@ -89385,7 +89389,7 @@
 
    <li><p>Return the newly created element.</li>
 
-  </ol><hr><p>When the steps below require the user agent to <dfn id=insert-a-foreign-element>insert a foreign element</dfn> for a token,
+  </ol><hr><p>When the steps below require the user agent to <dfn id=insert-a-foreign-element>insert a foreign element</dfn> for a token in a given namespace,
   the user agent must run these steps:</p>
 
   <ol><li><p>Let the <var title="">adjusted insertion location</var> be the <a href=#appropriate-place-for-inserting-a-node>appropriate
@@ -89395,11 +89399,6 @@
    intended parent being the element in which the <var title="">adjusted insertion location</var>
    finds itself.</li>
 
-   <li><p>If the newly created element has an <code title="">xmlns</code> attribute in the
-   <a href=#xmlns-namespace>XMLNS namespace</a> whose value is not exactly the same as the element's namespace, that
-   is a <a href=#parse-error>parse error</a>. Similarly, if the newly created element has an <code title="">xmlns:xlink</code> attribute in the <a href=#xmlns-namespace>XMLNS namespace</a> whose value is not the
-   <a href=#xlink-namespace>XLink Namespace</a>, that is a <a href=#parse-error>parse error</a>.</li>
-
    <li><p>If it is possible to insert an element at the <var title="">adjusted insertion
    location</var>, then insert the newly created element at the <var title="">adjusted insertion
    location</var>.</li>

Modified: index
===================================================================
--- index	2013-08-01 20:14:39 UTC (rev 8115)
+++ index	2013-08-01 20:20:20 UTC (rev 8116)
@@ -89336,6 +89336,12 @@
 
    </li>
 
+   <li><p>If the newly created element has an <code title="">xmlns</code> attribute <em>in the
+   <a href=#xmlns-namespace>XMLNS namespace</a></em> whose value is not exactly the same as the element's namespace, that
+   is a <a href=#parse-error>parse error</a>. Similarly, if the newly created element has an <code title="">xmlns:xlink</code> attribute in the <a href=#xmlns-namespace>XMLNS namespace</a> whose value is not the
+   <a href=#xlink-namespace>XLink Namespace</a>, that is a <a href=#parse-error>parse error</a>.</li>
+
+<!--CLEANUP-->
    <li>
 
     <p>If the newly created element is a <a href=#category-reset title=category-reset>resettable element</a>,
@@ -89344,6 +89350,14 @@
 
    </li>
 
+   <li><p>If the element is a <a href=#form-associated-element>form-associated element</a>, and the <a href=#form-element-pointer><code title="">form</code> element pointer</a> is not null,
+   and there is no <code><a href=#the-template-element>template</a></code> element on the <a href=#stack-of-open-elements>stack of open elements</a>,
+   and the newly created element is either not <a href=#category-form-attr title=category-form-attr>reassociateable</a> or doesn't
+   have a <code title=attr-fae-form><a href=#attr-fae-form>form</a></code> attribute, <a href=#concept-form-association title=concept-form-association>associate</a> the newly created element with the
+   <code><a href=#the-form-element>form</a></code> element pointed to by the <a href=#form-element-pointer><code title="">form</code> element
+   pointer</a>, and suppress the running of the <a href=#reset-the-form-owner>reset the form owner</a> algorithm in
+   the next step.</li>
+
    <li><p>Return the newly created element.</li>
 
   </ol><hr><!-- The names of these algorithms are kinda confusing; e.g. see the confusion in
@@ -89358,16 +89372,6 @@
    intended parent being the element in which the <var title="">adjusted insertion location</var>
    finds itself.</li>
 
-<!--CLEANUP-->
-   <!-- this could just as easily be in the "create..." algorithm I guess -->
-   <li><p>If the element is a <a href=#form-associated-element>form-associated element</a>, and the <a href=#form-element-pointer><code title="">form</code> element pointer</a> is not null,
-   and there is no <code><a href=#the-template-element>template</a></code> element on the <a href=#stack-of-open-elements>stack of open elements</a>,
-   and the newly created element is either not <a href=#category-form-attr title=category-form-attr>reassociateable</a> or doesn't
-   have a <code title=attr-fae-form><a href=#attr-fae-form>form</a></code> attribute, <a href=#concept-form-association title=concept-form-association>associate</a> the newly created element with the
-   <code><a href=#the-form-element>form</a></code> element pointed to by the <a href=#form-element-pointer><code title="">form</code> element
-   pointer</a>, and suppress the running of the <a href=#reset-the-form-owner>reset the form owner</a> algorithm in
-   the next step.</li>
-
    <li>
 
     <p>If it is possible to insert an element at the <var title="">adjusted insertion
@@ -89385,7 +89389,7 @@
 
    <li><p>Return the newly created element.</li>
 
-  </ol><hr><p>When the steps below require the user agent to <dfn id=insert-a-foreign-element>insert a foreign element</dfn> for a token,
+  </ol><hr><p>When the steps below require the user agent to <dfn id=insert-a-foreign-element>insert a foreign element</dfn> for a token in a given namespace,
   the user agent must run these steps:</p>
 
   <ol><li><p>Let the <var title="">adjusted insertion location</var> be the <a href=#appropriate-place-for-inserting-a-node>appropriate
@@ -89395,11 +89399,6 @@
    intended parent being the element in which the <var title="">adjusted insertion location</var>
    finds itself.</li>
 
-   <li><p>If the newly created element has an <code title="">xmlns</code> attribute in the
-   <a href=#xmlns-namespace>XMLNS namespace</a> whose value is not exactly the same as the element's namespace, that
-   is a <a href=#parse-error>parse error</a>. Similarly, if the newly created element has an <code title="">xmlns:xlink</code> attribute in the <a href=#xmlns-namespace>XMLNS namespace</a> whose value is not the
-   <a href=#xlink-namespace>XLink Namespace</a>, that is a <a href=#parse-error>parse error</a>.</li>
-
    <li><p>If it is possible to insert an element at the <var title="">adjusted insertion
    location</var>, then insert the newly created element at the <var title="">adjusted insertion
    location</var>.</li>

Modified: source
===================================================================
--- source	2013-08-01 20:14:39 UTC (rev 8115)
+++ source	2013-08-01 20:20:20 UTC (rev 8116)
@@ -99790,6 +99790,13 @@
 
    </li>
 
+   <li><p>If the newly created element has an <code title="">xmlns</code> attribute <em>in the
+   <span>XMLNS namespace</span></em> whose value is not exactly the same as the element's namespace, that
+   is a <span>parse error</span>. Similarly, if the newly created element has an <code
+   title="">xmlns:xlink</code> attribute in the <span>XMLNS namespace</span> whose value is not the
+   <span>XLink Namespace</span>, that is a <span>parse error</span>.</p></li>
+
+<!--CLEANUP-->
    <li>
 
     <p>If the newly created element is a <span title="category-reset">resettable element</span>,
@@ -99799,6 +99806,16 @@
 
    </li>
 
+   <li><p>If the element is a <span>form-associated element</span>, and the <span><code
+   title="">form</code> element pointer</span> is not null,
+   and there is no <code>template</code> element on the <span>stack of open elements</span>,
+   and the newly created element is either not <span title="category-form-attr">reassociateable</span> or doesn't
+   have a <code title="attr-fae-form">form</code> attribute, <span
+   title="concept-form-association">associate</span> the newly created element with the
+   <code>form</code> element pointed to by the <span><code title="">form</code> element
+   pointer</span>, and suppress the running of the <span>reset the form owner</span> algorithm in
+   the next step.</p></li>
+
    <li><p>Return the newly created element.</p></li>
 
   </ol>
@@ -99821,18 +99838,6 @@
    intended parent being the element in which the <var title="">adjusted insertion location</var>
    finds itself.</p></li>
 
-<!--CLEANUP-->
-   <!-- this could just as easily be in the "create..." algorithm I guess -->
-   <li><p>If the element is a <span>form-associated element</span>, and the <span><code
-   title="">form</code> element pointer</span> is not null,
-   and there is no <code>template</code> element on the <span>stack of open elements</span>,
-   and the newly created element is either not <span title="category-form-attr">reassociateable</span> or doesn't
-   have a <code title="attr-fae-form">form</code> attribute, <span
-   title="concept-form-association">associate</span> the newly created element with the
-   <code>form</code> element pointed to by the <span><code title="">form</code> element
-   pointer</span>, and suppress the running of the <span>reset the form owner</span> algorithm in
-   the next step.</p></li>
-
    <li>
 
     <p>If it is possible to insert an element at the <var title="">adjusted insertion
@@ -99854,7 +99859,7 @@
 
   <hr>
 
-  <p>When the steps below require the user agent to <dfn>insert a foreign element</dfn> for a token,
+  <p>When the steps below require the user agent to <dfn>insert a foreign element</dfn> for a token in a given namespace,
   the user agent must run these steps:</p>
 
   <ol>
@@ -99866,12 +99871,6 @@
    intended parent being the element in which the <var title="">adjusted insertion location</var>
    finds itself.</p></li>
 
-   <li><p>If the newly created element has an <code title="">xmlns</code> attribute in the
-   <span>XMLNS namespace</span> whose value is not exactly the same as the element's namespace, that
-   is a <span>parse error</span>. Similarly, if the newly created element has an <code
-   title="">xmlns:xlink</code> attribute in the <span>XMLNS namespace</span> whose value is not the
-   <span>XLink Namespace</span>, that is a <span>parse error</span>.</p></li>
-
    <li><p>If it is possible to insert an element at the <var title="">adjusted insertion
    location</var>, then insert the newly created element at the <var title="">adjusted insertion
    location</var>.</p></li>




More information about the Commit-Watchers mailing list