Merge pull request #625 from debris/nonenumerable

print nonenumerable properties of object in geth console && proper printing BigNumbers
This commit is contained in:
Jeffrey Wilcke 2015-04-02 11:35:01 +02:00
commit 7e13ee602e
1 changed files with 22 additions and 7 deletions

View File

@ -23,18 +23,28 @@ function pp(object, indent) {
}
}
str += " ]";
} else if (object instanceof Error) {
str += "\033[31m" + "Error";
} else if (isBigNumber(object)) {
str += "\033[32m'" + object.toString(10) + "'";
} else if(typeof(object) === "object") {
str += "{\n";
indent += " ";
var last = Object.keys(object).pop()
for(var k in object) {
str += indent + k + ": " + pp(object[k], indent);
indent += " ";
var last = Object.getOwnPropertyNames(object).pop()
Object.getOwnPropertyNames(object).forEach(function (k) {
str += indent + k + ": ";
try {
str += pp(object[k], indent);
} catch (e) {
str += pp(e, indent);
}
if(k !== last) {
str += ",";
}
str += "\n";
}
str += "\n";
});
str += indent.substr(2, indent.length) + "}";
} else if(typeof(object) === "string") {
str += "\033[32m'" + object + "'";
@ -43,7 +53,7 @@ function pp(object, indent) {
} else if(typeof(object) === "number") {
str += "\033[31m" + object;
} else if(typeof(object) === "function") {
str += "\033[35m[Function]";
str += "\033[35m[Function]";
} else {
str += object;
}
@ -53,6 +63,11 @@ function pp(object, indent) {
return str;
}
var isBigNumber = function (object) {
return typeof BigNumber !== 'undefined' && object instanceof BigNumber;
};
function prettyPrint(/* */) {
var args = arguments;
var ret = "";