Merge pull request #56 from pietroppeter/table-generic-key

fix #52: allow enum keys when parsing tables

Author: treeform

src/jsony.nim

@@ -18,7 +18,7 @@ type
 proc parseHook*[T](s: string, i: var int, v: var seq[T])
 proc parseHook*[T: enum](s: string, i: var int, v: var T)
 proc parseHook*[T: object|ref object](s: string, i: var int, v: var T)
-proc parseHook*[T](s: string, i: var int, v: var SomeTable[string, T])
+proc parseHook*[K: string | enum, V](s: string, i: var int, v: var SomeTable[K, V])
 proc parseHook*[T](s: string, i: var int, v: var (SomeSet[T]|set[T]))
 proc parseHook*[T: tuple](s: string, i: var int, v: var T)
 proc parseHook*[T: array](s: string, i: var int, v: var T)
@@ -494,7 +494,7 @@ proc parseHook*[T](s: string, i: var int, v: var Option[T]) =
   parseHook(s, i, e)
   v = some(e)
 
-proc parseHook*[T](s: string, i: var int, v: var SomeTable[string, T]) =
+proc parseHook*[K: string | enum, V](s: string, i: var int, v: var SomeTable[K, V]) =
   ## Parse an object.
   when compiles(new(v)):
     new(v)
@@ -503,10 +503,10 @@ proc parseHook*[T](s: string, i: var int, v: var SomeTable[string, T]) =
     eatSpace(s, i)
     if i < s.len and s[i] == '}':
       break
-    var key: string
+    var key: K
     parseHook(s, i, key)
     eatChar(s, i, ':')
-    var element: T
+    var element: V
     parseHook(s, i, element)
     v[key] = element
     if i < s.len and s[i] == ',':

tests/test_tables.nim

@@ -57,3 +57,23 @@ block:
 
   doAssert [{"j": "a"}].toJson() ==
     """[{"j":"a"}]"""
+
+block: # issue 52
+  type Color = enum
+    Red = "red", Green = "green", Blue = "blue"
+  let s = """{
+    "red": 1,
+    "blue": 3
+  }"""
+  let v = s.fromJson(Table[Color, int])
+  doAssert v.len == 2
+  doAssert v[Red] == 1
+  doAssert v[Blue] == 3
+
+block: # issue 52
+  type Answer {.pure.} = enum
+    A, B, C
+  let a = {A: "aaaa", B: "bbb"}.toTable
+  doAssert $(a.toJson()) == """{"A":"aaaa","B":"bbb"}"""
+  let t = a.toJson().fromJson(Table[Answer, string])
+  doAssert t == a