Skip to content

feat: Add more methods for StaticArray #2068

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

Merged
merged 7 commits into from
Sep 13, 2021
Merged

feat: Add more methods for StaticArray #2068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7a25c1a
add fill and copyWithin
MaxGraey Sep 12, 2021
23bda20
add reverse. Upd fixtures
MaxGraey Sep 12, 2021
4a775c7
add tests
MaxGraey Sep 12, 2021
273895e
transducers
MaxGraey Sep 12, 2021
83c4ae6
add findIndex and findLastIndex
MaxGraey Sep 12, 2021
68dc2b9
add more tests
MaxGraey Sep 13, 2021
cb79cac
fix
MaxGraey Sep 13, 2021
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
2 changes: 1 addition & 1 deletion std/assembly/array.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ export class Array<T> {
return result;
}

reverse(): Array<T> {
reverse(): this {
REVERSE<T>(this.dataStart, this.length_);
return this;
}
Expand Down
22 changes: 17 additions & 5 deletions std/assembly/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1691,9 +1691,8 @@ declare class Array<T> {
constructor(length?: i32);
at(index: i32): T;
fill(value: T, start?: i32, end?: i32): this;
every(callbackfn: (element: T, index: i32, array?: Array<T>) => bool): bool;
findIndex(callbackfn: (element: T, index: i32, array?: Array<T>) => bool): i32;
findLastIndex(callbackfn: (element: T, index: i32, array?: Array<T>) => bool): i32;
findIndex(callbackfn: (value: T, index: i32, array: Array<T>) => bool): i32;
findLastIndex(callbackfn: (value: T, index: i32, array: Array<T>) => bool): i32;
includes(searchElement: T, fromIndex?: i32): bool;
indexOf(searchElement: T, fromIndex?: i32): i32;
lastIndexOf(searchElement: T, fromIndex?: i32): i32;
Expand All @@ -1706,14 +1705,15 @@ declare class Array<T> {
filter(callbackfn: (value: T, index: i32, array: Array<T>) => bool): Array<T>;
reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: i32, array: Array<T>) => U, initialValue: U): U;
reduceRight<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: i32, array: Array<T>) => U, initialValue: U): U;
every(callbackfn: (value: T, index: i32, array: Array<T>) => bool): bool;
some(callbackfn: (value: T, index: i32, array: Array<T>) => bool): bool;
shift(): T;
some(callbackfn: (element: T, index: i32, array?: Array<T>) => bool): bool;
unshift(element: T): i32;
slice(from: i32, to?: i32): Array<T>;
splice(start: i32, deleteCount?: i32): Array<T>;
sort(comparator?: (a: T, b: T) => i32): this;
join(separator?: string): string;
reverse(): T[];
reverse(): this;
/** Flattens an array of arrays. If any null entries exist in the array, they are ignored, unlike JavaScript's version of Array#flat(). */
flat(): T extends unknown[] ? T : never;
toString(): string;
Expand All @@ -1728,13 +1728,25 @@ declare class StaticArray<T> {
readonly length: i32;
constructor(length?: i32);
at(index: i32): T;
fill(value: T, start?: i32, end?: i32): this;
findIndex(callbackfn: (value: T, index: i32, array: StaticArray<T>) => bool): i32;
findLastIndex(callbackfn: (value: T, index: i32, array: StaticArray<T>) => bool): i32;
copyWithin(target: i32, start: i32, end?: i32): this;
includes(searchElement: T, fromIndex?: i32): bool;
indexOf(searchElement: T, fromIndex?: i32): i32;
lastIndexOf(searchElement: T, fromIndex?: i32): i32;
forEach(callbackfn: (value: T, index: i32, array: StaticArray<T>) => void): void;
map<U>(callbackfn: (value: T, index: i32, array: StaticArray<T>) => U): Array<U>;
filter(callbackfn: (value: T, index: i32, array: StaticArray<T>) => bool): Array<T>;
reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: i32, array: StaticArray<T>) => U, initialValue: U): U;
reduceRight<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: i32, array: StaticArray<T>) => U, initialValue: U): U;
every(callbackfn: (value: T, index: i32, array: StaticArray<T>) => bool): bool;
some(callbackfn: (value: T, index: i32, array: StaticArray<T>) => bool): bool;
concat(items: Array<T>): Array<T>;
slice(from: i32, to?: i32): Array<T>;
sort(comparator?: (a: T, b: T) => i32): this;
join(separator?: string): string;
reverse(): this;
toString(): string;
}

Expand Down
130 changes: 130 additions & 0 deletions std/assembly/staticarray.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import { OBJECT, BLOCK_MAXSIZE, TOTAL_OVERHEAD } from "./rt/common";
import { COMPARATOR, SORT } from "./util/sort";
import { REVERSE } from "./util/bytes";
import { idof } from "./builtins";
import { Array } from "./array";
import { E_INDEXOUTOFRANGE, E_INVALIDLENGTH, E_HOLEYARRAY } from "./util/error";
Expand Down Expand Up @@ -137,6 +138,51 @@ export class StaticArray<T> {
}
}

