Browse Source
lib,test: remove unneeded escaping of /
The `/` character does not need to be escaped when occurring inside a
character class in a regular expression. Remove such instances of
escaping in the code base.
PR-URL: https://github.com/nodejs/node/pull/9485
Reviewed-By: Prince John Wesley <princejohnwesley@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Teddy Katz <teddy.katz@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
v6.x
Rich Trott
8 years ago
committed by
Anna Henningsen
No known key found for this signature in database
GPG Key ID: D8B9F5AEAE84E4CF
4 changed files with
9 additions and
9 deletions
lib/fs.js
lib/url.js
test/debugger/test-debugger-repl-break-in-module.js
test/parallel/test-require-json.js
@ -1566,13 +1566,13 @@ fs.unwatchFile = function(filename, listener) {
// Regexp that finds the next portion of a (partial) path
// result is [base_with_slash, base], e.g. ['somedir/', 'somedir']
const nextPartRe = isWindows ?
/(.*?)(?:[\ /\\]+|$)/g :
/(.*?)(?:[\ /]+|$)/g ;
/(.*?)(?:[/\\]+|$)/g :
/(.*?)(?:[/]+|$)/g ;
// Regex to find the device root, including trailing slash. E.g. 'c:\\'.
const splitRootRe = isWindows ?
/^(?:[a-zA-Z]:|[\\\ /]{2}[^\\\ /]+[\ \\/][^\\\ /]+)?[\ \\/]*/ :
/^[\ /]*/ ;
/^(?:[a-zA-Z]:|[\\/]{2}[^\\/]+[\\/][^\\/]+)?[\\/]*/ :
/^[/]*/ ;
function encodeRealpathResult ( result , options , err ) {
if ( ! options || ! options . encoding || options . encoding === 'utf8' || err )
@ -200,7 +200,7 @@ Url.prototype.parse = function(url, parseQueryString, slashesDenoteHost) {
// user@server is *always* interpreted as a hostname, and url
// resolution will treat //foo/bar as host=foo,path=bar because that's
// how the browser resolves relative URLs.
if ( slashesDenoteHost || proto || /^\/\/[^@\ /]+@[^@\ /]+/ . test ( rest ) ) {
if ( slashesDenoteHost || proto || /^\/\/[^@/]+@[^@/]+/ . test ( rest ) ) {
var slashes = rest . charCodeAt ( 0 ) === 47 /*/*/ &&
rest . charCodeAt ( 1 ) === 47 /*/*/ ;
if ( slashes && ! ( proto && hostlessProtocol [ proto ] ) ) {
@ -20,7 +20,7 @@ repl.addTest('sb(")^$*+?}{|][(.js\\\\", 1)', [
// continue - the breakpoint should be triggered
repl . addTest ( 'c' , [
/break in .*[\\\ /]mod\.js:2/ ,
/break in .*[\\/]mod\.js:2/ ,
/1/ , /2/ , /3/ , /4/
] ) ;
@ -42,7 +42,7 @@ repl.addTest('restart', [].concat(
// continue - the breakpoint should be triggered
repl . addTest ( 'c' , [
/break in .*[\\\ /]mod\.js:2/ ,
/break in .*[\\/]mod\.js:2/ ,
/1/ , /2/ , /3/ , /4/
] ) ;
@ -53,7 +53,7 @@ repl.addTest('cb("mod.js", 2)', [
] ) ;
repl . addTest ( 'c' , [
/break in .*[\\\ /]main\.js:4/ ,
/break in .*[\\/]main\.js:4/ ,
/2/ , /3/ , /4/ , /5/ , /6/
] ) ;
@ -6,7 +6,7 @@ var assert = require('assert');
try {
require ( path . join ( common . fixturesDir , 'invalid.json' ) ) ;
} catch ( err ) {
var re = /test[\ /\\]fixtures[\ /\\]invalid.json: Unexpected string/ ;
var re = /test[/\\]fixtures[/\\]invalid.json: Unexpected string/ ;
var i = err . message . match ( re ) ;
assert . notStrictEqual ( null , i , 'require() json error should include path' ) ;
}