Skip to content

Fix PriorityQueue compilation on the eval target, closes #48 #54

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
Gama11 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix PriorityQueue compilation on the eval target, closes #48 #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
544c38d
Fix PriorityQueue compilation on the eval target, closes #48
Gama11 Nov 3, 2020
3a88d8d
Fix ListSet compilation on the eval target
Gama11 Dec 17, 2020
ed759d7
Fix Std.is() deprecation warnings in Printf
Gama11 Dec 17, 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
4 changes: 2 additions & 2 deletions src/polygonal/ds/ListSet.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ class ListSet<T> implements Set<T>
**/
public function toArray():Array<T>
{
return mData.toArray(0, size, []);
return NativeArrayTools.toArray(mData, 0, size, []);
}

/**
Expand Down Expand Up @@ -431,4 +431,4 @@ class ListSetIterator<T> implements polygonal.ds.Itr<T>

mData.set(mI, mData.get(--mS));
}
}
}
6 changes: 3 additions & 3 deletions src/polygonal/ds/Printf.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,14 @@ class Printf
case Tag(type, tagArgs):
if (tagArgs.width == null)
{
if (!Std.is(args[argIndex], Int))
if (!(args[argIndex] is Int))
throw new PrintfError("invalid 'width' argument");
tagArgs.width = args[argIndex++];
}

if (tagArgs.precision == null)
{
if (!Std.is(args[argIndex], Int))
if (!(args[argIndex] is Int))
throw new PrintfError("invalid 'precision' argument");
tagArgs.precision = args[argIndex++];
}
Expand Down Expand Up @@ -996,4 +996,4 @@ private enum FloatType
FNormal;
FScientific;
FNatural;
}
}
6 changes: 3 additions & 3 deletions src/polygonal/ds/PriorityQueue.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ class PriorityQueue<T:(Prioritizable)> implements Queue<T>
{
if (isEmpty()) return [];

var out = ArrayTools.alloc(size);
var out:Array<T> = ArrayTools.alloc(size);
var t = mData.copy();
var k = size;
var j = 0, i, c, v, s, u;
Expand Down Expand Up @@ -533,7 +533,7 @@ class PriorityQueue<T:(Prioritizable)> implements Queue<T>
**/
public function toArray():Array<T>
{
return mData.toArray(1, size, []);
return NativeArrayTools.toArray(mData, 1, size, []);
}

/**
Expand Down Expand Up @@ -800,4 +800,4 @@ class PriorityQueueIterator<T:(Prioritizable)> implements polygonal.ds.Itr<T>

mObject.remove(mData.get(mI - 1));
}
}
}