[FIX] HashSet and OrderedSet not being decoded/encoded properly, thus tests failing

Author: Patitotective

kdl.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "2.0.1"
+version       = "2.0.2"
 author        = "Patitotective"
 description   = "KDL document language Nim implementation"
 license       = "MIT"

src/kdl/decoder.nim

@@ -86,7 +86,8 @@ runnableExamples:
   proc postHookKdl(v: var Foo) =
     inc v.x
 
-  assert parseKdl("x 1").decodeKdl(Foo) == Foo(x: 2) # 2 because x after postHook got incremented by one
+  assert parseKdl("x 1").decodeKdl(Foo) == Foo(
+      x: 2) # 2 because x after postHook got incremented by one
 
 ## #### Enum hook
 ## Enum hooks are useful for parsing enums in a custom manner.
@@ -278,9 +279,11 @@ runnableExamples:
   """).decodeKdl(DateTime) == dateTime(2022, mOct, 15, 12, 10)
 
   # Here we use the KdlNode overload
-  assert parseKdl("date 2022 \"October\" 15 12 04 00").decodeKdl(DateTime, "date") == dateTime(2022, mOct, 15, 12, 04)
+  assert parseKdl("date 2022 \"October\" 15 12 04 00").decodeKdl(DateTime,
+      "date") == dateTime(2022, mOct, 15, 12, 04)
   # And here we use the KdlVal overload
-  assert parseKdl("author birthday=\"2000-10-15\" name=\"Nobody\"")[0]["birthday"].decodeKdl(DateTime) == dateTime(2000, mOct, 15)
+  assert parseKdl("author birthday=\"2000-10-15\" name=\"Nobody\"")[0][
+      "birthday"].decodeKdl(DateTime) == dateTime(2000, mOct, 15)
 ##
 ## ----------
 ##
@@ -345,8 +348,9 @@ proc decodeKdl*(a: KdlVal, v: var char)
 # proc decodeKdl*(a: KdlVal, v: var cstring)
 proc decodeKdl*[T: array](a: KdlVal, v: var T)
 proc decodeKdl*[T: not KdlNode](a: KdlVal, v: var seq[T])
-proc decodeKdl*(a: KdlVal, v: var Object)
 proc decodeKdl*[T](a: KdlVal, v: var SomeSet[T])
+proc decodeKdl*(a: KdlVal, v: var Object)
+proc decodeKdl*(a: KdlVal, v: var SomeTable)
 proc decodeKdl*[T: Ordinal](a: KdlVal, v: var set[T])
 proc decodeKdl*[T](a: KdlVal, v: var Option[T])
 proc decodeKdl*[T](a: KdlVal, v: var ref T)
@@ -745,16 +749,19 @@ proc decodeKdl*[T: not KdlNode](a: KdlVal, v: var seq[T]) =
   v.setLen 1
   decodeKdl(a, v[0])
 
-proc decodeKdl*(a: KdlVal, v: var Object) =
-  fail &"{$typeof(v)} not implemented for {$typeof(a)}"
-
 proc decodeKdl*[T](a: KdlVal, v: var SomeSet[T]) =
   v.clear()
 
   v.incl decodeKdl(a, T)
 
   decodePostKdl(v)
 
+proc decodeKdl*(a: KdlVal, v: var Object) =
+  fail &"{$typeof(v)} not implemented for {$typeof(a)}"
+
+proc decodeKdl*(a: KdlVal, v: var SomeTable) =
+  fail &"{$typeof(v)} not implemented for {$typeof(a)}"
+
 proc decodeKdl*[T: Ordinal](a: KdlVal, v: var set[T]) =
   v.reset()
 

src/kdl/encoder.nim

@@ -204,7 +204,8 @@ proc encodeKdl*[T: Ordinal](a: set[T], v: var KdlNode, name: string) =
   for e, i in enumerate(a):
     v.args[e] = encodeKdlVal(i)
 
-proc encodeKdl*(a: SomeTable[string, auto] or SomeSet[auto], v: var KdlNode, name: string) =
+proc encodeKdl*(a: SomeTable[string, auto] or SomeSet[auto], v: var KdlNode,
+    name: string) =
   v = initKNode(name)
   encodeKdl(a, v.children)
 

src/kdl/utils.nim

@@ -1,13 +1,14 @@
 ## Various utilities for internal use in the library.
-import std/[strformat, strutils, unicode, streams, tables, macros]
+import std/[strformat, strutils, unicode, streams, tables, macros, sets]
 
 import types
 
 type
   Coord* = object
     line*, col*, idx*: int
 
-  Object* = ((object or tuple) and not KdlSome)
+  Object* = ((object or tuple) and not KdlSome and not SomeTable and
+      not List and not Value and not SomeSet)
   List* = (array or seq)
   Value* = (SomeNumber or string or bool) #  or range
   KdlSome* = (KdlDoc or KdlNode or KdlVal)
@@ -47,7 +48,8 @@ proc cmpIgnoreStyle(a, b: openarray[char], ignoreChars = {'_', '-'}): int =
     inc i
     inc j
 
-proc eqIdent*(v, a: openarray[char], ignoreChars = {'_', '-'}): bool = cmpIgnoreStyle(v, a, ignoreChars) == 0
+proc eqIdent*(v, a: openarray[char], ignoreChars = {'_',
+    '-'}): bool = cmpIgnoreStyle(v, a, ignoreChars) == 0
 
 # ----- Streams -----