diff options
| author | isaacs <i@izs.me> | 2013-04-05 09:02:48 -0700 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2013-04-05 09:02:48 -0700 |
| commit | 2c9a38d059d5c744dd111f3a9bc1f850b0d6a078 (patch) | |
| tree | c50b6bbef7281257dc3894ad136d762cb5d4aebb /lib/repl.js | |
| parent | b9655fc75813fe452998cd41162bcac5dbceba25 (diff) | |
| parent | 58f93ffc4a23aa7240808288acf8cf9f3022abea (diff) | |
| download | nodejs-2c9a38d059d5c744dd111f3a9bc1f850b0d6a078.tar.gz nodejs-2c9a38d059d5c744dd111f3a9bc1f850b0d6a078.tar.bz2 nodejs-2c9a38d059d5c744dd111f3a9bc1f850b0d6a078.zip | |
Merge remote-tracking branch 'ry/v0.10'
Conflicts:
AUTHORS
ChangeLog
deps/v8/src/json-parser.h
lib/crypto.js
src/node_version.h
Diffstat (limited to 'lib/repl.js')
| -rw-r--r-- | lib/repl.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/repl.js b/lib/repl.js index 52893cddc..7e9d0527b 100644 --- a/lib/repl.js +++ b/lib/repl.js @@ -937,7 +937,9 @@ function isSyntaxError(e) { // RegExp syntax error !e.match(/^SyntaxError: Invalid regular expression/) && !e.match(/^SyntaxError: Invalid flags supplied to RegExp constructor/) && + // "strict mode" syntax errors + !e.match(/^SyntaxError: .*strict mode.*/i) && // JSON.parse() error !(e.match(/^SyntaxError: Unexpected (token .*|end of input)/) && - e.match(/\n at Object.parse \(native\)\n/)); + e.match(/\n {4}at Object.parse \(native\)\n/)); } |