mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-17 17:20:29 +02:00
Update Gnulib to v0.1-4379-g2ef5a9b4b
Also bump required autoconf version to 2.64, as required by Gnulib.
This commit is contained in:
Andy Wingo
parent
758b31994c
commit
a91b95cca2
483 changed files with 26665 additions and 10031 deletions
|
|
@ -1,5 +1,5 @@
|
|||
/* Extended regular expression matching and search library.
|
||||
Copyright (C) 2002-2017 Free Software Foundation, Inc.
|
||||
Copyright (C) 2002-2021 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
|
||||
|
||||
|
|
@ -15,12 +15,11 @@
|
|||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library; if not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
#ifndef _REGEX_INTERNAL_H
|
||||
#define _REGEX_INTERNAL_H 1
|
||||
|
||||
#include <assert.h>
|
||||
#include <ctype.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
|
@ -33,33 +32,27 @@
|
|||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "intprops.h"
|
||||
#include <dynarray.h>
|
||||
#include <intprops.h>
|
||||
#include <verify.h>
|
||||
|
||||
#if defined DEBUG && DEBUG != 0
|
||||
# include <assert.h>
|
||||
# define DEBUG_ASSERT(x) assert (x)
|
||||
#else
|
||||
# define DEBUG_ASSERT(x) assume (x)
|
||||
#endif
|
||||
|
||||
#ifdef _LIBC
|
||||
# include <libc-lock.h>
|
||||
# define lock_define(name) __libc_lock_define (, name)
|
||||
# define lock_init(lock) (__libc_lock_init (lock), 0)
|
||||
# define lock_fini(lock) 0
|
||||
# define lock_fini(lock) ((void) 0)
|
||||
# define lock_lock(lock) __libc_lock_lock (lock)
|
||||
# define lock_unlock(lock) __libc_lock_unlock (lock)
|
||||
#elif defined GNULIB_LOCK && !defined USE_UNLOCKED_IO
|
||||
# include "glthread/lock.h"
|
||||
/* Use gl_lock_define if empty macro arguments are known to work.
|
||||
Otherwise, fall back on less-portable substitutes. */
|
||||
# if ((defined __GNUC__ && !defined __STRICT_ANSI__) \
|
||||
|| (defined __STDC_VERSION__ && 199901L <= __STDC_VERSION__))
|
||||
# define lock_define(name) gl_lock_define (, name)
|
||||
# elif USE_POSIX_THREADS
|
||||
# define lock_define(name) pthread_mutex_t name;
|
||||
# elif USE_PTH_THREADS
|
||||
# define lock_define(name) pth_mutex_t name;
|
||||
# elif USE_SOLARIS_THREADS
|
||||
# define lock_define(name) mutex_t name;
|
||||
# elif USE_WINDOWS_THREADS
|
||||
# define lock_define(name) gl_lock_t name;
|
||||
# else
|
||||
# define lock_define(name)
|
||||
# endif
|
||||
# define lock_define(name) gl_lock_define (, name)
|
||||
# define lock_init(lock) glthread_lock_init (&(lock))
|
||||
# define lock_fini(lock) glthread_lock_destroy (&(lock))
|
||||
# define lock_lock(lock) glthread_lock_lock (&(lock))
|
||||
|
|
@ -85,6 +78,14 @@
|
|||
# define isblank(ch) ((ch) == ' ' || (ch) == '\t')
|
||||
#endif
|
||||
|
||||
/* regex code assumes isascii has its usual numeric meaning,
|
||||
even if the portable character set uses EBCDIC encoding,
|
||||
and even if wint_t is wider than int. */
|
||||
#ifndef _LIBC
|
||||
# undef isascii
|
||||
# define isascii(c) (((c) & ~0x7f) == 0)
|
||||
#endif
|
||||
|
||||
#ifdef _LIBC
|
||||
# ifndef _RE_DEFINE_LOCALE_FUNCTIONS
|
||||
# define _RE_DEFINE_LOCALE_FUNCTIONS 1
|
||||
|
|
@ -102,6 +103,7 @@
|
|||
__dcgettext (_libc_intl_domainname, msgid, LC_MESSAGES)
|
||||
# endif
|
||||
#else
|
||||
# undef gettext
|
||||
# define gettext(msgid) (msgid)
|
||||
#endif
|
||||
|
||||
|
|
@ -115,8 +117,6 @@
|
|||
# define RE_ENABLE_I18N
|
||||
#endif
|
||||
|
||||
#define BE(expr, val) __builtin_expect (expr, val)
|
||||
|
||||
/* Number of ASCII characters. */
|
||||
#define ASCII_CHARS 0x80
|
||||
|
||||
|
|
@ -132,7 +132,10 @@
|
|||
/* Rename to standard API for using out of glibc. */
|
||||
#ifndef _LIBC
|
||||
# undef __wctype
|
||||
# undef __iswalnum
|
||||
# undef __iswctype
|
||||
# undef __towlower
|
||||
# undef __towupper
|
||||
# define __wctype wctype
|
||||
# define __iswalnum iswalnum
|
||||
# define __iswctype iswctype
|
||||
|
|
@ -142,16 +145,29 @@
|
|||
# define __mbrtowc mbrtowc
|
||||
# define __wcrtomb wcrtomb
|
||||
# define __regfree regfree
|
||||
# define attribute_hidden
|
||||
#endif /* not _LIBC */
|
||||
|
||||
#if __GNUC__ < 3 + (__GNUC_MINOR__ < 1)
|
||||
# define __attribute__(arg)
|
||||
#endif
|
||||
|
||||
#ifndef SSIZE_MAX
|
||||
# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
|
||||
#endif
|
||||
#ifndef ULONG_WIDTH
|
||||
# define ULONG_WIDTH REGEX_UINTEGER_WIDTH (ULONG_MAX)
|
||||
/* The number of usable bits in an unsigned integer type with maximum
|
||||
value MAX, as an int expression suitable in #if. Cover all known
|
||||
practical hosts. This implementation exploits the fact that MAX is
|
||||
1 less than a power of 2, and merely counts the number of 1 bits in
|
||||
MAX; "COBn" means "count the number of 1 bits in the low-order n bits". */
|
||||
# define REGEX_UINTEGER_WIDTH(max) REGEX_COB128 (max)
|
||||
# define REGEX_COB128(n) (REGEX_COB64 ((n) >> 31 >> 31 >> 2) + REGEX_COB64 (n))
|
||||
# define REGEX_COB64(n) (REGEX_COB32 ((n) >> 31 >> 1) + REGEX_COB32 (n))
|
||||
# define REGEX_COB32(n) (REGEX_COB16 ((n) >> 16) + REGEX_COB16 (n))
|
||||
# define REGEX_COB16(n) (REGEX_COB8 ((n) >> 8) + REGEX_COB8 (n))
|
||||
# define REGEX_COB8(n) (REGEX_COB4 ((n) >> 4) + REGEX_COB4 (n))
|
||||
# define REGEX_COB4(n) (!!((n) & 8) + !!((n) & 4) + !!((n) & 2) + ((n) & 1))
|
||||
# if ULONG_MAX / 2 + 1 != 1ul << (ULONG_WIDTH - 1)
|
||||
# error "ULONG_MAX out of range"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* The type of indexes into strings. This is signed, not size_t,
|
||||
since the API requires indexes to fit in regoff_t anyway, and using
|
||||
|
|
@ -175,36 +191,8 @@ typedef __re_size_t re_hashval_t;
|
|||
typedef unsigned long int bitset_word_t;
|
||||
/* All bits set in a bitset_word_t. */
|
||||
#define BITSET_WORD_MAX ULONG_MAX
|
||||
|
||||
/* Number of bits in a bitset_word_t. For portability to hosts with
|
||||
padding bits, do not use '(sizeof (bitset_word_t) * CHAR_BIT)';
|
||||
instead, deduce it directly from BITSET_WORD_MAX. Avoid
|
||||
greater-than-32-bit integers and unconditional shifts by more than
|
||||
31 bits, as they're not portable. */
|
||||
#if BITSET_WORD_MAX == 0xffffffffUL
|
||||
# define BITSET_WORD_BITS 32
|
||||
#elif BITSET_WORD_MAX >> 31 >> 4 == 1
|
||||
# define BITSET_WORD_BITS 36
|
||||
#elif BITSET_WORD_MAX >> 31 >> 16 == 1
|
||||
# define BITSET_WORD_BITS 48
|
||||
#elif BITSET_WORD_MAX >> 31 >> 28 == 1
|
||||
# define BITSET_WORD_BITS 60
|
||||
#elif BITSET_WORD_MAX >> 31 >> 31 >> 1 == 1
|
||||
# define BITSET_WORD_BITS 64
|
||||
#elif BITSET_WORD_MAX >> 31 >> 31 >> 9 == 1
|
||||
# define BITSET_WORD_BITS 72
|
||||
#elif BITSET_WORD_MAX >> 31 >> 31 >> 31 >> 31 >> 3 == 1
|
||||
# define BITSET_WORD_BITS 128
|
||||
#elif BITSET_WORD_MAX >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 7 == 1
|
||||
# define BITSET_WORD_BITS 256
|
||||
#elif BITSET_WORD_MAX >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 7 > 1
|
||||
# define BITSET_WORD_BITS 257 /* any value > SBC_MAX will do here */
|
||||
# if BITSET_WORD_BITS <= SBC_MAX
|
||||
# error "Invalid SBC_MAX"
|
||||
# endif
|
||||
#else
|
||||
# error "Add case for new bitset_word_t size"
|
||||
#endif
|
||||
/* Number of bits in a bitset_word_t. */
|
||||
#define BITSET_WORD_BITS ULONG_WIDTH
|
||||
|
||||
/* Number of bitset_word_t values in a bitset_t. */
|
||||
#define BITSET_WORDS ((SBC_MAX + BITSET_WORD_BITS - 1) / BITSET_WORD_BITS)
|
||||
|
|
@ -356,7 +344,7 @@ typedef struct
|
|||
Idx idx; /* for BACK_REF */
|
||||
re_context_type ctx_type; /* for ANCHOR */
|
||||
} opr;
|
||||
#if __GNUC__ >= 2 && !defined __STRICT_ANSI__
|
||||
#if (__GNUC__ >= 2 || defined __clang__) && !defined __STRICT_ANSI__
|
||||
re_token_type_t type : 8;
|
||||
#else
|
||||
re_token_type_t type;
|
||||
|
|
@ -437,24 +425,9 @@ struct re_dfa_t;
|
|||
typedef struct re_dfa_t re_dfa_t;
|
||||
|
||||
#ifndef _LIBC
|
||||
# define internal_function
|
||||
# define IS_IN(libc) false
|
||||
#endif
|
||||
|
||||
static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr,
|
||||
Idx new_buf_len)
|
||||
internal_function;
|
||||
#ifdef RE_ENABLE_I18N
|
||||
static void build_wcs_buffer (re_string_t *pstr) internal_function;
|
||||
static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr)
|
||||
internal_function;
|
||||
#endif /* RE_ENABLE_I18N */
|
||||
static void build_upper_buffer (re_string_t *pstr) internal_function;
|
||||
static void re_string_translate_buffer (re_string_t *pstr) internal_function;
|
||||
static unsigned int re_string_context_at (const re_string_t *input, Idx idx,
|
||||
int eflags)
|
||||
internal_function __attribute__ ((pure));
|
||||
|
||||
#define re_string_peek_byte(pstr, offset) \
|
||||
((pstr)->mbs[(pstr)->cur_idx + offset])
|
||||
#define re_string_fetch_byte(pstr) \
|
||||
|
|
@ -472,25 +445,6 @@ static unsigned int re_string_context_at (const re_string_t *input, Idx idx,
|
|||
#define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
|
||||
#define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
|
||||
|
||||
#if defined _LIBC || HAVE_ALLOCA
|
||||
# include <alloca.h>
|
||||
#endif
|
||||
|
||||
#ifndef _LIBC
|
||||
# if HAVE_ALLOCA
|
||||
/* The OS usually guarantees only one guard page at the bottom of the stack,
|
||||
and a page size can be as small as 4096 bytes. So we cannot safely
|
||||
allocate anything larger than 4096 bytes. Also care for the possibility
|
||||
of a few compiler-allocated temporary stack slots. */
|
||||
# define __libc_use_alloca(n) ((n) < 4032)
|
||||
# else
|
||||
/* alloca is implemented with malloc, so just use malloc. */
|
||||
# define __libc_use_alloca(n) 0
|
||||
# undef alloca
|
||||
# define alloca(n) malloc (n)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef _LIBC
|
||||
# define MALLOC_0_IS_NONNULL 1
|
||||
#elif !defined MALLOC_0_IS_NONNULL
|
||||
|
|
@ -627,20 +581,15 @@ struct re_backref_cache_entry
|
|||
Idx str_idx;
|
||||
Idx subexp_from;
|
||||
Idx subexp_to;
|
||||
bitset_word_t eps_reachable_subexps_map;
|
||||
char more;
|
||||
char unused;
|
||||
unsigned short int eps_reachable_subexps_map;
|
||||
};
|
||||
|
||||
typedef struct
|
||||
{
|
||||
/* The string object corresponding to the input string. */
|
||||
re_string_t input;
|
||||
#if defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
|
||||
const re_dfa_t *const dfa;
|
||||
#else
|
||||
const re_dfa_t *dfa;
|
||||
#endif
|
||||
/* EFLAGS of the argument of regexec. */
|
||||
int eflags;
|
||||
/* Where the matching ends. */
|
||||
|
|
@ -760,31 +709,31 @@ typedef struct
|
|||
|
||||
/* Functions for bitset_t operation. */
|
||||
|
||||
static void
|
||||
static inline void
|
||||
bitset_set (bitset_t set, Idx i)
|
||||
{
|
||||
set[i / BITSET_WORD_BITS] |= (bitset_word_t) 1 << i % BITSET_WORD_BITS;
|
||||
}
|
||||
|
||||
static void
|
||||
static inline void
|
||||
bitset_clear (bitset_t set, Idx i)
|
||||
{
|
||||
set[i / BITSET_WORD_BITS] &= ~ ((bitset_word_t) 1 << i % BITSET_WORD_BITS);
|
||||
}
|
||||
|
||||
static bool
|
||||
static inline bool
|
||||
bitset_contain (const bitset_t set, Idx i)
|
||||
{
|
||||
return (set[i / BITSET_WORD_BITS] >> i % BITSET_WORD_BITS) & 1;
|
||||
}
|
||||
|
||||
static void
|
||||
static inline void
|
||||
bitset_empty (bitset_t set)
|
||||
{
|
||||
memset (set, '\0', sizeof (bitset_t));
|
||||
}
|
||||
|
||||
static void
|
||||
static inline void
|
||||
bitset_set_all (bitset_t set)
|
||||
{
|
||||
memset (set, -1, sizeof (bitset_word_t) * (SBC_MAX / BITSET_WORD_BITS));
|
||||
|
|
@ -793,13 +742,13 @@ bitset_set_all (bitset_t set)
|
|||
((bitset_word_t) 1 << SBC_MAX % BITSET_WORD_BITS) - 1;
|
||||
}
|
||||
|
||||
static void
|
||||
static inline void
|
||||
bitset_copy (bitset_t dest, const bitset_t src)
|
||||
{
|
||||
memcpy (dest, src, sizeof (bitset_t));
|
||||
}
|
||||
|
||||
static void __attribute__ ((unused))
|
||||
static inline void
|
||||
bitset_not (bitset_t set)
|
||||
{
|
||||
int bitset_i;
|
||||
|
|
@ -811,7 +760,7 @@ bitset_not (bitset_t set)
|
|||
& ~set[BITSET_WORDS - 1]);
|
||||
}
|
||||
|
||||
static void __attribute__ ((unused))
|
||||
static inline void
|
||||
bitset_merge (bitset_t dest, const bitset_t src)
|
||||
{
|
||||
int bitset_i;
|
||||
|
|
@ -819,7 +768,7 @@ bitset_merge (bitset_t dest, const bitset_t src)
|
|||
dest[bitset_i] |= src[bitset_i];
|
||||
}
|
||||
|
||||
static void __attribute__ ((unused))
|
||||
static inline void
|
||||
bitset_mask (bitset_t dest, const bitset_t src)
|
||||
{
|
||||
int bitset_i;
|
||||
|
|
@ -830,7 +779,7 @@ bitset_mask (bitset_t dest, const bitset_t src)
|
|||
#ifdef RE_ENABLE_I18N
|
||||
/* Functions for re_string. */
|
||||
static int
|
||||
internal_function __attribute__ ((pure, unused))
|
||||
__attribute__ ((pure, unused))
|
||||
re_string_char_size_at (const re_string_t *pstr, Idx idx)
|
||||
{
|
||||
int byte_idx;
|
||||
|
|
@ -843,7 +792,7 @@ re_string_char_size_at (const re_string_t *pstr, Idx idx)
|
|||
}
|
||||
|
||||
static wint_t
|
||||
internal_function __attribute__ ((pure, unused))
|
||||
__attribute__ ((pure, unused))
|
||||
re_string_wchar_at (const re_string_t *pstr, Idx idx)
|
||||
{
|
||||
if (pstr->mb_cur_max == 1)
|
||||
|
|
@ -856,7 +805,7 @@ re_string_wchar_at (const re_string_t *pstr, Idx idx)
|
|||
# endif
|
||||
|
||||
static int
|
||||
internal_function __attribute__ ((pure, unused))
|
||||
__attribute__ ((pure, unused))
|
||||
re_string_elem_size_at (const re_string_t *pstr, Idx idx)
|
||||
{
|
||||
# ifdef _LIBC
|
||||
|
|
@ -881,21 +830,12 @@ re_string_elem_size_at (const re_string_t *pstr, Idx idx)
|
|||
}
|
||||
#endif /* RE_ENABLE_I18N */
|
||||
|
||||
#ifndef __GNUC_PREREQ
|
||||
# if defined __GNUC__ && defined __GNUC_MINOR__
|
||||
# define __GNUC_PREREQ(maj, min) \
|
||||
((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
|
||||
#ifndef FALLTHROUGH
|
||||
# if (__GNUC__ >= 7) || (__clang_major__ >= 10)
|
||||
# define FALLTHROUGH __attribute__ ((__fallthrough__))
|
||||
# else
|
||||
# define __GNUC_PREREQ(maj, min) 0
|
||||
# define FALLTHROUGH ((void) 0)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if __GNUC_PREREQ (3,4)
|
||||
# undef __attribute_warn_unused_result__
|
||||
# define __attribute_warn_unused_result__ \
|
||||
__attribute__ ((__warn_unused_result__))
|
||||
#else
|
||||
# define __attribute_warn_unused_result__ /* empty */
|
||||
#endif
|
||||
|
||||
#endif /* _REGEX_INTERNAL_H */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue