various bugfixes for generics; added generic sort proc

1 files changed, 36 insertions, 40 deletions

diff --git a/tests/accept/run/tgenerics1.nim b/tests/accept/run/tgenerics1.nim
index b30171831..e9ccd6917 100755
--- a/tests/accept/run/tgenerics1.nim
+++ b/tests/accept/run/tgenerics1.nim
@@ -4,51 +4,47 @@ discard """
 
 # A min-heap.
 type
-    TNode[T] = tuple[priority: int, data: T]
+  TNode[T] = tuple[priority: int, data: T]
 
-    TBinHeap[T] = object
-        heap: seq[TNode[T]]
-        last: int
-    
-    PBinHeap[T] = ref TBinHeap[T]
+  TBinHeap[T] = object
+    heap: seq[TNode[T]]
+    last: int
+  
+  PBinHeap[T] = ref TBinHeap[T]
 
 proc newBinHeap*[T](heap: var PBinHeap[T], size: int) =
-    new(heap)
-    heap.last = 0
-    newSeq(heap.seq, size)
-
-when false:
-
-  proc parent(elem: int): int =
-      return (elem-1) div 2
-
-  proc siftUp[T](heap: PBinHeap[T], elem: int) =
-      var idx = elem
-      while idx != 0:
-          var p = parent(idx)
-          if heap.heap[idx] < heap.heap[p]:
-              var tmp = heap.heap[idx]
-              heap.heap[idx] = heap.heap[p]
-              heap.heap[p] = tmp
-              idx = p
-          else:
-              break
-
-  proc add*[T](heap: PBinHeap[T], priority: int, data: T) =
-      var node: TNode
-      new(node)
-      node.priority = int
-      node.data = data
-      heap.heap[heap.last] = node
-      siftUp(heap, heap.last)
-      inc(heap.last)
-
-  proc print*[T](heap: PBinHeap[T]) =
-      for i in countup(0, heap.last):
-          echo($heap.heap[i])
+  new(heap)
+  heap.last = 0
+  newSeq(heap.heap, size)
+  #newSeq(heap.seq, size)
+ 
+proc parent(elem: int): int {.inline.} =
+  return (elem-1) div 2
+
+proc siftUp[T](heap: PBinHeap[T], elem: int) =
+  var idx = elem
+  while idx != 0:
+    var p = parent(idx)
+    if heap.heap[idx].priority < heap.heap[p].priority:
+      swap(heap.heap[idx], heap.heap[p])
+      idx = p
+    else:
+      break
+
+proc add*[T](heap: PBinHeap[T], priority: int, data: T) =
+  var node: TNode[T]
+  node.priority = priority
+  node.data = data
+  heap.heap[heap.last] = node
+  siftUp(heap, heap.last)
+  inc(heap.last)
+
+proc print*[T](heap: PBinHeap[T]) =
+  for i in countup(0, heap.last):
+    echo heap.heap[i].data
 
 var
-    heap: PBinHeap[int]
+  heap: PBinHeap[int]
 
 newBinHeap(heap, 256)
 add(heap, 1, 100)