Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libs: fix some RegExp nits #13536

Closed
wants to merge 3 commits into from
Closed

libs: fix some RegExp nits #13536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b2ddb4
libs: take RegExp creation out of cycles
vsemozhetbyt Jun 7, 2017
67f74d5
libs: use test(), not match() in boolean context
vsemozhetbyt Jun 7, 2017
a48371c
libs: remove redundant RegExp parts
vsemozhetbyt Jun 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/_tls_wrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ function SNICallback(servername, callback) {
var ctx;

this.server._contexts.some(function(elem) {
if (servername.match(elem[0]) !== null) {
if (elem[0].test(servername)) {
ctx = elem[1];
return true;
}
Expand Down
6 changes: 4 additions & 2 deletions lib/dns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,21 +309,23 @@ function setServers(servers) {
// servers cares won't have any servers available for resolution
const orig = cares.getServers();
const newSet = [];
const IPv6RE = /\[(.*)\]/;
const addrSplitRE = /:\d+$/;

servers.forEach((serv) => {
var ipVersion = isIP(serv);
if (ipVersion !== 0)
return newSet.push([ipVersion, serv]);

const match = serv.match(/\[(.*)\](?::\d+)?/);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if this was meant to be anchored, i.e. ^…$, otherwise the addition doesn’t make much sense? Anyway, your change seems correct.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this was for some more clarity, to show the wider pattern. But this may impact performance a bit.

const match = serv.match(IPv6RE);
// we have an IPv6 in brackets
if (match) {
ipVersion = isIP(match[1]);
if (ipVersion !== 0)
return newSet.push([ipVersion, match[1]]);
}

const s = serv.split(/:\d+$/)[0];
const s = serv.split(addrSplitRE)[0];
ipVersion = isIP(s);

if (ipVersion !== 0)
Expand Down
6 changes: 3 additions & 3 deletions lib/internal/cluster/master.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,14 @@ function createWorkerProcess(id, env) {
var workerEnv = util._extend({}, process.env);
var execArgv = cluster.settings.execArgv.slice();
var debugPort = 0;
var debugArgvRE =
/^(--inspect|--inspect-(brk|port)|--debug|--debug-(brk|port))(=\d+)?$/;

util._extend(workerEnv, env);
workerEnv.NODE_UNIQUE_ID = '' + id;

for (var i = 0; i < execArgv.length; i++) {
const match = execArgv[i].match(
/^(--inspect|--inspect-(brk|port)|--debug|--debug-(brk|port))(=\d+)?$/
);
const match = execArgv[i].match(debugArgvRE);

if (match) {
if (debugPort === 0) {
Expand Down
7 changes: 4 additions & 3 deletions lib/repl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,7 @@ function complete(line, callback) {
const exts = Object.keys(this.context.require.extensions);
var indexRe = new RegExp('^index(' + exts.map(regexpEscape).join('|') +
')$');
var versionedFileNamesRe = /-\d+\.\d+/;

completeOn = match[1];
var subdir = match[2] || '';
Expand All @@ -772,7 +773,7 @@ function complete(line, callback) {
name = files[f];
ext = path.extname(name);
base = name.slice(0, -ext.length);
if (base.match(/-\d+\.\d+(\.\d+)?/) || name === '.npm') {
if (versionedFileNamesRe.test(base) || name === '.npm') {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here, but I really don’t know what this code is supposed to do. :/

Copy link
Contributor Author

@vsemozhetbyt vsemozhetbyt Jun 7, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto about clarity/performance )

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked into this a bit further and this all about the npm cache itself. It is meant to prevent listing all the version folders found in the cache folder (e.g. 1.0.0 in root/.npm/foo/1.0.0/package). As far as I see it this does not check the cache folder anymore though and the windows cache folder (npm-cache instead of .npm) is not excluded either. So I think this part could be safely removed and it's a legacy remnant. I did not try it out though.

// Exclude versioned names that 'npm' installs.
continue;
}
Expand Down Expand Up @@ -816,7 +817,7 @@ function complete(line, callback) {
// spam.eggs.<|> # completions for 'spam.eggs' with filter ''
// foo<|> # all scope vars with filter 'foo'
// foo.<|> # completions for 'foo' with filter ''
} else if (line.length === 0 || line[line.length - 1].match(/\w|\.|\$/)) {
} else if (line.length === 0 || /\w|\.|\$/.test(line[line.length - 1])) {
match = simpleExpressionRE.exec(line);
if (line.length === 0 || match) {
var expr;
Expand Down Expand Up @@ -1067,7 +1068,7 @@ REPLServer.prototype.memory = function memory(cmd) {
self.lines.level.push({
line: self.lines.length - 1,
depth: depth,
isFunction: /\s*function\s*/.test(cmd)
isFunction: /\bfunction\b/.test(cmd)
});
} else if (depth < 0) {
// going... up.
Expand Down
10 changes: 6 additions & 4 deletions lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ const inspectDefaultOptions = Object.seal({
breakLength: 60
});

const numbersOnlyRE = /^\d+$/;

var CIRCULAR_ERROR_MESSAGE;
var Debug;

Expand Down Expand Up @@ -664,7 +666,7 @@ function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
}
for (var n = 0; n < keys.length; n++) {
var key = keys[n];
if (typeof key === 'symbol' || !key.match(/^\d+$/)) {
if (typeof key === 'symbol' || !numbersOnlyRE.test(key)) {
output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
key, true));
}
Expand All @@ -683,7 +685,7 @@ function formatTypedArray(ctx, value, recurseTimes, visibleKeys, keys) {
output.push(`... ${remaining} more item${remaining > 1 ? 's' : ''}`);
}
for (const key of keys) {
if (typeof key === 'symbol' || !key.match(/^\d+$/)) {
if (typeof key === 'symbol' || !numbersOnlyRE.test(key)) {
output.push(
formatProperty(ctx, value, recurseTimes, visibleKeys, key, true));
}
Expand Down Expand Up @@ -798,11 +800,11 @@ function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
}
}
if (name === undefined) {
if (array && key.match(/^\d+$/)) {
if (array && numbersOnlyRE.test(key)) {
return str;
}
name = JSON.stringify('' + key);
if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
if (/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/.test(name)) {
name = name.substr(1, name.length - 2);
name = ctx.stylize(name, 'name');
} else {
Expand Down