Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

buffer: refactor to remove some duplicated code in fromObject. #4948

Closed
wants to merge 8 commits into from
+20 −23
Closed

buffer: refactor to remove some duplicated code in fromObject. #4948

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
88f2a9f
buffer: refactor to remove some duplicated code in fromObject.
entertainyou Jan 29, 2016
cdaa4ea
fixup! buffer: refactor to remove some duplicated code in fromObject.
entertainyou Jan 31, 2016
c5a886b
fixup! buffer: refactor to remove some duplicated code in fromObject.
entertainyou Feb 1, 2016
e97323d
fixup! buffer: refactor to remove some duplicated code in fromObject.
entertainyou Feb 1, 2016
980f208
fixup! fixup! buffer: refactor to remove some duplicated code in from…
entertainyou Feb 1, 2016
ab15735
fixup! fixup! fixup! buffer: refactor to remove some duplicated code …
entertainyou Feb 1, 2016
e16e88b
fixup! fixup! fixup! fixup! buffer: refactor to remove some duplicate…
entertainyou Feb 1, 2016
b274fe1
fixup! fixup! fixup! fixup! fixup! buffer: refactor to remove some du…
entertainyou Feb 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 13 additions & 23 deletions lib/buffer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,13 @@ function fromString(string, encoding) {
return b;
}

function fromArrayLike(obj) {
const length = obj.length;
const b = allocate(length);
for (let i = 0; i < length; i++)
b[i] = obj[i] & 255;
return b;
}

function fromObject(obj) {
if (obj instanceof Buffer) {
Expand All @@ -134,14 +141,6 @@ function fromObject(obj) {
return b;
}

if (Array.isArray(obj)) {
const length = obj.length;
const b = allocate(length);
for (let i = 0; i < length; i++)
b[i] = obj[i] & 255;
return b;
}

if (obj == null) {
throw new TypeError('Must start with number, buffer, array or string');
}
Expand All @@ -150,25 +149,16 @@ function fromObject(obj) {
return binding.createFromArrayBuffer(obj);
}

if (obj.buffer instanceof ArrayBuffer || obj.length) {
let length;
if (typeof obj.length !== 'number' || obj.length !== obj.length)
length = 0;
else
length = obj.length;
const b = allocate(length);
for (let i = 0; i < length; i++) {
b[i] = obj[i] & 255;
if (obj.buffer instanceof ArrayBuffer || 'length' in obj) {
if (typeof obj.length !== 'number' || obj.length !== obj.length) {
return allocate(0);
} else {
return fromArrayLike(obj);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just an aside, all typed arrays could be more quickly handled in C++, but that doesn't concern this PR. at least now it's centralized and will be easier to make the change. :)

}
return b;
}

if (obj.type === 'Buffer' && Array.isArray(obj.data)) {
var array = obj.data;
const b = allocate(array.length);
for (let i = 0; i < array.length; i++)
b[i] = array[i] & 255;
return b;
return fromArrayLike(obj.data);
}

throw new TypeError('Must start with number, buffer, array or string');
Expand Down
4 changes: 4 additions & 0 deletions test/parallel/test-buffer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ var c = new Buffer(512);
console.log('c.length == %d', c.length);
assert.strictEqual(512, c.length);

var d = new Buffer([]);
console.log('d.length == %d', d.length);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Normally we don't expect successful tests to print anything. Can you remove this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the tc above also prints, should I remove all log statement in this test-buffer.js?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That falls outside the scope of this PR :) So I would suggest removing only this.

assert.strictEqual(0, d.length);

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also add the following:

var ui32 = new Uint32Array(4).fill(42);
var b = Buffer(ui32);
assert.deepEqual(ui32, b);

This is a test that should have been added previously, so is not technically part of this PR, but might as well add it since we're here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@trevnorris , test is added.

// First check Buffer#fill() works as expected.

assert.throws(function() {
Expand Down