From 242f911812b18ac62ae1bbe58465d2ed211feeab Mon Sep 17 00:00:00 2001 From: Sergey Golovin Date: Mon, 19 Feb 2018 21:13:54 +0300 Subject: [PATCH] module: replace "magic" numbers by constants MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - add new constants - replace numbers by constants PR-URL: https://github.com/nodejs/node/pull/18869 Reviewed-By: Colin Ihrig Reviewed-By: Michaƫl Zasso Reviewed-By: Ruben Bridgewater Reviewed-By: Matheus Marchini --- lib/internal/constants.js | 4 ++++ lib/internal/module.js | 13 ++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/internal/constants.js b/lib/internal/constants.js index d059dbc7ef8fa6..93bf926a84e165 100644 --- a/lib/internal/constants.js +++ b/lib/internal/constants.js @@ -14,6 +14,10 @@ module.exports = { CHAR_COLON: 58, /* : */ CHAR_QUESTION_MARK: 63, /* ? */ CHAR_UNDERSCORE: 95, /* _ */ + CHAR_LINE_FEED: 10, /* \n */ + CHAR_CARRIAGE_RETURN: 13, /* \r */ + CHAR_EXCLAMATION_MARK: 33, /* ! */ + CHAR_HASH: 35, /* # */ // Digits CHAR_0: 48, /* 0 */ diff --git a/lib/internal/module.js b/lib/internal/module.js index c3dede40fa3b87..6e2fb15268ffe4 100644 --- a/lib/internal/module.js +++ b/lib/internal/module.js @@ -2,6 +2,13 @@ const errors = require('internal/errors'); +const { + CHAR_LINE_FEED, + CHAR_CARRIAGE_RETURN, + CHAR_EXCLAMATION_MARK, + CHAR_HASH, +} = require('internal/constants'); + // Invoke with makeRequireFunction(module) where |module| is the Module object // to use as the context for the require() function. function makeRequireFunction(mod) { @@ -65,8 +72,8 @@ function stripShebang(content) { // Remove shebang var contLen = content.length; if (contLen >= 2) { - if (content.charCodeAt(0) === 35/*#*/ && - content.charCodeAt(1) === 33/*!*/) { + if (content.charCodeAt(0) === CHAR_HASH && + content.charCodeAt(1) === CHAR_EXCLAMATION_MARK) { if (contLen === 2) { // Exact match content = ''; @@ -75,7 +82,7 @@ function stripShebang(content) { var i = 2; for (; i < contLen; ++i) { var code = content.charCodeAt(i); - if (code === 10/*\n*/ || code === 13/*\r*/) + if (code === CHAR_LINE_FEED || code === CHAR_CARRIAGE_RETURN) break; } if (i === contLen)