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

Use duck-typing as well as instanceof in sys.inspect

Browse Source 
This makes it so that inspecting objects from other contexts works as expected.
This commit is contained in:
isaacs 2010-05-09 16:35:15 -07:00 committed by Ryan Dahl
parent 2fa4de001c
commit 3c7873bd3f
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/sys.js
View File

@ -65,7 +65,7 @@ exports.inspect = function (obj, showHidden, depth) {
// Functions without properties can be shortcutted. // Functions without properties can be shortcutted.
if (typeof value === 'function' && keys.length === 0) { if (typeof value === 'function' && keys.length === 0) {
if (value instanceof RegExp) { if (isRegExp(value)) {
return '' + value; return '' + value;
} else { } else {
return '[Function]'; return '[Function]';
@ -73,13 +73,13 @@ exports.inspect = function (obj, showHidden, depth) {
} }
// Dates without properties can be shortcutted // Dates without properties can be shortcutted
if (value instanceof Date && keys.length === 0) { if (isDate(value) && keys.length === 0) {
return value.toUTCString(); return value.toUTCString();
} }
var base, type, braces; var base, type, braces;
// Determine the object type // Determine the object type
if (value instanceof Array) { if (isArray(value)) {
type = 'Array'; type = 'Array';
braces = ["[", "]"]; braces = ["[", "]"];
} else { } else {
@ -89,13 +89,13 @@ exports.inspect = function (obj, showHidden, depth) {
// Make functions say that they are functions // Make functions say that they are functions
if (typeof value === 'function') { if (typeof value === 'function') {
base = (value instanceof RegExp) ? ' ' + value : ' [Function]'; base = (isRegExp(value)) ? ' ' + value : ' [Function]';
} else { } else {
base = ""; base = "";
} }
// Make dates with properties first say the date // Make dates with properties first say the date
if (value instanceof Date) { if (isDate(value)) {
base = ' ' + value.toUTCString(); base = ' ' + value.toUTCString();
} }
@ -106,7 +106,7 @@ exports.inspect = function (obj, showHidden, depth) {
} }
if (recurseTimes < 0) { if (recurseTimes < 0) {
if (value instanceof RegExp) { if (isRegExp(value)) {
return '' + value; return '' + value;
} else { } else {
return "[Object]"; return "[Object]";
@ -140,7 +140,7 @@ exports.inspect = function (obj, showHidden, depth) {
str = format(value[key], recurseTimes - 1); str = format(value[key], recurseTimes - 1);
} }
if (str.indexOf('\n') > -1) { if (str.indexOf('\n') > -1) {
if (value instanceof Array) { if (isArray(value)) {
str = str.split('\n').map(function(line) { str = str.split('\n').map(function(line) {
return ' ' + line; return ' ' + line;
}).join('\n').substr(2); }).join('\n').substr(2);
@ -191,6 +191,29 @@ exports.inspect = function (obj, showHidden, depth) {
} }
return format(obj, (typeof depth === 'undefined' ? 2 : depth)); return format(obj, (typeof depth === 'undefined' ? 2 : depth));
}; };
function isArray (ar) {
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.charAt(0) === "/"
&& s.substr(-1) === "/";
}
function isDate (d) {
if (d instanceof Date) return true;
if (typeof d !== "object") return false;
var properties = Date.prototype && Object.getOwnPropertyNames(Date.prototype);
var proto = d.__proto__ && Object.getOwnPropertyNames(d.__proto__);
return JSON.stringify(proto) === JSON.stringify(properties);
}
var pWarning; var pWarning;