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 numbers by constants

PR-URL: https://github.com/nodejs/node/pull/18869
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Matheus Marchini <matheus@sthima.com>
This commit is contained in:
Sergey Golovin 2018-02-19 21:13:54 +03:00 committed by Ruben Bridgewater
parent 13cb056e4c
commit 070a82e82c
No known key found for this signature in database
GPG Key ID: F07496B3EB3C1762
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/internal/constants.js
View File

@ -14,6 +14,10 @@ module.exports = {
CHAR_COLON: 58, /* : */ CHAR_COLON: 58, /* : */
CHAR_QUESTION_MARK: 63, /* ? */ CHAR_QUESTION_MARK: 63, /* ? */
CHAR_UNDERSCORE: 95, /* _ */ CHAR_UNDERSCORE: 95, /* _ */
CHAR_LINE_FEED: 10, /* \n */
CHAR_CARRIAGE_RETURN: 13, /* \r */
CHAR_EXCLAMATION_MARK: 33, /* ! */
CHAR_HASH: 35, /* # */
// Digits // Digits
CHAR_0: 48, /* 0 */ CHAR_0: 48, /* 0 */

13
lib/internal/module.js
View File

@ -2,6 +2,13 @@
const errors = require('internal/errors'); 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 // Invoke with makeRequireFunction(module) where |module| is the Module object
// to use as the context for the require() function. // to use as the context for the require() function.
function makeRequireFunction(mod) { function makeRequireFunction(mod) {
@ -65,8 +72,8 @@ function stripShebang(content) {
// Remove shebang // Remove shebang
var contLen = content.length; var contLen = content.length;
if (contLen >= 2) { if (contLen >= 2) {
if (content.charCodeAt(0) === 35/*#*/ && if (content.charCodeAt(0) === CHAR_HASH &&
content.charCodeAt(1) === 33/*!*/) { content.charCodeAt(1) === CHAR_EXCLAMATION_MARK) {
if (contLen === 2) { if (contLen === 2) {
// Exact match // Exact match
content = ''; content = '';
@ -75,7 +82,7 @@ function stripShebang(content) {
var i = 2; var i = 2;
for (; i < contLen; ++i) { for (; i < contLen; ++i) {
var code = content.charCodeAt(i); var code = content.charCodeAt(i);
if (code === 10/*\n*/ || code === 13/*\r*/) if (code === CHAR_LINE_FEED || code === CHAR_CARRIAGE_RETURN)
break; break;
} }
if (i === contLen) if (i === contLen)