made some tests green

This commit is contained in:
Araq 2014-08-31 12:34:35 +02:00
commit ae548a696f
8 changed files with 28 additions and 29 deletions

View file

@ -18,4 +18,4 @@ proc `++`(x, y: DF): DF {.borrow.}
proc `$`(x: DI): string {.borrow.}
proc `$`(x: DF): string {.borrow.}
echo 4544.DI ++ 343.di, " ", (4.5.df ++ 0.5.df).float == 5.0
echo 4544.DI ++ 343.DI, " ", (4.5.DF ++ 0.5.DF).float == 5.0

View file

@ -1,6 +1,6 @@
discard """
file: "tsubrange2.nim"
outputsub: "value out of range: 50 [EOutOfRange]"
outputsub: "value out of range: 50 [RangeError]"
exitcode: "1"
"""

View file

@ -1,6 +1,6 @@
discard """
file: "tsubrange.nim"
outputsub: "value out of range: 50 [EOutOfRange]"
outputsub: "value out of range: 50 [RangeError]"
exitcode: "1"
"""
@ -16,4 +16,3 @@ var
r = y
#p y

View file

@ -84,7 +84,7 @@ block orderedTableTest1:
block countTableTest1:
var s = data.toTable
var t = initCountTable[string]()
for k in s.Keys: t.inc(k)
for k in s.keys: t.inc(k)
for k in t.keys: assert t[k] == 1
t.inc("90", 3)
t.inc("12", 2)

View file

@ -1,5 +1,5 @@
type pnode* = ref object of tobject
type PNode* = ref object of RootObj
template litNode (name, ty): stmt =
type name* = ref object of PNode
@ -8,7 +8,7 @@ litNode PIntNode, int
import json
template withKey*(j: PJsonNode; key: string; varname: expr;
template withKey*(j: JsonNode; key: string; varname: expr;
body:stmt): stmt {.immediate.} =
if j.hasKey(key):
let varname{.inject.}= j[key]