Made bench great again

bench/jsonBench.nim

@@ -1,8 +1,8 @@
-import "../yaml", common
+import "../yaml", commonBench
 
 from nimlets_yaml import objKind
 
-import math, strutils, stopwatch, terminal, algorithm, random
+import math, strutils, stopwatch, terminal, algorithm, random, json
 
 proc cmp(left, right: clock): int = cmp(left.nanoseconds(), right.nanoseconds()) 
 

bench/yamlBench.nim

@@ -1,5 +1,5 @@
-import "../yaml", common
-import math, strutils, stopwatch, terminal, algorithm, random
+import "../yaml", commonBench
+import math, strutils, stopwatch, terminal, algorithm, random, streams
 
 from nimlets_yaml import objKind
 
@@ -153,10 +153,10 @@ block:
         let res = loadDOM(yaml100k)
         assert res.root.kind == yMapping
 
-block:
-    multibench(cYaml1m, 2):
-        let res = loadDOM(yaml1m)
-        assert res.root.kind == yMapping
+#block:
+#    multibench(cYaml1m, 2):
+#        let res = loadDOM(yaml1m)
+#        assert res.root.kind == yMapping
 
 block:
     multibench(cLibYaml1k, 100):
@@ -199,4 +199,4 @@ writeResult "LibYAML: ", cLibYaml100k div 1000
 setForegroundColor(fgWhite)
 writeStyled "1m input\n---------\n"
 writeResult "NimYAML: ", cYaml1m div 1000
-writeResult "LibYAML: ", cLibYaml1m div 1000
+writeResult "LibYAML: ", cLibYaml1m div 1000

yaml/stream.nim

@@ -67,7 +67,7 @@ type
     ## available from ``parent``.
 
 proc noLastContext(s: YamlStream, line, column: var int,
-    lineContent: var string): bool =
+    lineContent: var string): bool {.raises: [].} =
   (line, column, lineContent) = (-1, -1, "")
   result = false