[html5] r5855 - [e] (0) Rename the algorithms for running and executing a script to have less co [...]
whatwg at whatwg.org
whatwg at whatwg.org
Tue Feb 8 13:04:49 PST 2011
Author: ianh
Date: 2011-02-08 13:04:47 -0800 (Tue, 08 Feb 2011)
New Revision: 5855
Modified:
complete.html
index
source
Log:
[e] (0) Rename the algorithms for running and executing a script to have less confusing names. They're now 'prepare a script' and 'execute the script block' respectively.
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=11301
Modified: complete.html
===================================================================
--- complete.html 2011-02-08 02:13:47 UTC (rev 5854)
+++ complete.html 2011-02-08 21:04:47 UTC (rev 5855)
@@ -14906,12 +14906,13 @@
type</var></dfn>, <dfn id="the-script-block's-character-encoding"><var>the script block's character
encoding</var></dfn>, and <dfn id="the-script-block's-fallback-character-encoding"><var>the script block's fallback
character encoding</var></dfn>. They are determined when the script
- is run, based on the attributes on the element at that time, and the
- <code><a href=#document>Document</a></code> of the <code><a href=#script>script</a></code> element.</p>
+ is prepared, based on the attributes on the element at that time,
+ and the <code><a href=#document>Document</a></code> of the <code><a href=#script>script</a></code>
+ element.</p>
<p>When a <code><a href=#script>script</a></code> element that is not marked as being
<a href=#parser-inserted>"parser-inserted"</a> experiences one of the events listed
- in the following list, the user agent must synchronously <a href=#running-a-script title="running a script">run</a> the <code><a href=#script>script</a></code>
+ in the following list, the user agent must synchronously <a href=#prepare-a-script title="prepare a script">prepare</a> the <code><a href=#script>script</a></code>
element:</p>
<ul><li>The <code><a href=#script>script</a></code> element gets <a href=#insert-an-element-into-a-document title="insert an
@@ -14924,9 +14925,8 @@
<code>Document</code></a> and has a <code title=attr-script-src><a href=#attr-script-src>src</a></code> attribute set where previously
the element had no such attribute.</li>
- </ul><p><dfn id=running-a-script title="running a script">Running a script</dfn>: When a
- <code><a href=#script>script</a></code> element is to be run, the user agent must act as
- follows:</p>
+ </ul><p>To <dfn id=prepare-a-script title="prepare a script">prepare a script</dfn>, the user
+ agent must act as follows:</p>
<ol><li>
@@ -15206,7 +15206,7 @@
<p>The element must be added to the end of the <dfn id=list-of-scripts-that-will-execute-in-order-as-soon-as-possible>list of
scripts that will execute in order as soon as possible</dfn>
associated with the <code><a href=#document>Document</a></code> of the
- <code><a href=#script>script</a></code> element at the time the <a href=#running-a-script>running a
+ <code><a href=#script>script</a></code> element at the time the <a href=#prepare-a-script>prepare a
script</a> algorithm started.</p>
<p>The <a href=#concept-task title=concept-task>task</a> that the
@@ -15220,10 +15220,10 @@
element as ready but abort these steps without executing the
script yet.</li>
- <li><p><i>Execution</i>: <a href=#executing-a-script-block title="executing a script
- block">Execute the script block</a> corresponding to the
- first script element in this <a href=#list-of-scripts-that-will-execute-in-order-as-soon-as-possible>list of scripts that will
- execute in order as soon as possible</a>.</li>
+ <li><p><i>Execution</i>: <a href=#execute-the-script-block>Execute the script block</a>
+ corresponding to the first script element in this <a href=#list-of-scripts-that-will-execute-in-order-as-soon-as-possible>list of
+ scripts that will execute in order as soon as
+ possible</a>.</li>
<li><p>Remove the first element from this <a href=#list-of-scripts-that-will-execute-in-order-as-soon-as-possible>list of scripts
that will execute in order as soon as possible</a>.</li>
@@ -15243,24 +15243,22 @@
<p>The element must be added to the <dfn id=set-of-scripts-that-will-execute-as-soon-as-possible>set of scripts that
will execute as soon as possible</dfn> of the
<code><a href=#document>Document</a></code> of the <code><a href=#script>script</a></code> element at the
- time the <a href=#running-a-script>running a script</a> algorithm started.</p>
+ time the <a href=#prepare-a-script>prepare a script</a> algorithm started.</p>
<p>The <a href=#concept-task title=concept-task>task</a> that the
<a href=#networking-task-source>networking task source</a> places on the <a href=#task-queue>task
queue</a> once the <a href=#fetch title=fetch>fetching
- algorithm</a> has completed must <a href=#executing-a-script-block title="executing a
- script block">execute the script block</a> and then remove
- the element from the <a href=#set-of-scripts-that-will-execute-as-soon-as-possible>set of scripts that will execute as
- soon as possible</a>.</p>
+ algorithm</a> has completed must <a href=#execute-the-script-block>execute the script
+ block</a> and then remove the element from the <a href=#set-of-scripts-that-will-execute-as-soon-as-possible>set of
+ scripts that will execute as soon as possible</a>.</p>
</dd>
<dt id=script-processing-inline>Otherwise</dt>
- <dd>The user agent must immediately <a href=#executing-a-script-block title="executing a
- script block">execute the script block</a>, even if other
- scripts are already executing.</dd>
+ <dd>The user agent must immediately <a href=#execute-the-script-block>execute the script
+ block</a>, even if other scripts are already executing.</dd>
</dl></li>
@@ -15294,9 +15292,8 @@
blocking scripts" state, things aren't defined in terms of which
style sheets are blocking which scripts -->
- <p><dfn id=executing-a-script-block title="executing a script block">Executing a script
- block</dfn>: When the steps above require that the script block be
- executed, the user agent must act as follows:</p>
+ <p>When the user agent is required to <dfn id=execute-the-script-block title="execute the script
+ block">execute a script block</dfn>, it must act as follows:</p>
<dl class=switch><dt>If the load resulted in an error (for example a DNS error, or
an HTTP 404 error)</dt>
@@ -15312,7 +15309,7 @@
<p>Executing the script block must consists of running the
following steps. For the purposes of these steps, the script is
considered to be from an <i>external file</i> if, while the
- <a href=#running-a-script>running a script</a> algorithm above was running for this
+ <a href=#prepare-a-script>prepare a script</a> algorithm above was running for this
script, the <code><a href=#script>script</a></code> element had a <code title=attr-script-src><a href=#attr-script-src>src</a></code> attribute specified.</p>
<ol><li>
@@ -82619,7 +82616,7 @@
<p>Increment the parser's <a href=#script-nesting-level>script nesting level</a> by
one.</p>
- <p><a href=#running-a-script title="running a script">Run</a> the <var title="">script</var>. This might cause some script to execute,
+ <p><a href=#prepare-a-script title="prepare a script">Prepare</a> the <var title="">script</var>. This might cause some script to execute,
which might cause <a href=#dom-document-write title=dom-document-write>new characters
to be inserted into the tokenizer</a>, and might cause the
tokenizer to output more tokens, resulting in a <a href=#nestedParsing>reentrant invocation of the parser</a>.</p>
@@ -82686,7 +82683,7 @@
by one (it should be zero before this step, so this sets it to
one).</li>
- <li><p><a href=#executing-a-script-block title="executing a script block">Execute</a>
+ <li><p><a href=#execute-the-script-block title="execute the script block">Execute</a>
<var title="">the script</var>.</li>
<li><p>Decrement the parser's <a href=#script-nesting-level>script nesting level</a>
@@ -84134,7 +84131,7 @@
the parser's <code><a href=#document>Document</a></code> <a href=#has-no-style-sheet-that-is-blocking-scripts>has no style sheet that
is blocking scripts</a>.</li>
- <li><p><a href=#executing-a-script-block title="executing a script block">Execute</a> the
+ <li><p><a href=#execute-the-script-block title="execute the script block">Execute</a> the
first <code><a href=#script>script</a></code> in the <a href=#list-of-scripts-that-will-execute-when-the-document-has-finished-parsing>list of scripts that will
execute when the document has finished parsing</a>.</li>
@@ -85181,10 +85178,10 @@
flag must be unset. If the parser was originally created for the
<a href=#xml-fragment-parsing-algorithm>XML fragment parsing algorithm</a>, then the element must
be marked as <a href=#already-started>"already started"</a> also. When the element's
- end tag is parsed, the user agent must <a href=#running-a-script title="running a
- script">run</a> the <code><a href=#script>script</a></code> element. If this causes
- there to be a <a href=#pending-parsing-blocking-script>pending parsing-blocking script</a>, then the
- user agent must run the following steps:</p>
+ end tag is parsed, the user agent must <a href=#prepare-a-script title="prepare a
+ script">prepare</a> the <code><a href=#script>script</a></code> element. If this
+ causes there to be a <a href=#pending-parsing-blocking-script>pending parsing-blocking script</a>,
+ then the user agent must run the following steps:</p>
<ol><li><p>Block this instance of the <a href=#xml-parser>XML parser</a>, such
that the <a href=#event-loop>event loop</a> will not run <a href=#concept-task title=concept-task>tasks</a> that invoke it.</li>
@@ -85199,7 +85196,7 @@
that <a href=#concept-task title=concept-task>tasks</a> that invoke it can
again be run.</li>
- <li><p><a href=#executing-a-script-block title="executing a script block">Execute</a> the
+ <li><p><a href=#execute-the-script-block title="execute the script block">Execute</a> the
<a href=#pending-parsing-blocking-script>pending parsing-blocking script</a>.</li>
<li><p>There is no longer a <a href=#pending-parsing-blocking-script>pending parsing-blocking
Modified: index
===================================================================
--- index 2011-02-08 02:13:47 UTC (rev 5854)
+++ index 2011-02-08 21:04:47 UTC (rev 5855)
@@ -14886,12 +14886,13 @@
type</var></dfn>, <dfn id="the-script-block's-character-encoding"><var>the script block's character
encoding</var></dfn>, and <dfn id="the-script-block's-fallback-character-encoding"><var>the script block's fallback
character encoding</var></dfn>. They are determined when the script
- is run, based on the attributes on the element at that time, and the
- <code><a href=#document>Document</a></code> of the <code><a href=#script>script</a></code> element.</p>
+ is prepared, based on the attributes on the element at that time,
+ and the <code><a href=#document>Document</a></code> of the <code><a href=#script>script</a></code>
+ element.</p>
<p>When a <code><a href=#script>script</a></code> element that is not marked as being
<a href=#parser-inserted>"parser-inserted"</a> experiences one of the events listed
- in the following list, the user agent must synchronously <a href=#running-a-script title="running a script">run</a> the <code><a href=#script>script</a></code>
+ in the following list, the user agent must synchronously <a href=#prepare-a-script title="prepare a script">prepare</a> the <code><a href=#script>script</a></code>
element:</p>
<ul><li>The <code><a href=#script>script</a></code> element gets <a href=#insert-an-element-into-a-document title="insert an
@@ -14904,9 +14905,8 @@
<code>Document</code></a> and has a <code title=attr-script-src><a href=#attr-script-src>src</a></code> attribute set where previously
the element had no such attribute.</li>
- </ul><p><dfn id=running-a-script title="running a script">Running a script</dfn>: When a
- <code><a href=#script>script</a></code> element is to be run, the user agent must act as
- follows:</p>
+ </ul><p>To <dfn id=prepare-a-script title="prepare a script">prepare a script</dfn>, the user
+ agent must act as follows:</p>
<ol><li>
@@ -15186,7 +15186,7 @@
<p>The element must be added to the end of the <dfn id=list-of-scripts-that-will-execute-in-order-as-soon-as-possible>list of
scripts that will execute in order as soon as possible</dfn>
associated with the <code><a href=#document>Document</a></code> of the
- <code><a href=#script>script</a></code> element at the time the <a href=#running-a-script>running a
+ <code><a href=#script>script</a></code> element at the time the <a href=#prepare-a-script>prepare a
script</a> algorithm started.</p>
<p>The <a href=#concept-task title=concept-task>task</a> that the
@@ -15200,10 +15200,10 @@
element as ready but abort these steps without executing the
script yet.</li>
- <li><p><i>Execution</i>: <a href=#executing-a-script-block title="executing a script
- block">Execute the script block</a> corresponding to the
- first script element in this <a href=#list-of-scripts-that-will-execute-in-order-as-soon-as-possible>list of scripts that will
- execute in order as soon as possible</a>.</li>
+ <li><p><i>Execution</i>: <a href=#execute-the-script-block>Execute the script block</a>
+ corresponding to the first script element in this <a href=#list-of-scripts-that-will-execute-in-order-as-soon-as-possible>list of
+ scripts that will execute in order as soon as
+ possible</a>.</li>
<li><p>Remove the first element from this <a href=#list-of-scripts-that-will-execute-in-order-as-soon-as-possible>list of scripts
that will execute in order as soon as possible</a>.</li>
@@ -15223,24 +15223,22 @@
<p>The element must be added to the <dfn id=set-of-scripts-that-will-execute-as-soon-as-possible>set of scripts that
will execute as soon as possible</dfn> of the
<code><a href=#document>Document</a></code> of the <code><a href=#script>script</a></code> element at the
- time the <a href=#running-a-script>running a script</a> algorithm started.</p>
+ time the <a href=#prepare-a-script>prepare a script</a> algorithm started.</p>
<p>The <a href=#concept-task title=concept-task>task</a> that the
<a href=#networking-task-source>networking task source</a> places on the <a href=#task-queue>task
queue</a> once the <a href=#fetch title=fetch>fetching
- algorithm</a> has completed must <a href=#executing-a-script-block title="executing a
- script block">execute the script block</a> and then remove
- the element from the <a href=#set-of-scripts-that-will-execute-as-soon-as-possible>set of scripts that will execute as
- soon as possible</a>.</p>
+ algorithm</a> has completed must <a href=#execute-the-script-block>execute the script
+ block</a> and then remove the element from the <a href=#set-of-scripts-that-will-execute-as-soon-as-possible>set of
+ scripts that will execute as soon as possible</a>.</p>
</dd>
<dt id=script-processing-inline>Otherwise</dt>
- <dd>The user agent must immediately <a href=#executing-a-script-block title="executing a
- script block">execute the script block</a>, even if other
- scripts are already executing.</dd>
+ <dd>The user agent must immediately <a href=#execute-the-script-block>execute the script
+ block</a>, even if other scripts are already executing.</dd>
</dl></li>
@@ -15274,9 +15272,8 @@
blocking scripts" state, things aren't defined in terms of which
style sheets are blocking which scripts -->
- <p><dfn id=executing-a-script-block title="executing a script block">Executing a script
- block</dfn>: When the steps above require that the script block be
- executed, the user agent must act as follows:</p>
+ <p>When the user agent is required to <dfn id=execute-the-script-block title="execute the script
+ block">execute a script block</dfn>, it must act as follows:</p>
<dl class=switch><dt>If the load resulted in an error (for example a DNS error, or
an HTTP 404 error)</dt>
@@ -15292,7 +15289,7 @@
<p>Executing the script block must consists of running the
following steps. For the purposes of these steps, the script is
considered to be from an <i>external file</i> if, while the
- <a href=#running-a-script>running a script</a> algorithm above was running for this
+ <a href=#prepare-a-script>prepare a script</a> algorithm above was running for this
script, the <code><a href=#script>script</a></code> element had a <code title=attr-script-src><a href=#attr-script-src>src</a></code> attribute specified.</p>
<ol><li>
@@ -78590,7 +78587,7 @@
<p>Increment the parser's <a href=#script-nesting-level>script nesting level</a> by
one.</p>
- <p><a href=#running-a-script title="running a script">Run</a> the <var title="">script</var>. This might cause some script to execute,
+ <p><a href=#prepare-a-script title="prepare a script">Prepare</a> the <var title="">script</var>. This might cause some script to execute,
which might cause <a href=#dom-document-write title=dom-document-write>new characters
to be inserted into the tokenizer</a>, and might cause the
tokenizer to output more tokens, resulting in a <a href=#nestedParsing>reentrant invocation of the parser</a>.</p>
@@ -78657,7 +78654,7 @@
by one (it should be zero before this step, so this sets it to
one).</li>
- <li><p><a href=#executing-a-script-block title="executing a script block">Execute</a>
+ <li><p><a href=#execute-the-script-block title="execute the script block">Execute</a>
<var title="">the script</var>.</li>
<li><p>Decrement the parser's <a href=#script-nesting-level>script nesting level</a>
@@ -80105,7 +80102,7 @@
the parser's <code><a href=#document>Document</a></code> <a href=#has-no-style-sheet-that-is-blocking-scripts>has no style sheet that
is blocking scripts</a>.</li>
- <li><p><a href=#executing-a-script-block title="executing a script block">Execute</a> the
+ <li><p><a href=#execute-the-script-block title="execute the script block">Execute</a> the
first <code><a href=#script>script</a></code> in the <a href=#list-of-scripts-that-will-execute-when-the-document-has-finished-parsing>list of scripts that will
execute when the document has finished parsing</a>.</li>
@@ -81152,10 +81149,10 @@
flag must be unset. If the parser was originally created for the
<a href=#xml-fragment-parsing-algorithm>XML fragment parsing algorithm</a>, then the element must
be marked as <a href=#already-started>"already started"</a> also. When the element's
- end tag is parsed, the user agent must <a href=#running-a-script title="running a
- script">run</a> the <code><a href=#script>script</a></code> element. If this causes
- there to be a <a href=#pending-parsing-blocking-script>pending parsing-blocking script</a>, then the
- user agent must run the following steps:</p>
+ end tag is parsed, the user agent must <a href=#prepare-a-script title="prepare a
+ script">prepare</a> the <code><a href=#script>script</a></code> element. If this
+ causes there to be a <a href=#pending-parsing-blocking-script>pending parsing-blocking script</a>,
+ then the user agent must run the following steps:</p>
<ol><li><p>Block this instance of the <a href=#xml-parser>XML parser</a>, such
that the <a href=#event-loop>event loop</a> will not run <a href=#concept-task title=concept-task>tasks</a> that invoke it.</li>
@@ -81170,7 +81167,7 @@
that <a href=#concept-task title=concept-task>tasks</a> that invoke it can
again be run.</li>
- <li><p><a href=#executing-a-script-block title="executing a script block">Execute</a> the
+ <li><p><a href=#execute-the-script-block title="execute the script block">Execute</a> the
<a href=#pending-parsing-blocking-script>pending parsing-blocking script</a>.</li>
<li><p>There is no longer a <a href=#pending-parsing-blocking-script>pending parsing-blocking
Modified: source
===================================================================
--- source 2011-02-08 02:13:47 UTC (rev 5854)
+++ source 2011-02-08 21:04:47 UTC (rev 5855)
@@ -15785,13 +15785,14 @@
type</var></dfn>, <dfn><var>the script block's character
encoding</var></dfn>, and <dfn><var>the script block's fallback
character encoding</var></dfn>. They are determined when the script
- is run, based on the attributes on the element at that time, and the
- <code>Document</code> of the <code>script</code> element.</p>
+ is prepared, based on the attributes on the element at that time,
+ and the <code>Document</code> of the <code>script</code>
+ element.</p>
<p>When a <code>script</code> element that is not marked as being
<span>"parser-inserted"</span> experiences one of the events listed
in the following list, the user agent must synchronously <span
- title="running a script">run</span> the <code>script</code>
+ title="prepare a script">prepare</span> the <code>script</code>
element:</p>
<ul>
@@ -15809,9 +15810,8 @@
</ul>
- <p><dfn title="running a script">Running a script</dfn>: When a
- <code>script</code> element is to be run, the user agent must act as
- follows:</p>
+ <p>To <dfn title="prepare a script">prepare a script</dfn>, the user
+ agent must act as follows:</p>
<ol>
@@ -16131,7 +16131,7 @@
<p>The element must be added to the end of the <dfn>list of
scripts that will execute in order as soon as possible</dfn>
associated with the <code>Document</code> of the
- <code>script</code> element at the time the <span>running a
+ <code>script</code> element at the time the <span>prepare a
script</span> algorithm started.</p>
<p>The <span title="concept-task">task</span> that the
@@ -16147,10 +16147,10 @@
element as ready but abort these steps without executing the
script yet.</p></li>
- <li><p><i>Execution</i>: <span title="executing a script
- block">Execute the script block</span> corresponding to the
- first script element in this <span>list of scripts that will
- execute in order as soon as possible</span>.</p></li>
+ <li><p><i>Execution</i>: <span>Execute the script block</span>
+ corresponding to the first script element in this <span>list of
+ scripts that will execute in order as soon as
+ possible</span>.</p></li>
<li><p>Remove the first element from this <span>list of scripts
that will execute in order as soon as possible</span>.</p></li>
@@ -16173,24 +16173,22 @@
<p>The element must be added to the <dfn>set of scripts that
will execute as soon as possible</dfn> of the
<code>Document</code> of the <code>script</code> element at the
- time the <span>running a script</span> algorithm started.</p>
+ time the <span>prepare a script</span> algorithm started.</p>
<p>The <span title="concept-task">task</span> that the
<span>networking task source</span> places on the <span>task
queue</span> once the <span title="fetch">fetching
- algorithm</span> has completed must <span title="executing a
- script block">execute the script block</span> and then remove
- the element from the <span>set of scripts that will execute as
- soon as possible</span>.</p>
+ algorithm</span> has completed must <span>execute the script
+ block</span> and then remove the element from the <span>set of
+ scripts that will execute as soon as possible</span>.</p>
</dd>
<dt id="script-processing-inline">Otherwise</dt>
- <dd>The user agent must immediately <span title="executing a
- script block">execute the script block</span>, even if other
- scripts are already executing.</dd>
+ <dd>The user agent must immediately <span>execute the script
+ block</span>, even if other scripts are already executing.</dd>
</dl>
@@ -16230,9 +16228,8 @@
blocking scripts" state, things aren't defined in terms of which
style sheets are blocking which scripts -->
- <p><dfn title="executing a script block">Executing a script
- block</dfn>: When the steps above require that the script block be
- executed, the user agent must act as follows:</p>
+ <p>When the user agent is required to <dfn title="execute the script
+ block">execute a script block</dfn>, it must act as follows:</p>
<dl class="switch">
@@ -16251,7 +16248,7 @@
<p>Executing the script block must consists of running the
following steps. For the purposes of these steps, the script is
considered to be from an <i>external file</i> if, while the
- <span>running a script</span> algorithm above was running for this
+ <span>prepare a script</span> algorithm above was running for this
script, the <code>script</code> element had a <code
title="attr-script-src">src</code> attribute specified.</p>
@@ -93535,7 +93532,7 @@
<p>Increment the parser's <span>script nesting level</span> by
one.</p>
- <p><span title="running a script">Run</span> the <var
+ <p><span title="prepare a script">Prepare</span> the <var
title="">script</var>. This might cause some script to execute,
which might cause <span title="dom-document-write">new characters
to be inserted into the tokenizer</span>, and might cause the
@@ -93613,7 +93610,7 @@
by one (it should be zero before this step, so this sets it to
one).</p></li>
- <li><p><span title="executing a script block">Execute</span>
+ <li><p><span title="execute the script block">Execute</span>
<var title="">the script</var>.</p></li>
<li><p>Decrement the parser's <span>script nesting level</span>
@@ -95214,7 +95211,7 @@
the parser's <code>Document</code> <span>has no style sheet that
is blocking scripts</span>.</p></li>
- <li><p><span title="executing a script block">Execute</span> the
+ <li><p><span title="execute the script block">Execute</span> the
first <code>script</code> in the <span>list of scripts that will
execute when the document has finished parsing</span>.</p></li>
@@ -96418,10 +96415,10 @@
flag must be unset. If the parser was originally created for the
<span>XML fragment parsing algorithm</span>, then the element must
be marked as <span>"already started"</span> also. When the element's
- end tag is parsed, the user agent must <span title="running a
- script">run</span> the <code>script</code> element. If this causes
- there to be a <span>pending parsing-blocking script</span>, then the
- user agent must run the following steps:</p>
+ end tag is parsed, the user agent must <span title="prepare a
+ script">prepare</span> the <code>script</code> element. If this
+ causes there to be a <span>pending parsing-blocking script</span>,
+ then the user agent must run the following steps:</p>
<ol>
@@ -96439,7 +96436,7 @@
that <span title="concept-task">tasks</span> that invoke it can
again be run.</p></li>
- <li><p><span title="executing a script block">Execute</span> the
+ <li><p><span title="execute the script block">Execute</span> the
<span>pending parsing-blocking script</span>.</p></li>
<li><p>There is no longer a <span>pending parsing-blocking
More information about the Commit-Watchers
mailing list