diff --git a/lib/assert.js b/lib/assert.js index 4fbf1b2e433..3b18f05cb4b 100644 --- a/lib/assert.js +++ b/lib/assert.js @@ -15,7 +15,7 @@ // The above copyright notice and this permission notice shall be included in // all copies or substantial portions of the Software. // -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE // AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN @@ -33,10 +33,12 @@ var pSlice = Array.prototype.slice; var assert = exports; // 2. The AssertionError is defined in assert. -// new assert.AssertionError({message: message, actual: actual, expected: expected}) +// new assert.AssertionError({ message: message, +// actual: actual, +// expected: expected }) -assert.AssertionError = function AssertionError (options) { - this.name = "AssertionError"; +assert.AssertionError = function AssertionError(options) { + this.name = 'AssertionError'; this.message = options.message; this.actual = options.actual; this.expected = options.expected; @@ -51,13 +53,12 @@ util.inherits(assert.AssertionError, Error); assert.AssertionError.prototype.toString = function() { if (this.message) { - return [this.name+":", this.message].join(' '); + return [this.name + ':', this.message].join(' '); } else { - return [ this.name+":" - , JSON.stringify(this.expected ) - , this.operator - , JSON.stringify(this.actual) - ].join(" "); + return [this.name + ':', + JSON.stringify(this.expected), + this.operator, + JSON.stringify(this.actual)].join(' '); } }; @@ -97,7 +98,7 @@ assert.fail = fail; // assert.strictEqual(true, guard, message_opt);. assert.ok = function ok(value, message) { - if (!!!value) fail(value, true, message, "==", assert.ok); + if (!!!value) fail(value, true, message, '==', assert.ok); }; // 5. The equality assertion tests shallow, coercive equality with @@ -105,7 +106,7 @@ assert.ok = function ok(value, message) { // assert.equal(actual, expected, message_opt); assert.equal = function equal(actual, expected, message) { - if (actual != expected) fail(actual, expected, message, "==", assert.equal); + if (actual != expected) fail(actual, expected, message, '==', assert.equal); }; // 6. The non-equality assertion tests for whether two objects are not equal @@ -113,7 +114,7 @@ assert.equal = function equal(actual, expected, message) { assert.notEqual = function notEqual(actual, expected, message) { if (actual == expected) { - fail(actual, expected, message, "!=", assert.notEqual); + fail(actual, expected, message, '!=', assert.notEqual); } }; @@ -122,7 +123,7 @@ assert.notEqual = function notEqual(actual, expected, message) { assert.deepEqual = function deepEqual(actual, expected, message) { if (!_deepEqual(actual, expected)) { - fail(actual, expected, message, "deepEqual", assert.deepEqual); + fail(actual, expected, message, 'deepEqual', assert.deepEqual); } }; @@ -145,7 +146,7 @@ function _deepEqual(actual, expected) { } else if (actual instanceof Date && expected instanceof Date) { return actual.getTime() === expected.getTime(); - // 7.3. Other pairs that do not both pass typeof value == "object", + // 7.3. Other pairs that do not both pass typeof value == 'object', // equivalence is determined by ==. } else if (typeof actual != 'object' && typeof expected != 'object') { return actual == expected; @@ -154,25 +155,25 @@ function _deepEqual(actual, expected) { // determined by having the same number of owned properties (as verified // with Object.prototype.hasOwnProperty.call), the same set of keys // (although not necessarily the same order), equivalent values for every - // corresponding key, and an identical "prototype" property. Note: this + // corresponding key, and an identical 'prototype' property. Note: this // accounts for both named and indexed properties on Arrays. } else { return objEquiv(actual, expected); } } -function isUndefinedOrNull (value) { +function isUndefinedOrNull(value) { return value === null || value === undefined; } -function isArguments (object) { +function isArguments(object) { return Object.prototype.toString.call(object) == '[object Arguments]'; } -function objEquiv (a, b) { +function objEquiv(a, b) { if (isUndefinedOrNull(a) || isUndefinedOrNull(b)) return false; - // an identical "prototype" property. + // an identical 'prototype' property. if (a.prototype !== b.prototype) return false; //~~~I've managed to break Object.keys through screwy arguments passing. // Converting to array solves the problem. @@ -184,14 +185,15 @@ function objEquiv (a, b) { b = pSlice.call(b); return _deepEqual(a, b); } - try{ + try { var ka = Object.keys(a), - kb = Object.keys(b), - key, i; + kb = Object.keys(b), + key, i; } catch (e) {//happens when one is a string literal and the other isn't return false; } - // having the same number of owned properties (keys incorporates hasOwnProperty) + // having the same number of owned properties (keys incorporates + // hasOwnProperty) if (ka.length != kb.length) return false; //the same set of keys (although not necessarily the same order), @@ -206,8 +208,7 @@ function objEquiv (a, b) { //~~~possibly expensive deep test for (i = ka.length - 1; i >= 0; i--) { key = ka[i]; - if (!_deepEqual(a[key], b[key] )) - return false; + if (!_deepEqual(a[key], b[key])) return false; } return true; } @@ -217,7 +218,7 @@ function objEquiv (a, b) { assert.notDeepEqual = function notDeepEqual(actual, expected, message) { if (_deepEqual(actual, expected)) { - fail(actual, expected, message, "notDeepEqual", assert.notDeepEqual); + fail(actual, expected, message, 'notDeepEqual', assert.notDeepEqual); } }; @@ -226,16 +227,16 @@ assert.notDeepEqual = function notDeepEqual(actual, expected, message) { assert.strictEqual = function strictEqual(actual, expected, message) { if (actual !== expected) { - fail(actual, expected, message, "===", assert.strictEqual); + fail(actual, expected, message, '===', assert.strictEqual); } }; -// 10. The strict non-equality assertion tests for strict inequality, as determined by !==. -// assert.notStrictEqual(actual, expected, message_opt); +// 10. The strict non-equality assertion tests for strict inequality, as +// determined by !==. assert.notStrictEqual(actual, expected, message_opt); assert.notStrictEqual = function notStrictEqual(actual, expected, message) { if (actual === expected) { - fail(actual, expected, message, "!==", assert.notStrictEqual); + fail(actual, expected, message, '!==', assert.notStrictEqual); } }; @@ -248,15 +249,16 @@ function expectedException(actual, expected) { if (expected.test(actual)) { return true; } - } else if (actual instanceof expected || expected.call({}, actual) !== false) { + } else if (actual instanceof expected || + expected.call({}, actual) !== false) { return true; } } -function _throws (shouldThrow, block, expected, message) { +function _throws(shouldThrow, block, expected, message) { var actual; - if (typeof expected === "string") { + if (typeof expected === 'string') { message = expected; expected = null; } @@ -267,19 +269,19 @@ function _throws (shouldThrow, block, expected, message) { actual = e; } - message = (expected && expected.name ? " (" + expected.name + ")." : ".") - + (message ? " " + message : "."); + message = (expected && expected.name ? ' (' + expected.name + ').' : '.') + + (message ? ' ' + message : '.'); if (shouldThrow && !actual) { - fail("Missing expected exception" + message); + fail('Missing expected exception' + message); } if (!shouldThrow && expectedException(actual, expected)) { - fail("Got unwanted exception" + message); + fail('Got unwanted exception' + message); } - if ((shouldThrow && actual && expected && !expectedException(actual, expected)) || - (!shouldThrow && actual)) { + if ((shouldThrow && actual && expected && + !expectedException(actual, expected)) || (!shouldThrow && actual)) { throw actual; } } @@ -296,4 +298,4 @@ assert.doesNotThrow = function(block, /*optional*/error, /*optional*/message) { _throws.apply(this, [false].concat(pSlice.call(arguments))); }; -assert.ifError = function (err) { if (err) {throw err;}}; +assert.ifError = function(err) { if (err) {throw err;}}; diff --git a/lib/buffer.js b/lib/buffer.js index ab51ddfb720..ade5d5ac562 100644 --- a/lib/buffer.js +++ b/lib/buffer.js @@ -1,26 +1,26 @@ var SlowBuffer = process.binding('buffer').SlowBuffer; -function toHex (n) { - if (n < 16) return "0" + n.toString(16); +function toHex(n) { + if (n < 16) return '0' + n.toString(16); return n.toString(16); } -SlowBuffer.prototype.inspect = function () { +SlowBuffer.prototype.inspect = function() { var out = [], len = this.length; for (var i = 0; i < len; i++) { out[i] = toHex(this[i]); } - return ""; + return ''; }; -SlowBuffer.prototype.toString = function (encoding, start, end) { +SlowBuffer.prototype.toString = function(encoding, start, end) { encoding = String(encoding || 'utf8').toLowerCase(); start = +start || 0; - if (typeof end == "undefined") end = this.length; + if (typeof end == 'undefined') end = this.length; // Fastpath empty strings if (+end == start) { @@ -47,7 +47,7 @@ SlowBuffer.prototype.toString = function (encoding, start, end) { }; -SlowBuffer.prototype.write = function (string, offset, encoding) { +SlowBuffer.prototype.write = function(string, offset, encoding) { // Support both (string, offset, encoding) // and the legacy (string, encoding, offset) if (!isFinite(offset)) { @@ -80,12 +80,12 @@ SlowBuffer.prototype.write = function (string, offset, encoding) { // slice(start, end) -SlowBuffer.prototype.slice = function (start, end) { +SlowBuffer.prototype.slice = function(start, end) { if (end > this.length) { - throw new Error("oob"); + throw new Error('oob'); } if (start > end) { - throw new Error("oob"); + throw new Error('oob'); } return new Buffer(this, end - start, +start); @@ -94,7 +94,7 @@ SlowBuffer.prototype.slice = function (start, end) { // Buffer -function Buffer (subject, encoding, offset) { +function Buffer(subject, encoding, offset) { if (!(this instanceof Buffer)) { return new Buffer(subject, encoding, offset); } @@ -122,7 +122,8 @@ function Buffer (subject, encoding, offset) { break; default: - throw new Error("First argument need to be an number, array or string."); + throw new Error('First argument need to be an number,' + + 'array or string.'); } if (this.length > Buffer.poolSize) { @@ -155,10 +156,10 @@ function Buffer (subject, encoding, offset) { exports.SlowBuffer = SlowBuffer; exports.Buffer = Buffer; -Buffer.poolSize = 8*1024; +Buffer.poolSize = 8 * 1024; var pool; -function allocPool () { +function allocPool() { pool = new SlowBuffer(Buffer.poolSize); pool.used = 0; } @@ -177,24 +178,24 @@ Buffer.prototype.inspect = function inspect() { for (var i = 0; i < len; i++) { out[i] = toHex(this.parent[i + this.offset]); } - return ""; + return ''; }; -Buffer.prototype.get = function get (i) { - if (i < 0 || i >= this.length) throw new Error("oob"); +Buffer.prototype.get = function get(i) { + if (i < 0 || i >= this.length) throw new Error('oob'); return this.parent[this.offset + i]; }; -Buffer.prototype.set = function set (i, v) { - if (i < 0 || i >= this.length) throw new Error("oob"); +Buffer.prototype.set = function set(i, v) { + if (i < 0 || i >= this.length) throw new Error('oob'); return this.parent[this.offset + i] = v; }; // write(string, offset = 0, encoding = 'utf8') -Buffer.prototype.write = function write (string, offset, encoding) { +Buffer.prototype.write = function(string, offset, encoding) { if (!isFinite(offset)) { var swap = encoding; encoding = offset; @@ -238,7 +239,7 @@ Buffer.prototype.write = function write (string, offset, encoding) { // toString(encoding, start=0, end=buffer.length) -Buffer.prototype.toString = function (encoding, start, end) { +Buffer.prototype.toString = function(encoding, start, end) { encoding = String(encoding || 'utf8').toLowerCase(); if (typeof start == 'undefined' || start < 0) { @@ -247,7 +248,7 @@ Buffer.prototype.toString = function (encoding, start, end) { start = this.length; } - if (typeof end == "undefined" || end > this.length) { + if (typeof end == 'undefined' || end > this.length) { end = this.length; } else if (end < 0) { end = 0; @@ -281,28 +282,28 @@ Buffer.byteLength = SlowBuffer.byteLength; // copy(targetBuffer, targetStart=0, sourceStart=0, sourceEnd=buffer.length) -Buffer.prototype.copy = function copy (target, target_start, start, end) { +Buffer.prototype.copy = function(target, target_start, start, end) { var source = this; start || (start = 0); - end || (end = this.length); + end || (end = this.length); target_start || (target_start = 0); - if (end < start) throw new Error("sourceEnd < sourceStart"); + if (end < start) throw new Error('sourceEnd < sourceStart'); // Copy 0 bytes; we're done if (end === start) return 0; if (target.length == 0 || source.length == 0) return 0; if (target_start < 0 || target_start >= target.length) { - throw new Error("targetStart out of bounds"); + throw new Error('targetStart out of bounds'); } if (start < 0 || start >= source.length) { - throw new Error("sourceStart out of bounds"); + throw new Error('sourceStart out of bounds'); } if (end < 0 || end > source.length) { - throw new Error("sourceEnd out of bounds"); + throw new Error('sourceEnd out of bounds'); } // Are we oob? @@ -322,10 +323,10 @@ Buffer.prototype.copy = function copy (target, target_start, start, end) { // slice(start, end) -Buffer.prototype.slice = function (start, end) { +Buffer.prototype.slice = function(start, end) { if (end === undefined) end = this.length; - if (end > this.length) throw new Error("oob"); - if (start > end) throw new Error("oob"); + if (end > this.length) throw new Error('oob'); + if (start > end) throw new Error('oob'); return new Buffer(this.parent, end - start, +start + this.offset); }; @@ -333,27 +334,27 @@ Buffer.prototype.slice = function (start, end) { // Legacy methods for backwards compatibility. -Buffer.prototype.utf8Slice = function (start, end) { - return this.toString("utf8", start, end); +Buffer.prototype.utf8Slice = function(start, end) { + return this.toString('utf8', start, end); }; -Buffer.prototype.binarySlice = function (start, end) { - return this.toString("binary", start, end); +Buffer.prototype.binarySlice = function(start, end) { + return this.toString('binary', start, end); }; -Buffer.prototype.asciiSlice = function (start, end) { - return this.toString("ascii", start, end); +Buffer.prototype.asciiSlice = function(start, end) { + return this.toString('ascii', start, end); }; -Buffer.prototype.utf8Write = function (string, offset) { - return this.write(string, offset, "utf8"); +Buffer.prototype.utf8Write = function(string, offset) { + return this.write(string, offset, 'utf8'); }; -Buffer.prototype.binaryWrite = function (string, offset) { - return this.write(string, offset, "binary"); +Buffer.prototype.binaryWrite = function(string, offset) { + return this.write(string, offset, 'binary'); }; -Buffer.prototype.asciiWrite = function (string, offset) { - return this.write(string, offset, "ascii"); +Buffer.prototype.asciiWrite = function(string, offset) { + return this.write(string, offset, 'ascii'); };