Skip to content

Commit

Permalink
lib,tools: remove unneeded escaping of /
Browse files Browse the repository at this point in the history
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: #9591
Reviewed-By: Teddy Katz <[email protected]>
  • Loading branch information
princejwesley authored and addaleax committed Dec 5, 2016
1 parent 77e145a commit a673d44
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion lib/url.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions tools/doc/html.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function loadGtoc(cb) {
function toID(filename) {
return filename
.replace('.html', '')
.replace(/[^\w\-]/g, '-')
.replace(/[^\w-]/g, '-')
.replace(/-+/g, '-');
}

Expand Down Expand Up @@ -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));
Expand Down
8 changes: 4 additions & 4 deletions tools/doc/json.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function doJSON(input, filename, cb) {
// <!-- type = module -->
// 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 '';
Expand Down Expand Up @@ -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];
Expand All @@ -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];
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions tools/license2rtf.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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() {
Expand Down

0 comments on commit a673d44

Please sign in to comment.