gcc/libiberty/cplus-dem.c

4616 lines
109 KiB
C
Raw Normal View History

/* Demangler for GNU C++
Copyright 1989, 91, 94, 95, 96, 97, 98, 1999 Free Software Foundation, Inc.
1997-08-22 00:57:35 +02:00
Written by James Clark (jjc@jclark.uucp)
Rewritten by Fred Fish (fnf@cygnus.com) for ARM and Lucid demangling
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
Modified by Satish Pai (pai@apollo.hp.com) for HP demangling
1997-08-22 00:57:35 +02:00
This file is part of the libiberty library.
Libiberty is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
Libiberty is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with libiberty; see the file COPYING.LIB. If
not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
/* This file exports two functions; cplus_mangle_opname and cplus_demangle.
This file imports xmalloc and xrealloc, which are like malloc and
realloc except that they generate a fatal error if there is no
available memory. */
/* This file lives in both GCC and libiberty. When making changes, please
try not to break either. */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
1997-08-22 00:57:35 +02:00
#include <ctype.h>
#include <sys/types.h>
1997-08-22 00:57:35 +02:00
#include <string.h>
#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#else
char * malloc ();
char * realloc ();
#endif
1997-08-22 00:57:35 +02:00
#include <demangle.h>
#undef CURRENT_DEMANGLING_STYLE
#define CURRENT_DEMANGLING_STYLE work->options
#include "libiberty.h"
1997-08-22 00:57:35 +02:00
#define min(X,Y) (((X) < (Y)) ? (X) : (Y))
1997-08-22 00:57:35 +02:00
static const char *mystrstr PARAMS ((const char *, const char *));
static const char *
mystrstr (s1, s2)
const char *s1, *s2;
{
register const char *p = s1;
register int len = strlen (s2);
for (; (p = strchr (p, *s2)) != 0; p++)
{
if (strncmp (p, s2, len) == 0)
{
return (p);
}
}
return (0);
}
/* In order to allow a single demangler executable to demangle strings
using various common values of CPLUS_MARKER, as well as any specific
one set at compile time, we maintain a string containing all the
commonly used ones, and check to see if the marker we are looking for
is in that string. CPLUS_MARKER is usually '$' on systems where the
assembler can deal with that. Where the assembler can't, it's usually
'.' (but on many systems '.' is used for other things). We put the
current defined CPLUS_MARKER first (which defaults to '$'), followed
by the next most common value, followed by an explicit '$' in case
the value of CPLUS_MARKER is not '$'.
We could avoid this if we could just get g++ to tell us what the actual
cplus marker character is as part of the debug information, perhaps by
ensuring that it is the character that terminates the gcc<n>_compiled
marker symbol (FIXME). */
#if !defined (CPLUS_MARKER)
#define CPLUS_MARKER '$'
#endif
enum demangling_styles current_demangling_style = gnu_demangling;
static char cplus_markers[] = { CPLUS_MARKER, '.', '$', '\0' };
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
static char char_str[2] = { '\000', '\000' };
1997-08-22 00:57:35 +02:00
void
set_cplus_marker_for_demangling (ch)
int ch;
{
cplus_markers[0] = ch;
}
typedef struct string /* Beware: these aren't required to be */
{ /* '\0' terminated. */
char *b; /* pointer to start of string */
char *p; /* pointer after last character */
char *e; /* pointer after end of allocated space */
} string;
1997-08-22 00:57:35 +02:00
/* Stuff that is shared between sub-routines.
Using a shared structure allows cplus_demangle to be reentrant. */
struct work_stuff
{
int options;
char **typevec;
char **ktypevec;
char **btypevec;
int numk;
int numb;
int ksize;
int bsize;
1997-08-22 00:57:35 +02:00
int ntypes;
int typevec_size;
int constructor;
int destructor;
int static_type; /* A static member function */
int temp_start; /* index in demangled to start of template args */
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
int type_quals; /* The type qualifiers. */
int dllimported; /* Symbol imported from a PE DLL */
char **tmpl_argvec; /* Template function arguments. */
int ntmpl_args; /* The number of template function arguments. */
int forgetting_types; /* Nonzero if we are not remembering the types
we see. */
string* previous_argument; /* The last function argument demangled. */
int nrepeats; /* The number of times to repeat the previous
argument. */
1997-08-22 00:57:35 +02:00
};
#define PRINT_ANSI_QUALIFIERS (work -> options & DMGL_ANSI)
#define PRINT_ARG_TYPES (work -> options & DMGL_PARAMS)
static const struct optable
{
const char *in;
const char *out;
int flags;
} optable[] = {
{"nw", " new", DMGL_ANSI}, /* new (1.92, ansi) */
{"dl", " delete", DMGL_ANSI}, /* new (1.92, ansi) */
{"new", " new", 0}, /* old (1.91, and 1.x) */
{"delete", " delete", 0}, /* old (1.91, and 1.x) */
{"vn", " new []", DMGL_ANSI}, /* GNU, pending ansi */
{"vd", " delete []", DMGL_ANSI}, /* GNU, pending ansi */
{"as", "=", DMGL_ANSI}, /* ansi */
{"ne", "!=", DMGL_ANSI}, /* old, ansi */
{"eq", "==", DMGL_ANSI}, /* old, ansi */
{"ge", ">=", DMGL_ANSI}, /* old, ansi */
{"gt", ">", DMGL_ANSI}, /* old, ansi */
{"le", "<=", DMGL_ANSI}, /* old, ansi */
{"lt", "<", DMGL_ANSI}, /* old, ansi */
{"plus", "+", 0}, /* old */
{"pl", "+", DMGL_ANSI}, /* ansi */
{"apl", "+=", DMGL_ANSI}, /* ansi */
{"minus", "-", 0}, /* old */
{"mi", "-", DMGL_ANSI}, /* ansi */
{"ami", "-=", DMGL_ANSI}, /* ansi */
{"mult", "*", 0}, /* old */
{"ml", "*", DMGL_ANSI}, /* ansi */
{"amu", "*=", DMGL_ANSI}, /* ansi (ARM/Lucid) */
{"aml", "*=", DMGL_ANSI}, /* ansi (GNU/g++) */
{"convert", "+", 0}, /* old (unary +) */
{"negate", "-", 0}, /* old (unary -) */
{"trunc_mod", "%", 0}, /* old */
{"md", "%", DMGL_ANSI}, /* ansi */
{"amd", "%=", DMGL_ANSI}, /* ansi */
{"trunc_div", "/", 0}, /* old */
{"dv", "/", DMGL_ANSI}, /* ansi */
{"adv", "/=", DMGL_ANSI}, /* ansi */
{"truth_andif", "&&", 0}, /* old */
{"aa", "&&", DMGL_ANSI}, /* ansi */
{"truth_orif", "||", 0}, /* old */
{"oo", "||", DMGL_ANSI}, /* ansi */
{"truth_not", "!", 0}, /* old */
{"nt", "!", DMGL_ANSI}, /* ansi */
{"postincrement","++", 0}, /* old */
{"pp", "++", DMGL_ANSI}, /* ansi */
{"postdecrement","--", 0}, /* old */
{"mm", "--", DMGL_ANSI}, /* ansi */
{"bit_ior", "|", 0}, /* old */
{"or", "|", DMGL_ANSI}, /* ansi */
{"aor", "|=", DMGL_ANSI}, /* ansi */
{"bit_xor", "^", 0}, /* old */
{"er", "^", DMGL_ANSI}, /* ansi */
{"aer", "^=", DMGL_ANSI}, /* ansi */
{"bit_and", "&", 0}, /* old */
{"ad", "&", DMGL_ANSI}, /* ansi */
{"aad", "&=", DMGL_ANSI}, /* ansi */
{"bit_not", "~", 0}, /* old */
{"co", "~", DMGL_ANSI}, /* ansi */
{"call", "()", 0}, /* old */
{"cl", "()", DMGL_ANSI}, /* ansi */
{"alshift", "<<", 0}, /* old */
{"ls", "<<", DMGL_ANSI}, /* ansi */
{"als", "<<=", DMGL_ANSI}, /* ansi */
{"arshift", ">>", 0}, /* old */
{"rs", ">>", DMGL_ANSI}, /* ansi */
{"ars", ">>=", DMGL_ANSI}, /* ansi */
{"component", "->", 0}, /* old */
{"pt", "->", DMGL_ANSI}, /* ansi; Lucid C++ form */
{"rf", "->", DMGL_ANSI}, /* ansi; ARM/GNU form */
{"indirect", "*", 0}, /* old */
{"method_call", "->()", 0}, /* old */
{"addr", "&", 0}, /* old (unary &) */
{"array", "[]", 0}, /* old */
{"vc", "[]", DMGL_ANSI}, /* ansi */
{"compound", ", ", 0}, /* old */
{"cm", ", ", DMGL_ANSI}, /* ansi */
{"cond", "?:", 0}, /* old */
{"cn", "?:", DMGL_ANSI}, /* pseudo-ansi */
{"max", ">?", 0}, /* old */
{"mx", ">?", DMGL_ANSI}, /* pseudo-ansi */
{"min", "<?", 0}, /* old */
{"mn", "<?", DMGL_ANSI}, /* pseudo-ansi */
{"nop", "", 0}, /* old (for operator=) */
{"rm", "->*", DMGL_ANSI}, /* ansi */
{"sz", "sizeof ", DMGL_ANSI} /* pseudo-ansi */
1997-08-22 00:57:35 +02:00
};
/* These values are used to indicate the various type varieties.
They are all non-zero so that they can be used as `success'
values. */
typedef enum type_kind_t
{
tk_none,
tk_pointer,
tk_reference,
tk_integral,
tk_bool,
tk_char,
tk_real
} type_kind_t;
1997-08-22 00:57:35 +02:00
#define STRING_EMPTY(str) ((str) -> b == (str) -> p)
#define PREPEND_BLANK(str) {if (!STRING_EMPTY(str)) \
string_prepend(str, " ");}
#define APPEND_BLANK(str) {if (!STRING_EMPTY(str)) \
string_append(str, " ");}
#define LEN_STRING(str) ( (STRING_EMPTY(str))?0:((str)->p - (str)->b))
1997-08-22 00:57:35 +02:00
/* The scope separator appropriate for the language being demangled. */
#define SCOPE_STRING(work) ((work->options & DMGL_JAVA) ? "." : "::")
1997-08-22 00:57:35 +02:00
#define ARM_VTABLE_STRING "__vtbl__" /* Lucid/ARM virtual table prefix */
#define ARM_VTABLE_STRLEN 8 /* strlen (ARM_VTABLE_STRING) */
/* Prototypes for local functions */
static char *
mop_up PARAMS ((struct work_stuff *, string *, int));
Warning fixes: * Makefile.in (c-lang.o): Depend on c-tree.h, c-lex.h and toplev.h. (c-lex.o): Depend on output.h. (c-common.o): Likewise. (stmt.o): Likewise. (calls.o): Likewise. (integrate.o): Depend on toplev.h. (regclass.o): Depend on output.h. (final.o): Depend on reload.h. * c-common.c: Include output.h. (check_format_info): Remove unused variable `integral_format'. * c-decl.c (print_lang_decl): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (print_lang_type): Likewise. (maybe_build_cleanup): Likewise for parameter `decl'. (copy_lang_decl): Likewise for parameter `node'. * c-lang.c: Include c-tree.h, c-lex.h and toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (lookup_interface): Likewise for parameter `arg'. (is_class_name): Likewise. (maybe_objc_check_decl): Likewise for parameter `decl'. (maybe_objc_comptypes): Likewise for parameters `lhs', `rhs' and `reflexive'. (maybe_objc_method_name): Likewise for parameter `decl'. (build_objc_string): Likewise for parameters `len' and `str'. * c-lex.c: Include output.h. * c-lex.h (position_after_white_space): Correct typo in prototype. * c-tree.h (finish_file, c_expand_start_cond, c_expand_start_else, c_expand_end_cond, init_iterators): Add prototypes. * caller-save.c (set_reg_live): Mark parameters `reg' and `setter' with ATTRIBUTE_UNUSED. * calls.c: Include output.h. * cccp.c (pipe_closed): Mark parameter `signo' with ATTRIBUTE_UNUSED. * combine.c: Move inclusion of expr.h to after insn-config.h. * iris6.h (ASM_IDENTIFY_GCC, ASM_IDENTIFY_LANGUAGE): Don't define as empty, rather define as ((void)0). * sparc.c (sparc_check_64): Add braces around ambiguous `else'. Add parentheses around assignment used as truth value. * cplus-dem.c (squangle_mop_up): Change return type to void. (internal_cplus_demangle): Remove unused parameter `options'. All callers changed. (cplus_demangle_opname): Remove function wide variable `int i' and replace with `size_t i' at each location where it is used. (cplus_demangle_opname): change type of `i' from int to size_t. * cppexp.c (right_shift): Mark parameter `pfile' with ATTRIBUTE_UNUSED. * cpphash.c (cpp_lookup): Likewise. (cpp_hash_cleanup): Likewise. * cpplib.c (parse_name): Add a prototype and make it static. (null_underflow): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (null_cleanup): Likewise for parameters `pbuf' and `pfile'. (macro_cleanup): Likewise for parameter `pfile'. (file_cleanup): Likewise. * cpplib.h (cpp_reader_init, cpp_options_init, cpp_start_read, cpp_read_check_assertion, skip_rest_of_line): Add prototypes. * crtstuff.c (force_to_data, __CTOR_LIST__, force_to_data, __DTOR_END__, __FRAME_END__): Mark with ATTRIBUTE_UNUSED. * cse.c (cse_check_loop_start): Mark parameter `set' with ATTRIBUTE_UNUSED. * dbxout.c (flag_minimal_debug, have_used_extensions, source_label_number): Move inside macro wrapper check against defined (DBX_DEBUGGING_INFO) || defined (XCOFF_DEBUGGING_INFO). * dwarf2out.c (gen_entry_point_die): Hide prototype and definition. * except.h (doing_eh): Provide prototype. * expr.c: Move inclusion of expr.h to after insn-config.h. * final.c: Include reload.h. (shorten_branches): Cast the first argument of bzero to char *. * fix-header.c (cpp_print_containing_files): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (cpp_fatal): Likewise. * flow.c (find_basic_blocks_1): Cast the first argument of bzero to char *. * genattrtab.c (make_length_attrs): Change the type of variable `i' from int to size_t. (zero_fn): Mark parameter `exp' with ATTRIBUTE_UNUSED. (one_fn): Likewise. * genextract.c (main): When generating insn-extract.c, mark variable `junk' with ATTRIBUTE_UNUSED. * gengenrtl.c (gencode): When generating genrtl.c, cast the first argument of bzero to char*. * integrate.c: Include toplev.h. * libgcc2.c: Wrap `struct exception_table' and `find_exception_handler' in macro DWARF2_UNWIND_INFO. * objc/Make-lang.in (objc-act.o): Depend on toplev.h. * objc/objc-act.c: Include toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (finish_protocol): Likewise for parameter `protocol'. * output.h (declare_weak): Add prototype. (decode_reg_name): Don't wrap with TREE_CODE macro. (assemble_alias): Add prototype. * regclass.c: Include output.h. * reload.h (reloads_conflict): Add prototype. * rtl.h (print_rtl_single, mark_elimiation, reg_class_subset_p, output_func_start_profiler): Add prototypes. * rtlanal.c (reg_set_p_1): Mark parameters `x' and `pat' with ATTRIBUTE_UNUSED. * scan-decls.c: Include scan.h. * scan.h (recognized_function, recognized_extern): Add prototypes. * stmt.c: Include output.h. * toplev.c (error_for_asm, warning_for_asm): Remove prototypes. (output_lang_identify): Hide prototype and definition. (float_signal): Mark parameter `signo' with ATTRIBUTE_UNUSED. (pipe_closed): Likewise. * toplev.h (count_error, strip_off_ending, error_for_asm, warning_for_asm): Add prototypes. From-SVN: r19712
1998-05-13 14:40:39 +02:00
static void
squangle_mop_up PARAMS ((struct work_stuff *));
1997-08-22 00:57:35 +02:00
#if 0
static int
demangle_method_args PARAMS ((struct work_stuff *, const char **, string *));
1997-08-22 00:57:35 +02:00
#endif
static char *
Warning fixes: * Makefile.in (c-lang.o): Depend on c-tree.h, c-lex.h and toplev.h. (c-lex.o): Depend on output.h. (c-common.o): Likewise. (stmt.o): Likewise. (calls.o): Likewise. (integrate.o): Depend on toplev.h. (regclass.o): Depend on output.h. (final.o): Depend on reload.h. * c-common.c: Include output.h. (check_format_info): Remove unused variable `integral_format'. * c-decl.c (print_lang_decl): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (print_lang_type): Likewise. (maybe_build_cleanup): Likewise for parameter `decl'. (copy_lang_decl): Likewise for parameter `node'. * c-lang.c: Include c-tree.h, c-lex.h and toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (lookup_interface): Likewise for parameter `arg'. (is_class_name): Likewise. (maybe_objc_check_decl): Likewise for parameter `decl'. (maybe_objc_comptypes): Likewise for parameters `lhs', `rhs' and `reflexive'. (maybe_objc_method_name): Likewise for parameter `decl'. (build_objc_string): Likewise for parameters `len' and `str'. * c-lex.c: Include output.h. * c-lex.h (position_after_white_space): Correct typo in prototype. * c-tree.h (finish_file, c_expand_start_cond, c_expand_start_else, c_expand_end_cond, init_iterators): Add prototypes. * caller-save.c (set_reg_live): Mark parameters `reg' and `setter' with ATTRIBUTE_UNUSED. * calls.c: Include output.h. * cccp.c (pipe_closed): Mark parameter `signo' with ATTRIBUTE_UNUSED. * combine.c: Move inclusion of expr.h to after insn-config.h. * iris6.h (ASM_IDENTIFY_GCC, ASM_IDENTIFY_LANGUAGE): Don't define as empty, rather define as ((void)0). * sparc.c (sparc_check_64): Add braces around ambiguous `else'. Add parentheses around assignment used as truth value. * cplus-dem.c (squangle_mop_up): Change return type to void. (internal_cplus_demangle): Remove unused parameter `options'. All callers changed. (cplus_demangle_opname): Remove function wide variable `int i' and replace with `size_t i' at each location where it is used. (cplus_demangle_opname): change type of `i' from int to size_t. * cppexp.c (right_shift): Mark parameter `pfile' with ATTRIBUTE_UNUSED. * cpphash.c (cpp_lookup): Likewise. (cpp_hash_cleanup): Likewise. * cpplib.c (parse_name): Add a prototype and make it static. (null_underflow): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (null_cleanup): Likewise for parameters `pbuf' and `pfile'. (macro_cleanup): Likewise for parameter `pfile'. (file_cleanup): Likewise. * cpplib.h (cpp_reader_init, cpp_options_init, cpp_start_read, cpp_read_check_assertion, skip_rest_of_line): Add prototypes. * crtstuff.c (force_to_data, __CTOR_LIST__, force_to_data, __DTOR_END__, __FRAME_END__): Mark with ATTRIBUTE_UNUSED. * cse.c (cse_check_loop_start): Mark parameter `set' with ATTRIBUTE_UNUSED. * dbxout.c (flag_minimal_debug, have_used_extensions, source_label_number): Move inside macro wrapper check against defined (DBX_DEBUGGING_INFO) || defined (XCOFF_DEBUGGING_INFO). * dwarf2out.c (gen_entry_point_die): Hide prototype and definition. * except.h (doing_eh): Provide prototype. * expr.c: Move inclusion of expr.h to after insn-config.h. * final.c: Include reload.h. (shorten_branches): Cast the first argument of bzero to char *. * fix-header.c (cpp_print_containing_files): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (cpp_fatal): Likewise. * flow.c (find_basic_blocks_1): Cast the first argument of bzero to char *. * genattrtab.c (make_length_attrs): Change the type of variable `i' from int to size_t. (zero_fn): Mark parameter `exp' with ATTRIBUTE_UNUSED. (one_fn): Likewise. * genextract.c (main): When generating insn-extract.c, mark variable `junk' with ATTRIBUTE_UNUSED. * gengenrtl.c (gencode): When generating genrtl.c, cast the first argument of bzero to char*. * integrate.c: Include toplev.h. * libgcc2.c: Wrap `struct exception_table' and `find_exception_handler' in macro DWARF2_UNWIND_INFO. * objc/Make-lang.in (objc-act.o): Depend on toplev.h. * objc/objc-act.c: Include toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (finish_protocol): Likewise for parameter `protocol'. * output.h (declare_weak): Add prototype. (decode_reg_name): Don't wrap with TREE_CODE macro. (assemble_alias): Add prototype. * regclass.c: Include output.h. * reload.h (reloads_conflict): Add prototype. * rtl.h (print_rtl_single, mark_elimiation, reg_class_subset_p, output_func_start_profiler): Add prototypes. * rtlanal.c (reg_set_p_1): Mark parameters `x' and `pat' with ATTRIBUTE_UNUSED. * scan-decls.c: Include scan.h. * scan.h (recognized_function, recognized_extern): Add prototypes. * stmt.c: Include output.h. * toplev.c (error_for_asm, warning_for_asm): Remove prototypes. (output_lang_identify): Hide prototype and definition. (float_signal): Mark parameter `signo' with ATTRIBUTE_UNUSED. (pipe_closed): Likewise. * toplev.h (count_error, strip_off_ending, error_for_asm, warning_for_asm): Add prototypes. From-SVN: r19712
1998-05-13 14:40:39 +02:00
internal_cplus_demangle PARAMS ((struct work_stuff *, const char *));
static int
demangle_template_template_parm PARAMS ((struct work_stuff *work,
const char **, string *));
1997-08-22 00:57:35 +02:00
static int
demangle_template PARAMS ((struct work_stuff *work, const char **, string *,
string *, int, int));
1997-08-22 00:57:35 +02:00
static int
arm_pt PARAMS ((struct work_stuff *, const char *, int, const char **,
const char **));
static int
demangle_class_name PARAMS ((struct work_stuff *, const char **, string *));
static int
demangle_qualified PARAMS ((struct work_stuff *, const char **, string *,
int, int));
static int
demangle_class PARAMS ((struct work_stuff *, const char **, string *));
static int
demangle_fund_type PARAMS ((struct work_stuff *, const char **, string *));
static int
demangle_signature PARAMS ((struct work_stuff *, const char **, string *));
static int
demangle_prefix PARAMS ((struct work_stuff *, const char **, string *));
static int
gnu_special PARAMS ((struct work_stuff *, const char **, string *));
static int
arm_special PARAMS ((const char **, string *));
1997-08-22 00:57:35 +02:00
static void
string_need PARAMS ((string *, int));
static void
string_delete PARAMS ((string *));
static void
string_init PARAMS ((string *));
static void
string_clear PARAMS ((string *));
#if 0
static int
string_empty PARAMS ((string *));
#endif
static void
string_append PARAMS ((string *, const char *));
static void
string_appends PARAMS ((string *, string *));
static void
string_appendn PARAMS ((string *, const char *, int));
static void
string_prepend PARAMS ((string *, const char *));
static void
string_prependn PARAMS ((string *, const char *, int));
static int
get_count PARAMS ((const char **, int *));
static int
consume_count PARAMS ((const char **));
static int
consume_count_with_underscores PARAMS ((const char**));
1997-08-22 00:57:35 +02:00
static int
demangle_args PARAMS ((struct work_stuff *, const char **, string *));
static int
demangle_nested_args PARAMS ((struct work_stuff*, const char**, string*));
1997-08-22 00:57:35 +02:00
static int
do_type PARAMS ((struct work_stuff *, const char **, string *));
static int
do_arg PARAMS ((struct work_stuff *, const char **, string *));
static void
demangle_function_name PARAMS ((struct work_stuff *, const char **, string *,
const char *));
static void
remember_type PARAMS ((struct work_stuff *, const char *, int));
static void
remember_Btype PARAMS ((struct work_stuff *, const char *, int, int));
static int
register_Btype PARAMS ((struct work_stuff *));
static void
remember_Ktype PARAMS ((struct work_stuff *, const char *, int));
1997-08-22 00:57:35 +02:00
static void
forget_types PARAMS ((struct work_stuff *));
static void
forget_B_and_K_types PARAMS ((struct work_stuff *));
1997-08-22 00:57:35 +02:00
static void
string_prepends PARAMS ((string *, string *));
static int
demangle_template_value_parm PARAMS ((struct work_stuff*, const char**,
string*, type_kind_t));
static int
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
do_hpacc_template_const_value PARAMS ((struct work_stuff *, const char **, string *));
static int
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
do_hpacc_template_literal PARAMS ((struct work_stuff *, const char **, string *));
static int
snarf_numeric_literal PARAMS ((const char **, string *));
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
/* There is a TYPE_QUAL value for each type qualifier. They can be
combined by bitwise-or to form the complete set of qualifiers for a
type. */
#define TYPE_UNQUALIFIED 0x0
#define TYPE_QUAL_CONST 0x1
#define TYPE_QUAL_VOLATILE 0x2
#define TYPE_QUAL_RESTRICT 0x4
static int
code_for_qualifier PARAMS ((int));
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
static const char*
qualifier_string PARAMS ((int));
static const char*
demangle_qualifier PARAMS ((int));
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
/* Translate count to integer, consuming tokens in the process.
Conversion terminates on the first non-digit character.
Trying to consume something that isn't a count results in no
consumption of input and a return of -1.
Overflow consumes the rest of the digits, and returns -1. */
1997-08-22 00:57:35 +02:00
static int
consume_count (type)
const char **type;
{
int count = 0;
if (! isdigit ((unsigned char)**type))
return -1;
1997-08-22 00:57:35 +02:00
while (isdigit ((unsigned char)**type))
1997-08-22 00:57:35 +02:00
{
count *= 10;
/* Check for overflow.
We assume that count is represented using two's-complement;
no power of two is divisible by ten, so if an overflow occurs
when multiplying by ten, the result will not be a multiple of
ten. */
if ((count % 10) != 0)
{
while (isdigit ((unsigned char) **type))
(*type)++;
return -1;
}
count += **type - '0';
1997-08-22 00:57:35 +02:00
(*type)++;
}
1997-08-22 00:57:35 +02:00
return (count);
}
/* Like consume_count, but for counts that are preceded and followed
by '_' if they are greater than 10. Also, -1 is returned for
failure, since 0 can be a valid value. */
static int
consume_count_with_underscores (mangled)
const char **mangled;
{
int idx;
if (**mangled == '_')
{
(*mangled)++;
if (!isdigit ((unsigned char)**mangled))
return -1;
idx = consume_count (mangled);
if (**mangled != '_')
/* The trailing underscore was missing. */
return -1;
(*mangled)++;
}
else
{
if (**mangled < '0' || **mangled > '9')
return -1;
idx = **mangled - '0';
(*mangled)++;
}
return idx;
}
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
/* C is the code for a type-qualifier. Return the TYPE_QUAL
corresponding to this qualifier. */
static int
code_for_qualifier (c)
int c;
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
{
switch (c)
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
{
case 'C':
return TYPE_QUAL_CONST;
case 'V':
return TYPE_QUAL_VOLATILE;
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
case 'u':
return TYPE_QUAL_RESTRICT;
default:
break;
}
/* C was an invalid qualifier. */
abort ();
}
/* Return the string corresponding to the qualifiers given by
TYPE_QUALS. */
static const char*
qualifier_string (type_quals)
int type_quals;
{
switch (type_quals)
{
case TYPE_UNQUALIFIED:
return "";
case TYPE_QUAL_CONST:
return "const";
case TYPE_QUAL_VOLATILE:
return "volatile";
case TYPE_QUAL_RESTRICT:
return "__restrict";
case TYPE_QUAL_CONST | TYPE_QUAL_VOLATILE:
return "const volatile";
case TYPE_QUAL_CONST | TYPE_QUAL_RESTRICT:
return "const __restrict";
case TYPE_QUAL_VOLATILE | TYPE_QUAL_RESTRICT:
return "volatile __restrict";
case TYPE_QUAL_CONST | TYPE_QUAL_VOLATILE | TYPE_QUAL_RESTRICT:
return "const volatile __restrict";
default:
break;
}
/* TYPE_QUALS was an invalid qualifier set. */
abort ();
}
/* C is the code for a type-qualifier. Return the string
corresponding to this qualifier. This function should only be
called with a valid qualifier code. */
static const char*
demangle_qualifier (c)
int c;
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
{
return qualifier_string (code_for_qualifier (c));
}
1997-08-22 00:57:35 +02:00
int
cplus_demangle_opname (opname, result, options)
const char *opname;
char *result;
int options;
{
Warning fixes: * Makefile.in (c-lang.o): Depend on c-tree.h, c-lex.h and toplev.h. (c-lex.o): Depend on output.h. (c-common.o): Likewise. (stmt.o): Likewise. (calls.o): Likewise. (integrate.o): Depend on toplev.h. (regclass.o): Depend on output.h. (final.o): Depend on reload.h. * c-common.c: Include output.h. (check_format_info): Remove unused variable `integral_format'. * c-decl.c (print_lang_decl): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (print_lang_type): Likewise. (maybe_build_cleanup): Likewise for parameter `decl'. (copy_lang_decl): Likewise for parameter `node'. * c-lang.c: Include c-tree.h, c-lex.h and toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (lookup_interface): Likewise for parameter `arg'. (is_class_name): Likewise. (maybe_objc_check_decl): Likewise for parameter `decl'. (maybe_objc_comptypes): Likewise for parameters `lhs', `rhs' and `reflexive'. (maybe_objc_method_name): Likewise for parameter `decl'. (build_objc_string): Likewise for parameters `len' and `str'. * c-lex.c: Include output.h. * c-lex.h (position_after_white_space): Correct typo in prototype. * c-tree.h (finish_file, c_expand_start_cond, c_expand_start_else, c_expand_end_cond, init_iterators): Add prototypes. * caller-save.c (set_reg_live): Mark parameters `reg' and `setter' with ATTRIBUTE_UNUSED. * calls.c: Include output.h. * cccp.c (pipe_closed): Mark parameter `signo' with ATTRIBUTE_UNUSED. * combine.c: Move inclusion of expr.h to after insn-config.h. * iris6.h (ASM_IDENTIFY_GCC, ASM_IDENTIFY_LANGUAGE): Don't define as empty, rather define as ((void)0). * sparc.c (sparc_check_64): Add braces around ambiguous `else'. Add parentheses around assignment used as truth value. * cplus-dem.c (squangle_mop_up): Change return type to void. (internal_cplus_demangle): Remove unused parameter `options'. All callers changed. (cplus_demangle_opname): Remove function wide variable `int i' and replace with `size_t i' at each location where it is used. (cplus_demangle_opname): change type of `i' from int to size_t. * cppexp.c (right_shift): Mark parameter `pfile' with ATTRIBUTE_UNUSED. * cpphash.c (cpp_lookup): Likewise. (cpp_hash_cleanup): Likewise. * cpplib.c (parse_name): Add a prototype and make it static. (null_underflow): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (null_cleanup): Likewise for parameters `pbuf' and `pfile'. (macro_cleanup): Likewise for parameter `pfile'. (file_cleanup): Likewise. * cpplib.h (cpp_reader_init, cpp_options_init, cpp_start_read, cpp_read_check_assertion, skip_rest_of_line): Add prototypes. * crtstuff.c (force_to_data, __CTOR_LIST__, force_to_data, __DTOR_END__, __FRAME_END__): Mark with ATTRIBUTE_UNUSED. * cse.c (cse_check_loop_start): Mark parameter `set' with ATTRIBUTE_UNUSED. * dbxout.c (flag_minimal_debug, have_used_extensions, source_label_number): Move inside macro wrapper check against defined (DBX_DEBUGGING_INFO) || defined (XCOFF_DEBUGGING_INFO). * dwarf2out.c (gen_entry_point_die): Hide prototype and definition. * except.h (doing_eh): Provide prototype. * expr.c: Move inclusion of expr.h to after insn-config.h. * final.c: Include reload.h. (shorten_branches): Cast the first argument of bzero to char *. * fix-header.c (cpp_print_containing_files): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (cpp_fatal): Likewise. * flow.c (find_basic_blocks_1): Cast the first argument of bzero to char *. * genattrtab.c (make_length_attrs): Change the type of variable `i' from int to size_t. (zero_fn): Mark parameter `exp' with ATTRIBUTE_UNUSED. (one_fn): Likewise. * genextract.c (main): When generating insn-extract.c, mark variable `junk' with ATTRIBUTE_UNUSED. * gengenrtl.c (gencode): When generating genrtl.c, cast the first argument of bzero to char*. * integrate.c: Include toplev.h. * libgcc2.c: Wrap `struct exception_table' and `find_exception_handler' in macro DWARF2_UNWIND_INFO. * objc/Make-lang.in (objc-act.o): Depend on toplev.h. * objc/objc-act.c: Include toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (finish_protocol): Likewise for parameter `protocol'. * output.h (declare_weak): Add prototype. (decode_reg_name): Don't wrap with TREE_CODE macro. (assemble_alias): Add prototype. * regclass.c: Include output.h. * reload.h (reloads_conflict): Add prototype. * rtl.h (print_rtl_single, mark_elimiation, reg_class_subset_p, output_func_start_profiler): Add prototypes. * rtlanal.c (reg_set_p_1): Mark parameters `x' and `pat' with ATTRIBUTE_UNUSED. * scan-decls.c: Include scan.h. * scan.h (recognized_function, recognized_extern): Add prototypes. * stmt.c: Include output.h. * toplev.c (error_for_asm, warning_for_asm): Remove prototypes. (output_lang_identify): Hide prototype and definition. (float_signal): Mark parameter `signo' with ATTRIBUTE_UNUSED. (pipe_closed): Likewise. * toplev.h (count_error, strip_off_ending, error_for_asm, warning_for_asm): Add prototypes. From-SVN: r19712
1998-05-13 14:40:39 +02:00
int len, len1, ret;
1997-08-22 00:57:35 +02:00
string type;
struct work_stuff work[1];
const char *tem;
len = strlen(opname);
result[0] = '\0';
ret = 0;
memset ((char *) work, 0, sizeof (work));
1997-08-22 00:57:35 +02:00
work->options = options;
1997-08-22 00:57:35 +02:00
if (opname[0] == '_' && opname[1] == '_'
&& opname[2] == 'o' && opname[3] == 'p')
{
/* ANSI. */
/* type conversion operator. */
tem = opname + 4;
if (do_type (work, &tem, &type))
{
strcat (result, "operator ");
strncat (result, type.b, type.p - type.b);
string_delete (&type);
ret = 1;
}
}
else if (opname[0] == '_' && opname[1] == '_'
&& opname[2] >= 'a' && opname[2] <= 'z'
&& opname[3] >= 'a' && opname[3] <= 'z')
{
if (opname[4] == '\0')
{
/* Operator. */
Warning fixes: * Makefile.in (c-lang.o): Depend on c-tree.h, c-lex.h and toplev.h. (c-lex.o): Depend on output.h. (c-common.o): Likewise. (stmt.o): Likewise. (calls.o): Likewise. (integrate.o): Depend on toplev.h. (regclass.o): Depend on output.h. (final.o): Depend on reload.h. * c-common.c: Include output.h. (check_format_info): Remove unused variable `integral_format'. * c-decl.c (print_lang_decl): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (print_lang_type): Likewise. (maybe_build_cleanup): Likewise for parameter `decl'. (copy_lang_decl): Likewise for parameter `node'. * c-lang.c: Include c-tree.h, c-lex.h and toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (lookup_interface): Likewise for parameter `arg'. (is_class_name): Likewise. (maybe_objc_check_decl): Likewise for parameter `decl'. (maybe_objc_comptypes): Likewise for parameters `lhs', `rhs' and `reflexive'. (maybe_objc_method_name): Likewise for parameter `decl'. (build_objc_string): Likewise for parameters `len' and `str'. * c-lex.c: Include output.h. * c-lex.h (position_after_white_space): Correct typo in prototype. * c-tree.h (finish_file, c_expand_start_cond, c_expand_start_else, c_expand_end_cond, init_iterators): Add prototypes. * caller-save.c (set_reg_live): Mark parameters `reg' and `setter' with ATTRIBUTE_UNUSED. * calls.c: Include output.h. * cccp.c (pipe_closed): Mark parameter `signo' with ATTRIBUTE_UNUSED. * combine.c: Move inclusion of expr.h to after insn-config.h. * iris6.h (ASM_IDENTIFY_GCC, ASM_IDENTIFY_LANGUAGE): Don't define as empty, rather define as ((void)0). * sparc.c (sparc_check_64): Add braces around ambiguous `else'. Add parentheses around assignment used as truth value. * cplus-dem.c (squangle_mop_up): Change return type to void. (internal_cplus_demangle): Remove unused parameter `options'. All callers changed. (cplus_demangle_opname): Remove function wide variable `int i' and replace with `size_t i' at each location where it is used. (cplus_demangle_opname): change type of `i' from int to size_t. * cppexp.c (right_shift): Mark parameter `pfile' with ATTRIBUTE_UNUSED. * cpphash.c (cpp_lookup): Likewise. (cpp_hash_cleanup): Likewise. * cpplib.c (parse_name): Add a prototype and make it static. (null_underflow): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (null_cleanup): Likewise for parameters `pbuf' and `pfile'. (macro_cleanup): Likewise for parameter `pfile'. (file_cleanup): Likewise. * cpplib.h (cpp_reader_init, cpp_options_init, cpp_start_read, cpp_read_check_assertion, skip_rest_of_line): Add prototypes. * crtstuff.c (force_to_data, __CTOR_LIST__, force_to_data, __DTOR_END__, __FRAME_END__): Mark with ATTRIBUTE_UNUSED. * cse.c (cse_check_loop_start): Mark parameter `set' with ATTRIBUTE_UNUSED. * dbxout.c (flag_minimal_debug, have_used_extensions, source_label_number): Move inside macro wrapper check against defined (DBX_DEBUGGING_INFO) || defined (XCOFF_DEBUGGING_INFO). * dwarf2out.c (gen_entry_point_die): Hide prototype and definition. * except.h (doing_eh): Provide prototype. * expr.c: Move inclusion of expr.h to after insn-config.h. * final.c: Include reload.h. (shorten_branches): Cast the first argument of bzero to char *. * fix-header.c (cpp_print_containing_files): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (cpp_fatal): Likewise. * flow.c (find_basic_blocks_1): Cast the first argument of bzero to char *. * genattrtab.c (make_length_attrs): Change the type of variable `i' from int to size_t. (zero_fn): Mark parameter `exp' with ATTRIBUTE_UNUSED. (one_fn): Likewise. * genextract.c (main): When generating insn-extract.c, mark variable `junk' with ATTRIBUTE_UNUSED. * gengenrtl.c (gencode): When generating genrtl.c, cast the first argument of bzero to char*. * integrate.c: Include toplev.h. * libgcc2.c: Wrap `struct exception_table' and `find_exception_handler' in macro DWARF2_UNWIND_INFO. * objc/Make-lang.in (objc-act.o): Depend on toplev.h. * objc/objc-act.c: Include toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (finish_protocol): Likewise for parameter `protocol'. * output.h (declare_weak): Add prototype. (decode_reg_name): Don't wrap with TREE_CODE macro. (assemble_alias): Add prototype. * regclass.c: Include output.h. * reload.h (reloads_conflict): Add prototype. * rtl.h (print_rtl_single, mark_elimiation, reg_class_subset_p, output_func_start_profiler): Add prototypes. * rtlanal.c (reg_set_p_1): Mark parameters `x' and `pat' with ATTRIBUTE_UNUSED. * scan-decls.c: Include scan.h. * scan.h (recognized_function, recognized_extern): Add prototypes. * stmt.c: Include output.h. * toplev.c (error_for_asm, warning_for_asm): Remove prototypes. (output_lang_identify): Hide prototype and definition. (float_signal): Mark parameter `signo' with ATTRIBUTE_UNUSED. (pipe_closed): Likewise. * toplev.h (count_error, strip_off_ending, error_for_asm, warning_for_asm): Add prototypes. From-SVN: r19712
1998-05-13 14:40:39 +02:00
size_t i;
1997-08-22 00:57:35 +02:00
for (i = 0; i < sizeof (optable) / sizeof (optable[0]); i++)
{
if (strlen (optable[i].in) == 2
&& memcmp (optable[i].in, opname + 2, 2) == 0)
{
strcat (result, "operator");
strcat (result, optable[i].out);
ret = 1;
break;
}
}
}
else
{
if (opname[2] == 'a' && opname[5] == '\0')
{
/* Assignment. */
Warning fixes: * Makefile.in (c-lang.o): Depend on c-tree.h, c-lex.h and toplev.h. (c-lex.o): Depend on output.h. (c-common.o): Likewise. (stmt.o): Likewise. (calls.o): Likewise. (integrate.o): Depend on toplev.h. (regclass.o): Depend on output.h. (final.o): Depend on reload.h. * c-common.c: Include output.h. (check_format_info): Remove unused variable `integral_format'. * c-decl.c (print_lang_decl): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (print_lang_type): Likewise. (maybe_build_cleanup): Likewise for parameter `decl'. (copy_lang_decl): Likewise for parameter `node'. * c-lang.c: Include c-tree.h, c-lex.h and toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (lookup_interface): Likewise for parameter `arg'. (is_class_name): Likewise. (maybe_objc_check_decl): Likewise for parameter `decl'. (maybe_objc_comptypes): Likewise for parameters `lhs', `rhs' and `reflexive'. (maybe_objc_method_name): Likewise for parameter `decl'. (build_objc_string): Likewise for parameters `len' and `str'. * c-lex.c: Include output.h. * c-lex.h (position_after_white_space): Correct typo in prototype. * c-tree.h (finish_file, c_expand_start_cond, c_expand_start_else, c_expand_end_cond, init_iterators): Add prototypes. * caller-save.c (set_reg_live): Mark parameters `reg' and `setter' with ATTRIBUTE_UNUSED. * calls.c: Include output.h. * cccp.c (pipe_closed): Mark parameter `signo' with ATTRIBUTE_UNUSED. * combine.c: Move inclusion of expr.h to after insn-config.h. * iris6.h (ASM_IDENTIFY_GCC, ASM_IDENTIFY_LANGUAGE): Don't define as empty, rather define as ((void)0). * sparc.c (sparc_check_64): Add braces around ambiguous `else'. Add parentheses around assignment used as truth value. * cplus-dem.c (squangle_mop_up): Change return type to void. (internal_cplus_demangle): Remove unused parameter `options'. All callers changed. (cplus_demangle_opname): Remove function wide variable `int i' and replace with `size_t i' at each location where it is used. (cplus_demangle_opname): change type of `i' from int to size_t. * cppexp.c (right_shift): Mark parameter `pfile' with ATTRIBUTE_UNUSED. * cpphash.c (cpp_lookup): Likewise. (cpp_hash_cleanup): Likewise. * cpplib.c (parse_name): Add a prototype and make it static. (null_underflow): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (null_cleanup): Likewise for parameters `pbuf' and `pfile'. (macro_cleanup): Likewise for parameter `pfile'. (file_cleanup): Likewise. * cpplib.h (cpp_reader_init, cpp_options_init, cpp_start_read, cpp_read_check_assertion, skip_rest_of_line): Add prototypes. * crtstuff.c (force_to_data, __CTOR_LIST__, force_to_data, __DTOR_END__, __FRAME_END__): Mark with ATTRIBUTE_UNUSED. * cse.c (cse_check_loop_start): Mark parameter `set' with ATTRIBUTE_UNUSED. * dbxout.c (flag_minimal_debug, have_used_extensions, source_label_number): Move inside macro wrapper check against defined (DBX_DEBUGGING_INFO) || defined (XCOFF_DEBUGGING_INFO). * dwarf2out.c (gen_entry_point_die): Hide prototype and definition. * except.h (doing_eh): Provide prototype. * expr.c: Move inclusion of expr.h to after insn-config.h. * final.c: Include reload.h. (shorten_branches): Cast the first argument of bzero to char *. * fix-header.c (cpp_print_containing_files): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (cpp_fatal): Likewise. * flow.c (find_basic_blocks_1): Cast the first argument of bzero to char *. * genattrtab.c (make_length_attrs): Change the type of variable `i' from int to size_t. (zero_fn): Mark parameter `exp' with ATTRIBUTE_UNUSED. (one_fn): Likewise. * genextract.c (main): When generating insn-extract.c, mark variable `junk' with ATTRIBUTE_UNUSED. * gengenrtl.c (gencode): When generating genrtl.c, cast the first argument of bzero to char*. * integrate.c: Include toplev.h. * libgcc2.c: Wrap `struct exception_table' and `find_exception_handler' in macro DWARF2_UNWIND_INFO. * objc/Make-lang.in (objc-act.o): Depend on toplev.h. * objc/objc-act.c: Include toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (finish_protocol): Likewise for parameter `protocol'. * output.h (declare_weak): Add prototype. (decode_reg_name): Don't wrap with TREE_CODE macro. (assemble_alias): Add prototype. * regclass.c: Include output.h. * reload.h (reloads_conflict): Add prototype. * rtl.h (print_rtl_single, mark_elimiation, reg_class_subset_p, output_func_start_profiler): Add prototypes. * rtlanal.c (reg_set_p_1): Mark parameters `x' and `pat' with ATTRIBUTE_UNUSED. * scan-decls.c: Include scan.h. * scan.h (recognized_function, recognized_extern): Add prototypes. * stmt.c: Include output.h. * toplev.c (error_for_asm, warning_for_asm): Remove prototypes. (output_lang_identify): Hide prototype and definition. (float_signal): Mark parameter `signo' with ATTRIBUTE_UNUSED. (pipe_closed): Likewise. * toplev.h (count_error, strip_off_ending, error_for_asm, warning_for_asm): Add prototypes. From-SVN: r19712
1998-05-13 14:40:39 +02:00
size_t i;
1997-08-22 00:57:35 +02:00
for (i = 0; i < sizeof (optable) / sizeof (optable[0]); i++)
{
if (strlen (optable[i].in) == 3
&& memcmp (optable[i].in, opname + 2, 3) == 0)
{
strcat (result, "operator");
strcat (result, optable[i].out);
ret = 1;
break;
}
1997-08-22 00:57:35 +02:00
}
}
}
}
else if (len >= 3
1997-08-22 00:57:35 +02:00
&& opname[0] == 'o'
&& opname[1] == 'p'
&& strchr (cplus_markers, opname[2]) != NULL)
{
/* see if it's an assignment expression */
if (len >= 10 /* op$assign_ */
&& memcmp (opname + 3, "assign_", 7) == 0)
{
Warning fixes: * Makefile.in (c-lang.o): Depend on c-tree.h, c-lex.h and toplev.h. (c-lex.o): Depend on output.h. (c-common.o): Likewise. (stmt.o): Likewise. (calls.o): Likewise. (integrate.o): Depend on toplev.h. (regclass.o): Depend on output.h. (final.o): Depend on reload.h. * c-common.c: Include output.h. (check_format_info): Remove unused variable `integral_format'. * c-decl.c (print_lang_decl): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (print_lang_type): Likewise. (maybe_build_cleanup): Likewise for parameter `decl'. (copy_lang_decl): Likewise for parameter `node'. * c-lang.c: Include c-tree.h, c-lex.h and toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (lookup_interface): Likewise for parameter `arg'. (is_class_name): Likewise. (maybe_objc_check_decl): Likewise for parameter `decl'. (maybe_objc_comptypes): Likewise for parameters `lhs', `rhs' and `reflexive'. (maybe_objc_method_name): Likewise for parameter `decl'. (build_objc_string): Likewise for parameters `len' and `str'. * c-lex.c: Include output.h. * c-lex.h (position_after_white_space): Correct typo in prototype. * c-tree.h (finish_file, c_expand_start_cond, c_expand_start_else, c_expand_end_cond, init_iterators): Add prototypes. * caller-save.c (set_reg_live): Mark parameters `reg' and `setter' with ATTRIBUTE_UNUSED. * calls.c: Include output.h. * cccp.c (pipe_closed): Mark parameter `signo' with ATTRIBUTE_UNUSED. * combine.c: Move inclusion of expr.h to after insn-config.h. * iris6.h (ASM_IDENTIFY_GCC, ASM_IDENTIFY_LANGUAGE): Don't define as empty, rather define as ((void)0). * sparc.c (sparc_check_64): Add braces around ambiguous `else'. Add parentheses around assignment used as truth value. * cplus-dem.c (squangle_mop_up): Change return type to void. (internal_cplus_demangle): Remove unused parameter `options'. All callers changed. (cplus_demangle_opname): Remove function wide variable `int i' and replace with `size_t i' at each location where it is used. (cplus_demangle_opname): change type of `i' from int to size_t. * cppexp.c (right_shift): Mark parameter `pfile' with ATTRIBUTE_UNUSED. * cpphash.c (cpp_lookup): Likewise. (cpp_hash_cleanup): Likewise. * cpplib.c (parse_name): Add a prototype and make it static. (null_underflow): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (null_cleanup): Likewise for parameters `pbuf' and `pfile'. (macro_cleanup): Likewise for parameter `pfile'. (file_cleanup): Likewise. * cpplib.h (cpp_reader_init, cpp_options_init, cpp_start_read, cpp_read_check_assertion, skip_rest_of_line): Add prototypes. * crtstuff.c (force_to_data, __CTOR_LIST__, force_to_data, __DTOR_END__, __FRAME_END__): Mark with ATTRIBUTE_UNUSED. * cse.c (cse_check_loop_start): Mark parameter `set' with ATTRIBUTE_UNUSED. * dbxout.c (flag_minimal_debug, have_used_extensions, source_label_number): Move inside macro wrapper check against defined (DBX_DEBUGGING_INFO) || defined (XCOFF_DEBUGGING_INFO). * dwarf2out.c (gen_entry_point_die): Hide prototype and definition. * except.h (doing_eh): Provide prototype. * expr.c: Move inclusion of expr.h to after insn-config.h. * final.c: Include reload.h. (shorten_branches): Cast the first argument of bzero to char *. * fix-header.c (cpp_print_containing_files): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (cpp_fatal): Likewise. * flow.c (find_basic_blocks_1): Cast the first argument of bzero to char *. * genattrtab.c (make_length_attrs): Change the type of variable `i' from int to size_t. (zero_fn): Mark parameter `exp' with ATTRIBUTE_UNUSED. (one_fn): Likewise. * genextract.c (main): When generating insn-extract.c, mark variable `junk' with ATTRIBUTE_UNUSED. * gengenrtl.c (gencode): When generating genrtl.c, cast the first argument of bzero to char*. * integrate.c: Include toplev.h. * libgcc2.c: Wrap `struct exception_table' and `find_exception_handler' in macro DWARF2_UNWIND_INFO. * objc/Make-lang.in (objc-act.o): Depend on toplev.h. * objc/objc-act.c: Include toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (finish_protocol): Likewise for parameter `protocol'. * output.h (declare_weak): Add prototype. (decode_reg_name): Don't wrap with TREE_CODE macro. (assemble_alias): Add prototype. * regclass.c: Include output.h. * reload.h (reloads_conflict): Add prototype. * rtl.h (print_rtl_single, mark_elimiation, reg_class_subset_p, output_func_start_profiler): Add prototypes. * rtlanal.c (reg_set_p_1): Mark parameters `x' and `pat' with ATTRIBUTE_UNUSED. * scan-decls.c: Include scan.h. * scan.h (recognized_function, recognized_extern): Add prototypes. * stmt.c: Include output.h. * toplev.c (error_for_asm, warning_for_asm): Remove prototypes. (output_lang_identify): Hide prototype and definition. (float_signal): Mark parameter `signo' with ATTRIBUTE_UNUSED. (pipe_closed): Likewise. * toplev.h (count_error, strip_off_ending, error_for_asm, warning_for_asm): Add prototypes. From-SVN: r19712
1998-05-13 14:40:39 +02:00
size_t i;
1997-08-22 00:57:35 +02:00
for (i = 0; i < sizeof (optable) / sizeof (optable[0]); i++)
{
len1 = len - 10;
if ((int) strlen (optable[i].in) == len1
1997-08-22 00:57:35 +02:00
&& memcmp (optable[i].in, opname + 10, len1) == 0)
{
strcat (result, "operator");
strcat (result, optable[i].out);
strcat (result, "=");
ret = 1;
break;
}
}
}
else
{
Warning fixes: * Makefile.in (c-lang.o): Depend on c-tree.h, c-lex.h and toplev.h. (c-lex.o): Depend on output.h. (c-common.o): Likewise. (stmt.o): Likewise. (calls.o): Likewise. (integrate.o): Depend on toplev.h. (regclass.o): Depend on output.h. (final.o): Depend on reload.h. * c-common.c: Include output.h. (check_format_info): Remove unused variable `integral_format'. * c-decl.c (print_lang_decl): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (print_lang_type): Likewise. (maybe_build_cleanup): Likewise for parameter `decl'. (copy_lang_decl): Likewise for parameter `node'. * c-lang.c: Include c-tree.h, c-lex.h and toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (lookup_interface): Likewise for parameter `arg'. (is_class_name): Likewise. (maybe_objc_check_decl): Likewise for parameter `decl'. (maybe_objc_comptypes): Likewise for parameters `lhs', `rhs' and `reflexive'. (maybe_objc_method_name): Likewise for parameter `decl'. (build_objc_string): Likewise for parameters `len' and `str'. * c-lex.c: Include output.h. * c-lex.h (position_after_white_space): Correct typo in prototype. * c-tree.h (finish_file, c_expand_start_cond, c_expand_start_else, c_expand_end_cond, init_iterators): Add prototypes. * caller-save.c (set_reg_live): Mark parameters `reg' and `setter' with ATTRIBUTE_UNUSED. * calls.c: Include output.h. * cccp.c (pipe_closed): Mark parameter `signo' with ATTRIBUTE_UNUSED. * combine.c: Move inclusion of expr.h to after insn-config.h. * iris6.h (ASM_IDENTIFY_GCC, ASM_IDENTIFY_LANGUAGE): Don't define as empty, rather define as ((void)0). * sparc.c (sparc_check_64): Add braces around ambiguous `else'. Add parentheses around assignment used as truth value. * cplus-dem.c (squangle_mop_up): Change return type to void. (internal_cplus_demangle): Remove unused parameter `options'. All callers changed. (cplus_demangle_opname): Remove function wide variable `int i' and replace with `size_t i' at each location where it is used. (cplus_demangle_opname): change type of `i' from int to size_t. * cppexp.c (right_shift): Mark parameter `pfile' with ATTRIBUTE_UNUSED. * cpphash.c (cpp_lookup): Likewise. (cpp_hash_cleanup): Likewise. * cpplib.c (parse_name): Add a prototype and make it static. (null_underflow): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (null_cleanup): Likewise for parameters `pbuf' and `pfile'. (macro_cleanup): Likewise for parameter `pfile'. (file_cleanup): Likewise. * cpplib.h (cpp_reader_init, cpp_options_init, cpp_start_read, cpp_read_check_assertion, skip_rest_of_line): Add prototypes. * crtstuff.c (force_to_data, __CTOR_LIST__, force_to_data, __DTOR_END__, __FRAME_END__): Mark with ATTRIBUTE_UNUSED. * cse.c (cse_check_loop_start): Mark parameter `set' with ATTRIBUTE_UNUSED. * dbxout.c (flag_minimal_debug, have_used_extensions, source_label_number): Move inside macro wrapper check against defined (DBX_DEBUGGING_INFO) || defined (XCOFF_DEBUGGING_INFO). * dwarf2out.c (gen_entry_point_die): Hide prototype and definition. * except.h (doing_eh): Provide prototype. * expr.c: Move inclusion of expr.h to after insn-config.h. * final.c: Include reload.h. (shorten_branches): Cast the first argument of bzero to char *. * fix-header.c (cpp_print_containing_files): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (cpp_fatal): Likewise. * flow.c (find_basic_blocks_1): Cast the first argument of bzero to char *. * genattrtab.c (make_length_attrs): Change the type of variable `i' from int to size_t. (zero_fn): Mark parameter `exp' with ATTRIBUTE_UNUSED. (one_fn): Likewise. * genextract.c (main): When generating insn-extract.c, mark variable `junk' with ATTRIBUTE_UNUSED. * gengenrtl.c (gencode): When generating genrtl.c, cast the first argument of bzero to char*. * integrate.c: Include toplev.h. * libgcc2.c: Wrap `struct exception_table' and `find_exception_handler' in macro DWARF2_UNWIND_INFO. * objc/Make-lang.in (objc-act.o): Depend on toplev.h. * objc/objc-act.c: Include toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (finish_protocol): Likewise for parameter `protocol'. * output.h (declare_weak): Add prototype. (decode_reg_name): Don't wrap with TREE_CODE macro. (assemble_alias): Add prototype. * regclass.c: Include output.h. * reload.h (reloads_conflict): Add prototype. * rtl.h (print_rtl_single, mark_elimiation, reg_class_subset_p, output_func_start_profiler): Add prototypes. * rtlanal.c (reg_set_p_1): Mark parameters `x' and `pat' with ATTRIBUTE_UNUSED. * scan-decls.c: Include scan.h. * scan.h (recognized_function, recognized_extern): Add prototypes. * stmt.c: Include output.h. * toplev.c (error_for_asm, warning_for_asm): Remove prototypes. (output_lang_identify): Hide prototype and definition. (float_signal): Mark parameter `signo' with ATTRIBUTE_UNUSED. (pipe_closed): Likewise. * toplev.h (count_error, strip_off_ending, error_for_asm, warning_for_asm): Add prototypes. From-SVN: r19712
1998-05-13 14:40:39 +02:00
size_t i;
1997-08-22 00:57:35 +02:00
for (i = 0; i < sizeof (optable) / sizeof (optable[0]); i++)
{
len1 = len - 3;
if ((int) strlen (optable[i].in) == len1
1997-08-22 00:57:35 +02:00
&& memcmp (optable[i].in, opname + 3, len1) == 0)
{
strcat (result, "operator");
strcat (result, optable[i].out);
ret = 1;
break;
}
}
}
}
else if (len >= 5 && memcmp (opname, "type", 4) == 0
&& strchr (cplus_markers, opname[4]) != NULL)
{
/* type conversion operator */
tem = opname + 5;
if (do_type (work, &tem, &type))
{
strcat (result, "operator ");
strncat (result, type.b, type.p - type.b);
string_delete (&type);
ret = 1;
}
}
squangle_mop_up (work);
1997-08-22 00:57:35 +02:00
return ret;
}
/* Takes operator name as e.g. "++" and returns mangled
operator name (e.g. "postincrement_expr"), or NULL if not found.
If OPTIONS & DMGL_ANSI == 1, return the ANSI name;
if OPTIONS & DMGL_ANSI == 0, return the old GNU name. */
const char *
cplus_mangle_opname (opname, options)
const char *opname;
int options;
{
Warning fixes: * Makefile.in (c-lang.o): Depend on c-tree.h, c-lex.h and toplev.h. (c-lex.o): Depend on output.h. (c-common.o): Likewise. (stmt.o): Likewise. (calls.o): Likewise. (integrate.o): Depend on toplev.h. (regclass.o): Depend on output.h. (final.o): Depend on reload.h. * c-common.c: Include output.h. (check_format_info): Remove unused variable `integral_format'. * c-decl.c (print_lang_decl): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (print_lang_type): Likewise. (maybe_build_cleanup): Likewise for parameter `decl'. (copy_lang_decl): Likewise for parameter `node'. * c-lang.c: Include c-tree.h, c-lex.h and toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (lookup_interface): Likewise for parameter `arg'. (is_class_name): Likewise. (maybe_objc_check_decl): Likewise for parameter `decl'. (maybe_objc_comptypes): Likewise for parameters `lhs', `rhs' and `reflexive'. (maybe_objc_method_name): Likewise for parameter `decl'. (build_objc_string): Likewise for parameters `len' and `str'. * c-lex.c: Include output.h. * c-lex.h (position_after_white_space): Correct typo in prototype. * c-tree.h (finish_file, c_expand_start_cond, c_expand_start_else, c_expand_end_cond, init_iterators): Add prototypes. * caller-save.c (set_reg_live): Mark parameters `reg' and `setter' with ATTRIBUTE_UNUSED. * calls.c: Include output.h. * cccp.c (pipe_closed): Mark parameter `signo' with ATTRIBUTE_UNUSED. * combine.c: Move inclusion of expr.h to after insn-config.h. * iris6.h (ASM_IDENTIFY_GCC, ASM_IDENTIFY_LANGUAGE): Don't define as empty, rather define as ((void)0). * sparc.c (sparc_check_64): Add braces around ambiguous `else'. Add parentheses around assignment used as truth value. * cplus-dem.c (squangle_mop_up): Change return type to void. (internal_cplus_demangle): Remove unused parameter `options'. All callers changed. (cplus_demangle_opname): Remove function wide variable `int i' and replace with `size_t i' at each location where it is used. (cplus_demangle_opname): change type of `i' from int to size_t. * cppexp.c (right_shift): Mark parameter `pfile' with ATTRIBUTE_UNUSED. * cpphash.c (cpp_lookup): Likewise. (cpp_hash_cleanup): Likewise. * cpplib.c (parse_name): Add a prototype and make it static. (null_underflow): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (null_cleanup): Likewise for parameters `pbuf' and `pfile'. (macro_cleanup): Likewise for parameter `pfile'. (file_cleanup): Likewise. * cpplib.h (cpp_reader_init, cpp_options_init, cpp_start_read, cpp_read_check_assertion, skip_rest_of_line): Add prototypes. * crtstuff.c (force_to_data, __CTOR_LIST__, force_to_data, __DTOR_END__, __FRAME_END__): Mark with ATTRIBUTE_UNUSED. * cse.c (cse_check_loop_start): Mark parameter `set' with ATTRIBUTE_UNUSED. * dbxout.c (flag_minimal_debug, have_used_extensions, source_label_number): Move inside macro wrapper check against defined (DBX_DEBUGGING_INFO) || defined (XCOFF_DEBUGGING_INFO). * dwarf2out.c (gen_entry_point_die): Hide prototype and definition. * except.h (doing_eh): Provide prototype. * expr.c: Move inclusion of expr.h to after insn-config.h. * final.c: Include reload.h. (shorten_branches): Cast the first argument of bzero to char *. * fix-header.c (cpp_print_containing_files): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (cpp_fatal): Likewise. * flow.c (find_basic_blocks_1): Cast the first argument of bzero to char *. * genattrtab.c (make_length_attrs): Change the type of variable `i' from int to size_t. (zero_fn): Mark parameter `exp' with ATTRIBUTE_UNUSED. (one_fn): Likewise. * genextract.c (main): When generating insn-extract.c, mark variable `junk' with ATTRIBUTE_UNUSED. * gengenrtl.c (gencode): When generating genrtl.c, cast the first argument of bzero to char*. * integrate.c: Include toplev.h. * libgcc2.c: Wrap `struct exception_table' and `find_exception_handler' in macro DWARF2_UNWIND_INFO. * objc/Make-lang.in (objc-act.o): Depend on toplev.h. * objc/objc-act.c: Include toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (finish_protocol): Likewise for parameter `protocol'. * output.h (declare_weak): Add prototype. (decode_reg_name): Don't wrap with TREE_CODE macro. (assemble_alias): Add prototype. * regclass.c: Include output.h. * reload.h (reloads_conflict): Add prototype. * rtl.h (print_rtl_single, mark_elimiation, reg_class_subset_p, output_func_start_profiler): Add prototypes. * rtlanal.c (reg_set_p_1): Mark parameters `x' and `pat' with ATTRIBUTE_UNUSED. * scan-decls.c: Include scan.h. * scan.h (recognized_function, recognized_extern): Add prototypes. * stmt.c: Include output.h. * toplev.c (error_for_asm, warning_for_asm): Remove prototypes. (output_lang_identify): Hide prototype and definition. (float_signal): Mark parameter `signo' with ATTRIBUTE_UNUSED. (pipe_closed): Likewise. * toplev.h (count_error, strip_off_ending, error_for_asm, warning_for_asm): Add prototypes. From-SVN: r19712
1998-05-13 14:40:39 +02:00
size_t i;
1997-08-22 00:57:35 +02:00
int len;
len = strlen (opname);
for (i = 0; i < sizeof (optable) / sizeof (optable[0]); i++)
{
if ((int) strlen (optable[i].out) == len
1997-08-22 00:57:35 +02:00
&& (options & DMGL_ANSI) == (optable[i].flags & DMGL_ANSI)
&& memcmp (optable[i].out, opname, len) == 0)
return optable[i].in;
}
return (0);
}
/* char *cplus_demangle (const char *mangled, int options)
If MANGLED is a mangled function name produced by GNU C++, then
a pointer to a malloced string giving a C++ representation
of the name will be returned; otherwise NULL will be returned.
It is the caller's responsibility to free the string which
is returned.
The OPTIONS arg may contain one or more of the following bits:
DMGL_ANSI ANSI qualifiers such as `const' and `void' are
included.
DMGL_PARAMS Function parameters are included.
For example,
1997-08-22 00:57:35 +02:00
cplus_demangle ("foo__1Ai", DMGL_PARAMS) => "A::foo(int)"
cplus_demangle ("foo__1Ai", DMGL_PARAMS | DMGL_ANSI) => "A::foo(int)"
cplus_demangle ("foo__1Ai", 0) => "A::foo"
cplus_demangle ("foo__1Afe", DMGL_PARAMS) => "A::foo(float,...)"
cplus_demangle ("foo__1Afe", DMGL_PARAMS | DMGL_ANSI)=> "A::foo(float,...)"
cplus_demangle ("foo__1Afe", 0) => "A::foo"
Note that any leading underscores, or other such characters prepended by
the compilation system, are presumed to have already been stripped from
MANGLED. */
char *
cplus_demangle (mangled, options)
const char *mangled;
int options;
{
char *ret;
struct work_stuff work[1];
memset ((char *) work, 0, sizeof (work));
work -> options = options;
if ((work -> options & DMGL_STYLE_MASK) == 0)
work -> options |= (int) current_demangling_style & DMGL_STYLE_MASK;
Warning fixes: * Makefile.in (c-lang.o): Depend on c-tree.h, c-lex.h and toplev.h. (c-lex.o): Depend on output.h. (c-common.o): Likewise. (stmt.o): Likewise. (calls.o): Likewise. (integrate.o): Depend on toplev.h. (regclass.o): Depend on output.h. (final.o): Depend on reload.h. * c-common.c: Include output.h. (check_format_info): Remove unused variable `integral_format'. * c-decl.c (print_lang_decl): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (print_lang_type): Likewise. (maybe_build_cleanup): Likewise for parameter `decl'. (copy_lang_decl): Likewise for parameter `node'. * c-lang.c: Include c-tree.h, c-lex.h and toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (lookup_interface): Likewise for parameter `arg'. (is_class_name): Likewise. (maybe_objc_check_decl): Likewise for parameter `decl'. (maybe_objc_comptypes): Likewise for parameters `lhs', `rhs' and `reflexive'. (maybe_objc_method_name): Likewise for parameter `decl'. (build_objc_string): Likewise for parameters `len' and `str'. * c-lex.c: Include output.h. * c-lex.h (position_after_white_space): Correct typo in prototype. * c-tree.h (finish_file, c_expand_start_cond, c_expand_start_else, c_expand_end_cond, init_iterators): Add prototypes. * caller-save.c (set_reg_live): Mark parameters `reg' and `setter' with ATTRIBUTE_UNUSED. * calls.c: Include output.h. * cccp.c (pipe_closed): Mark parameter `signo' with ATTRIBUTE_UNUSED. * combine.c: Move inclusion of expr.h to after insn-config.h. * iris6.h (ASM_IDENTIFY_GCC, ASM_IDENTIFY_LANGUAGE): Don't define as empty, rather define as ((void)0). * sparc.c (sparc_check_64): Add braces around ambiguous `else'. Add parentheses around assignment used as truth value. * cplus-dem.c (squangle_mop_up): Change return type to void. (internal_cplus_demangle): Remove unused parameter `options'. All callers changed. (cplus_demangle_opname): Remove function wide variable `int i' and replace with `size_t i' at each location where it is used. (cplus_demangle_opname): change type of `i' from int to size_t. * cppexp.c (right_shift): Mark parameter `pfile' with ATTRIBUTE_UNUSED. * cpphash.c (cpp_lookup): Likewise. (cpp_hash_cleanup): Likewise. * cpplib.c (parse_name): Add a prototype and make it static. (null_underflow): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (null_cleanup): Likewise for parameters `pbuf' and `pfile'. (macro_cleanup): Likewise for parameter `pfile'. (file_cleanup): Likewise. * cpplib.h (cpp_reader_init, cpp_options_init, cpp_start_read, cpp_read_check_assertion, skip_rest_of_line): Add prototypes. * crtstuff.c (force_to_data, __CTOR_LIST__, force_to_data, __DTOR_END__, __FRAME_END__): Mark with ATTRIBUTE_UNUSED. * cse.c (cse_check_loop_start): Mark parameter `set' with ATTRIBUTE_UNUSED. * dbxout.c (flag_minimal_debug, have_used_extensions, source_label_number): Move inside macro wrapper check against defined (DBX_DEBUGGING_INFO) || defined (XCOFF_DEBUGGING_INFO). * dwarf2out.c (gen_entry_point_die): Hide prototype and definition. * except.h (doing_eh): Provide prototype. * expr.c: Move inclusion of expr.h to after insn-config.h. * final.c: Include reload.h. (shorten_branches): Cast the first argument of bzero to char *. * fix-header.c (cpp_print_containing_files): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (cpp_fatal): Likewise. * flow.c (find_basic_blocks_1): Cast the first argument of bzero to char *. * genattrtab.c (make_length_attrs): Change the type of variable `i' from int to size_t. (zero_fn): Mark parameter `exp' with ATTRIBUTE_UNUSED. (one_fn): Likewise. * genextract.c (main): When generating insn-extract.c, mark variable `junk' with ATTRIBUTE_UNUSED. * gengenrtl.c (gencode): When generating genrtl.c, cast the first argument of bzero to char*. * integrate.c: Include toplev.h. * libgcc2.c: Wrap `struct exception_table' and `find_exception_handler' in macro DWARF2_UNWIND_INFO. * objc/Make-lang.in (objc-act.o): Depend on toplev.h. * objc/objc-act.c: Include toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (finish_protocol): Likewise for parameter `protocol'. * output.h (declare_weak): Add prototype. (decode_reg_name): Don't wrap with TREE_CODE macro. (assemble_alias): Add prototype. * regclass.c: Include output.h. * reload.h (reloads_conflict): Add prototype. * rtl.h (print_rtl_single, mark_elimiation, reg_class_subset_p, output_func_start_profiler): Add prototypes. * rtlanal.c (reg_set_p_1): Mark parameters `x' and `pat' with ATTRIBUTE_UNUSED. * scan-decls.c: Include scan.h. * scan.h (recognized_function, recognized_extern): Add prototypes. * stmt.c: Include output.h. * toplev.c (error_for_asm, warning_for_asm): Remove prototypes. (output_lang_identify): Hide prototype and definition. (float_signal): Mark parameter `signo' with ATTRIBUTE_UNUSED. (pipe_closed): Likewise. * toplev.h (count_error, strip_off_ending, error_for_asm, warning_for_asm): Add prototypes. From-SVN: r19712
1998-05-13 14:40:39 +02:00
ret = internal_cplus_demangle (work, mangled);
squangle_mop_up (work);
return (ret);
}
/* This function performs most of what cplus_demangle use to do, but
to be able to demangle a name with a B, K or n code, we need to
have a longer term memory of what types have been seen. The original
now intializes and cleans up the squangle code info, while internal
calls go directly to this routine to avoid resetting that info. */
static char *
Warning fixes: * Makefile.in (c-lang.o): Depend on c-tree.h, c-lex.h and toplev.h. (c-lex.o): Depend on output.h. (c-common.o): Likewise. (stmt.o): Likewise. (calls.o): Likewise. (integrate.o): Depend on toplev.h. (regclass.o): Depend on output.h. (final.o): Depend on reload.h. * c-common.c: Include output.h. (check_format_info): Remove unused variable `integral_format'. * c-decl.c (print_lang_decl): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (print_lang_type): Likewise. (maybe_build_cleanup): Likewise for parameter `decl'. (copy_lang_decl): Likewise for parameter `node'. * c-lang.c: Include c-tree.h, c-lex.h and toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (lookup_interface): Likewise for parameter `arg'. (is_class_name): Likewise. (maybe_objc_check_decl): Likewise for parameter `decl'. (maybe_objc_comptypes): Likewise for parameters `lhs', `rhs' and `reflexive'. (maybe_objc_method_name): Likewise for parameter `decl'. (build_objc_string): Likewise for parameters `len' and `str'. * c-lex.c: Include output.h. * c-lex.h (position_after_white_space): Correct typo in prototype. * c-tree.h (finish_file, c_expand_start_cond, c_expand_start_else, c_expand_end_cond, init_iterators): Add prototypes. * caller-save.c (set_reg_live): Mark parameters `reg' and `setter' with ATTRIBUTE_UNUSED. * calls.c: Include output.h. * cccp.c (pipe_closed): Mark parameter `signo' with ATTRIBUTE_UNUSED. * combine.c: Move inclusion of expr.h to after insn-config.h. * iris6.h (ASM_IDENTIFY_GCC, ASM_IDENTIFY_LANGUAGE): Don't define as empty, rather define as ((void)0). * sparc.c (sparc_check_64): Add braces around ambiguous `else'. Add parentheses around assignment used as truth value. * cplus-dem.c (squangle_mop_up): Change return type to void. (internal_cplus_demangle): Remove unused parameter `options'. All callers changed. (cplus_demangle_opname): Remove function wide variable `int i' and replace with `size_t i' at each location where it is used. (cplus_demangle_opname): change type of `i' from int to size_t. * cppexp.c (right_shift): Mark parameter `pfile' with ATTRIBUTE_UNUSED. * cpphash.c (cpp_lookup): Likewise. (cpp_hash_cleanup): Likewise. * cpplib.c (parse_name): Add a prototype and make it static. (null_underflow): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (null_cleanup): Likewise for parameters `pbuf' and `pfile'. (macro_cleanup): Likewise for parameter `pfile'. (file_cleanup): Likewise. * cpplib.h (cpp_reader_init, cpp_options_init, cpp_start_read, cpp_read_check_assertion, skip_rest_of_line): Add prototypes. * crtstuff.c (force_to_data, __CTOR_LIST__, force_to_data, __DTOR_END__, __FRAME_END__): Mark with ATTRIBUTE_UNUSED. * cse.c (cse_check_loop_start): Mark parameter `set' with ATTRIBUTE_UNUSED. * dbxout.c (flag_minimal_debug, have_used_extensions, source_label_number): Move inside macro wrapper check against defined (DBX_DEBUGGING_INFO) || defined (XCOFF_DEBUGGING_INFO). * dwarf2out.c (gen_entry_point_die): Hide prototype and definition. * except.h (doing_eh): Provide prototype. * expr.c: Move inclusion of expr.h to after insn-config.h. * final.c: Include reload.h. (shorten_branches): Cast the first argument of bzero to char *. * fix-header.c (cpp_print_containing_files): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (cpp_fatal): Likewise. * flow.c (find_basic_blocks_1): Cast the first argument of bzero to char *. * genattrtab.c (make_length_attrs): Change the type of variable `i' from int to size_t. (zero_fn): Mark parameter `exp' with ATTRIBUTE_UNUSED. (one_fn): Likewise. * genextract.c (main): When generating insn-extract.c, mark variable `junk' with ATTRIBUTE_UNUSED. * gengenrtl.c (gencode): When generating genrtl.c, cast the first argument of bzero to char*. * integrate.c: Include toplev.h. * libgcc2.c: Wrap `struct exception_table' and `find_exception_handler' in macro DWARF2_UNWIND_INFO. * objc/Make-lang.in (objc-act.o): Depend on toplev.h. * objc/objc-act.c: Include toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (finish_protocol): Likewise for parameter `protocol'. * output.h (declare_weak): Add prototype. (decode_reg_name): Don't wrap with TREE_CODE macro. (assemble_alias): Add prototype. * regclass.c: Include output.h. * reload.h (reloads_conflict): Add prototype. * rtl.h (print_rtl_single, mark_elimiation, reg_class_subset_p, output_func_start_profiler): Add prototypes. * rtlanal.c (reg_set_p_1): Mark parameters `x' and `pat' with ATTRIBUTE_UNUSED. * scan-decls.c: Include scan.h. * scan.h (recognized_function, recognized_extern): Add prototypes. * stmt.c: Include output.h. * toplev.c (error_for_asm, warning_for_asm): Remove prototypes. (output_lang_identify): Hide prototype and definition. (float_signal): Mark parameter `signo' with ATTRIBUTE_UNUSED. (pipe_closed): Likewise. * toplev.h (count_error, strip_off_ending, error_for_asm, warning_for_asm): Add prototypes. From-SVN: r19712
1998-05-13 14:40:39 +02:00
internal_cplus_demangle (work, mangled)
struct work_stuff *work;
const char *mangled;
{
1997-08-22 00:57:35 +02:00
string decl;
int success = 0;
char *demangled = NULL;
int s1,s2,s3,s4;
s1 = work->constructor;
s2 = work->destructor;
s3 = work->static_type;
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
s4 = work->type_quals;
work->constructor = work->destructor = 0;
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
work->type_quals = TYPE_UNQUALIFIED;
work->dllimported = 0;
1997-08-22 00:57:35 +02:00
if ((mangled != NULL) && (*mangled != '\0'))
{
string_init (&decl);
/* First check to see if gnu style demangling is active and if the
string to be demangled contains a CPLUS_MARKER. If so, attempt to
recognize one of the gnu special forms rather than looking for a
standard prefix. In particular, don't worry about whether there
is a "__" string in the mangled string. Consider "_$_5__foo" for
example. */
if ((AUTO_DEMANGLING || GNU_DEMANGLING))
{
success = gnu_special (work, &mangled, &decl);
}
if (!success)
{
success = demangle_prefix (work, &mangled, &decl);
}
if (success && (*mangled != '\0'))
{
success = demangle_signature (work, &mangled, &decl);
}
if (work->constructor == 2)
{
string_prepend (&decl, "global constructors keyed to ");
1997-08-22 00:57:35 +02:00
work->constructor = 0;
}
else if (work->destructor == 2)
{
string_prepend (&decl, "global destructors keyed to ");
1997-08-22 00:57:35 +02:00
work->destructor = 0;
}
else if (work->dllimported == 1)
{
string_prepend (&decl, "import stub for ");
work->dllimported = 0;
}
1997-08-22 00:57:35 +02:00
demangled = mop_up (work, &decl, success);
}
work->constructor = s1;
work->destructor = s2;
work->static_type = s3;
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
work->type_quals = s4;
1997-08-22 00:57:35 +02:00
return (demangled);
}
/* Clear out and squangling related storage */
Warning fixes: * Makefile.in (c-lang.o): Depend on c-tree.h, c-lex.h and toplev.h. (c-lex.o): Depend on output.h. (c-common.o): Likewise. (stmt.o): Likewise. (calls.o): Likewise. (integrate.o): Depend on toplev.h. (regclass.o): Depend on output.h. (final.o): Depend on reload.h. * c-common.c: Include output.h. (check_format_info): Remove unused variable `integral_format'. * c-decl.c (print_lang_decl): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (print_lang_type): Likewise. (maybe_build_cleanup): Likewise for parameter `decl'. (copy_lang_decl): Likewise for parameter `node'. * c-lang.c: Include c-tree.h, c-lex.h and toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (lookup_interface): Likewise for parameter `arg'. (is_class_name): Likewise. (maybe_objc_check_decl): Likewise for parameter `decl'. (maybe_objc_comptypes): Likewise for parameters `lhs', `rhs' and `reflexive'. (maybe_objc_method_name): Likewise for parameter `decl'. (build_objc_string): Likewise for parameters `len' and `str'. * c-lex.c: Include output.h. * c-lex.h (position_after_white_space): Correct typo in prototype. * c-tree.h (finish_file, c_expand_start_cond, c_expand_start_else, c_expand_end_cond, init_iterators): Add prototypes. * caller-save.c (set_reg_live): Mark parameters `reg' and `setter' with ATTRIBUTE_UNUSED. * calls.c: Include output.h. * cccp.c (pipe_closed): Mark parameter `signo' with ATTRIBUTE_UNUSED. * combine.c: Move inclusion of expr.h to after insn-config.h. * iris6.h (ASM_IDENTIFY_GCC, ASM_IDENTIFY_LANGUAGE): Don't define as empty, rather define as ((void)0). * sparc.c (sparc_check_64): Add braces around ambiguous `else'. Add parentheses around assignment used as truth value. * cplus-dem.c (squangle_mop_up): Change return type to void. (internal_cplus_demangle): Remove unused parameter `options'. All callers changed. (cplus_demangle_opname): Remove function wide variable `int i' and replace with `size_t i' at each location where it is used. (cplus_demangle_opname): change type of `i' from int to size_t. * cppexp.c (right_shift): Mark parameter `pfile' with ATTRIBUTE_UNUSED. * cpphash.c (cpp_lookup): Likewise. (cpp_hash_cleanup): Likewise. * cpplib.c (parse_name): Add a prototype and make it static. (null_underflow): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (null_cleanup): Likewise for parameters `pbuf' and `pfile'. (macro_cleanup): Likewise for parameter `pfile'. (file_cleanup): Likewise. * cpplib.h (cpp_reader_init, cpp_options_init, cpp_start_read, cpp_read_check_assertion, skip_rest_of_line): Add prototypes. * crtstuff.c (force_to_data, __CTOR_LIST__, force_to_data, __DTOR_END__, __FRAME_END__): Mark with ATTRIBUTE_UNUSED. * cse.c (cse_check_loop_start): Mark parameter `set' with ATTRIBUTE_UNUSED. * dbxout.c (flag_minimal_debug, have_used_extensions, source_label_number): Move inside macro wrapper check against defined (DBX_DEBUGGING_INFO) || defined (XCOFF_DEBUGGING_INFO). * dwarf2out.c (gen_entry_point_die): Hide prototype and definition. * except.h (doing_eh): Provide prototype. * expr.c: Move inclusion of expr.h to after insn-config.h. * final.c: Include reload.h. (shorten_branches): Cast the first argument of bzero to char *. * fix-header.c (cpp_print_containing_files): Mark parameter `pfile' with ATTRIBUTE_UNUSED. (cpp_fatal): Likewise. * flow.c (find_basic_blocks_1): Cast the first argument of bzero to char *. * genattrtab.c (make_length_attrs): Change the type of variable `i' from int to size_t. (zero_fn): Mark parameter `exp' with ATTRIBUTE_UNUSED. (one_fn): Likewise. * genextract.c (main): When generating insn-extract.c, mark variable `junk' with ATTRIBUTE_UNUSED. * gengenrtl.c (gencode): When generating genrtl.c, cast the first argument of bzero to char*. * integrate.c: Include toplev.h. * libgcc2.c: Wrap `struct exception_table' and `find_exception_handler' in macro DWARF2_UNWIND_INFO. * objc/Make-lang.in (objc-act.o): Depend on toplev.h. * objc/objc-act.c: Include toplev.h. (lang_print_xnode): Mark parameters `file', `node' and `indent' with ATTRIBUTE_UNUSED. (finish_protocol): Likewise for parameter `protocol'. * output.h (declare_weak): Add prototype. (decode_reg_name): Don't wrap with TREE_CODE macro. (assemble_alias): Add prototype. * regclass.c: Include output.h. * reload.h (reloads_conflict): Add prototype. * rtl.h (print_rtl_single, mark_elimiation, reg_class_subset_p, output_func_start_profiler): Add prototypes. * rtlanal.c (reg_set_p_1): Mark parameters `x' and `pat' with ATTRIBUTE_UNUSED. * scan-decls.c: Include scan.h. * scan.h (recognized_function, recognized_extern): Add prototypes. * stmt.c: Include output.h. * toplev.c (error_for_asm, warning_for_asm): Remove prototypes. (output_lang_identify): Hide prototype and definition. (float_signal): Mark parameter `signo' with ATTRIBUTE_UNUSED. (pipe_closed): Likewise. * toplev.h (count_error, strip_off_ending, error_for_asm, warning_for_asm): Add prototypes. From-SVN: r19712
1998-05-13 14:40:39 +02:00
static void
squangle_mop_up (work)
struct work_stuff *work;
{
/* clean up the B and K type mangling types. */
forget_B_and_K_types (work);
if (work -> btypevec != NULL)
{
free ((char *) work -> btypevec);
}
if (work -> ktypevec != NULL)
{
free ((char *) work -> ktypevec);
}
}
/* Clear out any mangled storage */
1997-08-22 00:57:35 +02:00
static char *
mop_up (work, declp, success)
struct work_stuff *work;
string *declp;
int success;
{
char *demangled = NULL;
/* Discard the remembered types, if any. */
1997-08-22 00:57:35 +02:00
forget_types (work);
if (work -> typevec != NULL)
{
free ((char *) work -> typevec);
work -> typevec = NULL;
work -> typevec_size = 0;
1997-08-22 00:57:35 +02:00
}
if (work->tmpl_argvec)
{
int i;
for (i = 0; i < work->ntmpl_args; i++)
if (work->tmpl_argvec[i])
free ((char*) work->tmpl_argvec[i]);
free ((char*) work->tmpl_argvec);
work->tmpl_argvec = NULL;
}
if (work->previous_argument)
{
string_delete (work->previous_argument);
free ((char*) work->previous_argument);
work->previous_argument = NULL;
}
1997-08-22 00:57:35 +02:00
/* If demangling was successful, ensure that the demangled string is null
terminated and return it. Otherwise, free the demangling decl. */
1997-08-22 00:57:35 +02:00
if (!success)
{
string_delete (declp);
}
else
{
string_appendn (declp, "", 1);
demangled = declp -> b;
}
return (demangled);
}
/*
LOCAL FUNCTION
demangle_signature -- demangle the signature part of a mangled name
SYNOPSIS
static int
demangle_signature (struct work_stuff *work, const char **mangled,
string *declp);
DESCRIPTION
Consume and demangle the signature portion of the mangled name.
DECLP is the string where demangled output is being built. At
entry it contains the demangled root name from the mangled name
prefix. I.E. either a demangled operator name or the root function
name. In some special cases, it may contain nothing.
*MANGLED points to the current unconsumed location in the mangled
name. As tokens are consumed and demangling is performed, the
pointer is updated to continuously point at the next token to
be consumed.
Demangling GNU style mangled names is nasty because there is no
explicit token that marks the start of the outermost function
argument list. */
static int
demangle_signature (work, mangled, declp)
struct work_stuff *work;
const char **mangled;
string *declp;
{
int success = 1;
int func_done = 0;
int expect_func = 0;
int expect_return_type = 0;
1997-08-22 00:57:35 +02:00
const char *oldmangled = NULL;
string trawname;
string tname;
while (success && (**mangled != '\0'))
{
switch (**mangled)
{
case 'Q':
oldmangled = *mangled;
success = demangle_qualified (work, mangled, declp, 1, 0);
if (success)
remember_type (work, oldmangled, *mangled - oldmangled);
1997-08-22 00:57:35 +02:00
if (AUTO_DEMANGLING || GNU_DEMANGLING)
expect_func = 1;
1997-08-22 00:57:35 +02:00
oldmangled = NULL;
break;
case 'K':
oldmangled = *mangled;
success = demangle_qualified (work, mangled, declp, 1, 0);
if (AUTO_DEMANGLING || GNU_DEMANGLING)
{
expect_func = 1;
}
oldmangled = NULL;
break;
1997-08-22 00:57:35 +02:00
case 'S':
/* Static member function */
if (oldmangled == NULL)
{
oldmangled = *mangled;
}
(*mangled)++;
work -> static_type = 1;
break;
case 'C':
case 'V':
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
case 'u':
work->type_quals |= code_for_qualifier (**mangled);
/* a qualified member function */
1997-08-22 00:57:35 +02:00
if (oldmangled == NULL)
oldmangled = *mangled;
1997-08-22 00:57:35 +02:00
(*mangled)++;
break;
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
case 'L':
/* Local class name follows after "Lnnn_" */
if (HP_DEMANGLING)
{
while (**mangled && (**mangled != '_'))
(*mangled)++;
if (!**mangled)
success = 0;
else
(*mangled)++;
}
else
success = 0;
break;
1997-08-22 00:57:35 +02:00
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
if (oldmangled == NULL)
{
oldmangled = *mangled;
}
work->temp_start = -1; /* uppermost call to demangle_class */
1997-08-22 00:57:35 +02:00
success = demangle_class (work, mangled, declp);
if (success)
{
remember_type (work, oldmangled, *mangled - oldmangled);
}
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
if (AUTO_DEMANGLING || GNU_DEMANGLING || EDG_DEMANGLING)
1997-08-22 00:57:35 +02:00
{
/* EDG and others will have the "F", so we let the loop cycle
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
if we are looking at one. */
if (**mangled != 'F')
expect_func = 1;
1997-08-22 00:57:35 +02:00
}
oldmangled = NULL;
break;
case 'B':
{
string s;
success = do_type (work, mangled, &s);
if (success)
{
string_append (&s, SCOPE_STRING (work));
string_prepends (declp, &s);
}
oldmangled = NULL;
expect_func = 1;
}
break;
1997-08-22 00:57:35 +02:00
case 'F':
/* Function */
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
/* ARM/HP style demangling includes a specific 'F' character after
1997-08-22 00:57:35 +02:00
the class name. For GNU style, it is just implied. So we can
safely just consume any 'F' at this point and be compatible
with either style. */
oldmangled = NULL;
func_done = 1;
(*mangled)++;
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
/* For lucid/ARM/HP style we have to forget any types we might
1997-08-22 00:57:35 +02:00
have remembered up to this point, since they were not argument
types. GNU style considers all types seen as available for
back references. See comment in demangle_args() */
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
if (LUCID_DEMANGLING || ARM_DEMANGLING || HP_DEMANGLING || EDG_DEMANGLING)
1997-08-22 00:57:35 +02:00
{
forget_types (work);
}
success = demangle_args (work, mangled, declp);
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
/* After picking off the function args, we expect to either
find the function return type (preceded by an '_') or the
end of the string. */
if (success && (AUTO_DEMANGLING || EDG_DEMANGLING) && **mangled == '_')
{
++(*mangled);
/* At this level, we do not care about the return type. */
success = do_type (work, mangled, &tname);
string_delete (&tname);
}
1997-08-22 00:57:35 +02:00
break;
1997-08-22 00:57:35 +02:00
case 't':
/* G++ Template */
string_init(&trawname);
1997-08-22 00:57:35 +02:00
string_init(&tname);
if (oldmangled == NULL)
{
oldmangled = *mangled;
}
success = demangle_template (work, mangled, &tname,
&trawname, 1, 1);
1997-08-22 00:57:35 +02:00
if (success)
{
remember_type (work, oldmangled, *mangled - oldmangled);
}
1998-07-14 18:16:52 +02:00
string_append (&tname, SCOPE_STRING (work));
1997-08-22 00:57:35 +02:00
string_prepends(declp, &tname);
if (work -> destructor & 1)
{
string_prepend (&trawname, "~");
string_appends (declp, &trawname);
work->destructor -= 1;
}
if ((work->constructor & 1) || (work->destructor & 1))
{
string_appends (declp, &trawname);
work->constructor -= 1;
}
string_delete(&trawname);
string_delete(&tname);
oldmangled = NULL;
expect_func = 1;
break;
case '_':
if (GNU_DEMANGLING && expect_return_type)
{
/* Read the return type. */
string return_type;
string_init (&return_type);
(*mangled)++;
success = do_type (work, mangled, &return_type);
APPEND_BLANK (&return_type);
string_prepends (declp, &return_type);
string_delete (&return_type);
break;
}
else
/* At the outermost level, we cannot have a return type specified,
so if we run into another '_' at this point we are dealing with
a mangled name that is either bogus, or has been mangled by
some algorithm we don't know how to deal with. So just
reject the entire demangling. */
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
/* However, "_nnn" is an expected suffix for alternate entry point
numbered nnn for a function, with HP aCC, so skip over that
without reporting failure. pai/1997-09-04 */
if (HP_DEMANGLING)
{
(*mangled)++;
while (**mangled && isdigit ((unsigned char)**mangled))
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
(*mangled)++;
}
else
success = 0;
1997-08-22 00:57:35 +02:00
break;
case 'H':
if (GNU_DEMANGLING)
{
/* A G++ template function. Read the template arguments. */
success = demangle_template (work, mangled, declp, 0, 0,
0);
if (!(work->constructor & 1))
expect_return_type = 1;
(*mangled)++;
break;
}
else
/* fall through */
{;}
1997-08-22 00:57:35 +02:00
default:
if (AUTO_DEMANGLING || GNU_DEMANGLING)
{
/* Assume we have stumbled onto the first outermost function
argument token, and start processing args. */
func_done = 1;
success = demangle_args (work, mangled, declp);
}
else
{
/* Non-GNU demanglers use a specific token to mark the start
of the outermost function argument tokens. Typically 'F',
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
for ARM/HP-demangling, for example. So if we find something
1997-08-22 00:57:35 +02:00
we are not prepared for, it must be an error. */
success = 0;
}
break;
}
/*
if (AUTO_DEMANGLING || GNU_DEMANGLING)
*/
{
if (success && expect_func)
{
func_done = 1;
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
if (LUCID_DEMANGLING || ARM_DEMANGLING || EDG_DEMANGLING)
{
forget_types (work);
}
1997-08-22 00:57:35 +02:00
success = demangle_args (work, mangled, declp);
/* Since template include the mangling of their return types,
we must set expect_func to 0 so that we don't try do
demangle more arguments the next time we get here. */
expect_func = 0;
1997-08-22 00:57:35 +02:00
}
}
}
if (success && !func_done)
{
if (AUTO_DEMANGLING || GNU_DEMANGLING)
{
/* With GNU style demangling, bar__3foo is 'foo::bar(void)', and
bar__3fooi is 'foo::bar(int)'. We get here when we find the
first case, and need to ensure that the '(void)' gets added to
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
the current declp. Note that with ARM/HP, the first case
1997-08-22 00:57:35 +02:00
represents the name of a static data member 'foo::bar',
which is in the current declp, so we leave it alone. */
success = demangle_args (work, mangled, declp);
}
}
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
if (success && PRINT_ARG_TYPES)
{
if (work->static_type)
string_append (declp, " static");
if (work->type_quals != TYPE_UNQUALIFIED)
{
APPEND_BLANK (declp);
string_append (declp, qualifier_string (work->type_quals));
}
}
1997-08-22 00:57:35 +02:00
return (success);
}
#if 0
static int
demangle_method_args (work, mangled, declp)
struct work_stuff *work;
const char **mangled;
string *declp;
{
int success = 0;
if (work -> static_type)
{
string_append (declp, *mangled + 1);
*mangled += strlen (*mangled);
success = 1;
}
else
{
success = demangle_args (work, mangled, declp);
}
return (success);
}
#endif
static int
demangle_template_template_parm (work, mangled, tname)
struct work_stuff *work;
const char **mangled;
string *tname;
{
int i;
int r;
int need_comma = 0;
int success = 1;
string temp;
string_append (tname, "template <");
/* get size of template parameter list */
if (get_count (mangled, &r))
{
for (i = 0; i < r; i++)
{
if (need_comma)
{
string_append (tname, ", ");
}
/* Z for type parameters */
if (**mangled == 'Z')
{
(*mangled)++;
string_append (tname, "class");
}
/* z for template parameters */
else if (**mangled == 'z')
{
(*mangled)++;
success =
demangle_template_template_parm (work, mangled, tname);
if (!success)
{
break;
}
}
else
{
/* temp is initialized in do_type */
success = do_type (work, mangled, &temp);
if (success)
{
string_appends (tname, &temp);
}
string_delete(&temp);
if (!success)
{
break;
}
}
need_comma = 1;
}
}
if (tname->p[-1] == '>')
string_append (tname, " ");
string_append (tname, "> class");
return (success);
}
static int
demangle_integral_value (work, mangled, s)
struct work_stuff *work;
const char** mangled;
string* s;
{
int success;
if (**mangled == 'E')
{
int need_operator = 0;
success = 1;
string_appendn (s, "(", 1);
(*mangled)++;
while (success && **mangled != 'W' && **mangled != '\0')
{
if (need_operator)
{
size_t i;
size_t len;
success = 0;
len = strlen (*mangled);
for (i = 0;
i < sizeof (optable) / sizeof (optable [0]);
++i)
{
size_t l = strlen (optable[i].in);
if (l <= len
&& memcmp (optable[i].in, *mangled, l) == 0)
{
string_appendn (s, " ", 1);
string_append (s, optable[i].out);
string_appendn (s, " ", 1);
success = 1;
(*mangled) += l;
break;
}
}
if (!success)
break;
}
else
need_operator = 1;
success = demangle_template_value_parm (work, mangled, s,
tk_integral);
}
if (**mangled != 'W')
success = 0;
else
{
string_appendn (s, ")", 1);
(*mangled)++;
}
}
else if (**mangled == 'Q' || **mangled == 'K')
success = demangle_qualified (work, mangled, s, 0, 1);
else
{
success = 0;
if (**mangled == 'm')
{
string_appendn (s, "-", 1);
(*mangled)++;
}
while (isdigit ((unsigned char)**mangled))
{
string_appendn (s, *mangled, 1);
(*mangled)++;
success = 1;
}
}
return success;
}
static int
demangle_template_value_parm (work, mangled, s, tk)
struct work_stuff *work;
const char **mangled;
string* s;
type_kind_t tk;
{
int success = 1;
if (**mangled == 'Y')
{
/* The next argument is a template parameter. */
int idx;
(*mangled)++;
idx = consume_count_with_underscores (mangled);
if (idx == -1
|| (work->tmpl_argvec && idx >= work->ntmpl_args)
|| consume_count_with_underscores (mangled) == -1)
return -1;
if (work->tmpl_argvec)
string_append (s, work->tmpl_argvec[idx]);
else
{
char buf[10];
sprintf(buf, "T%d", idx);
string_append (s, buf);
}
}
else if (tk == tk_integral)
success = demangle_integral_value (work, mangled, s);
else if (tk == tk_char)
{
char tmp[2];
int val;
if (**mangled == 'm')
{
string_appendn (s, "-", 1);
(*mangled)++;
}
string_appendn (s, "'", 1);
val = consume_count(mangled);
if (val <= 0)
success = 0;
else
{
tmp[0] = (char)val;
tmp[1] = '\0';
string_appendn (s, &tmp[0], 1);
string_appendn (s, "'", 1);
}
}
else if (tk == tk_bool)
{
int val = consume_count (mangled);
if (val == 0)
string_appendn (s, "false", 5);
else if (val == 1)
string_appendn (s, "true", 4);
else
success = 0;
}
else if (tk == tk_real)
{
if (**mangled == 'm')
{
string_appendn (s, "-", 1);
(*mangled)++;
}
while (isdigit ((unsigned char)**mangled))
{
string_appendn (s, *mangled, 1);
(*mangled)++;
}
if (**mangled == '.') /* fraction */
{
string_appendn (s, ".", 1);
(*mangled)++;
while (isdigit ((unsigned char)**mangled))
{
string_appendn (s, *mangled, 1);
(*mangled)++;
}
}
if (**mangled == 'e') /* exponent */
{
string_appendn (s, "e", 1);
(*mangled)++;
while (isdigit ((unsigned char)**mangled))
{
string_appendn (s, *mangled, 1);
(*mangled)++;
}
}
}
else if (tk == tk_pointer || tk == tk_reference)
{
if (**mangled == 'Q')
success = demangle_qualified (work, mangled, s,
/*isfuncname=*/0,
/*append=*/1);
else
{
int symbol_len = consume_count (mangled);
if (symbol_len == -1)
return -1;
if (symbol_len == 0)
string_appendn (s, "0", 1);
else
{
char *p = xmalloc (symbol_len + 1), *q;
strncpy (p, *mangled, symbol_len);
p [symbol_len] = '\0';
/* We use cplus_demangle here, rather than
internal_cplus_demangle, because the name of the entity
mangled here does not make use of any of the squangling
or type-code information we have built up thus far; it is
mangled independently. */
q = cplus_demangle (p, work->options);
if (tk == tk_pointer)
string_appendn (s, "&", 1);
/* FIXME: Pointer-to-member constants should get a
qualifying class name here. */
if (q)
{
string_append (s, q);
free (q);
}
else
string_append (s, p);
free (p);
}
*mangled += symbol_len;
}
}
return success;
}
/* Demangle the template name in MANGLED. The full name of the
template (e.g., S<int>) is placed in TNAME. The name without the
template parameters (e.g. S) is placed in TRAWNAME if TRAWNAME is
non-NULL. If IS_TYPE is nonzero, this template is a type template,
not a function template. If both IS_TYPE and REMEMBER are nonzero,
the tmeplate is remembered in the list of back-referenceable
types. */
1997-08-22 00:57:35 +02:00
static int
demangle_template (work, mangled, tname, trawname, is_type, remember)
1997-08-22 00:57:35 +02:00
struct work_stuff *work;
const char **mangled;
string *tname;
string *trawname;
int is_type;
int remember;
1997-08-22 00:57:35 +02:00
{
int i;
int r;
int need_comma = 0;
int success = 0;
const char *start;
int is_java_array = 0;
1997-08-22 00:57:35 +02:00
string temp;
int bindex = 0;
1997-08-22 00:57:35 +02:00
(*mangled)++;
if (is_type)
1997-08-22 00:57:35 +02:00
{
if (remember)
bindex = register_Btype (work);
start = *mangled;
/* get template name */
if (**mangled == 'z')
{
int idx;
(*mangled)++;
(*mangled)++;
idx = consume_count_with_underscores (mangled);
if (idx == -1
|| (work->tmpl_argvec && idx >= work->ntmpl_args)
|| consume_count_with_underscores (mangled) == -1)
return (0);
if (work->tmpl_argvec)
{
string_append (tname, work->tmpl_argvec[idx]);
if (trawname)
string_append (trawname, work->tmpl_argvec[idx]);
}
else
{
char buf[10];
sprintf(buf, "T%d", idx);
string_append (tname, buf);
if (trawname)
string_append (trawname, buf);
}
}
else
{
if ((r = consume_count (mangled)) <= 0
|| (int) strlen (*mangled) < r)
{
return (0);
}
is_java_array = (work -> options & DMGL_JAVA)
&& strncmp (*mangled, "JArray1Z", 8) == 0;
if (! is_java_array)
{
string_appendn (tname, *mangled, r);
}
if (trawname)
string_appendn (trawname, *mangled, r);
*mangled += r;
}
1997-08-22 00:57:35 +02:00
}
if (!is_java_array)
string_append (tname, "<");
1997-08-22 00:57:35 +02:00
/* get size of template parameter list */
if (!get_count (mangled, &r))
{
return (0);
}
if (!is_type)
{
/* Create an array for saving the template argument values. */
work->tmpl_argvec = (char**) xmalloc (r * sizeof (char *));
work->ntmpl_args = r;
for (i = 0; i < r; i++)
work->tmpl_argvec[i] = 0;
}
1997-08-22 00:57:35 +02:00
for (i = 0; i < r; i++)
{
if (need_comma)
{
string_append (tname, ", ");
}
/* Z for type parameters */
if (**mangled == 'Z')
{
(*mangled)++;
/* temp is initialized in do_type */
success = do_type (work, mangled, &temp);
if (success)
{
string_appends (tname, &temp);
if (!is_type)
{
/* Save the template argument. */
int len = temp.p - temp.b;
work->tmpl_argvec[i] = xmalloc (len + 1);
memcpy (work->tmpl_argvec[i], temp.b, len);
work->tmpl_argvec[i][len] = '\0';
}
1997-08-22 00:57:35 +02:00
}
string_delete(&temp);
if (!success)
{
break;
}
}
/* z for template parameters */
else if (**mangled == 'z')
{
int r2;
(*mangled)++;
success = demangle_template_template_parm (work, mangled, tname);
if (success
&& (r2 = consume_count (mangled)) > 0
&& (int) strlen (*mangled) >= r2)
{
string_append (tname, " ");
string_appendn (tname, *mangled, r2);
if (!is_type)
{
/* Save the template argument. */
int len = r2;
work->tmpl_argvec[i] = xmalloc (len + 1);
memcpy (work->tmpl_argvec[i], *mangled, len);
work->tmpl_argvec[i][len] = '\0';
}
*mangled += r2;
}
if (!success)
{
break;
}
}
1997-08-22 00:57:35 +02:00
else
{
string param;
string* s;
1997-08-22 00:57:35 +02:00
/* otherwise, value parameter */
1997-08-22 00:57:35 +02:00
/* temp is initialized in do_type */
success = do_type (work, mangled, &temp);
string_delete(&temp);
if (!success)
break;
if (!is_type)
{
s = &param;
string_init (s);
}
else
s = tname;
success = demangle_template_value_parm (work, mangled, s,
(type_kind_t) success);
if (!success)
1997-08-22 00:57:35 +02:00
{
if (!is_type)
string_delete (s);
success = 0;
break;
1997-08-22 00:57:35 +02:00
}
if (!is_type)
{
int len = s->p - s->b;
work->tmpl_argvec[i] = xmalloc (len + 1);
memcpy (work->tmpl_argvec[i], s->b, len);
work->tmpl_argvec[i][len] = '\0';
string_appends (tname, s);
string_delete (s);
}
1997-08-22 00:57:35 +02:00
}
need_comma = 1;
}
if (is_java_array)
1998-07-14 18:16:52 +02:00
{
string_append (tname, "[]");
}
else
{
if (tname->p[-1] == '>')
string_append (tname, " ");
string_append (tname, ">");
1998-07-14 18:16:52 +02:00
}
if (is_type && remember)
remember_Btype (work, tname->b, LEN_STRING (tname), bindex);
1997-08-22 00:57:35 +02:00
/*
if (work -> static_type)
{
string_append (declp, *mangled + 1);
*mangled += strlen (*mangled);
success = 1;
}
else
{
success = demangle_args (work, mangled, declp);
}
}
*/
return (success);
}
static int
arm_pt (work, mangled, n, anchor, args)
struct work_stuff *work;
const char *mangled;
int n;
const char **anchor, **args;
{
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
/* Check if ARM template with "__pt__" in it ("parameterized type") */
/* Allow HP also here, because HP's cfront compiler follows ARM to some extent */
if ((ARM_DEMANGLING || HP_DEMANGLING) && (*anchor = mystrstr (mangled, "__pt__")))
1997-08-22 00:57:35 +02:00
{
int len;
*args = *anchor + 6;
len = consume_count (args);
if (len == -1)
return 0;
1997-08-22 00:57:35 +02:00
if (*args + len == mangled + n && **args == '_')
{
++*args;
return 1;
}
}
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
if (AUTO_DEMANGLING || EDG_DEMANGLING)
{
if ((*anchor = mystrstr (mangled, "__tm__"))
|| (*anchor = mystrstr (mangled, "__ps__"))
|| (*anchor = mystrstr (mangled, "__pt__")))
{
int len;
*args = *anchor + 6;
len = consume_count (args);
if (len == -1)
return 0;
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
if (*args + len == mangled + n && **args == '_')
{
++*args;
return 1;
}
}
else if ((*anchor = mystrstr (mangled, "__S")))
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
{
int len;
*args = *anchor + 3;
len = consume_count (args);
if (len == -1)
return 0;
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
if (*args + len == mangled + n && **args == '_')
{
++*args;
return 1;
}
}
}
1997-08-22 00:57:35 +02:00
return 0;
}
static void
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
demangle_arm_hp_template (work, mangled, n, declp)
1997-08-22 00:57:35 +02:00
struct work_stuff *work;
const char **mangled;
int n;
string *declp;
{
const char *p;
const char *args;
1997-08-22 00:57:35 +02:00
const char *e = *mangled + n;
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
string arg;
1997-08-22 00:57:35 +02:00
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
/* Check for HP aCC template spec: classXt1t2 where t1, t2 are
template args */
if (HP_DEMANGLING && ((*mangled)[n] == 'X'))
1997-08-22 00:57:35 +02:00
{
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
char *start_spec_args = NULL;
/* First check for and omit template specialization pseudo-arguments,
such as in "Spec<#1,#1.*>" */
start_spec_args = strchr (*mangled, '<');
if (start_spec_args && (start_spec_args - *mangled < n))
string_appendn (declp, *mangled, start_spec_args - *mangled);
else
string_appendn (declp, *mangled, n);
(*mangled) += n + 1;
string_init (&arg);
if (work->temp_start == -1) /* non-recursive call */
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
work->temp_start = declp->p - declp->b;
string_append (declp, "<");
while (1)
{
string_clear (&arg);
switch (**mangled)
{
case 'T':
/* 'T' signals a type parameter */
(*mangled)++;
if (!do_type (work, mangled, &arg))
goto hpacc_template_args_done;
break;
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
case 'U':
case 'S':
/* 'U' or 'S' signals an integral value */
if (!do_hpacc_template_const_value (work, mangled, &arg))
goto hpacc_template_args_done;
break;
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
case 'A':
/* 'A' signals a named constant expression (literal) */
if (!do_hpacc_template_literal (work, mangled, &arg))
goto hpacc_template_args_done;
break;
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
default:
/* Today, 1997-09-03, we have only the above types
of template parameters */
/* FIXME: maybe this should fail and return null */
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
goto hpacc_template_args_done;
}
string_appends (declp, &arg);
/* Check if we're at the end of template args.
0 if at end of static member of template class,
_ if done with template args for a function */
if ((**mangled == '\000') || (**mangled == '_'))
break;
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
else
string_append (declp, ",");
}
hpacc_template_args_done:
string_append (declp, ">");
string_delete (&arg);
if (**mangled == '_')
(*mangled)++;
return;
}
/* ARM template? (Also handles HP cfront extensions) */
else if (arm_pt (work, *mangled, n, &p, &args))
{
string type_str;
1997-08-22 00:57:35 +02:00
string_init (&arg);
string_appendn (declp, *mangled, p - *mangled);
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
if (work->temp_start == -1) /* non-recursive call */
work->temp_start = declp->p - declp->b;
1997-08-22 00:57:35 +02:00
string_append (declp, "<");
/* should do error checking here */
while (args < e) {
string_clear (&arg);
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
/* Check for type or literal here */
switch (*args)
{
/* HP cfront extensions to ARM for template args */
/* spec: Xt1Lv1 where t1 is a type, v1 is a literal value */
/* FIXME: We handle only numeric literals for HP cfront */
case 'X':
/* A typed constant value follows */
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
args++;
if (!do_type (work, &args, &type_str))
goto cfront_template_args_done;
string_append (&arg, "(");
string_appends (&arg, &type_str);
string_append (&arg, ")");
if (*args != 'L')
goto cfront_template_args_done;
args++;
/* Now snarf a literal value following 'L' */
if (!snarf_numeric_literal (&args, &arg))
goto cfront_template_args_done;
break;
case 'L':
/* Snarf a literal following 'L' */
args++;
if (!snarf_numeric_literal (&args, &arg))
goto cfront_template_args_done;
break;
default:
/* Not handling other HP cfront stuff */
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
if (!do_type (work, &args, &arg))
goto cfront_template_args_done;
}
1997-08-22 00:57:35 +02:00
string_appends (declp, &arg);
string_append (declp, ",");
}
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
cfront_template_args_done:
1997-08-22 00:57:35 +02:00
string_delete (&arg);
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
if (args >= e)
--declp->p; /* remove extra comma */
1997-08-22 00:57:35 +02:00
string_append (declp, ">");
}
else if (n>10 && strncmp (*mangled, "_GLOBAL_", 8) == 0
&& (*mangled)[9] == 'N'
&& (*mangled)[8] == (*mangled)[10]
&& strchr (cplus_markers, (*mangled)[8]))
{
/* A member of the anonymous namespace. */
string_append (declp, "{anonymous}");
}
1997-08-22 00:57:35 +02:00
else
{
if (work->temp_start == -1) /* non-recursive call only */
work->temp_start = 0; /* disable in recursive calls */
1997-08-22 00:57:35 +02:00
string_appendn (declp, *mangled, n);
}
*mangled += n;
}
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
/* Extract a class name, possibly a template with arguments, from the
mangled string; qualifiers, local class indicators, etc. have
already been dealt with */
1997-08-22 00:57:35 +02:00
static int
demangle_class_name (work, mangled, declp)
struct work_stuff *work;
const char **mangled;
string *declp;
{
int n;
int success = 0;
n = consume_count (mangled);
if (n == -1)
return 0;
if ((int) strlen (*mangled) >= n)
1997-08-22 00:57:35 +02:00
{
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
demangle_arm_hp_template (work, mangled, n, declp);
1997-08-22 00:57:35 +02:00
success = 1;
}
return (success);
}
/*
LOCAL FUNCTION
demangle_class -- demangle a mangled class sequence
SYNOPSIS
static int
demangle_class (struct work_stuff *work, const char **mangled,
strint *declp)
DESCRIPTION
DECLP points to the buffer into which demangling is being done.
*MANGLED points to the current token to be demangled. On input,
it points to a mangled class (I.E. "3foo", "13verylongclass", etc.)
On exit, it points to the next token after the mangled class on
success, or the first unconsumed token on failure.
If the CONSTRUCTOR or DESTRUCTOR flags are set in WORK, then
we are demangling a constructor or destructor. In this case
we prepend "class::class" or "class::~class" to DECLP.
Otherwise, we prepend "class::" to the current DECLP.
Reset the constructor/destructor flags once they have been
"consumed". This allows demangle_class to be called later during
the same demangling, to do normal class demangling.
Returns 1 if demangling is successful, 0 otherwise.
*/
static int
demangle_class (work, mangled, declp)
struct work_stuff *work;
const char **mangled;
string *declp;
{
int success = 0;
int btype;
1997-08-22 00:57:35 +02:00
string class_name;
char *save_class_name_end = 0;
1997-08-22 00:57:35 +02:00
string_init (&class_name);
btype = register_Btype (work);
1997-08-22 00:57:35 +02:00
if (demangle_class_name (work, mangled, &class_name))
{
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
save_class_name_end = class_name.p;
1997-08-22 00:57:35 +02:00
if ((work->constructor & 1) || (work->destructor & 1))
{
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
/* adjust so we don't include template args */
if (work->temp_start && (work->temp_start != -1))
{
class_name.p = class_name.b + work->temp_start;
}
1997-08-22 00:57:35 +02:00
string_prepends (declp, &class_name);
if (work -> destructor & 1)
{
string_prepend (declp, "~");
work -> destructor -= 1;
}
else
{
work -> constructor -= 1;
1997-08-22 00:57:35 +02:00
}
}
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
class_name.p = save_class_name_end;
remember_Ktype (work, class_name.b, LEN_STRING(&class_name));
remember_Btype (work, class_name.b, LEN_STRING(&class_name), btype);
string_prepend (declp, SCOPE_STRING (work));
1997-08-22 00:57:35 +02:00
string_prepends (declp, &class_name);
success = 1;
}
string_delete (&class_name);
return (success);
}
/*
LOCAL FUNCTION
demangle_prefix -- consume the mangled name prefix and find signature
SYNOPSIS
static int
demangle_prefix (struct work_stuff *work, const char **mangled,
string *declp);
DESCRIPTION
Consume and demangle the prefix of the mangled name.
DECLP points to the string buffer into which demangled output is
placed. On entry, the buffer is empty. On exit it contains
the root function name, the demangled operator name, or in some
special cases either nothing or the completely demangled result.
MANGLED points to the current pointer into the mangled name. As each
token of the mangled name is consumed, it is updated. Upon entry
the current mangled name pointer points to the first character of
the mangled name. Upon exit, it should point to the first character
of the signature if demangling was successful, or to the first
unconsumed character if demangling of the prefix was unsuccessful.
1997-08-22 00:57:35 +02:00
Returns 1 on success, 0 otherwise.
*/
static int
demangle_prefix (work, mangled, declp)
struct work_stuff *work;
const char **mangled;
string *declp;
{
int success = 1;
const char *scan;
int i;
if (strlen(*mangled) > 6
&& (strncmp(*mangled, "_imp__", 6) == 0
|| strncmp(*mangled, "__imp_", 6) == 0))
{
/* it's a symbol imported from a PE dynamic library. Check for both
new style prefix _imp__ and legacy __imp_ used by older versions
of dlltool. */
(*mangled) += 6;
work->dllimported = 1;
}
else if (strlen(*mangled) >= 11 && strncmp(*mangled, "_GLOBAL_", 8) == 0)
1997-08-22 00:57:35 +02:00
{
char *marker = strchr (cplus_markers, (*mangled)[8]);
if (marker != NULL && *marker == (*mangled)[10])
{
if ((*mangled)[9] == 'D')
{
/* it's a GNU global destructor to be executed at program exit */
(*mangled) += 11;
work->destructor = 2;
if (gnu_special (work, mangled, declp))
return success;
}
else if ((*mangled)[9] == 'I')
{
/* it's a GNU global constructor to be executed at program init */
(*mangled) += 11;
work->constructor = 2;
if (gnu_special (work, mangled, declp))
return success;
}
}
}
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
else if ((ARM_DEMANGLING || HP_DEMANGLING || EDG_DEMANGLING) && strncmp(*mangled, "__std__", 7) == 0)
1997-08-22 00:57:35 +02:00
{
/* it's a ARM global destructor to be executed at program exit */
(*mangled) += 7;
work->destructor = 2;
}
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
else if ((ARM_DEMANGLING || HP_DEMANGLING || EDG_DEMANGLING) && strncmp(*mangled, "__sti__", 7) == 0)
1997-08-22 00:57:35 +02:00
{
/* it's a ARM global constructor to be executed at program initial */
(*mangled) += 7;
work->constructor = 2;
}
/* This block of code is a reduction in strength time optimization
of:
scan = mystrstr (*mangled, "__"); */
{
scan = *mangled;
do {
scan = strchr (scan, '_');
} while (scan != NULL && *++scan != '_');
if (scan != NULL) --scan;
}
if (scan != NULL)
{
/* We found a sequence of two or more '_', ensure that we start at
the last pair in the sequence. */
i = strspn (scan, "_");
if (i > 2)
{
scan += (i - 2);
1997-08-22 00:57:35 +02:00
}
}
1997-08-22 00:57:35 +02:00
if (scan == NULL)
{
success = 0;
}
else if (work -> static_type)
{
if (!isdigit ((unsigned char)scan[0]) && (scan[0] != 't'))
1997-08-22 00:57:35 +02:00
{
success = 0;
}
}
else if ((scan == *mangled)
&& (isdigit ((unsigned char)scan[2]) || (scan[2] == 'Q')
|| (scan[2] == 't') || (scan[2] == 'K') || (scan[2] == 'H')))
1997-08-22 00:57:35 +02:00
{
/* The ARM says nothing about the mangling of local variables.
But cfront mangles local variables by prepending __<nesting_level>
to them. As an extension to ARM demangling we handle this case. */
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
if ((LUCID_DEMANGLING || ARM_DEMANGLING || HP_DEMANGLING)
&& isdigit ((unsigned char)scan[2]))
1997-08-22 00:57:35 +02:00
{
*mangled = scan + 2;
consume_count (mangled);
string_append (declp, *mangled);
*mangled += strlen (*mangled);
success = 1;
1997-08-22 00:57:35 +02:00
}
else
{
/* A GNU style constructor starts with __[0-9Qt]. But cfront uses
names like __Q2_3foo3bar for nested type names. So don't accept
this style of constructor for cfront demangling. A GNU
style member-template constructor starts with 'H'. */
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
if (!(LUCID_DEMANGLING || ARM_DEMANGLING || HP_DEMANGLING || EDG_DEMANGLING))
1997-08-22 00:57:35 +02:00
work -> constructor += 1;
*mangled = scan + 2;
}
}
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
else if (ARM_DEMANGLING && scan[2] == 'p' && scan[3] == 't')
{
/* Cfront-style parameterized type. Handled later as a signature. */
success = 1;
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
/* ARM template? */
demangle_arm_hp_template (work, mangled, strlen (*mangled), declp);
}
else if (EDG_DEMANGLING && ((scan[2] == 't' && scan[3] == 'm')
|| (scan[2] == 'p' && scan[3] == 's')
|| (scan[2] == 'p' && scan[3] == 't')))
{
/* EDG-style parameterized type. Handled later as a signature. */
success = 1;
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
/* EDG template? */
demangle_arm_hp_template (work, mangled, strlen (*mangled), declp);
}
else if ((scan == *mangled) && !isdigit ((unsigned char)scan[2])
&& (scan[2] != 't'))
1997-08-22 00:57:35 +02:00
{
/* Mangled name starts with "__". Skip over any leading '_' characters,
then find the next "__" that separates the prefix from the signature.
*/
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
if (!(ARM_DEMANGLING || LUCID_DEMANGLING || HP_DEMANGLING || EDG_DEMANGLING)
|| (arm_special (mangled, declp) == 0))
1997-08-22 00:57:35 +02:00
{
while (*scan == '_')
{
scan++;
}
if ((scan = mystrstr (scan, "__")) == NULL || (*(scan + 2) == '\0'))
{
/* No separator (I.E. "__not_mangled"), or empty signature
(I.E. "__not_mangled_either__") */
success = 0;
}
else
{
const char *tmp;
/* Look for the LAST occurrence of __, allowing names to
have the '__' sequence embedded in them. */
if (!(ARM_DEMANGLING || HP_DEMANGLING))
{
while ((tmp = mystrstr (scan + 2, "__")) != NULL)
scan = tmp;
}
if (*(scan + 2) == '\0')
success = 0;
else
demangle_function_name (work, mangled, declp, scan);
1997-08-22 00:57:35 +02:00
}
}
}
else if (*(scan + 2) != '\0')
{
/* Mangled name does not start with "__" but does have one somewhere
in there with non empty stuff after it. Looks like a global
function name. */
demangle_function_name (work, mangled, declp, scan);
}
else
{
/* Doesn't look like a mangled name */
success = 0;
}
if (!success && (work->constructor == 2 || work->destructor == 2))
{
string_append (declp, *mangled);
*mangled += strlen (*mangled);
success = 1;
}
1997-08-22 00:57:35 +02:00
return (success);
}
/*
LOCAL FUNCTION
gnu_special -- special handling of gnu mangled strings
SYNOPSIS
static int
gnu_special (struct work_stuff *work, const char **mangled,
string *declp);
DESCRIPTION
Process some special GNU style mangling forms that don't fit
the normal pattern. For example:
_$_3foo (destructor for class foo)
_vt$foo (foo virtual table)
_vt$foo$bar (foo::bar virtual table)
__vt_foo (foo virtual table, new style with thunks)
_3foo$varname (static data member)
_Q22rs2tu$vw (static data member)
__t6vector1Zii (constructor with template)
__thunk_4__$_7ostream (virtual function thunk)
*/
static int
gnu_special (work, mangled, declp)
struct work_stuff *work;
const char **mangled;
string *declp;
{
int n;
int success = 1;
const char *p;
if ((*mangled)[0] == '_'
&& strchr (cplus_markers, (*mangled)[1]) != NULL
&& (*mangled)[2] == '_')
{
/* Found a GNU style destructor, get past "_<CPLUS_MARKER>_" */
(*mangled) += 3;
work -> destructor += 1;
}
else if ((*mangled)[0] == '_'
&& (((*mangled)[1] == '_'
&& (*mangled)[2] == 'v'
&& (*mangled)[3] == 't'
&& (*mangled)[4] == '_')
|| ((*mangled)[1] == 'v'
&& (*mangled)[2] == 't'
&& strchr (cplus_markers, (*mangled)[3]) != NULL)))
{
/* Found a GNU style virtual table, get past "_vt<CPLUS_MARKER>"
and create the decl. Note that we consume the entire mangled
input string, which means that demangle_signature has no work
to do. */
if ((*mangled)[2] == 'v')
(*mangled) += 5; /* New style, with thunks: "__vt_" */
else
(*mangled) += 4; /* Old style, no thunks: "_vt<CPLUS_MARKER>" */
while (**mangled != '\0')
{
switch (**mangled)
{
case 'Q':
case 'K':
1997-08-22 00:57:35 +02:00
success = demangle_qualified (work, mangled, declp, 0, 1);
break;
case 't':
success = demangle_template (work, mangled, declp, 0, 1,
1);
1997-08-22 00:57:35 +02:00
break;
default:
if (isdigit((unsigned char)*mangled[0]))
1997-08-22 00:57:35 +02:00
{
n = consume_count(mangled);
/* We may be seeing a too-large size, or else a
".<digits>" indicating a static local symbol. In
any case, declare victory and move on; *don't* try
to use n to allocate. */
if (n > (int) strlen (*mangled))
{
success = 1;
break;
}
1997-08-22 00:57:35 +02:00
}
else
{
n = strcspn (*mangled, cplus_markers);
}
string_appendn (declp, *mangled, n);
(*mangled) += n;
}
p = strpbrk (*mangled, cplus_markers);
1997-08-22 00:57:35 +02:00
if (success && ((p == NULL) || (p == *mangled)))
{
if (p != NULL)
{
string_append (declp, SCOPE_STRING (work));
1997-08-22 00:57:35 +02:00
(*mangled)++;
}
}
else
{
success = 0;
break;
}
}
if (success)
string_append (declp, " virtual table");
}
else if ((*mangled)[0] == '_'
&& (strchr("0123456789Qt", (*mangled)[1]) != NULL)
&& (p = strpbrk (*mangled, cplus_markers)) != NULL)
{
/* static data member, "_3foo$varname" for example */
(*mangled)++;
switch (**mangled)
{
case 'Q':
case 'K':
1997-08-22 00:57:35 +02:00
success = demangle_qualified (work, mangled, declp, 0, 1);
break;
case 't':
success = demangle_template (work, mangled, declp, 0, 1, 1);
1997-08-22 00:57:35 +02:00
break;
default:
n = consume_count (mangled);
if (n < 0 || n > strlen (*mangled))
{
success = 0;
break;
}
1997-08-22 00:57:35 +02:00
string_appendn (declp, *mangled, n);
(*mangled) += n;
}
if (success && (p == *mangled))
{
/* Consumed everything up to the cplus_marker, append the
variable name. */
(*mangled)++;
string_append (declp, SCOPE_STRING (work));
1997-08-22 00:57:35 +02:00
n = strlen (*mangled);
string_appendn (declp, *mangled, n);
(*mangled) += n;
}
else
{
success = 0;
}
}
else if (strncmp (*mangled, "__thunk_", 8) == 0)
{
int delta;
(*mangled) += 8;
delta = consume_count (mangled);
if (delta == -1)
success = 0;
1997-08-22 00:57:35 +02:00
else
{
char *method = internal_cplus_demangle (work, ++*mangled);
if (method)
{
char buf[50];
sprintf (buf, "virtual function thunk (delta:%d) for ", -delta);
string_append (declp, buf);
string_append (declp, method);
free (method);
n = strlen (*mangled);
(*mangled) += n;
}
else
{
success = 0;
}
1997-08-22 00:57:35 +02:00
}
}
else if (strncmp (*mangled, "__t", 3) == 0
&& ((*mangled)[3] == 'i' || (*mangled)[3] == 'f'))
{
p = (*mangled)[3] == 'i' ? " type_info node" : " type_info function";
(*mangled) += 4;
switch (**mangled)
{
case 'Q':
case 'K':
1997-08-22 00:57:35 +02:00
success = demangle_qualified (work, mangled, declp, 0, 1);
break;
case 't':
success = demangle_template (work, mangled, declp, 0, 1, 1);
1997-08-22 00:57:35 +02:00
break;
default:
success = demangle_fund_type (work, mangled, declp);
break;
}
if (success && **mangled != '\0')
success = 0;
if (success)
string_append (declp, p);
}
else
{
success = 0;
}
return (success);
}
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
static void
recursively_demangle(work, mangled, result, namelength)
struct work_stuff *work;
const char **mangled;
string *result;
int namelength;
{
char * recurse = (char *)NULL;
char * recurse_dem = (char *)NULL;
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
recurse = (char *) xmalloc (namelength + 1);
memcpy (recurse, *mangled, namelength);
recurse[namelength] = '\000';
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
recurse_dem = cplus_demangle (recurse, work->options);
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
if (recurse_dem)
{
string_append (result, recurse_dem);
free (recurse_dem);
}
else
{
string_appendn (result, *mangled, namelength);
}
free (recurse);
*mangled += namelength;
}
1997-08-22 00:57:35 +02:00
/*
LOCAL FUNCTION
arm_special -- special handling of ARM/lucid mangled strings
SYNOPSIS
static int
arm_special (const char **mangled,
string *declp);
1997-08-22 00:57:35 +02:00
DESCRIPTION
Process some special ARM style mangling forms that don't fit
the normal pattern. For example:
__vtbl__3foo (foo virtual table)
__vtbl__3foo__3bar (bar::foo virtual table)
*/
static int
arm_special (mangled, declp)
1997-08-22 00:57:35 +02:00
const char **mangled;
string *declp;
{
int n;
int success = 1;
const char *scan;
if (strncmp (*mangled, ARM_VTABLE_STRING, ARM_VTABLE_STRLEN) == 0)
{
/* Found a ARM style virtual table, get past ARM_VTABLE_STRING
and create the decl. Note that we consume the entire mangled
input string, which means that demangle_signature has no work
to do. */
scan = *mangled + ARM_VTABLE_STRLEN;
while (*scan != '\0') /* first check it can be demangled */
{
n = consume_count (&scan);
if (n == -1)
1997-08-22 00:57:35 +02:00
{
return (0); /* no good */
}
scan += n;
if (scan[0] == '_' && scan[1] == '_')
{
scan += 2;
}
}
(*mangled) += ARM_VTABLE_STRLEN;
while (**mangled != '\0')
{
n = consume_count (mangled);
if (n == -1
|| n > strlen (*mangled))
return 0;
1997-08-22 00:57:35 +02:00
string_prependn (declp, *mangled, n);
(*mangled) += n;
if ((*mangled)[0] == '_' && (*mangled)[1] == '_')
{
string_prepend (declp, "::");
(*mangled) += 2;
}
}
string_append (declp, " virtual table");
}
else
{
success = 0;
}
return (success);
}
/*
LOCAL FUNCTION
demangle_qualified -- demangle 'Q' qualified name strings
SYNOPSIS
static int
demangle_qualified (struct work_stuff *, const char *mangled,
string *result, int isfuncname, int append);
DESCRIPTION
Demangle a qualified name, such as "Q25Outer5Inner" which is
the mangled form of "Outer::Inner". The demangled output is
prepended or appended to the result string according to the
state of the append flag.
If isfuncname is nonzero, then the qualified name we are building
is going to be used as a member function name, so if it is a
constructor or destructor function, append an appropriate
constructor or destructor name. I.E. for the above example,
the result for use as a constructor is "Outer::Inner::Inner"
and the result for use as a destructor is "Outer::Inner::~Inner".
BUGS
Numeric conversion is ASCII dependent (FIXME).
*/
static int
demangle_qualified (work, mangled, result, isfuncname, append)
struct work_stuff *work;
const char **mangled;
string *result;
int isfuncname;
int append;
{
int qualifiers = 0;
1997-08-22 00:57:35 +02:00
int success = 1;
const char *p;
char num[2];
string temp;
string last_name;
int bindex = register_Btype (work);
/* We only make use of ISFUNCNAME if the entity is a constructor or
destructor. */
isfuncname = (isfuncname
&& ((work->constructor & 1) || (work->destructor & 1)));
1997-08-22 00:57:35 +02:00
string_init (&temp);
string_init (&last_name);
if ((*mangled)[0] == 'K')
{
/* Squangling qualified name reuse */
int idx;
(*mangled)++;
idx = consume_count_with_underscores (mangled);
if (idx == -1 || idx >= work -> numk)
success = 0;
else
string_append (&temp, work -> ktypevec[idx]);
}
else
switch ((*mangled)[1])
1997-08-22 00:57:35 +02:00
{
case '_':
/* GNU mangled name with more than 9 classes. The count is preceded
by an underscore (to distinguish it from the <= 9 case) and followed
by an underscore. */
p = *mangled + 2;
qualifiers = atoi (p);
if (!isdigit ((unsigned char)*p) || *p == '0')
1997-08-22 00:57:35 +02:00
success = 0;
/* Skip the digits. */
while (isdigit ((unsigned char)*p))
1997-08-22 00:57:35 +02:00
++p;
if (*p != '_')
success = 0;
*mangled = p + 1;
break;
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
/* The count is in a single digit. */
num[0] = (*mangled)[1];
num[1] = '\0';
qualifiers = atoi (num);
/* If there is an underscore after the digit, skip it. This is
said to be for ARM-qualified names, but the ARM makes no
mention of such an underscore. Perhaps cfront uses one. */
if ((*mangled)[2] == '_')
{
(*mangled)++;
}
(*mangled) += 2;
break;
case '0':
default:
success = 0;
}
if (!success)
return success;
/* Pick off the names and collect them in the temp buffer in the order
in which they are found, separated by '::'. */
while (qualifiers-- > 0)
{
int remember_K = 1;
string_clear (&last_name);
if (*mangled[0] == '_')
(*mangled)++;
1997-08-22 00:57:35 +02:00
if (*mangled[0] == 't')
{
/* Here we always append to TEMP since we will want to use
the template name without the template parameters as a
constructor or destructor name. The appropriate
(parameter-less) value is returned by demangle_template
in LAST_NAME. We do not remember the template type here,
in order to match the G++ mangling algorithm. */
success = demangle_template(work, mangled, &temp,
&last_name, 1, 0);
if (!success)
break;
}
else if (*mangled[0] == 'K')
{
int idx;
(*mangled)++;
idx = consume_count_with_underscores (mangled);
if (idx == -1 || idx >= work->numk)
success = 0;
else
string_append (&temp, work->ktypevec[idx]);
remember_K = 0;
1997-08-22 00:57:35 +02:00
if (!success) break;
}
else
{
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
if (EDG_DEMANGLING)
{
int namelength;
/* Now recursively demangle the qualifier
* This is necessary to deal with templates in
* mangling styles like EDG */
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
namelength = consume_count (mangled);
if (namelength == -1)
{
success = 0;
break;
}
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
recursively_demangle(work, mangled, &temp, namelength);
}
else
{
success = do_type (work, mangled, &last_name);
if (!success)
break;
string_appends (&temp, &last_name);
}
1997-08-22 00:57:35 +02:00
}
if (remember_K)
remember_Ktype (work, temp.b, LEN_STRING (&temp));
1997-08-22 00:57:35 +02:00
if (qualifiers > 0)
string_append (&temp, SCOPE_STRING (work));
1997-08-22 00:57:35 +02:00
}
remember_Btype (work, temp.b, LEN_STRING (&temp), bindex);
1997-08-22 00:57:35 +02:00
/* If we are using the result as a function name, we need to append
the appropriate '::' separated constructor or destructor name.
We do this here because this is the most convenient place, where
we already have a pointer to the name and the length of the name. */
if (isfuncname)
1997-08-22 00:57:35 +02:00
{
string_append (&temp, SCOPE_STRING (work));
1997-08-22 00:57:35 +02:00
if (work -> destructor & 1)
string_append (&temp, "~");
string_appends (&temp, &last_name);
1997-08-22 00:57:35 +02:00
}
/* Now either prepend the temp buffer to the result, or append it,
1997-08-22 00:57:35 +02:00
depending upon the state of the append flag. */
if (append)
string_appends (result, &temp);
1997-08-22 00:57:35 +02:00
else
{
if (!STRING_EMPTY (result))
string_append (&temp, SCOPE_STRING (work));
1997-08-22 00:57:35 +02:00
string_prepends (result, &temp);
}
string_delete (&last_name);
1997-08-22 00:57:35 +02:00
string_delete (&temp);
return (success);
}
/*
LOCAL FUNCTION
get_count -- convert an ascii count to integer, consuming tokens
SYNOPSIS
static int
get_count (const char **type, int *count)
DESCRIPTION
Assume that *type points at a count in a mangled name; set
*count to its value, and set *type to the next character after
the count. There are some weird rules in effect here.
If *type does not point at a string of digits, return zero.
If *type points at a string of digits followed by an
underscore, set *count to their value as an integer, advance
*type to point *after the underscore, and return 1.
If *type points at a string of digits not followed by an
underscore, consume only the first digit. Set *count to its
value as an integer, leave *type pointing after that digit,
and return 1.
The excuse for this odd behavior: in the ARM and HP demangling
styles, a type can be followed by a repeat count of the form
`Nxy', where:
`x' is a single digit specifying how many additional copies
of the type to append to the argument list, and
`y' is one or more digits, specifying the zero-based index of
the first repeated argument in the list. Yes, as you're
unmangling the name you can figure this out yourself, but
it's there anyway.
So, for example, in `bar__3fooFPiN51', the first argument is a
pointer to an integer (`Pi'), and then the next five arguments
are the same (`N5'), and the first repeat is the function's
second argument (`1').
1997-08-22 00:57:35 +02:00
*/
static int
get_count (type, count)
const char **type;
int *count;
{
const char *p;
int n;
if (!isdigit ((unsigned char)**type))
1997-08-22 00:57:35 +02:00
{
return (0);
}
else
{
*count = **type - '0';
(*type)++;
if (isdigit ((unsigned char)**type))
1997-08-22 00:57:35 +02:00
{
p = *type;
n = *count;
do
1997-08-22 00:57:35 +02:00
{
n *= 10;
n += *p - '0';
p++;
}
while (isdigit ((unsigned char)*p));
1997-08-22 00:57:35 +02:00
if (*p == '_')
{
*type = p + 1;
*count = n;
}
}
}
return (1);
}
/* RESULT will be initialised here; it will be freed on failure. The
value returned is really a type_kind_t. */
1997-08-22 00:57:35 +02:00
static int
do_type (work, mangled, result)
struct work_stuff *work;
const char **mangled;
string *result;
{
int n;
int done;
int success;
string decl;
const char *remembered_type;
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
int type_quals;
string btype;
type_kind_t tk = tk_none;
1997-08-22 00:57:35 +02:00
string_init (&btype);
1997-08-22 00:57:35 +02:00
string_init (&decl);
string_init (result);
done = 0;
success = 1;
while (success && !done)
{
int member;
switch (**mangled)
{
/* A pointer type */
case 'P':
case 'p':
(*mangled)++;
if (! (work -> options & DMGL_JAVA))
string_prepend (&decl, "*");
if (tk == tk_none)
tk = tk_pointer;
1997-08-22 00:57:35 +02:00
break;
/* A reference type */
case 'R':
(*mangled)++;
string_prepend (&decl, "&");
if (tk == tk_none)
tk = tk_reference;
1997-08-22 00:57:35 +02:00
break;
/* An array */
case 'A':
{
++(*mangled);
1998-08-17 20:46:03 +02:00
if (!STRING_EMPTY (&decl)
&& (decl.b[0] == '*' || decl.b[0] == '&'))
{
string_prepend (&decl, "(");
string_append (&decl, ")");
}
string_append (&decl, "[");
if (**mangled != '_')
success = demangle_template_value_parm (work, mangled, &decl,
tk_integral);
1997-08-22 00:57:35 +02:00
if (**mangled == '_')
++(*mangled);
string_append (&decl, "]");
1997-08-22 00:57:35 +02:00
break;
}
/* A back reference to a previously seen type */
case 'T':
(*mangled)++;
if (!get_count (mangled, &n) || n >= work -> ntypes)
{
success = 0;
}
else
{
remembered_type = work -> typevec[n];
mangled = &remembered_type;
}
break;
/* A function */
case 'F':
(*mangled)++;
1998-08-17 20:46:03 +02:00
if (!STRING_EMPTY (&decl)
&& (decl.b[0] == '*' || decl.b[0] == '&'))
1997-08-22 00:57:35 +02:00
{
string_prepend (&decl, "(");
string_append (&decl, ")");
}
/* After picking off the function args, we expect to either find the
function return type (preceded by an '_') or the end of the
string. */
if (!demangle_nested_args (work, mangled, &decl)
1997-08-22 00:57:35 +02:00
|| (**mangled != '_' && **mangled != '\0'))
{
success = 0;
break;
1997-08-22 00:57:35 +02:00
}
if (success && (**mangled == '_'))
(*mangled)++;
1997-08-22 00:57:35 +02:00
break;
case 'M':
case 'O':
{
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
type_quals = TYPE_UNQUALIFIED;
1997-08-22 00:57:35 +02:00
member = **mangled == 'M';
(*mangled)++;
string_append (&decl, ")");
string_prepend (&decl, SCOPE_STRING (work));
if (isdigit ((unsigned char)**mangled))
1997-08-22 00:57:35 +02:00
{
n = consume_count (mangled);
if (n == -1
|| (int) strlen (*mangled) < n)
1997-08-22 00:57:35 +02:00
{
success = 0;
break;
}
string_prependn (&decl, *mangled, n);
*mangled += n;
}
else if (**mangled == 'X' || **mangled == 'Y')
{
string temp;
do_type (work, mangled, &temp);
string_prepends (&decl, &temp);
}
else if (**mangled == 't')
1997-08-22 00:57:35 +02:00
{
string temp;
string_init (&temp);
success = demangle_template (work, mangled, &temp,
NULL, 1, 1);
1997-08-22 00:57:35 +02:00
if (success)
{
string_prependn (&decl, temp.b, temp.p - temp.b);
string_clear (&temp);
}
else
break;
}
else
{
success = 0;
break;
}
1997-08-22 00:57:35 +02:00
string_prepend (&decl, "(");
if (member)
{
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
switch (**mangled)
1997-08-22 00:57:35 +02:00
{
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
case 'C':
case 'V':
case 'u':
type_quals |= code_for_qualifier (**mangled);
1997-08-22 00:57:35 +02:00
(*mangled)++;
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
break;
default:
break;
1997-08-22 00:57:35 +02:00
}
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
1997-08-22 00:57:35 +02:00
if (*(*mangled)++ != 'F')
{
success = 0;
break;
}
}
if ((member && !demangle_nested_args (work, mangled, &decl))
1997-08-22 00:57:35 +02:00
|| **mangled != '_')
{
success = 0;
break;
}
(*mangled)++;
if (! PRINT_ANSI_QUALIFIERS)
{
break;
}
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
if (type_quals != TYPE_UNQUALIFIED)
1997-08-22 00:57:35 +02:00
{
APPEND_BLANK (&decl);
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
string_append (&decl, qualifier_string (type_quals));
1997-08-22 00:57:35 +02:00
}
break;
}
case 'G':
(*mangled)++;
break;
case 'C':
case 'V':
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
case 'u':
1997-08-22 00:57:35 +02:00
if (PRINT_ANSI_QUALIFIERS)
{
if (!STRING_EMPTY (&decl))
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
string_prepend (&decl, " ");
string_prepend (&decl, demangle_qualifier (**mangled));
1997-08-22 00:57:35 +02:00
}
(*mangled)++;
1997-08-22 00:57:35 +02:00
break;
/*
}
*/
/* fall through */
default:
done = 1;
break;
}
}
if (success) switch (**mangled)
1997-08-22 00:57:35 +02:00
{
/* A qualified name, such as "Outer::Inner". */
case 'Q':
case 'K':
{
success = demangle_qualified (work, mangled, result, 0, 1);
break;
}
/* A back reference to a previously seen squangled type */
case 'B':
(*mangled)++;
if (!get_count (mangled, &n) || n >= work -> numb)
success = 0;
else
string_append (result, work->btypevec[n]);
1997-08-22 00:57:35 +02:00
break;
case 'X':
case 'Y':
/* A template parm. We substitute the corresponding argument. */
{
int idx;
(*mangled)++;
idx = consume_count_with_underscores (mangled);
if (idx == -1
|| (work->tmpl_argvec && idx >= work->ntmpl_args)
|| consume_count_with_underscores (mangled) == -1)
{
success = 0;
break;
}
if (work->tmpl_argvec)
string_append (result, work->tmpl_argvec[idx]);
else
{
char buf[10];
sprintf(buf, "T%d", idx);
string_append (result, buf);
}
success = 1;
}
break;
1997-08-22 00:57:35 +02:00
default:
success = demangle_fund_type (work, mangled, result);
if (tk == tk_none)
tk = (type_kind_t) success;
1997-08-22 00:57:35 +02:00
break;
}
if (success)
{
if (!STRING_EMPTY (&decl))
{
string_append (result, " ");
string_appends (result, &decl);
}
}
else
string_delete (result);
1997-08-22 00:57:35 +02:00
string_delete (&decl);
if (success)
/* Assume an integral type, if we're not sure. */
return (int) ((tk == tk_none) ? tk_integral : tk);
else
return 0;
1997-08-22 00:57:35 +02:00
}
/* Given a pointer to a type string that represents a fundamental type
argument (int, long, unsigned int, etc) in TYPE, a pointer to the
string in which the demangled output is being built in RESULT, and
the WORK structure, decode the types and add them to the result.
For example:
"Ci" => "const int"
"Sl" => "signed long"
"CUs" => "const unsigned short"
The value returned is really a type_kind_t. */
1997-08-22 00:57:35 +02:00
static int
demangle_fund_type (work, mangled, result)
struct work_stuff *work;
const char **mangled;
string *result;
{
int done = 0;
int success = 1;
char buf[10];
int dec = 0;
string btype;
type_kind_t tk = tk_integral;
string_init (&btype);
1997-08-22 00:57:35 +02:00
/* First pick off any type qualifiers. There can be more than one. */
while (!done)
{
switch (**mangled)
{
case 'C':
cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. * cplus-dem.c (work_stuff): Replace const_type and volatile_type with type_quals. (TYPE_UNQUALIFIED): New macro. (TYPE_QUAL_CONST): Likewise. (TYPE_QUAL_VOLATILE): Likewise. (TYPE_QUAL_RESTRICT): Likewise. (code_for_qualifier): New function. (qualifier_string): Likewise. (demangle_qualifier): Likewise. (internal_cplus_demangle): Use them. (demangle_signature): Likewise. (demangle_template_value_parm): Likewise. (do_type): Likewise. (demangle_fund_type)): Likewise. * Makefile.in (hash.h): Run gperf when necessary. * cp-tree.h (CP_TYPE_READONLY): Remove. (CP_TYPE_VOLATILE): Likewise. (CP_TYPE_QUALS): New macro. (CP_TYPE_CONST_P): Likewise. (CP_TYPE_VOLATILE_P): Likewise. (CP_TYPE_RESTRICT_P): Likewise. (CP_TYPE_CONST_NON_VOLATILE_P): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. (c_apply_type_quals_to_decl): Declare. (SIGNATURE_POINTER_NAME_FORMAT): Modify to allow `restrict'. (SIGNATURE_REFERENCE_NAME_FORMAT): Likewise. (cp_type_qual_from_rid): New function. (compparms): Remove unused parameter. All callers changed. (cp_type_quals): New function. (at_least_as_qualified_p): Likewise. (more_qualified_p): Likewise. * call.c (standard_conversion): Replace calls to cp_build_type_variant with cp_build_qualified_type. Use CP_TYPE_QUALS to get qualifiers and at_least_as_qualified_p to compare them. Use CP_TYPE_* macros to check qualifiers. (reference_binding): Likewise. (implicit_conversion): Likewise. (add_builtin_candidates): Likewise. (build_over_call): Likewise. * class.c (overrides): Compare all qualifiers, not just `const', on method declarations. * cvt.c (convert_to_reference): More CP_TYPE_QUALS conversion, etc. (convert_pointer_to_real): Likewise. (type_promotes_to): Likewise. * decl.c (check_for_uninitialized_const_var): New function. (init_decl_processing): More CP_TYPE_QUALS conversion, etc. (cp_finish_decl): Use check_for_uninitialized_const_var. (grokdeclarator): More CP_TYPE_QUALS conversion, etc. Update to handle `restrict'. (grok_ctor_properties): Likewise. (grok_op_properties): Likewise. (start_function): Likewise. (rever_static_member_fn): Likewise. * decl2.c (grok_method_quals): Likewise. (grokfield): Likewise. * error.c (dump_readonly_or_volatile): Rename to ... (dump_qualifiers): New function. Handle `restrict'. (dump_type_real): Use it. (dump_aggr_type): Likewise. (dump_type_prefix): Likewise. (dump_type_suffix): Likewise. (dump_function_decl): Likewise. (cv_as_string): Likewise. * gxx.gperf: Add __restrict and __restrict__. * gxxint.texi: Document `u' as used for `__restrict', and a few other previously undocumented codes. * hash.h: Regenerated. * init.c (expand_aggr_init): More CP_TYPE_QUALS conversion, etc. (build_member_call): Likewise. (build_new_1): Likewise. * lex.c (init_parse): Add entry for RID_RESTRICT. (cons_up_default_function): More CP_TYPE_QUALS conversion, etc. (cp_type_qual_from_rid): Define. * lex.h (enum rid): Add RID_RESTRICT. * method.c (process_modifiers): Deal with `restrict'. * parse.y (primary): More CP_TYPE_QUALS conversion, etc. * parse.c: Regenerated. * pt.c (convert_nontype_argument): More CP_TYPE_QUALS conversion, etc. (tsubst_aggr_type): Likewise. (tsubst): Likewise. (check_cv_quals_for_unify): Likewise. (unify): Likewise. * rtti.c (init_rtti_processing): Likewise. (build_headof): Likewise. (get_tinfo_var): Likewise. (buidl_dynamic_cast_1): Likewise. Fix `volatile' handling. (expand_class_desc): Likewise. (expand_attr_desc): Likewise. (synthesize_tinfo_fn): Likewise. * search.c (covariant_return_p): Likewise. Fix `volatile' handling. (get_matching_virtual): Likewise. (expand_upcast_fixups): Likewise. * sig.c (build_signature_pointer_or_reference_name): Take type_quals, not constp and volatilep. (build_signature_pointer_or_reference_type): Likewise. (match_method_types): More CP_TYPE_QUALS conversion, etc. (build_signature_pointer_constructor): Likewise. (build_signature_method_call): Likewise. * tree.c (build_cplus_array_type): Likewise. (cp_build_type_variant): Rename to ... (cp_build_qualified_type): New function. Deal with `__restrict'. (canonical_type_variant): More CP_TYPE_QUALS conversion, etc. (build_exception_variant): Likewise. (mapcar): Likewise. * typeck.c (qualif_type): Likewise. (common_type): Likewise. (comptypes): Likewise. (comp_cv_target_types): Likewise. (at_least_as_qualified_p): Define. (more_qualified_p): Likewise. (comp_cv_qualification): More CP_TYPE_QUALS conversion, etc. (compparms): Likewise. (inline_conversion): Likewise. (string_conv_p): Likewise. (build_component_ref): Likewise. (build_indirect_ref): Likewise. (build_array_ref): Likewise. (build_unary_op): Likewise. (build_conditional_expr): Likewise. (build_static_cast): Likewise. (build_c_cast): Likewise. (build_modify_expr): Likewise. (convert_For_assignment): Likewise. (comp_ptr_ttypes_real): Likewise. (cp_type_quals): New function. From-SVN: r23258
1998-10-23 16:53:28 +02:00
case 'V':
case 'u':
1997-08-22 00:57:35 +02:00
if (PRINT_ANSI_QUALIFIERS)
{
if (!STRING_EMPTY (result))
string_prepend (result, " ");
string_prepend (result, demangle_qualifier (**mangled));
1997-08-22 00:57:35 +02:00
}
(*mangled)++;
1997-08-22 00:57:35 +02:00
break;
case 'U':
(*mangled)++;
APPEND_BLANK (result);
string_append (result, "unsigned");
break;
case 'S': /* signed char only */
(*mangled)++;
APPEND_BLANK (result);
string_append (result, "signed");
break;
case 'J':
(*mangled)++;
APPEND_BLANK (result);
string_append (result, "__complex");
1997-08-22 00:57:35 +02:00
break;
default:
done = 1;
break;
}
}
/* Now pick off the fundamental type. There can be only one. */
switch (**mangled)
{
case '\0':
case '_':
break;
case 'v':
(*mangled)++;
APPEND_BLANK (result);
string_append (result, "void");
break;
case 'x':
(*mangled)++;
APPEND_BLANK (result);
string_append (result, "long long");
break;
case 'l':
(*mangled)++;
APPEND_BLANK (result);
string_append (result, "long");
break;
case 'i':
(*mangled)++;
APPEND_BLANK (result);
string_append (result, "int");
break;
case 's':
(*mangled)++;
APPEND_BLANK (result);
string_append (result, "short");
break;
case 'b':
(*mangled)++;
APPEND_BLANK (result);
string_append (result, "bool");
tk = tk_bool;
1997-08-22 00:57:35 +02:00
break;
case 'c':
(*mangled)++;
APPEND_BLANK (result);
string_append (result, "char");
tk = tk_char;
1997-08-22 00:57:35 +02:00
break;
case 'w':
(*mangled)++;
APPEND_BLANK (result);
string_append (result, "wchar_t");
tk = tk_char;
1997-08-22 00:57:35 +02:00
break;
case 'r':
(*mangled)++;
APPEND_BLANK (result);
string_append (result, "long double");
tk = tk_real;
1997-08-22 00:57:35 +02:00
break;
case 'd':
(*mangled)++;
APPEND_BLANK (result);
string_append (result, "double");
tk = tk_real;
1997-08-22 00:57:35 +02:00
break;
case 'f':
(*mangled)++;
APPEND_BLANK (result);
string_append (result, "float");
tk = tk_real;
1997-08-22 00:57:35 +02:00
break;
case 'G':
(*mangled)++;
if (!isdigit ((unsigned char)**mangled))
1997-08-22 00:57:35 +02:00
{
success = 0;
break;
}
case 'I':
(*mangled)++;
if (**mangled == '_')
{
int i;
(*mangled)++;
for (i = 0;
i < sizeof (buf) - 1 && **mangled && **mangled != '_';
(*mangled)++, i++)
buf[i] = **mangled;
if (**mangled != '_')
{
success = 0;
break;
}
buf[i] = '\0';
(*mangled)++;
}
else
{
strncpy (buf, *mangled, 2);
buf[2] = '\0';
*mangled += min (strlen (*mangled), 2);
}
sscanf (buf, "%x", &dec);
sprintf (buf, "int%i_t", dec);
APPEND_BLANK (result);
string_append (result, buf);
break;
1997-08-22 00:57:35 +02:00
/* fall through */
/* An explicit type, such as "6mytype" or "7integer" */
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
{
int bindex = register_Btype (work);
string btype;
string_init (&btype);
if (demangle_class_name (work, mangled, &btype)) {
remember_Btype (work, btype.b, LEN_STRING (&btype), bindex);
APPEND_BLANK (result);
string_appends (result, &btype);
}
else
success = 0;
string_delete (&btype);
break;
1997-08-22 00:57:35 +02:00
}
case 't':
{
success = demangle_template (work, mangled, &btype, 0, 1, 1);
string_appends (result, &btype);
break;
}
1997-08-22 00:57:35 +02:00
default:
success = 0;
break;
}
return success ? ((int) tk) : 0;
1997-08-22 00:57:35 +02:00
}
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
/* Handle a template's value parameter for HP aCC (extension from ARM)
**mangled points to 'S' or 'U' */
static int
do_hpacc_template_const_value (work, mangled, result)
struct work_stuff *work;
const char **mangled;
string *result;
{
int unsigned_const;
if (**mangled != 'U' && **mangled != 'S')
return 0;
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
unsigned_const = (**mangled == 'U');
(*mangled)++;
switch (**mangled)
{
case 'N':
string_append (result, "-");
/* fall through */
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
case 'P':
(*mangled)++;
break;
case 'M':
/* special case for -2^31 */
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
string_append (result, "-2147483648");
(*mangled)++;
return 1;
default:
return 0;
}
/* We have to be looking at an integer now */
if (!(isdigit ((unsigned char)**mangled)))
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
return 0;
/* We only deal with integral values for template
parameters -- so it's OK to look only for digits */
while (isdigit ((unsigned char)**mangled))
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
{
char_str[0] = **mangled;
string_append (result, char_str);
(*mangled)++;
}
if (unsigned_const)
string_append (result, "U");
/* FIXME? Some day we may have 64-bit (or larger :-) ) constants
with L or LL suffixes. pai/1997-09-03 */
return 1; /* success */
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
}
/* Handle a template's literal parameter for HP aCC (extension from ARM)
**mangled is pointing to the 'A' */
static int
do_hpacc_template_literal (work, mangled, result)
struct work_stuff *work;
const char **mangled;
string *result;
{
int literal_len = 0;
char * recurse;
char * recurse_dem;
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
if (**mangled != 'A')
return 0;
(*mangled)++;
literal_len = consume_count (mangled);
if (literal_len <= 0)
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
return 0;
/* Literal parameters are names of arrays, functions, etc. and the
canonical representation uses the address operator */
string_append (result, "&");
/* Now recursively demangle the literal name */
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
recurse = (char *) xmalloc (literal_len + 1);
memcpy (recurse, *mangled, literal_len);
recurse[literal_len] = '\000';
recurse_dem = cplus_demangle (recurse, work->options);
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
if (recurse_dem)
{
string_append (result, recurse_dem);
free (recurse_dem);
}
else
{
string_appendn (result, *mangled, literal_len);
}
(*mangled) += literal_len;
free (recurse);
return 1;
}
static int
snarf_numeric_literal (args, arg)
const char ** args;
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
string * arg;
{
if (**args == '-')
{
char_str[0] = '-';
string_append (arg, char_str);
(*args)++;
}
else if (**args == '+')
(*args)++;
if (!isdigit ((unsigned char)**args))
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
return 0;
while (isdigit ((unsigned char)**args))
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
{
char_str[0] = **args;
string_append (arg, char_str);
(*args)++;
}
return 1;
}
/* Demangle the next argument, given by MANGLED into RESULT, which
*should be an uninitialized* string. It will be initialized here,
and free'd should anything go wrong. */
1997-08-22 00:57:35 +02:00
static int
do_arg (work, mangled, result)
struct work_stuff *work;
const char **mangled;
string *result;
{
/* Remember where we started so that we can record the type, for
non-squangling type remembering. */
1997-08-22 00:57:35 +02:00
const char *start = *mangled;
string_init (result);
if (work->nrepeats > 0)
1997-08-22 00:57:35 +02:00
{
--work->nrepeats;
if (work->previous_argument == 0)
return 0;
/* We want to reissue the previous type in this argument list. */
string_appends (result, work->previous_argument);
return 1;
1997-08-22 00:57:35 +02:00
}
if (**mangled == 'n')
{
/* A squangling-style repeat. */
(*mangled)++;
work->nrepeats = consume_count(mangled);
if (work->nrepeats <= 0)
/* This was not a repeat count after all. */
return 0;
if (work->nrepeats > 9)
{
if (**mangled != '_')
/* The repeat count should be followed by an '_' in this
case. */
return 0;
else
(*mangled)++;
}
/* Now, the repeat is all set up. */
return do_arg (work, mangled, result);
}
/* Save the result in WORK->previous_argument so that we can find it
if it's repeated. Note that saving START is not good enough: we
do not want to add additional types to the back-referenceable
type vector when processing a repeated type. */
if (work->previous_argument)
string_clear (work->previous_argument);
1997-08-22 00:57:35 +02:00
else
{
work->previous_argument = (string*) xmalloc (sizeof (string));
string_init (work->previous_argument);
1997-08-22 00:57:35 +02:00
}
if (!do_type (work, mangled, work->previous_argument))
return 0;
string_appends (result, work->previous_argument);
remember_type (work, start, *mangled - start);
return 1;
1997-08-22 00:57:35 +02:00
}
static void
remember_type (work, start, len)
struct work_stuff *work;
const char *start;
int len;
{
char *tem;
if (work->forgetting_types)
return;
1997-08-22 00:57:35 +02:00
if (work -> ntypes >= work -> typevec_size)
{
if (work -> typevec_size == 0)
{
work -> typevec_size = 3;
work -> typevec
= (char **) xmalloc (sizeof (char *) * work -> typevec_size);
}
else
{
work -> typevec_size *= 2;
work -> typevec
= (char **) xrealloc ((char *)work -> typevec,
sizeof (char *) * work -> typevec_size);
}
}
tem = xmalloc (len + 1);
memcpy (tem, start, len);
tem[len] = '\0';
work -> typevec[work -> ntypes++] = tem;
}
/* Remember a K type class qualifier. */
static void
remember_Ktype (work, start, len)
struct work_stuff *work;
const char *start;
int len;
{
char *tem;
if (work -> numk >= work -> ksize)
{
if (work -> ksize == 0)
{
work -> ksize = 5;
work -> ktypevec
= (char **) xmalloc (sizeof (char *) * work -> ksize);
}
else
{
work -> ksize *= 2;
work -> ktypevec
= (char **) xrealloc ((char *)work -> ktypevec,
sizeof (char *) * work -> ksize);
}
}
tem = xmalloc (len + 1);
memcpy (tem, start, len);
tem[len] = '\0';
work -> ktypevec[work -> numk++] = tem;
}
/* Register a B code, and get an index for it. B codes are registered
as they are seen, rather than as they are completed, so map<temp<char> >
registers map<temp<char> > as B0, and temp<char> as B1 */
static int
register_Btype (work)
struct work_stuff *work;
{
int ret;
if (work -> numb >= work -> bsize)
{
if (work -> bsize == 0)
{
work -> bsize = 5;
work -> btypevec
= (char **) xmalloc (sizeof (char *) * work -> bsize);
}
else
{
work -> bsize *= 2;
work -> btypevec
= (char **) xrealloc ((char *)work -> btypevec,
sizeof (char *) * work -> bsize);
}
}
ret = work -> numb++;
work -> btypevec[ret] = NULL;
return(ret);
}
/* Store a value into a previously registered B code type. */
static void
remember_Btype (work, start, len, index)
struct work_stuff *work;
const char *start;
int len, index;
{
char *tem;
tem = xmalloc (len + 1);
memcpy (tem, start, len);
tem[len] = '\0';
work -> btypevec[index] = tem;
}
/* Lose all the info related to B and K type codes. */
static void
forget_B_and_K_types (work)
struct work_stuff *work;
{
int i;
while (work -> numk > 0)
{
i = --(work -> numk);
if (work -> ktypevec[i] != NULL)
{
free (work -> ktypevec[i]);
work -> ktypevec[i] = NULL;
}
}
while (work -> numb > 0)
{
i = --(work -> numb);
if (work -> btypevec[i] != NULL)
{
free (work -> btypevec[i]);
work -> btypevec[i] = NULL;
}
}
}
1997-08-22 00:57:35 +02:00
/* Forget the remembered types, but not the type vector itself. */
static void
forget_types (work)
struct work_stuff *work;
{
int i;
while (work -> ntypes > 0)
{
i = --(work -> ntypes);
if (work -> typevec[i] != NULL)
{
free (work -> typevec[i]);
work -> typevec[i] = NULL;
}
}
}
/* Process the argument list part of the signature, after any class spec
has been consumed, as well as the first 'F' character (if any). For
example:
"__als__3fooRT0" => process "RT0"
"complexfunc5__FPFPc_PFl_i" => process "PFPc_PFl_i"
DECLP must be already initialised, usually non-empty. It won't be freed
on failure.
Note that g++ differs significantly from ARM and lucid style mangling
with regards to references to previously seen types. For example, given
the source fragment:
class foo {
public:
foo::foo (int, foo &ia, int, foo &ib, int, foo &ic);
};
foo::foo (int, foo &ia, int, foo &ib, int, foo &ic) { ia = ib = ic; }
void foo (int, foo &ia, int, foo &ib, int, foo &ic) { ia = ib = ic; }
g++ produces the names:
__3fooiRT0iT2iT2
foo__FiR3fooiT1iT1
while lcc (and presumably other ARM style compilers as well) produces:
foo__FiR3fooT1T2T1T2
__ct__3fooFiR3fooT1T2T1T2
Note that g++ bases its type numbers starting at zero and counts all
previously seen types, while lucid/ARM bases its type numbers starting
1997-08-22 00:57:35 +02:00
at one and only considers types after it has seen the 'F' character
indicating the start of the function args. For lucid/ARM style, we
account for this difference by discarding any previously seen types when
we see the 'F' character, and subtracting one from the type number
reference.
*/
static int
demangle_args (work, mangled, declp)
struct work_stuff *work;
const char **mangled;
string *declp;
{
string arg;
int need_comma = 0;
int r;
int t;
const char *tem;
char temptype;
if (PRINT_ARG_TYPES)
{
string_append (declp, "(");
if (**mangled == '\0')
{
string_append (declp, "void");
}
}
while ((**mangled != '_' && **mangled != '\0' && **mangled != 'e')
|| work->nrepeats > 0)
1997-08-22 00:57:35 +02:00
{
if ((**mangled == 'N') || (**mangled == 'T'))
{
temptype = *(*mangled)++;
1997-08-22 00:57:35 +02:00
if (temptype == 'N')
{
if (!get_count (mangled, &r))
{
return (0);
}
}
else
{
r = 1;
}
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
if ((HP_DEMANGLING || ARM_DEMANGLING || EDG_DEMANGLING) && work -> ntypes >= 10)
1997-08-22 00:57:35 +02:00
{
/* If we have 10 or more types we might have more than a 1 digit
index so we'll have to consume the whole count here. This
will lose if the next thing is a type name preceded by a
count but it's impossible to demangle that case properly
anyway. Eg if we already have 12 types is T12Pc "(..., type1,
Pc, ...)" or "(..., type12, char *, ...)" */
if ((t = consume_count(mangled)) <= 0)
1997-08-22 00:57:35 +02:00
{
return (0);
}
}
else
{
if (!get_count (mangled, &t))
{
return (0);
}
}
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
if (LUCID_DEMANGLING || ARM_DEMANGLING || HP_DEMANGLING || EDG_DEMANGLING)
1997-08-22 00:57:35 +02:00
{
t--;
}
/* Validate the type index. Protect against illegal indices from
malformed type strings. */
if ((t < 0) || (t >= work -> ntypes))
{
return (0);
}
while (work->nrepeats > 0 || --r >= 0)
1997-08-22 00:57:35 +02:00
{
tem = work -> typevec[t];
if (need_comma && PRINT_ARG_TYPES)
{
string_append (declp, ", ");
}
if (!do_arg (work, &tem, &arg))
{
return (0);
}
if (PRINT_ARG_TYPES)
{
string_appends (declp, &arg);
}
string_delete (&arg);
need_comma = 1;
}
}
else
{
if (need_comma && PRINT_ARG_TYPES)
string_append (declp, ", ");
1997-08-22 00:57:35 +02:00
if (!do_arg (work, mangled, &arg))
return (0);
1997-08-22 00:57:35 +02:00
if (PRINT_ARG_TYPES)
string_appends (declp, &arg);
1997-08-22 00:57:35 +02:00
string_delete (&arg);
need_comma = 1;
}
}
if (**mangled == 'e')
{
(*mangled)++;
if (PRINT_ARG_TYPES)
{
if (need_comma)
{
string_append (declp, ",");
}
string_append (declp, "...");
}
}
if (PRINT_ARG_TYPES)
{
string_append (declp, ")");
}
return (1);
}
/* Like demangle_args, but for demangling the argument lists of function
and method pointers or references, not top-level declarations. */
static int
demangle_nested_args (work, mangled, declp)
struct work_stuff *work;
const char **mangled;
string *declp;
{
string* saved_previous_argument;
int result;
int saved_nrepeats;
/* The G++ name-mangling algorithm does not remember types on nested
argument lists, unless -fsquangling is used, and in that case the
type vector updated by remember_type is not used. So, we turn
off remembering of types here. */
++work->forgetting_types;
/* For the repeat codes used with -fsquangling, we must keep track of
the last argument. */
saved_previous_argument = work->previous_argument;
saved_nrepeats = work->nrepeats;
work->previous_argument = 0;
work->nrepeats = 0;
/* Actually demangle the arguments. */
result = demangle_args (work, mangled, declp);
/* Restore the previous_argument field. */
if (work->previous_argument)
string_delete (work->previous_argument);
work->previous_argument = saved_previous_argument;
--work->forgetting_types;
work->nrepeats = saved_nrepeats;
return result;
}
1997-08-22 00:57:35 +02:00
static void
demangle_function_name (work, mangled, declp, scan)
struct work_stuff *work;
const char **mangled;
string *declp;
const char *scan;
{
size_t i;
1997-08-22 00:57:35 +02:00
string type;
const char *tem;
string_appendn (declp, (*mangled), scan - (*mangled));
string_need (declp, 1);
*(declp -> p) = '\0';
/* Consume the function name, including the "__" separating the name
from the signature. We are guaranteed that SCAN points to the
separator. */
(*mangled) = scan + 2;
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
/* We may be looking at an instantiation of a template function:
foo__Xt1t2_Ft3t4, where t1, t2, ... are template arguments and a
following _F marks the start of the function arguments. Handle
the template arguments first. */
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
if (HP_DEMANGLING && (**mangled == 'X'))
{
demangle_arm_hp_template (work, mangled, 0, declp);
/* This leaves MANGLED pointing to the 'F' marking func args */
}
1997-08-22 00:57:35 +02:00
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
if (LUCID_DEMANGLING || ARM_DEMANGLING || HP_DEMANGLING || EDG_DEMANGLING)
1997-08-22 00:57:35 +02:00
{
/* See if we have an ARM style constructor or destructor operator.
If so, then just record it, clear the decl, and return.
We can't build the actual constructor/destructor decl until later,
when we recover the class name from the signature. */
if (strcmp (declp -> b, "__ct") == 0)
{
work -> constructor += 1;
string_clear (declp);
return;
}
else if (strcmp (declp -> b, "__dt") == 0)
{
work -> destructor += 1;
string_clear (declp);
return;
}
}
if (declp->p - declp->b >= 3
1997-08-22 00:57:35 +02:00
&& declp->b[0] == 'o'
&& declp->b[1] == 'p'
&& strchr (cplus_markers, declp->b[2]) != NULL)
{
/* see if it's an assignment expression */
if (declp->p - declp->b >= 10 /* op$assign_ */
&& memcmp (declp->b + 3, "assign_", 7) == 0)
{
for (i = 0; i < sizeof (optable) / sizeof (optable[0]); i++)
{
int len = declp->p - declp->b - 10;
if ((int) strlen (optable[i].in) == len
1997-08-22 00:57:35 +02:00
&& memcmp (optable[i].in, declp->b + 10, len) == 0)
{
string_clear (declp);
string_append (declp, "operator");
string_append (declp, optable[i].out);
string_append (declp, "=");
break;
}
}
}
else
{
for (i = 0; i < sizeof (optable) / sizeof (optable[0]); i++)
{
int len = declp->p - declp->b - 3;
if ((int) strlen (optable[i].in) == len
1997-08-22 00:57:35 +02:00
&& memcmp (optable[i].in, declp->b + 3, len) == 0)
{
string_clear (declp);
string_append (declp, "operator");
string_append (declp, optable[i].out);
break;
}
}
}
}
else if (declp->p - declp->b >= 5 && memcmp (declp->b, "type", 4) == 0
&& strchr (cplus_markers, declp->b[4]) != NULL)
{
/* type conversion operator */
tem = declp->b + 5;
if (do_type (work, &tem, &type))
{
string_clear (declp);
string_append (declp, "operator ");
string_appends (declp, &type);
string_delete (&type);
}
}
else if (declp->b[0] == '_' && declp->b[1] == '_'
&& declp->b[2] == 'o' && declp->b[3] == 'p')
{
/* ANSI. */
/* type conversion operator. */
tem = declp->b + 4;
if (do_type (work, &tem, &type))
{
string_clear (declp);
string_append (declp, "operator ");
string_appends (declp, &type);
string_delete (&type);
}
}
else if (declp->b[0] == '_' && declp->b[1] == '_'
&& declp->b[2] >= 'a' && declp->b[2] <= 'z'
&& declp->b[3] >= 'a' && declp->b[3] <= 'z')
{
if (declp->b[4] == '\0')
{
/* Operator. */
for (i = 0; i < sizeof (optable) / sizeof (optable[0]); i++)
{
if (strlen (optable[i].in) == 2
&& memcmp (optable[i].in, declp->b + 2, 2) == 0)
{
string_clear (declp);
string_append (declp, "operator");
string_append (declp, optable[i].out);
break;
}
}
}
else
{
if (declp->b[2] == 'a' && declp->b[5] == '\0')
{
/* Assignment. */
for (i = 0; i < sizeof (optable) / sizeof (optable[0]); i++)
{
if (strlen (optable[i].in) == 3
&& memcmp (optable[i].in, declp->b + 2, 3) == 0)
{
string_clear (declp);
string_append (declp, "operator");
string_append (declp, optable[i].out);
break;
}
1997-08-22 00:57:35 +02:00
}
}
}
}
}
/* a mini string-handling package */
static void
string_need (s, n)
string *s;
int n;
{
int tem;
if (s->b == NULL)
{
if (n < 32)
{
n = 32;
}
s->p = s->b = xmalloc (n);
s->e = s->b + n;
}
else if (s->e - s->p < n)
{
tem = s->p - s->b;
n += tem;
n *= 2;
s->b = xrealloc (s->b, n);
s->p = s->b + tem;
s->e = s->b + n;
}
}
static void
string_delete (s)
string *s;
{
if (s->b != NULL)
{
free (s->b);
s->b = s->e = s->p = NULL;
}
}
static void
string_init (s)
string *s;
{
s->b = s->p = s->e = NULL;
}
static void
1997-08-22 00:57:35 +02:00
string_clear (s)
string *s;
{
s->p = s->b;
}
#if 0
static int
string_empty (s)
string *s;
{
return (s->b == s->p);
}
#endif
static void
string_append (p, s)
string *p;
const char *s;
{
int n;
if (s == NULL || *s == '\0')
return;
n = strlen (s);
string_need (p, n);
memcpy (p->p, s, n);
p->p += n;
}
static void
string_appends (p, s)
string *p, *s;
{
int n;
if (s->b != s->p)
{
n = s->p - s->b;
string_need (p, n);
memcpy (p->p, s->b, n);
p->p += n;
}
}
static void
string_appendn (p, s, n)
string *p;
const char *s;
int n;
{
if (n != 0)
{
string_need (p, n);
memcpy (p->p, s, n);
p->p += n;
}
}
static void
string_prepend (p, s)
string *p;
const char *s;
{
if (s != NULL && *s != '\0')
{
string_prependn (p, s, strlen (s));
}
}
static void
string_prepends (p, s)
string *p, *s;
{
if (s->b != s->p)
{
string_prependn (p, s->b, s->p - s->b);
}
}
static void
string_prependn (p, s, n)
string *p;
const char *s;
int n;
{
char *q;
if (n != 0)
{
string_need (p, n);
for (q = p->p - 1; q >= p->b; q--)
{
q[n] = q[0];
}
memcpy (p->b, s, n);
p->p += n;
}
}
/* To generate a standalone demangler program for testing purposes,
just compile and link this file with -DMAIN and libiberty.a. When
run, it demangles each command line arg, or each stdin string, and
prints the result on stdout. */
#ifdef MAIN
#include "getopt.h"
static char *program_name;
static char *program_version = VERSION;
static int flags = DMGL_PARAMS | DMGL_ANSI;
static void demangle_it PARAMS ((char *));
static void usage PARAMS ((FILE *, int));
static void fatal PARAMS ((char *));
static void
demangle_it (mangled_name)
char *mangled_name;
{
char *result;
result = cplus_demangle (mangled_name, flags);
if (result == NULL)
{
printf ("%s\n", mangled_name);
}
else
{
printf ("%s\n", result);
free (result);
}
}
static void
usage (stream, status)
FILE *stream;
int status;
{
1997-08-22 00:57:35 +02:00
fprintf (stream, "\
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
Usage: %s [-_] [-n] [-s {gnu,lucid,arm,hp,edg}] [--strip-underscores]\n\
[--no-strip-underscores] [--format={gnu,lucid,arm,hp,edg}]\n\
1997-08-22 00:57:35 +02:00
[--help] [--version] [arg...]\n",
program_name);
exit (status);
}
#define MBUF_SIZE 32767
1997-08-22 00:57:35 +02:00
char mbuffer[MBUF_SIZE];
/* Defined in the automatically-generated underscore.c. */
extern int prepends_underscore;
int strip_underscore = 0;
static struct option long_options[] = {
{"strip-underscores", no_argument, 0, '_'},
{"format", required_argument, 0, 's'},
{"help", no_argument, 0, 'h'},
{"java", no_argument, 0, 'j'},
1997-08-22 00:57:35 +02:00
{"no-strip-underscores", no_argument, 0, 'n'},
{"version", no_argument, 0, 'v'},
{0, no_argument, 0, 0}
};
/* More 'friendly' abort that prints the line and file.
config.h can #define abort fancy_abort if you like that sort of thing. */
void
fancy_abort ()
{
fatal ("Internal gcc abort.");
}
/* Return the string of non-alnum characters that may occur
as a valid symbol component, in the standard assembler symbol
syntax. */
static const char *
standard_symbol_characters ()
{
return "_$.";
}
/* Return the string of non-alnum characters that may occur
as a valid symbol name component in an HP object file.
Note that, since HP's compiler generates object code straight from
C++ source, without going through an assembler, its mangled
identifiers can use all sorts of characters that no assembler would
tolerate, so the alphabet this function creates is a little odd.
Here are some sample mangled identifiers offered by HP:
typeid*__XT24AddressIndExpClassMember_
[Vftptr]key:__dt__32OrdinaryCompareIndExpClassMemberFv
__ct__Q2_9Elf64_Dyn18{unnamed.union.#1}Fv
This still seems really weird to me, since nowhere else in this
file is there anything to recognize curly brackets, parens, etc.
I've talked with Srikanth <srikanth@cup.hp.com>, and he assures me
this is right, but I still strongly suspect that there's a
misunderstanding here.
If we decide it's better for c++filt to use HP's assembler syntax
to scrape identifiers out of its input, here's the definition of
the symbol name syntax from the HP assembler manual:
Symbols are composed of uppercase and lowercase letters, decimal
digits, dollar symbol, period (.), ampersand (&), pound sign(#) and
underscore (_). A symbol can begin with a letter, digit underscore or
dollar sign. If a symbol begins with a digit, it must contain a
non-digit character.
So have fun. */
static const char *
hp_symbol_characters ()
{
return "_$.<>#,*&[]:(){}";
}
1997-08-22 00:57:35 +02:00
int
main (argc, argv)
int argc;
char **argv;
{
char *result;
int c;
char *valid_symbols;
1997-08-22 00:57:35 +02:00
program_name = argv[0];
strip_underscore = prepends_underscore;
while ((c = getopt_long (argc, argv, "_ns:j", long_options, (int *) 0)) != EOF)
{
switch (c)
{
case '?':
usage (stderr, 1);
break;
case 'h':
usage (stdout, 0);
case 'n':
strip_underscore = 0;
break;
case 'v':
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
printf ("GNU %s (C++ demangler), version %s\n", program_name, program_version);
1997-08-22 00:57:35 +02:00
exit (0);
case '_':
strip_underscore = 1;
break;
case 'j':
flags |= DMGL_JAVA;
break;
1997-08-22 00:57:35 +02:00
case 's':
if (strcmp (optarg, "gnu") == 0)
{
current_demangling_style = gnu_demangling;
}
else if (strcmp (optarg, "lucid") == 0)
{
current_demangling_style = lucid_demangling;
}
else if (strcmp (optarg, "arm") == 0)
{
current_demangling_style = arm_demangling;
}
* HP aCC demangling support. * cplus-dem.c (main): Remove default to HP style demangling, set to EDG demangling correctly when -edg specified; set the demangling style when user specifies 'edg'. Set strip_underscore to prepends_underscore, if not HPUXHPPA. Set current_demangling_style to hp_demangling if HPUXHPPA. Set current demangling style correctly if the switch is hp. Read label correctly also in the HP style case. (work_stuff): add temp_start field; add field for volatile member function. (arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP style for this case is the same as ARM. (demangle_args): handle EDG_DEMANGLING style; support HP style. (demangle_arm_hp_template): new function. (It was demangle_arm_pt.); check and set value of temp_start field in multiple places. Also, when ceching for end of template args, check to see if at end of static member of template class. (demangle_class): new local variable : save_class_name_end Don't include template args in string defining class. (demangle_class_name): use demangel_arm_hp_template. (demangle_function_name): handle case where demangling style is HP_DEMANGLING and currently point at an 'X' in the mangled name. Handle EDG_DEMANGLING style. Handle constructor and destructor ops for HP style. (demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING styles. global destructor and constructor for HP style are same as for ARM style. Same for local variables. (demangle_qualified): handle EDG_DEMANGLING style. (demangle_signature): add case for volatile member function. For cases '1' - '9' : initialize the temp_start field to -1 and handle the EDG_DEMANGLING style. for case 'F' : handle EDG_DEMANGLING and AUTO_DEMANGLING styles. If expecting a function and managed to demangle the funct args, then handle the LUCID_DEMANGLING, ARM_DEMANGLING, and EDG_DEMANGLING styles. Add case for local class name after "Lnnn_ in HP style case. HP style too needs to forget types. _nnn is OK for HP style, so don't report failure. (do_hpacc_template_const_value): new function. Handle template's value param for HP/aCC. (do_hpacc_template_literal): new function. Handle a template's literal parameter for HP aCC. (recursively_demangle): new function (snarf_numeric_literal): new function. (usage): add 'edg' to the list of demangling styles; add hp switch to message. Co-Authored-By: Andrew MacLeod <amacleod@cygnus.com> Co-Authored-By: Edith Epstein <eepstein@cygnus.com> Co-Authored-By: Elena Zannoni <ezannoni@cygnus.com> Co-Authored-By: Satish Pai <pai@apollo.hp.com> Co-Authored-By: Stan Shebs <shebs@cygnus.com> From-SVN: r24170
1998-12-07 23:21:45 +01:00
else if (strcmp (optarg, "hp") == 0)
{
current_demangling_style = hp_demangling;
}
else if (strcmp (optarg, "edg") == 0)
{
current_demangling_style = edg_demangling;
}
1997-08-22 00:57:35 +02:00
else
{
fprintf (stderr, "%s: unknown demangling style `%s'\n",
program_name, optarg);
exit (1);
}
break;
}
}
if (optind < argc)
{
for ( ; optind < argc; optind++)
{
demangle_it (argv[optind]);
}
}
else
{
switch (current_demangling_style)
{
case gnu_demangling:
case lucid_demangling:
case arm_demangling:
case edg_demangling:
valid_symbols = standard_symbol_characters ();
break;
case hp_demangling:
valid_symbols = hp_symbol_characters ();
break;
default:
/* Folks should explicitly indicate the appropriate alphabet for
each demangling. Providing a default would allow the
question to go unconsidered. */
abort ();
}
1997-08-22 00:57:35 +02:00
for (;;)
{
int i = 0;
c = getchar ();
/* Try to read a label. */
while (c != EOF && (isalnum (c) || strchr (valid_symbols, c)))
1997-08-22 00:57:35 +02:00
{
if (i >= MBUF_SIZE-1)
break;
mbuffer[i++] = c;
c = getchar ();
}
if (i > 0)
{
int skip_first = 0;
if (mbuffer[0] == '.')
++skip_first;
if (strip_underscore && mbuffer[skip_first] == '_')
++skip_first;
if (skip_first > i)
skip_first = i;
mbuffer[i] = 0;
1997-08-22 00:57:35 +02:00
result = cplus_demangle (mbuffer + skip_first, flags);
if (result)
{
if (mbuffer[0] == '.')
putc ('.', stdout);
fputs (result, stdout);
free (result);
}
else
fputs (mbuffer, stdout);
fflush (stdout);
}
if (c == EOF)
break;
putchar (c);
}
}
exit (0);
}
static void
fatal (str)
char *str;
{
fprintf (stderr, "%s: %s\n", program_name, str);
exit (1);
}
PTR
1997-08-22 00:57:35 +02:00
xmalloc (size)
size_t size;
1997-08-22 00:57:35 +02:00
{
register PTR value = (PTR) malloc (size);
1997-08-22 00:57:35 +02:00
if (value == 0)
fatal ("virtual memory exhausted");
return value;
}
PTR
1997-08-22 00:57:35 +02:00
xrealloc (ptr, size)
PTR ptr;
size_t size;
1997-08-22 00:57:35 +02:00
{
register PTR value = (PTR) realloc (ptr, size);
1997-08-22 00:57:35 +02:00
if (value == 0)
fatal ("virtual memory exhausted");
return value;
}
#endif /* main */