Merge branch 'master' into harmony

jquery · Feb 27, 2012 · 48a02cc · 48a02cc
2 parents 3cefe47 + f277475
commit 48a02cc
Show file tree

Hide file tree

Showing 4 changed files with 179 additions and 4 deletions.
diff --git a/demo/rewrite.html b/demo/rewrite.html
@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<title>Esprima: Full Source Rewrite Demo</title>
+<script src="../test/3rdparty/platform.js"></script>
+<script src="checkenv.js"></script>
+<script src="rewrite.js"></script>
+<script src="../esprima.js"></script>
+<script src="../assets/codemirror/codemirror.js"></script>
+<script src="../assets/codemirror/javascript.js"></script>
+<link rel="stylesheet" type="text/css" href="../assets/codemirror/codemirror.css"/>
+<link rel="stylesheet" type="text/css" href="../assets/style.css"/>
+<style>
+.CodeMirror-scroll {
+    height: 300px;
+}
+</style>
+</head>
+<body>
+<div class="container">
+
+<div class="topbar">
+<ul class="nav">
+<li><a href="../index.html">&larr; Home</a></li>
+<li><a href="http://github.com/ariya/esprima">Code</a></li>
+<li><a href="http://wiki.esprima.org">Documentation</a></li>
+<li><a href="http://issues.esprima.org">Issues</a></li>
+</ul>
+</div>
+
+<h1>Source Rewrite <small>cleans up and reformats everything</small></h1>
+
+<p>Type ECMAScript code in the editor. Press <b>Rewrite</b> button to get the code
+parsed and reconstructed.</p>
+
+<p><textarea id="code" autofocus="autofocus" cols="70" rows="25" spellcheck="false">
+    // Example of messy code with confusing and inconsistent indentations
+
+function bubbleSort    (list) {
+var items = list.slice(0), swapped =false,
+        p,   q;
+   for ( p= 1;p &lt;   items.length; ++p) {
+       for (q=0; q &lt; items.length -    p; ++q) {
+        if (items[q + 1  ] &lt; items[q]) {
+            swapped =true;
+        let temp = items[q];
+         items[q] = items[ q+1]; items[q+1] = temp;
+            }
+      }
+        if (!swapped)
+        break;
+    }
+        return items;
+}
+</textarea></p>
+
+<p><input type="button" value="Rewrite" id="rewrite"></p>
+
+<p id="codemirror" align="right"><small>The above code editor is based on <a href="http://codemirror.net" target="_blank">CodeMirror</a>.</small></p>
+
+<p id="error"></p>
+
+<p><b>Notes</b>:</p>
+<ul>
+    <li>Only valid syntax is accepted.</li>
+    <li>Comments are <em>not</em> preserved.</li>
+    <li>It is still experimental (see <a href="http://code.google.com/p/esprima/issues/detail?id=89">issue 89</a>).</li>
+</ul>
+
+<p style="margin-top: 50px;">Using Esprima version <span id="version"></span>.</p>
+
+<div class="footer"><strong>Esprima</strong> is created by
+<a href="http://ariya.ofilabs.com/about" target="_blank">Ariya Hidayat</a>. Follow <a href="http://twitter.com/ariyahidayat">@ariyahidayat</a> on Twitter.
+</div>
+
+<p id="testbox" style="visibility: hidden;"><textarea id="test"></textarea></p>
+</div>
+<script>
+/*jslint sloppy:true browser:true */
+/*global sourceRewrite:true, CodeMirror:true */
+window.onload = function () {
+    var el;
+
+    el = document.getElementById('version');
+    if (typeof el.innerText === 'string') {
+        el.innerText = window.esprima.version;
+    } else {
+        el.textContent = window.esprima.version;
+    }
+
+    document.getElementById('rewrite').onclick = sourceRewrite;
+};
+
+try {
+    window.checkEnv();
+
+    // This is just testing, to detect whether CodeMirror would fail or not
+    window.editor = CodeMirror.fromTextArea(document.getElementById("test"));
+
+    window.editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        matchBrackets: true
+    });
+} catch (e) {
+    // CodeMirror failed to initialize, possible in e.g. old IE.
+    document.getElementById('codemirror').innerHTML = '';
+} finally {
+    document.getElementById('testbox').parentNode.removeChild(document.getElementById('testbox'));
+}
+</script>
+</body>
+</html>
diff --git a/demo/rewrite.js b/demo/rewrite.js
@@ -0,0 +1,62 @@
+/*
+  Copyright (C) 2012 Ariya Hidayat <ariya.hidayat@gmail.com>
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*jslint browser:true evil:true */
+
+function sourceRewrite() {
+    'use strict';
+
+    var code, syntax;
+
+    function setText(id, str) {
+        var el = document.getElementById(id);
+        if (typeof el.innerText === 'string') {
+            el.innerText = str;
+        } else {
+            el.textContent = str;
+        }
+    }
+
+    setText('error', '');
+    if (typeof window.editor !== 'undefined') {
+        // Using CodeMirror.
+        code = window.editor.getValue();
+    } else {
+        // Plain textarea, likely in a situation where CodeMirror does not work.
+        code = document.getElementById('code').value;
+    }
+
+    try {
+        syntax = window.esprima.parse(code, { raw: true });
+        code = window.esprima.generate(syntax);
+    } catch (e) {
+        setText('error', e.toString());
+    } finally {
+        if (typeof window.editor !== 'undefined') {
+            window.editor.setValue(code);
+        } else {
+            document.getElementById('code').value = code;
+        }
+    }
+}
diff --git a/esprima.js b/esprima.js
@@ -337,10 +337,9 @@ parseStatement: true, parseSourceElement: true */
     // Return the next character and move forward.
 
     function nextChar() {
-        var ch = '\x00',
-            idx = index;
-        if (idx < length) {
-            ch = source[idx];
+        var ch;
+        if (index < length) {
+            ch = source[index];
             index += 1;
         }
         return ch;

diff --git a/index.html b/index.html
@@ -68,6 +68,7 @@ <h3>Useful demos</h3>
     <li><a href="demo/precedence.html">Operator precedence</a></li>
     <li><a href="demo/collector.html">Regex collector</a></li>
     <li><a href="demo/functiontrace.html">Function tracing</a></li>
+    <li><a href="demo/rewrite.html">Source rewrite</a></li>
 </ul>
 <h3>Harness tests</h3>
 <ul>