diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 18 | ||||
| -rw-r--r-- | gcc/cp/error.c | 27 | ||||
| -rw-r--r-- | gcc/cp/spew.c | 7 |
4 files changed, 21 insertions, 41 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 0676fb14845..09e54531484 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,13 @@ +2001-12-12 Jakub Jelinek <jakub@redhat.com> + + * cp-tree.h (DESTRUCTOR_DECL_PREFIX, DESTRUCTOR_NAME_P, + ANON_PARMNAME_FORMAT, ANON_PARMNAME_P, DESTRUCTOR_NAME_FORMAT, + THIS_NAME_P): Delete. + * spew.c (read_process_identifier): Remove DESTRUCTOR_NAME_P, + THIS_NAME_P and ANON_PARMNAME_P tests from warning about clash + with internal naming scheme. + * error.c (dump_decl): Remove DESTRUCTOR_NAME_P use. + 2001-12-12 Nathan Sidwell <nathan@codesourcery.com> * decl.c (grokdeclarator): Deprecated implicit typename use. diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 6172adf2617..a0ceff08457 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -3133,7 +3133,6 @@ extern varray_type local_classes; #define VPTR_NAME "$v" #define THROW_NAME "$eh_throw" -#define DESTRUCTOR_DECL_PREFIX "_$_" #define AUTO_VTABLE_NAME "__vtbl$me__" #define AUTO_TEMP_NAME "_$tmp_" #define AUTO_TEMP_FORMAT "_$tmp_%d" @@ -3153,7 +3152,6 @@ extern varray_type local_classes; #define VPTR_NAME ".v" #define THROW_NAME ".eh_throw" -#define DESTRUCTOR_DECL_PREFIX "_._" #define AUTO_VTABLE_NAME "__vtbl.me__" #define AUTO_TEMP_NAME "_.tmp_" #define AUTO_TEMP_FORMAT "_.tmp_%d" @@ -3172,10 +3170,6 @@ extern varray_type local_classes; #define VPTR_NAME_P(ID_NODE) \ (!strncmp (IDENTIFIER_POINTER (ID_NODE), VPTR_NAME, sizeof (VPTR_NAME) - 1)) #define THROW_NAME "__eh_throw" -#define DESTRUCTOR_DECL_PREFIX "__destr_" -#define DESTRUCTOR_NAME_P(ID_NODE) \ - (!strncmp (IDENTIFIER_POINTER (ID_NODE), DESTRUCTOR_DECL_PREFIX, \ - sizeof (DESTRUCTOR_DECL_PREFIX) - 1)) #define IN_CHARGE_NAME "__in_chrg" #define AUTO_VTABLE_NAME "__vtbl_me__" #define AUTO_TEMP_NAME "__tmp_" @@ -3202,16 +3196,11 @@ extern varray_type local_classes; (!strncmp (IDENTIFIER_POINTER (ID_NODE), ANON_AGGRNAME_PREFIX, \ sizeof (ANON_AGGRNAME_PREFIX) - 1)) #define ANON_AGGRNAME_FORMAT "__anon_%d" -#define ANON_PARMNAME_FORMAT "__%d" -#define ANON_PARMNAME_P(ID_NODE) (IDENTIFIER_POINTER (ID_NODE)[0] == '_' \ - && IDENTIFIER_POINTER (ID_NODE)[1] == '_' \ - && IDENTIFIER_POINTER (ID_NODE)[2] <= '9') #endif /* NO_DOT_IN_LABEL */ #endif /* NO_DOLLAR_IN_LABEL */ #define THIS_NAME "this" -#define DESTRUCTOR_NAME_FORMAT "~%s" #define FILE_FUNCTION_PREFIX_LEN 9 #define CTOR_NAME "__ct" #define DTOR_NAME "__dt" @@ -3224,14 +3213,10 @@ extern varray_type local_classes; #define EXCEPTION_CLEANUP_NAME "exception cleanup" -#define THIS_NAME_P(ID_NODE) (strcmp(IDENTIFIER_POINTER (ID_NODE), "this") == 0) - #if !defined(NO_DOLLAR_IN_LABEL) || !defined(NO_DOT_IN_LABEL) #define VPTR_NAME_P(ID_NODE) (IDENTIFIER_POINTER (ID_NODE)[0] == JOINER \ && IDENTIFIER_POINTER (ID_NODE)[1] == 'v') -#define DESTRUCTOR_NAME_P(ID_NODE) (IDENTIFIER_POINTER (ID_NODE)[1] == JOINER \ - && IDENTIFIER_POINTER (ID_NODE)[2] == '_') #define VTABLE_NAME_P(ID_NODE) (IDENTIFIER_POINTER (ID_NODE)[1] == 'v' \ && IDENTIFIER_POINTER (ID_NODE)[2] == 't' \ @@ -3245,9 +3230,6 @@ extern varray_type local_classes; not be harmful if it does. */ #define ANON_AGGRNAME_P(ID_NODE) (IDENTIFIER_POINTER (ID_NODE)[0] == JOINER \ && IDENTIFIER_POINTER (ID_NODE)[1] == '_') -#define ANON_PARMNAME_FORMAT "_%d" -#define ANON_PARMNAME_P(ID_NODE) (IDENTIFIER_POINTER (ID_NODE)[0] == '_' \ - && IDENTIFIER_POINTER (ID_NODE)[1] <= '9') #endif /* !defined(NO_DOLLAR_IN_LABEL) || !defined(NO_DOT_IN_LABEL) */ /* Returns non-zero iff NODE is a declaration for the global function diff --git a/gcc/cp/error.c b/gcc/cp/error.c index 5cd3ee70c9b..5b1e6f872c4 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -941,24 +941,15 @@ dump_decl (t, flags) /* These special cases are duplicated here so that other functions can feed identifiers to cp_error and get them demangled properly. */ case IDENTIFIER_NODE: - { tree f; - if (DESTRUCTOR_NAME_P (t) - && (f = ident_fndecl (t)) - && DECL_LANGUAGE (f) == lang_cplusplus) - { - output_add_character (scratch_buffer, '~'); - dump_decl (DECL_NAME (f), flags); - } - else if (IDENTIFIER_TYPENAME_P (t)) - { - output_add_string (scratch_buffer, "operator "); - /* Not exactly IDENTIFIER_TYPE_VALUE. */ - dump_type (TREE_TYPE (t), flags); - break; - } - else - print_tree_identifier (scratch_buffer, t); - } + if (IDENTIFIER_TYPENAME_P (t)) + { + output_add_string (scratch_buffer, "operator "); + /* Not exactly IDENTIFIER_TYPE_VALUE. */ + dump_type (TREE_TYPE (t), flags); + break; + } + else + print_tree_identifier (scratch_buffer, t); break; case OVERLOAD: diff --git a/gcc/cp/spew.c b/gcc/cp/spew.c index 68ad412d8d3..64222257c58 100644 --- a/gcc/cp/spew.c +++ b/gcc/cp/spew.c @@ -237,13 +237,10 @@ read_process_identifier (pyylval) the user's namespace, but is if '$' or double underscores are. */ #if !defined(JOINER) || JOINER == '$' - if (THIS_NAME_P (id) - || VPTR_NAME_P (id) - || DESTRUCTOR_NAME_P (id) + if (VPTR_NAME_P (id) || VTABLE_NAME_P (id) || TEMP_NAME_P (id) - || ANON_AGGRNAME_P (id) - || ANON_PARMNAME_P (id)) + || ANON_AGGRNAME_P (id)) warning ( "identifier name `%s' conflicts with GNU C++ internal naming strategy", IDENTIFIER_POINTER (id)); |