From 0f4c7b8c371caae4cd4a2cb1fa03d2079f75663d Mon Sep 17 00:00:00 2001 From: Prince J Wesley Date: Mon, 14 Nov 2016 12:53:35 +0530 Subject: [PATCH] lib,tools: 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/9591 Reviewed-By: Teddy Katz --- lib/url.js | 2 +- tools/doc/html.js | 4 ++-- tools/doc/json.js | 8 ++++---- tools/license2rtf.js | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/url.js b/lib/url.js index a199f4b581..5f87c0c36c 100644 --- a/lib/url.js +++ b/lib/url.js @@ -44,7 +44,7 @@ const protocolPattern = /^([a-z0-9.+-]+:)/i; const portPattern = /:[0-9]*$/; // Special case for a simple path URL -const simplePathPattern = /^(\/\/?(?!\/)[^\?\s]*)(\?[^\s]*)?$/; +const simplePathPattern = /^(\/\/?(?!\/)[^?\s]*)(\?[^\s]*)?$/; const hostnameMaxLen = 255; // protocols that can allow "unsafe" and "unwise" chars. diff --git a/tools/doc/html.js b/tools/doc/html.js index daa230cb92..c0790ffca5 100644 --- a/tools/doc/html.js +++ b/tools/doc/html.js @@ -90,7 +90,7 @@ function loadGtoc(cb) { function toID(filename) { return filename .replace('.html', '') - .replace(/[^\w\-]/g, '-') + .replace(/[^\w-]/g, '-') .replace(/-+/g, '-'); } @@ -284,7 +284,7 @@ function linkJsTypeDocs(text) { // Handle types, for example the source Markdown might say // "This argument should be a {Number} or {String}" for (i = 0; i < parts.length; i += 2) { - typeMatches = parts[i].match(/\{([^\}]+)\}/g); + typeMatches = parts[i].match(/\{([^}]+)\}/g); if (typeMatches) { typeMatches.forEach(function(typeMatch) { parts[i] = parts[i].replace(typeMatch, typeParser.toLink(typeMatch)); diff --git a/tools/doc/json.js b/tools/doc/json.js index a782c54028..f8210ef17f 100644 --- a/tools/doc/json.js +++ b/tools/doc/json.js @@ -31,7 +31,7 @@ function doJSON(input, filename, cb) { // // This is for cases where the markdown semantic structure is lacking. if (type === 'paragraph' || type === 'html') { - var metaExpr = /\n*/g; + var metaExpr = /\n*/g; text = text.replace(metaExpr, function(_0, k, v) { current[k.trim()] = v.trim(); return ''; @@ -371,7 +371,7 @@ function parseListItem(item) { item.name = 'return'; text = text.replace(retExpr, ''); } else { - var nameExpr = /^['`"]?([^'`": \{]+)['`"]?\s*:?\s*/; + var nameExpr = /^['`"]?([^'`": {]+)['`"]?\s*:?\s*/; var name = text.match(nameExpr); if (name) { item.name = name[1]; @@ -388,7 +388,7 @@ function parseListItem(item) { } text = text.trim(); - var typeExpr = /^\{([^\}]+)\}/; + var typeExpr = /^\{([^}]+)\}/; var type = text.match(typeExpr); if (type) { item.type = type[1]; @@ -551,7 +551,7 @@ var classMethExpr = /^class\s*method\s*:?[^.]+\.([^ .()]+)\([^)]*\)\s*?$/i; var methExpr = /^(?:method:?\s*)?(?:[^.]+\.)?([^ .()]+)\([^)]*\)\s*?$/i; -var newExpr = /^new ([A-Z][a-zA-Z]+)\([^\)]*\)\s*?$/; +var newExpr = /^new ([A-Z][a-zA-Z]+)\([^)]*\)\s*?$/; var paramExpr = /\((.*)\);?$/; function newSection(tok) { diff --git a/tools/license2rtf.js b/tools/license2rtf.js index 694e1c6050..4b3d71fe5b 100644 --- a/tools/license2rtf.js +++ b/tools/license2rtf.js @@ -122,7 +122,7 @@ function ParagraphParser() { // Detect separator "lines" within a block. These mark a paragraph break // and are stripped from the output. - if (/^\s*[=*\-]{5,}\s*$/.test(line)) { + if (/^\s*[=*-]{5,}\s*$/.test(line)) { flushParagraph(); return; } @@ -286,7 +286,7 @@ function RtfGenerator() { function rtfEscape(string) { return string - .replace(/[\\\{\}]/g, function(m) { + .replace(/[\\{}]/g, function(m) { return '\\' + m; }) .replace(/\t/g, function() {