some tests cleaned up; some bugfixes

tests/reject/tambsym2.nim

@@ -1,13 +0,0 @@
-discard """
-  file: "tambsym2.nim"
-  line: 9
-  errormsg: "undeclared identifier: \'CreateRGBSurface\'"
-"""
-
-from sdl import PSurface
-
-discard SDL.CreateRGBSurface(SDL.SWSURFACE, 23, 34, 
-      32, 0x00FF0000, 0x0000FF00, 0x000000FF, 0xff000000'i32)
-
-
-

tests/reject/tbind4.nim

@@ -1,12 +1,12 @@
 discard """
-  file: "tbind4.nim"
-  line: 9
+  file: "mbind4.nim"
+  line: 6
   errormsg: "undeclared identifier: \'lastId\'"
 """
 # Module B
 import mbind4
 
-echo genId() #ERROR_MSG instantiation from here
+echo genId()
 
 
 

tests/reject/tnamedparams.nim

@@ -1,7 +1,7 @@
 discard """
   file: "tnamedparams.nim"
   line: 8
-  errormsg: "Error: type mismatch: got (input: string, filename: string, line: int, col: int)"
+  errormsg: "type mismatch: got (input: string, filename: string, line: int, col: int)"
 """
 import pegs
 

tests/reject/tno_int_in_bool_context.nim

@@ -1,6 +1,6 @@
 discard """
   line: 6
-  errormsg: "Error: type mismatch: got (int) but expected 'bool'"
+  errormsg: "type mismatch: got (int) but expected 'bool'"
 """
 
 if 1: 

tests/reject/tnot.nim

@@ -1,6 +1,6 @@
 discard """
-  file: "tnot.nim"
-  line: 14
+  file: "system.nim"
+  line: 599
   errormsg: "type mismatch"
 """
 # BUG: following compiles, but should not:

tests/reject/toverl.nim

@@ -1,13 +1,13 @@
 discard """
   file: "toverl.nim"
   line: 11
-  errormsg: "attempt to redefine \'TNone\'"
+  errormsg: "redefinition of \'TNone\'"
 """
-# Test for overloading
-
-type
-  TNone {.exportc: "_NONE", final.} = object
-
-proc TNone(a, b: int) = nil #ERROR_MSG attempt to redefine 'TNone'
+# Test for overloading
+
+type
+  TNone {.exportc: "_NONE", final.} = object
+
+proc TNone(a, b: int) = nil #ERROR_MSG attempt to redefine 'TNone'
 
 

tests/reject/trecinca.nim

@@ -1,6 +1,6 @@
 discard """
-  file: "trecinca.nim"
-  line: 8
+  file: "trecincb.nim"
+  line: 9
   errormsg: "recursive dependency: \'tests/reject/trecincb.nim\'"
 """
 # Test recursive includes

tests/reject/trectype.nim

@@ -3,21 +3,21 @@ discard """
   line: 25
   errormsg: "internal error: cannot generate C type for: PA"
 """
-# Test recursive type descriptions
-# (mainly for the C code generator)
-
-type
-  PA = ref TA
-  TA = array [0..2, PA]
-
-  PRec = ref TRec
-  TRec {.final.} = object
-    a, b: TA
-
-  P1 = ref T1
-  PB = ref TB
-  TB = array [0..3, P1]
-  T1 = array [0..6, PB]
+# Test recursive type descriptions
+# (mainly for the C code generator)
+
+type
+  PA = ref TA
+  TA = array [0..2, PA]
+
+  PRec = ref TRec
+  TRec {.final.} = object
+    a, b: TA
+
+  P1 = ref T1
+  PB = ref TB
+  TB = array [0..3, P1]
+  T1 = array [0..6, PB]
 
 var
   x: PA

tests/reject/ttypelessemptyset.nim

@@ -1,7 +1,7 @@
 discard """
   file: "ttypelessemptyset.nim"
   line: 5
-  errormsg: "Error: internal error: invalid kind for last(tyEmpty)"
+  errormsg: "internal error: invalid kind for last(tyEmpty)"
 """
 var q = false
 discard (if q: {} else: {})

tests/reject/ttypenoval.nim

@@ -1,6 +1,6 @@
 discard """
   file: "ttypenoval.nim"
-  line: 36
+  line: 38
   errormsg: "a type has no value"
 """