From 43f9ce025631eabe87889646e50d19c1d228c680 Mon Sep 17 00:00:00 2001 From: Gabriel Dos Reis Date: Sun, 7 Sep 2003 11:59:52 +0000 Subject: [PATCH] * diagnostic.c (warn_deprecated_use): Move to toplev.c From-SVN: r71168 --- gcc/ChangeLog | 4 ++++ gcc/diagnostic.c | 38 -------------------------------------- gcc/toplev.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 38 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 492f6d7fdd7..d545cd84740 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2003-09-07 Gabriel Dos Reis + + * diagnostic.c (warn_deprecated_use): Move to toplev.c + 2003-09-07 Gabriel Dos Reis * langhooks.c (lhd_print_error_function): Move from diagnostic.c. diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c index 8c8a86c2b38..3d64b87cfdd 100644 --- a/gcc/diagnostic.c +++ b/gcc/diagnostic.c @@ -550,44 +550,6 @@ fnotice (FILE *file, const char *msgid, ...) va_end (ap); } -/* Warn about a use of an identifier which was marked deprecated. */ -void -warn_deprecated_use (tree node) -{ - if (node == 0 || !warn_deprecated_decl) - return; - - if (DECL_P (node)) - warning ("`%s' is deprecated (declared at %s:%d)", - IDENTIFIER_POINTER (DECL_NAME (node)), - DECL_SOURCE_FILE (node), DECL_SOURCE_LINE (node)); - else if (TYPE_P (node)) - { - const char *what = NULL; - tree decl = TYPE_STUB_DECL (node); - - if (TREE_CODE (TYPE_NAME (node)) == IDENTIFIER_NODE) - what = IDENTIFIER_POINTER (TYPE_NAME (node)); - else if (TREE_CODE (TYPE_NAME (node)) == TYPE_DECL - && DECL_NAME (TYPE_NAME (node))) - what = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (node))); - - if (what) - { - if (decl) - warning ("`%s' is deprecated (declared at %s:%d)", what, - DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl)); - else - warning ("`%s' is deprecated", what); - } - else if (decl) - warning ("type is deprecated (declared at %s:%d)", - DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl)); - else - warning ("type is deprecated"); - } -} - /* Inform the user that an error occurred while trying to report some other error. This indicates catastrophic internal inconsistencies, so give up now. But do try to flush out the previous error. diff --git a/gcc/toplev.c b/gcc/toplev.c index 92ef8358d8a..aa04138ca96 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -1702,6 +1702,44 @@ check_global_declarations (tree *vec, int len) } } +/* Warn about a use of an identifier which was marked deprecated. */ +void +warn_deprecated_use (tree node) +{ + if (node == 0 || !warn_deprecated_decl) + return; + + if (DECL_P (node)) + warning ("`%s' is deprecated (declared at %s:%d)", + IDENTIFIER_POINTER (DECL_NAME (node)), + DECL_SOURCE_FILE (node), DECL_SOURCE_LINE (node)); + else if (TYPE_P (node)) + { + const char *what = NULL; + tree decl = TYPE_STUB_DECL (node); + + if (TREE_CODE (TYPE_NAME (node)) == IDENTIFIER_NODE) + what = IDENTIFIER_POINTER (TYPE_NAME (node)); + else if (TREE_CODE (TYPE_NAME (node)) == TYPE_DECL + && DECL_NAME (TYPE_NAME (node))) + what = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (node))); + + if (what) + { + if (decl) + warning ("`%s' is deprecated (declared at %s:%d)", what, + DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl)); + else + warning ("`%s' is deprecated", what); + } + else if (decl) + warning ("type is deprecated (declared at %s:%d)", + DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl)); + else + warning ("type is deprecated"); + } +} + /* Save the current INPUT_LOCATION on the top entry in the INPUT_FILE_STACK. Push a new entry for FILE and LINE, and set the INPUT_LOCATION accordingly. */ -- 2.30.2