lint util.js and src/node.js
This commit is contained in:
Родитель
7c57eb2aec
Коммит
558e5ba2b0
5
Makefile
5
Makefile
|
@ -130,11 +130,8 @@ bench-idle:
|
|||
sleep 1
|
||||
./node benchmark/idle_clients.js &
|
||||
|
||||
GJSLINT = PYTHONPATH=tools/closure_linter/ \
|
||||
python tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --nojsdoc
|
||||
|
||||
jslint:
|
||||
$(GJSLINT) -r lib/ -r src/ -r test/
|
||||
PYTHONPATH=tools/closure_linter/ python tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --nojsdoc -r lib/ -r src/ -r test/
|
||||
|
||||
cpplint:
|
||||
@python tools/cpplint.py $(wildcard src/*.cc src/*.h src/*.c)
|
||||
|
|
165
lib/util.js
165
lib/util.js
|
@ -31,7 +31,7 @@ var error = exports.error = function(x) {
|
|||
* Echos the value of a value. Trys to print the value out
|
||||
* in the best way possible given the different types.
|
||||
*
|
||||
* @param {Object} value The object to print out.
|
||||
* @param {Object} obj The object to print out.
|
||||
* @param {Boolean} showHidden Flag that shows hidden (not enumerable)
|
||||
* properties of objects.
|
||||
* @param {Number} depth Depth in which to descend in object. Default is 2.
|
||||
|
@ -43,30 +43,32 @@ exports.inspect = function(obj, showHidden, depth, colors) {
|
|||
|
||||
var stylize = function(str, styleType) {
|
||||
// http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
|
||||
var styles = { 'bold' : [1, 22]
|
||||
, 'italic' : [3, 23]
|
||||
, 'underline' : [4, 24]
|
||||
, 'inverse' : [7, 27]
|
||||
, 'white' : [37, 39]
|
||||
, 'grey' : [90, 39]
|
||||
, 'black' : [30, 39]
|
||||
, 'blue' : [34, 39]
|
||||
, 'cyan' : [36, 39]
|
||||
, 'green' : [32, 39]
|
||||
, 'magenta' : [35, 39]
|
||||
, 'red' : [31, 39]
|
||||
, 'yellow' : [33, 39]
|
||||
};
|
||||
var style = { 'special': 'grey'
|
||||
, 'number': 'blue'
|
||||
, 'boolean': 'blue'
|
||||
, 'undefined': 'red'
|
||||
, 'null': 'red'
|
||||
, 'string': 'green'
|
||||
, 'date': 'magenta'
|
||||
//, "name": intentionally not styling
|
||||
, 'regexp': 'cyan'
|
||||
}[styleType];
|
||||
var styles =
|
||||
{ 'bold' : [1, 22],
|
||||
'italic' : [3, 23],
|
||||
'underline' : [4, 24],
|
||||
'inverse' : [7, 27],
|
||||
'white' : [37, 39],
|
||||
'grey' : [90, 39],
|
||||
'black' : [30, 39],
|
||||
'blue' : [34, 39],
|
||||
'cyan' : [36, 39],
|
||||
'green' : [32, 39],
|
||||
'magenta' : [35, 39],
|
||||
'red' : [31, 39],
|
||||
'yellow' : [33, 39] };
|
||||
|
||||
var style =
|
||||
{ 'special': 'grey',
|
||||
'number': 'blue',
|
||||
'boolean': 'blue',
|
||||
'undefined': 'red',
|
||||
'null': 'red',
|
||||
'string': 'green',
|
||||
'date': 'magenta',
|
||||
// "name": intentionally not styling
|
||||
'regexp': 'cyan' }[styleType];
|
||||
|
||||
if (style) {
|
||||
return '\033[' + styles[style][0] + 'm' + str +
|
||||
'\033[' + styles[style][1] + 'm';
|
||||
|
@ -91,14 +93,20 @@ exports.inspect = function(obj, showHidden, depth, colors) {
|
|||
|
||||
// Primitive types cannot have properties
|
||||
switch (typeof value) {
|
||||
case 'undefined': return stylize('undefined', 'undefined');
|
||||
case 'string': return stylize(
|
||||
JSON.stringify(value).replace(/'/g, "\\'")
|
||||
.replace(/\\"/g, '"')
|
||||
.replace(/(^"|"$)/g, "'"),
|
||||
'string');
|
||||
case 'number': return stylize('' + value, 'number');
|
||||
case 'boolean': return stylize('' + value, 'boolean');
|
||||
case 'undefined':
|
||||
return stylize('undefined', 'undefined');
|
||||
|
||||
case 'string':
|
||||
var simple = JSON.stringify(value).replace(/'/g, "\\'")
|
||||
.replace(/\\"/g, '"')
|
||||
.replace(/(^"|"$)/g, "'");
|
||||
return stylize(simple, 'string');
|
||||
|
||||
case 'number':
|
||||
return stylize('' + value, 'number');
|
||||
|
||||
case 'boolean':
|
||||
return stylize('' + value, 'boolean');
|
||||
}
|
||||
// For some reason typeof null is "object", so special case here.
|
||||
if (value === null) {
|
||||
|
@ -114,13 +122,14 @@ exports.inspect = function(obj, showHidden, depth, colors) {
|
|||
if (isRegExp(value)) {
|
||||
return stylize('' + value, 'regexp');
|
||||
} else {
|
||||
return stylize('[Function' + (value.name ? ': ' + value.name : '') + ']', 'special');
|
||||
var name = value.name ? ': ' + value.name : '';
|
||||
return stylize('[Function' + name + ']', 'special');
|
||||
}
|
||||
}
|
||||
|
||||
// Dates without properties can be shortcutted
|
||||
if (isDate(value) && keys.length === 0) {
|
||||
return stylize(value.toUTCString(), 'date');
|
||||
return stylize(value.toUTCString(), 'date');
|
||||
}
|
||||
|
||||
var base, type, braces;
|
||||
|
@ -135,7 +144,8 @@ exports.inspect = function(obj, showHidden, depth, colors) {
|
|||
|
||||
// Make functions say that they are functions
|
||||
if (typeof value === 'function') {
|
||||
base = (isRegExp(value)) ? ' ' + value : ' [Function' + (value.name ? ': ' + value.name : '') + ']';
|
||||
var n = value.name ? ': ' + value.name : '';
|
||||
base = (isRegExp(value)) ? ' ' + value : ' [Function' + n + ']';
|
||||
} else {
|
||||
base = '';
|
||||
}
|
||||
|
@ -222,20 +232,18 @@ exports.inspect = function(obj, showHidden, depth, colors) {
|
|||
|
||||
var numLinesEst = 0;
|
||||
var length = output.reduce(function(prev, cur) {
|
||||
numLinesEst++;
|
||||
if (cur.indexOf('\n') >= 0) {
|
||||
numLinesEst++;
|
||||
}
|
||||
return prev + cur.length + 1;
|
||||
},0);
|
||||
numLinesEst++;
|
||||
if (cur.indexOf('\n') >= 0) numLinesEst++;
|
||||
return prev + cur.length + 1;
|
||||
}, 0);
|
||||
|
||||
if (length > (require('readline').columns || 50)) {
|
||||
output = braces[0]
|
||||
+ (base === '' ? '' : base + '\n ')
|
||||
+ ' '
|
||||
+ output.join(',\n ')
|
||||
+ ' '
|
||||
+ braces[1];
|
||||
output = braces[0] +
|
||||
(base === '' ? '' : base + '\n ') +
|
||||
' ' +
|
||||
output.join(',\n ') +
|
||||
' ' +
|
||||
braces[1];
|
||||
|
||||
} else {
|
||||
output = braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
|
||||
|
@ -248,21 +256,22 @@ exports.inspect = function(obj, showHidden, depth, colors) {
|
|||
|
||||
|
||||
function isArray(ar) {
|
||||
return ar instanceof Array
|
||||
|| Array.isArray(ar)
|
||||
|| (ar && ar !== Object.prototype && isArray(ar.__proto__));
|
||||
return ar instanceof Array ||
|
||||
Array.isArray(ar) ||
|
||||
(ar && ar !== Object.prototype && isArray(ar.__proto__));
|
||||
}
|
||||
|
||||
|
||||
function isRegExp(re) {
|
||||
var s = ''+ re;
|
||||
return re instanceof RegExp // easy case
|
||||
|| typeof(re) === 'function' // duck-type for context-switching evalcx case
|
||||
&& re.constructor.name === 'RegExp'
|
||||
&& re.compile
|
||||
&& re.test
|
||||
&& re.exec
|
||||
&& s.match(/^\/.*\/[gim]{0,3}$/);
|
||||
var s = '' + re;
|
||||
return re instanceof RegExp || // easy case
|
||||
// duck-type for context-switching evalcx case
|
||||
typeof(re) === 'function' &&
|
||||
re.constructor.name === 'RegExp' &&
|
||||
re.compile &&
|
||||
re.test &&
|
||||
re.exec &&
|
||||
s.match(/^\/.*\/[gim]{0,3}$/);
|
||||
}
|
||||
|
||||
|
||||
|
@ -279,7 +288,8 @@ var pWarning;
|
|||
|
||||
exports.p = function() {
|
||||
if (!pWarning) {
|
||||
pWarning = 'util.p will be removed in future versions of Node. Use util.puts(util.inspect()) instead.\n';
|
||||
pWarning = 'util.p will be removed in future versions of Node. ' +
|
||||
'Use util.puts(util.inspect()) instead.\n';
|
||||
exports.error(pWarning);
|
||||
}
|
||||
for (var i = 0, len = arguments.length; i < len; ++i) {
|
||||
|
@ -293,15 +303,16 @@ function pad(n) {
|
|||
}
|
||||
|
||||
|
||||
var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
|
||||
var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep',
|
||||
'Oct', 'Nov', 'Dec'];
|
||||
|
||||
// 26 Feb 16:19:34
|
||||
function timestamp() {
|
||||
var d = new Date();
|
||||
return [d.getDate()
|
||||
, months[d.getMonth()]
|
||||
, [pad(d.getHours()), pad(d.getMinutes()), pad(d.getSeconds())].join(':')
|
||||
].join(' ');
|
||||
var time = [pad(d.getHours()),
|
||||
pad(d.getMinutes()),
|
||||
pad(d.getSeconds())].join(':');
|
||||
return [d.getDate(), months[d.getMonth()], time].join(' ');
|
||||
}
|
||||
|
||||
|
||||
|
@ -313,7 +324,8 @@ exports.log = function(msg) {
|
|||
var execWarning;
|
||||
exports.exec = function() {
|
||||
if (!execWarning) {
|
||||
execWarning = 'util.exec has moved to the "child_process" module. Please update your source code.';
|
||||
execWarning = 'util.exec has moved to the "child_process" module.' +
|
||||
' Please update your source code.';
|
||||
error(execWarning);
|
||||
}
|
||||
return require('child_process').exec.apply(this, arguments);
|
||||
|
@ -330,8 +342,13 @@ exports.pump = function(readStream, writeStream, callback) {
|
|||
}
|
||||
}
|
||||
|
||||
if (!readStream.pause) readStream.pause = function() {readStream.emit('pause');};
|
||||
if (!readStream.resume) readStream.resume = function() {readStream.emit('resume');};
|
||||
if (!readStream.pause) {
|
||||
readStream.pause = function() {readStream.emit('pause');};
|
||||
}
|
||||
|
||||
if (!readStream.resume) {
|
||||
readStream.resume = function() {readStream.emit('resume');};
|
||||
}
|
||||
|
||||
readStream.addListener('data', function(chunk) {
|
||||
if (writeStream.write(chunk) === false) readStream.pause();
|
||||
|
@ -368,6 +385,7 @@ exports.pump = function(readStream, writeStream, callback) {
|
|||
});
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Inherit the prototype methods from one constructor into another.
|
||||
*
|
||||
|
@ -382,11 +400,8 @@ exports.pump = function(readStream, writeStream, callback) {
|
|||
* @param {function} superCtor Constructor function to inherit prototype from.
|
||||
*/
|
||||
exports.inherits = function(ctor, superCtor) {
|
||||
ctor.super_ = superCtor;
|
||||
ctor.prototype = Object.create(superCtor.prototype, {
|
||||
constructor: {
|
||||
value: ctor,
|
||||
enumerable: false
|
||||
}
|
||||
});
|
||||
ctor.super_ = superCtor;
|
||||
ctor.prototype = Object.create(superCtor.prototype, {
|
||||
constructor: { value: ctor, enumerable: false }
|
||||
});
|
||||
};
|
||||
|
|
1024
src/node.js
1024
src/node.js
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
Загрузка…
Ссылка в новой задаче