annotate regex.c @ 2921:15cff6b2cb7d

More `unsigned char' -> `re_char' changes. Also change several `int' into `re_wchar_t'. (PATTERN_STACK_EMPTY, PUSH_PATTERN_OP, POP_PATTERN_OP): Remove. (PUSH_FAILURE_POINTER): Don't cast any more. (POP_FAILURE_REG_OR_COUNT): Remove the cast that strips `const'. We want GCC to complain, since this piece of code makes re_match non-reentrant, which *should* be fixed. (GET_BUFFER_SPACE): Use size_t rather than unsigned long. (EXTEND_BUFFER): Use RETALLOC. (SET_LIST_BIT): Don't cast. (re_wchar_t): New type. (re_iswctype, re_wctype_to_bit): Make it crystal clear to GCC that those two functions will always properly return. (IMMEDIATE_QUIT_CHECK): Cast to void. (analyse_first): Use recursion rather than an explicit stack. (re_compile_fastmap): Can't fail anymore. (re_search_2): Don't check re_compile_fastmap for failure. (PUSH_NUMBER): Renamed from PUSH_FAILURE_COUNT. Now also sets the new value (passed in a new argument). (re_match_2_internal): Use it. Also, use a new var `reg' of type size_t when looping through regs rather than reuse the inappropriate `mcnt'.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 26 Oct 2000 00:45:01 +0000
parents 9e8ab826e86c
children 71f30fc93bf9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
679
b088267ea1c8 Clean up whitespace.
Richard Stallman <rms@gnu.org>
parents: 678
diff changeset
1 /* Extended regular expression matching and search library, version
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
2 0.12. (Implements POSIX draft P1003.2/D11.2, except for some of the
2
d7a0c431b2a0 Initial revision
Karl Berry <karl@freefriends.org>
parents:
diff changeset
3 internationalization features.)
d7a0c431b2a0 Initial revision
Karl Berry <karl@freefriends.org>
parents:
diff changeset
4
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
5 Copyright (C) 1993,94,95,96,97,98,99,2000 Free Software Foundation, Inc.
2
d7a0c431b2a0 Initial revision
Karl Berry <karl@freefriends.org>
parents:
diff changeset
6
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
7 This program is free software; you can redistribute it and/or modify
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
8 it under the terms of the GNU General Public License as published by
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
9 the Free Software Foundation; either version 2, or (at your option)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
10 any later version.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
11
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
12 This program is distributed in the hope that it will be useful,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
15 GNU General Public License for more details.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
16
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
17 You should have received a copy of the GNU General Public License
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
18 along with this program; if not, write to the Free Software
542
7b0868042f7a Update FSF address in comment.
Karl Heuer <kwzh@gnu.org>
parents: 521
diff changeset
19 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
20 USA. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
21
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
22 /* TODO:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
23 - structure the opcode space into opcode+flag.
2828
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
24 - merge with glibc's regex.[ch].
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
25 - replace (succeed_n + jump_n + set_number_at) with something that doesn't
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
26 need to modify the compiled regexp.
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
27 */
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
28
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
29 /* AIX requires this to be the first thing in the file. */
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
30 #if defined _AIX && !defined REGEX_MALLOC
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
31 #pragma alloca
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
32 #endif
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
33
511
799190471f84 (NUM_FAILURE_ITEMS, POP_FAILURE_POINT, PUSH_FAILURE_POINT):
Richard Stallman <rms@gnu.org>
parents: 506
diff changeset
34 #undef _GNU_SOURCE
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
35 #define _GNU_SOURCE
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
36
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
37 #ifdef HAVE_CONFIG_H
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
38 # include <config.h>
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
39 #endif
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
40
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
41 #if defined STDC_HEADERS && !defined emacs
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
42 # include <stddef.h>
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
43 #else
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
44 /* We need this for `regex.h', and perhaps for the Emacs include files. */
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
45 # include <sys/types.h>
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
46 #endif
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
47
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
48 /* Whether to use ISO C Amendment 1 wide char functions.
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
49 Those should not be used for Emacs since it uses its own. */
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
50 #define WIDE_CHAR_SUPPORT \
2881
d3634ee92a43 (WIDE_CHAR_SUPPORT): Define if _LIBC as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2872
diff changeset
51 (defined _LIBC || HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC && !emacs)
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
52
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
53 /* For platform which support the ISO C amendement 1 functionality we
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
54 support user defined character classes. */
2881
d3634ee92a43 (WIDE_CHAR_SUPPORT): Define if _LIBC as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2872
diff changeset
55 #if WIDE_CHAR_SUPPORT
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
56 /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
57 # include <wchar.h>
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
58 # include <wctype.h>
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
59 #endif
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
60
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
61 #ifdef _LIBC
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
62 /* We have to keep the namespace clean. */
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
63 # define regfree(preg) __regfree (preg)
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
64 # define regexec(pr, st, nm, pm, ef) __regexec (pr, st, nm, pm, ef)
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
65 # define regcomp(preg, pattern, cflags) __regcomp (preg, pattern, cflags)
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
66 # define regerror(errcode, preg, errbuf, errbuf_size) \
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
67 __regerror(errcode, preg, errbuf, errbuf_size)
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
68 # define re_set_registers(bu, re, nu, st, en) \
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
69 __re_set_registers (bu, re, nu, st, en)
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
70 # define re_match_2(bufp, string1, size1, string2, size2, pos, regs, stop) \
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
71 __re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop)
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
72 # define re_match(bufp, string, size, pos, regs) \
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
73 __re_match (bufp, string, size, pos, regs)
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
74 # define re_search(bufp, string, size, startpos, range, regs) \
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
75 __re_search (bufp, string, size, startpos, range, regs)
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
76 # define re_compile_pattern(pattern, length, bufp) \
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
77 __re_compile_pattern (pattern, length, bufp)
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
78 # define re_set_syntax(syntax) __re_set_syntax (syntax)
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
79 # define re_search_2(bufp, st1, s1, st2, s2, startpos, range, regs, stop) \
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
80 __re_search_2 (bufp, st1, s1, st2, s2, startpos, range, regs, stop)
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
81 # define re_compile_fastmap(bufp) __re_compile_fastmap (bufp)
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
82
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
83 /* Make sure we call libc's function even if the user overrides them. */
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
84 # define btowc __btowc
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
85 # define iswctype __iswctype
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
86 # define wctype __wctype
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
87
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
88 # define WEAK_ALIAS(a,b) weak_alias (a, b)
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
89
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
90 /* We are also using some library internals. */
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
91 # include <locale/localeinfo.h>
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
92 # include <locale/elem-hash.h>
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
93 # include <langinfo.h>
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
94 #else
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
95 # define WEAK_ALIAS(a,b)
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
96 #endif
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
97
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
98 /* This is for other GNU distributions with internationalized messages. */
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
99 #if HAVE_LIBINTL_H || defined _LIBC
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
100 # include <libintl.h>
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
101 #else
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
102 # define gettext(msgid) (msgid)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
103 #endif
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
104
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
105 #ifndef gettext_noop
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
106 /* This define is so xgettext can find the internationalizable
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
107 strings. */
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
108 # define gettext_noop(String) String
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
109 #endif
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
110
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
111 /* The `emacs' switch turns on certain matching commands
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
112 that make sense only in Emacs. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
113 #ifdef emacs
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
114
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
115 # include "lisp.h"
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
116 # include "buffer.h"
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
117
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
118 /* Make syntax table lookup grant data in gl_state. */
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
119 # define SYNTAX_ENTRY_VIA_PROPERTY
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
120
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
121 # include "syntax.h"
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
122 # include "charset.h"
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
123 # include "category.h"
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
124
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
125 # define malloc xmalloc
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
126 # define realloc xrealloc
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
127 # define free xfree
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
128
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
129 /* Converts the pointer to the char to BEG-based offset from the start. */
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
130 # define PTR_TO_OFFSET(d) POS_AS_IN_BUFFER (POINTER_TO_OFFSET (d))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
131 # define POS_AS_IN_BUFFER(p) ((p) + (NILP (re_match_object) || BUFFERP (re_match_object)))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
132
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
133 # define RE_MULTIBYTE_P(bufp) ((bufp)->multibyte)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
134 # define RE_STRING_CHAR(p, s) \
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
135 (multibyte ? (STRING_CHAR (p, s)) : (*(p)))
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
136 # define RE_STRING_CHAR_AND_LENGTH(p, s, len) \
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
137 (multibyte ? (STRING_CHAR_AND_LENGTH (p, s, len)) : ((len) = 1, *(p)))
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
138
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
139 /* Set C a (possibly multibyte) character before P. P points into a
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
140 string which is the virtual concatenation of STR1 (which ends at
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
141 END1) or STR2 (which ends at END2). */
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
142 # define GET_CHAR_BEFORE_2(c, p, str1, end1, str2, end2) \
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
143 do { \
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
144 if (multibyte) \
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
145 { \
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
146 re_char *dtemp = (p) == (str2) ? (end1) : (p); \
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
147 re_char *dlimit = ((p) > (str2) && (p) <= (end2)) ? (str2) : (str1); \
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
148 while (dtemp-- > dlimit && !CHAR_HEAD_P (*dtemp)); \
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
149 c = STRING_CHAR (dtemp, (p) - dtemp); \
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
150 } \
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
151 else \
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
152 (c = ((p) == (str2) ? (end1) : (p))[-1]); \
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
153 } while (0)
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
154
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
155
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
156 #else /* not emacs */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
157
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
158 /* If we are not linking with Emacs proper,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
159 we can't use the relocating allocator
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
160 even if config.h says that we can. */
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
161 # undef REL_ALLOC
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
162
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
163 # if defined STDC_HEADERS || defined _LIBC
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
164 # include <stdlib.h>
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
165 # else
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
166 char *malloc ();
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
167 char *realloc ();
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
168 # endif
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
169
451
b08ce70c8b7c Undefined INHIBIT_STRING_HEADER when we have no
Karl Heuer <kwzh@gnu.org>
parents: 449
diff changeset
170 /* When used in Emacs's lib-src, we need to get bzero and bcopy somehow.
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
171 If nothing else has been done, use the method below. */
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
172 # ifdef INHIBIT_STRING_HEADER
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
173 # if !(defined HAVE_BZERO && defined HAVE_BCOPY)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
174 # if !defined bzero && !defined bcopy
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
175 # undef INHIBIT_STRING_HEADER
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
176 # endif
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
177 # endif
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
178 # endif
451
b08ce70c8b7c Undefined INHIBIT_STRING_HEADER when we have no
Karl Heuer <kwzh@gnu.org>
parents: 449
diff changeset
179
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
180 /* This is the normal way of making sure we have memcpy, memcmp and bzero.
451
b08ce70c8b7c Undefined INHIBIT_STRING_HEADER when we have no
Karl Heuer <kwzh@gnu.org>
parents: 449
diff changeset
181 This is used in most programs--a few other programs avoid this
b08ce70c8b7c Undefined INHIBIT_STRING_HEADER when we have no
Karl Heuer <kwzh@gnu.org>
parents: 449
diff changeset
182 by defining INHIBIT_STRING_HEADER. */
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
183 # ifndef INHIBIT_STRING_HEADER
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
184 # if defined HAVE_STRING_H || defined STDC_HEADERS || defined _LIBC
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
185 # include <string.h>
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
186 # ifndef bzero
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
187 # ifndef _LIBC
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
188 # define bzero(s, n) (memset (s, '\0', n), (s))
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
189 # else
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
190 # define bzero(s, n) __bzero (s, n)
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
191 # endif
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
192 # endif
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
193 # else
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
194 # include <strings.h>
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
195 # ifndef memcmp
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
196 # define memcmp(s1, s2, n) bcmp (s1, s2, n)
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
197 # endif
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
198 # ifndef memcpy
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
199 # define memcpy(d, s, n) (bcopy (s, d, n), (d))
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
200 # endif
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
201 # endif
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
202 # endif
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
203
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
204 /* Define the syntax stuff for \<, \>, etc. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
205
2359
dbf725277cfc (enum syntaxcode): Provide default for non-Emacs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2357
diff changeset
206 /* Sword must be nonzero for the wordchar pattern commands in re_match_2. */
dbf725277cfc (enum syntaxcode): Provide default for non-Emacs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2357
diff changeset
207 enum syntaxcode { Swhitespace = 0, Sword = 1 };
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
208
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
209 # ifdef SWITCH_ENUM_BUG
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
210 # define SWITCH_ENUM_CAST(x) ((int)(x))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
211 # else
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
212 # define SWITCH_ENUM_CAST(x) (x)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
213 # endif
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
214
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
215 /* Dummy macros for non-Emacs environments. */
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
216 # define BASE_LEADING_CODE_P(c) (0)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
217 # define CHAR_CHARSET(c) 0
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
218 # define CHARSET_LEADING_CODE_BASE(c) 0
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
219 # define MAX_MULTIBYTE_LENGTH 1
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
220 # define RE_MULTIBYTE_P(x) 0
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
221 # define WORD_BOUNDARY_P(c1, c2) (0)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
222 # define CHAR_HEAD_P(p) (1)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
223 # define SINGLE_BYTE_CHAR_P(c) (1)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
224 # define SAME_CHARSET_P(c1, c2) (1)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
225 # define MULTIBYTE_FORM_LENGTH(p, s) (1)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
226 # define STRING_CHAR(p, s) (*(p))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
227 # define RE_STRING_CHAR STRING_CHAR
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
228 # define CHAR_STRING(c, s) (*(s) = (c), 1)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
229 # define STRING_CHAR_AND_LENGTH(p, s, actual_len) ((actual_len) = 1, *(p))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
230 # define RE_STRING_CHAR_AND_LENGTH STRING_CHAR_AND_LENGTH
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
231 # define GET_CHAR_BEFORE_2(c, p, str1, end1, str2, end2) \
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
232 (c = ((p) == (str2) ? *((end1) - 1) : *((p) - 1)))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
233 # define MAKE_CHAR(charset, c1, c2) (c1)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
234 #endif /* not emacs */
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
235
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
236 #ifndef RE_TRANSLATE
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
237 # define RE_TRANSLATE(TBL, C) ((unsigned char)(TBL)[C])
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
238 # define RE_TRANSLATE_P(TBL) (TBL)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
239 #endif
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
240
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
241 /* Get the interface, including the syntax bits. */
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
242 #include "regex.h"
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
243
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
244 /* isalpha etc. are used for the character classes. */
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
245 #include <ctype.h>
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
246
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
247 #ifdef emacs
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
248
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
249 /* 1 if C is an ASCII character. */
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
250 # define IS_REAL_ASCII(c) ((c) < 0200)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
251
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
252 /* 1 if C is a unibyte character. */
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
253 # define ISUNIBYTE(c) (SINGLE_BYTE_CHAR_P ((c)))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
254
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
255 /* The Emacs definitions should not be directly affected by locales. */
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
256
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
257 /* In Emacs, these are only used for single-byte characters. */
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
258 # define ISDIGIT(c) ((c) >= '0' && (c) <= '9')
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
259 # define ISCNTRL(c) ((c) < ' ')
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
260 # define ISXDIGIT(c) (((c) >= '0' && (c) <= '9') \
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
261 || ((c) >= 'a' && (c) <= 'f') \
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
262 || ((c) >= 'A' && (c) <= 'F'))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
263
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
264 /* This is only used for single-byte characters. */
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
265 # define ISBLANK(c) ((c) == ' ' || (c) == '\t')
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
266
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
267 /* The rest must handle multibyte characters. */
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
268
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
269 # define ISGRAPH(c) (SINGLE_BYTE_CHAR_P (c) \
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
270 ? (c) > ' ' && !((c) >= 0177 && (c) <= 0237) \
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
271 : 1)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
272
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
273 # define ISPRINT(c) (SINGLE_BYTE_CHAR_P (c) \
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
274 ? (c) >= ' ' && !((c) >= 0177 && (c) <= 0237) \
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
275 : 1)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
276
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
277 # define ISALNUM(c) (IS_REAL_ASCII (c) \
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
278 ? (((c) >= 'a' && (c) <= 'z') \
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
279 || ((c) >= 'A' && (c) <= 'Z') \
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
280 || ((c) >= '0' && (c) <= '9')) \
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
281 : SYNTAX (c) == Sword)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
282
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
283 # define ISALPHA(c) (IS_REAL_ASCII (c) \
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
284 ? (((c) >= 'a' && (c) <= 'z') \
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
285 || ((c) >= 'A' && (c) <= 'Z')) \
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
286 : SYNTAX (c) == Sword)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
287
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
288 # define ISLOWER(c) (LOWERCASEP (c))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
289
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
290 # define ISPUNCT(c) (IS_REAL_ASCII (c) \
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
291 ? ((c) > ' ' && (c) < 0177 \
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
292 && !(((c) >= 'a' && (c) <= 'z') \
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
293 || ((c) >= 'A' && (c) <= 'Z') \
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
294 || ((c) >= '0' && (c) <= '9'))) \
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
295 : SYNTAX (c) != Sword)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
296
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
297 # define ISSPACE(c) (SYNTAX (c) == Swhitespace)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
298
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
299 # define ISUPPER(c) (UPPERCASEP (c))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
300
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
301 # define ISWORD(c) (SYNTAX (c) == Sword)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
302
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
303 #else /* not emacs */
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
304
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
305 /* Jim Meyering writes:
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
306
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
307 "... Some ctype macros are valid only for character codes that
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
308 isascii says are ASCII (SGI's IRIX-4.0.5 is one such system --when
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
309 using /bin/cc or gcc but without giving an ansi option). So, all
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
310 ctype uses should be through macros like ISPRINT... If
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
311 STDC_HEADERS is defined, then autoconf has verified that the ctype
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
312 macros don't need to be guarded with references to isascii. ...
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
313 Defining isascii to 1 should let any compiler worth its salt
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
314 eliminate the && through constant folding."
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
315 Solaris defines some of these symbols so we must undefine them first. */
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
316
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
317 # undef ISASCII
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
318 # if defined STDC_HEADERS || (!defined isascii && !defined HAVE_ISASCII)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
319 # define ISASCII(c) 1
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
320 # else
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
321 # define ISASCII(c) isascii(c)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
322 # endif
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
323
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
324 /* 1 if C is an ASCII character. */
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
325 # define IS_REAL_ASCII(c) ((c) < 0200)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
326
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
327 /* This distinction is not meaningful, except in Emacs. */
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
328 # define ISUNIBYTE(c) 1
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
329
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
330 # ifdef isblank
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
331 # define ISBLANK(c) (ISASCII (c) && isblank (c))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
332 # else
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
333 # define ISBLANK(c) ((c) == ' ' || (c) == '\t')
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
334 # endif
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
335 # ifdef isgraph
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
336 # define ISGRAPH(c) (ISASCII (c) && isgraph (c))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
337 # else
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
338 # define ISGRAPH(c) (ISASCII (c) && isprint (c) && !isspace (c))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
339 # endif
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
340
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
341 # undef ISPRINT
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
342 # define ISPRINT(c) (ISASCII (c) && isprint (c))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
343 # define ISDIGIT(c) (ISASCII (c) && isdigit (c))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
344 # define ISALNUM(c) (ISASCII (c) && isalnum (c))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
345 # define ISALPHA(c) (ISASCII (c) && isalpha (c))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
346 # define ISCNTRL(c) (ISASCII (c) && iscntrl (c))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
347 # define ISLOWER(c) (ISASCII (c) && islower (c))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
348 # define ISPUNCT(c) (ISASCII (c) && ispunct (c))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
349 # define ISSPACE(c) (ISASCII (c) && isspace (c))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
350 # define ISUPPER(c) (ISASCII (c) && isupper (c))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
351 # define ISXDIGIT(c) (ISASCII (c) && isxdigit (c))
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
352
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
353 # define ISWORD(c) ISALPHA(c)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
354
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
355 # ifdef _tolower
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
356 # define TOLOWER(c) _tolower(c)
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
357 # else
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
358 # define TOLOWER(c) tolower(c)
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
359 # endif
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
360
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
361 /* How many characters in the character set. */
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
362 # define CHAR_SET_SIZE 256
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
363
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
364 # ifdef SYNTAX_TABLE
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
365
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
366 extern char *re_syntax_table;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
367
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
368 # else /* not SYNTAX_TABLE */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
369
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
370 static char re_syntax_table[CHAR_SET_SIZE];
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
371
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
372 static void
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
373 init_syntax_once ()
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
374 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
375 register int c;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
376 static int done = 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
377
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
378 if (done)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
379 return;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
380
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
381 bzero (re_syntax_table, sizeof re_syntax_table);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
382
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
383 for (c = 0; c < CHAR_SET_SIZE; ++c)
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
384 if (ISALNUM (c))
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
385 re_syntax_table[c] = Sword;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
386
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
387 re_syntax_table['_'] = Sword;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
388
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
389 done = 1;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
390 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
391
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
392 # endif /* not SYNTAX_TABLE */
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
393
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
394 # define SYNTAX(c) re_syntax_table[(c)]
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
395
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
396 #endif /* not emacs */
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
397
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
398 #ifndef NULL
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
399 # define NULL (void *)0
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
400 #endif
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
401
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
402 /* We remove any previous definition of `SIGN_EXTEND_CHAR',
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
403 since ours (we hope) works properly with all combinations of
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
404 machines, compilers, `char' and `unsigned char' argument types.
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
405 (Per Bothner suggested the basic approach.) */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
406 #undef SIGN_EXTEND_CHAR
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
407 #if __STDC__
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
408 # define SIGN_EXTEND_CHAR(c) ((signed char) (c))
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
409 #else /* not __STDC__ */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
410 /* As in Harbison and Steele. */
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
411 # define SIGN_EXTEND_CHAR(c) ((((unsigned char) (c)) ^ 128) - 128)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
412 #endif
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
413
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
414 /* Should we use malloc or alloca? If REGEX_MALLOC is not defined, we
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
415 use `alloca' instead of `malloc'. This is because using malloc in
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
416 re_search* or re_match* could cause memory leaks when C-g is used in
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
417 Emacs; also, malloc is slower and causes storage fragmentation. On
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
418 the other hand, malloc is more portable, and easier to debug.
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
419
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
420 Because we sometimes use alloca, some routines have to be macros,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
421 not functions -- `alloca'-allocated space disappears at the end of the
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
422 function it is called in. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
423
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
424 #ifdef REGEX_MALLOC
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
425
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
426 # define REGEX_ALLOCATE malloc
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
427 # define REGEX_REALLOCATE(source, osize, nsize) realloc (source, nsize)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
428 # define REGEX_FREE free
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
429
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
430 #else /* not REGEX_MALLOC */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
431
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
432 /* Emacs already defines alloca, sometimes. */
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
433 # ifndef alloca
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
434
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
435 /* Make alloca work the best possible way. */
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
436 # ifdef __GNUC__
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
437 # define alloca __builtin_alloca
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
438 # else /* not __GNUC__ */
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
439 # if HAVE_ALLOCA_H
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
440 # include <alloca.h>
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
441 # endif /* HAVE_ALLOCA_H */
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
442 # endif /* not __GNUC__ */
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
443
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
444 # endif /* not alloca */
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
445
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
446 # define REGEX_ALLOCATE alloca
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
447
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
448 /* Assumes a `char *destination' variable. */
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
449 # define REGEX_REALLOCATE(source, osize, nsize) \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
450 (destination = (char *) alloca (nsize), \
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
451 memcpy (destination, source, osize))
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
452
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
453 /* No need to do anything to free, after alloca. */
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
454 # define REGEX_FREE(arg) ((void)0) /* Do nothing! But inhibit gcc warning. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
455
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
456 #endif /* not REGEX_MALLOC */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
457
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
458 /* Define how to allocate the failure stack. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
459
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
460 #if defined REL_ALLOC && defined REGEX_MALLOC
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
461
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
462 # define REGEX_ALLOCATE_STACK(size) \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
463 r_alloc (&failure_stack_ptr, (size))
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
464 # define REGEX_REALLOCATE_STACK(source, osize, nsize) \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
465 r_re_alloc (&failure_stack_ptr, (nsize))
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
466 # define REGEX_FREE_STACK(ptr) \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
467 r_alloc_free (&failure_stack_ptr)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
468
462
115ffc5a3b13 Don't use relocatable allocator.
Richard Stallman <rms@gnu.org>
parents: 460
diff changeset
469 #else /* not using relocating allocator */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
470
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
471 # ifdef REGEX_MALLOC
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
472
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
473 # define REGEX_ALLOCATE_STACK malloc
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
474 # define REGEX_REALLOCATE_STACK(source, osize, nsize) realloc (source, nsize)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
475 # define REGEX_FREE_STACK free
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
476
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
477 # else /* not REGEX_MALLOC */
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
478
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
479 # define REGEX_ALLOCATE_STACK alloca
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
480
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
481 # define REGEX_REALLOCATE_STACK(source, osize, nsize) \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
482 REGEX_REALLOCATE (source, osize, nsize)
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
483 /* No need to explicitly free anything. */
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
484 # define REGEX_FREE_STACK(arg) ((void)0)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
485
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
486 # endif /* not REGEX_MALLOC */
462
115ffc5a3b13 Don't use relocatable allocator.
Richard Stallman <rms@gnu.org>
parents: 460
diff changeset
487 #endif /* not using relocating allocator */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
488
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
489
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
490 /* True if `size1' is non-NULL and PTR is pointing anywhere inside
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
491 `string1' or just past its end. This works if PTR is NULL, which is
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
492 a good thing. */
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
493 #define FIRST_STRING_P(ptr) \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
494 (size1 && string1 <= (ptr) && (ptr) <= string1 + size1)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
495
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
496 /* (Re)Allocate N items of type T using malloc, or fail. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
497 #define TALLOC(n, t) ((t *) malloc ((n) * sizeof (t)))
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
498 #define RETALLOC(addr, n, t) ((addr) = (t *) realloc (addr, (n) * sizeof (t)))
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
499 #define RETALLOC_IF(addr, n, t) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
500 if (addr) RETALLOC((addr), (n), t); else (addr) = TALLOC ((n), t)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
501 #define REGEX_TALLOC(n, t) ((t *) REGEX_ALLOCATE ((n) * sizeof (t)))
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
502
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
503 #define BYTEWIDTH 8 /* In bits. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
504
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
505 #define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
506
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
507 #undef MAX
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
508 #undef MIN
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
509 #define MAX(a, b) ((a) > (b) ? (a) : (b))
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
510 #define MIN(a, b) ((a) < (b) ? (a) : (b))
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
511
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
512 /* Type of source-pattern and string chars. */
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
513 typedef const unsigned char re_char;
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
514
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
515 typedef char boolean;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
516 #define false 0
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
517 #define true 1
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
518
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
519 static int re_match_2_internal _RE_ARGS ((struct re_pattern_buffer *bufp,
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
520 re_char *string1, int size1,
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
521 re_char *string2, int size2,
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
522 int pos,
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
523 struct re_registers *regs,
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
524 int stop));
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
525
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
526 /* These are the command codes that appear in compiled regular
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
527 expressions. Some opcodes are followed by argument bytes. A
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
528 command code can specify any interpretation whatsoever for its
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
529 arguments. Zero bytes may appear in the compiled regular expression. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
530
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
531 typedef enum
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
532 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
533 no_op = 0,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
534
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
535 /* Succeed right away--no more backtracking. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
536 succeed,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
537
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
538 /* Followed by one byte giving n, then by n literal bytes. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
539 exactn,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
540
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
541 /* Matches any (more or less) character. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
542 anychar,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
543
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
544 /* Matches any one char belonging to specified set. First
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
545 following byte is number of bitmap bytes. Then come bytes
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
546 for a bitmap saying which chars are in. Bits in each byte
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
547 are ordered low-bit-first. A character is in the set if its
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
548 bit is 1. A character too large to have a bit in the map is
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
549 automatically not in the set.
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
550
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
551 If the length byte has the 0x80 bit set, then that stuff
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
552 is followed by a range table:
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
553 2 bytes of flags for character sets (low 8 bits, high 8 bits)
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
554 See RANGE_TABLE_WORK_BITS below.
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
555 2 bytes, the number of pairs that follow (upto 32767)
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
556 pairs, each 2 multibyte characters,
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
557 each multibyte character represented as 3 bytes. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
558 charset,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
559
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
560 /* Same parameters as charset, but match any character that is
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
561 not one of those specified. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
562 charset_not,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
563
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
564 /* Start remembering the text that is matched, for storing in a
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
565 register. Followed by one byte with the register number, in
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
566 the range 0 to one less than the pattern buffer's re_nsub
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
567 field. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
568 start_memory,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
569
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
570 /* Stop remembering the text that is matched and store it in a
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
571 memory register. Followed by one byte with the register
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
572 number, in the range 0 to one less than `re_nsub' in the
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
573 pattern buffer. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
574 stop_memory,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
575
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
576 /* Match a duplicate of something remembered. Followed by one
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
577 byte containing the register number. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
578 duplicate,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
579
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
580 /* Fail unless at beginning of line. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
581 begline,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
582
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
583 /* Fail unless at end of line. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
584 endline,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
585
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
586 /* Succeeds if at beginning of buffer (if emacs) or at beginning
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
587 of string to be matched (if not). */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
588 begbuf,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
589
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
590 /* Analogously, for end of buffer/string. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
591 endbuf,
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
592
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
593 /* Followed by two byte relative address to which to jump. */
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
594 jump,
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
595
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
596 /* Followed by two-byte relative address of place to resume at
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
597 in case of failure. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
598 on_failure_jump,
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
599
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
600 /* Like on_failure_jump, but pushes a placeholder instead of the
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
601 current string position when executed. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
602 on_failure_keep_string_jump,
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
603
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
604 /* Just like `on_failure_jump', except that it checks that we
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
605 don't get stuck in an infinite loop (matching an empty string
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
606 indefinitely). */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
607 on_failure_jump_loop,
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
608
2370
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
609 /* Just like `on_failure_jump_loop', except that it checks for
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
610 a different kind of loop (the kind that shows up with non-greedy
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
611 operators). This operation has to be immediately preceded
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
612 by a `no_op'. */
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
613 on_failure_jump_nastyloop,
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
614
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
615 /* A smart `on_failure_jump' used for greedy * and + operators.
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
616 It analyses the loop before which it is put and if the
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
617 loop does not require backtracking, it changes itself to
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
618 `on_failure_keep_string_jump' and short-circuits the loop,
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
619 else it just defaults to changing itself into `on_failure_jump'.
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
620 It assumes that it is pointing to just past a `jump'. */
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
621 on_failure_jump_smart,
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
622
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
623 /* Followed by two-byte relative address and two-byte number n.
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
624 After matching N times, jump to the address upon failure.
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
625 Does not work if N starts at 0: use on_failure_jump_loop
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
626 instead. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
627 succeed_n,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
628
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
629 /* Followed by two-byte relative address, and two-byte number n.
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
630 Jump to the address N times, then fail. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
631 jump_n,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
632
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
633 /* Set the following two-byte relative address to the
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
634 subsequent two-byte number. The address *includes* the two
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
635 bytes of number. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
636 set_number_at,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
637
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
638 wordbeg, /* Succeeds if at word beginning. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
639 wordend, /* Succeeds if at word end. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
640
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
641 wordbound, /* Succeeds if at a word boundary. */
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
642 notwordbound, /* Succeeds if not at a word boundary. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
643
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
644 /* Matches any character whose syntax is specified. Followed by
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
645 a byte which contains a syntax code, e.g., Sword. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
646 syntaxspec,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
647
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
648 /* Matches any character whose syntax is not that specified. */
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
649 notsyntaxspec
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
650
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
651 #ifdef emacs
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
652 ,before_dot, /* Succeeds if before point. */
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
653 at_dot, /* Succeeds if at point. */
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
654 after_dot, /* Succeeds if after point. */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
655
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
656 /* Matches any character whose category-set contains the specified
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
657 category. The operator is followed by a byte which contains a
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
658 category code (mnemonic ASCII character). */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
659 categoryspec,
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
660
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
661 /* Matches any character whose category-set does not contain the
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
662 specified category. The operator is followed by a byte which
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
663 contains the category code (mnemonic ASCII character). */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
664 notcategoryspec
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
665 #endif /* emacs */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
666 } re_opcode_t;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
667
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
668 /* Common operations on the compiled pattern. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
669
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
670 /* Store NUMBER in two contiguous bytes starting at DESTINATION. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
671
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
672 #define STORE_NUMBER(destination, number) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
673 do { \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
674 (destination)[0] = (number) & 0377; \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
675 (destination)[1] = (number) >> 8; \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
676 } while (0)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
677
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
678 /* Same as STORE_NUMBER, except increment DESTINATION to
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
679 the byte after where the number is stored. Therefore, DESTINATION
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
680 must be an lvalue. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
681
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
682 #define STORE_NUMBER_AND_INCR(destination, number) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
683 do { \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
684 STORE_NUMBER (destination, number); \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
685 (destination) += 2; \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
686 } while (0)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
687
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
688 /* Put into DESTINATION a number stored in two contiguous bytes starting
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
689 at SOURCE. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
690
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
691 #define EXTRACT_NUMBER(destination, source) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
692 do { \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
693 (destination) = *(source) & 0377; \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
694 (destination) += SIGN_EXTEND_CHAR (*((source) + 1)) << 8; \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
695 } while (0)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
696
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
697 #ifdef DEBUG
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
698 static void extract_number _RE_ARGS ((int *dest, re_char *source));
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
699 static void
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
700 extract_number (dest, source)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
701 int *dest;
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
702 re_char *source;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
703 {
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
704 int temp = SIGN_EXTEND_CHAR (*(source + 1));
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
705 *dest = *source & 0377;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
706 *dest += temp << 8;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
707 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
708
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
709 # ifndef EXTRACT_MACROS /* To debug the macros. */
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
710 # undef EXTRACT_NUMBER
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
711 # define EXTRACT_NUMBER(dest, src) extract_number (&dest, src)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
712 # endif /* not EXTRACT_MACROS */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
713
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
714 #endif /* DEBUG */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
715
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
716 /* Same as EXTRACT_NUMBER, except increment SOURCE to after the number.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
717 SOURCE must be an lvalue. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
718
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
719 #define EXTRACT_NUMBER_AND_INCR(destination, source) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
720 do { \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
721 EXTRACT_NUMBER (destination, source); \
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
722 (source) += 2; \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
723 } while (0)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
724
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
725 #ifdef DEBUG
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
726 static void extract_number_and_incr _RE_ARGS ((int *destination,
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
727 re_char **source));
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
728 static void
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
729 extract_number_and_incr (destination, source)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
730 int *destination;
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
731 re_char **source;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
732 {
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
733 extract_number (destination, *source);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
734 *source += 2;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
735 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
736
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
737 # ifndef EXTRACT_MACROS
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
738 # undef EXTRACT_NUMBER_AND_INCR
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
739 # define EXTRACT_NUMBER_AND_INCR(dest, src) \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
740 extract_number_and_incr (&dest, &src)
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
741 # endif /* not EXTRACT_MACROS */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
742
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
743 #endif /* DEBUG */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
744
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
745 /* Store a multibyte character in three contiguous bytes starting
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
746 DESTINATION, and increment DESTINATION to the byte after where the
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
747 character is stored. Therefore, DESTINATION must be an lvalue. */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
748
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
749 #define STORE_CHARACTER_AND_INCR(destination, character) \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
750 do { \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
751 (destination)[0] = (character) & 0377; \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
752 (destination)[1] = ((character) >> 8) & 0377; \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
753 (destination)[2] = (character) >> 16; \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
754 (destination) += 3; \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
755 } while (0)
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
756
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
757 /* Put into DESTINATION a character stored in three contiguous bytes
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
758 starting at SOURCE. */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
759
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
760 #define EXTRACT_CHARACTER(destination, source) \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
761 do { \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
762 (destination) = ((source)[0] \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
763 | ((source)[1] << 8) \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
764 | ((source)[2] << 16)); \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
765 } while (0)
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
766
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
767
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
768 /* Macros for charset. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
769
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
770 /* Size of bitmap of charset P in bytes. P is a start of charset,
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
771 i.e. *P is (re_opcode_t) charset or (re_opcode_t) charset_not. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
772 #define CHARSET_BITMAP_SIZE(p) ((p)[1] & 0x7F)
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
773
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
774 /* Nonzero if charset P has range table. */
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
775 #define CHARSET_RANGE_TABLE_EXISTS_P(p) ((p)[1] & 0x80)
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
776
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
777 /* Return the address of range table of charset P. But not the start
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
778 of table itself, but the before where the number of ranges is
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
779 stored. `2 +' means to skip re_opcode_t and size of bitmap,
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
780 and the 2 bytes of flags at the start of the range table. */
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
781 #define CHARSET_RANGE_TABLE(p) (&(p)[4 + CHARSET_BITMAP_SIZE (p)])
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
782
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
783 /* Extract the bit flags that start a range table. */
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
784 #define CHARSET_RANGE_TABLE_BITS(p) \
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
785 ((p)[2 + CHARSET_BITMAP_SIZE (p)] \
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
786 + (p)[3 + CHARSET_BITMAP_SIZE (p)] * 0x100)
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
787
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
788 /* Test if C is listed in the bitmap of charset P. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
789 #define CHARSET_LOOKUP_BITMAP(p, c) \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
790 ((c) < CHARSET_BITMAP_SIZE (p) * BYTEWIDTH \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
791 && (p)[2 + (c) / BYTEWIDTH] & (1 << ((c) % BYTEWIDTH)))
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
792
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
793 /* Return the address of end of RANGE_TABLE. COUNT is number of
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
794 ranges (which is a pair of (start, end)) in the RANGE_TABLE. `* 2'
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
795 is start of range and end of range. `* 3' is size of each start
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
796 and end. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
797 #define CHARSET_RANGE_TABLE_END(range_table, count) \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
798 ((range_table) + (count) * 2 * 3)
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
799
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
800 /* Test if C is in RANGE_TABLE. A flag NOT is negated if C is in.
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
801 COUNT is number of ranges in RANGE_TABLE. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
802 #define CHARSET_LOOKUP_RANGE_TABLE_RAW(not, c, range_table, count) \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
803 do \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
804 { \
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
805 re_wchar_t range_start, range_end; \
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
806 re_char *p; \
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
807 re_char *range_table_end \
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
808 = CHARSET_RANGE_TABLE_END ((range_table), (count)); \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
809 \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
810 for (p = (range_table); p < range_table_end; p += 2 * 3) \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
811 { \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
812 EXTRACT_CHARACTER (range_start, p); \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
813 EXTRACT_CHARACTER (range_end, p + 3); \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
814 \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
815 if (range_start <= (c) && (c) <= range_end) \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
816 { \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
817 (not) = !(not); \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
818 break; \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
819 } \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
820 } \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
821 } \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
822 while (0)
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
823
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
824 /* Test if C is in range table of CHARSET. The flag NOT is negated if
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
825 C is listed in it. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
826 #define CHARSET_LOOKUP_RANGE_TABLE(not, c, charset) \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
827 do \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
828 { \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
829 /* Number of ranges in range table. */ \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
830 int count; \
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
831 re_char *range_table = CHARSET_RANGE_TABLE (charset); \
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
832 \
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
833 EXTRACT_NUMBER_AND_INCR (count, range_table); \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
834 CHARSET_LOOKUP_RANGE_TABLE_RAW ((not), (c), range_table, count); \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
835 } \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
836 while (0)
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
837
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
838 /* If DEBUG is defined, Regex prints many voluminous messages about what
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
839 it is doing (if the variable `debug' is nonzero). If linked with the
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
840 main program in `iregex.c', you can enter patterns and strings
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
841 interactively. And if linked with the main program in `main.c' and
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
842 the other test files, you can run the already-written tests. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
843
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
844 #ifdef DEBUG
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
845
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
846 /* We use standard I/O for debugging. */
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
847 # include <stdio.h>
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
848
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
849 /* It is useful to test things that ``must'' be true when debugging. */
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
850 # include <assert.h>
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
851
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
852 static int debug = -100000;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
853
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
854 # define DEBUG_STATEMENT(e) e
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
855 # define DEBUG_PRINT1(x) if (debug > 0) printf (x)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
856 # define DEBUG_PRINT2(x1, x2) if (debug > 0) printf (x1, x2)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
857 # define DEBUG_PRINT3(x1, x2, x3) if (debug > 0) printf (x1, x2, x3)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
858 # define DEBUG_PRINT4(x1, x2, x3, x4) if (debug > 0) printf (x1, x2, x3, x4)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
859 # define DEBUG_PRINT_COMPILED_PATTERN(p, s, e) \
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
860 if (debug > 0) print_partial_compiled_pattern (s, e)
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
861 # define DEBUG_PRINT_DOUBLE_STRING(w, s1, sz1, s2, sz2) \
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
862 if (debug > 0) print_double_string (w, s1, sz1, s2, sz2)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
863
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
864
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
865 /* Print the fastmap in human-readable form. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
866
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
867 void
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
868 print_fastmap (fastmap)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
869 char *fastmap;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
870 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
871 unsigned was_a_range = 0;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
872 unsigned i = 0;
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
873
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
874 while (i < (1 << BYTEWIDTH))
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
875 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
876 if (fastmap[i++])
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
877 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
878 was_a_range = 0;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
879 putchar (i - 1);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
880 while (i < (1 << BYTEWIDTH) && fastmap[i])
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
881 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
882 was_a_range = 1;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
883 i++;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
884 }
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
885 if (was_a_range)
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
886 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
887 printf ("-");
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
888 putchar (i - 1);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
889 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
890 }
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
891 }
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
892 putchar ('\n');
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
893 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
894
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
895
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
896 /* Print a compiled pattern string in human-readable form, starting at
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
897 the START pointer into it and ending just before the pointer END. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
898
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
899 void
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
900 print_partial_compiled_pattern (start, end)
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
901 re_char *start;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
902 re_char *end;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
903 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
904 int mcnt, mcnt2;
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
905 re_char *p = start;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
906 re_char *pend = end;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
907
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
908 if (start == NULL)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
909 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
910 printf ("(null)\n");
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
911 return;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
912 }
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
913
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
914 /* Loop over pattern commands. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
915 while (p < pend)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
916 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
917 printf ("%d:\t", p - start);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
918
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
919 switch ((re_opcode_t) *p++)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
920 {
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
921 case no_op:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
922 printf ("/no_op");
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
923 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
924
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
925 case succeed:
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
926 printf ("/succeed");
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
927 break;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
928
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
929 case exactn:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
930 mcnt = *p++;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
931 printf ("/exactn/%d", mcnt);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
932 do
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
933 {
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
934 putchar ('/');
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
935 putchar (*p++);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
936 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
937 while (--mcnt);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
938 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
939
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
940 case start_memory:
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
941 printf ("/start_memory/%d", *p++);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
942 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
943
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
944 case stop_memory:
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
945 printf ("/stop_memory/%d", *p++);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
946 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
947
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
948 case duplicate:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
949 printf ("/duplicate/%d", *p++);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
950 break;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
951
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
952 case anychar:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
953 printf ("/anychar");
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
954 break;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
955
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
956 case charset:
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
957 case charset_not:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
958 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
959 register int c, last = -100;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
960 register int in_range = 0;
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
961 int length = CHARSET_BITMAP_SIZE (p - 1);
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
962 int has_range_table = CHARSET_RANGE_TABLE_EXISTS_P (p - 1);
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
963
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
964 printf ("/charset [%s",
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
965 (re_opcode_t) *(p - 1) == charset_not ? "^" : "");
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
966
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
967 assert (p + *p < pend);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
968
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
969 for (c = 0; c < 256; c++)
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
970 if (c / 8 < length
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
971 && (p[1 + (c/8)] & (1 << (c % 8))))
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
972 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
973 /* Are we starting a range? */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
974 if (last + 1 == c && ! in_range)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
975 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
976 putchar ('-');
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
977 in_range = 1;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
978 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
979 /* Have we broken a range? */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
980 else if (last + 1 != c && in_range)
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
981 {
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
982 putchar (last);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
983 in_range = 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
984 }
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
985
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
986 if (! in_range)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
987 putchar (c);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
988
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
989 last = c;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
990 }
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
991
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
992 if (in_range)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
993 putchar (last);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
994
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
995 putchar (']');
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
996
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
997 p += 1 + length;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
998
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
999 if (has_range_table)
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
1000 {
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
1001 int count;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
1002 printf ("has-range-table");
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
1003
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
1004 /* ??? Should print the range table; for now, just skip it. */
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
1005 p += 2; /* skip range table bits */
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
1006 EXTRACT_NUMBER_AND_INCR (count, p);
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
1007 p = CHARSET_RANGE_TABLE_END (p, count);
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
1008 }
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1009 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1010 break;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1011
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1012 case begline:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1013 printf ("/begline");
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1014 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1015
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1016 case endline:
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1017 printf ("/endline");
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1018 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1019
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1020 case on_failure_jump:
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1021 extract_number_and_incr (&mcnt, &p);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1022 printf ("/on_failure_jump to %d", p + mcnt - start);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1023 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1024
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1025 case on_failure_keep_string_jump:
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1026 extract_number_and_incr (&mcnt, &p);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1027 printf ("/on_failure_keep_string_jump to %d", p + mcnt - start);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1028 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1029
2370
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
1030 case on_failure_jump_nastyloop:
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
1031 extract_number_and_incr (&mcnt, &p);
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
1032 printf ("/on_failure_jump_nastyloop to %d", p + mcnt - start);
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
1033 break;
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
1034
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1035 case on_failure_jump_loop:
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1036 extract_number_and_incr (&mcnt, &p);
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1037 printf ("/on_failure_jump_loop to %d", p + mcnt - start);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1038 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1039
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1040 case on_failure_jump_smart:
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1041 extract_number_and_incr (&mcnt, &p);
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1042 printf ("/on_failure_jump_smart to %d", p + mcnt - start);
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1043 break;
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1044
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1045 case jump:
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1046 extract_number_and_incr (&mcnt, &p);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1047 printf ("/jump to %d", p + mcnt - start);
679
b088267ea1c8 Clean up whitespace.
Richard Stallman <rms@gnu.org>
parents: 678
diff changeset
1048 break;
b088267ea1c8 Clean up whitespace.
Richard Stallman <rms@gnu.org>
parents: 678
diff changeset
1049
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1050 case succeed_n:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1051 extract_number_and_incr (&mcnt, &p);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1052 extract_number_and_incr (&mcnt2, &p);
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
1053 printf ("/succeed_n to %d, %d times", p - 2 + mcnt - start, mcnt2);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1054 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1055
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1056 case jump_n:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1057 extract_number_and_incr (&mcnt, &p);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1058 extract_number_and_incr (&mcnt2, &p);
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
1059 printf ("/jump_n to %d, %d times", p - 2 + mcnt - start, mcnt2);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1060 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1061
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1062 case set_number_at:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1063 extract_number_and_incr (&mcnt, &p);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1064 extract_number_and_incr (&mcnt2, &p);
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
1065 printf ("/set_number_at location %d to %d", p - 2 + mcnt - start, mcnt2);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1066 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1067
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1068 case wordbound:
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1069 printf ("/wordbound");
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1070 break;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1071
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1072 case notwordbound:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1073 printf ("/notwordbound");
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1074 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1075
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1076 case wordbeg:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1077 printf ("/wordbeg");
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1078 break;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1079
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1080 case wordend:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1081 printf ("/wordend");
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1082
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
1083 case syntaxspec:
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
1084 printf ("/syntaxspec");
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
1085 mcnt = *p++;
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
1086 printf ("/%d", mcnt);
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
1087 break;
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
1088
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
1089 case notsyntaxspec:
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
1090 printf ("/notsyntaxspec");
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
1091 mcnt = *p++;
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
1092 printf ("/%d", mcnt);
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
1093 break;
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
1094
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
1095 # ifdef emacs
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1096 case before_dot:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1097 printf ("/before_dot");
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1098 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1099
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1100 case at_dot:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1101 printf ("/at_dot");
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1102 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1103
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1104 case after_dot:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1105 printf ("/after_dot");
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1106 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1107
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
1108 case categoryspec:
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
1109 printf ("/categoryspec");
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1110 mcnt = *p++;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1111 printf ("/%d", mcnt);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1112 break;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1113
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
1114 case notcategoryspec:
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
1115 printf ("/notcategoryspec");
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1116 mcnt = *p++;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1117 printf ("/%d", mcnt);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1118 break;
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
1119 # endif /* emacs */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1120
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1121 case begbuf:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1122 printf ("/begbuf");
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1123 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1124
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1125 case endbuf:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1126 printf ("/endbuf");
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1127 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1128
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1129 default:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1130 printf ("?%d", *(p-1));
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1131 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1132
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1133 putchar ('\n');
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1134 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1135
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1136 printf ("%d:\tend of pattern.\n", p - start);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1137 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1138
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1139
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1140 void
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1141 print_compiled_pattern (bufp)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1142 struct re_pattern_buffer *bufp;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1143 {
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1144 re_char *buffer = bufp->buffer;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1145
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1146 print_partial_compiled_pattern (buffer, buffer + bufp->used);
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1147 printf ("%ld bytes used/%ld bytes allocated.\n",
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1148 bufp->used, bufp->allocated);
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1149
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1150 if (bufp->fastmap_accurate && bufp->fastmap)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1151 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1152 printf ("fastmap: ");
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1153 print_fastmap (bufp->fastmap);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1154 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1155
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1156 printf ("re_nsub: %d\t", bufp->re_nsub);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1157 printf ("regs_alloc: %d\t", bufp->regs_allocated);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1158 printf ("can_be_null: %d\t", bufp->can_be_null);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1159 printf ("no_sub: %d\t", bufp->no_sub);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1160 printf ("not_bol: %d\t", bufp->not_bol);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1161 printf ("not_eol: %d\t", bufp->not_eol);
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1162 printf ("syntax: %lx\n", bufp->syntax);
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1163 fflush (stdout);
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1164 /* Perhaps we should print the translate table? */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1165 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1166
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1167
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1168 void
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1169 print_double_string (where, string1, size1, string2, size2)
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
1170 re_char *where;
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
1171 re_char *string1;
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
1172 re_char *string2;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1173 int size1;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1174 int size2;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1175 {
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1176 int this_char;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1177
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1178 if (where == NULL)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1179 printf ("(null)");
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1180 else
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1181 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1182 if (FIRST_STRING_P (where))
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1183 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1184 for (this_char = where - string1; this_char < size1; this_char++)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1185 putchar (string1[this_char]);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1186
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1187 where = string2;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1188 }
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1189
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1190 for (this_char = where - string2; this_char < size2; this_char++)
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1191 putchar (string2[this_char]);
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1192 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1193 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1194
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1195 #else /* not DEBUG */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1196
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
1197 # undef assert
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
1198 # define assert(e)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
1199
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
1200 # define DEBUG_STATEMENT(e)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
1201 # define DEBUG_PRINT1(x)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
1202 # define DEBUG_PRINT2(x1, x2)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
1203 # define DEBUG_PRINT3(x1, x2, x3)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
1204 # define DEBUG_PRINT4(x1, x2, x3, x4)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
1205 # define DEBUG_PRINT_COMPILED_PATTERN(p, s, e)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
1206 # define DEBUG_PRINT_DOUBLE_STRING(w, s1, sz1, s2, sz2)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1207
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1208 #endif /* not DEBUG */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1209
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1210 /* Set by `re_set_syntax' to the current regexp syntax to recognize. Can
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1211 also be assigned to arbitrarily: each pattern buffer stores its own
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1212 syntax, so it can be changed between regex compilations. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1213 /* This has no initializer because initialized variables in Emacs
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1214 become read-only after dumping. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1215 reg_syntax_t re_syntax_options;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1216
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1217
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1218 /* Specify the precise syntax of regexps for compilation. This provides
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1219 for compatibility for various utilities which historically have
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1220 different, incompatible syntaxes.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1221
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1222 The argument SYNTAX is a bit mask comprised of the various bits
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1223 defined in regex.h. We return the old syntax. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1224
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1225 reg_syntax_t
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1226 re_set_syntax (syntax)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1227 reg_syntax_t syntax;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1228 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1229 reg_syntax_t ret = re_syntax_options;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1230
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1231 re_syntax_options = syntax;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1232 return ret;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1233 }
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
1234 WEAK_ALIAS (__re_set_syntax, re_set_syntax)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1235
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1236 /* This table gives an error message for each of the error codes listed
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1237 in regex.h. Obviously the order here has to be same as there.
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1238 POSIX doesn't require that we do anything for REG_NOERROR,
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1239 but why not be nice? */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1240
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1241 static const char *re_error_msgid[] =
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1242 {
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1243 gettext_noop ("Success"), /* REG_NOERROR */
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1244 gettext_noop ("No match"), /* REG_NOMATCH */
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1245 gettext_noop ("Invalid regular expression"), /* REG_BADPAT */
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1246 gettext_noop ("Invalid collation character"), /* REG_ECOLLATE */
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1247 gettext_noop ("Invalid character class name"), /* REG_ECTYPE */
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1248 gettext_noop ("Trailing backslash"), /* REG_EESCAPE */
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1249 gettext_noop ("Invalid back reference"), /* REG_ESUBREG */
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1250 gettext_noop ("Unmatched [ or [^"), /* REG_EBRACK */
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1251 gettext_noop ("Unmatched ( or \\("), /* REG_EPAREN */
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1252 gettext_noop ("Unmatched \\{"), /* REG_EBRACE */
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1253 gettext_noop ("Invalid content of \\{\\}"), /* REG_BADBR */
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1254 gettext_noop ("Invalid range end"), /* REG_ERANGE */
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1255 gettext_noop ("Memory exhausted"), /* REG_ESPACE */
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1256 gettext_noop ("Invalid preceding regular expression"), /* REG_BADRPT */
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1257 gettext_noop ("Premature end of regular expression"), /* REG_EEND */
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1258 gettext_noop ("Regular expression too big"), /* REG_ESIZE */
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1259 gettext_noop ("Unmatched ) or \\)"), /* REG_ERPAREN */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1260 };
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1261
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1262 /* Avoiding alloca during matching, to placate r_alloc. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1263
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1264 /* Define MATCH_MAY_ALLOCATE unless we need to make sure that the
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1265 searching and matching functions should not call alloca. On some
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1266 systems, alloca is implemented in terms of malloc, and if we're
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1267 using the relocating allocator routines, then malloc could cause a
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1268 relocation, which might (if the strings being searched are in the
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1269 ralloc heap) shift the data out from underneath the regexp
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1270 routines.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1271
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1272 Here's another reason to avoid allocation: Emacs
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1273 processes input from X in a signal handler; processing X input may
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1274 call malloc; if input arrives while a matching routine is calling
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1275 malloc, then we're scrod. But Emacs can't just block input while
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1276 calling matching routines; then we don't notice interrupts when
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1277 they come in. So, Emacs blocks input around all regexp calls
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1278 except the matching calls, which it leaves unprotected, in the
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1279 faith that they will not malloc. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1280
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1281 /* Normally, this is fine. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1282 #define MATCH_MAY_ALLOCATE
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1283
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1284 /* When using GNU C, we are not REALLY using the C alloca, no matter
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1285 what config.h may say. So don't take precautions for it. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1286 #ifdef __GNUC__
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
1287 # undef C_ALLOCA
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1288 #endif
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1289
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1290 /* The match routines may not allocate if (1) they would do it with malloc
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1291 and (2) it's not safe for them to use malloc.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1292 Note that if REL_ALLOC is defined, matching would not use malloc for the
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1293 failure stack, but we would still use it for the register vectors;
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1294 so REL_ALLOC should not affect this. */
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
1295 #if (defined C_ALLOCA || defined REGEX_MALLOC) && defined emacs
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
1296 # undef MATCH_MAY_ALLOCATE
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1297 #endif
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1298
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1299
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1300 /* Failure stack declarations and macros; both re_compile_fastmap and
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1301 re_match_2 use a failure stack. These have to be macros because of
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1302 REGEX_ALLOCATE_STACK. */
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1303
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1304
1156
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1305 /* Approximate number of failure points for which to initially allocate space
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1306 when matching. If this number is exceeded, we allocate more
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1307 space, so it is not a hard limit. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1308 #ifndef INIT_FAILURE_ALLOC
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
1309 # define INIT_FAILURE_ALLOC 20
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1310 #endif
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1311
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1312 /* Roughly the maximum number of failure points on the stack. Would be
1156
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1313 exactly that if always used TYPICAL_FAILURE_SIZE items each time we failed.
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1314 This is a variable only so users of regex can assign to it; we never
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
1315 change it ourselves. */
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
1316 # if defined MATCH_MAY_ALLOCATE
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
1317 /* Note that 4400 was enough to cause a crash on Alpha OSF/1,
1156
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1318 whose default stack limit is 2mb. In order for a larger
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1319 value to work reliably, you have to try to make it accord
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1320 with the process stack limit. */
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
1321 size_t re_max_failures = 40000;
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
1322 # else
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
1323 size_t re_max_failures = 4000;
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
1324 # endif
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1325
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1326 union fail_stack_elt
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1327 {
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1328 re_char *pointer;
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
1329 /* This should be the biggest `int' that's no bigger than a pointer. */
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
1330 long integer;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1331 };
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1332
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1333 typedef union fail_stack_elt fail_stack_elt_t;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1334
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1335 typedef struct
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1336 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1337 fail_stack_elt_t *stack;
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
1338 size_t size;
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
1339 size_t avail; /* Offset of next open position. */
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
1340 size_t frame; /* Offset of the cur constructed frame. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1341 } fail_stack_type;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1342
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1343 #define FAIL_STACK_EMPTY() (fail_stack.frame == 0)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1344 #define FAIL_STACK_FULL() (fail_stack.avail == fail_stack.size)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1345
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1346
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1347 /* Define macros to initialize and free the failure stack.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1348 Do `return -2' if the alloc fails. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1349
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1350 #ifdef MATCH_MAY_ALLOCATE
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
1351 # define INIT_FAIL_STACK() \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1352 do { \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1353 fail_stack.stack = (fail_stack_elt_t *) \
1156
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1354 REGEX_ALLOCATE_STACK (INIT_FAILURE_ALLOC * TYPICAL_FAILURE_SIZE \
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1355 * sizeof (fail_stack_elt_t)); \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1356 \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1357 if (fail_stack.stack == NULL) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1358 return -2; \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1359 \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1360 fail_stack.size = INIT_FAILURE_ALLOC; \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1361 fail_stack.avail = 0; \
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1362 fail_stack.frame = 0; \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1363 } while (0)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1364
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
1365 # define RESET_FAIL_STACK() REGEX_FREE_STACK (fail_stack.stack)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1366 #else
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
1367 # define INIT_FAIL_STACK() \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1368 do { \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1369 fail_stack.avail = 0; \
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1370 fail_stack.frame = 0; \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1371 } while (0)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1372
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
1373 # define RESET_FAIL_STACK() ((void)0)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1374 #endif
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1375
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1376
1156
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1377 /* Double the size of FAIL_STACK, up to a limit
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1378 which allows approximately `re_max_failures' items.
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1379
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1380 Return 1 if succeeds, and 0 if either ran out of memory
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1381 allocating space for it or it was already too large.
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1382
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1383 REGEX_REALLOCATE_STACK requires `destination' be declared. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1384
1156
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1385 /* Factor to increase the failure stack size by
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1386 when we increase it.
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1387 This used to be 2, but 2 was too wasteful
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1388 because the old discarded stacks added up to as much space
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1389 were as ultimate, maximum-size stack. */
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1390 #define FAIL_STACK_GROWTH_FACTOR 4
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1391
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1392 #define GROW_FAIL_STACK(fail_stack) \
1158
282562802f46 (GROW_FAIL_STACK): Fix test for stack size at max.
Karl Heuer <kwzh@gnu.org>
parents: 1157
diff changeset
1393 (((fail_stack).size * sizeof (fail_stack_elt_t) \
282562802f46 (GROW_FAIL_STACK): Fix test for stack size at max.
Karl Heuer <kwzh@gnu.org>
parents: 1157
diff changeset
1394 >= re_max_failures * TYPICAL_FAILURE_SIZE) \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1395 ? 0 \
1156
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1396 : ((fail_stack).stack \
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1397 = (fail_stack_elt_t *) \
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1398 REGEX_REALLOCATE_STACK ((fail_stack).stack, \
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1399 (fail_stack).size * sizeof (fail_stack_elt_t), \
1156
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1400 MIN (re_max_failures * TYPICAL_FAILURE_SIZE, \
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1401 ((fail_stack).size * sizeof (fail_stack_elt_t) \
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1402 * FAIL_STACK_GROWTH_FACTOR))), \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1403 \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1404 (fail_stack).stack == NULL \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1405 ? 0 \
1157
5aa89bba935d (GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents: 1156
diff changeset
1406 : ((fail_stack).size \
5aa89bba935d (GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents: 1156
diff changeset
1407 = (MIN (re_max_failures * TYPICAL_FAILURE_SIZE, \
5aa89bba935d (GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents: 1156
diff changeset
1408 ((fail_stack).size * sizeof (fail_stack_elt_t) \
5aa89bba935d (GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents: 1156
diff changeset
1409 * FAIL_STACK_GROWTH_FACTOR)) \
5aa89bba935d (GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents: 1156
diff changeset
1410 / sizeof (fail_stack_elt_t)), \
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1411 1)))
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1412
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1413
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1414 /* Push a pointer value onto the failure stack.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1415 Assumes the variable `fail_stack'. Probably should only
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1416 be called from within `PUSH_FAILURE_POINT'. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1417 #define PUSH_FAILURE_POINTER(item) \
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1418 fail_stack.stack[fail_stack.avail++].pointer = (item)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1419
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1420 /* This pushes an integer-valued item onto the failure stack.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1421 Assumes the variable `fail_stack'. Probably should only
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1422 be called from within `PUSH_FAILURE_POINT'. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1423 #define PUSH_FAILURE_INT(item) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1424 fail_stack.stack[fail_stack.avail++].integer = (item)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1425
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1426 /* Push a fail_stack_elt_t value onto the failure stack.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1427 Assumes the variable `fail_stack'. Probably should only
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1428 be called from within `PUSH_FAILURE_POINT'. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1429 #define PUSH_FAILURE_ELT(item) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1430 fail_stack.stack[fail_stack.avail++] = (item)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1431
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1432 /* These three POP... operations complement the three PUSH... operations.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1433 All assume that `fail_stack' is nonempty. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1434 #define POP_FAILURE_POINTER() fail_stack.stack[--fail_stack.avail].pointer
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1435 #define POP_FAILURE_INT() fail_stack.stack[--fail_stack.avail].integer
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1436 #define POP_FAILURE_ELT() fail_stack.stack[--fail_stack.avail]
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1437
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1438 /* Individual items aside from the registers. */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1439 #define NUM_NONREG_ITEMS 3
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1440
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1441 /* Used to examine the stack (to detect infinite loops). */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1442 #define FAILURE_PAT(h) fail_stack.stack[(h) - 1].pointer
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
1443 #define FAILURE_STR(h) (fail_stack.stack[(h) - 2].pointer)
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1444 #define NEXT_FAILURE_HANDLE(h) fail_stack.stack[(h) - 3].integer
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1445 #define TOP_FAILURE_HANDLE() fail_stack.frame
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1446
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1447
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1448 #define ENSURE_FAIL_STACK(space) \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1449 while (REMAINING_AVAIL_SLOTS <= space) { \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1450 if (!GROW_FAIL_STACK (fail_stack)) \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1451 return -2; \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1452 DEBUG_PRINT2 ("\n Doubled stack; size now: %d\n", (fail_stack).size);\
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1453 DEBUG_PRINT2 (" slots available: %d\n", REMAINING_AVAIL_SLOTS);\
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1454 }
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1455
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1456 /* Push register NUM onto the stack. */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1457 #define PUSH_FAILURE_REG(num) \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1458 do { \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1459 char *destination; \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1460 ENSURE_FAIL_STACK(3); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1461 DEBUG_PRINT4 (" Push reg %d (spanning %p -> %p)\n", \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1462 num, regstart[num], regend[num]); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1463 PUSH_FAILURE_POINTER (regstart[num]); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1464 PUSH_FAILURE_POINTER (regend[num]); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1465 PUSH_FAILURE_INT (num); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1466 } while (0)
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1467
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1468 /* Change the counter's value to VAL, but make sure that it will
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1469 be reset when backtracking. */
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1470 #define PUSH_NUMBER(ptr,val) \
2828
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1471 do { \
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1472 char *destination; \
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1473 int c; \
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1474 ENSURE_FAIL_STACK(3); \
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1475 EXTRACT_NUMBER (c, ptr); \
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1476 DEBUG_PRINT4 (" Push number %p = %d -> %d\n", ptr, c, val); \
2828
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1477 PUSH_FAILURE_INT (c); \
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1478 PUSH_FAILURE_POINTER (ptr); \
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1479 PUSH_FAILURE_INT (-1); \
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1480 STORE_NUMBER (ptr, val); \
2828
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1481 } while (0)
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1482
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1483 /* Pop a saved register off the stack. */
2828
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1484 #define POP_FAILURE_REG_OR_COUNT() \
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1485 do { \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1486 int reg = POP_FAILURE_INT (); \
2828
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1487 if (reg == -1) \
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1488 { \
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1489 /* It's a counter. */ \
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1490 /* Here, we discard `const', which makes re_match non-reentrant. \
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1491 Gcc gives a warning for it, which is good. */ \
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1492 unsigned char *ptr = POP_FAILURE_POINTER (); \
2828
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1493 reg = POP_FAILURE_INT (); \
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1494 STORE_NUMBER (ptr, reg); \
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1495 DEBUG_PRINT3 (" Pop counter %p = %d\n", ptr, reg); \
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1496 } \
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1497 else \
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1498 { \
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1499 regend[reg] = POP_FAILURE_POINTER (); \
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1500 regstart[reg] = POP_FAILURE_POINTER (); \
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1501 DEBUG_PRINT4 (" Pop reg %d (spanning %p -> %p)\n", \
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1502 reg, regstart[reg], regend[reg]); \
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1503 } \
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1504 } while (0)
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1505
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1506 /* Check that we are not stuck in an infinite loop. */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1507 #define CHECK_INFINITE_LOOP(pat_cur, string_place) \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1508 do { \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1509 int failure = TOP_FAILURE_HANDLE(); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1510 /* Check for infinite matching loops */ \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1511 while (failure > 0 && \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1512 (FAILURE_STR (failure) == string_place \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1513 || FAILURE_STR (failure) == NULL)) \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1514 { \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1515 assert (FAILURE_PAT (failure) >= bufp->buffer \
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
1516 && FAILURE_PAT (failure) <= bufp->buffer + bufp->used); \
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1517 if (FAILURE_PAT (failure) == pat_cur) \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1518 goto fail; \
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
1519 DEBUG_PRINT2 (" Other pattern: %p\n", FAILURE_PAT (failure)); \
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1520 failure = NEXT_FAILURE_HANDLE(failure); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1521 } \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1522 DEBUG_PRINT2 (" Other string: %p\n", FAILURE_STR (failure)); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1523 } while (0)
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1524
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1525 /* Push the information about the state we will need
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1526 if we ever fail back to it.
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1527
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1528 Requires variables fail_stack, regstart, regend and
1156
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1529 num_regs be declared. GROW_FAIL_STACK requires `destination' be
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1530 declared.
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1531
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1532 Does `return FAILURE_CODE' if runs out of memory. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1533
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1534 #define PUSH_FAILURE_POINT(pattern, string_place) \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1535 do { \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1536 char *destination; \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1537 /* Must be int, so when we don't save any registers, the arithmetic \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1538 of 0 + -1 isn't done as unsigned. */ \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1539 \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1540 DEBUG_STATEMENT (nfailure_points_pushed++); \
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1541 DEBUG_PRINT1 ("\nPUSH_FAILURE_POINT:\n"); \
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1542 DEBUG_PRINT2 (" Before push, next avail: %d\n", (fail_stack).avail); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1543 DEBUG_PRINT2 (" size: %d\n", (fail_stack).size);\
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1544 \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1545 ENSURE_FAIL_STACK (NUM_NONREG_ITEMS); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1546 \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1547 DEBUG_PRINT1 ("\n"); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1548 \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1549 DEBUG_PRINT2 (" Push frame index: %d\n", fail_stack.frame); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1550 PUSH_FAILURE_INT (fail_stack.frame); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1551 \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1552 DEBUG_PRINT2 (" Push string %p: `", string_place); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1553 DEBUG_PRINT_DOUBLE_STRING (string_place, string1, size1, string2, size2);\
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1554 DEBUG_PRINT1 ("'\n"); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1555 PUSH_FAILURE_POINTER (string_place); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1556 \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1557 DEBUG_PRINT2 (" Push pattern %p: ", pattern); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1558 DEBUG_PRINT_COMPILED_PATTERN (bufp, pattern, pend); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1559 PUSH_FAILURE_POINTER (pattern); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1560 \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1561 /* Close the frame by moving the frame pointer past it. */ \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1562 fail_stack.frame = fail_stack.avail; \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1563 } while (0)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1564
1156
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1565 /* Estimate the size of data pushed by a typical failure stack entry.
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1566 An estimate is all we need, because all we use this for
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1567 is to choose a limit for how big to make the failure stack. */
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1568
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1569 #define TYPICAL_FAILURE_SIZE 20
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
1570
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1571 /* How many items can still be added to the stack without overflowing it. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1572 #define REMAINING_AVAIL_SLOTS ((fail_stack).size - (fail_stack).avail)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1573
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1574
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1575 /* Pops what PUSH_FAIL_STACK pushes.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1576
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1577 We restore into the parameters, all of which should be lvalues:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1578 STR -- the saved data position.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1579 PAT -- the saved pattern position.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1580 REGSTART, REGEND -- arrays of string positions.
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1581
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1582 Also assumes the variables `fail_stack' and (if debugging), `bufp',
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1583 `pend', `string1', `size1', `string2', and `size2'. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1584
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1585 #define POP_FAILURE_POINT(str, pat) \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1586 do { \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1587 assert (!FAIL_STACK_EMPTY ()); \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1588 \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1589 /* Remove failure points and point to how many regs pushed. */ \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1590 DEBUG_PRINT1 ("POP_FAILURE_POINT:\n"); \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1591 DEBUG_PRINT2 (" Before pop, next avail: %d\n", fail_stack.avail); \
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1592 DEBUG_PRINT2 (" size: %d\n", fail_stack.size); \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1593 \
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1594 /* Pop the saved registers. */ \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1595 while (fail_stack.frame < fail_stack.avail) \
2828
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
1596 POP_FAILURE_REG_OR_COUNT (); \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1597 \
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1598 pat = POP_FAILURE_POINTER (); \
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1599 DEBUG_PRINT2 (" Popping pattern %p: ", pat); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1600 DEBUG_PRINT_COMPILED_PATTERN (bufp, pat, pend); \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1601 \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1602 /* If the saved string location is NULL, it came from an \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1603 on_failure_keep_string_jump opcode, and we want to throw away the \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1604 saved NULL, thus retaining our current position in the string. */ \
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1605 str = POP_FAILURE_POINTER (); \
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1606 DEBUG_PRINT2 (" Popping string %p: `", str); \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1607 DEBUG_PRINT_DOUBLE_STRING (str, string1, size1, string2, size2); \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1608 DEBUG_PRINT1 ("'\n"); \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1609 \
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1610 fail_stack.frame = POP_FAILURE_INT (); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1611 DEBUG_PRINT2 (" Popping frame index: %d\n", fail_stack.frame); \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1612 \
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1613 assert (fail_stack.avail >= 0); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1614 assert (fail_stack.frame <= fail_stack.avail); \
480
998dc67883fb (PUSH_FAILURE_POINT, POP_FAILURE_POINT): Don't push or pop
Richard Stallman <rms@gnu.org>
parents: 463
diff changeset
1615 \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1616 DEBUG_STATEMENT (nfailure_points_popped++); \
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
1617 } while (0) /* POP_FAILURE_POINT */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1618
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1619
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1620
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1621 /* Registers are set to a sentinel when they haven't yet matched. */
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1622 #define REG_UNSET(e) ((e) == NULL)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1623
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1624 /* Subroutine declarations and macros for regex_compile. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1625
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1626 static reg_errcode_t regex_compile _RE_ARGS ((re_char *pattern, size_t size,
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1627 reg_syntax_t syntax,
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1628 struct re_pattern_buffer *bufp));
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1629 static void store_op1 _RE_ARGS ((re_opcode_t op, unsigned char *loc, int arg));
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1630 static void store_op2 _RE_ARGS ((re_opcode_t op, unsigned char *loc,
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1631 int arg1, int arg2));
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1632 static void insert_op1 _RE_ARGS ((re_opcode_t op, unsigned char *loc,
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1633 int arg, unsigned char *end));
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1634 static void insert_op2 _RE_ARGS ((re_opcode_t op, unsigned char *loc,
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1635 int arg1, int arg2, unsigned char *end));
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1636 static boolean at_begline_loc_p _RE_ARGS ((re_char *pattern,
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1637 re_char *p,
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1638 reg_syntax_t syntax));
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1639 static boolean at_endline_loc_p _RE_ARGS ((re_char *p,
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1640 re_char *pend,
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1641 reg_syntax_t syntax));
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1642 static re_char *skip_one_char _RE_ARGS ((re_char *p));
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1643 static int analyse_first _RE_ARGS ((re_char *p, re_char *pend,
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1644 char *fastmap, const int multibyte));
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1645
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1646 /* Fetch the next character in the uncompiled pattern---translating it
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1647 if necessary. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1648 #define PATFETCH(c) \
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
1649 do { \
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
1650 PATFETCH_RAW (c); \
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
1651 c = TRANSLATE (c); \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1652 } while (0)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1653
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1654 /* Fetch the next character in the uncompiled pattern, with no
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1655 translation. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1656 #define PATFETCH_RAW(c) \
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
1657 do { \
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
1658 int len; \
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
1659 if (p == pend) return REG_EEND; \
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
1660 c = RE_STRING_CHAR_AND_LENGTH (p, pend - p, len); \
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
1661 p += len; \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1662 } while (0)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1663
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1664
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1665 /* If `translate' is non-null, return translate[D], else just D. We
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1666 cast the subscript to translate because some data is declared as
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1667 `char *', to avoid warnings when a string constant is passed. But
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1668 when we use a character as a subscript we must make it unsigned. */
501
f29b13c2cefd (TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard Stallman <rms@gnu.org>
parents: 490
diff changeset
1669 #ifndef TRANSLATE
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
1670 # define TRANSLATE(d) \
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
1671 (RE_TRANSLATE_P (translate) ? RE_TRANSLATE (translate, (d)) : (d))
501
f29b13c2cefd (TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard Stallman <rms@gnu.org>
parents: 490
diff changeset
1672 #endif
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1673
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1674
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1675 /* Macros for outputting the compiled pattern into `buffer'. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1676
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1677 /* If the buffer isn't allocated when it comes in, use this. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1678 #define INIT_BUF_SIZE 32
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1679
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1680 /* Make sure we have at least N more bytes of space in buffer. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1681 #define GET_BUFFER_SPACE(n) \
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1682 while ((size_t) (b - bufp->buffer + (n)) > bufp->allocated) \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1683 EXTEND_BUFFER ()
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1684
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1685 /* Make sure we have one more byte of buffer space and then add C to it. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1686 #define BUF_PUSH(c) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1687 do { \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1688 GET_BUFFER_SPACE (1); \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1689 *b++ = (unsigned char) (c); \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1690 } while (0)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1691
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1692
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1693 /* Ensure we have two more bytes of buffer space and then append C1 and C2. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1694 #define BUF_PUSH_2(c1, c2) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1695 do { \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1696 GET_BUFFER_SPACE (2); \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1697 *b++ = (unsigned char) (c1); \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1698 *b++ = (unsigned char) (c2); \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1699 } while (0)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1700
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1701
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1702 /* As with BUF_PUSH_2, except for three bytes. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1703 #define BUF_PUSH_3(c1, c2, c3) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1704 do { \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1705 GET_BUFFER_SPACE (3); \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1706 *b++ = (unsigned char) (c1); \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1707 *b++ = (unsigned char) (c2); \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1708 *b++ = (unsigned char) (c3); \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1709 } while (0)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1710
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1711
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1712 /* Store a jump with opcode OP at LOC to location TO. We store a
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1713 relative address offset by the three bytes the jump itself occupies. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1714 #define STORE_JUMP(op, loc, to) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1715 store_op1 (op, loc, (to) - (loc) - 3)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1716
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1717 /* Likewise, for a two-argument jump. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1718 #define STORE_JUMP2(op, loc, to, arg) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1719 store_op2 (op, loc, (to) - (loc) - 3, arg)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1720
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1721 /* Like `STORE_JUMP', but for inserting. Assume `b' is the buffer end. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1722 #define INSERT_JUMP(op, loc, to) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1723 insert_op1 (op, loc, (to) - (loc) - 3, b)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1724
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1725 /* Like `STORE_JUMP2', but for inserting. Assume `b' is the buffer end. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1726 #define INSERT_JUMP2(op, loc, to, arg) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1727 insert_op2 (op, loc, (to) - (loc) - 3, arg, b)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1728
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1729
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1730 /* This is not an arbitrary limit: the arguments which represent offsets
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1731 into the pattern are two bytes long. So if 2^16 bytes turns out to
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1732 be too small, many things would have to change. */
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1733 /* Any other compiler which, like MSC, has allocation limit below 2^16
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1734 bytes will have to use approach similar to what was done below for
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1735 MSC and drop MAX_BUF_SIZE a bit. Otherwise you may end up
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1736 reallocating to 0 bytes. Such thing is not going to work too well.
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1737 You have been warned!! */
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1738 #if defined _MSC_VER && !defined WIN32
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1739 /* Microsoft C 16-bit versions limit malloc to approx 65512 bytes. */
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1740 # define MAX_BUF_SIZE 65500L
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1741 #else
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1742 # define MAX_BUF_SIZE (1L << 16)
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1743 #endif
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1744
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1745 /* Extend the buffer by twice its current size via realloc and
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1746 reset the pointers that pointed into the old block to point to the
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1747 correct places in the new one. If extending the buffer results in it
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1748 being larger than MAX_BUF_SIZE, then flag memory exhausted. */
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1749 #if __BOUNDED_POINTERS__
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1750 # define SET_HIGH_BOUND(P) (__ptrhigh (P) = __ptrlow (P) + bufp->allocated)
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1751 # define MOVE_BUFFER_POINTER(P) \
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1752 (__ptrlow (P) += incr, SET_HIGH_BOUND (P), __ptrvalue (P) += incr)
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1753 # define ELSE_EXTEND_BUFFER_HIGH_BOUND \
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1754 else \
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1755 { \
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1756 SET_HIGH_BOUND (b); \
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1757 SET_HIGH_BOUND (begalt); \
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1758 if (fixup_alt_jump) \
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1759 SET_HIGH_BOUND (fixup_alt_jump); \
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1760 if (laststart) \
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1761 SET_HIGH_BOUND (laststart); \
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1762 if (pending_exact) \
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1763 SET_HIGH_BOUND (pending_exact); \
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1764 }
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1765 #else
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1766 # define MOVE_BUFFER_POINTER(P) (P) += incr
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1767 # define ELSE_EXTEND_BUFFER_HIGH_BOUND
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1768 #endif
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1769 #define EXTEND_BUFFER() \
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1770 do { \
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1771 re_char *old_buffer = bufp->buffer; \
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1772 if (bufp->allocated == MAX_BUF_SIZE) \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1773 return REG_ESIZE; \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1774 bufp->allocated <<= 1; \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1775 if (bufp->allocated > MAX_BUF_SIZE) \
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1776 bufp->allocated = MAX_BUF_SIZE; \
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1777 RETALLOC (bufp->buffer, bufp->allocated, unsigned char); \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1778 if (bufp->buffer == NULL) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1779 return REG_ESPACE; \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1780 /* If the buffer moved, move all the pointers into it. */ \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1781 if (old_buffer != bufp->buffer) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1782 { \
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1783 int incr = bufp->buffer - old_buffer; \
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1784 MOVE_BUFFER_POINTER (b); \
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1785 MOVE_BUFFER_POINTER (begalt); \
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1786 if (fixup_alt_jump) \
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1787 MOVE_BUFFER_POINTER (fixup_alt_jump); \
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1788 if (laststart) \
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1789 MOVE_BUFFER_POINTER (laststart); \
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1790 if (pending_exact) \
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1791 MOVE_BUFFER_POINTER (pending_exact); \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1792 } \
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1793 ELSE_EXTEND_BUFFER_HIGH_BOUND \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1794 } while (0)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1795
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1796
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1797 /* Since we have one byte reserved for the register number argument to
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1798 {start,stop}_memory, the maximum number of groups we can report
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1799 things about is what fits in that byte. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1800 #define MAX_REGNUM 255
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1801
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1802 /* But patterns can have more than `MAX_REGNUM' registers. We just
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1803 ignore the excess. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1804 typedef unsigned regnum_t;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1805
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1806
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1807 /* Macros for the compile stack. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1808
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1809 /* Since offsets can go either forwards or backwards, this type needs to
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1810 be able to hold values from -(MAX_BUF_SIZE - 1) to MAX_BUF_SIZE - 1. */
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1811 /* int may be not enough when sizeof(int) == 2. */
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1812 typedef long pattern_offset_t;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1813
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1814 typedef struct
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1815 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1816 pattern_offset_t begalt_offset;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1817 pattern_offset_t fixup_alt_jump;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
1818 pattern_offset_t laststart_offset;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1819 regnum_t regnum;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1820 } compile_stack_elt_t;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1821
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1822
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1823 typedef struct
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1824 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1825 compile_stack_elt_t *stack;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1826 unsigned size;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1827 unsigned avail; /* Offset of next open position. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1828 } compile_stack_type;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1829
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1830
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1831 #define INIT_COMPILE_STACK_SIZE 32
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1832
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1833 #define COMPILE_STACK_EMPTY (compile_stack.avail == 0)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1834 #define COMPILE_STACK_FULL (compile_stack.avail == compile_stack.size)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1835
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1836 /* The next available element. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1837 #define COMPILE_STACK_TOP (compile_stack.stack[compile_stack.avail])
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1838
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1839
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1840 /* Structure to manage work area for range table. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1841 struct range_table_work_area
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1842 {
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1843 int *table; /* actual work area. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1844 int allocated; /* allocated size for work area in bytes. */
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1845 int used; /* actually used size in words. */
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
1846 int bits; /* flag to record character classes */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1847 };
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1848
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1849 /* Make sure that WORK_AREA can hold more N multibyte characters. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1850 #define EXTEND_RANGE_TABLE_WORK_AREA(work_area, n) \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1851 do { \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1852 if (((work_area).used + (n)) * sizeof (int) > (work_area).allocated) \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1853 { \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1854 (work_area).allocated += 16 * sizeof (int); \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1855 if ((work_area).table) \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1856 (work_area).table \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1857 = (int *) realloc ((work_area).table, (work_area).allocated); \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1858 else \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1859 (work_area).table \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1860 = (int *) malloc ((work_area).allocated); \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1861 if ((work_area).table == 0) \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1862 FREE_STACK_RETURN (REG_ESPACE); \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1863 } \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1864 } while (0)
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1865
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
1866 #define SET_RANGE_TABLE_WORK_AREA_BIT(work_area, bit) \
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
1867 (work_area).bits |= (bit)
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
1868
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1869 /* Bits used to implement the multibyte-part of the various character classes
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1870 such as [:alnum:] in a charset's range table. */
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1871 #define BIT_WORD 0x1
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1872 #define BIT_LOWER 0x2
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1873 #define BIT_PUNCT 0x4
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1874 #define BIT_SPACE 0x8
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1875 #define BIT_UPPER 0x10
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1876 #define BIT_MULTIBYTE 0x20
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
1877
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1878 /* Set a range (RANGE_START, RANGE_END) to WORK_AREA. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1879 #define SET_RANGE_TABLE_WORK_AREA(work_area, range_start, range_end) \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1880 do { \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1881 EXTEND_RANGE_TABLE_WORK_AREA ((work_area), 2); \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1882 (work_area).table[(work_area).used++] = (range_start); \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1883 (work_area).table[(work_area).used++] = (range_end); \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1884 } while (0)
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1885
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1886 /* Free allocated memory for WORK_AREA. */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1887 #define FREE_RANGE_TABLE_WORK_AREA(work_area) \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1888 do { \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1889 if ((work_area).table) \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1890 free ((work_area).table); \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1891 } while (0)
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1892
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
1893 #define CLEAR_RANGE_TABLE_WORK_USED(work_area) ((work_area).used = 0, (work_area).bits = 0)
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1894 #define RANGE_TABLE_WORK_USED(work_area) ((work_area).used)
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
1895 #define RANGE_TABLE_WORK_BITS(work_area) ((work_area).bits)
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1896 #define RANGE_TABLE_WORK_ELT(work_area, i) ((work_area).table[i])
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1897
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
1898
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1899 /* Set the bit for character C in a list. */
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1900 #define SET_LIST_BIT(c) (b[((c)) / BYTEWIDTH] |= 1 << ((c) % BYTEWIDTH))
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1901
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1902
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1903 /* Get the next unsigned number in the uncompiled pattern. */
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1904 #define GET_UNSIGNED_NUMBER(num) \
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
1905 do { if (p != pend) \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1906 { \
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1907 PATFETCH (c); \
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
1908 while ('0' <= c && c <= '9') \
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1909 { \
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1910 if (num < 0) \
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1911 num = 0; \
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1912 num = num * 10 + c - '0'; \
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1913 if (p == pend) \
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1914 break; \
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1915 PATFETCH (c); \
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1916 } \
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
1917 } \
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
1918 } while (0)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
1919
2881
d3634ee92a43 (WIDE_CHAR_SUPPORT): Define if _LIBC as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2872
diff changeset
1920 #if WIDE_CHAR_SUPPORT
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1921 /* The GNU C library provides support for user-defined character classes
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1922 and the functions from ISO C amendement 1. */
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1923 # ifdef CHARCLASS_NAME_MAX
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1924 # define CHAR_CLASS_MAX_LENGTH CHARCLASS_NAME_MAX
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1925 # else
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1926 /* This shouldn't happen but some implementation might still have this
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1927 problem. Use a reasonable default value. */
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1928 # define CHAR_CLASS_MAX_LENGTH 256
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1929 # endif
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1930 typedef wctype_t re_wctype_t;
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1931 typedef wchar_t re_wchar_t;
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1932 # define re_wctype wctype
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1933 # define re_iswctype iswctype
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1934 # define re_wctype_to_bit(cc) 0
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1935 #else
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1936 # define CHAR_CLASS_MAX_LENGTH 9 /* Namely, `multibyte'. */
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1937 # define btowc(c) c
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1938
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1939 /* Character classes. */
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1940 typedef enum { RECC_ERROR = 0,
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1941 RECC_ALNUM, RECC_ALPHA, RECC_WORD,
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1942 RECC_GRAPH, RECC_PRINT,
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1943 RECC_LOWER, RECC_UPPER,
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1944 RECC_PUNCT, RECC_CNTRL,
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1945 RECC_DIGIT, RECC_XDIGIT,
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1946 RECC_BLANK, RECC_SPACE,
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1947 RECC_MULTIBYTE, RECC_NONASCII,
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1948 RECC_ASCII, RECC_UNIBYTE
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1949 } re_wctype_t;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1950
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1951 typedef int re_wchar_t;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1952
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1953 /* Map a string to the char class it names (if any). */
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1954 static re_wctype_t
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1955 re_wctype (string)
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1956 re_char *string;
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1957 {
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1958 if (STREQ (string, "alnum")) return RECC_ALNUM;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1959 else if (STREQ (string, "alpha")) return RECC_ALPHA;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1960 else if (STREQ (string, "word")) return RECC_WORD;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1961 else if (STREQ (string, "ascii")) return RECC_ASCII;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1962 else if (STREQ (string, "nonascii")) return RECC_NONASCII;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1963 else if (STREQ (string, "graph")) return RECC_GRAPH;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1964 else if (STREQ (string, "lower")) return RECC_LOWER;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1965 else if (STREQ (string, "print")) return RECC_PRINT;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1966 else if (STREQ (string, "punct")) return RECC_PUNCT;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1967 else if (STREQ (string, "space")) return RECC_SPACE;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1968 else if (STREQ (string, "upper")) return RECC_UPPER;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1969 else if (STREQ (string, "unibyte")) return RECC_UNIBYTE;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1970 else if (STREQ (string, "multibyte")) return RECC_MULTIBYTE;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1971 else if (STREQ (string, "digit")) return RECC_DIGIT;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1972 else if (STREQ (string, "xdigit")) return RECC_XDIGIT;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1973 else if (STREQ (string, "cntrl")) return RECC_CNTRL;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1974 else if (STREQ (string, "blank")) return RECC_BLANK;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1975 else return 0;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1976 }
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1977
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1978 /* True iff CH is in the char class CC. */
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1979 static boolean
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1980 re_iswctype (ch, cc)
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1981 int ch;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1982 re_wctype_t cc;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1983 {
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1984 boolean ret = false;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1985
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1986 switch (cc)
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
1987 {
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1988 case RECC_ALNUM: ret = ISALNUM (ch);
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1989 case RECC_ALPHA: ret = ISALPHA (ch);
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1990 case RECC_BLANK: ret = ISBLANK (ch);
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1991 case RECC_CNTRL: ret = ISCNTRL (ch);
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1992 case RECC_DIGIT: ret = ISDIGIT (ch);
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1993 case RECC_GRAPH: ret = ISGRAPH (ch);
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1994 case RECC_LOWER: ret = ISLOWER (ch);
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1995 case RECC_PRINT: ret = ISPRINT (ch);
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1996 case RECC_PUNCT: ret = ISPUNCT (ch);
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1997 case RECC_SPACE: ret = ISSPACE (ch);
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1998 case RECC_UPPER: ret = ISUPPER (ch);
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
1999 case RECC_XDIGIT: ret = ISXDIGIT (ch);
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2000 case RECC_ASCII: ret = IS_REAL_ASCII (ch);
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2001 case RECC_NONASCII: ret = !IS_REAL_ASCII (ch);
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2002 case RECC_UNIBYTE: ret = ISUNIBYTE (ch);
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2003 case RECC_MULTIBYTE: ret = !ISUNIBYTE (ch);
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2004 case RECC_WORD: ret = ISWORD (ch);
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2005 case RECC_ERROR: ret = false;
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2006 }
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2007 return ret;
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2008 }
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2009
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2010 /* Return a bit-pattern to use in the range-table bits to match multibyte
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2011 chars of class CC. */
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2012 static int
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2013 re_wctype_to_bit (cc)
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2014 re_wctype_t cc;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2015 {
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2016 int ret = 0;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2017
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2018 switch (cc)
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2019 {
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2020 case RECC_NONASCII: case RECC_PRINT: case RECC_GRAPH:
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2021 case RECC_MULTIBYTE: ret = BIT_MULTIBYTE;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2022 case RECC_ALPHA: case RECC_ALNUM: case RECC_WORD: ret = BIT_WORD;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2023 case RECC_LOWER: ret = BIT_LOWER;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2024 case RECC_UPPER: ret = BIT_UPPER;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2025 case RECC_PUNCT: ret = BIT_PUNCT;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2026 case RECC_SPACE: ret = BIT_SPACE;
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2027 case RECC_ASCII: case RECC_DIGIT: case RECC_XDIGIT: case RECC_CNTRL:
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2028 case RECC_BLANK: case RECC_UNIBYTE: case RECC_ERROR: ret = 0;
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2029 }
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2030 return ret;
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2031 }
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2032 #endif
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2033
2913
9e8ab826e86c (IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents: 2912
diff changeset
2034 /* Explicit quit checking is only used on NTemacs. */
9e8ab826e86c (IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents: 2912
diff changeset
2035 #if defined WINDOWSNT && defined emacs && defined QUIT
9e8ab826e86c (IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents: 2912
diff changeset
2036 extern int immediate_quit;
9e8ab826e86c (IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents: 2912
diff changeset
2037 # define IMMEDIATE_QUIT_CHECK \
9e8ab826e86c (IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents: 2912
diff changeset
2038 do { \
9e8ab826e86c (IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents: 2912
diff changeset
2039 if (immediate_quit) QUIT; \
9e8ab826e86c (IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents: 2912
diff changeset
2040 } while (0)
9e8ab826e86c (IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents: 2912
diff changeset
2041 #else
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2042 # define IMMEDIATE_QUIT_CHECK ((void)0)
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2043 #endif
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2044
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2045 #ifndef MATCH_MAY_ALLOCATE
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2046
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2047 /* If we cannot allocate large objects within re_match_2_internal,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2048 we make the fail stack and register vectors global.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2049 The fail stack, we grow to the maximum size when a regexp
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2050 is compiled.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2051 The register vectors, we adjust in size each time we
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2052 compile a regexp, according to the number of registers it needs. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2053
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2054 static fail_stack_type fail_stack;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2055
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2056 /* Size with which the following vectors are currently allocated.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2057 That is so we can make them bigger as needed,
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
2058 but never make them smaller. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2059 static int regs_allocated_size;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2060
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
2061 static re_char ** regstart, ** regend;
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
2062 static re_char **best_regstart, **best_regend;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2063
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2064 /* Make the register vectors big enough for NUM_REGS registers,
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
2065 but don't make them smaller. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2066
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2067 static
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2068 regex_grow_registers (num_regs)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2069 int num_regs;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2070 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2071 if (num_regs > regs_allocated_size)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2072 {
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
2073 RETALLOC_IF (regstart, num_regs, re_char *);
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
2074 RETALLOC_IF (regend, num_regs, re_char *);
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
2075 RETALLOC_IF (best_regstart, num_regs, re_char *);
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
2076 RETALLOC_IF (best_regend, num_regs, re_char *);
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2077
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2078 regs_allocated_size = num_regs;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2079 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2080 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2081
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2082 #endif /* not MATCH_MAY_ALLOCATE */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2083
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2084 static boolean group_in_compile_stack _RE_ARGS ((compile_stack_type
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2085 compile_stack,
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2086 regnum_t regnum));
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2087
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2088 /* `regex_compile' compiles PATTERN (of length SIZE) according to SYNTAX.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2089 Returns one of error codes defined in `regex.h', or zero for success.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2090
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2091 Assumes the `allocated' (and perhaps `buffer') and `translate'
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2092 fields are set in BUFP on entry.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2093
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2094 If it succeeds, results are put in BUFP (if it returns an error, the
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2095 contents of BUFP are undefined):
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2096 `buffer' is the compiled pattern;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2097 `syntax' is set to SYNTAX;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2098 `used' is set to the length of the compiled pattern;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2099 `fastmap_accurate' is zero;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2100 `re_nsub' is the number of subexpressions in PATTERN;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2101 `not_bol' and `not_eol' are zero;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
2102
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
2103 The `fastmap' field is neither examined nor set. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2104
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2105 /* Insert the `jump' from the end of last alternative to "here".
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2106 The space for the jump has already been allocated. */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2107 #define FIXUP_ALT_JUMP() \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2108 do { \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2109 if (fixup_alt_jump) \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2110 STORE_JUMP (jump, fixup_alt_jump, b); \
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2111 } while (0)
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2112
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2113
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2114 /* Return, freeing storage we allocated. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2115 #define FREE_STACK_RETURN(value) \
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2116 do { \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2117 FREE_RANGE_TABLE_WORK_AREA (range_table_work); \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2118 free (compile_stack.stack); \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2119 return value; \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2120 } while (0)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2121
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2122 static reg_errcode_t
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2123 regex_compile (pattern, size, syntax, bufp)
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
2124 re_char *pattern;
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
2125 size_t size;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2126 reg_syntax_t syntax;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2127 struct re_pattern_buffer *bufp;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2128 {
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2129 /* We fetch characters from PATTERN here. */
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2130 register re_wchar_t c, c1;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
2131
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2132 /* A random temporary spot in PATTERN. */
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
2133 re_char *p1;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2134
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2135 /* Points to the end of the buffer, where we should append. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2136 register unsigned char *b;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
2137
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2138 /* Keeps track of unclosed groups. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2139 compile_stack_type compile_stack;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2140
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2141 /* Points to the current (ending) position in the pattern. */
1440
ba6fdbf593bb (regex_compile): Declare p with non-const type on AIX.
Richard Stallman <rms@gnu.org>
parents: 1383
diff changeset
2142 #ifdef AIX
ba6fdbf593bb (regex_compile): Declare p with non-const type on AIX.
Richard Stallman <rms@gnu.org>
parents: 1383
diff changeset
2143 /* `const' makes AIX compiler fail. */
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
2144 unsigned char *p = pattern;
1440
ba6fdbf593bb (regex_compile): Declare p with non-const type on AIX.
Richard Stallman <rms@gnu.org>
parents: 1383
diff changeset
2145 #else
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
2146 re_char *p = pattern;
1440
ba6fdbf593bb (regex_compile): Declare p with non-const type on AIX.
Richard Stallman <rms@gnu.org>
parents: 1383
diff changeset
2147 #endif
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
2148 re_char *pend = pattern + size;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
2149
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2150 /* How to translate the characters in the pattern. */
501
f29b13c2cefd (TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard Stallman <rms@gnu.org>
parents: 490
diff changeset
2151 RE_TRANSLATE_TYPE translate = bufp->translate;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2152
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2153 /* Address of the count-byte of the most recently inserted `exactn'
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2154 command. This makes it possible to tell if a new exact-match
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2155 character can be added to that command or if the character requires
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2156 a new `exactn' command. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2157 unsigned char *pending_exact = 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2158
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2159 /* Address of start of the most recently finished expression.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2160 This tells, e.g., postfix * where to find the start of its
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2161 operand. Reset at the beginning of groups and alternatives. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2162 unsigned char *laststart = 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2163
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2164 /* Address of beginning of regexp, or inside of last group. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2165 unsigned char *begalt;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2166
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2167 /* Place in the uncompiled pattern (i.e., the {) to
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2168 which to go back if the interval is invalid. */
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
2169 re_char *beg_interval;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
2170
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2171 /* Address of the place where a forward jump should go to the end of
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2172 the containing expression. Each alternative of an `or' -- except the
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2173 last -- ends with a forward jump of this sort. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2174 unsigned char *fixup_alt_jump = 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2175
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2176 /* Counts open-groups as they are encountered. Remembered for the
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2177 matching close-group on the compile stack, so the same register
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2178 number is put in the stop_memory as the start_memory. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2179 regnum_t regnum = 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2180
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2181 /* Work area for range table of charset. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2182 struct range_table_work_area range_table_work;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2183
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
2184 /* If the object matched can contain multibyte characters. */
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
2185 const boolean multibyte = RE_MULTIBYTE_P (bufp);
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
2186
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2187 #ifdef DEBUG
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2188 debug++;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2189 DEBUG_PRINT1 ("\nCompiling pattern: ");
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2190 if (debug > 0)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2191 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2192 unsigned debug_count;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
2193
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2194 for (debug_count = 0; debug_count < size; debug_count++)
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2195 putchar (pattern[debug_count]);
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2196 putchar ('\n');
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2197 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2198 #endif /* DEBUG */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2199
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2200 /* Initialize the compile stack. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2201 compile_stack.stack = TALLOC (INIT_COMPILE_STACK_SIZE, compile_stack_elt_t);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2202 if (compile_stack.stack == NULL)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2203 return REG_ESPACE;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2204
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2205 compile_stack.size = INIT_COMPILE_STACK_SIZE;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2206 compile_stack.avail = 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2207
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2208 range_table_work.table = 0;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2209 range_table_work.allocated = 0;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2210
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2211 /* Initialize the pattern buffer. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2212 bufp->syntax = syntax;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2213 bufp->fastmap_accurate = 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2214 bufp->not_bol = bufp->not_eol = 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2215
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2216 /* Set `used' to zero, so that if we return an error, the pattern
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2217 printer (for debugging) will think there's no pattern. We reset it
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2218 at the end. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2219 bufp->used = 0;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
2220
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2221 /* Always count groups, whether or not bufp->no_sub is set. */
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
2222 bufp->re_nsub = 0;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2223
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
2224 #if !defined emacs && !defined SYNTAX_TABLE
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2225 /* Initialize the syntax table. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2226 init_syntax_once ();
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2227 #endif
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2228
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2229 if (bufp->allocated == 0)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2230 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2231 if (bufp->buffer)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2232 { /* If zero allocated, but buffer is non-null, try to realloc
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2233 enough space. This loses if buffer's address is bogus, but
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2234 that is the user's responsibility. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2235 RETALLOC (bufp->buffer, INIT_BUF_SIZE, unsigned char);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2236 }
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2237 else
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2238 { /* Caller did not allocate a buffer. Do it for them. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2239 bufp->buffer = TALLOC (INIT_BUF_SIZE, unsigned char);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2240 }
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2241 if (!bufp->buffer) FREE_STACK_RETURN (REG_ESPACE);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2242
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2243 bufp->allocated = INIT_BUF_SIZE;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2244 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2245
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2246 begalt = b = bufp->buffer;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2247
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2248 /* Loop through the uncompiled pattern until we're at the end. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2249 while (p != pend)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2250 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2251 PATFETCH (c);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2252
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2253 switch (c)
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2254 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2255 case '^':
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2256 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2257 if ( /* If at start of pattern, it's an operator. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2258 p == pattern + 1
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2259 /* If context independent, it's an operator. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2260 || syntax & RE_CONTEXT_INDEP_ANCHORS
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2261 /* Otherwise, depends on what's come before. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2262 || at_begline_loc_p (pattern, p, syntax))
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
2263 BUF_PUSH ((syntax & RE_NO_NEWLINE_ANCHOR) ? begbuf : begline);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2264 else
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2265 goto normal_char;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2266 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2267 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2268
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2269
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2270 case '$':
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2271 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2272 if ( /* If at end of pattern, it's an operator. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2273 p == pend
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2274 /* If context independent, it's an operator. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2275 || syntax & RE_CONTEXT_INDEP_ANCHORS
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2276 /* Otherwise, depends on what's next. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2277 || at_endline_loc_p (p, pend, syntax))
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
2278 BUF_PUSH ((syntax & RE_NO_NEWLINE_ANCHOR) ? endbuf : endline);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2279 else
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2280 goto normal_char;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2281 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2282 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2283
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2284
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2285 case '+':
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2286 case '?':
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2287 if ((syntax & RE_BK_PLUS_QM)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2288 || (syntax & RE_LIMITED_OPS))
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2289 goto normal_char;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2290 handle_plus:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2291 case '*':
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2292 /* If there is no previous pattern... */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2293 if (!laststart)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2294 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2295 if (syntax & RE_CONTEXT_INVALID_OPS)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2296 FREE_STACK_RETURN (REG_BADRPT);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2297 else if (!(syntax & RE_CONTEXT_INDEP_OPS))
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2298 goto normal_char;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2299 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2300
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2301 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2302 /* 1 means zero (many) matches is allowed. */
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
2303 boolean zero_times_ok = 0, many_times_ok = 0;
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
2304 boolean greedy = 1;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2305
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2306 /* If there is a sequence of repetition chars, collapse it
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2307 down to just one (the right one). We can't combine
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2308 interval operators with these because of, e.g., `a{2}*',
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2309 which should only match an even number of `a's. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2310
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2311 for (;;)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2312 {
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
2313 if ((syntax & RE_FRUGAL)
2034
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2314 && c == '?' && (zero_times_ok || many_times_ok))
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2315 greedy = 0;
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2316 else
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2317 {
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2318 zero_times_ok |= c != '+';
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2319 many_times_ok |= c != '?';
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2320 }
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2321
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2322 if (p == pend)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2323 break;
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2324 else if (*p == '*'
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2325 || (!(syntax & RE_BK_PLUS_QM)
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2326 && (*p == '+' || *p == '?')))
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2327 ;
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2328 else if (syntax & RE_BK_PLUS_QM && *p == '\\')
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2329 {
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2330 if (p+1 == pend)
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2331 FREE_STACK_RETURN (REG_EESCAPE);
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2332 if (p[1] == '+' || p[1] == '?')
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2333 PATFETCH (c); /* Gobble up the backslash. */
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2334 else
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2335 break;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2336 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2337 else
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2338 break;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2339 /* If we get here, we found another repeat character. */
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2340 PATFETCH (c);
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2341 }
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2342
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2343 /* Star, etc. applied to an empty pattern is equivalent
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2344 to an empty pattern. */
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2345 if (!laststart || laststart == b)
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2346 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2347
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2348 /* Now we know whether or not zero matches is allowed
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2349 and also whether or not two or more matches is allowed. */
2034
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2350 if (greedy)
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2351 {
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2352 if (many_times_ok)
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2353 {
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2354 boolean simple = skip_one_char (laststart) == b;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2355 unsigned int startoffset = 0;
2372
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
2356 re_opcode_t ofj =
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2357 /* Check if the loop can match the empty string. */
2372
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
2358 (simple || !analyse_first (laststart, b, NULL, 0)) ?
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
2359 on_failure_jump : on_failure_jump_loop;
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2360 assert (skip_one_char (laststart) <= b);
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2361
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2362 if (!zero_times_ok && simple)
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2363 { /* Since simple * loops can be made faster by using
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2364 on_failure_keep_string_jump, we turn simple P+
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2365 into PP* if P is simple. */
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2366 unsigned char *p1, *p2;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2367 startoffset = b - laststart;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2368 GET_BUFFER_SPACE (startoffset);
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2369 p1 = b; p2 = laststart;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2370 while (p2 < p1)
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2371 *b++ = *p2++;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2372 zero_times_ok = 1;
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2373 }
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2374
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2375 GET_BUFFER_SPACE (6);
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2376 if (!zero_times_ok)
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2377 /* A + loop. */
2372
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
2378 STORE_JUMP (ofj, b, b + 6);
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2379 else
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2380 /* Simple * loops can use on_failure_keep_string_jump
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2381 depending on what follows. But since we don't know
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2382 that yet, we leave the decision up to
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2383 on_failure_jump_smart. */
2372
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
2384 INSERT_JUMP (simple ? on_failure_jump_smart : ofj,
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2385 laststart + startoffset, b + 6);
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2386 b += 3;
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2387 STORE_JUMP (jump, b, laststart + startoffset);
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2388 b += 3;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2389 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2390 else
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2391 {
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2392 /* A simple ? pattern. */
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2393 assert (zero_times_ok);
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2394 GET_BUFFER_SPACE (3);
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2395 INSERT_JUMP (on_failure_jump, laststart, b + 3);
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2396 b += 3;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2397 }
2034
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2398 }
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2399 else /* not greedy */
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2400 { /* I wish the greedy and non-greedy cases could be merged. */
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2401
2370
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
2402 GET_BUFFER_SPACE (7); /* We might use less. */
2034
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2403 if (many_times_ok)
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2404 {
2372
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
2405 boolean emptyp = analyse_first (laststart, b, NULL, 0);
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
2406
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2407 /* The non-greedy multiple match looks like a repeat..until:
2034
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2408 we only need a conditional jump at the end of the loop */
2372
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
2409 if (emptyp) BUF_PUSH (no_op);
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
2410 STORE_JUMP (emptyp ? on_failure_jump_nastyloop
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
2411 : on_failure_jump, b, laststart);
2034
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2412 b += 3;
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2413 if (zero_times_ok)
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2414 {
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2415 /* The repeat...until naturally matches one or more.
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2416 To also match zero times, we need to first jump to
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2417 the end of the loop (its conditional jump). */
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2418 INSERT_JUMP (jump, laststart, b);
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2419 b += 3;
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2420 }
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2421 }
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2422 else
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2423 {
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2424 /* non-greedy a?? */
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2425 INSERT_JUMP (jump, laststart, b + 3);
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2426 b += 3;
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2427 INSERT_JUMP (on_failure_jump, laststart, laststart + 6);
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2428 b += 3;
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2429 }
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2430 }
00db7733320d 1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents: 1972
diff changeset
2431 }
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
2432 pending_exact = 0;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2433 break;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2434
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2435
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2436 case '.':
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2437 laststart = b;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2438 BUF_PUSH (anychar);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2439 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2440
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2441
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2442 case '[':
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2443 {
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2444 CLEAR_RANGE_TABLE_WORK_USED (range_table_work);
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2445
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2446 if (p == pend) FREE_STACK_RETURN (REG_EBRACK);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2447
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2448 /* Ensure that we have enough space to push a charset: the
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2449 opcode, the length count, and the bitset; 34 bytes in all. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2450 GET_BUFFER_SPACE (34);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2451
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2452 laststart = b;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2453
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2454 /* We test `*p == '^' twice, instead of using an if
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2455 statement, so we only need one BUF_PUSH. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2456 BUF_PUSH (*p == '^' ? charset_not : charset);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2457 if (*p == '^')
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2458 p++;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2459
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2460 /* Remember the first position in the bracket expression. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2461 p1 = p;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2462
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2463 /* Push the number of bytes in the bitmap. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2464 BUF_PUSH ((1 << BYTEWIDTH) / BYTEWIDTH);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2465
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2466 /* Clear the whole map. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2467 bzero (b, (1 << BYTEWIDTH) / BYTEWIDTH);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2468
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2469 /* charset_not matches newline according to a syntax bit. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2470 if ((re_opcode_t) b[-2] == charset_not
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2471 && (syntax & RE_HAT_LISTS_NOT_NEWLINE))
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2472 SET_LIST_BIT ('\n');
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2473
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2474 /* Read in characters and ranges, setting map bits. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2475 for (;;)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2476 {
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2477 boolean escaped_char = false;
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
2478 const unsigned char *p2 = p;
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2479
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2480 if (p == pend) FREE_STACK_RETURN (REG_EBRACK);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2481
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2482 PATFETCH (c);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2483
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2484 /* \ might escape characters inside [...] and [^...]. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2485 if ((syntax & RE_BACKSLASH_ESCAPE_IN_LISTS) && c == '\\')
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2486 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2487 if (p == pend) FREE_STACK_RETURN (REG_EESCAPE);
679
b088267ea1c8 Clean up whitespace.
Richard Stallman <rms@gnu.org>
parents: 678
diff changeset
2488
b088267ea1c8 Clean up whitespace.
Richard Stallman <rms@gnu.org>
parents: 678
diff changeset
2489 PATFETCH (c);
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2490 escaped_char = true;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2491 }
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2492 else
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2493 {
992
03e78eed4997 Whitespace change.
Richard Stallman <rms@gnu.org>
parents: 963
diff changeset
2494 /* Could be the end of the bracket expression. If it's
03e78eed4997 Whitespace change.
Richard Stallman <rms@gnu.org>
parents: 963
diff changeset
2495 not (i.e., when the bracket expression is `[]' so
03e78eed4997 Whitespace change.
Richard Stallman <rms@gnu.org>
parents: 963
diff changeset
2496 far), the ']' character bit gets set way below. */
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
2497 if (c == ']' && p2 != p1)
992
03e78eed4997 Whitespace change.
Richard Stallman <rms@gnu.org>
parents: 963
diff changeset
2498 break;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2499 }
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2500
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2501 /* What should we do for the character which is
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2502 greater than 0x7F, but not BASE_LEADING_CODE_P?
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2503 XXX */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2504
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2505 /* See if we're at the beginning of a possible character
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2506 class. */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2507
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
2508 if (!escaped_char &&
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
2509 syntax & RE_CHAR_CLASSES && c == '[' && *p == ':')
992
03e78eed4997 Whitespace change.
Richard Stallman <rms@gnu.org>
parents: 963
diff changeset
2510 {
03e78eed4997 Whitespace change.
Richard Stallman <rms@gnu.org>
parents: 963
diff changeset
2511 /* Leave room for the null. */
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2512 unsigned char str[CHAR_CLASS_MAX_LENGTH + 1];
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2513 const unsigned char *class_beg;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2514
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2515 PATFETCH (c);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2516 c1 = 0;
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2517 class_beg = p;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2518
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2519 /* If pattern is `[[:'. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2520 if (p == pend) FREE_STACK_RETURN (REG_EBRACK);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2521
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2522 for (;;)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2523 {
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2524 PATFETCH (c);
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2525 if ((c == ':' && *p == ']') || p == pend)
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2526 break;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2527 if (c1 < CHAR_CLASS_MAX_LENGTH)
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2528 str[c1++] = c;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2529 else
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2530 /* This is in any case an invalid class name. */
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2531 str[0] = '\0';
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2532 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2533 str[c1] = '\0';
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2534
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2535 /* If isn't a word bracketed by `[:' and `:]':
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2536 undo the ending character, the letters, and
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2537 leave the leading `:' and `[' (but set bits for
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2538 them). */
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2539 if (c == ':' && *p == ']')
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2540 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2541 int ch;
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2542 re_wctype_t cc;
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2543
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2544 cc = re_wctype (str);
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2545
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2546 if (cc == 0)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2547 FREE_STACK_RETURN (REG_ECTYPE);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2548
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2549 /* Throw away the ] at the end of the character
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2550 class. */
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2551 PATFETCH (c);
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2552
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2553 if (p == pend) FREE_STACK_RETURN (REG_EBRACK);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2554
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
2555 /* Most character classes in a multibyte match
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
2556 just set a flag. Exceptions are is_blank,
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
2557 is_digit, is_cntrl, and is_xdigit, since
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
2558 they can only match ASCII characters. We
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2559 don't need to handle them for multibyte.
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2560 They are distinguished by a negative wctype. */
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
2561
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
2562 if (multibyte)
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2563 SET_RANGE_TABLE_WORK_AREA_BIT (range_table_work,
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2564 re_wctype_to_bit (cc));
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2565
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2566 for (ch = 0; ch < 1 << BYTEWIDTH; ++ch)
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2567 {
692
1036844e8833 (regex_compile): Use TRANSLATE before calling SET_LIST_BIT.
Richard Stallman <rms@gnu.org>
parents: 680
diff changeset
2568 int translated = TRANSLATE (ch);
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
2569 if (re_iswctype (btowc (ch), cc))
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
2570 SET_LIST_BIT (translated);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2571 }
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2572
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2573 /* Repeat the loop. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2574 continue;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2575 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2576 else
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2577 {
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2578 /* Go back to right after the "[:". */
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2579 p = class_beg;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2580 SET_LIST_BIT ('[');
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2581
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2582 /* Because the `:' may starts the range, we
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2583 can't simply set bit and repeat the loop.
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2584 Instead, just set it to C and handle below. */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2585 c = ':';
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2586 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2587 }
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2588
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2589 if (p < pend && p[0] == '-' && p[1] != ']')
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2590 {
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2591
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2592 /* Discard the `-'. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2593 PATFETCH (c1);
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2594
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2595 /* Fetch the character which ends the range. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2596 PATFETCH (c1);
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2597
2581
34ebbdf4dda0 (MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents: 2551
diff changeset
2598 if (SINGLE_BYTE_CHAR_P (c))
1296
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
2599 {
2581
34ebbdf4dda0 (MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents: 2551
diff changeset
2600 if (! SINGLE_BYTE_CHAR_P (c1))
34ebbdf4dda0 (MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents: 2551
diff changeset
2601 {
2909
d9e0603fc9d4 (regex_compile): Change the way of handling a range from a char less
Kenichi Handa <handa@m17n.org>
parents: 2887
diff changeset
2602 /* Handle a range starting with a
d9e0603fc9d4 (regex_compile): Change the way of handling a range from a char less
Kenichi Handa <handa@m17n.org>
parents: 2887
diff changeset
2603 character of less than 256, and ending
d9e0603fc9d4 (regex_compile): Change the way of handling a range from a char less
Kenichi Handa <handa@m17n.org>
parents: 2887
diff changeset
2604 with a character of not less than 256.
d9e0603fc9d4 (regex_compile): Change the way of handling a range from a char less
Kenichi Handa <handa@m17n.org>
parents: 2887
diff changeset
2605 Split that into two ranges, the low one
d9e0603fc9d4 (regex_compile): Change the way of handling a range from a char less
Kenichi Handa <handa@m17n.org>
parents: 2887
diff changeset
2606 ending at 0377, and the high one
d9e0603fc9d4 (regex_compile): Change the way of handling a range from a char less
Kenichi Handa <handa@m17n.org>
parents: 2887
diff changeset
2607 starting at the smallest character in
d9e0603fc9d4 (regex_compile): Change the way of handling a range from a char less
Kenichi Handa <handa@m17n.org>
parents: 2887
diff changeset
2608 the charset of C1 and ending at C1. */
2581
34ebbdf4dda0 (MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents: 2551
diff changeset
2609 int charset = CHAR_CHARSET (c1);
34ebbdf4dda0 (MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents: 2551
diff changeset
2610 int c2 = MAKE_CHAR (charset, 0, 0);
34ebbdf4dda0 (MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents: 2551
diff changeset
2611
34ebbdf4dda0 (MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents: 2551
diff changeset
2612 SET_RANGE_TABLE_WORK_AREA (range_table_work,
34ebbdf4dda0 (MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents: 2551
diff changeset
2613 c2, c1);
2912
98856b23a038 (regex_compile): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 2909
diff changeset
2614 c1 = 0377;
2581
34ebbdf4dda0 (MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents: 2551
diff changeset
2615 }
1296
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
2616 }
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
2617 else if (!SAME_CHARSET_P (c, c1))
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2618 FREE_STACK_RETURN (REG_ERANGE);
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2619 }
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2620 else
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2621 /* Range from C to C. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2622 c1 = c;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2623
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2624 /* Set the range ... */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2625 if (SINGLE_BYTE_CHAR_P (c))
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2626 /* ... into bitmap. */
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2627 {
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
2628 re_wchar_t this_char;
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2629 int range_start = c, range_end = c1;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2630
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2631 /* If the start is after the end, the range is empty. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2632 if (range_start > range_end)
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2633 {
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2634 if (syntax & RE_NO_EMPTY_RANGES)
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2635 FREE_STACK_RETURN (REG_ERANGE);
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2636 /* Else, repeat the loop. */
679
b088267ea1c8 Clean up whitespace.
Richard Stallman <rms@gnu.org>
parents: 678
diff changeset
2637 }
b088267ea1c8 Clean up whitespace.
Richard Stallman <rms@gnu.org>
parents: 678
diff changeset
2638 else
b088267ea1c8 Clean up whitespace.
Richard Stallman <rms@gnu.org>
parents: 678
diff changeset
2639 {
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2640 for (this_char = range_start; this_char <= range_end;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2641 this_char++)
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2642 SET_LIST_BIT (TRANSLATE (this_char));
1296
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
2643 }
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2644 }
679
b088267ea1c8 Clean up whitespace.
Richard Stallman <rms@gnu.org>
parents: 678
diff changeset
2645 else
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2646 /* ... into range table. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2647 SET_RANGE_TABLE_WORK_AREA (range_table_work, c, c1);
679
b088267ea1c8 Clean up whitespace.
Richard Stallman <rms@gnu.org>
parents: 678
diff changeset
2648 }
b088267ea1c8 Clean up whitespace.
Richard Stallman <rms@gnu.org>
parents: 678
diff changeset
2649
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2650 /* Discard any (non)matching list bytes that are all 0 at the
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2651 end of the map. Decrease the map-length byte too. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2652 while ((int) b[-1] > 0 && b[b[-1] - 1] == 0)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2653 b[-1]--;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2654 b += b[-1];
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2655
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
2656 /* Build real range table from work area. */
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
2657 if (RANGE_TABLE_WORK_USED (range_table_work)
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
2658 || RANGE_TABLE_WORK_BITS (range_table_work))
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2659 {
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2660 int i;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2661 int used = RANGE_TABLE_WORK_USED (range_table_work);
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2662
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2663 /* Allocate space for COUNT + RANGE_TABLE. Needs two
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
2664 bytes for flags, two for COUNT, and three bytes for
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
2665 each character. */
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
2666 GET_BUFFER_SPACE (4 + used * 3);
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2667
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2668 /* Indicate the existence of range table. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2669 laststart[1] |= 0x80;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2670
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
2671 /* Store the character class flag bits into the range table.
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
2672 If not in emacs, these flag bits are always 0. */
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
2673 *b++ = RANGE_TABLE_WORK_BITS (range_table_work) & 0xff;
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
2674 *b++ = RANGE_TABLE_WORK_BITS (range_table_work) >> 8;
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
2675
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2676 STORE_NUMBER_AND_INCR (b, used / 2);
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2677 for (i = 0; i < used; i++)
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2678 STORE_CHARACTER_AND_INCR
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2679 (b, RANGE_TABLE_WORK_ELT (range_table_work, i));
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
2680 }
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2681 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2682 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2683
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2684
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2685 case '(':
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2686 if (syntax & RE_NO_BK_PARENS)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2687 goto handle_open;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2688 else
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2689 goto normal_char;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2690
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2691
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2692 case ')':
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2693 if (syntax & RE_NO_BK_PARENS)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2694 goto handle_close;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2695 else
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2696 goto normal_char;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2697
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2698
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2699 case '\n':
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2700 if (syntax & RE_NEWLINE_ALT)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2701 goto handle_alt;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2702 else
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2703 goto normal_char;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2704
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2705
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2706 case '|':
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2707 if (syntax & RE_NO_BK_VBAR)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2708 goto handle_alt;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2709 else
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2710 goto normal_char;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2711
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2712
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2713 case '{':
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2714 if (syntax & RE_INTERVALS && syntax & RE_NO_BK_BRACES)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2715 goto handle_interval;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2716 else
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2717 goto normal_char;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2718
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2719
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2720 case '\\':
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2721 if (p == pend) FREE_STACK_RETURN (REG_EESCAPE);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2722
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2723 /* Do not translate the character after the \, so that we can
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2724 distinguish, e.g., \B from \b, even if we normally would
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2725 translate, e.g., B to b. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2726 PATFETCH_RAW (c);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2727
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2728 switch (c)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2729 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2730 case '(':
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2731 if (syntax & RE_NO_BK_PARENS)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2732 goto normal_backslash;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2733
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2734 handle_open:
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2735 {
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2736 int shy = 0;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2737 if (p+1 < pend)
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2738 {
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2739 /* Look for a special (?...) construct */
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2740 if ((syntax & RE_SHY_GROUPS) && *p == '?')
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2741 {
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2742 PATFETCH (c); /* Gobble up the '?'. */
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2743 PATFETCH (c);
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2744 switch (c)
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2745 {
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2746 case ':': shy = 1; break;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2747 default:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2748 /* Only (?:...) is supported right now. */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2749 FREE_STACK_RETURN (REG_BADPAT);
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2750 }
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2751 }
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2752 }
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2753
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2754 if (!shy)
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2755 {
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2756 bufp->re_nsub++;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2757 regnum++;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2758 }
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2759
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2760 if (COMPILE_STACK_FULL)
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2761 {
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2762 RETALLOC (compile_stack.stack, compile_stack.size << 1,
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2763 compile_stack_elt_t);
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2764 if (compile_stack.stack == NULL) return REG_ESPACE;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2765
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2766 compile_stack.size <<= 1;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2767 }
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2768
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2769 /* These are the values to restore when we hit end of this
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2770 group. They are all relative offsets, so that if the
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2771 whole pattern moves because of realloc, they will still
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2772 be valid. */
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2773 COMPILE_STACK_TOP.begalt_offset = begalt - bufp->buffer;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2774 COMPILE_STACK_TOP.fixup_alt_jump
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2775 = fixup_alt_jump ? fixup_alt_jump - bufp->buffer + 1 : 0;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2776 COMPILE_STACK_TOP.laststart_offset = b - bufp->buffer;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2777 COMPILE_STACK_TOP.regnum = shy ? -regnum : regnum;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2778
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2779 /* Do not push a
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2780 start_memory for groups beyond the last one we can
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2781 represent in the compiled pattern. */
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2782 if (regnum <= MAX_REGNUM && !shy)
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2783 BUF_PUSH_2 (start_memory, regnum);
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2784
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2785 compile_stack.avail++;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2786
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2787 fixup_alt_jump = 0;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2788 laststart = 0;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2789 begalt = b;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2790 /* If we've reached MAX_REGNUM groups, then this open
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2791 won't actually generate any code, so we'll have to
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2792 clear pending_exact explicitly. */
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2793 pending_exact = 0;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2794 break;
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2795 }
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2796
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2797 case ')':
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2798 if (syntax & RE_NO_BK_PARENS) goto normal_backslash;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2799
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2800 if (COMPILE_STACK_EMPTY)
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2801 {
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2802 if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD)
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2803 goto normal_backslash;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2804 else
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2805 FREE_STACK_RETURN (REG_ERPAREN);
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2806 }
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2807
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2808 handle_close:
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2809 FIXUP_ALT_JUMP ();
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2810
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2811 /* See similar code for backslashed left paren above. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2812 if (COMPILE_STACK_EMPTY)
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2813 {
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2814 if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD)
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2815 goto normal_char;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2816 else
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2817 FREE_STACK_RETURN (REG_ERPAREN);
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2818 }
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2819
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2820 /* Since we just checked for an empty stack above, this
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2821 ``can't happen''. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2822 assert (compile_stack.avail != 0);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2823 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2824 /* We don't just want to restore into `regnum', because
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2825 later groups should continue to be numbered higher,
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2826 as in `(ab)c(de)' -- the second group is #2. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2827 regnum_t this_group_regnum;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2828
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2829 compile_stack.avail--;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2830 begalt = bufp->buffer + COMPILE_STACK_TOP.begalt_offset;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2831 fixup_alt_jump
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2832 = COMPILE_STACK_TOP.fixup_alt_jump
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2833 ? bufp->buffer + COMPILE_STACK_TOP.fixup_alt_jump - 1
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2834 : 0;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2835 laststart = bufp->buffer + COMPILE_STACK_TOP.laststart_offset;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2836 this_group_regnum = COMPILE_STACK_TOP.regnum;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2837 /* If we've reached MAX_REGNUM groups, then this open
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2838 won't actually generate any code, so we'll have to
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2839 clear pending_exact explicitly. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2840 pending_exact = 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
2841
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2842 /* We're at the end of the group, so now we know how many
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2843 groups were inside this one. */
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2844 if (this_group_regnum <= MAX_REGNUM && this_group_regnum > 0)
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2845 BUF_PUSH_2 (stop_memory, this_group_regnum);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2846 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2847 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2848
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2849
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2850 case '|': /* `\|'. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2851 if (syntax & RE_LIMITED_OPS || syntax & RE_NO_BK_VBAR)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2852 goto normal_backslash;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2853 handle_alt:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2854 if (syntax & RE_LIMITED_OPS)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2855 goto normal_char;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2856
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2857 /* Insert before the previous alternative a jump which
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2858 jumps to this alternative if the former fails. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2859 GET_BUFFER_SPACE (3);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2860 INSERT_JUMP (on_failure_jump, begalt, b + 6);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2861 pending_exact = 0;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2862 b += 3;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2863
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2864 /* The alternative before this one has a jump after it
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2865 which gets executed if it gets matched. Adjust that
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2866 jump so it will jump to this alternative's analogous
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2867 jump (put in below, which in turn will jump to the next
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2868 (if any) alternative's such jump, etc.). The last such
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2869 jump jumps to the correct final destination. A picture:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2870 _____ _____
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2871 | | | |
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2872 | v | v
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2873 a | b | c
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2874
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2875 If we are at `b', then fixup_alt_jump right now points to a
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2876 three-byte space after `a'. We'll put in the jump, set
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2877 fixup_alt_jump to right after `b', and leave behind three
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2878 bytes which we'll fill in when we get to after `c'. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2879
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
2880 FIXUP_ALT_JUMP ();
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2881
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2882 /* Mark and leave space for a jump after this alternative,
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2883 to be filled in later either by next alternative or
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2884 when know we're at the end of a series of alternatives. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2885 fixup_alt_jump = b;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2886 GET_BUFFER_SPACE (3);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2887 b += 3;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2888
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2889 laststart = 0;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2890 begalt = b;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2891 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2892
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2893
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2894 case '{':
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2895 /* If \{ is a literal. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2896 if (!(syntax & RE_INTERVALS)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2897 /* If we're at `\{' and it's not the open-interval
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2898 operator. */
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
2899 || (syntax & RE_NO_BK_BRACES))
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2900 goto normal_backslash;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2901
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2902 handle_interval:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2903 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2904 /* If got here, then the syntax allows intervals. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2905
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2906 /* At least (most) this many matches must be made. */
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
2907 int lower_bound = 0, upper_bound = -1;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2908
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2909 beg_interval = p;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2910
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2911 if (p == pend)
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
2912 FREE_STACK_RETURN (REG_EBRACE);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2913
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2914 GET_UNSIGNED_NUMBER (lower_bound);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2915
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2916 if (c == ',')
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2917 GET_UNSIGNED_NUMBER (upper_bound);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2918 else
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2919 /* Interval such as `{1}' => match exactly once. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2920 upper_bound = lower_bound;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2921
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2922 if (lower_bound < 0 || upper_bound > RE_DUP_MAX
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2923 || (upper_bound >= 0 && lower_bound > upper_bound))
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
2924 FREE_STACK_RETURN (REG_BADBR);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2925
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2926 if (!(syntax & RE_NO_BK_BRACES))
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2927 {
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
2928 if (c != '\\')
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
2929 FREE_STACK_RETURN (REG_BADBR);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2930
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2931 PATFETCH (c);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2932 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2933
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2934 if (c != '}')
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
2935 FREE_STACK_RETURN (REG_BADBR);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2936
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2937 /* We just parsed a valid interval. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2938
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2939 /* If it's invalid to have no preceding re. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2940 if (!laststart)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2941 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2942 if (syntax & RE_CONTEXT_INVALID_OPS)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2943 FREE_STACK_RETURN (REG_BADRPT);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2944 else if (syntax & RE_CONTEXT_INDEP_OPS)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2945 laststart = b;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2946 else
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2947 goto unfetch_interval;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2948 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2949
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2950 if (upper_bound == 0)
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2951 /* If the upper bound is zero, just drop the sub pattern
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2952 altogether. */
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2953 b = laststart;
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2954 else if (lower_bound == 1 && upper_bound == 1)
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2955 /* Just match it once: nothing to do here. */
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2956 ;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2957
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2958 /* Otherwise, we have a nontrivial interval. When
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2959 we're all done, the pattern will look like:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2960 set_number_at <jump count> <upper bound>
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2961 set_number_at <succeed_n count> <lower bound>
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2962 succeed_n <after jump addr> <succeed_n count>
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2963 <body of loop>
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2964 jump_n <succeed_n addr> <jump count>
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2965 (The upper bound and `jump_n' are omitted if
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2966 `upper_bound' is 1, though.) */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2967 else
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2968 { /* If the upper bound is > 1, we need to insert
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
2969 more at the end of the loop. */
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2970 unsigned int nbytes = (upper_bound < 0 ? 3
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2971 : upper_bound > 1 ? 5 : 0);
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2972 unsigned int startoffset = 0;
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2973
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2974 GET_BUFFER_SPACE (20); /* We might use less. */
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2975
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2976 if (lower_bound == 0)
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2977 {
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2978 /* A succeed_n that starts with 0 is really a
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2979 a simple on_failure_jump_loop. */
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2980 INSERT_JUMP (on_failure_jump_loop, laststart,
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2981 b + 3 + nbytes);
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2982 b += 3;
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2983 }
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2984 else
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2985 {
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2986 /* Initialize lower bound of the `succeed_n', even
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2987 though it will be set during matching by its
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2988 attendant `set_number_at' (inserted next),
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2989 because `re_compile_fastmap' needs to know.
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2990 Jump to the `jump_n' we might insert below. */
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2991 INSERT_JUMP2 (succeed_n, laststart,
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2992 b + 5 + nbytes,
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2993 lower_bound);
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2994 b += 5;
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2995
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2996 /* Code to initialize the lower bound. Insert
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2997 before the `succeed_n'. The `5' is the last two
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2998 bytes of this `set_number_at', plus 3 bytes of
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
2999 the following `succeed_n'. */
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3000 insert_op2 (set_number_at, laststart, 5, lower_bound, b);
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3001 b += 5;
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3002 startoffset += 5;
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3003 }
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3004
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3005 if (upper_bound < 0)
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3006 {
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3007 /* A negative upper bound stands for infinity,
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3008 in which case it degenerates to a plain jump. */
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3009 STORE_JUMP (jump, b, laststart + startoffset);
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3010 b += 3;
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3011 }
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3012 else if (upper_bound > 1)
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3013 { /* More than one repetition is allowed, so
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3014 append a backward jump to the `succeed_n'
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3015 that starts this interval.
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3016
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3017 When we've reached this during matching,
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3018 we'll have matched the interval once, so
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3019 jump back only `upper_bound - 1' times. */
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3020 STORE_JUMP2 (jump_n, b, laststart + startoffset,
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3021 upper_bound - 1);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3022 b += 5;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3023
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3024 /* The location we want to set is the second
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3025 parameter of the `jump_n'; that is `b-2' as
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3026 an absolute address. `laststart' will be
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3027 the `set_number_at' we're about to insert;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3028 `laststart+3' the number to set, the source
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3029 for the relative address. But we are
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3030 inserting into the middle of the pattern --
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3031 so everything is getting moved up by 5.
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3032 Conclusion: (b - 2) - (laststart + 3) + 5,
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3033 i.e., b - laststart.
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3034
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3035 We insert this at the beginning of the loop
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3036 so that if we fail during matching, we'll
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3037 reinitialize the bounds. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3038 insert_op2 (set_number_at, laststart, b - laststart,
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3039 upper_bound - 1, b);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3040 b += 5;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3041 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3042 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3043 pending_exact = 0;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3044 beg_interval = NULL;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3045 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3046 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3047
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3048 unfetch_interval:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3049 /* If an invalid interval, match the characters as literals. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3050 assert (beg_interval);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3051 p = beg_interval;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3052 beg_interval = NULL;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3053
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3054 /* normal_char and normal_backslash need `c'. */
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3055 c = '{';
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3056
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3057 if (!(syntax & RE_NO_BK_BRACES))
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3058 {
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3059 assert (p > pattern && p[-1] == '\\');
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3060 goto normal_backslash;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3061 }
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3062 else
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3063 goto normal_char;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3064
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3065 #ifdef emacs
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3066 /* There is no way to specify the before_dot and after_dot
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3067 operators. rms says this is ok. --karl */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3068 case '=':
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3069 BUF_PUSH (at_dot);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3070 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3071
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3072 case 's':
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3073 laststart = b;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3074 PATFETCH (c);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3075 BUF_PUSH_2 (syntaxspec, syntax_spec_code[c]);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3076 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3077
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3078 case 'S':
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3079 laststart = b;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3080 PATFETCH (c);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3081 BUF_PUSH_2 (notsyntaxspec, syntax_spec_code[c]);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3082 break;
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3083
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3084 case 'c':
679
b088267ea1c8 Clean up whitespace.
Richard Stallman <rms@gnu.org>
parents: 678
diff changeset
3085 laststart = b;
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3086 PATFETCH_RAW (c);
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3087 BUF_PUSH_2 (categoryspec, c);
679
b088267ea1c8 Clean up whitespace.
Richard Stallman <rms@gnu.org>
parents: 678
diff changeset
3088 break;
b088267ea1c8 Clean up whitespace.
Richard Stallman <rms@gnu.org>
parents: 678
diff changeset
3089
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3090 case 'C':
679
b088267ea1c8 Clean up whitespace.
Richard Stallman <rms@gnu.org>
parents: 678
diff changeset
3091 laststart = b;
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3092 PATFETCH_RAW (c);
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3093 BUF_PUSH_2 (notcategoryspec, c);
679
b088267ea1c8 Clean up whitespace.
Richard Stallman <rms@gnu.org>
parents: 678
diff changeset
3094 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3095 #endif /* emacs */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3096
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3097
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3098 case 'w':
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
3099 if (syntax & RE_NO_GNU_OPS)
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
3100 goto normal_char;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3101 laststart = b;
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3102 BUF_PUSH_2 (syntaxspec, Sword);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3103 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3104
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3105
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3106 case 'W':
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
3107 if (syntax & RE_NO_GNU_OPS)
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
3108 goto normal_char;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3109 laststart = b;
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3110 BUF_PUSH_2 (notsyntaxspec, Sword);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3111 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3112
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3113
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3114 case '<':
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
3115 if (syntax & RE_NO_GNU_OPS)
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
3116 goto normal_char;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3117 BUF_PUSH (wordbeg);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3118 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3119
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3120 case '>':
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
3121 if (syntax & RE_NO_GNU_OPS)
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
3122 goto normal_char;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3123 BUF_PUSH (wordend);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3124 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3125
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3126 case 'b':
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
3127 if (syntax & RE_NO_GNU_OPS)
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
3128 goto normal_char;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3129 BUF_PUSH (wordbound);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3130 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3131
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3132 case 'B':
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
3133 if (syntax & RE_NO_GNU_OPS)
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
3134 goto normal_char;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3135 BUF_PUSH (notwordbound);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3136 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3137
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3138 case '`':
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
3139 if (syntax & RE_NO_GNU_OPS)
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
3140 goto normal_char;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3141 BUF_PUSH (begbuf);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3142 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3143
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3144 case '\'':
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
3145 if (syntax & RE_NO_GNU_OPS)
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
3146 goto normal_char;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3147 BUF_PUSH (endbuf);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3148 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3149
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3150 case '1': case '2': case '3': case '4': case '5':
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3151 case '6': case '7': case '8': case '9':
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3152 if (syntax & RE_NO_BK_REFS)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3153 goto normal_char;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3154
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3155 c1 = c - '0';
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3156
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3157 if (c1 > regnum)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3158 FREE_STACK_RETURN (REG_ESUBREG);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3159
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3160 /* Can't back reference to a subexpression if inside of it. */
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
3161 if (group_in_compile_stack (compile_stack, (regnum_t) c1))
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3162 goto normal_char;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3163
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3164 laststart = b;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3165 BUF_PUSH_2 (duplicate, c1);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3166 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3167
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3168
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3169 case '+':
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3170 case '?':
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3171 if (syntax & RE_BK_PLUS_QM)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3172 goto handle_plus;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3173 else
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3174 goto normal_backslash;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3175
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3176 default:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3177 normal_backslash:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3178 /* You might think it would be useful for \ to mean
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3179 not to translate; but if we don't translate it
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
3180 it will never match anything. */
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3181 c = TRANSLATE (c);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3182 goto normal_char;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3183 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3184 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3185
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3186
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3187 default:
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3188 /* Expects the character in `c'. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3189 normal_char:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3190 /* If no exactn currently being built. */
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3191 if (!pending_exact
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3192
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3193 /* If last exactn not at current position. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3194 || pending_exact + *pending_exact + 1 != b
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3195
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3196 /* We have only one byte following the exactn for the count. */
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
3197 || *pending_exact >= (1 << BYTEWIDTH) - MAX_MULTIBYTE_LENGTH
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3198
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3199 /* If followed by a repetition operator. */
1342
e5cbc689bc64 (regex_compile): When checking after exactn
Richard Stallman <rms@gnu.org>
parents: 1335
diff changeset
3200 || (p != pend && (*p == '*' || *p == '^'))
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3201 || ((syntax & RE_BK_PLUS_QM)
1342
e5cbc689bc64 (regex_compile): When checking after exactn
Richard Stallman <rms@gnu.org>
parents: 1335
diff changeset
3202 ? p + 1 < pend && *p == '\\' && (p[1] == '+' || p[1] == '?')
e5cbc689bc64 (regex_compile): When checking after exactn
Richard Stallman <rms@gnu.org>
parents: 1335
diff changeset
3203 : p != pend && (*p == '+' || *p == '?'))
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3204 || ((syntax & RE_INTERVALS)
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3205 && ((syntax & RE_NO_BK_BRACES)
1342
e5cbc689bc64 (regex_compile): When checking after exactn
Richard Stallman <rms@gnu.org>
parents: 1335
diff changeset
3206 ? p != pend && *p == '{'
e5cbc689bc64 (regex_compile): When checking after exactn
Richard Stallman <rms@gnu.org>
parents: 1335
diff changeset
3207 : p + 1 < pend && p[0] == '\\' && p[1] == '{')))
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3208 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3209 /* Start building a new exactn. */
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3210
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3211 laststart = b;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3212
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3213 BUF_PUSH_2 (exactn, 0);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3214 pending_exact = b - 1;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3215 }
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3216
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
3217 GET_BUFFER_SPACE (MAX_MULTIBYTE_LENGTH);
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
3218 {
2816
bd9c110a1342 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 2615
diff changeset
3219 int len;
bd9c110a1342 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 2615
diff changeset
3220
bd9c110a1342 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 2615
diff changeset
3221 if (multibyte)
bd9c110a1342 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 2615
diff changeset
3222 len = CHAR_STRING (c, b);
bd9c110a1342 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 2615
diff changeset
3223 else
bd9c110a1342 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 2615
diff changeset
3224 *b = c, len = 1;
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
3225 b += len;
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
3226 (*pending_exact) += len;
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
3227 }
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
3228
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3229 break;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3230 } /* switch (c) */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3231 } /* while p != pend */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3232
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3233
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3234 /* Through the pattern now. */
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3235
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3236 FIXUP_ALT_JUMP ();
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3237
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3238 if (!COMPILE_STACK_EMPTY)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3239 FREE_STACK_RETURN (REG_EPAREN);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3240
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3241 /* If we don't want backtracking, force success
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3242 the first time we reach the end of the compiled pattern. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3243 if (syntax & RE_NO_POSIX_BACKTRACKING)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3244 BUF_PUSH (succeed);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3245
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3246 free (compile_stack.stack);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3247
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3248 /* We have succeeded; set the length of the buffer. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3249 bufp->used = b - bufp->buffer;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3250
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3251 #ifdef DEBUG
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
3252 if (debug > 0)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3253 {
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3254 re_compile_fastmap (bufp);
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3255 DEBUG_PRINT1 ("\nCompiled pattern: \n");
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3256 print_compiled_pattern (bufp);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3257 }
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
3258 debug--;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3259 #endif /* DEBUG */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3260
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3261 #ifndef MATCH_MAY_ALLOCATE
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3262 /* Initialize the failure stack to the largest possible stack. This
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3263 isn't necessary unless we're trying to avoid calling alloca in
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3264 the search and match routines. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3265 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3266 int num_regs = bufp->re_nsub + 1;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3267
1156
8e1cbb305ddc (TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents: 992
diff changeset
3268 if (fail_stack.size < re_max_failures * TYPICAL_FAILURE_SIZE)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3269 {
1297
ac5117571763 (regex_compile) [!MATCH_MAY_ALLOCATE]: Fix paren error.
Richard Stallman <rms@gnu.org>
parents: 1296
diff changeset
3270 fail_stack.size = re_max_failures * TYPICAL_FAILURE_SIZE;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3271
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3272 if (! fail_stack.stack)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3273 fail_stack.stack
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3274 = (fail_stack_elt_t *) malloc (fail_stack.size
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3275 * sizeof (fail_stack_elt_t));
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3276 else
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3277 fail_stack.stack
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3278 = (fail_stack_elt_t *) realloc (fail_stack.stack,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3279 (fail_stack.size
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3280 * sizeof (fail_stack_elt_t)));
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3281 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3282
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3283 regex_grow_registers (num_regs);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3284 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3285 #endif /* not MATCH_MAY_ALLOCATE */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3286
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3287 return REG_NOERROR;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3288 } /* regex_compile */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3289
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3290 /* Subroutines for `regex_compile'. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3291
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3292 /* Store OP at LOC followed by two-byte integer parameter ARG. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3293
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3294 static void
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3295 store_op1 (op, loc, arg)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3296 re_opcode_t op;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3297 unsigned char *loc;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3298 int arg;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3299 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3300 *loc = (unsigned char) op;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3301 STORE_NUMBER (loc + 1, arg);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3302 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3303
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3304
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3305 /* Like `store_op1', but for two two-byte parameters ARG1 and ARG2. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3306
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3307 static void
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3308 store_op2 (op, loc, arg1, arg2)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3309 re_opcode_t op;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3310 unsigned char *loc;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3311 int arg1, arg2;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3312 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3313 *loc = (unsigned char) op;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3314 STORE_NUMBER (loc + 1, arg1);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3315 STORE_NUMBER (loc + 3, arg2);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3316 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3317
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3318
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3319 /* Copy the bytes from LOC to END to open up three bytes of space at LOC
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3320 for OP followed by two-byte integer parameter ARG. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3321
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3322 static void
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3323 insert_op1 (op, loc, arg, end)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3324 re_opcode_t op;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3325 unsigned char *loc;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3326 int arg;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3327 unsigned char *end;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3328 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3329 register unsigned char *pfrom = end;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3330 register unsigned char *pto = end + 3;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3331
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3332 while (pfrom != loc)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3333 *--pto = *--pfrom;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3334
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3335 store_op1 (op, loc, arg);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3336 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3337
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3338
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3339 /* Like `insert_op1', but for two two-byte parameters ARG1 and ARG2. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3340
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3341 static void
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3342 insert_op2 (op, loc, arg1, arg2, end)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3343 re_opcode_t op;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3344 unsigned char *loc;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3345 int arg1, arg2;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3346 unsigned char *end;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3347 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3348 register unsigned char *pfrom = end;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3349 register unsigned char *pto = end + 5;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3350
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3351 while (pfrom != loc)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3352 *--pto = *--pfrom;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3353
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3354 store_op2 (op, loc, arg1, arg2);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3355 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3356
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3357
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3358 /* P points to just after a ^ in PATTERN. Return true if that ^ comes
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3359 after an alternative or a begin-subexpression. We assume there is at
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3360 least one character before the ^. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3361
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3362 static boolean
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3363 at_begline_loc_p (pattern, p, syntax)
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3364 re_char *pattern, *p;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3365 reg_syntax_t syntax;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3366 {
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3367 re_char *prev = p - 2;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3368 boolean prev_prev_backslash = prev > pattern && prev[-1] == '\\';
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3369
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3370 return
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3371 /* After a subexpression? */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3372 (*prev == '(' && (syntax & RE_NO_BK_PARENS || prev_prev_backslash))
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3373 /* After an alternative? */
2537
c971620b680c (at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2438
diff changeset
3374 || (*prev == '|' && (syntax & RE_NO_BK_VBAR || prev_prev_backslash))
c971620b680c (at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2438
diff changeset
3375 /* After a shy subexpression? */
c971620b680c (at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2438
diff changeset
3376 || ((syntax & RE_SHY_GROUPS) && prev - 2 >= pattern
c971620b680c (at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2438
diff changeset
3377 && prev[-1] == '?' && prev[-2] == '('
c971620b680c (at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2438
diff changeset
3378 && (syntax & RE_NO_BK_PARENS
c971620b680c (at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2438
diff changeset
3379 || (prev - 3 >= pattern && prev[-3] == '\\')));
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3380 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3381
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3382
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3383 /* The dual of at_begline_loc_p. This one is for $. We assume there is
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3384 at least one character after the $, i.e., `P < PEND'. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3385
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3386 static boolean
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3387 at_endline_loc_p (p, pend, syntax)
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3388 re_char *p, *pend;
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
3389 reg_syntax_t syntax;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3390 {
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3391 re_char *next = p;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3392 boolean next_backslash = *next == '\\';
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3393 re_char *next_next = p + 1 < pend ? p + 1 : 0;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3394
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3395 return
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3396 /* Before a subexpression? */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3397 (syntax & RE_NO_BK_PARENS ? *next == ')'
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3398 : next_backslash && next_next && *next_next == ')')
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3399 /* Before an alternative? */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3400 || (syntax & RE_NO_BK_VBAR ? *next == '|'
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3401 : next_backslash && next_next && *next_next == '|');
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3402 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3403
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3404
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3405 /* Returns true if REGNUM is in one of COMPILE_STACK's elements and
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3406 false if it's not. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3407
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3408 static boolean
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3409 group_in_compile_stack (compile_stack, regnum)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3410 compile_stack_type compile_stack;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3411 regnum_t regnum;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3412 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3413 int this_element;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3414
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3415 for (this_element = compile_stack.avail - 1;
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3416 this_element >= 0;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3417 this_element--)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3418 if (compile_stack.stack[this_element].regnum == regnum)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3419 return true;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3420
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3421 return false;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3422 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3423
2372
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3424 /* analyse_first.
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3425 If fastmap is non-NULL, go through the pattern and fill fastmap
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3426 with all the possible leading chars. If fastmap is NULL, don't
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3427 bother filling it up (obviously) and only return whether the
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3428 pattern could potentially match the empty string.
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3429
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3430 Return 1 if p..pend might match the empty string.
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3431 Return 0 if p..pend matches at least one char.
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3432 Return -1 if fastmap was not updated accurately. */
2372
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3433
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3434 static int
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3435 analyse_first (p, pend, fastmap, multibyte)
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3436 re_char *p, *pend;
2372
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3437 char *fastmap;
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3438 const int multibyte;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3439 {
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3440 int j, k;
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3441 boolean not;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3442
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3443 /* If all elements for base leading-codes in fastmap is set, this
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3444 flag is set true. */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3445 boolean match_any_multibyte_characters = false;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3446
2372
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3447 assert (p);
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3448
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3449 /* The loop below works as follows:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3450 - It has a working-list kept in the PATTERN_STACK and which basically
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3451 starts by only containing a pointer to the first operation.
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3452 - If the opcode we're looking at is a match against some set of
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3453 chars, then we add those chars to the fastmap and go on to the
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3454 next work element from the worklist (done via `break').
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3455 - If the opcode is a control operator on the other hand, we either
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3456 ignore it (if it's meaningless at this point, such as `start_memory')
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3457 or execute it (if it's a jump). If the jump has several destinations
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3458 (i.e. `on_failure_jump'), then we push the other destination onto the
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3459 worklist.
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3460 We guarantee termination by ignoring backward jumps (more or less),
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3461 so that `p' is monotonically increasing. More to the point, we
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3462 never set `p' (or push) anything `<= p1'. */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3463
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3464 while (p < pend)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3465 {
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3466 /* `p1' is used as a marker of how far back a `on_failure_jump'
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3467 can go without being ignored. It is normally equal to `p'
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3468 (which prevents any backward `on_failure_jump') except right
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3469 after a plain `jump', to allow patterns such as:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3470 0: jump 10
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3471 3..9: <body>
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3472 10: on_failure_jump 3
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3473 as used for the *? operator. */
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3474 re_char *p1 = p;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3475
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3476 switch (SWITCH_ENUM_CAST ((re_opcode_t) *p++))
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3477 {
2372
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3478 case succeed:
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3479 return 1;
2372
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3480 continue;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3481
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3482 case duplicate:
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3483 /* If the first character has to match a backreference, that means
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3484 that the group was empty (since it already matched). Since this
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3485 is the only case that interests us here, we can assume that the
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3486 backreference must match the empty string. */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3487 p++;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3488 continue;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3489
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3490
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3491 /* Following are the cases which match a character. These end
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3492 with `break'. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3493
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3494 case exactn:
2816
bd9c110a1342 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 2615
diff changeset
3495 if (fastmap)
bd9c110a1342 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 2615
diff changeset
3496 {
bd9c110a1342 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 2615
diff changeset
3497 int c = RE_STRING_CHAR (p + 1, pend - p);
bd9c110a1342 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 2615
diff changeset
3498
bd9c110a1342 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 2615
diff changeset
3499 if (SINGLE_BYTE_CHAR_P (c))
bd9c110a1342 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 2615
diff changeset
3500 fastmap[c] = 1;
bd9c110a1342 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 2615
diff changeset
3501 else
bd9c110a1342 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 2615
diff changeset
3502 fastmap[p[1]] = 1;
bd9c110a1342 (regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents: 2615
diff changeset
3503 }
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3504 break;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3505
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3506
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3507 case anychar:
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3508 /* We could put all the chars except for \n (and maybe \0)
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3509 but we don't bother since it is generally not worth it. */
2372
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3510 if (!fastmap) break;
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3511 return -1;
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3512
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3513
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3514 case charset_not:
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3515 /* Chars beyond end of bitmap are possible matches.
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3516 All the single-byte codes can occur in multibyte buffers.
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3517 So any that are not listed in the charset
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3518 are possible matches, even in multibyte buffers. */
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3519 if (!fastmap) break;
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3520 for (j = CHARSET_BITMAP_SIZE (&p[-1]) * BYTEWIDTH;
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3521 j < (1 << BYTEWIDTH); j++)
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3522 fastmap[j] = 1;
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3523 /* Fallthrough */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3524 case charset:
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3525 if (!fastmap) break;
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3526 not = (re_opcode_t) *(p - 1) == charset_not;
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3527 for (j = CHARSET_BITMAP_SIZE (&p[-1]) * BYTEWIDTH - 1, p++;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3528 j >= 0; j--)
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3529 if (!!(p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH))) ^ not)
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3530 fastmap[j] = 1;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3531
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3532 if ((not && multibyte)
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3533 /* Any character set can possibly contain a character
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3534 which doesn't match the specified set of characters. */
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3535 || (CHARSET_RANGE_TABLE_EXISTS_P (&p[-2])
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3536 && CHARSET_RANGE_TABLE_BITS (&p[-2]) != 0))
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3537 /* If we can match a character class, we can match
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3538 any character set. */
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3539 {
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3540 set_fastmap_for_multibyte_characters:
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3541 if (match_any_multibyte_characters == false)
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3542 {
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3543 for (j = 0x80; j < 0xA0; j++) /* XXX */
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3544 if (BASE_LEADING_CODE_P (j))
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3545 fastmap[j] = 1;
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3546 match_any_multibyte_characters = true;
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3547 }
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3548 }
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3549
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3550 else if (!not && CHARSET_RANGE_TABLE_EXISTS_P (&p[-2])
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3551 && match_any_multibyte_characters == false)
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3552 {
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3553 /* Set fastmap[I] 1 where I is a base leading code of each
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3554 multibyte character in the range table. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3555 int c, count;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3556
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3557 /* Make P points the range table. `+ 2' is to skip flag
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
3558 bits for a character class. */
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3559 p += CHARSET_BITMAP_SIZE (&p[-2]) + 2;
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3560
1965
058a9ce57dd7 1999-09-04 Richard Stallman <rms@gnu.org>
Dave Love <fx@gnu.org>
parents: 1933
diff changeset
3561 /* Extract the number of ranges in range table into COUNT. */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3562 EXTRACT_NUMBER_AND_INCR (count, p);
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3563 for (; count > 0; count--, p += 2 * 3) /* XXX */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3564 {
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3565 /* Extract the start of each range. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3566 EXTRACT_CHARACTER (c, p);
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3567 j = CHAR_CHARSET (c);
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3568 fastmap[CHARSET_LEADING_CODE_BASE (j)] = 1;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3569 }
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3570 }
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3571 break;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3572
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3573 case syntaxspec:
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3574 case notsyntaxspec:
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3575 if (!fastmap) break;
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3576 #ifndef emacs
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3577 not = (re_opcode_t)p[-1] == notsyntaxspec;
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3578 k = *p++;
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3579 for (j = 0; j < (1 << BYTEWIDTH); j++)
2359
dbf725277cfc (enum syntaxcode): Provide default for non-Emacs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2357
diff changeset
3580 if ((SYNTAX (j) == (enum syntaxcode) k) ^ not)
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3581 fastmap[j] = 1;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3582 break;
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3583 #else /* emacs */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3584 /* This match depends on text properties. These end with
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3585 aborting optimizations. */
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3586 return -1;
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3587
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3588 case categoryspec:
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3589 case notcategoryspec:
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3590 if (!fastmap) break;
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3591 not = (re_opcode_t)p[-1] == notcategoryspec;
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3592 k = *p++;
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3593 for (j = 0; j < (1 << BYTEWIDTH); j++)
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3594 if ((CHAR_HAS_CATEGORY (j, k)) ^ not)
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3595 fastmap[j] = 1;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3596
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3597 if (multibyte)
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3598 /* Any character set can possibly contain a character
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3599 whose category is K (or not). */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3600 goto set_fastmap_for_multibyte_characters;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3601 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3602
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3603 /* All cases after this match the empty string. These end with
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3604 `continue'. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3605
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3606 case before_dot:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3607 case at_dot:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3608 case after_dot:
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
3609 #endif /* !emacs */
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3610 case no_op:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3611 case begline:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3612 case endline:
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3613 case begbuf:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3614 case endbuf:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3615 case wordbound:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3616 case notwordbound:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3617 case wordbeg:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3618 case wordend:
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3619 continue;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3620
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3621
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3622 case jump:
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3623 EXTRACT_NUMBER_AND_INCR (j, p);
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3624 if (j < 0)
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3625 /* Backward jumps can only go back to code that we've already
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3626 visited. `re_compile' should make sure this is true. */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3627 break;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3628 p += j;
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3629 switch (SWITCH_ENUM_CAST ((re_opcode_t) *p))
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3630 {
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3631 case on_failure_jump:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3632 case on_failure_keep_string_jump:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3633 case on_failure_jump_loop:
2370
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
3634 case on_failure_jump_nastyloop:
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3635 case on_failure_jump_smart:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3636 p++;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3637 break;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3638 default:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3639 continue;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3640 };
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3641 /* Keep `p1' to allow the `on_failure_jump' we are jumping to
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3642 to jump back to "just after here". */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3643 /* Fallthrough */
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3644
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3645 case on_failure_jump:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3646 case on_failure_keep_string_jump:
2370
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
3647 case on_failure_jump_nastyloop:
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3648 case on_failure_jump_loop:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3649 case on_failure_jump_smart:
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3650 EXTRACT_NUMBER_AND_INCR (j, p);
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3651 if (p + j <= p1)
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3652 ; /* Backward jump to be ignored. */
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3653 else
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3654 { /* We have to look down both arms.
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3655 We first go down the "straight" path so as to minimize
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3656 stack usage when going through alternatives. */
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3657 int r = analyse_first (p, pend, fastmap, multibyte);
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3658 if (r) return r;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3659 p += j;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3660 }
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3661 continue;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3662
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3663
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3664 case jump_n:
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3665 /* This code simply does not properly handle forward jump_n. */
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3666 DEBUG_STATEMENT (EXTRACT_NUMBER (j, p); assert (j < 0));
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3667 p += 4;
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3668 /* jump_n can either jump or fall through. The (backward) jump
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3669 case has already been handled, so we only need to look at the
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3670 fallthrough case. */
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3671 continue;
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3672
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3673 case succeed_n:
2371
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3674 /* If N == 0, it should be an on_failure_jump_loop instead. */
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3675 DEBUG_STATEMENT (EXTRACT_NUMBER (j, p + 2); assert (j > 0));
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3676 p += 4;
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3677 /* We only care about one iteration of the loop, so we don't
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3678 need to consider the case where this behaves like an
3274fb530385 (REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2370
diff changeset
3679 on_failure_jump. */
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3680 continue;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3681
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3682
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3683 case set_number_at:
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3684 p += 4;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3685 continue;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3686
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3687
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3688 case start_memory:
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3689 case stop_memory:
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
3690 p += 1;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3691 continue;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3692
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3693
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3694 default:
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3695 abort (); /* We have listed all the cases. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3696 } /* switch *p++ */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3697
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3698 /* Getting here means we have found the possible starting
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3699 characters for one path of the pattern -- and that the empty
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3700 string does not match. We need not follow this path further. */
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3701 return 0;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3702 } /* while p */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3703
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3704 /* We reached the end without matching anything. */
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3705 return 1;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3706
2372
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3707 } /* analyse_first */
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3708
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3709 /* re_compile_fastmap computes a ``fastmap'' for the compiled pattern in
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3710 BUFP. A fastmap records which of the (1 << BYTEWIDTH) possible
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3711 characters can start a string that matches the pattern. This fastmap
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3712 is used by re_search to skip quickly over impossible starting points.
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3713
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3714 Character codes above (1 << BYTEWIDTH) are not represented in the
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3715 fastmap, but the leading codes are represented. Thus, the fastmap
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3716 indicates which character sets could start a match.
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3717
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3718 The caller must supply the address of a (1 << BYTEWIDTH)-byte data
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3719 area as BUFP->fastmap.
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3720
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3721 We set the `fastmap', `fastmap_accurate', and `can_be_null' fields in
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3722 the pattern buffer.
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3723
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3724 Returns 0 if we succeed, -2 if an internal error. */
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3725
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3726 int
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3727 re_compile_fastmap (bufp)
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3728 struct re_pattern_buffer *bufp;
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3729 {
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3730 char *fastmap = bufp->fastmap;
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3731 int analysis;
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3732
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3733 assert (fastmap && bufp->buffer);
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3734
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3735 bzero (fastmap, 1 << BYTEWIDTH); /* Assume nothing's valid. */
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3736 bufp->fastmap_accurate = 1; /* It will be when we're done. */
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3737
c0c46914f4fe (analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2371
diff changeset
3738 analysis = analyse_first (bufp->buffer, bufp->buffer + bufp->used,
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
3739 fastmap, RE_MULTIBYTE_P (bufp));
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
3740 bufp->can_be_null = (analysis != 0);
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3741 return 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3742 } /* re_compile_fastmap */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3743
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3744 /* Set REGS to hold NUM_REGS registers, storing them in STARTS and
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3745 ENDS. Subsequent matches using PATTERN_BUFFER and REGS will use
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3746 this memory for recording register information. STARTS and ENDS
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3747 must be allocated using the malloc library routine, and must each
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3748 be at least NUM_REGS * sizeof (regoff_t) bytes long.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3749
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3750 If NUM_REGS == 0, then subsequent matches should allocate their own
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3751 register data.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3752
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3753 Unless this function is called, the first search or match using
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3754 PATTERN_BUFFER will allocate its own register data, without
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3755 freeing the old data. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3756
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3757 void
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3758 re_set_registers (bufp, regs, num_regs, starts, ends)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3759 struct re_pattern_buffer *bufp;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3760 struct re_registers *regs;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3761 unsigned num_regs;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3762 regoff_t *starts, *ends;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3763 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3764 if (num_regs)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3765 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3766 bufp->regs_allocated = REGS_REALLOCATE;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3767 regs->num_regs = num_regs;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3768 regs->start = starts;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3769 regs->end = ends;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3770 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3771 else
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3772 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3773 bufp->regs_allocated = REGS_UNALLOCATED;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3774 regs->num_regs = 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3775 regs->start = regs->end = (regoff_t *) 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3776 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3777 }
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
3778 WEAK_ALIAS (__re_set_registers, re_set_registers)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3779
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3780 /* Searching routines. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3781
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3782 /* Like re_search_2, below, but only one string is specified, and
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3783 doesn't let you say where to stop matching. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3784
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3785 int
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3786 re_search (bufp, string, size, startpos, range, regs)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3787 struct re_pattern_buffer *bufp;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3788 const char *string;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3789 int size, startpos, range;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3790 struct re_registers *regs;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3791 {
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3792 return re_search_2 (bufp, NULL, 0, string, size, startpos, range,
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3793 regs, size);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3794 }
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
3795 WEAK_ALIAS (__re_search, re_search)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3796
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3797 /* End address of virtual concatenation of string. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3798 #define STOP_ADDR_VSTRING(P) \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3799 (((P) >= size1 ? string2 + size2 : string1 + size1))
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3800
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3801 /* Address of POS in the concatenation of virtual string. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3802 #define POS_ADDR_VSTRING(POS) \
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3803 (((POS) >= size1 ? string2 - size1 : string1) + (POS))
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3804
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3805 /* Using the compiled pattern in BUFP->buffer, first tries to match the
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3806 virtual concatenation of STRING1 and STRING2, starting first at index
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3807 STARTPOS, then at STARTPOS + 1, and so on.
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3808
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3809 STRING1 and STRING2 have length SIZE1 and SIZE2, respectively.
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3810
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3811 RANGE is how far to scan while trying to match. RANGE = 0 means try
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3812 only at STARTPOS; in general, the last start tried is STARTPOS +
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3813 RANGE.
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3814
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3815 In REGS, return the indices of the virtual concatenation of STRING1
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3816 and STRING2 that matched the entire BUFP->buffer and its contained
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3817 subexpressions.
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3818
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3819 Do not consider matching one past the index STOP in the virtual
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3820 concatenation of STRING1 and STRING2.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3821
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3822 We return either the position in the strings at which the match was
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3823 found, -1 if no match, or -2 if error (such as failure
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3824 stack overflow). */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3825
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3826 int
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
3827 re_search_2 (bufp, str1, size1, str2, size2, startpos, range, regs, stop)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3828 struct re_pattern_buffer *bufp;
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
3829 const char *str1, *str2;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3830 int size1, size2;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3831 int startpos;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3832 int range;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3833 struct re_registers *regs;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3834 int stop;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3835 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3836 int val;
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
3837 re_char *string1 = (re_char*) str1;
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
3838 re_char *string2 = (re_char*) str2;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3839 register char *fastmap = bufp->fastmap;
501
f29b13c2cefd (TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard Stallman <rms@gnu.org>
parents: 490
diff changeset
3840 register RE_TRANSLATE_TYPE translate = bufp->translate;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3841 int total_size = size1 + size2;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3842 int endpos = startpos + range;
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
3843 boolean anchored_start;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3844
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3845 /* Nonzero if we have to concern multibyte character. */
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
3846 const boolean multibyte = RE_MULTIBYTE_P (bufp);
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3847
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3848 /* Check for out-of-range STARTPOS. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3849 if (startpos < 0 || startpos > total_size)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3850 return -1;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3851
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3852 /* Fix up RANGE if it might eventually take us outside
490
985fe9826996 (re_search_2): Use 0, not -1, as the lower bound
Richard Stallman <rms@gnu.org>
parents: 481
diff changeset
3853 the virtual concatenation of STRING1 and STRING2.
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3854 Make sure we won't move STARTPOS below 0 or above TOTAL_SIZE. */
490
985fe9826996 (re_search_2): Use 0, not -1, as the lower bound
Richard Stallman <rms@gnu.org>
parents: 481
diff changeset
3855 if (endpos < 0)
985fe9826996 (re_search_2): Use 0, not -1, as the lower bound
Richard Stallman <rms@gnu.org>
parents: 481
diff changeset
3856 range = 0 - startpos;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3857 else if (endpos > total_size)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3858 range = total_size - startpos;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3859
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3860 /* If the search isn't to be a backwards one, don't waste time in a
1329
818db3848f2b (re_search_2): Fix handling of at_dot.
Richard Stallman <rms@gnu.org>
parents: 1328
diff changeset
3861 search for a pattern anchored at beginning of buffer. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3862 if (bufp->used > 0 && (re_opcode_t) bufp->buffer[0] == begbuf && range > 0)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3863 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3864 if (startpos > 0)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3865 return -1;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3866 else
1329
818db3848f2b (re_search_2): Fix handling of at_dot.
Richard Stallman <rms@gnu.org>
parents: 1328
diff changeset
3867 range = 0;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3868 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3869
481
35afc74165b7 (re_search_2): If pattern starts with \=, optimize search.
Richard Stallman <rms@gnu.org>
parents: 480
diff changeset
3870 #ifdef emacs
35afc74165b7 (re_search_2): If pattern starts with \=, optimize search.
Richard Stallman <rms@gnu.org>
parents: 480
diff changeset
3871 /* In a forward search for something that starts with \=.
35afc74165b7 (re_search_2): If pattern starts with \=, optimize search.
Richard Stallman <rms@gnu.org>
parents: 480
diff changeset
3872 don't keep searching past point. */
35afc74165b7 (re_search_2): If pattern starts with \=, optimize search.
Richard Stallman <rms@gnu.org>
parents: 480
diff changeset
3873 if (bufp->used > 0 && (re_opcode_t) bufp->buffer[0] == at_dot && range > 0)
35afc74165b7 (re_search_2): If pattern starts with \=, optimize search.
Richard Stallman <rms@gnu.org>
parents: 480
diff changeset
3874 {
1329
818db3848f2b (re_search_2): Fix handling of at_dot.
Richard Stallman <rms@gnu.org>
parents: 1328
diff changeset
3875 range = PT_BYTE - BEGV_BYTE - startpos;
818db3848f2b (re_search_2): Fix handling of at_dot.
Richard Stallman <rms@gnu.org>
parents: 1328
diff changeset
3876 if (range < 0)
481
35afc74165b7 (re_search_2): If pattern starts with \=, optimize search.
Richard Stallman <rms@gnu.org>
parents: 480
diff changeset
3877 return -1;
35afc74165b7 (re_search_2): If pattern starts with \=, optimize search.
Richard Stallman <rms@gnu.org>
parents: 480
diff changeset
3878 }
35afc74165b7 (re_search_2): If pattern starts with \=, optimize search.
Richard Stallman <rms@gnu.org>
parents: 480
diff changeset
3879 #endif /* emacs */
35afc74165b7 (re_search_2): If pattern starts with \=, optimize search.
Richard Stallman <rms@gnu.org>
parents: 480
diff changeset
3880
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3881 /* Update the fastmap now if not correct already. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3882 if (fastmap && !bufp->fastmap_accurate)
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3883 re_compile_fastmap (bufp);
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3884
678
bd677f8ba924 (re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents: 677
diff changeset
3885 /* See whether the pattern is anchored. */
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
3886 anchored_start = (bufp->buffer[0] == begline);
678
bd677f8ba924 (re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents: 677
diff changeset
3887
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3888 #ifdef emacs
1321
a37088328c87 (re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents: 1313
diff changeset
3889 gl_state.object = re_match_object;
a37088328c87 (re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents: 1313
diff changeset
3890 {
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
3891 int charpos = SYNTAX_TABLE_BYTE_TO_CHAR (POS_AS_IN_BUFFER (startpos));
1321
a37088328c87 (re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents: 1313
diff changeset
3892
a37088328c87 (re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents: 1313
diff changeset
3893 SETUP_SYNTAX_TABLE_FOR_OBJECT (re_match_object, charpos, 1);
a37088328c87 (re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents: 1313
diff changeset
3894 }
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3895 #endif
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3896
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3897 /* Loop through the string, looking for a place to start matching. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3898 for (;;)
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3899 {
678
bd677f8ba924 (re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents: 677
diff changeset
3900 /* If the pattern is anchored,
bd677f8ba924 (re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents: 677
diff changeset
3901 skip quickly past places we cannot match.
bd677f8ba924 (re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents: 677
diff changeset
3902 We don't bother to treat startpos == 0 specially
bd677f8ba924 (re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents: 677
diff changeset
3903 because that case doesn't repeat. */
bd677f8ba924 (re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents: 677
diff changeset
3904 if (anchored_start && startpos > 0)
bd677f8ba924 (re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents: 677
diff changeset
3905 {
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
3906 if (! ((startpos <= size1 ? string1[startpos - 1]
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
3907 : string2[startpos - size1 - 1])
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
3908 == '\n'))
678
bd677f8ba924 (re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents: 677
diff changeset
3909 goto advance;
bd677f8ba924 (re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents: 677
diff changeset
3910 }
bd677f8ba924 (re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents: 677
diff changeset
3911
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3912 /* If a fastmap is supplied, skip quickly over characters that
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3913 cannot be the start of a match. If the pattern can match the
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3914 null string, however, we don't need to skip characters; we want
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3915 the first null string. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3916 if (fastmap && startpos < total_size && !bufp->can_be_null)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3917 {
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
3918 register re_char *d;
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
3919 register re_wchar_t buf_ch;
1296
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3920
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3921 d = POS_ADDR_VSTRING (startpos);
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3922
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3923 if (range > 0) /* Searching forwards. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3924 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3925 register int lim = 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3926 int irange = range;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3927
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3928 if (startpos < size1 && startpos + range >= size1)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3929 lim = range - (size1 - startpos);
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
3930
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3931 /* Written out as an if-else to avoid testing `translate'
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3932 inside the loop. */
1335
97f50084cc62 (re_search_2): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 1329
diff changeset
3933 if (RE_TRANSLATE_P (translate))
97f50084cc62 (re_search_2): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 1329
diff changeset
3934 {
1296
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3935 if (multibyte)
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3936 while (range > lim)
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3937 {
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3938 int buf_charlen;
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3939
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3940 buf_ch = STRING_CHAR_AND_LENGTH (d, range - lim,
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3941 buf_charlen);
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3942
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3943 buf_ch = RE_TRANSLATE (translate, buf_ch);
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3944 if (buf_ch >= 0400
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3945 || fastmap[buf_ch])
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3946 break;
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3947
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3948 range -= buf_charlen;
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3949 d += buf_charlen;
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3950 }
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3951 else
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3952 while (range > lim
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
3953 && !fastmap[RE_TRANSLATE (translate, *d)])
1381
24423cbaf6a9 (re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents: 1342
diff changeset
3954 {
24423cbaf6a9 (re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents: 1342
diff changeset
3955 d++;
24423cbaf6a9 (re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents: 1342
diff changeset
3956 range--;
24423cbaf6a9 (re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents: 1342
diff changeset
3957 }
1296
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3958 }
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3959 else
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
3960 while (range > lim && !fastmap[*d])
1381
24423cbaf6a9 (re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents: 1342
diff changeset
3961 {
24423cbaf6a9 (re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents: 1342
diff changeset
3962 d++;
24423cbaf6a9 (re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents: 1342
diff changeset
3963 range--;
24423cbaf6a9 (re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents: 1342
diff changeset
3964 }
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3965
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3966 startpos += irange - range;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3967 }
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3968 else /* Searching backwards. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3969 {
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
3970 int room = (startpos >= size1
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
3971 ? size2 + size1 - startpos
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
3972 : size1 - startpos);
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
3973 buf_ch = RE_STRING_CHAR (d, room);
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
3974 buf_ch = TRANSLATE (buf_ch);
1296
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3975
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3976 if (! (buf_ch >= 0400
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
3977 || fastmap[buf_ch]))
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3978 goto advance;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3979 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3980 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3981
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3982 /* If can't match the null string, and that's all we have left, fail. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3983 if (range >= 0 && startpos == total_size && fastmap
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
3984 && !bufp->can_be_null)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3985 return -1;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3986
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3987 val = re_match_2_internal (bufp, string1, size1, string2, size2,
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3988 startpos, regs, stop);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3989 #ifndef REGEX_MALLOC
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
3990 # ifdef C_ALLOCA
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3991 alloca (0);
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
3992 # endif
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3993 #endif
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3994
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3995 if (val >= 0)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3996 return startpos;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
3997
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3998 if (val == -2)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
3999 return -2;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4000
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4001 advance:
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
4002 if (!range)
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4003 break;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
4004 else if (range > 0)
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4005 {
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4006 /* Update STARTPOS to the next character boundary. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4007 if (multibyte)
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4008 {
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
4009 re_char *p = POS_ADDR_VSTRING (startpos);
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
4010 re_char *pend = STOP_ADDR_VSTRING (startpos);
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4011 int len = MULTIBYTE_FORM_LENGTH (p, pend - p);
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4012
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4013 range -= len;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4014 if (range < 0)
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4015 break;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4016 startpos += len;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4017 }
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4018 else
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4019 {
961
6959c7741ed2 (re_search_2): Cast result of POS_ADDR_VSTRING.
Richard Stallman <rms@gnu.org>
parents: 942
diff changeset
4020 range--;
6959c7741ed2 (re_search_2): Cast result of POS_ADDR_VSTRING.
Richard Stallman <rms@gnu.org>
parents: 942
diff changeset
4021 startpos++;
6959c7741ed2 (re_search_2): Cast result of POS_ADDR_VSTRING.
Richard Stallman <rms@gnu.org>
parents: 942
diff changeset
4022 }
679
b088267ea1c8 Clean up whitespace.
Richard Stallman <rms@gnu.org>
parents: 678
diff changeset
4023 }
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4024 else
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4025 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4026 range++;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4027 startpos--;
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4028
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4029 /* Update STARTPOS to the previous character boundary. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4030 if (multibyte)
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4031 {
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
4032 re_char *p = POS_ADDR_VSTRING (startpos);
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4033 int len = 0;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4034
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4035 /* Find the head of multibyte form. */
1204
28ff40a118b8 (re_search_2): Fix call to CHAR_HEAD_P.
Richard Stallman <rms@gnu.org>
parents: 1158
diff changeset
4036 while (!CHAR_HEAD_P (*p))
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4037 p--, len++;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4038
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4039 /* Adjust it. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4040 #if 0 /* XXX */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4041 if (MULTIBYTE_FORM_LENGTH (p, len + 1) != (len + 1))
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4042 ;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4043 else
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4044 #endif
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4045 {
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4046 range += len;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4047 if (range > 0)
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4048 break;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4049
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4050 startpos -= len;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4051 }
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4052 }
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4053 }
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4054 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4055 return -1;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4056 } /* re_search_2 */
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
4057 WEAK_ALIAS (__re_search_2, re_search_2)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4058
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4059 /* Declarations and macros for re_match_2. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4060
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
4061 static int bcmp_translate _RE_ARGS((re_char *s1, re_char *s2,
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
4062 register int len,
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
4063 RE_TRANSLATE_TYPE translate,
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
4064 const int multibyte));
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4065
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4066 /* This converts PTR, a pointer into one of the search strings `string1'
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4067 and `string2' into an offset from the beginning of that string. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4068 #define POINTER_TO_OFFSET(ptr) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4069 (FIRST_STRING_P (ptr) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4070 ? ((regoff_t) ((ptr) - string1)) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4071 : ((regoff_t) ((ptr) - string2 + size1)))
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4072
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4073 /* Call before fetching a character with *d. This switches over to
2438
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4074 string2 if necessary.
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4075 Check re_match_2_internal for a discussion of why end_match_2 might
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4076 not be within string2 (but be equal to end_match_1 instead). */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4077 #define PREFETCH() \
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4078 while (d == dend) \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4079 { \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4080 /* End of string2 => fail. */ \
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4081 if (dend == end_match_2) \
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4082 goto fail; \
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
4083 /* End of string1 => advance to string2. */ \
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4084 d = string2; \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4085 dend = end_match_2; \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4086 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4087
2551
b341325934ed (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2537
diff changeset
4088 /* Call before fetching a char with *d if you already checked other limits.
b341325934ed (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2537
diff changeset
4089 This is meant for use in lookahead operations like wordend, etc..
b341325934ed (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2537
diff changeset
4090 where we might need to look at parts of the string that might be
b341325934ed (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2537
diff changeset
4091 outside of the LIMITs (i.e past `stop'). */
b341325934ed (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2537
diff changeset
4092 #define PREFETCH_NOLIMIT() \
b341325934ed (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2537
diff changeset
4093 if (d == end1) \
b341325934ed (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2537
diff changeset
4094 { \
b341325934ed (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2537
diff changeset
4095 d = string2; \
b341325934ed (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2537
diff changeset
4096 dend = end_match_2; \
b341325934ed (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2537
diff changeset
4097 } \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4098
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4099 /* Test if at very beginning or at very end of the virtual concatenation
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4100 of `string1' and `string2'. If only one string, it's `string2'. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4101 #define AT_STRINGS_BEG(d) ((d) == (size1 ? string1 : string2) || !size2)
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
4102 #define AT_STRINGS_END(d) ((d) == end2)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4103
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4104
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4105 /* Test if D points to a character which is word-constituent. We have
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4106 two special cases to check for: if past the end of string1, look at
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4107 the first character in string2; and if before the beginning of
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4108 string2, look at the last character in string1. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4109 #define WORDCHAR_P(d) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4110 (SYNTAX ((d) == end1 ? *string2 \
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4111 : (d) == string2 - 1 ? *(end1 - 1) : *(d)) \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4112 == Sword)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4113
521
7089c3a3a164 (AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents: 515
diff changeset
4114 /* Disabled due to a compiler bug -- see comment at case wordbound */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4115
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4116 /* The comment at case wordbound is following one, but we don't use
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4117 AT_WORD_BOUNDARY anymore to support multibyte form.
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4118
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4119 The DEC Alpha C compiler 3.x generates incorrect code for the
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4120 test WORDCHAR_P (d - 1) != WORDCHAR_P (d) in the expansion of
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4121 AT_WORD_BOUNDARY, so this code is disabled. Expanding the
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4122 macro and introducing temporary variables works around the bug. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4123
521
7089c3a3a164 (AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents: 515
diff changeset
4124 #if 0
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4125 /* Test if the character before D and the one at D differ with respect
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4126 to being word-constituent. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4127 #define AT_WORD_BOUNDARY(d) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4128 (AT_STRINGS_BEG (d) || AT_STRINGS_END (d) \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4129 || WORDCHAR_P (d - 1) != WORDCHAR_P (d))
521
7089c3a3a164 (AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents: 515
diff changeset
4130 #endif
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4131
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4132 /* Free everything we malloc. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4133 #ifdef MATCH_MAY_ALLOCATE
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
4134 # define FREE_VAR(var) if (var) { REGEX_FREE (var); var = NULL; } else
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
4135 # define FREE_VARIABLES() \
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4136 do { \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4137 REGEX_FREE_STACK (fail_stack.stack); \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4138 FREE_VAR (regstart); \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4139 FREE_VAR (regend); \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4140 FREE_VAR (best_regstart); \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4141 FREE_VAR (best_regend); \
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4142 } while (0)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4143 #else
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
4144 # define FREE_VARIABLES() ((void)0) /* Do nothing! But inhibit gcc warning. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4145 #endif /* not MATCH_MAY_ALLOCATE */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4146
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4147
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4148 /* Optimization routines. */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4149
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4150 /* If the operation is a match against one or more chars,
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4151 return a pointer to the next operation, else return NULL. */
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4152 static re_char *
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4153 skip_one_char (p)
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4154 re_char *p;
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4155 {
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4156 switch (SWITCH_ENUM_CAST (*p++))
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4157 {
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4158 case anychar:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4159 break;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4160
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4161 case exactn:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4162 p += *p + 1;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4163 break;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4164
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4165 case charset_not:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4166 case charset:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4167 if (CHARSET_RANGE_TABLE_EXISTS_P (p - 1))
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4168 {
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4169 int mcnt;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4170 p = CHARSET_RANGE_TABLE (p - 1);
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4171 EXTRACT_NUMBER_AND_INCR (mcnt, p);
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4172 p = CHARSET_RANGE_TABLE_END (p, mcnt);
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4173 }
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4174 else
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4175 p += 1 + CHARSET_BITMAP_SIZE (p - 1);
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4176 break;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4177
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4178 case syntaxspec:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4179 case notsyntaxspec:
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
4180 #ifdef emacs
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4181 case categoryspec:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4182 case notcategoryspec:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4183 #endif /* emacs */
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4184 p++;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4185 break;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4186
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4187 default:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4188 p = NULL;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4189 }
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4190 return p;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4191 }
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4192
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4193
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4194 /* Jump over non-matching operations. */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4195 static unsigned char *
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4196 skip_noops (p, pend)
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4197 unsigned char *p, *pend;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4198 {
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4199 int mcnt;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4200 while (p < pend)
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4201 {
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4202 switch (SWITCH_ENUM_CAST ((re_opcode_t) *p))
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4203 {
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4204 case start_memory:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4205 case stop_memory:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4206 p += 2; break;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4207 case no_op:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4208 p += 1; break;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4209 case jump:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4210 p += 1;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4211 EXTRACT_NUMBER_AND_INCR (mcnt, p);
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4212 p += mcnt;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4213 break;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4214 default:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4215 return p;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4216 }
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4217 }
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4218 assert (p == pend);
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4219 return p;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4220 }
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4221
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4222 /* Non-zero if "p1 matches something" implies "p2 fails". */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4223 static int
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4224 mutually_exclusive_p (bufp, p1, p2)
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4225 struct re_pattern_buffer *bufp;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4226 unsigned char *p1, *p2;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4227 {
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4228 re_opcode_t op2;
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
4229 const boolean multibyte = RE_MULTIBYTE_P (bufp);
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4230 unsigned char *pend = bufp->buffer + bufp->used;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4231
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4232 assert (p1 >= bufp->buffer && p1 < pend
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4233 && p2 >= bufp->buffer && p2 <= pend);
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4234
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4235 /* Skip over open/close-group commands.
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4236 If what follows this loop is a ...+ construct,
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4237 look at what begins its body, since we will have to
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4238 match at least one of that. */
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4239 p2 = skip_noops (p2, pend);
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4240 /* The same skip can be done for p1, except that this function
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4241 is only used in the case where p1 is a simple match operator. */
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4242 /* p1 = skip_noops (p1, pend); */
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4243
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4244 assert (p1 >= bufp->buffer && p1 < pend
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4245 && p2 >= bufp->buffer && p2 <= pend);
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4246
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4247 op2 = p2 == pend ? succeed : *p2;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4248
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4249 switch (SWITCH_ENUM_CAST (op2))
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4250 {
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4251 case succeed:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4252 case endbuf:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4253 /* If we're at the end of the pattern, we can change. */
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4254 if (skip_one_char (p1))
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4255 {
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4256 DEBUG_PRINT1 (" End of pattern: fast loop.\n");
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4257 return 1;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4258 }
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4259 break;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4260
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4261 case endline:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4262 case exactn:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4263 {
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4264 register re_wchar_t c
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4265 = (re_opcode_t) *p2 == endline ? '\n'
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4266 : RE_STRING_CHAR(p2 + 2, pend - p2 - 2);
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4267
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4268 if ((re_opcode_t) *p1 == exactn)
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4269 {
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4270 if (c != RE_STRING_CHAR (p1 + 2, pend - p1 - 2))
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4271 {
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4272 DEBUG_PRINT3 (" '%c' != '%c' => fast loop.\n", c, p1[2]);
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4273 return 1;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4274 }
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4275 }
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4276
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4277 else if ((re_opcode_t) *p1 == charset
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4278 || (re_opcode_t) *p1 == charset_not)
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4279 {
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4280 int not = (re_opcode_t) *p1 == charset_not;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4281
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4282 /* Test if C is listed in charset (or charset_not)
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4283 at `p1'. */
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4284 if (SINGLE_BYTE_CHAR_P (c))
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4285 {
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4286 if (c < CHARSET_BITMAP_SIZE (p1) * BYTEWIDTH
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4287 && p1[2 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH)))
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4288 not = !not;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4289 }
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4290 else if (CHARSET_RANGE_TABLE_EXISTS_P (p1))
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4291 CHARSET_LOOKUP_RANGE_TABLE (not, c, p1);
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4292
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4293 /* `not' is equal to 1 if c would match, which means
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4294 that we can't change to pop_failure_jump. */
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4295 if (!not)
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4296 {
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4297 DEBUG_PRINT1 (" No match => fast loop.\n");
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4298 return 1;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4299 }
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4300 }
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4301 else if ((re_opcode_t) *p1 == anychar
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4302 && c == '\n')
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4303 {
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4304 DEBUG_PRINT1 (" . != \\n => fast loop.\n");
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4305 return 1;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4306 }
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4307 }
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4308 break;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4309
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4310 case charset:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4311 case charset_not:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4312 {
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4313 if ((re_opcode_t) *p1 == exactn)
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4314 /* Reuse the code above. */
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4315 return mutually_exclusive_p (bufp, p2, p1);
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4316
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4317
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4318 /* It is hard to list up all the character in charset
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4319 P2 if it includes multibyte character. Give up in
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4320 such case. */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4321 else if (!multibyte || !CHARSET_RANGE_TABLE_EXISTS_P (p2))
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4322 {
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4323 /* Now, we are sure that P2 has no range table.
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4324 So, for the size of bitmap in P2, `p2[1]' is
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4325 enough. But P1 may have range table, so the
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4326 size of bitmap table of P1 is extracted by
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4327 using macro `CHARSET_BITMAP_SIZE'.
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4328
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4329 Since we know that all the character listed in
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4330 P2 is ASCII, it is enough to test only bitmap
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4331 table of P1. */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4332
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4333 if (*p1 == *p2)
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4334 {
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4335 int idx;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4336 /* We win if the charset inside the loop
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4337 has no overlap with the one after the loop. */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4338 for (idx = 0;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4339 (idx < (int) p2[1]
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4340 && idx < CHARSET_BITMAP_SIZE (p1));
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4341 idx++)
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4342 if ((p2[2 + idx] & p1[2 + idx]) != 0)
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4343 break;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4344
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4345 if (idx == p2[1]
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4346 || idx == CHARSET_BITMAP_SIZE (p1))
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4347 {
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4348 DEBUG_PRINT1 (" No match => fast loop.\n");
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4349 return 1;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4350 }
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4351 }
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4352 else if ((re_opcode_t) *p1 == charset
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4353 || (re_opcode_t) *p1 == charset_not)
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4354 {
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4355 int idx;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4356 /* We win if the charset_not inside the loop lists
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4357 every character listed in the charset after. */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4358 for (idx = 0; idx < (int) p2[1]; idx++)
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4359 if (! (p2[2 + idx] == 0
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4360 || (idx < CHARSET_BITMAP_SIZE (p1)
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4361 && ((p2[2 + idx] & ~ p1[2 + idx]) == 0))))
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4362 break;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4363
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4364 if (idx == p2[1])
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4365 {
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4366 DEBUG_PRINT1 (" No match => fast loop.\n");
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4367 return 1;
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4368 }
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4369 }
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4370 }
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4371 }
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4372
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4373 case wordend:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4374 case notsyntaxspec:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4375 return ((re_opcode_t) *p1 == syntaxspec
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4376 && p1[1] == (op2 == wordend ? Sword : p2[1]));
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4377
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4378 case wordbeg:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4379 case syntaxspec:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4380 return ((re_opcode_t) *p1 == notsyntaxspec
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4381 && p1[1] == (op2 == wordend ? Sword : p2[1]));
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4382
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4383 case wordbound:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4384 return (((re_opcode_t) *p1 == notsyntaxspec
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4385 || (re_opcode_t) *p1 == syntaxspec)
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4386 && p1[1] == Sword);
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4387
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
4388 #ifdef emacs
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4389 case categoryspec:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4390 return ((re_opcode_t) *p1 == notcategoryspec && p1[1] == p2[1]);
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4391 case notcategoryspec:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4392 return ((re_opcode_t) *p1 == categoryspec && p1[1] == p2[1]);
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4393 #endif /* emacs */
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4394
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4395 default:
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
4396 ;
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4397 }
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4398
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4399 /* Safe default. */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4400 return 0;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4401 }
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4402
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4403
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4404 /* Matching routines. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4405
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4406 #ifndef emacs /* Emacs never uses this. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4407 /* re_match is like re_match_2 except it takes only a single string. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4408
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4409 int
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4410 re_match (bufp, string, size, pos, regs)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4411 struct re_pattern_buffer *bufp;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4412 const char *string;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4413 int size, pos;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4414 struct re_registers *regs;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4415 {
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
4416 int result = re_match_2_internal (bufp, NULL, 0, (re_char*) string, size,
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4417 pos, regs, size);
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
4418 # if defined C_ALLOCA && !defined REGEX_MALLOC
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4419 alloca (0);
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
4420 # endif
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4421 return result;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4422 }
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
4423 WEAK_ALIAS (__re_match, re_match)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4424 #endif /* not emacs */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4425
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4426 #ifdef emacs
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4427 /* In Emacs, this is the string or buffer in which we
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4428 are matching. It is used for looking up syntax properties. */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4429 Lisp_Object re_match_object;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4430 #endif
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4431
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4432 /* re_match_2 matches the compiled pattern in BUFP against the
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4433 the (virtual) concatenation of STRING1 and STRING2 (of length SIZE1
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4434 and SIZE2, respectively). We start matching at POS, and stop
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4435 matching at STOP.
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
4436
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4437 If REGS is non-null and the `no_sub' field of BUFP is nonzero, we
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4438 store offsets for the substring each group matched in REGS. See the
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4439 documentation for exactly how many groups we fill.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4440
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4441 We return -1 if no match, -2 if an internal error (such as the
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4442 failure stack overflowing). Otherwise, we return the length of the
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4443 matched substring. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4444
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4445 int
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4446 re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4447 struct re_pattern_buffer *bufp;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4448 const char *string1, *string2;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4449 int size1, size2;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4450 int pos;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4451 struct re_registers *regs;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4452 int stop;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4453 {
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4454 int result;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4455
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4456 #ifdef emacs
1321
a37088328c87 (re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents: 1313
diff changeset
4457 int charpos;
a37088328c87 (re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents: 1313
diff changeset
4458 gl_state.object = re_match_object;
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4459 charpos = SYNTAX_TABLE_BYTE_TO_CHAR (POS_AS_IN_BUFFER (pos));
1321
a37088328c87 (re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents: 1313
diff changeset
4460 SETUP_SYNTAX_TABLE_FOR_OBJECT (re_match_object, charpos, 1);
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4461 #endif
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4462
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
4463 result = re_match_2_internal (bufp, (re_char*) string1, size1,
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
4464 (re_char*) string2, size2,
1321
a37088328c87 (re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents: 1313
diff changeset
4465 pos, regs, stop);
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
4466 #if defined C_ALLOCA && !defined REGEX_MALLOC
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4467 alloca (0);
2615
31b85fc23c04 (re_match, re_match_2): Protect calls to alloca (0).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2581
diff changeset
4468 #endif
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4469 return result;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4470 }
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
4471 WEAK_ALIAS (__re_match_2, re_match_2)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4472
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4473 /* This is a separate function so that we can force an alloca cleanup
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4474 afterwards. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4475 static int
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4476 re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4477 struct re_pattern_buffer *bufp;
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
4478 re_char *string1, *string2;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4479 int size1, size2;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4480 int pos;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4481 struct re_registers *regs;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4482 int stop;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4483 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4484 /* General temporaries. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4485 int mcnt;
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4486 size_t reg;
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
4487 boolean not;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4488
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4489 /* Just past the end of the corresponding string. */
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
4490 re_char *end1, *end2;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4491
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4492 /* Pointers into string1 and string2, just past the last characters in
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4493 each to consider matching. */
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
4494 re_char *end_match_1, *end_match_2;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4495
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4496 /* Where we are in the data, and the end of the current string. */
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
4497 re_char *d, *dend;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
4498
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4499 /* Used sometimes to remember where we were before starting matching
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4500 an operator so that we can go back in case of failure. This "atomic"
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4501 behavior of matching opcodes is indispensable to the correctness
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4502 of the on_failure_keep_string_jump optimization. */
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4503 re_char *dfail;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4504
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4505 /* Where we are in the pattern, and the end of the pattern. */
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4506 re_char *p = bufp->buffer;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4507 re_char *pend = p + bufp->used;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4508
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4509 /* We use this to map every character in the string. */
501
f29b13c2cefd (TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard Stallman <rms@gnu.org>
parents: 490
diff changeset
4510 RE_TRANSLATE_TYPE translate = bufp->translate;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4511
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4512 /* Nonzero if we have to concern multibyte character. */
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
4513 const boolean multibyte = RE_MULTIBYTE_P (bufp);
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4514
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4515 /* Failure point stack. Each place that can handle a failure further
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4516 down the line pushes a failure point on this stack. It consists of
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4517 regstart, and regend for all registers corresponding to
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4518 the subexpressions we're currently inside, plus the number of such
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4519 registers, and, finally, two char *'s. The first char * is where
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4520 to resume scanning the pattern; the second one is where to resume
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4521 scanning the strings. */
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4522 #ifdef MATCH_MAY_ALLOCATE /* otherwise, this is global. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4523 fail_stack_type fail_stack;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4524 #endif
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4525 #ifdef DEBUG
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4526 unsigned nfailure_points_pushed = 0, nfailure_points_popped = 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4527 #endif
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4528
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
4529 #if defined REL_ALLOC && defined REGEX_MALLOC
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4530 /* This holds the pointer to the failure stack, when
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4531 it is allocated relocatably. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4532 fail_stack_elt_t *failure_stack_ptr;
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4533 #endif
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4534
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4535 /* We fill all the registers internally, independent of what we
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4536 return, for use in backreferences. The number here includes
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4537 an element for register zero. */
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
4538 size_t num_regs = bufp->re_nsub + 1;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
4539
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4540 /* Information on the contents of registers. These are pointers into
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4541 the input strings; they record just what was matched (on this
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4542 attempt) by a subexpression part of the pattern, that is, the
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4543 regnum-th regstart pointer points to where in the pattern we began
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4544 matching and the regnum-th regend points to right after where we
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4545 stopped matching the regnum-th subexpression. (The zeroth register
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4546 keeps track of what the whole pattern matches.) */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4547 #ifdef MATCH_MAY_ALLOCATE /* otherwise, these are global. */
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
4548 re_char **regstart, **regend;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4549 #endif
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4550
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4551 /* The following record the register info as found in the above
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
4552 variables when we find a match better than any we've seen before.
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4553 This happens as we backtrack through the failure points, which in
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4554 turn happens only if we have not yet matched the entire string. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4555 unsigned best_regs_set = false;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4556 #ifdef MATCH_MAY_ALLOCATE /* otherwise, these are global. */
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
4557 re_char **best_regstart, **best_regend;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4558 #endif
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
4559
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4560 /* Logically, this is `best_regend[0]'. But we don't want to have to
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4561 allocate space for that if we're not allocating space for anything
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4562 else (see below). Also, we never need info about register 0 for
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4563 any of the other register vectors, and it seems rather a kludge to
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4564 treat `best_regend' differently than the rest. So we keep track of
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4565 the end of the best match so far in a separate variable. We
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4566 initialize this to NULL so that when we backtrack the first time
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4567 and need to test it, it's not garbage. */
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
4568 re_char *match_end = NULL;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4569
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4570 #ifdef DEBUG
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4571 /* Counts the total number of registers pushed. */
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
4572 unsigned num_regs_pushed = 0;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4573 #endif
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4574
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4575 DEBUG_PRINT1 ("\n\nEntering re_match_2.\n");
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
4576
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4577 INIT_FAIL_STACK ();
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
4578
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4579 #ifdef MATCH_MAY_ALLOCATE
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4580 /* Do not bother to initialize all the register variables if there are
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4581 no groups in the pattern, as it takes a fair amount of time. If
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4582 there are groups, we include space for register 0 (the whole
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4583 pattern), even though we never use it, since it simplifies the
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4584 array indexing. We should fix this. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4585 if (bufp->re_nsub)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4586 {
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
4587 regstart = REGEX_TALLOC (num_regs, re_char *);
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
4588 regend = REGEX_TALLOC (num_regs, re_char *);
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
4589 best_regstart = REGEX_TALLOC (num_regs, re_char *);
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
4590 best_regend = REGEX_TALLOC (num_regs, re_char *);
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4591
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4592 if (!(regstart && regend && best_regstart && best_regend))
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4593 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4594 FREE_VARIABLES ();
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4595 return -2;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4596 }
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4597 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4598 else
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4599 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4600 /* We must initialize all our variables to NULL, so that
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4601 `FREE_VARIABLES' doesn't try to free them. */
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4602 regstart = regend = best_regstart = best_regend = NULL;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4603 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4604 #endif /* MATCH_MAY_ALLOCATE */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4605
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4606 /* The starting position is bogus. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4607 if (pos < 0 || pos > size1 + size2)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4608 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4609 FREE_VARIABLES ();
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4610 return -1;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4611 }
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
4612
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4613 /* Initialize subexpression text positions to -1 to mark ones that no
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4614 start_memory/stop_memory has been seen for. Also initialize the
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4615 register information struct. */
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4616 for (reg = 1; reg < num_regs; reg++)
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4617 regstart[reg] = regend[reg] = NULL;
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4618
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4619 /* We move `string1' into `string2' if the latter's empty -- but not if
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4620 `string1' is null. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4621 if (size2 == 0 && string1 != NULL)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4622 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4623 string2 = string1;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4624 size2 = size1;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4625 string1 = 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4626 size1 = 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4627 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4628 end1 = string1 + size1;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4629 end2 = string2 + size2;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4630
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
4631 /* `p' scans through the pattern as `d' scans through the data.
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4632 `dend' is the end of the input string that `d' points within. `d'
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4633 is advanced into the following input string whenever necessary, but
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4634 this happens before fetching; therefore, at the beginning of the
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4635 loop, `d' can be pointing at the end of a string, but it cannot
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4636 equal `string2'. */
2438
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4637 if (pos >= size1)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4638 {
2438
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4639 /* Only match within string2. */
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4640 d = string2 + pos - size1;
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4641 dend = end_match_2 = string2 + stop - size1;
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4642 end_match_1 = end1; /* Just to give it a value. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4643 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4644 else
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4645 {
2551
b341325934ed (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2537
diff changeset
4646 if (stop < size1)
2438
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4647 {
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4648 /* Only match within string1. */
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4649 end_match_1 = string1 + stop;
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4650 /* BEWARE!
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4651 When we reach end_match_1, PREFETCH normally switches to string2.
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4652 But in the present case, this means that just doing a PREFETCH
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4653 makes us jump from `stop' to `gap' within the string.
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4654 What we really want here is for the search to stop as
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4655 soon as we hit end_match_1. That's why we set end_match_2
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4656 to end_match_1 (since PREFETCH fails as soon as we hit
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4657 end_match_2). */
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4658 end_match_2 = end_match_1;
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4659 }
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4660 else
2551
b341325934ed (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2537
diff changeset
4661 { /* It's important to use this code when stop == size so that
b341325934ed (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2537
diff changeset
4662 moving `d' from end1 to string2 will not prevent the d == dend
b341325934ed (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2537
diff changeset
4663 check from catching the end of string. */
2438
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4664 end_match_1 = end1;
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4665 end_match_2 = string2 + stop - size1;
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4666 }
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4667 d = string1 + pos;
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
4668 dend = end_match_1;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4669 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4670
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4671 DEBUG_PRINT1 ("The compiled pattern is: ");
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4672 DEBUG_PRINT_COMPILED_PATTERN (bufp, p, pend);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4673 DEBUG_PRINT1 ("The string to match is: `");
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4674 DEBUG_PRINT_DOUBLE_STRING (d, string1, size1, string2, size2);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4675 DEBUG_PRINT1 ("'\n");
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
4676
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4677 /* This loops over pattern commands. It exits by returning from the
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4678 function if the match is complete, or it drops through if the match
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4679 fails at this starting point in the input data. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4680 for (;;)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4681 {
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
4682 DEBUG_PRINT2 ("\n%p: ", p);
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4683
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4684 if (p == pend)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4685 { /* End of pattern means we might have succeeded. */
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4686 DEBUG_PRINT1 ("end of pattern ... ");
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
4687
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4688 /* If we haven't matched the entire string, and we want the
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4689 longest match, try backtracking. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4690 if (d != end_match_2)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4691 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4692 /* 1 if this match ends in the same string (string1 or string2)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4693 as the best previous match. */
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
4694 boolean same_str_p = (FIRST_STRING_P (match_end)
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4695 == FIRST_STRING_P (d));
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4696 /* 1 if this match is the best seen so far. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4697 boolean best_match_p;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4698
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4699 /* AIX compiler got confused when this was combined
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4700 with the previous declaration. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4701 if (same_str_p)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4702 best_match_p = d > match_end;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4703 else
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4704 best_match_p = !FIRST_STRING_P (d);
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4705
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4706 DEBUG_PRINT1 ("backtracking.\n");
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4707
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4708 if (!FAIL_STACK_EMPTY ())
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4709 { /* More failure points to try. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4710
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4711 /* If exceeds best match so far, save it. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4712 if (!best_regs_set || best_match_p)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4713 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4714 best_regs_set = true;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4715 match_end = d;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4716
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4717 DEBUG_PRINT1 ("\nSAVING match as best so far.\n");
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4718
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4719 for (reg = 1; reg < num_regs; reg++)
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4720 {
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4721 best_regstart[reg] = regstart[reg];
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4722 best_regend[reg] = regend[reg];
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4723 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4724 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4725 goto fail;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4726 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4727
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4728 /* If no failure points, don't restore garbage. And if
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4729 last match is real best match, don't restore second
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4730 best one. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4731 else if (best_regs_set && !best_match_p)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4732 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4733 restore_best_regs:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4734 /* Restore best match. It may happen that `dend ==
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4735 end_match_1' while the restored d is in string2.
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4736 For example, the pattern `x.*y.*z' against the
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4737 strings `x-' and `y-z-', if the two strings are
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4738 not consecutive in memory. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4739 DEBUG_PRINT1 ("Restoring best registers.\n");
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4740
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4741 d = match_end;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4742 dend = ((d >= string1 && d <= end1)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4743 ? end_match_1 : end_match_2);
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4744
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4745 for (reg = 1; reg < num_regs; reg++)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4746 {
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4747 regstart[reg] = best_regstart[reg];
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4748 regend[reg] = best_regend[reg];
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4749 }
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4750 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4751 } /* d != end_match_2 */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4752
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4753 succeed_label:
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4754 DEBUG_PRINT1 ("Accepting match.\n");
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4755
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4756 /* If caller wants register contents data back, do it. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4757 if (regs && !bufp->no_sub)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4758 {
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4759 /* Have the register data arrays been allocated? */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4760 if (bufp->regs_allocated == REGS_UNALLOCATED)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4761 { /* No. So allocate them with malloc. We need one
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4762 extra element beyond `num_regs' for the `-1' marker
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4763 GNU code uses. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4764 regs->num_regs = MAX (RE_NREGS, num_regs + 1);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4765 regs->start = TALLOC (regs->num_regs, regoff_t);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4766 regs->end = TALLOC (regs->num_regs, regoff_t);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4767 if (regs->start == NULL || regs->end == NULL)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4768 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4769 FREE_VARIABLES ();
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4770 return -2;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4771 }
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4772 bufp->regs_allocated = REGS_REALLOCATE;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4773 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4774 else if (bufp->regs_allocated == REGS_REALLOCATE)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4775 { /* Yes. If we need more elements than were already
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4776 allocated, reallocate them. If we need fewer, just
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4777 leave it alone. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4778 if (regs->num_regs < num_regs + 1)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4779 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4780 regs->num_regs = num_regs + 1;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4781 RETALLOC (regs->start, regs->num_regs, regoff_t);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4782 RETALLOC (regs->end, regs->num_regs, regoff_t);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4783 if (regs->start == NULL || regs->end == NULL)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4784 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4785 FREE_VARIABLES ();
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4786 return -2;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4787 }
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4788 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4789 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4790 else
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4791 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4792 /* These braces fend off a "empty body in an else-statement"
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4793 warning under GCC when assert expands to nothing. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4794 assert (bufp->regs_allocated == REGS_FIXED);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4795 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4796
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4797 /* Convert the pointer data in `regstart' and `regend' to
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4798 indices. Register zero has to be set differently,
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4799 since we haven't kept track of any info for it. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4800 if (regs->num_regs > 0)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4801 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4802 regs->start[0] = pos;
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4803 regs->end[0] = POINTER_TO_OFFSET (d);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4804 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4805
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4806 /* Go through the first `min (num_regs, regs->num_regs)'
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4807 registers, since that is all we initialized. */
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4808 for (reg = 1; reg < MIN (num_regs, regs->num_regs); reg++)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4809 {
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4810 if (REG_UNSET (regstart[reg]) || REG_UNSET (regend[reg]))
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4811 regs->start[reg] = regs->end[reg] = -1;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4812 else
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4813 {
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4814 regs->start[reg]
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4815 = (regoff_t) POINTER_TO_OFFSET (regstart[reg]);
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4816 regs->end[reg]
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4817 = (regoff_t) POINTER_TO_OFFSET (regend[reg]);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4818 }
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4819 }
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
4820
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4821 /* If the regs structure we return has more elements than
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4822 were in the pattern, set the extra elements to -1. If
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4823 we (re)allocated the registers, this is the case,
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4824 because we always allocate enough to have at least one
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4825 -1 at the end. */
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4826 for (reg = num_regs; reg < regs->num_regs; reg++)
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4827 regs->start[reg] = regs->end[reg] = -1;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4828 } /* regs && !bufp->no_sub */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4829
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4830 DEBUG_PRINT4 ("%u failure points pushed, %u popped (%u remain).\n",
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4831 nfailure_points_pushed, nfailure_points_popped,
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4832 nfailure_points_pushed - nfailure_points_popped);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4833 DEBUG_PRINT2 ("%u registers pushed.\n", num_regs_pushed);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4834
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4835 mcnt = POINTER_TO_OFFSET (d) - pos;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4836
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4837 DEBUG_PRINT2 ("Returning %d from re_match_2.\n", mcnt);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4838
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4839 FREE_VARIABLES ();
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4840 return mcnt;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4841 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4842
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4843 /* Otherwise match next pattern command. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4844 switch (SWITCH_ENUM_CAST ((re_opcode_t) *p++))
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4845 {
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4846 /* Ignore these. Used to ignore the n of succeed_n's which
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4847 currently have n == 0. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4848 case no_op:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4849 DEBUG_PRINT1 ("EXECUTING no_op.\n");
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4850 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4851
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4852 case succeed:
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4853 DEBUG_PRINT1 ("EXECUTING succeed.\n");
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4854 goto succeed_label;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4855
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4856 /* Match the next n pattern characters exactly. The following
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4857 byte in the pattern defines n, and the n bytes after that
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4858 are the characters to match. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4859 case exactn:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4860 mcnt = *p++;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4861 DEBUG_PRINT2 ("EXECUTING exactn %d.\n", mcnt);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4862
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4863 /* Remember the start point to rollback upon failure. */
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4864 dfail = d;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4865
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4866 /* This is written out as an if-else so we don't waste time
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4867 testing `translate' inside the loop. */
1328
0aa10b723959 Use RE_TRANSLATE_P to check whether translation is
Andreas Schwab <schwab@suse.de>
parents: 1326
diff changeset
4868 if (RE_TRANSLATE_P (translate))
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4869 {
1296
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4870 if (multibyte)
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4871 do
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4872 {
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4873 int pat_charlen, buf_charlen;
1312
a9a56c9deb21 (re_match_2_internal): Declare buf_ch unsigned int.
Richard Stallman <rms@gnu.org>
parents: 1297
diff changeset
4874 unsigned int pat_ch, buf_ch;
1296
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4875
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4876 PREFETCH ();
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4877 pat_ch = STRING_CHAR_AND_LENGTH (p, pend - p, pat_charlen);
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4878 buf_ch = STRING_CHAR_AND_LENGTH (d, dend - d, buf_charlen);
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4879
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4880 if (RE_TRANSLATE (translate, buf_ch)
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4881 != pat_ch)
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4882 {
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4883 d = dfail;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4884 goto fail;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4885 }
1296
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4886
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4887 p += pat_charlen;
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4888 d += buf_charlen;
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4889 mcnt -= pat_charlen;
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4890 }
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4891 while (mcnt > 0);
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4892 else
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4893 do
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4894 {
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4895 PREFETCH ();
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
4896 if (RE_TRANSLATE (translate, *d) != *p++)
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4897 {
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4898 d = dfail;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4899 goto fail;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4900 }
1381
24423cbaf6a9 (re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents: 1342
diff changeset
4901 d++;
1296
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4902 }
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4903 while (--mcnt);
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4904 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4905 else
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4906 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4907 do
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4908 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4909 PREFETCH ();
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4910 if (*d++ != *p++)
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4911 {
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4912 d = dfail;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4913 goto fail;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
4914 }
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4915 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4916 while (--mcnt);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4917 }
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4918 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4919
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4920
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4921 /* Match any character except possibly a newline or a null. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4922 case anychar:
1296
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4923 {
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4924 int buf_charlen;
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4925 re_wchar_t buf_ch;
1296
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4926
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4927 DEBUG_PRINT1 ("EXECUTING anychar.\n");
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4928
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4929 PREFETCH ();
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
4930 buf_ch = RE_STRING_CHAR_AND_LENGTH (d, dend - d, buf_charlen);
1296
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4931 buf_ch = TRANSLATE (buf_ch);
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4932
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4933 if ((!(bufp->syntax & RE_DOT_NEWLINE)
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4934 && buf_ch == '\n')
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4935 || ((bufp->syntax & RE_DOT_NOT_NULL)
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4936 && buf_ch == '\000'))
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4937 goto fail;
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4938
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4939 DEBUG_PRINT2 (" Matched `%d'.\n", *d);
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4940 d += buf_charlen;
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
4941 }
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4942 break;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4943
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4944
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4945 case charset:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4946 case charset_not:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4947 {
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4948 register unsigned int c;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4949 boolean not = (re_opcode_t) *(p - 1) == charset_not;
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4950 int len;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4951
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4952 /* Start of actual range_table, or end of bitmap if there is no
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4953 range table. */
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
4954 re_char *range_table;
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4955
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4956 /* Nonzero if there is a range table. */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4957 int range_table_exists;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4958
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4959 /* Number of ranges of range table. This is not included
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4960 in the initial byte-length of the command. */
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4961 int count = 0;
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4962
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
4963 DEBUG_PRINT2 ("EXECUTING charset%s.\n", not ? "_not" : "");
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
4964
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4965 range_table_exists = CHARSET_RANGE_TABLE_EXISTS_P (&p[-1]);
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4966
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4967 if (range_table_exists)
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4968 {
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4969 range_table = CHARSET_RANGE_TABLE (&p[-1]); /* Past the bitmap. */
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4970 EXTRACT_NUMBER_AND_INCR (count, range_table);
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4971 }
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4972
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
4973 PREFETCH ();
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
4974 c = RE_STRING_CHAR_AND_LENGTH (d, dend - d, len);
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
4975 c = TRANSLATE (c); /* The character to match. */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4976
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4977 if (SINGLE_BYTE_CHAR_P (c))
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4978 { /* Lookup bitmap. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4979 /* Cast to `unsigned' instead of `unsigned char' in
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4980 case the bit list is a full 32 bytes long. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4981 if (c < (unsigned) (CHARSET_BITMAP_SIZE (&p[-1]) * BYTEWIDTH)
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4982 && p[1 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH)))
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4983 not = !not;
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4984 }
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4985 #ifdef emacs
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
4986 else if (range_table_exists)
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4987 {
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4988 int class_bits = CHARSET_RANGE_TABLE_BITS (&p[-1]);
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4989
2851
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
4990 if ( (class_bits & BIT_LOWER && ISLOWER (c))
d2bf7ab893af (WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2849
diff changeset
4991 | (class_bits & BIT_MULTIBYTE)
1933
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4992 | (class_bits & BIT_PUNCT && ISPUNCT (c))
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4993 | (class_bits & BIT_SPACE && ISSPACE (c))
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4994 | (class_bits & BIT_UPPER && ISUPPER (c))
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4995 | (class_bits & BIT_WORD && ISWORD (c)))
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4996 not = !not;
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4997 else
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4998 CHARSET_LOOKUP_RANGE_TABLE_RAW (not, c, range_table, count);
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
4999 }
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
5000 #endif /* emacs */
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
5001
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
5002 if (range_table_exists)
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
5003 p = CHARSET_RANGE_TABLE_END (range_table, count);
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
5004 else
5ffa81ab1988 [emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents: 1660
diff changeset
5005 p += CHARSET_BITMAP_SIZE (&p[-1]) + 1;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5006
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5007 if (!not) goto fail;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5008
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5009 d += len;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5010 break;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5011 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5012
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5013
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5014 /* The beginning of a group is represented by start_memory.
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5015 The argument is the register number. The text
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5016 matched within the group is recorded (in the internal
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5017 registers data structure) under the register number. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5018 case start_memory:
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5019 DEBUG_PRINT2 ("EXECUTING start_memory %d:\n", *p);
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5020
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5021 /* In case we need to undo this operation (via backtracking). */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5022 PUSH_FAILURE_REG ((unsigned int)*p);
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5023
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5024 regstart[*p] = d;
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
5025 regend[*p] = NULL; /* probably unnecessary. -sm */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5026 DEBUG_PRINT2 (" regstart: %d\n", POINTER_TO_OFFSET (regstart[*p]));
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5027
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5028 /* Move past the register number and inner group count. */
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5029 p += 1;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5030 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5031
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5032
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5033 /* The stop_memory opcode represents the end of a group. Its
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5034 argument is the same as start_memory's: the register number. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5035 case stop_memory:
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5036 DEBUG_PRINT2 ("EXECUTING stop_memory %d:\n", *p);
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5037
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5038 assert (!REG_UNSET (regstart[*p]));
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5039 /* Strictly speaking, there should be code such as:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5040
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5041 assert (REG_UNSET (regend[*p]));
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5042 PUSH_FAILURE_REGSTOP ((unsigned int)*p);
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5043
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5044 But the only info to be pushed is regend[*p] and it is known to
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5045 be UNSET, so there really isn't anything to push.
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5046 Not pushing anything, on the other hand deprives us from the
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5047 guarantee that regend[*p] is UNSET since undoing this operation
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5048 will not reset its value properly. This is not important since
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5049 the value will only be read on the next start_memory or at
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5050 the very end and both events can only happen if this stop_memory
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5051 is *not* undone. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5052
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5053 regend[*p] = d;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5054 DEBUG_PRINT2 (" regend: %d\n", POINTER_TO_OFFSET (regend[*p]));
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5055
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5056 /* Move past the register number and the inner group count. */
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5057 p += 1;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5058 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5059
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5060
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5061 /* \<digit> has been turned into a `duplicate' command which is
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5062 followed by the numeric value of <digit> as the register number. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5063 case duplicate:
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5064 {
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
5065 register re_char *d2, *dend2;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5066 int regno = *p++; /* Get which register to match against. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5067 DEBUG_PRINT2 ("EXECUTING duplicate %d.\n", regno);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5068
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5069 /* Can't back reference a group which we've never matched. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5070 if (REG_UNSET (regstart[regno]) || REG_UNSET (regend[regno]))
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5071 goto fail;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5072
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5073 /* Where in input to try to start matching. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5074 d2 = regstart[regno];
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5075
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
5076 /* Remember the start point to rollback upon failure. */
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
5077 dfail = d;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
5078
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5079 /* Where to stop matching; if both the place to start and
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5080 the place to stop matching are in the same string, then
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5081 set to the place to stop, otherwise, for now have to use
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5082 the end of the first string. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5083
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5084 dend2 = ((FIRST_STRING_P (regstart[regno])
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5085 == FIRST_STRING_P (regend[regno]))
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5086 ? regend[regno] : end_match_1);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5087 for (;;)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5088 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5089 /* If necessary, advance to next segment in register
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5090 contents. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5091 while (d2 == dend2)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5092 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5093 if (dend2 == end_match_2) break;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5094 if (dend2 == regend[regno]) break;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5095
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5096 /* End of string1 => advance to string2. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5097 d2 = string2;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5098 dend2 = regend[regno];
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5099 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5100 /* At end of register contents => success */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5101 if (d2 == dend2) break;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5102
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5103 /* If necessary, advance to next segment in data. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5104 PREFETCH ();
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5105
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5106 /* How many characters left in this segment to match. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5107 mcnt = dend - d;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5108
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5109 /* Want how many consecutive characters we can match in
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5110 one shot, so, if necessary, adjust the count. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5111 if (mcnt > dend2 - d2)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5112 mcnt = dend2 - d2;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5113
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5114 /* Compare that many; failure if mismatch, else move
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5115 past them. */
1328
0aa10b723959 Use RE_TRANSLATE_P to check whether translation is
Andreas Schwab <schwab@suse.de>
parents: 1326
diff changeset
5116 if (RE_TRANSLATE_P (translate)
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5117 ? bcmp_translate (d, d2, mcnt, translate, multibyte)
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
5118 : memcmp (d, d2, mcnt))
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
5119 {
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
5120 d = dfail;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
5121 goto fail;
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
5122 }
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5123 d += mcnt, d2 += mcnt;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5124 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5125 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5126 break;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5127
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5128
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5129 /* begline matches the empty string at the beginning of the string
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5130 (unless `not_bol' is set in `bufp'), and after newlines. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5131 case begline:
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5132 DEBUG_PRINT1 ("EXECUTING begline.\n");
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5133
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5134 if (AT_STRINGS_BEG (d))
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5135 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5136 if (!bufp->not_bol) break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5137 }
2438
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
5138 else
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5139 {
2438
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
5140 unsigned char c;
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
5141 GET_CHAR_BEFORE_2 (c, d, string1, end1, string2, end2);
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5142 if (c == '\n')
2438
c6d2b36bed68 (re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2375
diff changeset
5143 break;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5144 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5145 /* In all other cases, we fail. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5146 goto fail;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5147
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5148
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5149 /* endline is the dual of begline. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5150 case endline:
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5151 DEBUG_PRINT1 ("EXECUTING endline.\n");
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5152
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5153 if (AT_STRINGS_END (d))
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5154 {
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5155 if (!bufp->not_eol) break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5156 }
2551
b341325934ed (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2537
diff changeset
5157 else
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5158 {
2551
b341325934ed (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2537
diff changeset
5159 PREFETCH_NOLIMIT ();
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5160 if (*d == '\n')
2551
b341325934ed (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2537
diff changeset
5161 break;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5162 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5163 goto fail;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5164
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5165
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5166 /* Match at the very beginning of the data. */
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5167 case begbuf:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5168 DEBUG_PRINT1 ("EXECUTING begbuf.\n");
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5169 if (AT_STRINGS_BEG (d))
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5170 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5171 goto fail;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5172
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5173
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5174 /* Match at the very end of the data. */
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5175 case endbuf:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5176 DEBUG_PRINT1 ("EXECUTING endbuf.\n");
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5177 if (AT_STRINGS_END (d))
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5178 break;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5179 goto fail;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5180
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5181
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5182 /* on_failure_keep_string_jump is used to optimize `.*\n'. It
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5183 pushes NULL as the value for the string on the stack. Then
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5184 `POP_FAILURE_POINT' will keep the current value for the
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5185 string, instead of restoring it. To see why, consider
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5186 matching `foo\nbar' against `.*\n'. The .* matches the foo;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5187 then the . fails against the \n. But the next thing we want
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5188 to do is match the \n against the \n; if we restored the
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5189 string value, we would be back at the foo.
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5190
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5191 Because this is used only in specific cases, we don't need to
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5192 check all the things that `on_failure_jump' does, to make
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5193 sure the right things get saved on the stack. Hence we don't
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5194 share its code. The only reason to push anything on the
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5195 stack at all is that otherwise we would have to change
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5196 `anychar's code to do something besides goto fail in this
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5197 case; that seems worse than this. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5198 case on_failure_keep_string_jump:
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5199 EXTRACT_NUMBER_AND_INCR (mcnt, p);
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5200 DEBUG_PRINT3 ("EXECUTING on_failure_keep_string_jump %d (to %p):\n",
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5201 mcnt, p + mcnt);
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5202
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5203 PUSH_FAILURE_POINT (p - 3, NULL);
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5204 break;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5205
2370
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5206 /* A nasty loop is introduced by the non-greedy *? and +?.
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5207 With such loops, the stack only ever contains one failure point
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5208 at a time, so that a plain on_failure_jump_loop kind of
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5209 cycle detection cannot work. Worse yet, such a detection
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5210 can not only fail to detect a cycle, but it can also wrongly
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5211 detect a cycle (between different instantiations of the same
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5212 loop.
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5213 So the method used for those nasty loops is a little different:
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5214 We use a special cycle-detection-stack-frame which is pushed
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5215 when the on_failure_jump_nastyloop failure-point is *popped*.
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5216 This special frame thus marks the beginning of one iteration
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5217 through the loop and we can hence easily check right here
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5218 whether something matched between the beginning and the end of
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5219 the loop. */
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5220 case on_failure_jump_nastyloop:
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5221 EXTRACT_NUMBER_AND_INCR (mcnt, p);
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5222 DEBUG_PRINT3 ("EXECUTING on_failure_jump_nastyloop %d (to %p):\n",
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5223 mcnt, p + mcnt);
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5224
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5225 assert ((re_opcode_t)p[-4] == no_op);
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5226 CHECK_INFINITE_LOOP (p - 4, d);
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5227 PUSH_FAILURE_POINT (p - 3, d);
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5228 break;
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5229
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
5230
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
5231 /* Simple loop detecting on_failure_jump: just check on the
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
5232 failure stack if the same spot was already hit earlier. */
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5233 case on_failure_jump_loop:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5234 on_failure:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5235 EXTRACT_NUMBER_AND_INCR (mcnt, p);
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5236 DEBUG_PRINT3 ("EXECUTING on_failure_jump_loop %d (to %p):\n",
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5237 mcnt, p + mcnt);
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5238
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5239 CHECK_INFINITE_LOOP (p - 3, d);
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5240 PUSH_FAILURE_POINT (p - 3, d);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5241 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5242
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5243
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5244 /* Uses of on_failure_jump:
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5245
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5246 Each alternative starts with an on_failure_jump that points
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5247 to the beginning of the next alternative. Each alternative
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5248 except the last ends with a jump that in effect jumps past
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5249 the rest of the alternatives. (They really jump to the
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5250 ending jump of the following alternative, because tensioning
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5251 these jumps is a hassle.)
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5252
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5253 Repeats start with an on_failure_jump that points past both
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5254 the repetition text and either the following jump or
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5255 pop_failure_jump back to this on_failure_jump. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5256 case on_failure_jump:
2913
9e8ab826e86c (IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents: 2912
diff changeset
5257 IMMEDIATE_QUIT_CHECK;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5258 EXTRACT_NUMBER_AND_INCR (mcnt, p);
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5259 DEBUG_PRINT3 ("EXECUTING on_failure_jump %d (to %p):\n",
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5260 mcnt, p + mcnt);
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5261
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5262 PUSH_FAILURE_POINT (p -3, d);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5263 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5264
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
5265 /* This operation is used for greedy *.
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5266 Compare the beginning of the repeat with what in the
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5267 pattern follows its end. If we can establish that there
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5268 is nothing that they would both match, i.e., that we
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5269 would have to backtrack because of (as in, e.g., `a*a')
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5270 then we can use a non-backtracking loop based on
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
5271 on_failure_keep_string_jump instead of on_failure_jump. */
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5272 case on_failure_jump_smart:
2913
9e8ab826e86c (IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents: 2912
diff changeset
5273 IMMEDIATE_QUIT_CHECK;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5274 EXTRACT_NUMBER_AND_INCR (mcnt, p);
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5275 DEBUG_PRINT3 ("EXECUTING on_failure_jump_smart %d (to %p).\n",
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5276 mcnt, p + mcnt);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5277 {
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5278 re_char *p1 = p; /* Next operation. */
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5279 /* Please don't add casts to try and shut up GCC. */
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5280 unsigned char *p2 = p + mcnt; /* Destination of the jump. */
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5281 unsigned char *p3 = p - 3; /* Location of the opcode. */
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5282
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5283 p -= 3; /* Reset so that we will re-execute the
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5284 instruction once it's been changed. */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5285
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
5286 EXTRACT_NUMBER (mcnt, p2 - 2);
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
5287
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
5288 /* Ensure this is a indeed the trivial kind of loop
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
5289 we are expecting. */
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
5290 assert (skip_one_char (p1) == p2 - 3);
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
5291 assert ((re_opcode_t) p2[-3] == jump && p2 + mcnt == p);
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
5292 DEBUG_STATEMENT (debug += 2);
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5293 if (mutually_exclusive_p (bufp, p1, p2))
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5294 {
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5295 /* Use a fast `on_failure_keep_string_jump' loop. */
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
5296 DEBUG_PRINT1 (" smart exclusive => fast loop.\n");
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5297 *p3 = (unsigned char) on_failure_keep_string_jump;
2355
0786b40fdf1c (RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2350
diff changeset
5298 STORE_NUMBER (p2 - 2, mcnt + 3);
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5299 }
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5300 else
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5301 {
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5302 /* Default to a safe `on_failure_jump' loop. */
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5303 DEBUG_PRINT1 (" smart default => slow loop.\n");
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5304 *p3 = (unsigned char) on_failure_jump;
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5305 }
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
5306 DEBUG_STATEMENT (debug -= 2);
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5307 }
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5308 break;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5309
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5310 /* Unconditionally jump (without popping any failure points). */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5311 case jump:
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5312 unconditional_jump:
2913
9e8ab826e86c (IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents: 2912
diff changeset
5313 IMMEDIATE_QUIT_CHECK;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5314 EXTRACT_NUMBER_AND_INCR (mcnt, p); /* Get the amount to jump. */
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5315 DEBUG_PRINT2 ("EXECUTING jump %d ", mcnt);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5316 p += mcnt; /* Do the jump. */
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5317 DEBUG_PRINT2 ("(to %p).\n", p);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5318 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5319
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5320
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5321 /* Have to succeed matching what follows at least n times.
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5322 After that, handle like `on_failure_jump'. */
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5323 case succeed_n:
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5324 /* Signedness doesn't matter since we only compare MCNT to 0. */
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5325 EXTRACT_NUMBER (mcnt, p + 2);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5326 DEBUG_PRINT2 ("EXECUTING succeed_n %d.\n", mcnt);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5327
2828
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
5328 /* Originally, mcnt is how many times we HAVE to succeed. */
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
5329 if (mcnt != 0)
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5330 {
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5331 /* Please don't add a cast to try and shut up GCC. */
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5332 unsigned char *p2 = p + 2; /* Location of the counter. */
2828
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
5333 mcnt--;
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5334 p += 4;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5335 PUSH_NUMBER (p2, mcnt);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5336 }
2828
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
5337 else
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
5338 /* The two bytes encoding mcnt == 0 are two no_op opcodes. */
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
5339 goto on_failure;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5340 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5341
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5342 case jump_n:
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5343 /* Signedness doesn't matter since we only compare MCNT to 0. */
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5344 EXTRACT_NUMBER (mcnt, p + 2);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5345 DEBUG_PRINT2 ("EXECUTING jump_n %d.\n", mcnt);
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5346
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5347 /* Originally, this is how many times we CAN jump. */
2828
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
5348 if (mcnt != 0)
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5349 {
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5350 /* Please don't add a cast to try and shut up GCC. */
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5351 unsigned char *p2 = p + 2; /* Location of the counter. */
2828
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
5352 mcnt--;
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5353 PUSH_NUMBER (p2, mcnt);
2828
a52061981f50 (PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2816
diff changeset
5354 goto unconditional_jump;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5355 }
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5356 /* If don't have to jump any more, skip over the rest of command. */
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5357 else
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5358 p += 4;
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5359 break;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5360
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5361 case set_number_at:
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5362 {
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5363 unsigned char *p2; /* Location of the counter. */
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5364 DEBUG_PRINT1 ("EXECUTING set_number_at.\n");
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5365
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5366 EXTRACT_NUMBER_AND_INCR (mcnt, p);
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5367 /* Please don't add a cast to try and shut up GCC. */
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5368 p2 = p + mcnt;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5369 /* Signedness doesn't matter since we only copy MCNT's bits . */
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5370 EXTRACT_NUMBER_AND_INCR (mcnt, p);
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5371 DEBUG_PRINT3 (" Setting %p to %d.\n", p2, mcnt);
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5372 PUSH_NUMBER (p2, mcnt);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5373 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5374 }
521
7089c3a3a164 (AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents: 515
diff changeset
5375
7089c3a3a164 (AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents: 515
diff changeset
5376 case wordbound:
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
5377 case notwordbound:
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
5378 not = (re_opcode_t) *(p - 1) == notwordbound;
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
5379 DEBUG_PRINT2 ("EXECUTING %swordbound.\n", not?"not":"");
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5380
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
5381 /* We SUCCEED (or FAIL) in one of the following cases: */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5382
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5383 /* Case 1: D is at the beginning or the end of string. */
521
7089c3a3a164 (AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents: 515
diff changeset
5384 if (AT_STRINGS_BEG (d) || AT_STRINGS_END (d))
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
5385 not = !not;
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5386 else
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5387 {
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5388 /* C1 is the character before D, S1 is the syntax of C1, C2
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5389 is the character at D, and S2 is the syntax of C2. */
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5390 re_wchar_t c1, c2;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5391 int s1, s2;
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5392 #ifdef emacs
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5393 int offset = PTR_TO_OFFSET (d - 1);
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5394 int charpos = SYNTAX_TABLE_BYTE_TO_CHAR (offset);
1204
28ff40a118b8 (re_search_2): Fix call to CHAR_HEAD_P.
Richard Stallman <rms@gnu.org>
parents: 1158
diff changeset
5395 UPDATE_SYNTAX_TABLE (charpos);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5396 #endif
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
5397 GET_CHAR_BEFORE_2 (c1, d, string1, end1, string2, end2);
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5398 s1 = SYNTAX (c1);
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5399 #ifdef emacs
1204
28ff40a118b8 (re_search_2): Fix call to CHAR_HEAD_P.
Richard Stallman <rms@gnu.org>
parents: 1158
diff changeset
5400 UPDATE_SYNTAX_TABLE_FORWARD (charpos + 1);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5401 #endif
2551
b341325934ed (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2537
diff changeset
5402 PREFETCH_NOLIMIT ();
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5403 c2 = RE_STRING_CHAR (d, dend - d);
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5404 s2 = SYNTAX (c2);
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5405
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5406 if (/* Case 2: Only one of S1 and S2 is Sword. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5407 ((s1 == Sword) != (s2 == Sword))
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5408 /* Case 3: Both of S1 and S2 are Sword, and macro
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5409 WORD_BOUNDARY_P (C1, C2) returns nonzero. */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5410 || ((s1 == Sword) && WORD_BOUNDARY_P (c1, c2)))
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
5411 not = !not;
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
5412 }
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
5413 if (not)
521
7089c3a3a164 (AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents: 515
diff changeset
5414 break;
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5415 else
521
7089c3a3a164 (AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents: 515
diff changeset
5416 goto fail;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5417
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5418 case wordbeg:
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5419 DEBUG_PRINT1 ("EXECUTING wordbeg.\n");
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5420
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5421 /* We FAIL in one of the following cases: */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5422
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5423 /* Case 1: D is at the end of string. */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5424 if (AT_STRINGS_END (d))
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
5425 goto fail;
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5426 else
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5427 {
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5428 /* C1 is the character before D, S1 is the syntax of C1, C2
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5429 is the character at D, and S2 is the syntax of C2. */
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5430 re_wchar_t c1, c2;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5431 int s1, s2;
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5432 #ifdef emacs
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5433 int offset = PTR_TO_OFFSET (d);
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5434 int charpos = SYNTAX_TABLE_BYTE_TO_CHAR (offset);
1218
51cf07183c67 (re_match_2_internal): Use SYNTAX_TABLE_BYTE_TO_CHAR.
Richard Stallman <rms@gnu.org>
parents: 1204
diff changeset
5435 UPDATE_SYNTAX_TABLE (charpos);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5436 #endif
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
5437 PREFETCH ();
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5438 c2 = RE_STRING_CHAR (d, dend - d);
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5439 s2 = SYNTAX (c2);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5440
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5441 /* Case 2: S2 is not Sword. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5442 if (s2 != Sword)
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5443 goto fail;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5444
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5445 /* Case 3: D is not at the beginning of string ... */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5446 if (!AT_STRINGS_BEG (d))
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5447 {
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5448 GET_CHAR_BEFORE_2 (c1, d, string1, end1, string2, end2);
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5449 #ifdef emacs
1204
28ff40a118b8 (re_search_2): Fix call to CHAR_HEAD_P.
Richard Stallman <rms@gnu.org>
parents: 1158
diff changeset
5450 UPDATE_SYNTAX_TABLE_BACKWARD (charpos - 1);
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5451 #endif
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5452 s1 = SYNTAX (c1);
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5453
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5454 /* ... and S1 is Sword, and WORD_BOUNDARY_P (C1, C2)
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5455 returns 0. */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5456 if ((s1 == Sword) && !WORD_BOUNDARY_P (c1, c2))
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5457 goto fail;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5458 }
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5459 }
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5460 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5461
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5462 case wordend:
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5463 DEBUG_PRINT1 ("EXECUTING wordend.\n");
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5464
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5465 /* We FAIL in one of the following cases: */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5466
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5467 /* Case 1: D is at the beginning of string. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5468 if (AT_STRINGS_BEG (d))
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5469 goto fail;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5470 else
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5471 {
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5472 /* C1 is the character before D, S1 is the syntax of C1, C2
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5473 is the character at D, and S2 is the syntax of C2. */
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5474 re_wchar_t c1, c2;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5475 int s1, s2;
1204
28ff40a118b8 (re_search_2): Fix call to CHAR_HEAD_P.
Richard Stallman <rms@gnu.org>
parents: 1158
diff changeset
5476 #ifdef emacs
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5477 int offset = PTR_TO_OFFSET (d) - 1;
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5478 int charpos = SYNTAX_TABLE_BYTE_TO_CHAR (offset);
1218
51cf07183c67 (re_match_2_internal): Use SYNTAX_TABLE_BYTE_TO_CHAR.
Richard Stallman <rms@gnu.org>
parents: 1204
diff changeset
5479 UPDATE_SYNTAX_TABLE (charpos);
1204
28ff40a118b8 (re_search_2): Fix call to CHAR_HEAD_P.
Richard Stallman <rms@gnu.org>
parents: 1158
diff changeset
5480 #endif
2350
f3edfed6aa96 (re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2349
diff changeset
5481 GET_CHAR_BEFORE_2 (c1, d, string1, end1, string2, end2);
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5482 s1 = SYNTAX (c1);
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5483
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5484 /* Case 2: S1 is not Sword. */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5485 if (s1 != Sword)
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5486 goto fail;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5487
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5488 /* Case 3: D is not at the end of string ... */
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5489 if (!AT_STRINGS_END (d))
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5490 {
2551
b341325934ed (PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2537
diff changeset
5491 PREFETCH_NOLIMIT ();
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5492 c2 = RE_STRING_CHAR (d, dend - d);
1204
28ff40a118b8 (re_search_2): Fix call to CHAR_HEAD_P.
Richard Stallman <rms@gnu.org>
parents: 1158
diff changeset
5493 #ifdef emacs
28ff40a118b8 (re_search_2): Fix call to CHAR_HEAD_P.
Richard Stallman <rms@gnu.org>
parents: 1158
diff changeset
5494 UPDATE_SYNTAX_TABLE_FORWARD (charpos);
28ff40a118b8 (re_search_2): Fix call to CHAR_HEAD_P.
Richard Stallman <rms@gnu.org>
parents: 1158
diff changeset
5495 #endif
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5496 s2 = SYNTAX (c2);
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5497
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5498 /* ... and S2 is Sword, and WORD_BOUNDARY_P (C1, C2)
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5499 returns 0. */
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5500 if ((s2 == Sword) && !WORD_BOUNDARY_P (c1, c2))
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5501 goto fail;
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5502 }
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5503 }
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5504 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5505
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5506 case syntaxspec:
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5507 case notsyntaxspec:
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5508 not = (re_opcode_t) *(p - 1) == notsyntaxspec;
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5509 mcnt = *p++;
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5510 DEBUG_PRINT3 ("EXECUTING %ssyntaxspec %d.\n", not?"not":"", mcnt);
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5511 PREFETCH ();
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5512 #ifdef emacs
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5513 {
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5514 int offset = PTR_TO_OFFSET (d);
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5515 int pos1 = SYNTAX_TABLE_BYTE_TO_CHAR (offset);
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5516 UPDATE_SYNTAX_TABLE (pos1);
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5517 }
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5518 #endif
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5519 {
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5520 int len;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5521 re_wchar_t c;
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5522
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5523 c = RE_STRING_CHAR_AND_LENGTH (d, dend - d, len);
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5524
2359
dbf725277cfc (enum syntaxcode): Provide default for non-Emacs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2357
diff changeset
5525 if ((SYNTAX (c) != (enum syntaxcode) mcnt) ^ not)
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5526 goto fail;
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5527 d += len;
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5528 }
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5529 break;
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5530
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5531 #ifdef emacs
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5532 case before_dot:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5533 DEBUG_PRINT1 ("EXECUTING before_dot.\n");
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
5534 if (PTR_BYTE_POS (d) >= PT_BYTE)
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5535 goto fail;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5536 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5537
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5538 case at_dot:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5539 DEBUG_PRINT1 ("EXECUTING at_dot.\n");
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
5540 if (PTR_BYTE_POS (d) != PT_BYTE)
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5541 goto fail;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5542 break;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5543
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5544 case after_dot:
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5545 DEBUG_PRINT1 ("EXECUTING after_dot.\n");
2349
5fa185a9956e * regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2345
diff changeset
5546 if (PTR_BYTE_POS (d) <= PT_BYTE)
941
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5547 goto fail;
a6403bc27be4 Fix up whitespace.
Richard Stallman <rms@gnu.org>
parents: 939
diff changeset
5548 break;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5549
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5550 case categoryspec:
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5551 case notcategoryspec:
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5552 not = (re_opcode_t) *(p - 1) == notcategoryspec;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5553 mcnt = *p++;
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5554 DEBUG_PRINT3 ("EXECUTING %scategoryspec %d.\n", not?"not":"", mcnt);
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5555 PREFETCH ();
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5556 {
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5557 int len;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5558 re_wchar_t c;
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5559
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5560 c = RE_STRING_CHAR_AND_LENGTH (d, dend - d, len);
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5561
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5562 if ((!CHAR_HAS_CATEGORY (c, mcnt)) ^ not)
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5563 goto fail;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5564 d += len;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5565 }
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5566 break;
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5567
2356
d93889e88226 (CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2355
diff changeset
5568 #endif /* emacs */
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5569
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5570 default:
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5571 abort ();
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5572 }
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5573 continue; /* Successfully executed one pattern command; keep going. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5574
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5575
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5576 /* We goto here if a matching operation fails. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5577 fail:
2913
9e8ab826e86c (IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents: 2912
diff changeset
5578 IMMEDIATE_QUIT_CHECK;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5579 if (!FAIL_STACK_EMPTY ())
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5580 {
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5581 re_char *str, *pat;
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5582 /* A restart point is known. Restore to that state. */
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5583 DEBUG_PRINT1 ("\nFAIL:\n");
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5584 POP_FAILURE_POINT (str, pat);
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5585 switch (SWITCH_ENUM_CAST ((re_opcode_t) *pat++))
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5586 {
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5587 case on_failure_keep_string_jump:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5588 assert (str == NULL);
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5589 goto continue_failure_jump;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5590
2370
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5591 case on_failure_jump_nastyloop:
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5592 assert ((re_opcode_t)pat[-2] == no_op);
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5593 PUSH_FAILURE_POINT (pat - 2, str);
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5594 /* Fallthrough */
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5595
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5596 case on_failure_jump_loop:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5597 case on_failure_jump:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5598 case succeed_n:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5599 d = str;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5600 continue_failure_jump:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5601 EXTRACT_NUMBER_AND_INCR (mcnt, pat);
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5602 p = pat + mcnt;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5603 break;
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5604
2370
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5605 case no_op:
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5606 /* A special frame used for nastyloops. */
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5607 goto fail;
d8ded9c0e20c (enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2359
diff changeset
5608
2345
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5609 default:
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5610 abort();
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5611 }
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5612
93d6633849d6 This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2153
diff changeset
5613 assert (p >= bufp->buffer && p <= pend);
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5614
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5615 if (d >= string1 && d <= end1)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5616 dend = end_match_1;
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5617 }
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5618 else
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5619 break; /* Matching at this starting point really fails. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5620 } /* for (;;) */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5621
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5622 if (best_regs_set)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5623 goto restore_best_regs;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5624
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5625 FREE_VARIABLES ();
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5626
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5627 return -1; /* Failure to match. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5628 } /* re_match_2 */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5629
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5630 /* Subroutine definitions for re_match_2. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5631
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5632 /* Return zero if TRANSLATE[S1] and TRANSLATE[S2] are identical for LEN
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5633 bytes; nonzero otherwise. */
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5634
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5635 static int
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5636 bcmp_translate (s1, s2, len, translate, multibyte)
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5637 re_char *s1, *s2;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5638 register int len;
501
f29b13c2cefd (TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard Stallman <rms@gnu.org>
parents: 490
diff changeset
5639 RE_TRANSLATE_TYPE translate;
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5640 const int multibyte;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5641 {
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5642 register re_char *p1 = s1, *p2 = s2;
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5643 re_char *p1_end = s1 + len;
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5644 re_char *p2_end = s2 + len;
1296
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
5645
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
5646 /* FIXME: Checking both p1 and p2 presumes that the two strings might have
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
5647 different lengths, but relying on a single `len' would break this. -sm */
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
5648 while (p1 < p1_end && p2 < p2_end)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5649 {
1296
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
5650 int p1_charlen, p2_charlen;
2921
15cff6b2cb7d More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2913
diff changeset
5651 re_wchar_t p1_ch, p2_ch;
1296
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
5652
2375
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5653 p1_ch = RE_STRING_CHAR_AND_LENGTH (p1, p1_end - p1, p1_charlen);
f25b865f900c * regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2372
diff changeset
5654 p2_ch = RE_STRING_CHAR_AND_LENGTH (p2, p2_end - p2, p2_charlen);
1296
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
5655
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
5656 if (RE_TRANSLATE (translate, p1_ch)
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
5657 != RE_TRANSLATE (translate, p2_ch))
963
ed0235161e4b (TRANSLATE, re_search_2, re_match_2_internal,bcmp_translate):
Richard Stallman <rms@gnu.org>
parents: 961
diff changeset
5658 return 1;
1296
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
5659
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
5660 p1 += p1_charlen, p2 += p2_charlen;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5661 }
1296
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
5662
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
5663 if (p1 != p1_end || p2 != p2_end)
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
5664 return 1;
7b938cc81ae2 (compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents: 1218
diff changeset
5665
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5666 return 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5667 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5668
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5669 /* Entry points for GNU code. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5670
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5671 /* re_compile_pattern is the GNU regular expression compiler: it
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5672 compiles PATTERN (of length SIZE) and puts the result in BUFP.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5673 Returns 0 if the pattern was valid, otherwise an error string.
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5674
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5675 Assumes the `allocated' (and perhaps `buffer') and `translate' fields
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5676 are set in BUFP on entry.
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5677
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5678 We call regex_compile to do the actual compilation. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5679
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5680 const char *
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5681 re_compile_pattern (pattern, length, bufp)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5682 const char *pattern;
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5683 size_t length;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5684 struct re_pattern_buffer *bufp;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5685 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5686 reg_errcode_t ret;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5687
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5688 /* GNU code is written to assume at least RE_NREGS registers will be set
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5689 (and at least one extra will be -1). */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5690 bufp->regs_allocated = REGS_UNALLOCATED;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5691
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5692 /* And GNU code determines whether or not to get register information
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5693 by passing null for the REGS argument to re_match, etc., not by
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5694 setting no_sub. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5695 bufp->no_sub = 0;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5696
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
5697 ret = regex_compile ((re_char*) pattern, length, re_syntax_options, bufp);
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5698
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5699 if (!ret)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5700 return NULL;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5701 return gettext (re_error_msgid[(int) ret]);
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5702 }
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5703 WEAK_ALIAS (__re_compile_pattern, re_compile_pattern)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5704
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5705 /* Entry points compatible with 4.2 BSD regex library. We don't define
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5706 them unless specifically requested. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5707
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5708 #if defined _REGEX_RE_COMP || defined _LIBC
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5709
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5710 /* BSD has one and only one pattern buffer. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5711 static struct re_pattern_buffer re_comp_buf;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5712
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5713 char *
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5714 # ifdef _LIBC
636
ddd029a89661 [_LIBC] (re_comp, re_exec): Use `weak_function' keyword in defn instead of
Roland McGrath <roland@gnu.org>
parents: 631
diff changeset
5715 /* Make these definitions weak in libc, so POSIX programs can redefine
ddd029a89661 [_LIBC] (re_comp, re_exec): Use `weak_function' keyword in defn instead of
Roland McGrath <roland@gnu.org>
parents: 631
diff changeset
5716 these names if they don't use our functions, and still use
ddd029a89661 [_LIBC] (re_comp, re_exec): Use `weak_function' keyword in defn instead of
Roland McGrath <roland@gnu.org>
parents: 631
diff changeset
5717 regcomp/regexec below without link errors. */
ddd029a89661 [_LIBC] (re_comp, re_exec): Use `weak_function' keyword in defn instead of
Roland McGrath <roland@gnu.org>
parents: 631
diff changeset
5718 weak_function
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5719 # endif
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5720 re_comp (s)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5721 const char *s;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5722 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5723 reg_errcode_t ret;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5724
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5725 if (!s)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5726 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5727 if (!re_comp_buf.buffer)
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5728 /* Yes, we're discarding `const' here if !HAVE_LIBINTL. */
2615
31b85fc23c04 (re_match, re_match_2): Protect calls to alloca (0).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2581
diff changeset
5729 return (char *) gettext ("No previous regular expression");
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5730 return 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5731 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5732
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5733 if (!re_comp_buf.buffer)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5734 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5735 re_comp_buf.buffer = (unsigned char *) malloc (200);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5736 if (re_comp_buf.buffer == NULL)
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5737 /* Yes, we're discarding `const' here if !HAVE_LIBINTL. */
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5738 return (char *) gettext (re_error_msgid[(int) REG_ESPACE]);
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5739 re_comp_buf.allocated = 200;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5740
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5741 re_comp_buf.fastmap = (char *) malloc (1 << BYTEWIDTH);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5742 if (re_comp_buf.fastmap == NULL)
2615
31b85fc23c04 (re_match, re_match_2): Protect calls to alloca (0).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2581
diff changeset
5743 /* Yes, we're discarding `const' here if !HAVE_LIBINTL. */
31b85fc23c04 (re_match, re_match_2): Protect calls to alloca (0).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2581
diff changeset
5744 return (char *) gettext (re_error_msgid[(int) REG_ESPACE]);
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5745 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5746
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5747 /* Since `re_exec' always passes NULL for the `regs' argument, we
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5748 don't need to initialize the pattern buffer fields which affect it. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5749
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5750 ret = regex_compile (s, strlen (s), re_syntax_options, &re_comp_buf);
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5751
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5752 if (!ret)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5753 return NULL;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5754
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5755 /* Yes, we're discarding `const' here if !HAVE_LIBINTL. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5756 return (char *) gettext (re_error_msgid[(int) ret]);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5757 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5758
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5759
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5760 int
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5761 # ifdef _LIBC
636
ddd029a89661 [_LIBC] (re_comp, re_exec): Use `weak_function' keyword in defn instead of
Roland McGrath <roland@gnu.org>
parents: 631
diff changeset
5762 weak_function
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5763 # endif
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5764 re_exec (s)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5765 const char *s;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5766 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5767 const int len = strlen (s);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5768 return
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5769 0 <= re_search (&re_comp_buf, s, len, 0, len, (struct re_registers *) 0);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5770 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5771 #endif /* _REGEX_RE_COMP */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5772
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5773 /* POSIX.2 functions. Don't define these for Emacs. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5774
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5775 #ifndef emacs
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5776
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5777 /* regcomp takes a regular expression as a string and compiles it.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5778
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5779 PREG is a regex_t *. We do not expect any fields to be initialized,
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5780 since POSIX says we shouldn't. Thus, we set
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5781
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5782 `buffer' to the compiled pattern;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5783 `used' to the length of the compiled pattern;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5784 `syntax' to RE_SYNTAX_POSIX_EXTENDED if the
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5785 REG_EXTENDED bit in CFLAGS is set; otherwise, to
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5786 RE_SYNTAX_POSIX_BASIC;
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5787 `fastmap' to an allocated space for the fastmap;
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5788 `fastmap_accurate' to zero;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5789 `re_nsub' to the number of subexpressions in PATTERN.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5790
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5791 PATTERN is the address of the pattern string.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5792
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5793 CFLAGS is a series of bits which affect compilation.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5794
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5795 If REG_EXTENDED is set, we use POSIX extended syntax; otherwise, we
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5796 use POSIX basic syntax.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5797
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5798 If REG_NEWLINE is set, then . and [^...] don't match newline.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5799 Also, regexec will try a match beginning after every newline.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5800
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5801 If REG_ICASE is set, then we considers upper- and lowercase
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5802 versions of letters to be equivalent when matching.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5803
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5804 If REG_NOSUB is set, then when PREG is passed to regexec, that
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5805 routine will report only success or failure, and nothing about the
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5806 registers.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5807
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5808 It returns 0 if it succeeds, nonzero if it doesn't. (See regex.h for
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5809 the return codes and their meanings.) */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5810
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5811 int
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5812 regcomp (preg, pattern, cflags)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5813 regex_t *preg;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5814 const char *pattern;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5815 int cflags;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5816 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5817 reg_errcode_t ret;
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
5818 reg_syntax_t syntax
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5819 = (cflags & REG_EXTENDED) ?
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5820 RE_SYNTAX_POSIX_EXTENDED : RE_SYNTAX_POSIX_BASIC;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5821
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5822 /* regex_compile will allocate the space for the compiled pattern. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5823 preg->buffer = 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5824 preg->allocated = 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5825 preg->used = 0;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5826
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5827 /* Try to allocate space for the fastmap. */
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5828 preg->fastmap = (char *) malloc (1 << BYTEWIDTH);
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5829
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5830 if (cflags & REG_ICASE)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5831 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5832 unsigned i;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5833
501
f29b13c2cefd (TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard Stallman <rms@gnu.org>
parents: 490
diff changeset
5834 preg->translate
f29b13c2cefd (TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard Stallman <rms@gnu.org>
parents: 490
diff changeset
5835 = (RE_TRANSLATE_TYPE) malloc (CHAR_SET_SIZE
f29b13c2cefd (TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard Stallman <rms@gnu.org>
parents: 490
diff changeset
5836 * sizeof (*(RE_TRANSLATE_TYPE)0));
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5837 if (preg->translate == NULL)
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5838 return (int) REG_ESPACE;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5839
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5840 /* Map uppercase characters to corresponding lowercase ones. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5841 for (i = 0; i < CHAR_SET_SIZE; i++)
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
5842 preg->translate[i] = ISUPPER (i) ? TOLOWER (i) : i;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5843 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5844 else
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5845 preg->translate = NULL;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5846
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5847 /* If REG_NEWLINE is set, newlines are treated differently. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5848 if (cflags & REG_NEWLINE)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5849 { /* REG_NEWLINE implies neither . nor [^...] match newline. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5850 syntax &= ~RE_DOT_NEWLINE;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5851 syntax |= RE_HAT_LISTS_NOT_NEWLINE;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5852 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5853 else
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5854 syntax |= RE_NO_NEWLINE_ANCHOR;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5855
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5856 preg->no_sub = !!(cflags & REG_NOSUB);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5857
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5858 /* POSIX says a null character in the pattern terminates it, so we
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5859 can use strlen here in compiling the pattern. */
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
5860 ret = regex_compile ((re_char*) pattern, strlen (pattern), syntax, preg);
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5861
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5862 /* POSIX doesn't distinguish between an unmatched open-group and an
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5863 unmatched close-group: both are REG_EPAREN. */
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5864 if (ret == REG_ERPAREN)
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5865 ret = REG_EPAREN;
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5866
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5867 if (ret == REG_NOERROR && preg->fastmap)
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5868 { /* Compute the fastmap now, since regexec cannot modify the pattern
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5869 buffer. */
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5870 re_compile_fastmap (preg);
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5871 if (preg->can_be_null)
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5872 { /* The fastmap can't be used anyway. */
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5873 free (preg->fastmap);
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5874 preg->fastmap = NULL;
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5875 }
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5876 }
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5877 return (int) ret;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5878 }
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5879 WEAK_ALIAS (__regcomp, regcomp)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5880
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5881
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5882 /* regexec searches for a given pattern, specified by PREG, in the
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5883 string STRING.
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5884
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5885 If NMATCH is zero or REG_NOSUB was set in the cflags argument to
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5886 `regcomp', we ignore PMATCH. Otherwise, we assume PMATCH has at
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5887 least NMATCH elements, and we set them to the offsets of the
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5888 corresponding matched substrings.
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5889
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5890 EFLAGS specifies `execution flags' which affect matching: if
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5891 REG_NOTBOL is set, then ^ does not match at the beginning of the
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5892 string; if REG_NOTEOL is set, then $ does not match at the end.
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5893
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5894 We return 0 if we find a match and REG_NOMATCH if not. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5895
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5896 int
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5897 regexec (preg, string, nmatch, pmatch, eflags)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5898 const regex_t *preg;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5899 const char *string;
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5900 size_t nmatch;
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5901 regmatch_t pmatch[];
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5902 int eflags;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5903 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5904 int ret;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5905 struct re_registers regs;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5906 regex_t private_preg;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5907 int len = strlen (string);
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5908 boolean want_reg_info = !preg->no_sub && nmatch > 0 && pmatch;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5909
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5910 private_preg = *preg;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5911
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5912 private_preg.not_bol = !!(eflags & REG_NOTBOL);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5913 private_preg.not_eol = !!(eflags & REG_NOTEOL);
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5914
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5915 /* The user has told us exactly how many registers to return
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5916 information about, via `nmatch'. We have to pass that on to the
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5917 matching routines. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5918 private_preg.regs_allocated = REGS_FIXED;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5919
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5920 if (want_reg_info)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5921 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5922 regs.num_regs = nmatch;
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
5923 regs.start = TALLOC (nmatch * 2, regoff_t);
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
5924 if (regs.start == NULL)
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5925 return (int) REG_NOMATCH;
2848
99ba697d0902 Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2841
diff changeset
5926 regs.end = regs.start + nmatch;
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5927 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5928
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5929 /* Instead of using not_eol to implement REG_NOTEOL, we could simply
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5930 pass (&private_preg, string, len + 1, 0, len, ...) pretending the string
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5931 was a little bit longer but still only matching the real part.
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5932 This works because the `endline' will check for a '\n' and will find a
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5933 '\0', correctly deciding that this is not the end of a line.
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5934 But it doesn't work out so nicely for REG_NOTBOL, since we don't have
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5935 a convenient '\0' there. For all we know, the string could be preceded
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5936 by '\n' which would throw things off. */
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5937
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5938 /* Perform the searching operation. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5939 ret = re_search (&private_preg, string, len,
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5940 /* start: */ 0, /* range: */ len,
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5941 want_reg_info ? &regs : (struct re_registers *) 0);
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5942
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5943 /* Copy the register information to the POSIX structure. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5944 if (want_reg_info)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5945 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5946 if (ret >= 0)
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5947 {
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5948 unsigned r;
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5949
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5950 for (r = 0; r < nmatch; r++)
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5951 {
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5952 pmatch[r].rm_so = regs.start[r];
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5953 pmatch[r].rm_eo = regs.end[r];
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5954 }
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5955 }
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5956
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5957 /* If we needed the temporary register info, free the space now. */
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5958 free (regs.start);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5959 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5960
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5961 /* We want zero return to mean success, unlike `re_search'. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5962 return ret >= 0 ? (int) REG_NOERROR : (int) REG_NOMATCH;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5963 }
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
5964 WEAK_ALIAS (__regexec, regexec)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5965
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5966
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5967 /* Returns a message corresponding to an error code, ERRCODE, returned
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5968 from either regcomp or regexec. We don't use PREG here. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5969
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5970 size_t
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5971 regerror (errcode, preg, errbuf, errbuf_size)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5972 int errcode;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5973 const regex_t *preg;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5974 char *errbuf;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5975 size_t errbuf_size;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5976 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5977 const char *msg;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5978 size_t msg_size;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5979
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5980 if (errcode < 0
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5981 || errcode >= (sizeof (re_error_msgid) / sizeof (re_error_msgid[0])))
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5982 /* Only error codes returned by the rest of the code should be passed
939
ace17b6e9d29 (PTR_TO_OFFSET): New macro.
Richard Stallman <rms@gnu.org>
parents: 786
diff changeset
5983 to this routine. If we are given anything else, or if other regex
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5984 code generates an invalid error code, then the program has a bug.
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5985 Dump core so we can fix it. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5986 abort ();
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5987
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5988 msg = gettext (re_error_msgid[errcode]);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5989
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5990 msg_size = strlen (msg) + 1; /* Includes the null. */
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
5991
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5992 if (errbuf_size != 0)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5993 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5994 if (msg_size > errbuf_size)
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5995 {
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5996 strncpy (errbuf, msg, errbuf_size - 1);
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5997 errbuf[errbuf_size - 1] = 0;
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
5998 }
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
5999 else
2841
a19cab2eaa6d * regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2828
diff changeset
6000 strcpy (errbuf, msg);
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6001 }
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6002
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6003 return msg_size;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6004 }
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
6005 WEAK_ALIAS (__regerror, regerror)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6006
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6007
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6008 /* Free dynamically allocated space used by PREG. */
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6009
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6010 void
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6011 regfree (preg)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6012 regex_t *preg;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6013 {
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6014 if (preg->buffer != NULL)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6015 free (preg->buffer);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6016 preg->buffer = NULL;
515
69ba3b63e1d1 (gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents: 511
diff changeset
6017
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6018 preg->allocated = 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6019 preg->used = 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6020
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6021 if (preg->fastmap != NULL)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6022 free (preg->fastmap);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6023 preg->fastmap = NULL;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6024 preg->fastmap_accurate = 0;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6025
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6026 if (preg->translate != NULL)
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6027 free (preg->translate);
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6028 preg->translate = NULL;
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6029 }
2849
a7cffadea321 * regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 2848
diff changeset
6030 WEAK_ALIAS (__regfree, regfree)
441
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6031
403b2dfdfa0b Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents: 438
diff changeset
6032 #endif /* not emacs */