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

module: replace magic numbers by constants

Browse Source 
- add new constants
- replace "magic" numbers in "module" by constants

PR-URL: https://github.com/nodejs/node/pull/18785
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Minwoo Jung <minwoo@nodesource.com>
Reviewed-By: Weijia Wang <starkwang@126.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Matheus Marchini <matheus@sthima.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
This commit is contained in:
Sergey Golovin 2018-02-14 20:52:00 +03:00 committed by Ruben Bridgewater
parent 2960096a91
commit c86fe511f4
No known key found for this signature in database
GPG Key ID: F07496B3EB3C1762
2 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/internal/constants.js
View File

@ -2,15 +2,20 @@
module.exports = { module.exports = {
// Alphabet chars. // Alphabet chars.
CHAR_UPPERCASE_A: 65, /*A*/ CHAR_UPPERCASE_A: 65, /* A */
CHAR_LOWERCASE_A: 97, /*a*/ CHAR_LOWERCASE_A: 97, /* a */
CHAR_UPPERCASE_Z: 90, /*Z*/ CHAR_UPPERCASE_Z: 90, /* Z */
CHAR_LOWERCASE_Z: 122, /*z*/ CHAR_LOWERCASE_Z: 122, /* z */
// Non-alphabetic chars. // Non-alphabetic chars.
CHAR_DOT: 46, /*.*/ CHAR_DOT: 46, /* . */
CHAR_FORWARD_SLASH: 47, /*/*/ CHAR_FORWARD_SLASH: 47, /* / */
CHAR_BACKWARD_SLASH: 92, /*\*/ CHAR_BACKWARD_SLASH: 92, /* \ */
CHAR_COLON: 58, /*:*/ CHAR_COLON: 58, /* : */
CHAR_QUESTION_MARK: 63, /*?*/ CHAR_QUESTION_MARK: 63, /* ? */
CHAR_UNDERSCORE: 95, /* _ */
// Digits
CHAR_0: 48, /* 0 */
CHAR_9: 57, /* 9 */
}; };

39
lib/module.js
View File

@ -47,6 +47,19 @@ module.exports = Module;
const internalESModule = require('internal/process/modules'); const internalESModule = require('internal/process/modules');
const ModuleJob = require('internal/loader/ModuleJob'); const ModuleJob = require('internal/loader/ModuleJob');
const createDynamicModule = require('internal/loader/CreateDynamicModule'); const createDynamicModule = require('internal/loader/CreateDynamicModule');
const {
CHAR_UPPERCASE_A,
CHAR_LOWERCASE_A,
CHAR_UPPERCASE_Z,
CHAR_LOWERCASE_Z,
CHAR_FORWARD_SLASH,
CHAR_BACKWARD_SLASH,
CHAR_COLON,
CHAR_DOT,
CHAR_UNDERSCORE,
CHAR_0,
CHAR_9,
} = require('internal/constants');
function stat(filename) { function stat(filename) {
filename = path.toNamespacedPath(filename); filename = path.toNamespacedPath(filename);
@ -201,7 +214,7 @@ Module._findPath = function(request, paths, isMain) {
var exts; var exts;
var trailingSlash = request.length > 0 && var trailingSlash = request.length > 0 &&
request.charCodeAt(request.length - 1) === 47/*/*/; request.charCodeAt(request.length - 1) === CHAR_FORWARD_SLASH;
// For each path // For each path
for (var i = 0; i < paths.length; i++) { for (var i = 0; i < paths.length; i++) {
@ -276,8 +289,8 @@ if (process.platform === 'win32') {
// return root node_modules when path is 'D:\\'. // return root node_modules when path is 'D:\\'.
// path.resolve will make sure from.length >=3 in Windows. // path.resolve will make sure from.length >=3 in Windows.
if (from.charCodeAt(from.length - 1) === 92/*\*/ && if (from.charCodeAt(from.length - 1) === CHAR_BACKWARD_SLASH &&
from.charCodeAt(from.length - 2) === 58/*:*/) from.charCodeAt(from.length - 2) === CHAR_COLON)
return [from + 'node_modules']; return [from + 'node_modules'];
const paths = []; const paths = [];
@ -290,7 +303,9 @@ if (process.platform === 'win32') {
// Use colon as an extra condition since we can get node_modules // Use colon as an extra condition since we can get node_modules
// path for drive root like 'C:\node_modules' and don't need to // path for drive root like 'C:\node_modules' and don't need to
// parse drive name. // parse drive name.
if (code === 92/*\*/ || code === 47/*/*/ || code === 58/*:*/) { if (code === CHAR_BACKWARD_SLASH ||
code === CHAR_FORWARD_SLASH ||
code === CHAR_COLON) {
if (p !== nmLen) if (p !== nmLen)
paths.push(from.slice(0, last) + '\\node_modules'); paths.push(from.slice(0, last) + '\\node_modules');
last = i; last = i;
@ -324,7 +339,7 @@ if (process.platform === 'win32') {
var last = from.length; var last = from.length;
for (var i = from.length - 1; i >= 0; --i) { for (var i = from.length - 1; i >= 0; --i) {
const code = from.charCodeAt(i); const code = from.charCodeAt(i);
if (code === 47/*/*/) { if (code === CHAR_FORWARD_SLASH) {
if (p !== nmLen) if (p !== nmLen)
paths.push(from.slice(0, last) + '/node_modules'); paths.push(from.slice(0, last) + '/node_modules');
last = i; last = i;
@ -357,9 +372,9 @@ Module._resolveLookupPaths = function(request, parent, newReturn) {
// Check for relative path // Check for relative path
if (request.length < 2 || if (request.length < 2 ||
request.charCodeAt(0) !== 46/*.*/ || request.charCodeAt(0) !== CHAR_DOT ||
(request.charCodeAt(1) !== 46/*.*/ && (request.charCodeAt(1) !== CHAR_DOT &&
request.charCodeAt(1) !== 47/*/*/)) { request.charCodeAt(1) !== CHAR_FORWARD_SLASH)) {
var paths = modulePaths; var paths = modulePaths;
if (parent) { if (parent) {
if (!parent.paths) if (!parent.paths)
@ -407,10 +422,10 @@ Module._resolveLookupPaths = function(request, parent, newReturn) {
// We matched 'index.', let's validate the rest // We matched 'index.', let's validate the rest
for (; i < base.length; ++i) { for (; i < base.length; ++i) {
const code = base.charCodeAt(i); const code = base.charCodeAt(i);
if (code !== 95/*_*/ && if (code !== CHAR_UNDERSCORE &&
(code < 48/*0*/ || code > 57/*9*/) && (code < CHAR_0 || code > CHAR_9) &&
(code < 65/*A*/ || code > 90/*Z*/) && (code < CHAR_UPPERCASE_A || code > CHAR_UPPERCASE_Z) &&
(code < 97/*a*/ || code > 122/*z*/)) (code < CHAR_LOWERCASE_A || code > CHAR_LOWERCASE_Z))
break; break;
} }
if (i === base.length) { if (i === base.length) {