From 2c6c865b353d0e15783a95886d672288ca7da46c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arne=20D=C3=B6ring?= <arne.doering@gmx.net>
Date: Thu, 2 Feb 2017 23:06:13 +0100
Subject: [PATCH] reenabled clear test, made clear working (#5323)

---
 lib/pure/collections/tables.nim |  7 ++++--
 tests/collections/ttables.nim   | 38 ++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/lib/pure/collections/tables.nim b/lib/pure/collections/tables.nim
index 57e98bf5cd..00a81b8d5e 100644
--- a/lib/pure/collections/tables.nim
+++ b/lib/pure/collections/tables.nim
@@ -814,11 +814,14 @@ proc len*[A](t: CountTable[A]): int =
   ## returns the number of keys in `t`.
   result = t.counter
 
-proc clear*[A](t: var CountTable[A] | CountTableRef[A]) =
+proc clear*[A](t: CountTableRef[A]) =
   ## Resets the table so that it is empty.
   clearImpl()
-  t.counter = 0
 
+proc clear*[A](t: var CountTable[A]) =
+  ## Resets the table so that it is empty.
+  clearImpl()
+  
 iterator pairs*[A](t: CountTable[A]): (A, int) =
   ## iterates over any (key, value) pair in the table `t`.
   for h in 0..high(t.data):
diff --git a/tests/collections/ttables.nim b/tests/collections/ttables.nim
index ef5ed92f57..0e06bc26f8 100644
--- a/tests/collections/ttables.nim
+++ b/tests/collections/ttables.nim
@@ -190,28 +190,26 @@ block zeroHashKeysTest:
   doZeroHashValueTest(toOrderedTable[string,string]({"egg": "sausage"}),
       "", "spam")
 
-# Until #4448 is fixed, these tests will fail
-when false:
-  block clearTableTest:
-    var t = data.toTable
-    assert t.len() != 0
-    t.clear()
-    assert t.len() == 0
+block clearTableTest:
+  var t = data.toTable
+  assert t.len() != 0
+  t.clear()
+  assert t.len() == 0
 
-  block clearOrderedTableTest:
-    var t = data.toOrderedTable
-    assert t.len() != 0
-    t.clear()
-    assert t.len() == 0
+block clearOrderedTableTest:
+  var t = data.toOrderedTable
+  assert t.len() != 0
+  t.clear()
+  assert t.len() == 0
 
-  block clearCountTableTest:
-    var t = initCountTable[string]()
-    t.inc("90", 3)
-    t.inc("12", 2)
-    t.inc("34", 1)
-    assert t.len() != 0
-    t.clear()
-    assert t.len() == 0
+block clearCountTableTest:
+  var t = initCountTable[string]()
+  t.inc("90", 3)
+  t.inc("12", 2)
+  t.inc("34", 1)
+  assert t.len() != 0
+  t.clear()
+  assert t.len() == 0
 
 proc orderedTableSortTest() =
   var t = initOrderedTable[string, int](2)