From: Ian Lance Taylor <iant@golang.org>
Date: Wed, 22 Oct 2008 23:09:24 +0000 (-0700)
Subject: Match gccgo error messages.
X-Git-Tag: weekly.2009-11-06~2916
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=7dbee69b58d8f3e954a6482d09fa80147119e8ea;p=gostls13.git

Match gccgo error messages.

convlit.go:17: error: incompatible type in initialization
convlit.go:18: error: incompatible types in binary expression
convlit.go:19: error: incompatible types in binary expression
convlit.go:20: error: incompatible types in binary expression
convlit.go:21: error: incompatible types in binary expression
convlit.go:23: error: cannot convert non-integer constant
convlit.go:24: error: integer type overflow
convlit.go:25: error: floating point overflow

R=rsc
DELTA=5  (0 added, 0 deleted, 5 changed)
OCL=17649
CL=17661
---

diff --git a/test/convlit.go b/test/convlit.go
index b6f3134c6b..2f1b202258 100644
--- a/test/convlit.go
+++ b/test/convlit.go
@@ -17,11 +17,11 @@ var x7 = float(1e1000);
 
 // implicit conversions merit scrutiny
 var s string;
-var bad1 string = 1;	// ERROR "conver"
-var bad2 = s + 1;		// ERROR "conver"
-var bad3 = s + 'a';	// ERROR "conver"
-var bad4 = "a" + 1;	// ERROR "literals"
-var bad5 = "a" + 'a';	// ERROR "literals"
+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"
+var bad5 = "a" + 'a';	// ERROR "literals|incompatible"
 
 var bad6 int = 1.5;	// ERROR "convert"
 var bad7 int = 1e100;	// ERROR "overflow"