From 066ea1fbd2c0180729328cda5f0375aac5d194b9 Mon Sep 17 00:00:00 2001 From: dcode Date: Sat, 1 Jun 2019 05:12:30 +0200 Subject: [PATCH] consistent naming --- std/assembly/array.ts | 48 +++--- std/assembly/set.ts | 70 ++++---- std/assembly/typedarray.ts | 336 ++++++++++++++++++------------------- 3 files changed, 227 insertions(+), 227 deletions(-) diff --git a/std/assembly/array.ts b/std/assembly/array.ts index c2b84fe4..095efb2b 100644 --- a/std/assembly/array.ts +++ b/std/assembly/array.ts @@ -77,14 +77,14 @@ export class Array extends ArrayBufferView { this.length_ = length; } - every(callbackfn: (element: T, index: i32, array: Array) => bool): bool { + every(fn: (value: T, index: i32, array: Array) => bool): bool { for (let index = 0, length = this.length_; index < min(length, this.length_); ++index) { - if (!callbackfn(load(this.dataStart + (index << alignof())), index, this)) return false; + if (!fn(load(this.dataStart + (index << alignof())), index, this)) return false; } return true; } - findIndex(predicate: (element: T, index: i32, array: Array) => bool): i32 { + findIndex(predicate: (value: T, index: i32, array: Array) => bool): i32 { for (let index = 0, length = this.length_; index < min(length, this.length_); ++index) { if (predicate(load(this.dataStart + (index << alignof())), index, this)) return index; } @@ -151,30 +151,30 @@ export class Array extends ArrayBufferView { return this; } - includes(searchElement: T, fromIndex: i32 = 0): bool { - return this.indexOf(searchElement, fromIndex) >= 0; + includes(value: T, fromIndex: i32 = 0): bool { + return this.indexOf(value, fromIndex) >= 0; } - indexOf(searchElement: T, fromIndex: i32 = 0): i32 { + indexOf(value: T, fromIndex: i32 = 0): i32 { var length = this.length_; if (length == 0 || fromIndex >= length) return -1; if (fromIndex < 0) fromIndex = max(length + fromIndex, 0); var dataStart = this.dataStart; while (fromIndex < length) { - if (load(dataStart + (fromIndex << alignof())) == searchElement) return fromIndex; + if (load(dataStart + (fromIndex << alignof())) == value) return fromIndex; ++fromIndex; } return -1; } - lastIndexOf(searchElement: T, fromIndex: i32 = this.length_): i32 { + lastIndexOf(value: T, fromIndex: i32 = this.length_): i32 { var length = this.length_; if (length == 0) return -1; if (fromIndex < 0) fromIndex = length + fromIndex; else if (fromIndex >= length) fromIndex = length - 1; var dataStart = this.dataStart; while (fromIndex >= 0) { - if (load(dataStart + (fromIndex << alignof())) == searchElement) return fromIndex; + if (load(dataStart + (fromIndex << alignof())) == value) return fromIndex; --fromIndex; } return -1; @@ -261,18 +261,18 @@ export class Array extends ArrayBufferView { return element; } - forEach(callbackfn: (value: T, index: i32, array: Array) => void): void { + forEach(fn: (value: T, index: i32, array: Array) => void): void { for (let index = 0, length = this.length_; index < min(length, this.length_); ++index) { - callbackfn(load(this.dataStart + (index << alignof())), index, this); + fn(load(this.dataStart + (index << alignof())), index, this); } } - map(callbackfn: (value: T, index: i32, array: Array) => U): Array { + map(fn: (value: T, index: i32, array: Array) => U): Array { var length = this.length_; var out = changetype>(__allocArray(length, alignof(), idof>())); // retains var outStart = out.dataStart; for (let index = 0; index < min(length, this.length_); ++index) { - let result = callbackfn(load(this.dataStart + (index << alignof())), index, this); // retains + let result = fn(load(this.dataStart + (index << alignof())), index, this); // retains if (isManaged()) { store(outStart + (index << alignof()), __retain(changetype(result))); } else { @@ -283,33 +283,33 @@ export class Array extends ArrayBufferView { return out; } - filter(callbackfn: (value: T, index: i32, array: Array) => bool): Array { + filter(fn: (value: T, index: i32, array: Array) => bool): Array { var result = changetype>(__allocArray(0, alignof(), idof>())); // retains for (let index = 0, length = this.length_; index < min(length, this.length_); ++index) { let value = load(this.dataStart + (index << alignof())); - if (callbackfn(value, index, this)) result.push(value); + if (fn(value, index, this)) result.push(value); } return result; } reduce( - callbackfn: (previousValue: U, currentValue: T, currentIndex: i32, array: Array) => U, + fn: (previousValue: U, currentValue: T, currentIndex: i32, array: Array) => U, initialValue: U ): U { var accum = initialValue; for (let index = 0, length = this.length_; index < min(length, this.length_); ++index) { - accum = callbackfn(accum, load(this.dataStart + (index << alignof())), index, this); + accum = fn(accum, load(this.dataStart + (index << alignof())), index, this); } return accum; } reduceRight( - callbackfn: (previousValue: U, currentValue: T, currentIndex: i32, array: Array) => U, + fn: (previousValue: U, currentValue: T, currentIndex: i32, array: Array) => U, initialValue: U ): U { var accum = initialValue; for (let index = this.length_ - 1; index >= 0; --index) { - accum = callbackfn(accum, load(this.dataStart + (index << alignof())), index, this); + accum = fn(accum, load(this.dataStart + (index << alignof())), index, this); } return accum; } @@ -333,14 +333,14 @@ export class Array extends ArrayBufferView { return element; } - some(callbackfn: (element: T, index: i32, array: Array) => bool): bool { + some(fn: (value: T, index: i32, array: Array) => bool): bool { for (let index = 0, length = this.length_; index < min(length, this.length_); ++index) { - if (callbackfn(load(this.dataStart + (index << alignof())), index, this)) return true; + if (fn(load(this.dataStart + (index << alignof())), index, this)) return true; } return false; } - unshift(element: T): i32 { + unshift(value: T): i32 { var newLength = this.length_ + 1; ensureSize(changetype(this), newLength, alignof()); var dataStart = this.dataStart; @@ -350,9 +350,9 @@ export class Array extends ArrayBufferView { (newLength - 1) << alignof() ); if (isManaged()) { - store(dataStart, __retain(changetype(element))); + store(dataStart, __retain(changetype(value))); } else { - store(dataStart, element); + store(dataStart, value); } this.length_ = newLength; return newLength; diff --git a/std/assembly/set.ts b/std/assembly/set.ts index 3fe0e03f..a2354105 100644 --- a/std/assembly/set.ts +++ b/std/assembly/set.ts @@ -35,22 +35,22 @@ const BUCKET_SIZE = sizeof(); /** Computes the alignment of an entry. */ // @ts-ignore: decorator @inline -function ENTRY_ALIGN(): usize { +function ENTRY_ALIGN(): usize { // can align to 4 instead of 8 if 32-bit and K is <= 32-bits - const align = (sizeof() > sizeof() ? sizeof() : sizeof()) - 1; + const align = (sizeof() > sizeof() ? sizeof() : sizeof()) - 1; return align; } /** Computes the aligned size of an entry. */ // @ts-ignore: decorator @inline -function ENTRY_SIZE(): usize { - const align = ENTRY_ALIGN(); - const size = (offsetof>() + align) & ~align; +function ENTRY_SIZE(): usize { + const align = ENTRY_ALIGN(); + const size = (offsetof>() + align) & ~align; return size; } -export class Set { +export class Set { // buckets holding references to the respective first entry within private buckets: ArrayBuffer; // usize[bucketsMask + 1] @@ -70,30 +70,30 @@ export class Set { const bucketsSize = INITIAL_CAPACITY * BUCKET_SIZE; this.buckets = new ArrayBuffer(bucketsSize); this.bucketsMask = INITIAL_CAPACITY - 1; - const entriesSize = INITIAL_CAPACITY * ENTRY_SIZE(); + const entriesSize = INITIAL_CAPACITY * ENTRY_SIZE(); this.entries = new ArrayBuffer(entriesSize); this.entriesCapacity = INITIAL_CAPACITY; this.entriesOffset = 0; this.entriesCount = 0; } - private find(key: K, hashCode: u32): SetEntry | null { - var entry = load>( // unmanaged! + private find(key: T, hashCode: u32): SetEntry | null { + var entry = load>( // unmanaged! changetype(this.buckets) + (hashCode & this.bucketsMask) * BUCKET_SIZE ); while (entry) { if (!(entry.taggedNext & EMPTY) && entry.key == key) return entry; - entry = changetype>(entry.taggedNext & ~EMPTY); + entry = changetype>(entry.taggedNext & ~EMPTY); } return null; } - has(key: K): bool { - return this.find(key, HASH(key)) !== null; + has(key: T): bool { + return this.find(key, HASH(key)) !== null; } - add(key: K): void { - var hashCode = HASH(key); + add(key: T): void { + var hashCode = HASH(key); var entry = this.find(key, hashCode); // unmanaged! if (!entry) { // check if rehashing is necessary @@ -105,9 +105,9 @@ export class Set { ); } // append new entry - entry = changetype>(changetype(this.entries) + this.entriesOffset++ * ENTRY_SIZE()); - entry.key = isManaged() - ? changetype(__retain(changetype(key))) + entry = changetype>(changetype(this.entries) + this.entriesOffset++ * ENTRY_SIZE()); + entry.key = isManaged() + ? changetype(__retain(changetype(key))) : key; ++this.entriesCount; // link with previous entry in bucket @@ -117,10 +117,10 @@ export class Set { } } - delete(key: K): bool { - var entry = this.find(key, HASH(key)); // unmanaged! + delete(key: T): bool { + var entry = this.find(key, HASH(key)); // unmanaged! if (!entry) return false; - if (isManaged()) __release(changetype(entry.key)); // exact 'key' + if (isManaged()) __release(changetype(entry.key)); // exact 'key' entry.taggedNext |= EMPTY; --this.entriesCount; // check if rehashing is appropriate @@ -136,24 +136,24 @@ export class Set { var newBucketsCapacity = (newBucketsMask + 1); var newBuckets = new ArrayBuffer(newBucketsCapacity * BUCKET_SIZE); var newEntriesCapacity = (newBucketsCapacity * FILL_FACTOR); - var newEntries = new ArrayBuffer(newEntriesCapacity * ENTRY_SIZE()); + var newEntries = new ArrayBuffer(newEntriesCapacity * ENTRY_SIZE()); // copy old entries to new entries var oldPtr = changetype(this.entries); - var oldEnd = oldPtr + this.entriesOffset * ENTRY_SIZE(); + var oldEnd = oldPtr + this.entriesOffset * ENTRY_SIZE(); var newPtr = changetype(newEntries); while (oldPtr != oldEnd) { - let oldEntry = changetype>(oldPtr); // unmanaged! + let oldEntry = changetype>(oldPtr); // unmanaged! if (!(oldEntry.taggedNext & EMPTY)) { - let newEntry = changetype>(newPtr); // unmanaged! + let newEntry = changetype>(newPtr); // unmanaged! newEntry.key = oldEntry.key; - let newBucketIndex = HASH(oldEntry.key) & newBucketsMask; + let newBucketIndex = HASH(oldEntry.key) & newBucketsMask; let newBucketPtrBase = changetype(newBuckets) + newBucketIndex * BUCKET_SIZE; newEntry.taggedNext = load(newBucketPtrBase); store(newBucketPtrBase, newPtr); - newPtr += ENTRY_SIZE(); + newPtr += ENTRY_SIZE(); } - oldPtr += ENTRY_SIZE(); + oldPtr += ENTRY_SIZE(); } this.buckets = newBuckets; @@ -163,13 +163,13 @@ export class Set { this.entriesOffset = this.entriesCount; } - values(): K[] { + values(): T[] { // FIXME: this is preliminary, needs iterators/closures var start = changetype(this.entries); var size = this.entriesOffset; - var values = Array.create(size); + var values = Array.create(size); for (let i = 0; i < size; ++i) { - let entry = changetype>(start + i * ENTRY_SIZE()); + let entry = changetype>(start + i * ENTRY_SIZE()); if (!(entry.taggedNext & EMPTY)) { values.push(entry.key); } @@ -186,18 +186,18 @@ export class Set { @unsafe private __visit_impl(cookie: u32): void { __visit(changetype(this.buckets), cookie); var entries = changetype(this.entries); - if (isManaged()) { + if (isManaged()) { let cur = entries; - let end = cur + this.entriesOffset * ENTRY_SIZE(); + let end = cur + this.entriesOffset * ENTRY_SIZE(); while (cur < end) { - let entry = changetype>(cur); + let entry = changetype>(cur); if (!(entry.taggedNext & EMPTY)) { let val = changetype(entry.key); - if (isNullable()) { + if (isNullable()) { if (val) __visit(val, cookie); } else __visit(val, cookie); } - cur += ENTRY_SIZE(); + cur += ENTRY_SIZE(); } } __visit(entries, cookie); diff --git a/std/assembly/typedarray.ts b/std/assembly/typedarray.ts index d878a9f2..60a60db8 100644 --- a/std/assembly/typedarray.ts +++ b/std/assembly/typedarray.ts @@ -47,37 +47,37 @@ export class Int8Array extends ArrayBufferView { } reduce( - callbackfn: (accumulator: T, value: i8, index: i32, array: Int8Array) => T, + fn: (accumulator: T, value: i8, index: i32, array: Int8Array) => T, initialValue: T, ): T { - return REDUCE(this, callbackfn, initialValue); + return REDUCE(this, fn, initialValue); } reduceRight( - callbackfn: (accumulator: T, value: i8, index: i32, array: Int8Array) => T, + fn: (accumulator: T, value: i8, index: i32, array: Int8Array) => T, initialValue: T, ): T { - return REDUCE_RIGHT(this, callbackfn, initialValue); + return REDUCE_RIGHT(this, fn, initialValue); } - map(callbackfn: (value: i8, index: i32, self: Int8Array) => i8): Int8Array { - return MAP(this, callbackfn); + map(fn: (value: i8, index: i32, self: Int8Array) => i8): Int8Array { + return MAP(this, fn); } - findIndex(callbackfn: (value: i8, index: i32, self: Int8Array) => bool): i32 { - return FIND_INDEX(this, callbackfn); + findIndex(fn: (value: i8, index: i32, self: Int8Array) => bool): i32 { + return FIND_INDEX(this, fn); } - some(callbackfn: (value: i8, index: i32, self: Int8Array) => bool): bool { - return SOME(this, callbackfn); + some(fn: (value: i8, index: i32, self: Int8Array) => bool): bool { + return SOME(this, fn); } - every(callbackfn: (value: i8, index: i32, self: Int8Array) => bool): bool { - return EVERY(this, callbackfn); + every(fn: (value: i8, index: i32, self: Int8Array) => bool): bool { + return EVERY(this, fn); } - forEach(callbackfn: (value: i8, index: i32, self: Int8Array) => void): void { - FOREACH(this, callbackfn); + forEach(fn: (value: i8, index: i32, self: Int8Array) => void): void { + FOREACH(this, fn); } reverse(): this { @@ -129,37 +129,37 @@ export class Uint8Array extends ArrayBufferView { } reduce( - callbackfn: (accumulator: T, value: u8, index: i32, array: Uint8Array) => T, + fn: (accumulator: T, value: u8, index: i32, array: Uint8Array) => T, initialValue: T, ): T { - return REDUCE(this, callbackfn, initialValue); + return REDUCE(this, fn, initialValue); } reduceRight( - callbackfn: (accumulator: T, value: u8, index: i32, array: Uint8Array) => T, + fn: (accumulator: T, value: u8, index: i32, array: Uint8Array) => T, initialValue: T, ): T { - return REDUCE_RIGHT(this, callbackfn, initialValue); + return REDUCE_RIGHT(this, fn, initialValue); } - map(callbackfn: (value: u8, index: i32, self: Uint8Array) => u8): Uint8Array { - return MAP(this, callbackfn); + map(fn: (value: u8, index: i32, self: Uint8Array) => u8): Uint8Array { + return MAP(this, fn); } - findIndex(callbackfn: (value: u8, index: i32, self: Uint8Array) => bool): i32 { - return FIND_INDEX(this, callbackfn); + findIndex(fn: (value: u8, index: i32, self: Uint8Array) => bool): i32 { + return FIND_INDEX(this, fn); } - some(callbackfn: (value: u8, index: i32, self: Uint8Array) => bool): bool { - return SOME(this, callbackfn); + some(fn: (value: u8, index: i32, self: Uint8Array) => bool): bool { + return SOME(this, fn); } - every(callbackfn: (value: u8, index: i32, self: Uint8Array) => bool): bool { - return EVERY(this, callbackfn); + every(fn: (value: u8, index: i32, self: Uint8Array) => bool): bool { + return EVERY(this, fn); } - forEach(callbackfn: (value: u8, index: i32, self: Uint8Array) => void): void { - FOREACH(this, callbackfn); + forEach(fn: (value: u8, index: i32, self: Uint8Array) => void): void { + FOREACH(this, fn); } reverse(): this { @@ -211,37 +211,37 @@ export class Uint8ClampedArray extends ArrayBufferView { } reduce( - callbackfn: (accumulator: T, value: u8, index: i32, array: Uint8ClampedArray) => T, + fn: (accumulator: T, value: u8, index: i32, array: Uint8ClampedArray) => T, initialValue: T, ): T { - return REDUCE(this, callbackfn, initialValue); + return REDUCE(this, fn, initialValue); } reduceRight( - callbackfn: (accumulator: T, value: u8, index: i32, array: Uint8ClampedArray) => T, + fn: (accumulator: T, value: u8, index: i32, array: Uint8ClampedArray) => T, initialValue: T, ): T { - return REDUCE_RIGHT(this, callbackfn, initialValue); + return REDUCE_RIGHT(this, fn, initialValue); } - map(callbackfn: (value: u8, index: i32, self: Uint8ClampedArray) => u8): Uint8ClampedArray { - return MAP(this, callbackfn); + map(fn: (value: u8, index: i32, self: Uint8ClampedArray) => u8): Uint8ClampedArray { + return MAP(this, fn); } - findIndex(callbackfn: (value: u8, index: i32, self: Uint8ClampedArray) => bool): i32 { - return FIND_INDEX(this, callbackfn); + findIndex(fn: (value: u8, index: i32, self: Uint8ClampedArray) => bool): i32 { + return FIND_INDEX(this, fn); } - some(callbackfn: (value: u8, index: i32, self: Uint8ClampedArray) => bool): bool { - return SOME(this, callbackfn); + some(fn: (value: u8, index: i32, self: Uint8ClampedArray) => bool): bool { + return SOME(this, fn); } - every(callbackfn: (value: u8, index: i32, self: Uint8ClampedArray) => bool): bool { - return EVERY(this, callbackfn); + every(fn: (value: u8, index: i32, self: Uint8ClampedArray) => bool): bool { + return EVERY(this, fn); } - forEach(callbackfn: (value: u8, index: i32, self: Uint8ClampedArray) => void): void { - FOREACH(this, callbackfn); + forEach(fn: (value: u8, index: i32, self: Uint8ClampedArray) => void): void { + FOREACH(this, fn); } reverse(): this { @@ -293,37 +293,37 @@ export class Int16Array extends ArrayBufferView { } reduce( - callbackfn: (accumulator: T, value: i16, index: i32, array: Int16Array) => T, + fn: (accumulator: T, value: i16, index: i32, array: Int16Array) => T, initialValue: T, ): T { - return REDUCE(this, callbackfn, initialValue); + return REDUCE(this, fn, initialValue); } reduceRight( - callbackfn: (accumulator: T, value: i16, index: i32, array: Int16Array) => T, + fn: (accumulator: T, value: i16, index: i32, array: Int16Array) => T, initialValue: T, ): T { - return REDUCE_RIGHT(this, callbackfn, initialValue); + return REDUCE_RIGHT(this, fn, initialValue); } - map(callbackfn: (value: i16, index: i32, self: Int16Array) => i16): Int16Array { - return MAP(this, callbackfn); + map(fn: (value: i16, index: i32, self: Int16Array) => i16): Int16Array { + return MAP(this, fn); } - findIndex(callbackfn: (value: i16, index: i32, self: Int16Array) => bool): i32 { - return FIND_INDEX(this, callbackfn); + findIndex(fn: (value: i16, index: i32, self: Int16Array) => bool): i32 { + return FIND_INDEX(this, fn); } - some(callbackfn: (value: i16, index: i32, self: Int16Array) => bool): bool { - return SOME(this, callbackfn); + some(fn: (value: i16, index: i32, self: Int16Array) => bool): bool { + return SOME(this, fn); } - every(callbackfn: (value: i16, index: i32, self: Int16Array) => bool): bool { - return EVERY(this, callbackfn); + every(fn: (value: i16, index: i32, self: Int16Array) => bool): bool { + return EVERY(this, fn); } - forEach(callbackfn: (value: i16, index: i32, self: Int16Array) => void): void { - FOREACH(this, callbackfn); + forEach(fn: (value: i16, index: i32, self: Int16Array) => void): void { + FOREACH(this, fn); } reverse(): this { @@ -375,37 +375,37 @@ export class Uint16Array extends ArrayBufferView { } reduce( - callbackfn: (accumulator: T, value: u16, index: i32, array: Uint16Array) => T, + fn: (accumulator: T, value: u16, index: i32, array: Uint16Array) => T, initialValue: T, ): T { - return REDUCE(this, callbackfn, initialValue); + return REDUCE(this, fn, initialValue); } reduceRight( - callbackfn: (accumulator: T, value: u16, index: i32, array: Uint16Array) => T, + fn: (accumulator: T, value: u16, index: i32, array: Uint16Array) => T, initialValue: T, ): T { - return REDUCE_RIGHT(this, callbackfn, initialValue); + return REDUCE_RIGHT(this, fn, initialValue); } - map(callbackfn: (value: u16, index: i32, self: Uint16Array) => u16): Uint16Array { - return MAP(this, callbackfn); + map(fn: (value: u16, index: i32, self: Uint16Array) => u16): Uint16Array { + return MAP(this, fn); } - findIndex(callbackfn: (value: u16, index: i32, self: Uint16Array) => bool): i32 { - return FIND_INDEX(this, callbackfn); + findIndex(fn: (value: u16, index: i32, self: Uint16Array) => bool): i32 { + return FIND_INDEX(this, fn); } - some(callbackfn: (value: u16, index: i32, self: Uint16Array) => bool): bool { - return SOME(this, callbackfn); + some(fn: (value: u16, index: i32, self: Uint16Array) => bool): bool { + return SOME(this, fn); } - every(callbackfn: (value: u16, index: i32, self: Uint16Array) => bool): bool { - return EVERY(this, callbackfn); + every(fn: (value: u16, index: i32, self: Uint16Array) => bool): bool { + return EVERY(this, fn); } - forEach(callbackfn: (value: u16, index: i32, self: Uint16Array) => void): void { - FOREACH(this, callbackfn); + forEach(fn: (value: u16, index: i32, self: Uint16Array) => void): void { + FOREACH(this, fn); } reverse(): this { @@ -457,37 +457,37 @@ export class Int32Array extends ArrayBufferView { } reduce( - callbackfn: (accumulator: T, value: i32, index: i32, array: Int32Array) => T, + fn: (accumulator: T, value: i32, index: i32, array: Int32Array) => T, initialValue: T, ): T { - return REDUCE(this, callbackfn, initialValue); + return REDUCE(this, fn, initialValue); } reduceRight( - callbackfn: (accumulator: T, value: i32, index: i32, array: Int32Array) => T, + fn: (accumulator: T, value: i32, index: i32, array: Int32Array) => T, initialValue: T, ): T { - return REDUCE_RIGHT(this, callbackfn, initialValue); + return REDUCE_RIGHT(this, fn, initialValue); } - map(callbackfn: (value: i32, index: i32, self: Int32Array) => i32): Int32Array { - return MAP(this, callbackfn); + map(fn: (value: i32, index: i32, self: Int32Array) => i32): Int32Array { + return MAP(this, fn); } - findIndex(callbackfn: (value: i32, index: i32, self: Int32Array) => bool): i32 { - return FIND_INDEX(this, callbackfn); + findIndex(fn: (value: i32, index: i32, self: Int32Array) => bool): i32 { + return FIND_INDEX(this, fn); } - some(callbackfn: (value: i32, index: i32, self: Int32Array) => bool): bool { - return SOME(this, callbackfn); + some(fn: (value: i32, index: i32, self: Int32Array) => bool): bool { + return SOME(this, fn); } - every(callbackfn: (value: i32, index: i32, self: Int32Array) => bool): bool { - return EVERY(this, callbackfn); + every(fn: (value: i32, index: i32, self: Int32Array) => bool): bool { + return EVERY(this, fn); } - forEach(callbackfn: (value: i32, index: i32, self: Int32Array) => void): void { - FOREACH(this, callbackfn); + forEach(fn: (value: i32, index: i32, self: Int32Array) => void): void { + FOREACH(this, fn); } reverse(): this { @@ -539,37 +539,37 @@ export class Uint32Array extends ArrayBufferView { } reduce( - callbackfn: (accumulator: T, value: u32, index: i32, array: Uint32Array) => T, + fn: (accumulator: T, value: u32, index: i32, array: Uint32Array) => T, initialValue: T, ): T { - return REDUCE(this, callbackfn, initialValue); + return REDUCE(this, fn, initialValue); } reduceRight( - callbackfn: (accumulator: T, value: u32, index: i32, array: Uint32Array) => T, + fn: (accumulator: T, value: u32, index: i32, array: Uint32Array) => T, initialValue: T, ): T { - return REDUCE_RIGHT(this, callbackfn, initialValue); + return REDUCE_RIGHT(this, fn, initialValue); } - map(callbackfn: (value: u32, index: i32, self: Uint32Array) => u32): Uint32Array { - return MAP(this, callbackfn); + map(fn: (value: u32, index: i32, self: Uint32Array) => u32): Uint32Array { + return MAP(this, fn); } - findIndex(callbackfn: (value: u32, index: i32, self: Uint32Array) => bool): i32 { - return FIND_INDEX(this, callbackfn); + findIndex(fn: (value: u32, index: i32, self: Uint32Array) => bool): i32 { + return FIND_INDEX(this, fn); } - some(callbackfn: (value: u32, index: i32, self: Uint32Array) => bool): bool { - return SOME(this, callbackfn); + some(fn: (value: u32, index: i32, self: Uint32Array) => bool): bool { + return SOME(this, fn); } - every(callbackfn: (value: u32, index: i32, self: Uint32Array) => bool): bool { - return EVERY(this, callbackfn); + every(fn: (value: u32, index: i32, self: Uint32Array) => bool): bool { + return EVERY(this, fn); } - forEach(callbackfn: (value: u32, index: i32, self: Uint32Array) => void): void { - FOREACH(this, callbackfn); + forEach(fn: (value: u32, index: i32, self: Uint32Array) => void): void { + FOREACH(this, fn); } reverse(): this { @@ -621,37 +621,37 @@ export class Int64Array extends ArrayBufferView { } reduce( - callbackfn: (accumulator: T, value: i64, index: i32, array: Int64Array) => T, + fn: (accumulator: T, value: i64, index: i32, array: Int64Array) => T, initialValue: T, ): T { - return REDUCE(this, callbackfn, initialValue); + return REDUCE(this, fn, initialValue); } reduceRight( - callbackfn: (accumulator: T, value: i64, index: i32, array: Int64Array) => T, + fn: (accumulator: T, value: i64, index: i32, array: Int64Array) => T, initialValue: T, ): T { - return REDUCE_RIGHT(this, callbackfn, initialValue); + return REDUCE_RIGHT(this, fn, initialValue); } - map(callbackfn: (value: i64, index: i32, self: Int64Array) => i64): Int64Array { - return MAP(this, callbackfn); + map(fn: (value: i64, index: i32, self: Int64Array) => i64): Int64Array { + return MAP(this, fn); } - findIndex(callbackfn: (value: i64, index: i32, self: Int64Array) => bool): i32 { - return FIND_INDEX(this, callbackfn); + findIndex(fn: (value: i64, index: i32, self: Int64Array) => bool): i32 { + return FIND_INDEX(this, fn); } - some(callbackfn: (value: i64, index: i32, self: Int64Array) => bool): bool { - return SOME(this, callbackfn); + some(fn: (value: i64, index: i32, self: Int64Array) => bool): bool { + return SOME(this, fn); } - every(callbackfn: (value: i64, index: i32, self: Int64Array) => bool): bool { - return EVERY(this, callbackfn); + every(fn: (value: i64, index: i32, self: Int64Array) => bool): bool { + return EVERY(this, fn); } - forEach(callbackfn: (value: i64, index: i32, self: Int64Array) => void): void { - FOREACH(this, callbackfn); + forEach(fn: (value: i64, index: i32, self: Int64Array) => void): void { + FOREACH(this, fn); } reverse(): this { @@ -703,37 +703,37 @@ export class Uint64Array extends ArrayBufferView { } reduce( - callbackfn: (accumulator: T, value: u64, index: i32, array: Uint64Array) => T, + fn: (accumulator: T, value: u64, index: i32, array: Uint64Array) => T, initialValue: T, ): T { - return REDUCE(this, callbackfn, initialValue); + return REDUCE(this, fn, initialValue); } reduceRight( - callbackfn: (accumulator: T, value: u64, index: i32, array: Uint64Array) => T, + fn: (accumulator: T, value: u64, index: i32, array: Uint64Array) => T, initialValue: T, ): T { - return REDUCE_RIGHT(this, callbackfn, initialValue); + return REDUCE_RIGHT(this, fn, initialValue); } - map(callbackfn: (value: u64, index: i32, self: Uint64Array) => u64): Uint64Array { - return MAP(this, callbackfn); + map(fn: (value: u64, index: i32, self: Uint64Array) => u64): Uint64Array { + return MAP(this, fn); } - findIndex(callbackfn: (value: u64, index: i32, self: Uint64Array) => bool): i32 { - return FIND_INDEX(this, callbackfn); + findIndex(fn: (value: u64, index: i32, self: Uint64Array) => bool): i32 { + return FIND_INDEX(this, fn); } - some(callbackfn: (value: u64, index: i32, self: Uint64Array) => bool): bool { - return SOME(this, callbackfn); + some(fn: (value: u64, index: i32, self: Uint64Array) => bool): bool { + return SOME(this, fn); } - every(callbackfn: (value: u64, index: i32, self: Uint64Array) => bool): bool { - return EVERY(this, callbackfn); + every(fn: (value: u64, index: i32, self: Uint64Array) => bool): bool { + return EVERY(this, fn); } - forEach(callbackfn: (value: u64, index: i32, self: Uint64Array) => void): void { - FOREACH(this, callbackfn); + forEach(fn: (value: u64, index: i32, self: Uint64Array) => void): void { + FOREACH(this, fn); } reverse(): this { @@ -785,37 +785,37 @@ export class Float32Array extends ArrayBufferView { } reduce( - callbackfn: (accumulator: T, value: f32, index: i32, array: Float32Array) => T, + fn: (accumulator: T, value: f32, index: i32, array: Float32Array) => T, initialValue: T, ): T { - return REDUCE(this, callbackfn, initialValue); + return REDUCE(this, fn, initialValue); } reduceRight( - callbackfn: (accumulator: T, value: f32, index: i32, array: Float32Array) => T, + fn: (accumulator: T, value: f32, index: i32, array: Float32Array) => T, initialValue: T, ): T { - return REDUCE_RIGHT(this, callbackfn, initialValue); + return REDUCE_RIGHT(this, fn, initialValue); } - map(callbackfn: (value: f32, index: i32, self: Float32Array) => f32): Float32Array { - return MAP(this, callbackfn); + map(fn: (value: f32, index: i32, self: Float32Array) => f32): Float32Array { + return MAP(this, fn); } - findIndex(callbackfn: (value: f32, index: i32, self: Float32Array) => bool): i32 { - return FIND_INDEX(this, callbackfn); + findIndex(fn: (value: f32, index: i32, self: Float32Array) => bool): i32 { + return FIND_INDEX(this, fn); } - some(callbackfn: (value: f32, index: i32, self: Float32Array) => bool): bool { - return SOME(this, callbackfn); + some(fn: (value: f32, index: i32, self: Float32Array) => bool): bool { + return SOME(this, fn); } - every(callbackfn: (value: f32, index: i32, self: Float32Array) => bool): bool { - return EVERY(this, callbackfn); + every(fn: (value: f32, index: i32, self: Float32Array) => bool): bool { + return EVERY(this, fn); } - forEach(callbackfn: (value: f32, index: i32, self: Float32Array) => void): void { - FOREACH(this, callbackfn); + forEach(fn: (value: f32, index: i32, self: Float32Array) => void): void { + FOREACH(this, fn); } reverse(): this { @@ -867,37 +867,37 @@ export class Float64Array extends ArrayBufferView { } reduce( - callbackfn: (accumulator: T, value: f64, index: i32, array: Float64Array) => T, + fn: (accumulator: T, value: f64, index: i32, array: Float64Array) => T, initialValue: T, ): T { - return REDUCE(this, callbackfn, initialValue); + return REDUCE(this, fn, initialValue); } reduceRight( - callbackfn: (accumulator: T, value: f64, index: i32, array: Float64Array) => T, + fn: (accumulator: T, value: f64, index: i32, array: Float64Array) => T, initialValue: T, ): T { - return REDUCE_RIGHT(this, callbackfn, initialValue); + return REDUCE_RIGHT(this, fn, initialValue); } - map(callbackfn: (value: f64, index: i32, self: Float64Array) => f64): Float64Array { - return MAP(this, callbackfn); + map(fn: (value: f64, index: i32, self: Float64Array) => f64): Float64Array { + return MAP(this, fn); } - findIndex(callbackfn: (value: f64, index: i32, self: Float64Array) => bool): i32 { - return FIND_INDEX(this, callbackfn); + findIndex(fn: (value: f64, index: i32, self: Float64Array) => bool): i32 { + return FIND_INDEX(this, fn); } - some(callbackfn: (value: f64, index: i32, self: Float64Array) => bool): bool { - return SOME(this, callbackfn); + some(fn: (value: f64, index: i32, self: Float64Array) => bool): bool { + return SOME(this, fn); } - every(callbackfn: (value: f64, index: i32, self: Float64Array) => bool): bool { - return EVERY(this, callbackfn); + every(fn: (value: f64, index: i32, self: Float64Array) => bool): bool { + return EVERY(this, fn); } - forEach(callbackfn: (value: f64, index: i32, self: Float64Array) => void): void { - FOREACH(this, callbackfn); + forEach(fn: (value: f64, index: i32, self: Float64Array) => void): void { + FOREACH(this, fn); } reverse(): this { @@ -971,12 +971,12 @@ function SUBARRAY( @inline function REDUCE( array: TArray, - callbackfn: (accumulator: TRet, value: T, index: i32, array: TArray) => TRet, + fn: (accumulator: TRet, value: T, index: i32, array: TArray) => TRet, initialValue: TRet ): TRet { var dataStart = array.dataStart; for (let i = 0, k = array.length; i < k; i++) { - initialValue = callbackfn(initialValue, load(dataStart + (i << alignof())), i, array); + initialValue = fn(initialValue, load(dataStart + (i << alignof())), i, array); } return initialValue; } @@ -985,12 +985,12 @@ function REDUCE( @inline function REDUCE_RIGHT( array: TArray, - callbackfn: (accumulator: TRet, value: T, index: i32, array: TArray) => TRet, + fn: (accumulator: TRet, value: T, index: i32, array: TArray) => TRet, initialValue: TRet ): TRet { var dataStart = array.dataStart; for (let i = array.length - 1; i >= 0; i--) { - initialValue = callbackfn(initialValue, load(dataStart + (i << alignof())), i, array); + initialValue = fn(initialValue, load(dataStart + (i << alignof())), i, array); } return initialValue; } @@ -999,7 +999,7 @@ function REDUCE_RIGHT( @inline function MAP( array: TArray, - callbackfn: (value: T, index: i32, self: TArray) => T, + fn: (value: T, index: i32, self: TArray) => T, ): TArray { var length = array.length; var dataStart = array.dataStart; @@ -1008,7 +1008,7 @@ function MAP( for (let i = 0; i < length; i++) { store( outDataStart + (i << alignof()), - callbackfn(load(dataStart + (i << alignof())), i, array) + fn(load(dataStart + (i << alignof())), i, array) ); } return out; @@ -1018,11 +1018,11 @@ function MAP( @inline function FIND_INDEX( array: TArray, - callbackfn: (value: T, index: i32, array: TArray) => bool, + fn: (value: T, index: i32, array: TArray) => bool, ): i32 { var dataStart = array.dataStart; for (let i = 0, k = array.length; i < k; i++) { - if (callbackfn(load(dataStart + (i << alignof())), i, array)) return i; + if (fn(load(dataStart + (i << alignof())), i, array)) return i; } return -1; } @@ -1031,11 +1031,11 @@ function FIND_INDEX( @inline function SOME( array: TArray, - callbackfn: (value: T, index: i32, array: TArray) => bool, + fn: (value: T, index: i32, array: TArray) => bool, ): bool { var dataStart = array.dataStart; for (let i = 0, k = array.length; i < k; i++) { - if (callbackfn(load(dataStart + (i << alignof())), i, array)) return true; + if (fn(load(dataStart + (i << alignof())), i, array)) return true; } return false; } @@ -1044,11 +1044,11 @@ function SOME( @inline function EVERY( array: TArray, - callbackfn: (value: T, index: i32, array: TArray) => bool, + fn: (value: T, index: i32, array: TArray) => bool, ): bool { var dataStart = array.dataStart; for (let i = 0, k = array.length; i < k; i++) { - if (callbackfn(load(dataStart + (i << alignof())), i, array)) continue; + if (fn(load(dataStart + (i << alignof())), i, array)) continue; return false; } return true; @@ -1058,11 +1058,11 @@ function EVERY( @inline function FOREACH( array: TArray, - callbackfn: (value: T, index: i32, array: TArray) => void, + fn: (value: T, index: i32, array: TArray) => void, ): void { var dataStart = array.dataStart; for (let i = 0, k = array.length; i < k; i++) { - callbackfn(load(dataStart + (i << alignof())), i, array); + fn(load(dataStart + (i << alignof())), i, array); } }