fill(value: T, start: i32 = 0, end: i32 = i32.MAX_VALUE): this {
var ptr = changetype<usize>(this);
var len = this.length;
start = start < 0 ? max(len + start, 0) : min(start, len);
end = end < 0 ? max(len + end, 0) : min(end, len);
if (isManaged<T>()) {
for (; start < end; ++start) {
store<usize>(ptr + (<usize>start << alignof<T>()), changetype<usize>(value));
__link(changetype<usize>(this), changetype<usize>(value), true);
}
} else if (sizeof<T>() == 1) {
if (start < end) {
memory.fill(
ptr + <usize>start,
u8(value),
<usize>(end - start)
);
}
} else {
for (; start < end; ++start) {
store<T>(ptr + (<usize>start << alignof<T>()), value);
}
}
return this;
}

copyWithin(target: i32, start: i32, end: i32 = i32.MAX_VALUE): this {
var ptr = changetype<usize>(this);
var len = this.length;

end = min<i32>(end, len);

var to = target < 0 ? max(len + target, 0) : min(target, len);
var from = start < 0 ? max(len + start, 0) : min(start, len);
var last = end < 0 ? max(len + end, 0) : min(end, len);
var count = min(last - from, len - to);

memory.copy( // is memmove
ptr + (<usize>to << alignof<T>()),
ptr + (<usize>from << alignof<T>()),
<usize>count << alignof<T>()
);
return this;
}

includes(value: T, fromIndex: i32 = 0): bool {
if (isFloat<T>()) {
let length = this.length;
Expand Down Expand Up @@ -230,6 +276,85 @@ export class StaticArray<T> {
return slice;
}

findIndex(fn: (value: T, index: i32, array: StaticArray<T>) => bool): i32 {
for (let i = 0, len = this.length; i < len; ++i) {
if (fn(load<T>(changetype<usize>(this) + (<usize>i << alignof<T>())), i, this)) return i;
}
return -1;
}

findLastIndex(fn: (value: T, index: i32, array: StaticArray<T>) => bool): i32 {
for (let i = this.length - 1; i >= 0; --i) {
if (fn(load<T>(changetype<usize>(this) + (<usize>i << alignof<T>())), i, this)) return i;
}
return -1;
}

forEach(fn: (value: T, index: i32, array: StaticArray<T>) => void): void {
for (let i = 0, len = this.length; i < len; ++i) {
fn(load<T>(changetype<usize>(this) + (<usize>i << alignof<T>())), i, this);
}
}

map<U>(fn: (value: T, index: i32, array: StaticArray<T>) => U): Array<U> {
var len = this.length;
var out = changetype<Array<U>>(__newArray(len, alignof<U>(), idof<Array<U>>()));
var outStart = out.dataStart;
for (let i = 0; i < len; ++i) {
let result = fn(load<T>(changetype<usize>(this) + (<usize>i << alignof<T>())), i, this);
store<U>(outStart + (<usize>i << alignof<U>()), result);
if (isManaged<U>()) {
__link(changetype<usize>(out), changetype<usize>(result), true);
}
}
return out;
}

filter(fn: (value: T, index: i32, array: StaticArray<T>) => bool): Array<T> {
var result = changetype<Array<T>>(__newArray(0, alignof<T>(), idof<Array<T>>()));
for (let i = 0, len = this.length; i < len; ++i) {
let value = load<T>(changetype<usize>(this) + (<usize>i << alignof<T>()));
if (fn(value, i, this)) result.push(value);
}
return result;
}

reduce<U>(
fn: (previousValue: U, currentValue: T, currentIndex: i32, array: StaticArray<T>) => U,
initialValue: U
): U {
var acc = initialValue;
for (let i = 0, len = this.length; i < len; ++i) {
acc = fn(acc, load<T>(changetype<usize>(this) + (<usize>i << alignof<T>())), i, this);
}
return acc;
}

reduceRight<U>(
fn: (previousValue: U, currentValue: T, currentIndex: i32, array: StaticArray<T>) => U,
initialValue: U
): U {
var acc = initialValue;
for (let i = this.length - 1; i >= 0; --i) {
acc = fn(acc, load<T>(changetype<usize>(this) + (<usize>i << alignof<T>())), i, this);
}
return acc;
}

every(fn: (value: T, index: i32, array: StaticArray<T>) => bool): bool {
for (let i = 0, len = this.length; i < len; ++i) {
if (!fn(load<T>(changetype<usize>(this) + (<usize>i << alignof<T>())), i, this)) return false;
}
return true;
}

some(fn: (value: T, index: i32, array: StaticArray<T>) => bool): bool {
for (let i = 0, len = this.length; i < len; ++i) {
if (fn(load<T>(changetype<usize>(this) + (<usize>i << alignof<T>())), i, this)) return true;
}
return false;
}

sort(comparator: (a: T, b: T) => i32 = COMPARATOR<T>()): this {
SORT<T>(changetype<usize>(this), this.length, comparator);
return this;
Expand All @@ -247,6 +372,11 @@ export class StaticArray<T> {
return <string>unreachable();
}

reverse(): this {
REVERSE<T>(changetype<usize>(this), this.length);
return this;
}

toString(): string {
return this.join();
}
Expand Down
Loading