made tests green again

8 files changed, 15 insertions, 15 deletions

diff --git a/tests/compile/tradix.nim b/tests/compile/tradix.nim
index e7ca210e4..379876ea1 100755
--- a/tests/compile/tradix.nim
+++ b/tests/compile/tradix.nim
@@ -12,8 +12,8 @@ type
   TRadixNode {.pure.} = object
     kind: TRadixNodeKind
   TRadixNodeLinear = object of TRadixNode
-    len: byte
-    keys: array [0..31, byte]
+    len: int8
+    keys: array [0..31, int8]
     vals: array [0..31, PRadixNode]
   
   TRadixNodeFull = object of TRadixNode
@@ -21,8 +21,8 @@ type
   TRadixNodeLeafBits = object of TRadixNode
     b: array [0..7, int]
   TRadixNodeLeafLinear = object of TRadixNode
-    len: byte
-    keys: array [0..31, byte]
+    len: int8
+    keys: array [0..31, int8]
 
 var
   root: PRadixNode
diff --git a/tests/compile/tstrset.nim b/tests/compile/tstrset.nim
index e19ccee4d..d81ab44c9 100755
--- a/tests/compile/tstrset.nim
+++ b/tests/compile/tstrset.nim
@@ -6,7 +6,7 @@ type
   TRadixNode = object
     kind: TRadixNodeKind
   TRadixNodeLinear = object of TRadixNode
-    len: byte
+    len: int8
     keys: array [0..31, char]
     vals: array [0..31, PRadixNode]  
   TRadixNodeFull = object of TRadixNode
diff --git a/tests/reject/tconstraints.nim b/tests/reject/tconstraints.nim
index aafe86911..e61095fff 100755
--- a/tests/reject/tconstraints.nim
+++ b/tests/reject/tconstraints.nim
@@ -1,6 +1,6 @@
 discard """
-  line: 15
-  errormsg: "type mismatch: got (int)"
+  line: 16
+  errormsg: "type mismatch: got (int literal(232))"
 """
 
 proc myGenericProc[T: object|tuple|ptr|ref|distinct](x: T): string = 
@@ -12,7 +12,7 @@ type
 var
   x: TMyObj
 
-assert myGenericProc(232) == "232"
 assert myGenericProc(x) == "(x: 0, y: 0)"
+assert myGenericProc(232) == "232"
 
 
diff --git a/tests/reject/tinvalidnewseq.nim b/tests/reject/tinvalidnewseq.nim
index a8cc36783..957a25560 100755
--- a/tests/reject/tinvalidnewseq.nim
+++ b/tests/reject/tinvalidnewseq.nim
@@ -1,7 +1,7 @@
 discard """
   file: "tinvalidnewseq.nim"
   line: 15
-  errormsg: "type mismatch: got (array[0..6, string], int)"
+  errormsg: "type mismatch: got (array[0..6, string], int literal(7))"
 """
 import re, strutils
 
diff --git a/tests/reject/tnamedparams.nim b/tests/reject/tnamedparams.nim
index 5fb7699ba..9397fea4a 100755
--- a/tests/reject/tnamedparams.nim
+++ b/tests/reject/tnamedparams.nim
@@ -1,7 +1,7 @@
 discard """
   file: "tnamedparams.nim"
   line: 8
-  errormsg: "type mismatch: got (input: string, filename: string, line: int, col: int)"
+  errormsg: "type mismatch: got (input: string, filename: string, line: int literal(1), col: int literal(23))"
 """
 import pegs
 
diff --git a/tests/reject/tno_int_in_bool_context.nim b/tests/reject/tno_int_in_bool_context.nim
index c539bb556..755a02c0c 100755
--- a/tests/reject/tno_int_in_bool_context.nim
+++ b/tests/reject/tno_int_in_bool_context.nim
@@ -1,6 +1,6 @@
 discard """
   line: 6
-  errormsg: "type mismatch: got (int) but expected 'bool'"
+  errormsg: "type mismatch: got (int literal(1)) but expected 'bool'"
 """
 
 if 1: 
diff --git a/tests/reject/tnolen.nim b/tests/reject/tnolen.nim
index 4e81d7dd6..e33086536 100644
--- a/tests/reject/tnolen.nim
+++ b/tests/reject/tnolen.nim
@@ -1,6 +1,6 @@
 discard """
   line: 8
-  msg: "type mismatch: got (int)"
+  msg: "type mismatch: got (int literal(3))"
 """
 
 # please finally disallow Len(3)
diff --git a/tests/run/tuserassert.nim b/tests/run/tuserassert.nim
index 80748189f..8710ee486 100644
--- a/tests/run/tuserassert.nim
+++ b/tests/run/tuserassert.nim
@@ -1,5 +1,5 @@
 discard """
-  output: "454 == 45ugh"
+  output: "x == 45ugh"
 """
 
 template myAssert(cond: expr) = 
@@ -8,6 +8,6 @@ template myAssert(cond: expr) =
     if not cond:
       echo c, "ugh"
   
-
-myAssert(454 == 45)
+var x = 454
+myAssert(x == 45)