more cleanup

example/example-page.css

@@ -10,7 +10,7 @@ body {
 }
 
 .container .col {
-  width: 50%;
+  width: 33%;
   padding: 10px;
 }
 
@@ -20,4 +20,15 @@ body {
 
 .CodeMirror {
   box-shadow: 3px 4px 21px -4px rgba(0,0,0,0.75);
-}
+}
+
+
+#fullscreenButton {
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+  transform: translate(-50%, 0px);
+}
+#output { position: relative; }
+main { text-align: center; }
+main .error { background: red; padding: 10px; font-family: courier; line-height: 5ex; }

example/example.js

@@ -5,7 +5,7 @@ import prettyJS from 'pretty-js'
 
 import { compile } from '../src/wescheme'
 
-import Evaluator from '../src/runtime/mzscheme-vm/evaluator'
+import { Runner } from '../src/runtime/mzscheme-vm/evaluator'
 import loadProject from '../src/runtime/loadProject'
 
 require('./example.css')
@@ -22,18 +22,19 @@ var cm2 = CodeMirror.fromTextArea(
 )
 cm.on('change', function() {
   try {
-    cm2.setValue(prettyJS(compile("TEST PROGRAM", cm.getValue(), true).bytecode.toString()))
+    const bytecode = prettyJS(compile(cm.getValue(), true).bytecode.toString());
+    cm2.setValue(bytecode)
   } catch (e) {
+    cm2.setValue("Compilation Error (see console for details)")
     if (e instanceof Error) {
       throw e
     }
-    cm2.setValue(e)
   }
 })
 
-
 cm2.on('change', function() {
-  try { init(); } 
+  if(cm2.getValue().includes("Compilation Error")) return;
+  try { runBytecode(); } 
   catch (e) { throw e; }
 });
 
@@ -42,130 +43,19 @@ cm.setValue('(triangle 200 "solid" "turquoise")')
 ///////////////////////////////////////////////////////////////////////////////
 // imported from WeScheme war-src/js/run.js
 
