* c-common.c, c-decl.c, c-lex.c, c-objc-common.c, c-opts.c,

	c-parse.in, c-pragma.c, c-typeck.c: Use %q, %< and %> for quoting
	in diagnostics.  Use %' for English apostrophes.
	* c-tree.h (ATTRIBUTE_GCC_CDIAG): Define.
	(pedwarn_c90, pedwarn_c99): Use it.
	* c-decl.c (lookup_label): Quote label name in diagnostic.
	* c-parse.in (yyprint): Use ' instead of ` for left quote.
	* c-typeck.c (warn_for_assignment): Likewise.

testsuite:
	* g++.dg/warn/Wswitch-1.C, g++.dg/warn/Wswitch-2.C,
	gcc.dg/Wswitch-2.c, gcc.dg/Wswitch-enum.c, gcc.dg/Wswitch.c,
	gcc.dg/declspec-9.c, gcc.dg/declspec-10.c, gcc.dg/declspec-11.c,
	gcc.dg/m-un-2.c, gcc.dg/noreturn-1.c, gcc.dg/wtr-conversion-1.c:
	Update expected messages.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@87413 138bc75d-0d04-0410-961f-82ee72b054a4

12 files changed, 59 insertions, 51 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8abd183b614..e26e4c26d73 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-13  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* g++.dg/warn/Wswitch-1.C, g++.dg/warn/Wswitch-2.C,
+	gcc.dg/Wswitch-2.c, gcc.dg/Wswitch-enum.c, gcc.dg/Wswitch.c,
+	gcc.dg/declspec-9.c, gcc.dg/declspec-10.c, gcc.dg/declspec-11.c,
+	gcc.dg/m-un-2.c, gcc.dg/noreturn-1.c, gcc.dg/wtr-conversion-1.c:
+	Update expected messages.
+
 2004-09-13  Hans-Peter Nilsson  <hp@axis.com>
 
 	* gcc.dg/asmreg-1.c (__syscall_getdents64): Adjust signedness
diff --git a/gcc/testsuite/g++.dg/warn/Wswitch-1.C b/gcc/testsuite/g++.dg/warn/Wswitch-1.C
index 4f44e12576e..9b05cd16c5d 100644
--- a/gcc/testsuite/g++.dg/warn/Wswitch-1.C
+++ b/gcc/testsuite/g++.dg/warn/Wswitch-1.C
@@ -19,14 +19,14 @@ foo (int i, int j, enum e ei, enum e ej, enum e ek, enum e el,
     case 4: return 3;
     default: break;
     }
