mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-23 05:39:02 +08:00
051664b069
* dyn-string.h (dyn_string_init, dyn_string_new, dyn_string_delete, dyn_string_release, dyn_string_resize, dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr, dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert, dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr, dyn_string_append_char, dyn_string_substring_dyn_string_eq): Define as same name with __cxa_ prepended, if IN_LIBGCC2. (dyn_string_init, dyn_string_copy, dyn_string_copy_cstr, dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert, dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr, dyn_string_append_char, dyn_string_substring): Change return type to int. in libiberty/ChangeLog: * cp-demangle.c: Don't include ctype.h. (IS_DIGIT): New macro. (IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout instead of isdigit and isalpanum. (demangling_def): Make name and next const pointers. (STATUS_ALLOCATION_FAILED): New status code. (dyn_string_append_space): Handle failure in dyn_string_append_char. (int_to_dyn_string): Likewise. Change return value to status_t. (string_list_new): Handle failure of dyn_string_init. (result_close_template_list): Change return type to status_t. Handle failure in dyn_string_append. (result_push): Change return value to status_t. Handle failure in string_list_new. Handle failure of result_push throughout. (substitution_add): Change return value to status_t. Handle dyn_string failures. Handle failure of substitution_add throughout. (template_arg_list_new): Return NULL on allocation failure. (result_append_string): Return STATUS_ALLOCATION_FAILED on error. Handle error result throughout. (result_append): Likewise. (result_append_char): Likewise. (result_append_space): Likewise. (demangling_new): Make argument a const pointer. Handle allocation failures. (demangle_template_args): Handle failure in template_arg_list_new and result_close_template_list. (demangle_discriminator): Return if int_to_dyn_string fails. (cp_demangle): Likewise. (cp_demangle_type): New function. (cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on memory allocation failure. (main): Likewise. * dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if IN_LIBGCC2. (dyn_string_init): Change return value to int. Handle RETURN_ON_ALLOCATION_FAILURE case. (dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case. (dyn_string_release): Delete the dyn_string. (dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case. (dyn_string_copy): Change return type to int. (dyn_string_copy_cstr): Likewise. (dyn_string_prepend): Likewise. (dyn_string_prepend_cstr): Likewise. (dyn_string_insert): Likewise. (dyn_string_insert_cstr): Likewise. (dyn_string_append): Likewise. (dyn_string_append_cstr): Likewise. (dyn_string_append_char): Likewise. (dyn_string_substring): Likewise. in gcc/cp/ChangeLog: * Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o. (CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c. (cp-demangle.o): New rule. (dyn-string.o): Likewise. * inc/cxxabi.h (__cxa_demangle): New declaration. From-SVN: r34657
93 lines
4.2 KiB
C
93 lines
4.2 KiB
C
/* An abstract string datatype.
|
|
Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
|
|
Contributed by Mark Mitchell (mark@markmitchell.com).
|
|
|
|
This file is part of GNU CC.
|
|
|
|
GNU CC is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU CC 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU CC; see the file COPYING. If not, write to
|
|
the Free Software Foundation, 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
typedef struct dyn_string
|
|
{
|
|
int allocated; /* The amount of space allocated for the string. */
|
|
int length; /* The actual length of the string. */
|
|
char *s; /* The string itself, NUL-terminated. */
|
|
}* dyn_string_t;
|
|
|
|
/* The length STR, in bytes, not including the terminating NUL. */
|
|
#define dyn_string_length(STR) \
|
|
((STR)->length)
|
|
|
|
/* The NTBS in which the contents of STR are stored. */
|
|
#define dyn_string_buf(STR) \
|
|
((STR)->s)
|
|
|
|
/* Compare DS1 to DS2 with strcmp. */
|
|
#define dyn_string_compare(DS1, DS2) \
|
|
(strcmp ((DS1)->s, (DS2)->s))
|
|
|
|
|
|
/* dyn_string functions are used in the demangling implementation
|
|
included in the G++ runtime library. To prevent collisions with
|
|
names in user programs, the functions that are used in the
|
|
demangler are given implementation-reserved names. */
|
|
|
|
#ifdef IN_LIBGCC2
|
|
|
|
#define dyn_string_init __cxa_dyn_string_init
|
|
#define dyn_string_new __cxa_dyn_string_new
|
|
#define dyn_string_delete __cxa_dyn_string_delete
|
|
#define dyn_string_release __cxa_dyn_string_release
|
|
#define dyn_string_resize __cxa_dyn_string_resize
|
|
#define dyn_string_clear __cxa_dyn_string_clear
|
|
#define dyn_string_copy __cxa_dyn_string_copy
|
|
#define dyn_string_copy_cstr __cxa_dyn_string_copy_cstr
|
|
#define dyn_string_prepend __cxa_dyn_string_prepend
|
|
#define dyn_string_prepend_cstr __cxa_dyn_string_prepend_cstr
|
|
#define dyn_string_insert __cxa_dyn_string_insert
|
|
#define dyn_string_insert_cstr __cxa_dyn_string_insert_cstr
|
|
#define dyn_string_append __cxa_dyn_string_append
|
|
#define dyn_string_append_cstr __cxa_dyn_string_append_cstr
|
|
#define dyn_string_append_char __cxa_dyn_string_append_char
|
|
#define dyn_string_substring __cxa_dyn_string_substring
|
|
#define dyn_string_eq __cxa_dyn_string_eq
|
|
|
|
#endif /* IN_LIBGCC2 */
|
|
|
|
|
|
extern int dyn_string_init PARAMS ((struct dyn_string *, int));
|
|
extern dyn_string_t dyn_string_new PARAMS ((int));
|
|
extern void dyn_string_delete PARAMS ((dyn_string_t));
|
|
extern char *dyn_string_release PARAMS ((dyn_string_t));
|
|
extern dyn_string_t dyn_string_resize PARAMS ((dyn_string_t, int));
|
|
extern void dyn_string_clear PARAMS ((dyn_string_t));
|
|
extern int dyn_string_copy PARAMS ((dyn_string_t, dyn_string_t));
|
|
extern int dyn_string_copy_cstr PARAMS ((dyn_string_t, const char *));
|
|
extern int dyn_string_prepend PARAMS ((dyn_string_t, dyn_string_t));
|
|
extern int dyn_string_prepend_cstr PARAMS ((dyn_string_t, const char *));
|
|
extern int dyn_string_insert PARAMS ((dyn_string_t, int,
|
|
dyn_string_t));
|
|
extern int dyn_string_insert_cstr PARAMS ((dyn_string_t, int,
|
|
const char *));
|
|
extern int dyn_string_append PARAMS ((dyn_string_t, dyn_string_t));
|
|
extern int dyn_string_append_cstr
|
|
PARAMS ((dyn_string_t, const char *));
|
|
extern int dyn_string_append_char
|
|
PARAMS ((dyn_string_t, int));
|
|
extern int dyn_string_substring PARAMS ((dyn_string_t,
|
|
dyn_string_t, int, int));
|
|
extern int dyn_string_eq PARAMS ((dyn_string_t, dyn_string_t));
|