From 976c9e8b587cc2a292836e3c0de57a8212e3e94d Mon Sep 17 00:00:00 2001
From: Aviv Palivoda <palaviv@gmail.com>
Date: Sat, 9 Mar 2019 18:41:02 +0200
Subject: [PATCH 1/7] Add interactive shell to WASM demo

---
 wasm/demo/package.json  |  3 ++-
 wasm/demo/src/index.ejs |  3 +++
 wasm/demo/src/index.js  |  1 +
 wasm/demo/src/main.js   | 43 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/wasm/demo/package.json b/wasm/demo/package.json
index 321bef0902..2184c6db84 100644
--- a/wasm/demo/package.json
+++ b/wasm/demo/package.json
@@ -4,7 +4,8 @@
     "description": "Bindings to the RustPython library for WebAssembly",
     "main": "index.js",
     "dependencies": {
-        "codemirror": "^5.42.0"
+        "codemirror": "^5.42.0",
+        "xterm": "^3.8.0"
     },
     "devDependencies": {
         "@wasm-tool/wasm-pack-plugin": "0.2.0",
diff --git a/wasm/demo/src/index.ejs b/wasm/demo/src/index.ejs
index 0cb2def1d5..a2a02d214b 100644
--- a/wasm/demo/src/index.ejs
+++ b/wasm/demo/src/index.ejs
@@ -30,6 +30,9 @@
         <h3>Standard Output</h3>
         <textarea id="console" readonly>Loading...</textarea>
 
+        <h3>Interactive shell</h3>
+         <div id="terminal"></div>
+
         <p>Here's some info regarding the <code>rp.pyEval()</code> function</p>
         <ul>
             <li>
diff --git a/wasm/demo/src/index.js b/wasm/demo/src/index.js
index bf5257df2a..9b58afe398 100644
--- a/wasm/demo/src/index.js
+++ b/wasm/demo/src/index.js
@@ -1,5 +1,6 @@
 import './style.css';
 import 'codemirror/lib/codemirror.css';
+import 'xterm/dist/xterm.css';
 
 // A dependency graph that contains any wasm must all be imported
 // asynchronously. This `index.js` file does the single async import, so
diff --git a/wasm/demo/src/main.js b/wasm/demo/src/main.js
index 0735f8d227..8b6c608c62 100644
--- a/wasm/demo/src/main.js
+++ b/wasm/demo/src/main.js
@@ -2,6 +2,7 @@ import * as rp from '../../lib/pkg';
 import CodeMirror from 'codemirror';
 import 'codemirror/mode/python/python';
 import 'codemirror/addon/comment/comment';
+import { Terminal } from 'xterm';
 
 // so people can play around with it
 window.rp = rp;
@@ -72,3 +73,45 @@ snippets.addEventListener('change', updateSnippet);
 // Run once for demo (updateSnippet b/c the browser might try to keep the same
 // option selected for the `select`, but the textarea won't be updated)
 updateSnippet();
+
+const term = new Terminal();
+term.open(document.getElementById('terminal'));
+term.write(">>>> ");
+
+function remove_non_ascii(str) {
+    if ((str===null) || (str===''))
+        return false;
+    else
+        str = str.toString();
+
+    return str.replace(/[^\x20-\x7E]/g, '');
+}
+
+function print_to_console(data) {
+    term.write(remove_non_ascii(data) + "\r\n");
+}
+
+var input = "";
+term.on("data", (data) => {
+  const code = data.charCodeAt(0);
+  if (code == 13) { // CR
+    term.write("\r\n");
+    try {
+        rp.pyEval(input, {
+            stdout: print_to_console
+        });
+    } catch (err) {
+        if (err instanceof WebAssembly.RuntimeError) {
+            err = window.__RUSTPYTHON_ERROR || err;
+        }
+        print_to_console(err);
+    }
+    term.write(">>>> ");
+    input = "";
+  } else if (code < 32 || code == 127) { // Control
+    return;
+  } else { // Visible
+    term.write(data);
+    input += data;
+  }
+});

From ec3ace527b538fd3c6372e8c55bb31a0333f98f2 Mon Sep 17 00:00:00 2001
From: Aviv Palivoda <palaviv@gmail.com>
Date: Sat, 9 Mar 2019 20:57:36 +0200
Subject: [PATCH 2/7] Change prompt to >>>>>

---
 wasm/demo/src/main.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/wasm/demo/src/main.js b/wasm/demo/src/main.js
index 8b6c608c62..3ef876ec0f 100644
--- a/wasm/demo/src/main.js
+++ b/wasm/demo/src/main.js
@@ -74,9 +74,11 @@ snippets.addEventListener('change', updateSnippet);
 // option selected for the `select`, but the textarea won't be updated)
 updateSnippet();
 
+const prompt = ">>>>> ";
+
 const term = new Terminal();
 term.open(document.getElementById('terminal'));
-term.write(">>>> ");
+term.write(prompt);
 
 function remove_non_ascii(str) {
     if ((str===null) || (str===''))
@@ -106,7 +108,7 @@ term.on("data", (data) => {
         }
         print_to_console(err);
     }
-    term.write(">>>> ");
+    term.write(prompt);
     input = "";
   } else if (code < 32 || code == 127) { // Control
     return;

From 03d431ecacb4690128bf3a0701e0072e221d6418 Mon Sep 17 00:00:00 2001
From: Aviv Palivoda <palaviv@gmail.com>
Date: Sat, 9 Mar 2019 21:17:13 +0200
Subject: [PATCH 3/7] Support backspace in interactive shell

---
 wasm/demo/src/main.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wasm/demo/src/main.js b/wasm/demo/src/main.js
index 3ef876ec0f..e2ef78fc63 100644
--- a/wasm/demo/src/main.js
+++ b/wasm/demo/src/main.js
@@ -110,6 +110,9 @@ term.on("data", (data) => {
     }
     term.write(prompt);
     input = "";
+  } else if (code == 127) {
+    term.write("\b \b");
+    input = input.slice(0, -1);
   } else if (code < 32 || code == 127) { // Control
     return;
   } else { // Visible

From 669aa70aabaf8e13f1e8b8d76aab3041c3f1eeff Mon Sep 17 00:00:00 2001
From: Aviv Palivoda <palaviv@gmail.com>
Date: Sat, 9 Mar 2019 21:23:59 +0200
Subject: [PATCH 4/7] Support ':' in interactive shell

---
 wasm/demo/src/main.js | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/wasm/demo/src/main.js b/wasm/demo/src/main.js
index e2ef78fc63..2fecd945b7 100644
--- a/wasm/demo/src/main.js
+++ b/wasm/demo/src/main.js
@@ -97,19 +97,24 @@ var input = "";
 term.on("data", (data) => {
   const code = data.charCodeAt(0);
   if (code == 13) { // CR
-    term.write("\r\n");
-    try {
-        rp.pyEval(input, {
-            stdout: print_to_console
-        });
-    } catch (err) {
-        if (err instanceof WebAssembly.RuntimeError) {
-            err = window.__RUSTPYTHON_ERROR || err;
+    if (input[input.length - 1] == ':') {
+        input += data
+        term.write("\r\n.....");
+    } else {
+        term.write("\r\n");
+        try {
+            rp.pyEval(input, {
+                stdout: print_to_console
+            });
+        } catch (err) {
+            if (err instanceof WebAssembly.RuntimeError) {
+                err = window.__RUSTPYTHON_ERROR || err;
+            }
+            print_to_console(err);
         }
-        print_to_console(err);
+        term.write(prompt);
+        input = "";
     }
-    term.write(prompt);
-    input = "";
   } else if (code == 127) {
     term.write("\b \b");
     input = input.slice(0, -1);

From 264d218b709448c405fa255cba4cc69c9a9578fb Mon Sep 17 00:00:00 2001
From: Aviv Palivoda <palaviv@gmail.com>
Date: Sun, 10 Mar 2019 18:36:29 +0200
Subject: [PATCH 5/7] Use seperate VM for interactive shell

---
 wasm/demo/src/main.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/wasm/demo/src/main.js b/wasm/demo/src/main.js
index 2fecd945b7..02f12c4bd8 100644
--- a/wasm/demo/src/main.js
+++ b/wasm/demo/src/main.js
@@ -93,6 +93,9 @@ function print_to_console(data) {
     term.write(remove_non_ascii(data) + "\r\n");
 }
 
+const terminalVM = rp.vmStore.init("term_vm");
+terminalVM.setStdout(print_to_console);
+
 var input = "";
 term.on("data", (data) => {
   const code = data.charCodeAt(0);
@@ -103,9 +106,7 @@ term.on("data", (data) => {
     } else {
         term.write("\r\n");
         try {
-            rp.pyEval(input, {
-                stdout: print_to_console
-            });
+            terminalVM.exec(input);
         } catch (err) {
             if (err instanceof WebAssembly.RuntimeError) {
                 err = window.__RUSTPYTHON_ERROR || err;

From 625e181fd8972c9fefb568952857e46498df9de5 Mon Sep 17 00:00:00 2001
From: Aviv Palivoda <palaviv@gmail.com>
Date: Sun, 10 Mar 2019 18:38:17 +0200
Subject: [PATCH 6/7] Use snakeCase

---
 wasm/demo/src/main.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/wasm/demo/src/main.js b/wasm/demo/src/main.js
index 02f12c4bd8..185588921a 100644
--- a/wasm/demo/src/main.js
+++ b/wasm/demo/src/main.js
@@ -80,7 +80,7 @@ const term = new Terminal();
 term.open(document.getElementById('terminal'));
 term.write(prompt);
 
-function remove_non_ascii(str) {
+function removeNonAscii(str) {
     if ((str===null) || (str===''))
         return false;
     else
@@ -89,12 +89,12 @@ function remove_non_ascii(str) {
     return str.replace(/[^\x20-\x7E]/g, '');
 }
 
-function print_to_console(data) {
-    term.write(remove_non_ascii(data) + "\r\n");
+function printToConsole(data) {
+    term.write(removeNonAscii(data) + "\r\n");
 }
 
 const terminalVM = rp.vmStore.init("term_vm");
-terminalVM.setStdout(print_to_console);
+terminalVM.setStdout(printToConsole);
 
 var input = "";
 term.on("data", (data) => {
@@ -111,7 +111,7 @@ term.on("data", (data) => {
             if (err instanceof WebAssembly.RuntimeError) {
                 err = window.__RUSTPYTHON_ERROR || err;
             }
-            print_to_console(err);
+            printToConsole(err);
         }
         term.write(prompt);
         input = "";

From f27cb5b8ed46cb2b97c70ac6f5ea1c3606f243df Mon Sep 17 00:00:00 2001
From: Aviv Palivoda <palaviv@gmail.com>
Date: Sun, 10 Mar 2019 18:40:03 +0200
Subject: [PATCH 7/7] Don't delete prompt

---
 wasm/demo/src/main.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/wasm/demo/src/main.js b/wasm/demo/src/main.js
index 185588921a..2f6de563d1 100644
--- a/wasm/demo/src/main.js
+++ b/wasm/demo/src/main.js
@@ -117,8 +117,10 @@ term.on("data", (data) => {
         input = "";
     }
   } else if (code == 127) {
-    term.write("\b \b");
-    input = input.slice(0, -1);
+    if (input.length > 0) {
+        term.write("\b \b");
+        input = input.slice(0, -1);
+    }
   } else if (code < 32 || code == 127) { // Control
     return;
   } else { // Visible