1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

repl: handle quotes within regexp literal

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/5117
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>
This commit is contained in:
Prince J Wesley 2016-02-06 12:14:27 +05:30 committed by Roman Reiss
parent 3da7d13e59
commit 211018fe72
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/repl.js
View File

@ -84,6 +84,7 @@ class LineParser {
this._literal = null;
this.shouldFail = false;
this.blockComment = false;
this.regExpLiteral = false;
}
parseLine(line) {
@ -99,6 +100,11 @@ class LineParser {
}
if (!this._literal) {
if (this.regExpLiteral && current === '/') {
this.regExpLiteral = false;
previous = null;
continue;
}
if (previous === '*' && current === '/') {
if (this.blockComment) {
this.blockComment = false;
@ -115,13 +121,17 @@ class LineParser {
break;
}
if (previous === '/' && current === '*') {
this.blockComment = true;
if (previous === '/') {
if (current === '*') {
this.blockComment = true;
} else {
this.regExpLiteral = true;
}
previous = null;
}
}
if (this.blockComment) continue;
if (this.blockComment || this.regExpLiteral) continue;
if (current === this._literal) {
this._literal = null;

13
test/parallel/test-repl.js
View File

@ -287,6 +287,19 @@ function error_test() {
// access to internal modules without the --expose_internals flag.
{ client: client_unix, send: 'require("internal/repl")',
expect: /^Error: Cannot find module 'internal\/repl'/ },
// REPL should handle quotes within regexp literal in multiline mode
{ client: client_unix, send: "function x(s) {\nreturn s.replace(/'/,'');\n}",
expect: prompt_multiline + prompt_multiline +
'undefined\n' + prompt_unix },
{ client: client_unix, send: "function x(s) {\nreturn s.replace(/\'/,'');\n}",
expect: prompt_multiline + prompt_multiline +
'undefined\n' + prompt_unix },
{ client: client_unix, send: 'function x(s) {\nreturn s.replace(/"/,"");\n}',
expect: prompt_multiline + prompt_multiline +
'undefined\n' + prompt_unix },
{ client: client_unix, send: 'function x(s) {\nreturn s.replace(/.*/,"");\n}',
expect: prompt_multiline + prompt_multiline +
'undefined\n' + prompt_unix },
]);
}