suzanne.soy/whalesong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minimal error handling just so failure isn't quiet.

Browse Source
This commit is contained in:
Danny Yoo 2013-03-05 17:03:28 -07:00
parent 3da2292247
commit 76115cc019
2 changed files with 72 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
whalesong/repl-prototype/htdocs/repl.js
View File

@ -78,6 +78,18 @@ $(document).ready(function() {
};
// writeErrorMessage: string -> void
// Write out an error message.
var writeErrorMessage = function(msg) {
$("<span/>")
.text(''+msg)
.css("color", "red")
.appendTo(output);
$("<br/>").appendTo(output);
};
// Print: Racket value -> void
// Prints the racket value out.
var print = function(elt) {
@ -103,6 +115,24 @@ $(document).ready(function() {
$("<tt/>").text('> ' + src).appendTo(output);
$("<br/>").appendTo(output);
var onCompile = function(compiledResult) {
if (compiledResult.type === 'repl') {
return onGoodReplCompile(compiledResult);
} else if (compiledResult.type === 'module') {
alert('internal error: module unexpected');
after();
} else if (compiledResult.type === 'error') {
return onCompileTimeError(compiledResult);
}
};
var onCompileTimeError = function(compiledResult) {
writeErrorMessage(compiledResult.message);
after();
};
var onGoodReplCompile = function(compiledResult) {
// 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.
@ -124,11 +154,7 @@ $(document).ready(function() {
console.log(err.stack);
}
if (err.message) {
$("<span/>")
.text(err.message)
.css("color", "red")
.appendTo(output);
$("<br/>").appendTo(output);
writeErrorMessage(err.message);
}
after();
@ -137,8 +163,11 @@ $(document).ready(function() {
},
after);
};
var onCompileError = function(err) {
};
var onServerError = function(err) {
console.log("error", err);
writeErrorMessage("internal server error");
after();
};

13
whalesong/repl-prototype/server.rkt
View File

@ -62,7 +62,10 @@
#t]
[else #f]))
;; Compile the program here...
(with-handlers ([exn:fail? (lambda (exn)
(write-json (hash 'type "error"
'message (exn-message exn))
op))])
(cond [(not as-mod?)
(define ip (open-input-string text-src))
(port-count-lines! ip)
@ -83,7 +86,8 @@
(define assembled (assemble/write-invoke compiled-bytecode assembled-op 'with-preemption))
(cons (get-output-string assembled-op) (loop))])))
(printf "assembled codes ~a\n" assembled-codes)
(write-json (hash 'compiledCodes assembled-codes)
(write-json (hash 'type "repl"
'compiledCodes assembled-codes)
op)]
[else
(define program-port (open-output-string))
@ -91,9 +95,10 @@
(read (open-input-string (string-append "#lang whalesong\n" text-src)))))
#:should-follow-children? (lambda (src) #f)
#:output-port program-port)
(write-json (hash 'compiledModule (get-output-string program-port))
(write-json (hash 'type "module"
'compiledModule (get-output-string program-port))
op)
])
]))
;; Send it back as json text....
(close-output-port op)