Skip to content

[Implement] Buffer.concat #5

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

Open
jtenner wants to merge 10 commits into
base: main
Choose a base branch
from
Open

[Implement] Buffer.concat #5

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ddeb2c3
[Implement] Naive Buffer.concat<T>
jtenner Jul 18, 2019
6f5f8aa
[Fix] Switch to Buffer[], remove excess changetype()
jtenner Jul 19, 2019
5cb8ea9
[Types] Update signature
jtenner Jul 19, 2019
2a87ef8
[Cleanup] concat
jtenner Jul 31, 2019
efe6ebc
[Merge] from master
jtenner Jul 31, 2019
cd34165
fix up concat
jtenner Mar 12, 2020
98b5665
add generic parameter
jtenner Mar 12, 2020
c4b6c4b
remove excess type
jtenner Mar 12, 2020
14002b4
update tests, add short path, update types to make length optional
jtenner Mar 12, 2020
4b03b51
update test, remove types on expect calls
jtenner Mar 12, 2020
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
Prev Previous commit
Next Next commit
[Cleanup] concat
  • Loading branch information
@jtenner
jtenner committed Jul 31, 2019
commit 2a87ef8bac95cd2078e3b18e3d1cac1b0fcfb943
14 changes: 9 additions & 5 deletions assembly/buffer/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,22 @@ export class Buffer extends Uint8Array {
return new Buffer(size);
}

public static concat(items: Buffer[], length: i32): Buffer {
public static concat(items: Array<Buffer>, length: i32): Buffer {
// assert the list itself isn't null
assert(items != null);

let size: usize = 0;
let itemCount = usize(items.length);
let itemCount = <usize>items.length;
let itemsDataStart = items.dataStart;

for (let i: usize = 0; i < itemCount; i++) {
let item = load<usize>(itemsDataStart + (i << alignof<usize>()));
if (item == 0) continue;
size += <usize>load<u32>(item, offsetof<Uint8Array>("dataLength"));
}
size = min<usize>(usize(length), size);
assert(items);

// account for passed concat buffer length
size = min<usize>(<usize>length, size);

let buffer = __alloc(size, idof<ArrayBuffer>());
let result = changetype<Buffer>(__alloc(offsetof<Buffer>(), idof<Buffer>()));
Expand All @@ -33,7 +37,7 @@ export class Buffer extends Uint8Array {
let start: usize = result.dataStart;
for (let i: usize = 0; i < itemCount && size > 0; i++) {
let item = load<usize>(itemsDataStart + (i << alignof<usize>()));
if (item == 0) continue;
if (item == null) continue;
let count = min<u32>(size, <usize>load<u32>(item, offsetof<Uint8Array>("dataLength")));
memory.copy(start, load<usize>(item, offsetof<Uint8Array>("dataStart")), count);
start += count;
Expand Down