-  switch (ei) /* { dg-warning "enumeration value `e1' not handled in switch" "enum e1" } */
-    { /* { dg-warning "enumeration value `e2' not handled in switch" "enum e2" { target *-*-* } 22 } */
+  switch (ei) /* { dg-warning "enumeration value 'e1' not handled in switch" "enum e1" } */
+    { /* { dg-warning "enumeration value 'e2' not handled in switch" "enum e2" { target *-*-* } 22 } */
     }
   switch (ej)
     {
     default: break;
     }
-  switch (ek) /* { dg-warning "enumeration value `e2' not handled in switch" "enum e2" } */
+  switch (ek) /* { dg-warning "enumeration value 'e2' not handled in switch" "enum e2" } */
     {
     case e1: return 1;
     }
@@ -50,7 +50,7 @@ foo (int i, int j, enum e ei, enum e ej, enum e ek, enum e el,
     {
     case e1: return 1;
     case e2: return 2;
-    case 3: return 3; /* { dg-warning "case value `3' not in enumerated type `e'" "excess 3" } */
+    case 3: return 3; /* { dg-warning "case value '3' not in enumerated type 'e'" "excess 3" } */
     }
   switch (ep)
     {
diff --git a/gcc/testsuite/g++.dg/warn/Wswitch-2.C b/gcc/testsuite/g++.dg/warn/Wswitch-2.C
index 9bc7d022b46..79ba4bdcb84 100644
--- a/gcc/testsuite/g++.dg/warn/Wswitch-2.C
+++ b/gcc/testsuite/g++.dg/warn/Wswitch-2.C
@@ -13,7 +13,7 @@ foo (enum e ei, int j)
     case e3: return 2;
     case e4: return 3;
     }	/* No warning here since e2 has the same value as e3.  */
-  switch (ei) /* { dg-warning "enumeration value `e4' not handled in switch" "enum e4" } */
+  switch (ei) /* { dg-warning "enumeration value 'e4' not handled in switch" "enum e4" } */
     {
     case e1: return 1;
     case e2: return 2;
@@ -22,7 +22,7 @@ foo (enum e ei, int j)
     {
     case e1: return 1;
     }	/* No warning here since switch condition was cast to int.  */
-  switch ((enum e) j) /* { dg-warning "enumeration value `e1' not handled in switch" "enum e1" } */
+  switch ((enum e) j) /* { dg-warning "enumeration value 'e1' not handled in switch" "enum e1" } */
     {
     case e2: return 1;
     case e4: return 2;
diff --git a/gcc/testsuite/gcc.dg/Wswitch-2.c b/gcc/testsuite/gcc.dg/Wswitch-2.c
index 9bc7d022b46..79ba4bdcb84 100644
--- a/gcc/testsuite/gcc.dg/Wswitch-2.c
+++ b/gcc/testsuite/gcc.dg/Wswitch-2.c
@@ -13,7 +13,7 @@ foo (enum e ei, int j)
     case e3: return 2;
     case e4: return 3;
     }	/* No warning here since e2 has the same value as e3.  */
-  switch (ei) /* { dg-warning "enumeration value `e4' not handled in switch" "enum e4" } */
+  switch (ei) /* { dg-warning "enumeration value 'e4' not handled in switch" "enum e4" } */
     {
     case e1: return 1;
     case e2: return 2;
@@ -22,7 +22,7 @@ foo (enum e ei, int j)
     {
     case e1: return 1;
     }	/* No warning here since switch condition was cast to int.  */
-  switch ((enum e) j) /* { dg-warning "enumeration value `e1' not handled in switch" "enum e1" } */
+  switch ((enum e) j) /* { dg-warning "enumeration value 'e1' not handled in switch" "enum e1" } */
     {
     case e2: return 1;
     case e4: return 2;
diff --git a/gcc/testsuite/gcc.dg/Wswitch-enum.c b/gcc/testsuite/gcc.dg/Wswitch-enum.c
index 24fc26261e6..28c60d879ae 100644
--- a/gcc/testsuite/gcc.dg/Wswitch-enum.c
+++ b/gcc/testsuite/gcc.dg/Wswitch-enum.c
@@ -19,18 +19,18 @@ foo (int i, int j, enum e ei, enum e ej, enum e ek, enum e el,
     case 4: return 3;
     default: break;
     }
-  switch (ei) /* { dg-warning "enumeration value `e1' not handled in switch" "enum e1" } */
-    { /* { dg-warning "enumeration value `e2' not handled in switch" "enum e2" { target *-*-* } 22 } */
+  switch (ei) /* { dg-warning "enumeration value 'e1' not handled in switch" "enum e1" } */
+    { /* { dg-warning "enumeration value 'e2' not handled in switch" "enum e2" { target *-*-* } 22 } */
     }
-  switch (ej) /* { dg-warning "enumeration value `e1' not handled in switch" "enum e1" } */
-    { /* { dg-warning "enumeration value `e2' not handled in switch" "enum e2" { target *-*-* } 25 } */
+  switch (ej) /* { dg-warning "enumeration value 'e1' not handled in switch" "enum e1" } */
+    { /* { dg-warning "enumeration value 'e2' not handled in switch" "enum e2" { target *-*-* } 25 } */
     default: break;
     }
-  switch (ek) /* { dg-warning "enumeration value `e2' not handled in switch" "enum e2" } */
+  switch (ek) /* { dg-warning "enumeration value 'e2' not handled in switch" "enum e2" } */
     {
     case e1: return 1;
     }
-  switch (el) /* { dg-warning "enumeration value `e2' not handled in switch" "enum e2" } */
+  switch (el) /* { dg-warning "enumeration value 'e2' not handled in switch" "enum e2" } */
     {
     case e1: return 1;
     default: break;
@@ -50,13 +50,13 @@ foo (int i, int j, enum e ei, enum e ej, enum e ek, enum e el,
     {
     case e1: return 1;
     case e2: return 2;
-    case 3: return 3; /* { dg-warning "case value `3' not in enumerated type `enum e'" "excess 3" } */
+    case 3: return 3; /* { dg-warning "case value '3' not in enumerated type 'enum e'" "excess 3" } */
     }
   switch (ep)
     {
     case e1: return 1;
     case e2: return 2;
-    case 3: return 3; /* { dg-warning "case value `3' not in enumerated type `enum e'" "excess 3" } */
+    case 3: return 3; /* { dg-warning "case value '3' not in enumerated type 'enum e'" "excess 3" } */
     default: break;
     }
   return 0;
diff --git a/gcc/testsuite/gcc.dg/Wswitch.c b/gcc/testsuite/gcc.dg/Wswitch.c
index 9ba12d6d3c0..686fd41614c 100644
--- a/gcc/testsuite/gcc.dg/Wswitch.c
+++ b/gcc/testsuite/gcc.dg/Wswitch.c
@@ -19,14 +19,14 @@ foo (int i, int j, enum e ei, enum e ej, enum e ek, enum e el,
     case 4: return 3;
     default: break;
     }
-  switch (ei) /* { dg-warning "enumeration value `e1' not handled in switch" "enum e1" } */
-    { /*{ dg-warning "enumeration value `e2' not handled in switch" "enum e2" { target *-*-* } 22 } */
+  switch (ei) /* { dg-warning "enumeration value 'e1' not handled in switch" "enum e1" } */
+    { /*{ dg-warning "enumeration value 'e2' not handled in switch" "enum e2" { target *-*-* } 22 } */
     }
   switch (ej)
     {
     default: break;
     }
-  switch (ek) /* { dg-warning "enumeration value `e2' not handled in switch" "enum e2" } */
+  switch (ek) /* { dg-warning "enumeration value 'e2' not handled in switch" "enum e2" } */
     {
     case e1: return 1;
     }
@@ -50,7 +50,7 @@ foo (int i, int j, enum e ei, enum e ej, enum e ek, enum e el,
     {
     case e1: return 1;
     case e2: return 2;
-    case 3: return 3; /* { dg-warning "case value `3' not in enumerated type `enum e'" "excess 3" } */
+    case 3: return 3; /* { dg-warning "case value '3' not in enumerated type 'enum e'" "excess 3" } */
     }
   switch (ep)
     {
diff --git a/gcc/testsuite/gcc.dg/declspec-10.c b/gcc/testsuite/gcc.dg/declspec-10.c
index 454cb1d5480..5a76764abfb 100644
--- a/gcc/testsuite/gcc.dg/declspec-10.c
+++ b/gcc/testsuite/gcc.dg/declspec-10.c
@@ -15,31 +15,31 @@ void f5 (register int);
 void f6 (static int); /* { dg-error "error: storage class specified for parameter 'type name'" } */
 void f7 (typedef int); /* { dg-error "error: storage class specified for parameter 'type name'" } */
 
-auto int x; /* { dg-error "error: file-scope declaration of `x' specifies `auto'" } */
+auto int x; /* { dg-error "error: file-scope declaration of 'x' specifies 'auto'" } */
 register int y; /* { dg-warning "warning: file-scope declaration of 'y' specifies 'register'" } */
 
-void h (void) { extern void x (void) {} } /* { dg-error "error: nested function `x' declared `extern'" } */
+void h (void) { extern void x (void) {} } /* { dg-error "error: nested function 'x' declared 'extern'" } */
 /* { dg-warning "warning: ISO C forbids nested functions" "nested" { target *-*-* } 21 } */
 
 void
 g (void)
 {
-  void a; /* { dg-error "error: variable or field `a' declared void" } */
-  const void b; /* { dg-error "error: variable or field `b' declared void" } */
-  static void c; /* { dg-error "error: variable or field `c' declared void" } */
+  void a; /* { dg-error "error: variable or field 'a' declared void" } */
+  const void b; /* { dg-error "error: variable or field 'b' declared void" } */
+  static void c; /* { dg-error "error: variable or field 'c' declared void" } */
 }
 
 void p;
 const void p1;
 extern void q;
 extern const void q1;
-static void r; /* { dg-error "error: variable or field `r' declared void" } */
-static const void r1; /* { dg-error "error: variable or field `r1' declared void" } */
+static void r; /* { dg-error "error: variable or field 'r' declared void" } */
+static const void r1; /* { dg-error "error: variable or field 'r1' declared void" } */
 
-register void f8 (void); /* { dg-error "error: invalid storage class for function `f8'" } */
+register void f8 (void); /* { dg-error "error: invalid storage class for function 'f8'" } */
 /* { dg-warning "warning: file-scope declaration of 'f8' specifies 'register'" "register function" { target *-*-* } 39 } */
 
 void i (void) { auto void y (void) {} } /* { dg-warning "warning: ISO C forbids nested functions" } */
 /* { dg-warning "warning: function definition declared 'auto'" "nested" { target *-*-* } 42 } */
 
-inline int main (void) { return 0; } /* { dg-warning "warning: cannot inline function `main'" } */
+inline int main (void) { return 0; } /* { dg-warning "warning: cannot inline function 'main'" } */
diff --git a/gcc/testsuite/gcc.dg/declspec-11.c b/gcc/testsuite/gcc.dg/declspec-11.c
index c418de135d6..2f4eaff3b25 100644
--- a/gcc/testsuite/gcc.dg/declspec-11.c
+++ b/gcc/testsuite/gcc.dg/declspec-11.c
@@ -15,31 +15,31 @@ void f5 (register int);
 void f6 (static int); /* { dg-error "error: storage class specified for parameter 'type name'" } */
 void f7 (typedef int); /* { dg-error "error: storage class specified for parameter 'type name'" } */
 
-auto int x; /* { dg-error "error: file-scope declaration of `x' specifies `auto'" } */
+auto int x; /* { dg-error "error: file-scope declaration of 'x' specifies 'auto'" } */
 register int y; /* { dg-error "error: file-scope declaration of 'y' specifies 'register'" } */
 
-void h (void) { extern void x (void) {} } /* { dg-error "error: nested function `x' declared `extern'" } */
+void h (void) { extern void x (void) {} } /* { dg-error "error: nested function 'x' declared 'extern'" } */
 /* { dg-error "error: ISO C forbids nested functions" "nested" { target *-*-* } 21 } */
 
 void
 g (void)
 {
-  void a; /* { dg-error "error: variable or field `a' declared void" } */
-  const void b; /* { dg-error "error: variable or field `b' declared void" } */
-  static void c; /* { dg-error "error: variable or field `c' declared void" } */
+  void a; /* { dg-error "error: variable or field 'a' declared void" } */
+  const void b; /* { dg-error "error: variable or field 'b' declared void" } */
+  static void c; /* { dg-error "error: variable or field 'c' declared void" } */
 }
 
 void p;
 const void p1;
 extern void q;
 extern const void q1;
-static void r; /* { dg-error "error: variable or field `r' declared void" } */
-static const void r1; /* { dg-error "error: variable or field `r1' declared void" } */
+static void r; /* { dg-error "error: variable or field 'r' declared void" } */
+static const void r1; /* { dg-error "error: variable or field 'r1' declared void" } */
 
-register void f8 (void); /* { dg-error "error: invalid storage class for function `f8'" } */
+register void f8 (void); /* { dg-error "error: invalid storage class for function 'f8'" } */
 /* { dg-error "error: file-scope declaration of 'f8' specifies 'register'" "register function" { target *-*-* } 39 } */
 
 void i (void) { auto void y (void) {} } /* { dg-error "error: ISO C forbids nested functions" } */
 /* { dg-error "error: function definition declared 'auto'" "nested" { target *-*-* } 42 } */
 
-inline int main (void) { return 0; } /* { dg-warning "warning: cannot inline function `main'" } */
+inline int main (void) { return 0; } /* { dg-warning "warning: cannot inline function 'main'" } */
diff --git a/gcc/testsuite/gcc.dg/declspec-9.c b/gcc/testsuite/gcc.dg/declspec-9.c
index 855393c943d..e5dd5b2b6c5 100644
--- a/gcc/testsuite/gcc.dg/declspec-9.c
+++ b/gcc/testsuite/gcc.dg/declspec-9.c
@@ -16,28 +16,28 @@ void f5 (register int);
 void f6 (static int); /* { dg-error "error: storage class specified for parameter 'type name'" } */
 void f7 (typedef int); /* { dg-error "error: storage class specified for parameter 'type name'" } */
 
-auto int x; /* { dg-error "error: file-scope declaration of `x' specifies `auto'" } */
+auto int x; /* { dg-error "error: file-scope declaration of 'x' specifies 'auto'" } */
 register int y;
 
-void h (void) { extern void x (void) {} } /* { dg-error "error: nested function `x' declared `extern'" } */
+void h (void) { extern void x (void) {} } /* { dg-error "error: nested function 'x' declared 'extern'" } */
 
 void
 g (void)
 {
-  void a; /* { dg-error "error: variable or field `a' declared void" } */
-  const void b; /* { dg-error "error: variable or field `b' declared void" } */
-  static void c; /* { dg-error "error: variable or field `c' declared void" } */
+  void a; /* { dg-error "error: variable or field 'a' declared void" } */
+  const void b; /* { dg-error "error: variable or field 'b' declared void" } */
+  static void c; /* { dg-error "error: variable or field 'c' declared void" } */
 }
 
 void p;
 const void p1;
 extern void q;
 extern const void q1;
-static void r; /* { dg-error "error: variable or field `r' declared void" } */
-static const void r1; /* { dg-error "error: variable or field `r1' declared void" } */
+static void r; /* { dg-error "error: variable or field 'r' declared void" } */
+static const void r1; /* { dg-error "error: variable or field 'r1' declared void" } */
 
-register void f8 (void); /* { dg-error "error: invalid storage class for function `f8'" } */
+register void f8 (void); /* { dg-error "error: invalid storage class for function 'f8'" } */
 
 void i (void) { auto void y (void) {} }
 
-inline int main (void) { return 0; } /* { dg-warning "warning: cannot inline function `main'" } */
+inline int main (void) { return 0; } /* { dg-warning "warning: cannot inline function 'main'" } */
diff --git a/gcc/testsuite/gcc.dg/m-un-2.c b/gcc/testsuite/gcc.dg/m-un-2.c
index bb617369163..d957f868405 100644
--- a/gcc/testsuite/gcc.dg/m-un-2.c
+++ b/gcc/testsuite/gcc.dg/m-un-2.c
@@ -16,7 +16,7 @@ struct vtable mtable = {
   malloc,
   free
 }; /* { dg-warning "missing initializer" "warning regression" { target *-*-* } {18} } */
-   /* { dg-warning "initialization for `mtable._realloc'" "warning regression" { target *-*-* } {18} } */
+   /* { dg-warning "initialization for 'mtable._realloc'" "warning regression" { target *-*-* } {18} } */
 
 /* With designated initializers, we assume you meant to leave out the
    initialization of any blank fields.  */
diff --git a/gcc/testsuite/gcc.dg/noreturn-1.c b/gcc/testsuite/gcc.dg/noreturn-1.c
index 21ad2fa8e53..952e906ce9a 100644
--- a/gcc/testsuite/gcc.dg/noreturn-1.c
+++ b/gcc/testsuite/gcc.dg/noreturn-1.c
@@ -34,7 +34,7 @@ extern void foo5(void) __attribute__ ((__noreturn__));
 void
 foo5(void)
 {
-  return; /* { dg-warning "`noreturn' has a `return' statement" "detect invalid return" } */
+  return; /* { dg-warning "'noreturn' has a 'return' statement" "detect invalid return" } */
 } /* { dg-warning "function does return" "detect return from noreturn" } */
 
 extern void foo6(void);
diff --git a/gcc/testsuite/gcc.dg/wtr-conversion-1.c b/gcc/testsuite/gcc.dg/wtr-conversion-1.c
index 18d26165f2a..15086f245fe 100644
--- a/gcc/testsuite/gcc.dg/wtr-conversion-1.c
+++ b/gcc/testsuite/gcc.dg/wtr-conversion-1.c
@@ -23,8 +23,8 @@ testfunc1 ()
   foo_i (cd); /* { dg-warning "as integer rather than complex" "prototype conversion warning" } */
 
   foo_f (i); /* { dg-warning "as floating rather than integer" "prototype conversion warning" } */
-  foo_f (f); /* { dg-warning "as `float' rather than `double'" "prototype conversion warning" } */
-  foo_f (ld); /* { dg-warning "as `float' rather than `double'" "prototype conversion warning" } */
+  foo_f (f); /* { dg-warning "as 'float' rather than 'double'" "prototype conversion warning" } */
+  foo_f (ld); /* { dg-warning "as 'float' rather than 'double'" "prototype conversion warning" } */
   foo_f (cd); /* { dg-warning "as floating rather than complex" "prototype conversion warning" } */
 
   foo_ld (i); /* { dg-warning "as floating rather than integer" "prototype conversion warning" } */