Skip to content

Add workaround for Array#sort for strings & references #90

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
dcodeIO merged 8 commits into from
May 2, 2018
Merged

Add workaround for Array#sort for strings & references #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6911a5f
Fix out of bound issue during sorting test
MaxGraey May 2, 2018
4b7f31b
update
MaxGraey May 2, 2018
b3e0624
simplificate sort tempale. Temprary disable sorting tests for string
MaxGraey May 2, 2018
55fd9e2
update comments
MaxGraey May 2, 2018
51457a2
Use workaround for string sorting while Timsort not implemented
MaxGraey May 2, 2018
acfdf64
use workaround for all references
MaxGraey May 2, 2018
8db90b1
fix branch tree shaking
MaxGraey May 2, 2018
7834445
rebuild
MaxGraey May 2, 2018
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
14 changes: 10 additions & 4 deletions std/assembly/array.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,9 +314,15 @@ export class Array<T> {
}
return this;
}
return changetype<this>(length < 256
? insertionSort<T,T>(this, comparator)
: weakHeapSort<T,T>(this, comparator)
);

if (isReference<T>()) {
// TODO replace this to stable sort when it implemented
return changetype<this>(insertionSort<T>(this, comparator));
} else {
return changetype<this>(length < 256
? insertionSort<T>(this, comparator)
: weakHeapSort<T>(this, comparator)
);
}
}
}
54 changes: 27 additions & 27 deletions std/assembly/internal/array.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,25 @@ export function defaultComparator<T>(): (a: T, b: T) => i32 {
}

/** Sorts an Array with the 'Insertion Sort' algorithm. */
export function insertionSort<T,V>(arr: Array<T>, comparator: (a: V, b: V) => i32): Array<T> {
export function insertionSort<T>(arr: Array<T>, comparator: (a: T, b: T) => i32): Array<T> {
var buffer = arr.buffer_;
for (let i: i32 = 0, length: i32 = arr.length; i < length; i++) {
let a = loadUnsafe<T,V>(buffer, i); // a = arr[i]
let a = loadUnsafe<T,T>(buffer, i); // a = arr[i]
let j = i - 1;
while (j >= 0) {
let b = loadUnsafe<T,V>(buffer, j); // b = arr[j]
let b = loadUnsafe<T,T>(buffer, j); // b = arr[j]
if (comparator(a, b) < 0) {
storeUnsafe<T,V>(buffer, j-- + 1, b); // arr[j + 1] = b
storeUnsafe<T,T>(buffer, j-- + 1, b); // arr[j + 1] = b
} else break;
}
storeUnsafe<T,V>(buffer, j + 1, a); // arr[j + 1] = a
storeUnsafe<T,T>(buffer, j + 1, a); // arr[j + 1] = a
}
return arr;
}

/** Sorts an Array with the 'Weak Heap Sort' algorithm. */
export function weakHeapSort<T,V>(arr: Array<T>, comparator: (a: V, b: V) => i32): Array<T> {
const shift32 = alignof<i32>();
export function weakHeapSort<T>(arr: Array<T>, comparator: (a: T, b: T) => i32): Array<T> {
const shift32 = alignof<u32>();

var length = arr.length;
var bitsetSize = (length + 31) >> 5 << shift32;
Expand All @@ -44,49 +44,49 @@ export function weakHeapSort<T,V>(arr: Array<T>, comparator: (a: V, b: V) => i32
var buffer = arr.buffer_;
for (let i = length - 1; i > 0; i--) {
let j = i;
while ((j & 1) == (load<i32>(bitset + (j >> 6 << shift32)) >> (j >> 1 & 31) & 1)) j >>= 1;
while ((j & 1) == (load<u32>(bitset + (j >> 6 << shift32)) >> (j >> 1 & 31) & 1)) j >>= 1;

let p = j >> 1;
let a = loadUnsafe<T,V>(buffer, p); // a = arr[p]
let b = loadUnsafe<T,V>(buffer, i); // b = arr[i]
let a = loadUnsafe<T,T>(buffer, p); // a = arr[p]
let b = loadUnsafe<T,T>(buffer, i); // b = arr[i]
if (comparator(a, b) < 0) {
store<i32>(
store<u32>(
bitset + (i >> 5 << shift32),
load<i32>(bitset + (i >> 5 << shift32)) ^ (1 << (i & 31))
load<u32>(bitset + (i >> 5 << shift32)) ^ (1 << (i & 31))
);
storeUnsafe<T,V>(buffer, i, a); // arr[i] = a
storeUnsafe<T,V>(buffer, p, b); // arr[p] = b
storeUnsafe<T,T>(buffer, i, a); // arr[i] = a
storeUnsafe<T,T>(buffer, p, b); // arr[p] = b
}
}

for (let i = length - 1; i >= 2; i--) {
let a = loadUnsafe<T,V>(buffer, 0); // a = arr[0]
storeUnsafe<T,V>(buffer, 0, loadUnsafe<T,V>(buffer, i)); // arr[0] = arr[i]
storeUnsafe<T,V>(buffer, i, a); // arr[i] = a
let a = loadUnsafe<T,T>(buffer, 0); // a = arr[0]
storeUnsafe<T,T>(buffer, 0, loadUnsafe<T,T>(buffer, i)); // arr[0] = arr[i]
storeUnsafe<T,T>(buffer, i, a); // arr[i] = a

let x = 1, y: i32;
while ((y = (x << 1) + ((load<i32>(bitset + (x >> 5 << shift32)) >> (x & 31)) & 1)) < i) x = y;
while ((y = (x << 1) + ((load<u32>(bitset + (x >> 5 << shift32)) >> (x & 31)) & 1)) < i) x = y;

while (x > 0) {
a = loadUnsafe<T,V>(buffer, 0); // a = arr[0]
let b = loadUnsafe<T,V>(buffer, x); // b = arr[x]
a = loadUnsafe<T,T>(buffer, 0); // a = arr[0]
let b = loadUnsafe<T,T>(buffer, x); // b = arr[x]

if (comparator(a, b) < 0) {
store<i32>(
store<u32>(
bitset + (x >> 5 << shift32),
load<i32>(bitset + (x >> 5 << shift32)) ^ (1 << (x & 31))
load<u32>(bitset + (x >> 5 << shift32)) ^ (1 << (x & 31))
);
storeUnsafe<T,V>(buffer, x, a); // arr[x] = a
storeUnsafe<T,V>(buffer, 0, b); // arr[0] = b
storeUnsafe<T,T>(buffer, x, a); // arr[x] = a
storeUnsafe<T,T>(buffer, 0, b); // arr[0] = b
}
x >>= 1;
}
}

free_memory(bitset);

var t = loadUnsafe<T,V>(buffer, 1); // t = arr[1]
storeUnsafe<T,V>(buffer, 1, loadUnsafe<T,V>(buffer, 0)); // arr[1] = arr[0]
storeUnsafe<T,V>(buffer, 0, t); // arr[0] = t
var t = loadUnsafe<T,T>(buffer, 1); // t = arr[1]
storeUnsafe<T,T>(buffer, 1, loadUnsafe<T,T>(buffer, 0)); // arr[1] = arr[0]
storeUnsafe<T,T>(buffer, 0, t); // arr[0] = t
return arr;
}
Loading