diff options
| author | Zack Weinberg <zack@codesourcery.com> | 2004-10-06 04:47:42 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2004-10-06 04:47:42 +0000 |
| commit | d5706a1eea67117c5b76a33ec42ce96ad4ba399a (patch) | |
| tree | 5a3ce60061200b7754e09f04fceb0b0f6076a700 /gcc/treelang | |
| parent | 12cde21b1201cee86d4fd2c87aa8f40fb09b667e (diff) | |
| download | gcc-d5706a1eea67117c5b76a33ec42ce96ad4ba399a.zip gcc-d5706a1eea67117c5b76a33ec42ce96ad4ba399a.tar.gz gcc-d5706a1eea67117c5b76a33ec42ce96ad4ba399a.tar.bz2 | |
pretty-print.c: Include tree.h.
* pretty-print.c: Include tree.h.
(pp_base_prepare_to_format): New function, logic from
text_specifies_location.
(pp_base_format_text): Use gcc_assert.
* pretty-print.h (pp_prepare_to_format): New macro.
(pp_base_prepare_to_format): Prototype.
* diagnostic.c (text_specifies_location): Delete.
(bug_report_request): Delete.
(diagnostic_set_info): Don't call text_specifies_location.
(diagnostic_action_after_output): Put text from
bug_report_request inline here. Use gcc_unreachable.
(diagnostic_report_current_function): Fix comment.
(diagnostic_report_diagnostic): Clarify logic for error recursion.
Call pp_prepare_to_format before diagnostic_starter.
(trim_filename): Use IS_DIR_SEPARATOR.
(fatal_error, internal_error): Use gcc_unreachable.
(error_recursion): Call diagnostic_action_after_output to
issue the bug_report_request message and exit.
* Makefile.in (diagnostic.o, pretty-print.o): Update dependencies.
* c-parse.in: Add list of diagnostic messages to insulate
translation template from version of yacc/bison used to
compile the grammar.
java:
* parse.y, parse-scan.y: Add list of diagnostic messages to
insulate translation template from version of yacc/bison used
to compile the grammar.
treelang:
* parse.y: Add list of diagnostic messages to insulate
translation template from version of yacc/bison used to
compile the grammar.
po:
* gcc.pot: Regenerate.
From-SVN: r88590
Diffstat (limited to 'gcc/treelang')
| -rw-r--r-- | gcc/treelang/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/treelang/parse.y | 16 |
2 files changed, 22 insertions, 0 deletions
diff --git a/gcc/treelang/ChangeLog b/gcc/treelang/ChangeLog index 9620863..810d492 100644 --- a/gcc/treelang/ChangeLog +++ b/gcc/treelang/ChangeLog @@ -1,3 +1,9 @@ +2004-10-05 Zack Weinberg <zack@codesourcery.com> + + * parse.y: Add list of diagnostic messages to insulate + translation template from version of yacc/bison used to + compile the grammar. + 2004-10-02 James A. Morrison <phython@gcc.gnu.org> PR other/17762 diff --git a/gcc/treelang/parse.y b/gcc/treelang/parse.y index 5177c90..b1330c7 100644 --- a/gcc/treelang/parse.y +++ b/gcc/treelang/parse.y @@ -954,3 +954,19 @@ treelang_debug (void) yydebug = 1; } +#ifdef __XGETTEXT__ +/* Depending on the version of Bison used to compile this grammar, + it may issue generic diagnostics spelled "syntax error" or + "parse error". To prevent this from changing the translation + template randomly, we list all the variants of this particular + diagnostic here. Translators: there is no fine distinction + between diagnostics with "syntax error" in them, and diagnostics + with "parse error" in them. It's okay to give them both the same + translation. */ +const char d1[] = N_("syntax error"); +const char d2[] = N_("parse error"); +const char d3[] = N_("syntax error; also virtual memory exhausted"); +const char d4[] = N_("parse error; also virtual memory exhausted"); +const char d5[] = N_("syntax error: cannot back up"); +const char d6[] = N_("parse error: cannot back up"); +#endif |