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

buffer: fix cyclic dependency with util

Browse Source 
PR-URL: https://github.com/nodejs/io.js/pull/1988
Fixes: https://github.com/nodejs/io.js/issues/1987
Reviewed-By: Roman Reiss <me@silverwind.io>
This commit is contained in:
Brendan Ashworth 2015-06-15 21:52:06 -07:00
parent 1d79f572f1
commit d5637e67c9
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/buffer.js
View File

@ -3,7 +3,6 @@
const binding = process.binding('buffer'); const binding = process.binding('buffer');
const smalloc = process.binding('smalloc'); const smalloc = process.binding('smalloc');
const util = require('util');
const internalUtil = require('internal/util'); const internalUtil = require('internal/util');
const alloc = smalloc.alloc; const alloc = smalloc.alloc;
const truncate = smalloc.truncate; const truncate = smalloc.truncate;
@ -457,7 +456,7 @@ Buffer.prototype.fill = function fill(val, start, end) {
// XXX remove in v0.13 // XXX remove in v0.13
Buffer.prototype.get = util.deprecate(function get(offset) { Buffer.prototype.get = internalUtil.deprecate(function get(offset) {
offset = ~~offset; offset = ~~offset;
if (offset < 0 || offset >= this.length) if (offset < 0 || offset >= this.length)
throw new RangeError('index out of range'); throw new RangeError('index out of range');
@ -466,7 +465,7 @@ Buffer.prototype.get = util.deprecate(function get(offset) {
// XXX remove in v0.13 // XXX remove in v0.13
Buffer.prototype.set = util.deprecate(function set(offset, v) { Buffer.prototype.set = internalUtil.deprecate(function set(offset, v) {
offset = ~~offset; offset = ~~offset;
if (offset < 0 || offset >= this.length) if (offset < 0 || offset >= this.length)
throw new RangeError('index out of range'); throw new RangeError('index out of range');

4
test/parallel/test-util.js
View File

@ -71,6 +71,10 @@ assert.equal(true, util.isPrimitive(Infinity));
assert.equal(true, util.isPrimitive(NaN)); assert.equal(true, util.isPrimitive(NaN));
assert.equal(true, util.isPrimitive(Symbol('symbol'))); assert.equal(true, util.isPrimitive(Symbol('symbol')));
// isBuffer
assert.equal(false, util.isBuffer('foo'));
assert.equal(true, util.isBuffer(new Buffer('foo')));
// _extend // _extend
assert.deepEqual(util._extend({a:1}), {a:1}); assert.deepEqual(util._extend({a:1}), {a:1});
assert.deepEqual(util._extend({a:1}, []), {a:1}); assert.deepEqual(util._extend({a:1}, []), {a:1});