more 6g reorg; checkpoint.

typecheck.c is now responsible for all type checking
except for assignment and function argument "..."

R=ken
OCL=32661
CL=32667

1 files changed, 5 insertions, 5 deletions

diff --git a/test/convlit.go b/test/convlit.go
index be12e63835..e65dad3df6 100644
--- a/test/convlit.go
+++ b/test/convlit.go
@@ -19,11 +19,11 @@ var x7 = float(1e1000);	// ERROR "overflow"
 
 // implicit conversions merit scrutiny
 var s string;
-var bad1 string = 1;	// ERROR "conver|incompatible"
-var bad2 = s + 1;		// ERROR "conver|incompatible"
-var bad3 = s + 'a';	// ERROR "conver|incompatible"
-var bad4 = "a" + 1;	// ERROR "literals|incompatible|convert"
-var bad5 = "a" + 'a';	// ERROR "literals|incompatible|convert"
+var bad1 string = 1;	// ERROR "conver|incompatible|invalid|cannot"
+var bad2 = s + 1;		// ERROR "conver|incompatible|invalid"
+var bad3 = s + 'a';	// ERROR "conver|incompatible|invalid"
+var bad4 = "a" + 1;	// ERROR "literals|incompatible|convert|invalid"
+var bad5 = "a" + 'a';	// ERROR "literals|incompatible|convert|invalid"
 
 var bad6 int = 1.5;	// ERROR "convert|truncate"
 var bad7 int = 1e100;	// ERROR "overflow"