clean up a few error messages;

disable func redeclaration mismatch test;
fix golden.out

R=ken
OCL=32883
CL=32883

diff --git a/src/cmd/gc/dcl.c b/src/cmd/gc/dcl.c
index d5864212b0d3aed2888784b09cb0e42a9aa6d232..1768f2e121ffc38d87d51a29dfc38d2b55a92b9e 100644 (file)
--- a/src/cmd/gc/dcl.c
+++ b/src/cmd/gc/dcl.c
@@ -837,7 +837,7 @@ typedcl2(Type *pt, Type *t)
        if(pt->etype == TINTER && t->etype == TFORWINTER)
                return;
        if(!cvttype(pt, t)) {
-               yyerror("redeclaration of %T during imports\n\t%lT [%p]\n\t%lT [%p]", pt, pt, pt, t, t);
+               yyerror("redeclaration of %T during imports", pt);
                return;
        }
        return;

diff --git a/src/cmd/gc/typecheck.c b/src/cmd/gc/typecheck.c
index 05efbba84c8b8851d7d608fdd2f77e1467636cab..ff8b2056c0c58f76fe69bf156c093102d4f58ffe 100644 (file)
--- a/src/cmd/gc/typecheck.c
+++ b/src/cmd/gc/typecheck.c
@@ -400,7 +400,7 @@ reswitch:
                        checkwidth(t);
                }
                if(!lookdot(n, t)) {
-                       yyerror("%#N undefined (type %p %T has no field %S)", n, t, t, n->right->sym);
+                       yyerror("%#N undefined (type %T has no field %S)", n, t, n->right->sym);
                        goto error;
                }
                switch(n->op) {

diff --git a/test/golden.out b/test/golden.out
index d1403736b9e87702d0adfdd10cfc33fdc66f67d6..d4c05db18c5cd179a24ac13cad15ad1402ef80ec 100644 (file)
--- a/test/golden.out
+++ b/test/golden.out
@@ -121,7 +121,7 @@ do break
 broke
 
 =========== fixedbugs/bug081.go
-fixedbugs/bug081.go:5: fatal error: loop
+fixedbugs/bug081.go:5: fatal error: typecheck loop
 
 =========== fixedbugs/bug093.go
 M