This is the mail archive of the
fortran@gcc.gnu.org
mailing list for the GNU Fortran project.
Patch to remove more ` in diagnostics
- From: "Joseph S. Myers" <joseph at codesourcery dot com>
- To: gcc-patches at gcc dot gnu dot org, fortran at gcc dot gnu dot org, java-patches at gcc dot gnu dot org
- Date: Wed, 24 Nov 2004 22:47:47 +0000 (UTC)
- Subject: Patch to remove more ` in diagnostics
This patch fixes the remaining places where ` is used as a left quote
in diagnostics that appear in gcc.pot, mostly cases that don't pass
through the pretty-printing infrastructure (so changed to ').
Bootstrapped with no regressions on i686-pc-linux-gnu. OK to commit?
--
Joseph S. Myers http://www.srcf.ucam.org/~jsm28/gcc/
jsm@polyomino.org.uk (personal mail)
joseph@codesourcery.com (CodeSourcery mail)
jsm28@gcc.gnu.org (Bugzilla assignments and CCs)
2004-11-24 Joseph S. Myers <joseph@codesourcery.com>
* config/rs6000/darwin.h (SUBTARGET_OVERRIDE_OPTIONS): Use %qs
instead of `%s' in diagnostic.
cp:
2004-11-24 Joseph S. Myers <joseph@codesourcery.com>
* g++spec.c, lex.c: Avoid ` as left quote in diagnostics.
fortran:
2004-11-24 Joseph S. Myers <joseph@codesourcery.com>
* f95-lang.c, gfortranspec.c, trans-decl.c: Avoid ` as left quote
in diagnostics.
java:
2004-11-24 Joseph S. Myers <joseph@codesourcery.com>
* gjavah.c, jcf-dump.c, jv-scan.c, jvspec.c: Avoid ` as left quote
in diagnostics.
diff -rupN GCC.orig/gcc/config/rs6000/darwin.h GCC/gcc/config/rs6000/darwin.h
--- GCC.orig/gcc/config/rs6000/darwin.h 2004-11-13 11:33:42.000000000 +0000
+++ GCC/gcc/config/rs6000/darwin.h 2004-11-24 16:45:28.000000000 +0000
@@ -103,7 +103,7 @@ do { \
while (base[-1] != 'm') base--; \
\
if (*darwin_fix_and_continue_switch != '\0') \
- error ("invalid option `%s'", base); \
+ error ("invalid option %qs", base); \
darwin_fix_and_continue = (base[0] != 'n'); \
} \
} \
diff -rupN GCC.orig/gcc/cp/g++spec.c GCC/gcc/cp/g++spec.c
--- GCC.orig/gcc/cp/g++spec.c 2004-10-15 21:10:13.000000000 +0000
+++ GCC/gcc/cp/g++spec.c 2004-11-24 16:46:15.000000000 +0000
@@ -235,7 +235,7 @@ lang_specific_driver (int *in_argc, cons
}
if (quote)
- fatal ("argument to `%s' missing\n", quote);
+ fatal ("argument to '%s' missing\n", quote);
/* If we know we don't have to do anything, bail now. */
if (! added && library <= 0)
diff -rupN GCC.orig/gcc/cp/lex.c GCC/gcc/cp/lex.c
--- GCC.orig/gcc/cp/lex.c 2004-11-24 14:28:49.000000000 +0000
+++ GCC/gcc/cp/lex.c 2004-11-24 16:45:58.000000000 +0000
@@ -616,8 +616,8 @@ unqualified_fn_lookup_error (tree name)
static bool hint;
if (!hint)
{
- error ("(if you use `-fpermissive', G++ will accept your code, "
- "but allowing the use of an undeclared name is "
+ error ("(if you use %<-fpermissive%>, G++ will accept your "
+ "code, but allowing the use of an undeclared name is "
"deprecated)");
hint = true;
}
diff -rupN GCC.orig/gcc/fortran/f95-lang.c GCC/gcc/fortran/f95-lang.c
--- GCC.orig/gcc/fortran/f95-lang.c 2004-11-09 09:53:37.000000000 +0000
+++ GCC/gcc/fortran/f95-lang.c 2004-11-24 16:46:57.000000000 +0000
@@ -620,18 +620,18 @@ gfc_mark_addressable (tree exp)
if (TREE_PUBLIC (x))
{
error
- ("global register variable `%s' used in nested function",
+ ("global register variable %qs used in nested function",
IDENTIFIER_POINTER (DECL_NAME (x)));
return false;
}
- pedwarn ("register variable `%s' used in nested function",
+ pedwarn ("register variable %qs used in nested function",
IDENTIFIER_POINTER (DECL_NAME (x)));
}
else if (DECL_REGISTER (x) && !TREE_ADDRESSABLE (x))
{
if (TREE_PUBLIC (x))
{
- error ("address of global register variable `%s' requested",
+ error ("address of global register variable %qs requested",
IDENTIFIER_POINTER (DECL_NAME (x)));
return true;
}
@@ -649,7 +649,7 @@ gfc_mark_addressable (tree exp)
}
#endif
- pedwarn ("address of register variable `%s' requested",
+ pedwarn ("address of register variable %qs requested",
IDENTIFIER_POINTER (DECL_NAME (x)));
}
diff -rupN GCC.orig/gcc/fortran/gfortranspec.c GCC/gcc/fortran/gfortranspec.c
--- GCC.orig/gcc/fortran/gfortranspec.c 2004-11-09 09:53:37.000000000 +0000
+++ GCC/gcc/fortran/gfortranspec.c 2004-11-24 16:47:29.000000000 +0000
@@ -228,7 +228,7 @@ append_arg (const char *arg)
}
if (g77_newargc == newargsize)
- fatal ("overflowed output arg list for `%s'", arg);
+ fatal ("overflowed output arg list for '%s'", arg);
g77_newargv[g77_newargc++] = arg;
}
@@ -372,7 +372,7 @@ For more information about these matters
if (i + skip < argc)
i += skip;
else
- fatal ("argument to `%s' missing", argv[i]);
+ fatal ("argument to '%s' missing", argv[i]);
}
if ((n_outfiles != 0) && (n_infiles == 0))
diff -rupN GCC.orig/gcc/fortran/trans-decl.c GCC/gcc/fortran/trans-decl.c
--- GCC.orig/gcc/fortran/trans-decl.c 2004-11-06 01:21:04.000000000 +0000
+++ GCC/gcc/fortran/trans-decl.c 2004-11-24 16:47:13.000000000 +0000
@@ -2091,12 +2091,12 @@ generate_local_decl (gfc_symbol * sym)
if (sym->attr.referenced)
gfc_get_symbol_decl (sym);
else if (sym->attr.dummy && warn_unused_parameter)
- warning ("unused parameter `%s'", sym->name);
+ warning ("unused parameter %qs", sym->name);
/* Warn for unused variables, but not if they're inside a common
block or are use-associated. */
else if (warn_unused_variable
&& !(sym->attr.in_common || sym->attr.use_assoc))
- warning ("unused variable `%s'", sym->name);
+ warning ("unused variable %qs", sym->name);
}
}
diff -rupN GCC.orig/gcc/java/gjavah.c GCC/gcc/java/gjavah.c
--- GCC.orig/gcc/java/gjavah.c 2004-11-23 16:10:10.000000000 +0000
+++ GCC/gcc/java/gjavah.c 2004-11-24 17:03:56.000000000 +0000
@@ -885,7 +885,7 @@ print_method_info (FILE *stream, JCF* jc
{
/* FIXME: i18n bug here. Order of prints should not be
fixed. */
- fprintf (stderr, _("ignored method `"));
+ fprintf (stderr, _("ignored method '"));
jcf_print_utf8 (stderr, str, length);
fprintf (stderr, _("' marked virtual\n"));
found_error = 1;
@@ -1468,7 +1468,7 @@ print_c_decl (FILE* stream, JCF* jcf, in
next = decode_signature_piece (stream, str, limit, &need_space);
if (! next)
{
- error ("unparseable signature: `%s'", str0);
+ error ("unparseable signature: '%s'", str0);
return;
}
}
@@ -1570,7 +1570,7 @@ print_full_cxx_name (FILE* stream, JCF*
next = decode_signature_piece (stream, str, limit, &need_space);
if (! next)
{
- error ("unparseable signature: `%s'", str0);
+ error ("unparseable signature: '%s'", str0);
return;
}
@@ -1645,7 +1645,7 @@ print_stub_or_jni (FILE* stream, JCF* jc
next = decode_signature_piece (stream, str, limit, &need_space);
if (! next)
{
- error ("unparseable signature: `%s'", str0);
+ error ("unparseable signature: '%s'", str0);
return;
}
}
@@ -2316,7 +2316,7 @@ static const struct option options[] =
static void
usage (void)
{
- fprintf (stderr, _("Try `gcjh --help' for more information.\n"));
+ fprintf (stderr, _("Try 'gcjh --help' for more information.\n"));
exit (1);
}
@@ -2330,7 +2330,7 @@ help (void)
printf ("\n");
printf (_(" -add TEXT Insert TEXT into class body\n"));
printf (_(" -append TEXT Insert TEXT after class declaration\n"));
- printf (_(" -friend TEXT Insert TEXT as `friend' declaration\n"));
+ printf (_(" -friend TEXT Insert TEXT as 'friend' declaration\n"));
printf (_(" -prepend TEXT Insert TEXT before start of class\n"));
printf ("\n");
printf (_(" --classpath PATH Set path to find .class files\n"));
@@ -2474,7 +2474,7 @@ main (int argc, char** argv)
break;
case OPT_MG:
- error ("`-MG' option is unimplemented");
+ error ("'-MG' option is unimplemented");
exit (1);
case OPT_MD:
diff -rupN GCC.orig/gcc/java/jcf-dump.c GCC/gcc/java/jcf-dump.c
--- GCC.orig/gcc/java/jcf-dump.c 2004-10-19 19:41:03.000000000 +0000
+++ GCC/gcc/java/jcf-dump.c 2004-11-24 16:49:13.000000000 +0000
@@ -882,7 +882,7 @@ static const struct option options[] =
static void
usage (void)
{
- fprintf (stderr, _("Try `jcf-dump --help' for more information.\n"));
+ fprintf (stderr, _("Try 'jcf-dump --help' for more information.\n"));
exit (1);
}
@@ -892,7 +892,7 @@ help (void)
printf (_("Usage: jcf-dump [OPTION]... CLASS...\n\n"));
printf (_("Display contents of a class file in readable form.\n\n"));
printf (_(" -c Disassemble method bodies\n"));
- printf (_(" --javap Generate output in `javap' format\n"));
+ printf (_(" --javap Generate output in 'javap' format\n"));
printf ("\n");
printf (_(" --classpath PATH Set path to find .class files\n"));
printf (_(" -IDIR Append directory to class path\n"));
diff -rupN GCC.orig/gcc/java/jv-scan.c GCC/gcc/java/jv-scan.c
--- GCC.orig/gcc/java/jv-scan.c 2004-10-01 10:50:01.000000000 +0000
+++ GCC/gcc/java/jv-scan.c 2004-11-24 16:49:25.000000000 +0000
@@ -96,7 +96,7 @@ static const struct option options[] =
static void
usage (void)
{
- fprintf (stderr, _("Try `jv-scan --help' for more information.\n"));
+ fprintf (stderr, _("Try 'jv-scan --help' for more information.\n"));
exit (1);
}
@@ -108,7 +108,7 @@ help (void)
printf (_(" --no-assert Don't recognize the assert keyword\n"));
printf (_(" --complexity Print cyclomatic complexity of input file\n"));
printf (_(" --encoding NAME Specify encoding of input file\n"));
- printf (_(" --print-main Print name of class containing `main'\n"));
+ printf (_(" --print-main Print name of class containing 'main'\n"));
printf (_(" --list-class List all classes defined in file\n"));
printf (_(" --list-filename Print input filename when listing class names\n"));
printf (_(" -o FILE Set output file name\n"));
@@ -210,10 +210,10 @@ main (int argc, char **argv)
/* Check on bad usage */
if (flag_find_main + flag_dump_class + flag_complexity > 1)
fatal_error
- ("only one of `--print-main', `--list-class', and `--complexity' allowed");
+ ("only one of '--print-main', '--list-class', and '--complexity' allowed");
if (output_file && !(out = fopen (output_file, "w")))
- fatal_error ("can't open output file `%s'", output_file);
+ fatal_error ("can't open output file '%s'", output_file);
ft = ftell (out);
@@ -248,7 +248,7 @@ main (int argc, char **argv)
reset_report ();
}
else
- fatal_error ("file not found `%s'", argv [i]);
+ fatal_error ("file not found '%s'", argv [i]);
}
/* Flush and close */
diff -rupN GCC.orig/gcc/java/jvspec.c GCC/gcc/java/jvspec.c
--- GCC.orig/gcc/java/jvspec.c 2004-10-14 00:29:09.000000000 +0000
+++ GCC/gcc/java/jvspec.c 2004-11-24 16:47:57.000000000 +0000
@@ -414,13 +414,13 @@ lang_specific_driver (int *in_argc, cons
}
if (quote)
- fatal ("argument to `%s' missing\n", quote);
+ fatal ("argument to '%s' missing\n", quote);
if (saw_D && ! main_class_name)
- fatal ("can't specify `-D' without `--main'\n");
+ fatal ("can't specify '-D' without '--main'\n");
if (main_class_name && ! verify_class_name (main_class_name))
- fatal ("`%s' is not a valid class name", main_class_name);
+ fatal ("'%s' is not a valid class name", main_class_name);
num_args = argc + added;
if (saw_resource)
@@ -531,7 +531,7 @@ lang_specific_driver (int *in_argc, cons
if (strncmp (argv[i], "-fmain=", 7) == 0)
{
if (! will_link)
- fatal ("cannot specify `main' class when not linking");
+ fatal ("cannot specify 'main' class when not linking");
--j;
continue;
}