daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

pull/5370/head
Fedor Indutny 2011-09-11 14:05:00 +07:00 committed by Ryan Dahl
parent 55c1546f01
commit df480e0357
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/repl.js
View File

@ -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,14 +177,18 @@ 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
@ -192,7 +196,7 @@ function REPLServer(prompt, stream, eval) {
self.displayPrompt();
return;
} else if (e) {
self.outputStream.write(e + '\n');
self.outputStream.write((e.stack || e) + '\n');
}
// Clear buffer if no SyntaxErrors