--- markup/html/scripting-parser/parser.html	2008/04/27 09:16:11	1.9
+++ markup/html/scripting-parser/parser.html	2008/04/27 10:44:36	1.11
@@ -47,7 +47,12 @@
       var p = new Parser (new InputStream (v));
       var doc = p.doc;
       p.parse ();
+      
       log (dumpTree (doc, ''));
+      
+      if (p.hasAsyncScript) {
+        log ('Some script codes are executed asynchronously; it means that the document might be rendered in different ways depending on the network condition and other factors');
+      }
     }
   } // update2
 
@@ -73,6 +78,7 @@
     this.openElements = [doc];
     this.input = i;
     this.scriptsExecutedAfterParsing = [];
+    this.scriptsExecutedSoon = [];
   } // Parser
 
   Parser.prototype.getNextToken = function () {
@@ -329,8 +335,21 @@
 
     // "When a script completes loading" rules start applying.
 
-    // TODO: Handles "list of scripts that will execute as soon as possible"
-    // and "list of scripts that will execute asynchronously"
+    // List of scripts that will execute as soon as possible
+    for (var i = 0; i < this.scriptsExecutedSoon.length; i++) {
+      var e = this.scriptsExecutedSoon[i];
+
+      // If it has completed loading
+      log ('Execute an external script not inserted by parser...');
+      executeScript (this.doc, e);
+
+      // NOTE: It MAY be executed before the end of the parsing, according
+      // to the spec.
+      this.hasAsyncScript = true;
+    }
+
+    // TODO: Handles
+    // "list of scripts that will execute asynchronously"
 
     // Handle "list of scripts that will execute when the document has finished
     // parsing".
@@ -434,9 +453,10 @@
           log ('Error: There is a script that will execute as soon as the parser resumes.');
         }
         p.scriptExecutedWhenParserResumes = e;
-        log ('Running a script: aborted (src)');
+        log ('Running a script: aborted (src parser-inserted)');
       } else if (e.src != null) {
-        // TODO
+        p.scriptsExecutedSoon.push (e);
+        log ('Running a script: aborted (src)');
       } else {
         executeScript (doc, e); // even if other scripts are already executing.
       }
@@ -484,9 +504,9 @@
       var m;
       if (m = uri.match (/^javascript:\s*(?:'([^']*)'|"([^"]+)")\s*$/i)) {
         if (m[1]) {
-          return m[1];
+          return unescapeJSLiteral (m[1]);
         } else if (m[2]) {
-          return m[2];
+          return unescapeJSLiteral (m[2]);
         } else {
           return null;
         }
@@ -507,12 +527,19 @@
         matched = true;
         var args = [];
         t.replace (/('[^']*'|"[^"]*")/g, function (s, v) {
-          args.push (v.substring (1, v.length - 1));
+          args.push (unescapeJSLiteral (v.substring (1, v.length - 1)));
           return '';
         });
         doc.write.apply (doc, args);
         return '';
       });
+      s = s.replace (/^\s*var\s+s\s*=\s*document\.createElement\s*\(\s*['"]script['"]\s*\)\s*;\s*s\.src\s*=\s*(?:'(javascript:[^']*)'|"(javascript:[^"]*)")\s*;\s*document\.documentElement\.appendChild\s*\(\s*s\s*\)\s*;\s*/,
+      function (s, t, u) {
+        matched = true;
+        var args = [unescapeJSLiteral (t ? t : u)];
+        doc._insertExternalScript.apply (doc, args);
+        return '';
+      });
       if (s == '') break;
       if (!matched) {
         log ('Script parse error: "' + s + '"');
@@ -521,6 +548,12 @@
     }
   } // parseAndRunScript
 
+  function unescapeJSLiteral (s) {
+    return s.replace (/\\u([0-9A-Fa-f]{4})/g, function (t, v) {
+      return String.fromCharCode (parseInt ('0x' + v));
+    });
+  } // unescapeJSLiteral
+
   function JSText (data) {
     this.data = data;
   } // JSText
@@ -631,6 +664,22 @@
     return;
   }; // document.write
 
+  JSDocument.prototype._insertExternalScript = function (uri) {
+    var s = new JSElement (this, 'script');
+    s.src = uri;
+    this.documentElement.appendChild (s);
+  }; // _insertExternalScript
+
+  JSDocument.prototype.__defineGetter__ ('documentElement', function () {
+    var cn = this.childNodes;
+    for (var i = 0; i < cn.length; i++) {
+      if (cn[i] instanceof JSElement) {
+        return cn[i]
+      }
+    }
+    return null;
+  });
+
   JSElement.prototype.__defineGetter__ ('text', function () {
     var r = '';
     for (var i = 0; i < this.childNodes.length; i++) {
@@ -700,10 +749,10 @@
 &lt;p>
 </textarea>
 
-<h2>Log</h2>
+<h2 id=log>Log</h2>
 <p><output></output>
 
-<h2>Note</h2>
+<h2 id=notes>Notes</h2>
 
 <p>This is a <em>simplified</em> implementation of 
 <a href="http://www.whatwg.org/specs/web-apps/current-work/#parsing">HTML5 
@@ -725,19 +774,30 @@
 <li>Only supports <code>script</code> <code>type</code>
 <code>text/javascript</code>.  <code>type</code> and <code>language</code>
 attributes are ignored.
-<li>Only supports <code>document.write</code>.
-The script code must be match to the regular expression
-<code>^\s*(?:document\.write\s*\(<var>v</var>\s*(?:,\s*<var>v</var>\s*)*\)\s*;\s*)*$</code>
-where <var>v</var> is <code>"[^"]*"|'[^']*'</code>.
+<li>Only supports limited statements.  It must consist of zero or more
+of statements looking similar to the following statements, possibly
+introduced, followed, or separated by white space characters:
+  <ul>
+  <li><code>document.write ("<var>string</var>", ["<var>string</var>", ...]);</code>.
+  <li><code>var s = document.createElement ("script");
+            s.src = "<var>string</var>";
+            document.documentElement.appendChild (s);</code>
+  </ul>
+Note that strings may be delimited by <code>'</code>s instead of
+<code>"</code>s.
 <li>Only supports <code>javascript:</code> 
 <abbr title="Uniform Resourace Identifiers">URI</abbr> scheme in the 
 <code>src</code> attribute of the <code>script</code> element.  In addition, 
 the <abbr title="Uniform Resource Identifiers">URI</abbr> must be conform to 
 the regular expression <code>^javascript:\s*(?:"[^"]*"|'[^']*')\s*$</code>.
+<li>Only supports <code>\u<var>HHHH</var></code> escapes in JavaScript 
+string literals.
 </ul>
 
 <p>For some reason, this parser does not work in browsers that do
 not support JavaScript 1.5.
 
+<!-- TODO: license -->
+
 </body>
 </html>
\ No newline at end of file