Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

fix syntax error handling for 'throw ...', fix return value assertion

  • Loading branch information...
indutny authored and ry committed Sep 11, 2011
1 parent 55c1546 commit df480e0357b597aa99f0ceb42c14d13129277e9d
Showing with 11 additions and 7 deletions.
  1. +11 −7 lib/repl.js
@@ -163,9 +163,9 @@ function REPLServer(prompt, stream, eval) {
self.context,
'repl',
function(e, ret) {
if (e) return finish(e);
if (e && !isSyntaxError(e)) return finish(e);

if (ret === 'function' || e) {
if (typeof ret === 'function' || e) {
// Now as statement without parens.
self.eval(self.bufferedCommand, self.context, 'repl', finish);
} else {
@@ -177,22 +177,26 @@ function REPLServer(prompt, stream, eval) {
finish(null);
}

function finish(e, ret) {
function isSyntaxError(e) {
// Convert error to string
e = e && (e.stack || e.toString());
return e && e.match(/^SyntaxError/) &&
!(e.match(/^SyntaxError: Unexpected token .*\n/) &&
e.match(/\n at Object.parse \(native\)\n/));
}

function finish(e, ret) {

// If error was SyntaxError and not JSON.parse error
if (e && e.match(/^SyntaxError/) &&
!(e.match(/^SyntaxError: Unexpected token .*\n/) &&
e.match(/\n at Object.parse \(native\)\n/))) {
if (isSyntaxError(e)) {
// Start buffering data like that:
// {
// ... x: 1
// ... }
self.displayPrompt();
return;
} else if (e) {
self.outputStream.write(e + '\n');
self.outputStream.write((e.stack || e) + '\n');
}

// Clear buffer if no SyntaxErrors

0 comments on commit df480e0

Please sign in to comment.
You can’t perform that action at this time.