From 753e1d80f938799762c352fed73d597686e82fcd Mon Sep 17 00:00:00 2001
From: Danny Yoo <dyoo@hashcollision.org>
Date: Fri, 5 Apr 2013 14:57:38 -0600
Subject: [PATCH] syntax errors caught.

---
 whalesong/repl-prototype/htdocs/repl.js       | 46 ++++++++++---------
 whalesong/repl-prototype/sandboxed-server.rkt |  1 +
 whalesong/repl-prototype/server.rkt           |  1 -
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/whalesong/repl-prototype/htdocs/repl.js b/whalesong/repl-prototype/htdocs/repl.js
index 1b3e504..b341f32 100644
--- a/whalesong/repl-prototype/htdocs/repl.js
+++ b/whalesong/repl-prototype/htdocs/repl.js
@@ -140,28 +140,32 @@
     Repl.prototype.executeCompiledProgram = function(compiledResult,
 						     onDoneSuccess, onDoneFail) {
         var that = this;
-        // compiledResult.compiledCodes is an array of function chunks.
-        // The evaluation leaves the value register of the machine
-        // to contain the list of values from toplevel evaluation.
-        var compiledCodes = compiledResult.compiledCodes;
-        forEachK(compiledCodes,
-                 function(code, k) {
-                     // Indirect eval usage here is deliberate.
-                     var codeFunction = (0,eval)(code);
-                     var onGoodEvaluation = function() {
-                         var resultList = that.M.v;
-                         while(resultList !== plt.baselib.lists.EMPTY) {
-                             print(that, resultList.first);
-                             resultList = resultList.rest;
+        if (compiledResult.type === 'error') {
+            return onDoneFail(compiledResult);
+        } else {
+            // compiledResult.compiledCodes is an array of function chunks.
+            // The evaluation leaves the value register of the machine
+            // to contain the list of values from toplevel evaluation.
+            var compiledCodes = compiledResult.compiledCodes;
+            forEachK(compiledCodes,
+                     function(code, k) {
+                         // Indirect eval usage here is deliberate.
+                         var codeFunction = (0,eval)(code);
+                         var onGoodEvaluation = function() {
+                             var resultList = that.M.v;
+                             while(resultList !== plt.baselib.lists.EMPTY) {
+                                 print(that, resultList.first);
+                                 resultList = resultList.rest;
+                             };
+                             k();
                          };
-                         k();
-                     };
-                     var onBadEvaluation = function(M, err) {
-                         onDoneFail(err);
-                     };
-                     codeFunction(that.M, onGoodEvaluation, onBadEvaluation);
-                 },
-                 onDoneSuccess);
+                         var onBadEvaluation = function(M, err) {
+                             onDoneFail(err);
+                         };
+                         codeFunction(that.M, onGoodEvaluation, onBadEvaluation);
+                     },
+                     onDoneSuccess);
+        }
     };
 
 
diff --git a/whalesong/repl-prototype/sandboxed-server.rkt b/whalesong/repl-prototype/sandboxed-server.rkt
index 19bb219..03dc869 100644
--- a/whalesong/repl-prototype/sandboxed-server.rkt
+++ b/whalesong/repl-prototype/sandboxed-server.rkt
@@ -25,6 +25,7 @@
 (let loop ()
   (define eval
     (parameterize ([sandbox-memory-limit 256]
+                   [sandbox-eval-limits '(+inf.0 256)]
                    [sandbox-output (current-output-port)]
                    [sandbox-network-guard my-network-guard])
       (printf "memory limit: ~s mb\n" (sandbox-memory-limit))
diff --git a/whalesong/repl-prototype/server.rkt b/whalesong/repl-prototype/server.rkt
index 816076f..30d9cdc 100644
--- a/whalesong/repl-prototype/server.rkt
+++ b/whalesong/repl-prototype/server.rkt
@@ -77,7 +77,6 @@
                     [else #f]))
   ;; Compile the program here...
   (with-handlers ([exn:fail? (lambda (exn)
-                               (printf "Error: ~s\n" (exn-message exn))
                                (write-json (hash 'type "error"
                                                  'message (exn-message exn))
                                            op))])