Break out tests into their own files.

Author: treeform

src/jsony.nim

@@ -1,4 +1,4 @@
-import macros, strutils
+import macros, strutils, tables, unicode
 
 type JsonError = object of ValueError
 
@@ -7,9 +7,9 @@ const whiteSpace = {' ', '\n', '\t', '\r'}
 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])
 
-
-template error(msg: string) =
+template error(msg: string, i: int) =
   ## Short cut to raise an exception.
   raise newException(JsonError, msg)
 
@@ -28,11 +28,11 @@ proc eat(s: string, i: var int, c: char) =
   ## Will raise an exception if `c` is not found.
   eatSpace(s, i)
   if i >= s.len:
-    error("Expected " & c & " but end reached.")
+    error("Expected " & c & " but end reached.", i)
   if s[i] == c:
     inc i
   else:
-    error("Expected " & c & " at offset " & $i & ".")
+    error("Expected " & c & " at offset.", i)
 
 proc parseSymbol(s: string, i: var int): string =
   ## Will read a symbol and return it.
@@ -56,7 +56,7 @@ proc parseJson(s: string, i: var int, v: var bool) =
   of "false":
     v = false
   else:
-    error("Boolean true or false expected at offset " & $i & ".")
+    error("Boolean true or false expected.", i)
 
 proc parseJson(s: string, i: var int, v: var SomeInteger) =
   ## Will parse int8, uint8, int16, uint16, int32, uint32, int64, uint64 or
@@ -69,15 +69,40 @@ proc parseJson(s: string, i: var int, v: var SomeFloat) =
 
 proc parseJson(s: string, i: var int, v: var string) =
   ## Parse string.
+  #echo "S:", s[i .. min(i + 80, s.len-1)]
+  eatSpace(s, i)
+  if s[i] == 'n':
+    let what = parseSymbol(s, i)
+    if what == "null":
+      return
+    else:
+      error("Expected \" or null at offset.", i)
   eat(s, i, '"')
   var j = i
   while i < s.len:
-    case s[i]
+    let c = s[i]
+    case c
     of '"':
-      v = s[j ..< i]
       break
+    of '\\':
+      inc i
+      let c = s[i]
+      case c
+      of '"', '\\', '/': v.add(c)
+      of 'b': v.add '\b'
+      of 'f': v.add '\f'
+      of 'n': v.add '\n'
+      of 'r': v.add '\r'
+      of 't': v.add '\t'
+      of 'u':
+        inc i
+        let u = parseHexInt(s[i ..< i + 4])
+        i += 3
+        v.add(Rune(u).toUTF8())
+      else:
+        v.add(c)
     else:
-      discard
+      v.add(c)
     inc i
   eat(s, i, '"')
 
@@ -100,8 +125,10 @@ proc parseJson[T](s: string, i: var int, v: var seq[T]) =
 
 proc skipValue(s: string, i: var int) =
   ## Used to skip values of extra fields.
+  #echo "Skip:", s[i .. min(i + 80, s.len-1)]
   eatSpace(s, i)
   if s[i] == '{':
+    #echo "skip obj"
     eat(s, i, '{')
     while i < s.len:
       eatSpace(s, i)
@@ -115,6 +142,7 @@ proc skipValue(s: string, i: var int) =
         inc i
     eat(s, i, '}')
   elif s[i] == '[':
+    #echo "skip arr"
     eat(s, i, '[')
     while i < s.len:
       eatSpace(s, i)
@@ -126,13 +154,11 @@ proc skipValue(s: string, i: var int) =
         inc i
     eat(s, i, ']')
   elif s[i] == '"':
-    eat(s, i, '"')
-    while i < s.len:
-      inc i
-      if s[i] == '"':
-        break
-    eat(s, i, '"')
+    #echo "skip str"
+    var str: string
+    parseJson(s, i, str)
   else:
+    #echo "skip sym"
     discard parseSymbol(s, i)
 
 proc camelCase(s: string): string =
@@ -189,8 +215,8 @@ proc parseJson[T:enum](s: string, i: var int, v: var T) =
   var strV: string
   if s[i] == '"':
     parseJson(s, i, strV)
-    when compiles(enumHook[T](strV)):
-      v = enumHook[T](strV)
+    when compiles(enumHook(strV, v)):
+      enumHook(strV, v)
     else:
       v = parseEnum[T](strV)
   else:
@@ -199,6 +225,13 @@ 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) =
   ## Parse an object.
+  eatSpace(s, i)
+  if s[i] == 'n':
+    let what = parseSymbol(s, i)
+    if what == "null":
+      return
+    else:
+      error("Expected {} or null at offset.", i)
   eat(s, i, '{')
   when compiles(newHook(v)):
     newHook(v)
@@ -219,6 +252,25 @@ proc parseJson[T:object|ref object](s: string, i: var int, v: var T) =
       break
   eat(s, i, '}')
 
+proc parseJson[T](s: string, i: var int, v: var Table[string, T]) =
+  ## Parse an object.
+  eat(s, i, '{')
+  while i < s.len:
+    eatSpace(s, i)
+    if s[i] == '}':
+      break
+    var key: string
+    parseJson(s, i, key)
+    eat(s, i, ':')
+    var element: T
+    parseJson(s, i, element)
+    v[key] = element
+    if s[i] == ',':
+      inc i
+    else:
+      break
+  eat(s, i, '}')
+
 proc fromJson*[T](s: string): T =
   ## Takes json and outputs the object it represents.
   ## * Create little intermediate values.

tests/test_enums.nim

@@ -18,8 +18,8 @@ type Color2 = enum
   c2Blue
   c2Green
 
-proc enumHook[Color2](v: string): Color2 =
-  case v:
+proc enumHook(s: string, v: var Color2) =
+  v = case s:
   of "RED": c2Red
   of "BLUE": c2Blue
   of "GREEN": c2Green

tests/test_objects.nim

@@ -18,7 +18,6 @@ block:
   doAssert v.a == "b"
   doAssert v.ratio == 22.5
 
-
 type
   Bar3 = ref object
     name: string
@@ -131,3 +130,17 @@ doAssert snakeCase("color_Rule") == "color_rule"
 doAssert snakeCase("color_rule") == "color_rule"
 doAssert snakeCase("httpGet") == "http_get"
 doAssert snakeCase("restAPI") == "rest_api"
+
+block:
+  type Entry5 = object
+    color: string
+  var s = "null"
+  var v = fromJson[Entry5](s)
+  doAssert v.color == ""
+
+block:
+  type Entry6 = ref object
+    color: string
+  var s = "null"
+  var v = fromJson[Entry6](s)
+  doAssert v == nil

tests/test_strings.nim

@@ -0,0 +1,26 @@
+import jsony
+
+block:
+  var s = """ "hello" """
+  var v = fromJson[string](s)
+  doAssert v == "hello"
+
+block:
+  var s = """ "new\nline" """
+  var v = fromJson[string](s)
+  doAssert v == "new\nline"
+
+block:
+  var s = """ "quote\"inside" """
+  var v = fromJson[string](s)
+  doAssert v == "quote\"inside"
+
+block:
+  var s = """ "special: \"\\\/\b\f\n\r\t chars" """
+  var v = fromJson[string](s)
+  doAssert v == "special: \"\\/\b\f\n\r\t chars"
+
+block:
+  var s = """ "unicode: \u0020 \u0F88 \u1F21" """
+  var v = fromJson[string](s)
+  doAssert v == "unicode: \u0020 \u0F88 \u1F21"

tests/test_tables.nim

@@ -0,0 +1,35 @@
+import jsony, tables
+
+block:
+
+  var s = "{}"
+  var v = fromJson[Table[string, int]](s)
+  doAssert v.len == 0
+
+block:
+  var s = """{"a":2}"""
+  var v = fromJson[Table[string, int]](s)
+  doAssert v.len == 1
+  doAssert v["a"] == 2
+
+block:
+  var s = """{"a":2, "b":3, "c" : 4}"""
+  var v = fromJson[Table[string, uint8]](s)
+  doAssert v.len == 3
+  doAssert v["a"] == 2
+  doAssert v["b"] == 3
+  doAssert v["c"] == 4
+
+block:
+  type Entry = object
+    color: string
+  var s = """{
+    "a": {"color":"red"},
+    "b": {"color":"green"},
+    "c": {"color":"blue"}
+  }"""
+  var v = fromJson[Table[string, Entry]](s)
+  doAssert v.len == 3
+  doAssert v["a"].color == "red"
+  doAssert v["b"].color == "green"
+  doAssert v["c"].color == "blue"