-function init(publicId) { 
-
-  var Runner = function(outputDOMContainer) {
-    var that = this;
-    this.outputDOMContainer = outputDOMContainer;
-    this.evaluator = new Evaluator({ 
-       write: function(thing) { that.addToInteractions(thing); },
-    });
-    this.evaluator.setImageProxy("/imageProxy");
-    this.evaluator.setRootLibraryPath("/js/mzscheme-vm/collects");
-
-    this.runCompiledCode = function(compiledCode, permStringArray) {
-      var that = this;
-      var onSuccessRun = function() { };
-      var onFailRun = function(exn) { that.renderErrorAsDomNode(exn); };
-      this.evaluator.executeCompiledProgram((0,eval)('(' + compiledCode + ')'),
-                                            onSuccessRun,
-                                            onFailRun);
-    };
-
-    this.runSourceCode = function(title, sourceCode, permStringArray) {
-      var that = this;
-      var onSuccessRun = function() { console.log('success')};
-      var onFailRun = function(exn) { that.renderErrorAsDomNode(exn); };
-      this.evaluator.executeProgram(title, sourceCode, onSuccessRun, onFailRun);
-    };
-
-    this.addToInteractions = function(interactionVal) {
-
-      // Returns if x is a dom node.
-      function isDomNode(x) {
-          return (x.nodeType != undefined);
-      }
-      // Returns if x is a node that should be printed
-      // Printable Nodes are CANVAS elements, OR non-empty SPANs
-      function isPrintableNode(x){
-        return x.nodeName === "CANVAS" || x.childNodes.length > 0;
-      }
-
-      if(!isPrintableNode(interactionVal)){ return;}      // make sure there are no other topLevelEvaluationNodes in the outputDOMContainer
-      while(this.outputDOMContainer.firstChild){
-        this.outputDOMContainer.removeChild(this.outputDOMContainer.firstChild);
-      }
-      if (isDomNode(interactionVal)) {
-        interactionVal.style.display="inline-block";
-        interactionVal.classList.add("replOutput");      // simulate the editor REPL, so CSS spacing will kick in
-        this.outputDOMContainer.append(interactionVal);
-      } else {
-        var newArea = document.createElement("div");
-        newArea.style.width='100%';
-        newArea.text(interactionVal);
-        newArea.style.display="inline-block";
-        this.outputDOMContainer.append(newArea);
-      }
-      this.outputDOMContainer.scrollTop = this.outputDOMContainer.scrollHeight;
-    };
-
-    // renderErrorAsDomNode: exception -> element
-    // Given an exception, produces error dom node to be displayed.
-    this.renderErrorAsDomNode = function(err) {
-      var msg = this.evaluator.getMessageFromExn(err);
-
-      var dom = document.createElement('div');
-      dom['class'] = 'moby-error';
-
-      var msgDom = document.createElement('div');
-      msgDom['class'] = 'moby-error:message';
-      msgDom.appendChild(document.createTextNode(msg));
-      dom.appendChild(msgDom);
-
-      var stacktrace = this.evaluator.getTraceFromExn(err);
-      for (var i = 0; i < stacktrace.length; i++) {
-        dom.appendChild(document.createTextNode("at: line " + stacktrace[i].line +
-                                                ", column " + stacktrace[i].column));
-      }
-      return dom;
-    };
-  };
-
+function runBytecode(publicId) { 
+  var inter = document.getElementById('interactions');
   var runner = new Runner(document.getElementById('interactions'));
-  var afterLoad = function(aProgram) {
-
-    var title = "Test Program",       // aProgram.getTitle(),
-        sourceCode = cm.getValue(),   // aProgram.getSourceCode(),
-        programCode = null,           // Set it to null, so that the client-side compiler is invoked.
-        permissions = null,           // aProgram.getPermissions(),
-        notes       = null;           // aProgram.getNotes();
-
-    var j = document.getElementById('interactions'),
-        b = document.getElementsByTagName("body")[0];
-
-    var toggleFullscreen = function() {
-      // obtain the element being added
-      var elem;
-      if (j.querySelectorAll("canvas").length == 1) { elem = j.querySelectorAll("canvas")[0]; }
-      else { elem = j[0]; }
-
-      // get fullscreen access
-      if(!document.fullscreenElement) elem.requestFullscreen( Element.ALLOW_KEYBOARD_INPUT );
-      else document.exitFullscreen();
-    };
-    var input = document.createElement("input");
-    input.type = "button";
-    input.value = "Run Fullscreen";
-    input.style = "margin-top: 20px; display: block; margin-left: auto; margin-right: auto";
-    input.onclick = toggleFullscreen;
-    b.appendChild(input);
-
-    var appendFinishedMsg = function() {
-        var inter = document.getElementById('interactions');
-        var finished = document.createElement('span');
-        finished.id = "finished";
-        finished.innerHTML = "The program has finished running, but only included definitions (which do not produce any output).";
-        if(inter.children.length == 0) {
-            inter.appendChild(finished);
-        }
-    };
-
-    if (programCode) {
-      runner.runCompiledCode(programCode, permissions);
-    } else  {
-      runner.runSourceCode("TEST PROGRAM", sourceCode, permissions);
+  var reportIfNoOutput = function() {
+    if(inter.children.length == 0) {
+        inter.innerHTML = "The program has finished running, but only included definitions (which do not produce any output).";
     }
-    appendFinishedMsg();
   };
-  afterLoad();
+  try {
+    runner.runSourceCode(null, cm.getValue(), null); // pass null for permissions and title
+  } catch(e) {
+    inter.innerHTML = "<span class='error'>" + e.toString() + "</span>";
+  } finally {
+    reportIfNoOutput();
+  }
 }

example/index.html

@@ -1,19 +1,21 @@
 <html>
   <body>
-    <h1>wescheme-js</h1>
+    <h1>WeScheme as a Node Module</h1>
     <div class="container">
-      <div class="col">
+      <div id="sourcecode" class="col">
         <p>Write scheme code here...</p>
         <textarea id="code"></textarea>
       </div>
-      <div class="col">
-        <p>And get compiled javascript here!</p>
+      <div id="bytecode" class="col">
+        <p>get compiled bytecode here...</p>
         <textarea id="code2"></textarea>
       </div>
-      <div class="col">
-        <p>And see executed output here!</p>
+      <div id="output" class="col">
+        <p>and see output here!</p>
           <main id="interactions" role="log" aria-live="assertive"></main>
+      </div>
     </div>
+
     <script src="build/example.js"></script>
   </body>
 </html>

src/compiler.js

@@ -29,7 +29,7 @@ import {
 } from './structures';
 var compiler = require('./compiler');
 var jsnums = require('./runtime/js-numbers');
-var types = require('./runtime/types');
+import types from './runtime/types';
 
 /*
  SOMEDAY...but probably never

src/lex.js

@@ -1,5 +1,5 @@
 var compiler = require('./structures');
-var types = require('./runtime/types');
+import types from './runtime/types';
 var jsnums = require('./runtime/js-numbers');
 
 /*
@@ -1026,8 +1026,6 @@ export var lex = function(str, strSource, debug) {
   var end = new Date().getTime();
   if (debug) {
     console.log("Lexed in " + (Math.floor(end - start)) + "ms");
-    console.log(sexp);
-    console.log(sexpToString(sexp));
   }
   return sexp;
 };

src/parser.js

@@ -30,7 +30,7 @@ import {
   throwError,
   keywords
 } from './structures';
-var types    = require('./runtime/types');
+import types from './runtime/types';
 var compiler = require('./compiler');
 /*
  

src/runtime/control.js

@@ -1,9 +1,9 @@
 // Control structures
 
 var sys = require('sys');
-var types = require('./types');
+var types = require('./types').default 
 import primitive from './primitive'
-var types = require('./types');
+import state from './state'
 
 var DEBUG_ON = false;
 

src/runtime/helpers.js

@@ -1,3 +1,4 @@
+import types from './types'
 
 //////////////////////////////////////////////////////////////
 
@@ -622,4 +623,4 @@ var helpers = {};
 })();
 
 /////////////////////////////////////////////////////////////////
-export default helpers;
+export default helpers;

src/runtime/interpret.js

@@ -1,12 +1,13 @@
 
 // For node.js.
 var sys = require('sys');
-var types = require('./types');
+var types = require('./types').default 
 import primitive from './primitive'
 import loader from './loader';
 var assert = require('assert');
 import control from './control'
-var state = require('./state');
+import helpers from './helpers'
+var state = require('./state').default;
 
 var DEBUG_ON = false;
 
@@ -143,30 +144,25 @@ var run = function(aState, onSuccessK, onFailK) {
     if (! onFailK) { onFailK = function(exn) { throw exn; } };
 
     function doRunWork(){
-      console.log(1);
       var gas = MAX_STEPS_BEFORE_BOUNCE;
       while( (! aState.isStuck()) && (gas > 0)) {
-        console.log(2);
           step(aState);
           gas--;
       }
       if (aState.breakRequested) {
-        console.log('breakRequested');
           onFailK(types.schemeError(
                     types.exnBreak("user break", 
                                    state.captureCurrentContinuationMarks(aState),
                                    captureContinuationClosure(aState))));
           return;
       } else if (gas <= 0) {
-        console.log('pausing for browser thread');
           var stateValues = aState.save();
           setTimeout(function(){ 
                        aState.restore(stateValues);
                        run(aState, onSuccessK, onFailK);
                      },
                      0);
       } else {
-        console.log('done!')
           onSuccessK(aState.v);
           return;
       }
@@ -184,7 +180,8 @@ var run = function(aState, onSuccessK, onFailK) {
           // scheme exception
           // If the error is incomplete, finish constructing it
           if ( types.isIncompleteExn(e.val) ) {
-        var contMarks = state.captureCurrentContinuationMarks(aState);
+            console.log(state)
+            var contMarks = state.captureCurrentContinuationMarks(aState);
           e = types.schemeError(e.val.constructor.apply(null, [e.val.msg, contMarks].concat(e.val.otherArgs) ));
           }
           onFailK(e);

src/runtime/loader.js

@@ -1,6 +1,8 @@
 // Loader: take bytecode and translate to internal format.
 
 import control from './control'
+import state from './state'
+
 var sys = require('sys');
 
 var loader = {};