diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/java/expr.c | 2 | ||||
| -rw-r--r-- | gcc/java/jcf-parse.c | 6 | ||||
| -rw-r--r-- | gcc/java/jvspec.c | 2 | ||||
| -rw-r--r-- | gcc/java/lang.c | 4 |
5 files changed, 14 insertions, 7 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 4b97677..a635c1e 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,10 @@ +2010-11-10 Joseph Myers <joseph@codesourcery.com> + + * expr.c (expand_java_field_op): Use %' in diagnostic. + * jcf-parse.c (java_parse_file): Use %' in diagnostics. + * jvspec.c (lang_specific_driver): Use %' in diagnostic. + * lang.c (java_post_options): Use %' in diagnostics. + 2010-11-06 Joern Rennecke <amylaar@spamcop.net> PR middle-end/46314 diff --git a/gcc/java/expr.c b/gcc/java/expr.c index 85cf1a2..f6c6c1b 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -2920,7 +2920,7 @@ expand_java_field_op (int is_static, int is_putting, int field_ref_index) if (FIELD_FINAL (field_decl)) { if (DECL_CONTEXT (field_decl) != current_class) - error ("assignment to final field %q+D not in field's class", + error ("assignment to final field %q+D not in field%'s class", field_decl); /* We used to check for assignments to final fields not occurring in the class initializer or in a constructor diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c index 30f171c..ce1de5a 100644 --- a/gcc/java/jcf-parse.c +++ b/gcc/java/jcf-parse.c @@ -1750,7 +1750,7 @@ java_parse_file (int set_yydebug ATTRIBUTE_UNUSED) int avail = 2000; finput = fopen (main_input_filename, "r"); if (finput == NULL) - fatal_error ("can't open %s: %m", input_filename); + fatal_error ("can%'t open %s: %m", input_filename); list = XNEWVEC (char, avail); next = list; for (;;) @@ -1885,11 +1885,11 @@ java_parse_file (int set_yydebug ATTRIBUTE_UNUSED) /* Close previous descriptor, if any */ if (finput && fclose (finput)) - fatal_error ("can't close input file %s: %m", main_input_filename); + fatal_error ("can%'t close input file %s: %m", main_input_filename); finput = fopen (filename, "rb"); if (finput == NULL) - fatal_error ("can't open %s: %m", filename); + fatal_error ("can%'t open %s: %m", filename); #ifdef IO_BUFFER_SIZE setvbuf (finput, xmalloc (IO_BUFFER_SIZE), diff --git a/gcc/java/jvspec.c b/gcc/java/jvspec.c index 7fe44f3..4240db1 100644 --- a/gcc/java/jvspec.c +++ b/gcc/java/jvspec.c @@ -393,7 +393,7 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, } if (saw_D && ! main_class_name) - fatal_error ("can't specify %<-D%> without %<--main%>"); + fatal_error ("can%'t specify %<-D%> without %<--main%>"); if (main_class_name && ! verify_class_name (main_class_name)) fatal_error ("%qs is not a valid class name", main_class_name); diff --git a/gcc/java/lang.c b/gcc/java/lang.c index 45722e5..8065efa 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -599,7 +599,7 @@ java_post_options (const char **pfilename) filename = "stdin"; if (dependency_tracking) - error ("can't do dependency tracking with input from stdin"); + error ("can%'t do dependency tracking with input from stdin"); } else { @@ -615,7 +615,7 @@ java_post_options (const char **pfilename) { dot = strrchr (filename, '.'); if (dot == NULL) - error ("couldn't determine target name for dependency tracking"); + error ("couldn%'t determine target name for dependency tracking"); else { char *buf = XNEWVEC (char, dot - filename + |