diff options
| author | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-01-23 03:01:53 +0000 |
|---|---|---|
| committer | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-01-23 03:01:53 +0000 |
| commit | d3e748368ef1a691e906e5d7689895dc1182affe (patch) | |
| tree | ca41794bb585929e8499cf7afd3ea5f69332e7c1 /gcc/f/bad.h | |
| parent | 25afff2f90d918f58f7554cd615c239188e9cdde (diff) | |
| download | gcc-d3e748368ef1a691e906e5d7689895dc1182affe.tar.gz | |
* bad.c: Include intl.h.
(FFEBAD_MSGS1, FFEBAD_MSGS2): Replace by FFEBAD_MSG, SHORT,
LONG. Adjust definitions to work with exgettext.
(ffebad_start_): Translate all error messages.
(ffebad_finish): Mark constant strings for translation.
* bad.h: Use FFEBAD_MSG. Adjust prototype of ffebad_start_
and definitions of ffebad_start_msg, ffebad_start_msg_lex to
work with exgettext.
* bad.def: Use FFEBAD_MSG, SHORT, LONG throughout.
* com.c: Include intl.h.
(lang_print_error_function): Always use ffeinfo_kind_message
to get the kind label for a non-nested construct. Translate
it. Translate constant strings.
* info.c (FFEINFO_KIND): Adjust definition to work with exgettext.
* info-k.def: Block xgettext from slurping copyright notice
into gcc.pot. Adjust strings for their sole use, in com.c.
* Make-lang.in (f/bad.o, f/com.o): Depend on intl.h.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49123 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/f/bad.h')
| -rw-r--r-- | gcc/f/bad.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gcc/f/bad.h b/gcc/f/bad.h index 8589943cc46..bd7581e50d9 100644 --- a/gcc/f/bad.h +++ b/gcc/f/bad.h @@ -1,5 +1,5 @@ /* bad.h -- Public #include File (module.h template V1.0) - Copyright (C) 1995 Free Software Foundation, Inc. + Copyright (C) 1995, 2002 Free Software Foundation, Inc. Contributed by James Craig Burley. This file is part of GNU Fortran. @@ -34,11 +34,9 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA typedef enum { -#define FFEBAD_MSGS1(KWD,SEV,MSG) KWD, -#define FFEBAD_MSGS2(KWD,SEV,LMSG,SMSG) KWD, +#define FFEBAD_MSG(KWD,SEV,MSG) KWD, #include "bad.def" -#undef FFEBAD_MSGS1 -#undef FFEBAD_MSGS2 +#undef FFEBAD_MSG FFEBAD } ffebad; @@ -82,7 +80,7 @@ void ffebad_init_0 (void); bool ffebad_is_fatal (ffebad errnum); ffebadSeverity ffebad_severity (ffebad errnum); bool ffebad_start_ (bool lex_override, ffebad errnum, ffebadSeverity sev, - const char *message); + const char *msgid); void ffebad_string (const char *string); /* Define macros. */ @@ -95,8 +93,8 @@ void ffebad_string (const char *string); #define ffebad_set_inhibit(f) (ffebad_is_inhibited_ = (f)) #define ffebad_start(e) ffebad_start_ (FALSE, (e), FFEBAD_severity, NULL) #define ffebad_start_lex(e) ffebad_start_ (TRUE, (e), FFEBAD_severity, NULL) -#define ffebad_start_msg(m,s) ffebad_start_ (FALSE, FFEBAD, (s), (m)) -#define ffebad_start_msg_lex(m,s) ffebad_start_ (TRUE, FFEBAD, (s), (m)) +#define ffebad_start_msg(msgid,s) ffebad_start_ (FALSE, FFEBAD, (s), (msgid)) +#define ffebad_start_msg_lex(msgid,s) ffebad_start_ (TRUE, FFEBAD, (s), (msgid)) #define ffebad_terminate_0() #define ffebad_terminate_1() #define ffebad_terminate_2() |