Add tuples and arrays.

Author: treeform

src/jsony.nim

@@ -8,6 +8,8 @@ proc parseJson[T](s: string, i: var int, v: var seq[T])
 proc parseJson[T:enum](s: string, i: var int, v: var T)
 proc parseJson[T:object|ref object](s: string, i: var int, v: var T)
 proc parseJson[T](s: string, i: var int, v: var Table[string, T])
+proc parseJson[T:tuple](s: string, i: var int, v: var T)
+proc parseJson[T:array](s: string, i: var int, v: var T)
 
 template error(msg: string, i: int) =
   ## Short cut to raise an exception.
@@ -123,6 +125,30 @@ proc parseJson[T](s: string, i: var int, v: var seq[T]) =
       break
   eat(s, i, ']')
 
+proc parseJson[T:tuple](s: string, i: var int, v: var T) =
+  eatSpace(s, i)
+  var strV: string
+  eat(s, i, '[')
+  for name, value in v.fieldPairs:
+    eatSpace(s, i)
+    parseJson(s, i, value)
+    eatSpace(s, i)
+    if s[i] == ',':
+      inc i
+  eat(s, i, ']')
+
+proc parseJson[T:array](s: string, i: var int, v: var T) =
+  eatSpace(s, i)
+  var strV: string
+  eat(s, i, '[')
+  for value in v.mitems:
+    eatSpace(s, i)
+    parseJson(s, i, value)
+    eatSpace(s, i)
+    if s[i] == ',':
+      inc i
+  eat(s, i, ']')
+
 proc skipValue(s: string, i: var int) =
   ## Used to skip values of extra fields.
   #echo "Skip:", s[i .. min(i + 80, s.len-1)]

tests/test_arrays.nim

@@ -0,0 +1,21 @@
+import jsony
+
+block:
+  var s = "[1, 2, 3]"
+  var v = fromJson[array[3, int]](s)
+  doAssert v[0] == 1
+  doAssert v[1] == 2
+  doAssert v[2] == 3
+
+block:
+  var s = "[1.5, 2.25, 3.0]"
+  var v = fromJson[array[3, float32]](s)
+  doAssert v[0] == 1.5
+  doAssert v[1] == 2.25
+  doAssert v[2] == 3.0
+
+block:
+  var s = """["no", "yes"]"""
+  var v = fromJson[array[2, string]](s)
+  doAssert v[0] == "no"
+  doAssert v[1] == "yes"

tests/test_tuples.nim

@@ -0,0 +1,37 @@
+import jsony
+
+block:
+  var s = "[1, 2, 3]"
+  var v = fromJson[(int, int, int)](s)
+  doAssert v[0] == 1
+  doAssert v[1] == 2
+  doAssert v[2] == 3
+
+block:
+  var s = """[1, "hi", 3.5]"""
+  var v = fromJson[(int, string, float32)](s)
+  doAssert v[0] == 1
+  doAssert v[1] == "hi"
+  doAssert v[2] == 3.5
+
+block:
+  type Entry = tuple[id:int, name:string, dist:float32]
+  var s = """[134, "red", 13.5]"""
+  var v = fromJson[Entry](s)
+  doAssert v[0] == 134
+  doAssert v[1] == "red"
+  doAssert v[2] == 13.5
+  doAssert v.id == 134
+  doAssert v.name == "red"
+  doAssert v.dist == 13.5
+
+block:
+  type Vector3i = tuple[x:int, y:int, z:int]
+  var s = """[0, 1, 2]"""
+  var v = fromJson[Vector3i](s)
+  doAssert v[0] == 0
+  doAssert v[1] == 1
+  doAssert v[2] == 2
+  doAssert v.x == 0
+  doAssert v.y == 1
+  doAssert v.z == 2