In include,
* dyn-string.h: Move here from gcc/dyn-string.h. Add new functions. * demangle.h (DMGL_GNU_NEW_ABI): New macro. (DMGL_STYLE_MASK): Or in DMGL_GNU_NEW_ABI. (current_demangling_style): Add gnu_new_abi_demangling. (GNU_NEW_ABI_DEMANGLING_STYLE_STRING): New macro. (GNU_NEW_ABI_DEMANGLING): Likewise. (cplus_demangle_new_abi): New declaration. In libiberty, * Makefile.in (CFILES): Add cp-demangle.c and dyn-string.c. (REQUIRED_OFILES): Add cp-demangle.o and dyn-string.o. (cp-demangle.o): New dependency. (dyn-string.o): Likewise. * dyn-string.c: Move here from gcc/dyn-string.c. Add new functions. * cplus-dem.c (libiberty_demanglers): Add initializer for new-ABI demangler. (cplus_demangle): Call cplus_demangle_new_abi if in new-ABI demangling mode. (gnu_new_abi_symbol_characters): New function. (main): Use gnu_new_abi_symbol_characters. * cp-demangle.c: New file. * cp-demangle.c: New file. From-SVN: r34397
This commit is contained in:
Alex Samuel
Alex Samuel
parent
0dc09a613b
commit
69afa80d10
|
|
@ -1,3 +1,14 @@
|
|||
2000-06-04 Alex Samuel <samuel@codesourcery.com>
|
||||
|
||||
* dyn-string.h: Move here from gcc/dyn-string.h. Add new functions.
|
||||
|
||||
* demangle.h (DMGL_GNU_NEW_ABI): New macro.
|
||||
(DMGL_STYLE_MASK): Or in DMGL_GNU_NEW_ABI.
|
||||
(current_demangling_style): Add gnu_new_abi_demangling.
|
||||
(GNU_NEW_ABI_DEMANGLING_STYLE_STRING): New macro.
|
||||
(GNU_NEW_ABI_DEMANGLING): Likewise.
|
||||
(cplus_demangle_new_abi): New declaration.
|
||||
|
||||
Tue May 30 16:53:34 2000 Andrew Cagney <cagney@b1.cygnus.com>
|
||||
|
||||
* floatformat.h (struct floatformat): Add field name.
|
||||
|
|
|
|||
|
|
@ -24,21 +24,23 @@
|
|||
|
||||
/* Options passed to cplus_demangle (in 2nd parameter). */
|
||||
|
||||
#define DMGL_NO_OPTS 0 /* For readability... */
|
||||
#define DMGL_PARAMS (1 << 0) /* Include function args */
|
||||
#define DMGL_ANSI (1 << 1) /* Include const, volatile, etc */
|
||||
#define DMGL_JAVA (1 << 2) /* Demangle as Java rather than C++. */
|
||||
#define DMGL_NO_OPTS 0 /* For readability... */
|
||||
#define DMGL_PARAMS (1 << 0) /* Include function args */
|
||||
#define DMGL_ANSI (1 << 1) /* Include const, volatile, etc */
|
||||
#define DMGL_JAVA (1 << 2) /* Demangle as Java rather than C++. */
|
||||
|
||||
#define DMGL_AUTO (1 << 8)
|
||||
#define DMGL_GNU (1 << 9)
|
||||
#define DMGL_LUCID (1 << 10)
|
||||
#define DMGL_ARM (1 << 11)
|
||||
#define DMGL_HP (1 << 12) /* For the HP aCC compiler; same as ARM
|
||||
except for template arguments, etc. */
|
||||
#define DMGL_EDG (1 << 13)
|
||||
#define DMGL_AUTO (1 << 8)
|
||||
#define DMGL_GNU (1 << 9)
|
||||
#define DMGL_LUCID (1 << 10)
|
||||
#define DMGL_ARM (1 << 11)
|
||||
#define DMGL_HP (1 << 12) /* For the HP aCC compiler;
|
||||
same as ARM except for
|
||||
template arguments, etc. */
|
||||
#define DMGL_EDG (1 << 13)
|
||||
#define DMGL_GNU_NEW_ABI (1 << 14)
|
||||
|
||||
/* If none of these are set, use 'current_demangling_style' as the default. */
|
||||
#define DMGL_STYLE_MASK (DMGL_AUTO|DMGL_GNU|DMGL_LUCID|DMGL_ARM|DMGL_HP|DMGL_EDG)
|
||||
#define DMGL_STYLE_MASK (DMGL_AUTO|DMGL_GNU|DMGL_LUCID|DMGL_ARM|DMGL_HP|DMGL_EDG|DMGL_GNU_NEW_ABI)
|
||||
|
||||
/* Enumeration of possible demangling styles.
|
||||
|
||||
|
|
@ -56,17 +58,19 @@ extern enum demangling_styles
|
|||
lucid_demangling = DMGL_LUCID,
|
||||
arm_demangling = DMGL_ARM,
|
||||
hp_demangling = DMGL_HP,
|
||||
edg_demangling = DMGL_EDG
|
||||
edg_demangling = DMGL_EDG,
|
||||
gnu_new_abi_demangling = DMGL_GNU_NEW_ABI,
|
||||
} current_demangling_style;
|
||||
|
||||
/* Define string names for the various demangling styles. */
|
||||
|
||||
#define AUTO_DEMANGLING_STYLE_STRING "auto"
|
||||
#define GNU_DEMANGLING_STYLE_STRING "gnu"
|
||||
#define LUCID_DEMANGLING_STYLE_STRING "lucid"
|
||||
#define ARM_DEMANGLING_STYLE_STRING "arm"
|
||||
#define HP_DEMANGLING_STYLE_STRING "hp"
|
||||
#define EDG_DEMANGLING_STYLE_STRING "edg"
|
||||
#define AUTO_DEMANGLING_STYLE_STRING "auto"
|
||||
#define GNU_DEMANGLING_STYLE_STRING "gnu"
|
||||
#define LUCID_DEMANGLING_STYLE_STRING "lucid"
|
||||
#define ARM_DEMANGLING_STYLE_STRING "arm"
|
||||
#define HP_DEMANGLING_STYLE_STRING "hp"
|
||||
#define EDG_DEMANGLING_STYLE_STRING "edg"
|
||||
#define GNU_NEW_ABI_DEMANGLING_STYLE_STRING "gnu-new-abi"
|
||||
|
||||
/* Some macros to test what demangling style is active. */
|
||||
|
||||
|
|
@ -77,6 +81,7 @@ extern enum demangling_styles
|
|||
#define ARM_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_ARM)
|
||||
#define HP_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_HP)
|
||||
#define EDG_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_EDG)
|
||||
#define GNU_NEW_ABI_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_GNU_NEW_ABI)
|
||||
|
||||
/* Provide information about the available demangle styles. This code is
|
||||
pulled from gdb into libiberty because it is useful to binutils also. */
|
||||
|
|
@ -107,4 +112,9 @@ cplus_demangle_set_style PARAMS ((enum demangling_styles style));
|
|||
|
||||
extern enum demangling_styles
|
||||
cplus_demangle_name_to_style PARAMS ((const char *name));
|
||||
|
||||
/* New-ABI demangling entry point, defined in cp-demangle.c. */
|
||||
extern char*
|
||||
cplus_demangle_new_abi PARAMS ((const char* mangled));
|
||||
|
||||
#endif /* DEMANGLE_H */
|
||||
|
|
|
|||
|
|
@ -0,0 +1,64 @@
|
|||
/* 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))
|
||||
|
||||
|
||||
extern void 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 void dyn_string_copy PARAMS ((dyn_string_t, dyn_string_t));
|
||||
extern void dyn_string_copy_cstr PARAMS ((dyn_string_t, const char *));
|
||||
extern void dyn_string_prepend PARAMS ((dyn_string_t, dyn_string_t));
|
||||
extern void dyn_string_prepend_cstr PARAMS ((dyn_string_t, const char *));
|
||||
extern void dyn_string_insert PARAMS ((dyn_string_t, int,
|
||||
dyn_string_t));
|
||||
extern void dyn_string_insert_cstr PARAMS ((dyn_string_t, int,
|
||||
const char *));
|
||||
extern dyn_string_t dyn_string_append PARAMS ((dyn_string_t, dyn_string_t));
|
||||
extern dyn_string_t dyn_string_append_cstr
|
||||
PARAMS ((dyn_string_t, const char *));
|
||||
extern dyn_string_t dyn_string_append_char
|
||||
PARAMS ((dyn_string_t, char));
|
||||
extern void dyn_string_substring PARAMS ((dyn_string_t,
|
||||
dyn_string_t, int, int));
|
||||
extern int dyn_string_eq PARAMS ((dyn_string_t, dyn_string_t));
|
||||
|
|
@ -1,3 +1,21 @@
|
|||
2000-06-04 Alex Samuel <samuel@codesourcery.com>
|
||||
|
||||
* Makefile.in (CFILES): Add cp-demangle.c and dyn-string.c.
|
||||
(REQUIRED_OFILES): Add cp-demangle.o and dyn-string.o.
|
||||
(cp-demangle.o): New dependency.
|
||||
(dyn-string.o): Likewise.
|
||||
|
||||
* dyn-string.c: Move here from gcc/dyn-string.c. Add new functions.
|
||||
|
||||
* cplus-dem.c (libiberty_demanglers): Add initializer for new-ABI
|
||||
demangler.
|
||||
(cplus_demangle): Call cplus_demangle_new_abi if in new-ABI
|
||||
demangling mode.
|
||||
(gnu_new_abi_symbol_characters): New function.
|
||||
(main): Use gnu_new_abi_symbol_characters. * cp-demangle.c: New
|
||||
file.
|
||||
* cp-demangle.c: New file.
|
||||
|
||||
Tue May 30 16:45:25 2000 Andrew Cagney <cagney@b1.cygnus.com>
|
||||
|
||||
* floatformat.c: Add name to each floatformat field.
|
||||
|
|
|
|||
|
|
@ -125,23 +125,25 @@ HFILES = alloca-conf.h
|
|||
# (alphabetical), and add them to REQUIRED_OFILES or funcs in
|
||||
# configure.in.
|
||||
CFILES = asprintf.c alloca.c argv.c atexit.c basename.c bcmp.c bcopy.c \
|
||||
bzero.c calloc.c choose-temp.c clock.c concat.c cplus-dem.c fdmatch.c \
|
||||
fnmatch.c getcwd.c getpwd.c getopt.c getopt1.c getpagesize.c \
|
||||
getruntime.c floatformat.c hashtab.c hex.c index.c insque.c memchr.c \
|
||||
memcmp.c memcpy.c memmove.c memset.c mkstemps.c objalloc.c obstack.c \
|
||||
partition.c pexecute.c putenv.c random.c rename.c rindex.c \
|
||||
setenv.c sigsetmask.c sort.c spaces.c splay-tree.c strcasecmp.c \
|
||||
strncasecmp.c strchr.c strdup.c strerror.c strncmp.c strrchr.c \
|
||||
strsignal.c strstr.c strtod.c strtol.c strtoul.c tmpnam.c \
|
||||
vasprintf.c vfork.c vfprintf.c vprintf.c vsprintf.c waitpid.c \
|
||||
xatexit.c xexit.c xmalloc.c xmemdup.c xstrdup.c xstrerror.c
|
||||
bzero.c calloc.c choose-temp.c clock.c concat.c cplus-dem.c \
|
||||
cp-demangle.c dyn-string.c fdmatch.c fnmatch.c getcwd.c \
|
||||
getpwd.c getopt.c getopt1.c getpagesize.c getruntime.c \
|
||||
floatformat.c hashtab.c hex.c index.c insque.c memchr.c memcmp.c \
|
||||
memcpy.c memmove.c memset.c mkstemps.c objalloc.c obstack.c \
|
||||
partition.c pexecute.c putenv.c random.c rename.c rindex.c setenv.c \
|
||||
sigsetmask.c sort.c spaces.c splay-tree.c strcasecmp.c strncasecmp.c \
|
||||
strchr.c strdup.c strerror.c strncmp.c strrchr.c strsignal.c strstr.c \
|
||||
strtod.c strtol.c strtoul.c tmpnam.c vasprintf.c vfork.c vfprintf.c \
|
||||
vprintf.c vsprintf.c waitpid.c xatexit.c xexit.c xmalloc.c \
|
||||
xmemdup.c xstrdup.c xstrerror.c
|
||||
|
||||
# These are always included in the library.
|
||||
REQUIRED_OFILES = argv.o choose-temp.o concat.o cplus-dem.o \
|
||||
fdmatch.o fnmatch.o getopt.o getopt1.o getpwd.o getruntime.o hashtab.o \
|
||||
hex.o floatformat.o objalloc.o obstack.o partition.o pexecute.o sort.o \
|
||||
spaces.o splay-tree.o strerror.o strsignal.o xatexit.o xexit.o xmalloc.o \
|
||||
xmemdup.o xstrdup.o xstrerror.o
|
||||
REQUIRED_OFILES = argv.o choose-temp.o concat.o cplus-dem.o cp-demangle.o \
|
||||
dyn-string.o fdmatch.o fnmatch.o getopt.o getopt1.o getpwd.o \
|
||||
getruntime.o hashtab.o hex.o floatformat.o objalloc.o obstack.o \
|
||||
partition.o pexecute.o sort.o spaces.o splay-tree.o strerror.o \
|
||||
strsignal.o xatexit.o xexit.o xmalloc.o xmemdup.o xstrdup.o \
|
||||
xstrerror.o
|
||||
|
||||
$(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) $(ALLOCA)
|
||||
rm -f $(TARGETLIB)
|
||||
|
|
@ -261,6 +263,8 @@ choose-temp.o: config.h
|
|||
clock.o: config.h
|
||||
concat.o: $(INCDIR)/libiberty.h
|
||||
cplus-dem.o: config.h $(INCDIR)/demangle.h
|
||||
cp-demangle.o: config.h $(INCDIR)/dyn-string.h
|
||||
dyn-string.o: config.h $(INCDIR)/dyn-string.h
|
||||
fdmatch.o: $(INCDIR)/libiberty.h
|
||||
fnmatch.o: config.h $(INCDIR)/fnmatch.h
|
||||
getcwd.o: config.h
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -290,6 +290,12 @@ struct demangler_engine libiberty_demanglers[] =
|
|||
"EDG style demangling"
|
||||
}
|
||||
,
|
||||
{
|
||||
GNU_NEW_ABI_DEMANGLING_STYLE_STRING,
|
||||
gnu_new_abi_demangling,
|
||||
"GNU (g++) new-ABI-style demangling"
|
||||
}
|
||||
,
|
||||
{
|
||||
NULL, unknown_demangling, NULL
|
||||
}
|
||||
|
|
@ -876,6 +882,10 @@ cplus_demangle (mangled, options)
|
|||
if ((work -> options & DMGL_STYLE_MASK) == 0)
|
||||
work -> options |= (int) current_demangling_style & DMGL_STYLE_MASK;
|
||||
|
||||
/* The new-ABI demangling is implemented elsewhere. */
|
||||
if (GNU_NEW_ABI_DEMANGLING)
|
||||
return cplus_demangle_new_abi (mangled);
|
||||
|
||||
ret = internal_cplus_demangle (work, mangled);
|
||||
squangle_mop_up (work);
|
||||
return (ret);
|
||||
|
|
@ -4574,6 +4584,9 @@ standard_symbol_characters PARAMS ((void));
|
|||
static const char *
|
||||
hp_symbol_characters PARAMS ((void));
|
||||
|
||||
static const char *
|
||||
gnu_new_abi_symbol_characters PARAMS ((void));
|
||||
|
||||
/* Return the string of non-alnum characters that may occur
|
||||
as a valid symbol component, in the standard assembler symbol
|
||||
syntax. */
|
||||
|
|
@ -4622,6 +4635,17 @@ hp_symbol_characters ()
|
|||
}
|
||||
|
||||
|
||||
/* Return the string of non-alnum characters that may occur
|
||||
as a valid symbol component in the GNU standard C++ ABI mangling
|
||||
scheme. */
|
||||
|
||||
static const char *
|
||||
gnu_new_abi_symbol_characters ()
|
||||
{
|
||||
return "_";
|
||||
}
|
||||
|
||||
|
||||
extern int main PARAMS ((int, char **));
|
||||
|
||||
int
|
||||
|
|
@ -4696,6 +4720,9 @@ main (argc, argv)
|
|||
case hp_demangling:
|
||||
valid_symbols = hp_symbol_characters ();
|
||||
break;
|
||||
case gnu_new_abi_demangling:
|
||||
valid_symbols = gnu_new_abi_symbol_characters ();
|
||||
break;
|
||||
default:
|
||||
/* Folks should explicitly indicate the appropriate alphabet for
|
||||
each demangling. Providing a default would allow the
|
||||
|
|
|
|||
|
|
@ -0,0 +1,331 @@
|
|||
/* 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. */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_STRING_H
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_STDLIB_H
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
|
||||
#include "libiberty.h"
|
||||
#include "dyn-string.h"
|
||||
|
||||
/* Performs in-place initialization of a dyn_string struct. This
|
||||
function can be used with a dyn_string struct on the stack or
|
||||
embedded in another object. The contents of of the string itself
|
||||
are still dynamically allocated. The string initially is capable
|
||||
of holding at least SPACE characeters, including the terminating
|
||||
NUL. If SPACE is 0, it will silently be increated to 1. */
|
||||
|
||||
void
|
||||
dyn_string_init (ds_struct_ptr, space)
|
||||
struct dyn_string *ds_struct_ptr;
|
||||
int space;
|
||||
{
|
||||
/* We need at least one byte in which to store the terminating NUL. */
|
||||
if (space == 0)
|
||||
space = 1;
|
||||
|
||||
ds_struct_ptr->allocated = space;
|
||||
ds_struct_ptr->s = (char *) xmalloc (space);
|
||||
ds_struct_ptr->length = 0;
|
||||
ds_struct_ptr->s[0] = '\0';
|
||||
}
|
||||
|
||||
/* Create a new dynamic string capable of holding at least SPACE characters,
|
||||
including the terminating NUL. If SPACE is 0, it will be silently
|
||||
increased to 1. */
|
||||
|
||||
dyn_string_t
|
||||
dyn_string_new (space)
|
||||
int space;
|
||||
{
|
||||
dyn_string_t result = (dyn_string_t) xmalloc (sizeof (struct dyn_string));
|
||||
dyn_string_init (result, space);
|
||||
return result;
|
||||
}
|
||||
|
||||
/* Free the memory used by DS. */
|
||||
|
||||
void
|
||||
dyn_string_delete (ds)
|
||||
dyn_string_t ds;
|
||||
{
|
||||
free (ds->s);
|
||||
free (ds);
|
||||
}
|
||||
|
||||
/* Returns the contents of DS in a buffer allocated with malloc. It
|
||||
is the caller's responsibility to deallocate the buffer using free.
|
||||
DS is then set to the empty string. */
|
||||
|
||||
char*
|
||||
dyn_string_release (ds)
|
||||
dyn_string_t ds;
|
||||
{
|
||||
/* Store the old buffer. */
|
||||
char* result = ds->s;
|
||||
/* The buffer is no longer owned by DS. */
|
||||
ds->s = NULL;
|
||||
/* Reinitialize DS to the empty string. */
|
||||
dyn_string_init (ds, 0);
|
||||
/* Return the old buffer. */
|
||||
return result;
|
||||
}
|
||||
|
||||
/* Increase the capacity of DS so it can hold at least SPACE
|
||||
characters, plus the terminating NUL. This function will not (at
|
||||
present) reduce the capacity of DS. */
|
||||
|
||||
dyn_string_t
|
||||
dyn_string_resize (ds, space)
|
||||
dyn_string_t ds;
|
||||
int space;
|
||||
{
|
||||
int new_allocated = ds->allocated;
|
||||
|
||||
/* Increase SPACE to hold the NUL termination. */
|
||||
++space;
|
||||
|
||||
while (space > new_allocated)
|
||||
new_allocated *= 2;
|
||||
|
||||
if (new_allocated != ds->allocated)
|
||||
{
|
||||
/* We actually need more space. */
|
||||
ds->allocated = new_allocated;
|
||||
ds->s = (char *) xrealloc (ds->s, ds->allocated);
|
||||
}
|
||||
|
||||
return ds;
|
||||
}
|
||||
|
||||
/* Sets the contents of DS to the empty string. */
|
||||
|
||||
void
|
||||
dyn_string_clear (ds)
|
||||
dyn_string_t ds;
|
||||
{
|
||||
/* A dyn_string always has room for at least the NUL terminator. */
|
||||
ds->s[0] = '\0';
|
||||
ds->length = 0;
|
||||
}
|
||||
|
||||
/* Makes the contents of DEST the same as the contents of SRC. DEST
|
||||
and SRC must be distinct. */
|
||||
|
||||
void
|
||||
dyn_string_copy (dest, src)
|
||||
dyn_string_t dest;
|
||||
dyn_string_t src;
|
||||
{
|
||||
if (dest == src)
|
||||
abort ();
|
||||
|
||||
/* Make room in DEST. */
|
||||
dyn_string_resize (dest, src->length);
|
||||
/* Copy DEST into SRC. */
|
||||
strcpy (dest->s, src->s);
|
||||
/* Update the size of DEST. */
|
||||
dest->length = src->length;
|
||||
}
|
||||
|
||||
/* Copies SRC, a NUL-terminated string, into DEST. */
|
||||
|
||||
void
|
||||
dyn_string_copy_cstr (dest, src)
|
||||
dyn_string_t dest;
|
||||
const char *src;
|
||||
{
|
||||
int length = strlen (src);
|
||||
/* Make room in DEST. */
|
||||
dyn_string_resize (dest, length);
|
||||
/* Copy DEST into SRC. */
|
||||
strcpy (dest->s, src);
|
||||
/* Update the size of DEST. */
|
||||
dest->length = length;
|
||||
}
|
||||
|
||||
/* Inserts SRC at the beginning of DEST. DEST is expanded as
|
||||
necessary. SRC and DEST must be distinct. */
|
||||
|
||||
void
|
||||
dyn_string_prepend (dest, src)
|
||||
dyn_string_t dest;
|
||||
dyn_string_t src;
|
||||
{
|
||||
dyn_string_insert (dest, 0, src);
|
||||
}
|
||||
|
||||
/* Inserts SRC, a NUL-terminated string, at the beginning of DEST.
|
||||
DEST is expanded as necessary. */
|
||||
|
||||
void
|
||||
dyn_string_prepend_cstr (dest, src)
|
||||
dyn_string_t dest;
|
||||
const char *src;
|
||||
{
|
||||
dyn_string_insert_cstr (dest, 0, src);
|
||||
}
|
||||
|
||||
/* Inserts SRC into DEST starting at position POS. DEST is expanded as
|
||||
necessary. SRC and DEST must be distinct. */
|
||||
|
||||
void
|
||||
dyn_string_insert (dest, pos, src)
|
||||
dyn_string_t dest;
|
||||
int pos;
|
||||
dyn_string_t src;
|
||||
{
|
||||
int i;
|
||||
|
||||
if (src == dest)
|
||||
abort ();
|
||||
|
||||
dyn_string_resize (dest, dest->length + src->length);
|
||||
/* Make room for the insertion. Be sure to copy the NUL. */
|
||||
for (i = dest->length; i >= pos; --i)
|
||||
dest->s[i + src->length] = dest->s[i];
|
||||
/* Splice in the new stuff. */
|
||||
strncpy (dest->s + pos, src->s, src->length);
|
||||
/* Compute the new length. */
|
||||
dest->length += src->length;
|
||||
}
|
||||
|
||||
/* Inserts SRC, a NUL-terminated string, into DEST starting at
|
||||
position POS. DEST is expanded as necessary. */
|
||||
|
||||
void
|
||||
dyn_string_insert_cstr (dest, pos, src)
|
||||
dyn_string_t dest;
|
||||
int pos;
|
||||
const char *src;
|
||||
{
|
||||
int i;
|
||||
int length = strlen (src);
|
||||
|
||||
dyn_string_resize (dest, dest->length + length);
|
||||
/* Make room for the insertion. Be sure to copy the NUL. */
|
||||
for (i = dest->length; i >= pos; --i)
|
||||
dest->s[i + length] = dest->s[i];
|
||||
/* Splice in the new stuff. */
|
||||
strncpy (dest->s + pos, src, length);
|
||||
/* Compute the new length. */
|
||||
dest->length += length;
|
||||
}
|
||||
|
||||
/* Append S to DS, resizing DS if necessary. Returns DS. */
|
||||
|
||||
dyn_string_t
|
||||
dyn_string_append (ds, s)
|
||||
dyn_string_t ds;
|
||||
dyn_string_t s;
|
||||
{
|
||||
dyn_string_resize (ds, ds->length + s->length);
|
||||
strcpy (ds->s + ds->length, s->s);
|
||||
ds->length += s->length;
|
||||
return ds;
|
||||
}
|
||||
|
||||
/* Append the NUL-terminated string S to DS, resizing DS if necessary.
|
||||
Returns DS. */
|
||||
|
||||
dyn_string_t
|
||||
dyn_string_append_cstr (ds, s)
|
||||
dyn_string_t ds;
|
||||
const char *s;
|
||||
{
|
||||
int len = strlen (s);
|
||||
|
||||
/* The new length is the old length plus the size of our string, plus
|
||||
one for the null at the end. */
|
||||
dyn_string_resize (ds, ds->length + len);
|
||||
strcpy (ds->s + ds->length, s);
|
||||
ds->length += len;
|
||||
|
||||
return ds;
|
||||
}
|
||||
|
||||
/* Appends C to the end of DS. */
|
||||
|
||||
dyn_string_t
|
||||
dyn_string_append_char (ds, c)
|
||||
dyn_string_t ds;
|
||||
char c;
|
||||
{
|
||||
/* Make room for the extra character. */
|
||||
dyn_string_resize (ds, ds->length + 1);
|
||||
/* Append the character; it will overwrite the old NUL. */
|
||||
ds->s[ds->length] = c;
|
||||
/* Add a new NUL at the end. */
|
||||
ds->s[ds->length + 1] = '\0';
|
||||
/* Update the length. */
|
||||
++(ds->length);
|
||||
return ds;
|
||||
}
|
||||
|
||||
/* Sets the contents of DEST to the substring of SRC starting at START
|
||||
and ending before END. START must be less than or equal to END,
|
||||
and both must be between zero and the length of SRC, inclusive. */
|
||||
|
||||
void
|
||||
dyn_string_substring (dest, src, start, end)
|
||||
dyn_string_t dest;
|
||||
dyn_string_t src;
|
||||
int start;
|
||||
int end;
|
||||
{
|
||||
int i;
|
||||
int length = end - start;
|
||||
|
||||
if (start > end || start > src->length || end > src->length)
|
||||
abort ();
|
||||
|
||||
/* Make room for the substring. */
|
||||
dyn_string_resize (dest, length);
|
||||
/* Copy the characters in the substring, */
|
||||
for (i = length; --i >= 0; )
|
||||
dest->s[i] = src->s[start + i];
|
||||
/* NUL-terimate the result. */
|
||||
dest->s[length] = '\0';
|
||||
/* Record the length of the substring. */
|
||||
dest->length = length;
|
||||
}
|
||||
|
||||
/* Returns non-zero if DS1 and DS2 have the same contents. */
|
||||
|
||||
int
|
||||
dyn_string_eq (ds1, ds2)
|
||||
dyn_string_t ds1;
|
||||
dyn_string_t ds2;
|
||||
{
|
||||
/* If DS1 and DS2 have different lengths, they must not be the same. */
|
||||
if (ds1->length != ds2->length)
|
||||
return 0;
|
||||
else
|
||||
return !strcmp (ds1->s, ds2->s);
|
||||
}
|
||||
Loading…
Reference in New Issue