Mercurial > hg > octave-kai > gnulib-hg
annotate regex.c @ 2909:d9e0603fc9d4
(regex_compile): Change the way of handling a range from a char less
than 256 to a char not less than 256.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Tue, 24 Oct 2000 08:10:27 +0000 |
| parents | 30949ab3be6d |
| children | 98856b23a038 |
| rev | line source |
|---|---|
| 679 | 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 | 3 internationalization features.) |
| 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 | 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 | 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 | 19 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
| 941 | 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]. |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
25 - replace succeed_n + jump_n with a combined operation so that the counter |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
26 can simply be decremented when popping the failure_point without having |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
27 to stack up failure_count entries. |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
28 */ |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
29 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
30 /* 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
|
31 #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
|
32 #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
|
33 #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
|
34 |
|
511
799190471f84
(NUM_FAILURE_ITEMS, POP_FAILURE_POINT, PUSH_FAILURE_POINT):
Richard Stallman <rms@gnu.org>
parents:
506
diff
changeset
|
35 #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
|
36 #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
|
37 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
38 #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
|
39 # 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
|
40 #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
|
41 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
42 #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
|
43 # include <stddef.h> |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
44 #else |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
45 /* 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
|
46 # include <sys/types.h> |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
47 #endif |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
48 |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
49 /* 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
|
50 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
|
51 #define WIDE_CHAR_SUPPORT \ |
|
2881
d3634ee92a43
(WIDE_CHAR_SUPPORT): Define if _LIBC as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2872
diff
changeset
|
52 (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
|
53 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
54 /* 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
|
55 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
|
56 #if WIDE_CHAR_SUPPORT |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
57 /* 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
|
58 # include <wchar.h> |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
59 # include <wctype.h> |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
60 #endif |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
61 |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
62 #ifdef _LIBC |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
63 /* 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
|
64 # 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
|
65 # 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
|
66 # 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
|
67 # 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
|
68 __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
|
69 # 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
|
70 __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
|
71 # 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
|
72 __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
|
73 # 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
|
74 __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
|
75 # 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
|
76 __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
|
77 # 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
|
78 __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
|
79 # 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
|
80 # 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
|
81 __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
|
82 # 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
|
83 |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
84 /* 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
|
85 # define btowc __btowc |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
86 # define iswctype __iswctype |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
87 # define wctype __wctype |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
88 |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
89 # 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
|
90 |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
91 /* 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
|
92 # include <locale/localeinfo.h> |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
93 # 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
|
94 # include <langinfo.h> |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
95 #else |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
96 # 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
|
97 #endif |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
98 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
99 /* 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
|
100 #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
|
101 # 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
|
102 #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
|
103 # 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
|
104 #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
|
105 |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
106 #ifndef gettext_noop |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
107 /* 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
|
108 strings. */ |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
109 # define gettext_noop(String) String |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
110 #endif |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
111 |
|
441
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 /* 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
|
113 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
|
114 #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
|
115 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
116 # include "lisp.h" |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
117 # include "buffer.h" |
| 939 | 118 |
| 119 /* 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
|
120 # 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
|
121 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
122 # include "syntax.h" |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
123 # include "charset.h" |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
124 # include "category.h" |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
125 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
126 # define malloc xmalloc |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
127 # define realloc xrealloc |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
128 # define free xfree |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
129 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
130 /* 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
|
131 # 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
|
132 # 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
|
133 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
134 # 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
|
135 # define RE_STRING_CHAR(p, s) \ |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
136 (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
|
137 # 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
|
138 (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
|
139 |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
140 /* 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
|
141 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
|
142 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
|
143 # 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
|
144 do { \ |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
145 if (multibyte) \ |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
146 { \ |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
147 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
|
148 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
|
149 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
|
150 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
|
151 } \ |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
152 else \ |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
153 (c = ((p) == (str2) ? (end1) : (p))[-1]); \ |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
154 } while (0) |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
155 |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
156 |
|
441
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 #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
|
158 |
|
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 /* 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
|
160 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
|
161 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
|
162 # undef REL_ALLOC |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
163 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
164 # 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
|
165 # include <stdlib.h> |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
166 # 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
|
167 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
|
168 char *realloc (); |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
169 # 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
|
170 |
|
451
b08ce70c8b7c
Undefined INHIBIT_STRING_HEADER when we have no
Karl Heuer <kwzh@gnu.org>
parents:
449
diff
changeset
|
171 /* 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
|
172 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
|
173 # 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
|
174 # 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
|
175 # 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
|
176 # 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
|
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 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
179 # endif |
|
451
b08ce70c8b7c
Undefined INHIBIT_STRING_HEADER when we have no
Karl Heuer <kwzh@gnu.org>
parents:
449
diff
changeset
|
180 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
181 /* 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
|
182 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
|
183 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
|
184 # 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
|
185 # 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
|
186 # include <string.h> |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
187 # ifndef bzero |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
188 # ifndef _LIBC |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
189 # 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
|
190 # else |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
191 # 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
|
192 # endif |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
193 # endif |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
194 # else |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
195 # include <strings.h> |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
196 # ifndef memcmp |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
197 # 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
|
198 # endif |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
199 # ifndef memcpy |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
200 # 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
|
201 # endif |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
202 # endif |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
203 # 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
|
204 |
|
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 /* 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
|
206 |
|
2359
dbf725277cfc
(enum syntaxcode): Provide default for non-Emacs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2357
diff
changeset
|
207 /* 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
|
208 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
|
209 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
210 # 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
|
211 # 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
|
212 # else |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
213 # 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
|
214 # endif |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
215 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
216 /* 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
|
217 # 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
|
218 # 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
|
219 # 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
|
220 # 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
|
221 # 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
|
222 # 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
|
223 # 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
|
224 # 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
|
225 # 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
|
226 # 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
|
227 # 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
|
228 # 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
|
229 # 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
|
230 # 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
|
231 # 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
|
232 # 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
|
233 (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
|
234 # 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
|
235 #endif /* not emacs */ |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
236 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
237 #ifndef RE_TRANSLATE |
|
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(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
|
239 # 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
|
240 #endif |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
241 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
242 /* 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
|
243 #include "regex.h" |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
244 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
245 /* 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
|
246 #include <ctype.h> |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
247 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
248 #ifdef emacs |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
249 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
250 /* 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
|
251 # 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
|
252 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
253 /* 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
|
254 # 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
|
255 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
256 /* 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
|
257 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
258 /* 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
|
259 # 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
|
260 # 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
|
261 # 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
|
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 || ((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
|
264 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
265 /* 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
|
266 # 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
|
267 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
268 /* 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
|
269 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
270 # 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
|
271 ? (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
|
272 : 1) |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
273 |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
274 # 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
|
275 ? (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
|
276 : 1) |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
277 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
278 # 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
|
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) >= 'A' && (c) <= 'Z') \ |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
281 || ((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
|
282 : SYNTAX (c) == Sword) |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
283 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
284 # 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
|
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 || ((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
|
287 : SYNTAX (c) == Sword) |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
288 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
289 # 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
|
290 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
291 # 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
|
292 ? ((c) > ' ' && (c) < 0177 \ |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
293 && !(((c) >= 'a' && (c) <= 'z') \ |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
294 || ((c) >= 'A' && (c) <= 'Z') \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
295 || ((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
|
296 : SYNTAX (c) != Sword) |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
297 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
298 # 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
|
299 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
300 # 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
|
301 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
302 # 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
|
303 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
304 #else /* not emacs */ |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
305 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
306 /* Jim Meyering writes: |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
307 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
308 "... 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
|
309 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
|
310 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
|
311 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
|
312 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
|
313 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
|
314 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
|
315 eliminate the && through constant folding." |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
316 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
|
317 |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
318 # undef ISASCII |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
319 # 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
|
320 # 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
|
321 # else |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
322 # 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
|
323 # endif |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
324 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
325 /* 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
|
326 # 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
|
327 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
328 /* 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
|
329 # 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
|
330 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
331 # ifdef isblank |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
332 # 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
|
333 # else |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
334 # 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
|
335 # endif |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
336 # ifdef isgraph |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
337 # 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
|
338 # else |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
339 # 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
|
340 # endif |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
341 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
342 # undef ISPRINT |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
343 # 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
|
344 # 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
|
345 # 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
|
346 # 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
|
347 # 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
|
348 # 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
|
349 # 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
|
350 # 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
|
351 # 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
|
352 # 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
|
353 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
354 # 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
|
355 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
356 # ifdef _tolower |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
357 # define TOLOWER(c) _tolower(c) |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
358 # else |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
359 # define TOLOWER(c) tolower(c) |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
360 # endif |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
361 |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
362 /* 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
|
363 # define CHAR_SET_SIZE 256 |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
364 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
365 # 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
|
366 |
|
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 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
|
368 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
369 # 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
|
370 |
|
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 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
|
372 |
|
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 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
|
374 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
|
375 { |
|
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 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
|
377 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
|
378 |
|
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 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
|
380 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
|
381 |
|
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 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
|
383 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
384 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
|
385 if (ISALNUM (c)) |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
386 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
|
387 |
|
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 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
|
389 |
|
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 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
|
391 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
392 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
393 # endif /* not SYNTAX_TABLE */ |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
394 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
395 # 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
|
396 |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
397 #endif /* not emacs */ |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
398 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
399 #ifndef NULL |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
400 # 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
|
401 #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
|
402 |
|
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 /* 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
|
404 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
|
405 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
|
406 (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
|
407 #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
|
408 #if __STDC__ |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
409 # 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
|
410 #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
|
411 /* 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
|
412 # 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
|
413 #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
|
414 |
|
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 /* 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
|
416 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
|
417 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
|
418 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
|
419 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
|
420 |
|
441
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 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
|
422 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
|
423 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
|
424 |
|
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 #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
|
426 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
427 # 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
|
428 # 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
|
429 # 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
|
430 |
|
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 #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
|
432 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
433 /* 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
|
434 # 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
|
435 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
436 /* 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
|
437 # ifdef __GNUC__ |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
438 # 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
|
439 # else /* not __GNUC__ */ |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
440 # 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
|
441 # include <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 /* HAVE_ALLOCA_H */ |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
443 # endif /* not __GNUC__ */ |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
444 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
445 # endif /* not alloca */ |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
446 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
447 # 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
|
448 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
449 /* 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
|
450 # 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
|
451 (destination = (char *) alloca (nsize), \ |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
452 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
|
453 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
454 /* 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
|
455 # 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
|
456 |
|
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 #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
|
458 |
|
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 /* 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
|
460 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
461 #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
|
462 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
463 # 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
|
464 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
|
465 # 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
|
466 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
|
467 # 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
|
468 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
|
469 |
|
462
115ffc5a3b13
Don't use relocatable allocator.
Richard Stallman <rms@gnu.org>
parents:
460
diff
changeset
|
470 #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
|
471 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
472 # ifdef REGEX_MALLOC |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
473 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
474 # 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
|
475 # 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
|
476 # 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
|
477 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
478 # 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
|
479 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
480 # 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
|
481 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
482 # 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
|
483 REGEX_REALLOCATE (source, osize, nsize) |
| 941 | 484 /* 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
|
485 # 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
|
486 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
487 # endif /* not REGEX_MALLOC */ |
|
462
115ffc5a3b13
Don't use relocatable allocator.
Richard Stallman <rms@gnu.org>
parents:
460
diff
changeset
|
488 #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
|
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 |
|
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 /* 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
|
492 `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
|
493 a good thing. */ |
| 941 | 494 #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
|
495 (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
|
496 |
|
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 /* (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
|
498 #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
|
499 #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
|
500 #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
|
501 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
|
502 #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
|
503 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
504 #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
|
505 |
|
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 #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
|
507 |
|
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 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
|
509 #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
|
510 #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
|
511 #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
|
512 |
|
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
|
513 /* 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
|
514 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
|
515 |
|
441
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 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
|
517 #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
|
518 #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
|
519 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
520 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
|
521 re_char *string1, int size1, |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
522 re_char *string2, int size2, |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
523 int pos, |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
524 struct re_registers *regs, |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
525 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
|
526 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
527 /* 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
|
528 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
|
529 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
|
530 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
|
531 |
|
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 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
|
533 { |
|
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 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
|
535 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
536 /* 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
|
537 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
|
538 |
| 941 | 539 /* 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
|
540 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
|
541 |
| 941 | 542 /* 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
|
543 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
|
544 |
| 941 | 545 /* Matches any one char belonging to specified set. First |
| 546 following byte is number of bitmap bytes. Then come bytes | |
| 547 for a bitmap saying which chars are in. Bits in each byte | |
| 548 are ordered low-bit-first. A character is in the set if its | |
| 549 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
|
550 automatically not in the set. |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
551 |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
552 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
|
553 is followed by a range table: |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
554 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
|
555 See RANGE_TABLE_WORK_BITS below. |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
556 2 bytes, the number of pairs that follow |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
557 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
|
558 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
|
559 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
|
560 |
| 941 | 561 /* 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
|
562 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
|
563 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
|
564 |
| 941 | 565 /* Start remembering the text that is matched, for storing in a |
| 566 register. Followed by one byte with the register number, in | |
| 567 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
|
568 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
|
569 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
|
570 |
| 941 | 571 /* Stop remembering the text that is matched and store it in a |
| 572 memory register. Followed by one byte with the register | |
| 573 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
|
574 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
|
575 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
|
576 |
| 941 | 577 /* 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
|
578 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
|
579 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
|
580 |
| 941 | 581 /* 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
|
582 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
|
583 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
584 /* 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
|
585 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
|
586 |
| 941 | 587 /* Succeeds if at beginning of buffer (if emacs) or at beginning |
| 588 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
|
589 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
|
590 |
| 941 | 591 /* 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
|
592 endbuf, |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
593 |
| 941 | 594 /* 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
|
595 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
|
596 |
| 941 | 597 /* Followed by two-byte relative address of place to resume at |
| 598 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
|
599 on_failure_jump, |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
600 |
| 941 | 601 /* Like on_failure_jump, but pushes a placeholder instead of the |
| 602 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
|
603 on_failure_keep_string_jump, |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
604 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
605 /* 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
|
606 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
|
607 indefinitely). */ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
608 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
|
609 |
|
2370
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
610 /* 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
|
611 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
|
612 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
|
613 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
|
614 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
|
615 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
616 /* 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
|
617 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
|
618 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
|
619 `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
|
620 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
|
621 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
|
622 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
|
623 |
| 941 | 624 /* 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
|
625 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
|
626 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
|
627 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
|
628 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
|
629 |
| 941 | 630 /* Followed by two-byte relative address, and two-byte number n. |
| 631 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
|
632 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
|
633 |
| 941 | 634 /* Set the following two-byte relative address to the |
| 635 subsequent two-byte number. The address *includes* the two | |
| 636 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
|
637 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
|
638 |
|
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 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
|
640 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
|
641 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
642 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
|
643 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
|
644 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
645 /* Matches any character whose syntax is specified. Followed by |
| 941 | 646 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
|
647 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
|
648 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
649 /* 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
|
650 notsyntaxspec |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
651 |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
652 #ifdef emacs |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
653 ,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
|
654 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
|
655 after_dot, /* Succeeds if after point. */ |
| 939 | 656 |
| 657 /* Matches any character whose category-set contains the specified | |
| 941 | 658 category. The operator is followed by a byte which contains a |
| 659 category code (mnemonic ASCII character). */ | |
| 939 | 660 categoryspec, |
| 661 | |
| 662 /* Matches any character whose category-set does not contain the | |
| 663 specified category. The operator is followed by a byte which | |
| 664 contains the category code (mnemonic ASCII character). */ | |
| 665 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
|
666 #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
|
667 } 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
|
668 |
|
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 /* 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
|
670 |
|
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 /* 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
|
672 |
|
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 #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
|
674 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
|
675 (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
|
676 (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
|
677 } 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
|
678 |
|
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 /* 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
|
680 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
|
681 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
|
682 |
|
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 #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
|
684 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
|
685 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
|
686 (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
|
687 } 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
|
688 |
|
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 /* 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
|
690 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
|
691 |
|
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 #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
|
693 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
|
694 (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
|
695 (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
|
696 } 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
|
697 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
698 #ifdef DEBUG |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
699 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
|
700 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
|
701 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
|
702 int *dest; |
|
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 unsigned char *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
|
704 { |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
705 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
|
706 *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
|
707 *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
|
708 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
709 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
710 # 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
|
711 # undef EXTRACT_NUMBER |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
712 # 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
|
713 # 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
|
714 |
|
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 #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
|
716 |
|
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 /* 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
|
718 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
|
719 |
|
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 #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
|
721 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
|
722 EXTRACT_NUMBER (destination, source); \ |
| 941 | 723 (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
|
724 } 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
|
725 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
726 #ifdef DEBUG |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
727 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
|
728 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
|
729 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
|
730 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
|
731 int *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
|
732 unsigned char **source; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
733 { |
|
441
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 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
|
735 *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
|
736 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
737 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
738 # ifndef EXTRACT_MACROS |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
739 # 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
|
740 # 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
|
741 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
|
742 # 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
|
743 |
|
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 #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
|
745 |
| 939 | 746 /* Store a multibyte character in three contiguous bytes starting |
| 747 DESTINATION, and increment DESTINATION to the byte after where the | |
| 941 | 748 character is stored. Therefore, DESTINATION must be an lvalue. */ |
| 939 | 749 |
| 750 #define STORE_CHARACTER_AND_INCR(destination, character) \ | |
| 751 do { \ | |
| 752 (destination)[0] = (character) & 0377; \ | |
| 753 (destination)[1] = ((character) >> 8) & 0377; \ | |
| 754 (destination)[2] = (character) >> 16; \ | |
| 755 (destination) += 3; \ | |
| 756 } while (0) | |
| 757 | |
| 758 /* Put into DESTINATION a character stored in three contiguous bytes | |
| 941 | 759 starting at SOURCE. */ |
| 939 | 760 |
| 761 #define EXTRACT_CHARACTER(destination, source) \ | |
| 762 do { \ | |
| 763 (destination) = ((source)[0] \ | |
| 764 | ((source)[1] << 8) \ | |
| 765 | ((source)[2] << 16)); \ | |
| 766 } while (0) | |
| 767 | |
| 768 | |
| 769 /* Macros for charset. */ | |
| 770 | |
| 771 /* Size of bitmap of charset P in bytes. P is a start of charset, | |
| 772 i.e. *P is (re_opcode_t) charset or (re_opcode_t) charset_not. */ | |
| 773 #define CHARSET_BITMAP_SIZE(p) ((p)[1] & 0x7F) | |
| 774 | |
| 775 /* Nonzero if charset P has range table. */ | |
| 941 | 776 #define CHARSET_RANGE_TABLE_EXISTS_P(p) ((p)[1] & 0x80) |
| 939 | 777 |
| 778 /* Return the address of range table of charset P. But not the start | |
| 779 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
|
780 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
|
781 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
|
782 #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
|
783 |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
784 /* 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
|
785 #define CHARSET_RANGE_TABLE_BITS(p) \ |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
786 ((p)[2 + CHARSET_BITMAP_SIZE (p)] \ |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
787 + (p)[3 + CHARSET_BITMAP_SIZE (p)] * 0x100) |
| 939 | 788 |
| 789 /* Test if C is listed in the bitmap of charset P. */ | |
| 790 #define CHARSET_LOOKUP_BITMAP(p, c) \ | |
| 791 ((c) < CHARSET_BITMAP_SIZE (p) * BYTEWIDTH \ | |
| 792 && (p)[2 + (c) / BYTEWIDTH] & (1 << ((c) % BYTEWIDTH))) | |
| 793 | |
| 794 /* Return the address of end of RANGE_TABLE. COUNT is number of | |
| 941 | 795 ranges (which is a pair of (start, end)) in the RANGE_TABLE. `* 2' |
| 796 is start of range and end of range. `* 3' is size of each start | |
| 939 | 797 and end. */ |
| 798 #define CHARSET_RANGE_TABLE_END(range_table, count) \ | |
| 799 ((range_table) + (count) * 2 * 3) | |
| 800 | |
| 941 | 801 /* Test if C is in RANGE_TABLE. A flag NOT is negated if C is in. |
| 939 | 802 COUNT is number of ranges in RANGE_TABLE. */ |
| 803 #define CHARSET_LOOKUP_RANGE_TABLE_RAW(not, c, range_table, count) \ | |
| 804 do \ | |
| 805 { \ | |
| 806 int range_start, range_end; \ | |
| 807 unsigned char *p; \ | |
| 808 unsigned char *range_table_end \ | |
| 809 = CHARSET_RANGE_TABLE_END ((range_table), (count)); \ | |
| 810 \ | |
| 811 for (p = (range_table); p < range_table_end; p += 2 * 3) \ | |
| 812 { \ | |
| 813 EXTRACT_CHARACTER (range_start, p); \ | |
| 814 EXTRACT_CHARACTER (range_end, p + 3); \ | |
| 815 \ | |
| 816 if (range_start <= (c) && (c) <= range_end) \ | |
| 817 { \ | |
| 818 (not) = !(not); \ | |
| 819 break; \ | |
| 820 } \ | |
| 821 } \ | |
| 822 } \ | |
| 823 while (0) | |
| 824 | |
| 825 /* Test if C is in range table of CHARSET. The flag NOT is negated if | |
| 826 C is listed in it. */ | |
| 827 #define CHARSET_LOOKUP_RANGE_TABLE(not, c, charset) \ | |
| 828 do \ | |
| 829 { \ | |
| 830 /* Number of ranges in range table. */ \ | |
| 831 int count; \ | |
| 832 unsigned char *range_table = CHARSET_RANGE_TABLE (charset); \ | |
| 833 \ | |
| 834 EXTRACT_NUMBER_AND_INCR (count, range_table); \ | |
| 835 CHARSET_LOOKUP_RANGE_TABLE_RAW ((not), (c), range_table, count); \ | |
| 836 } \ | |
| 837 while (0) | |
| 838 | |
|
441
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 /* 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
|
840 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
|
841 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
|
842 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
|
843 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
|
844 |
|
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 #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
|
846 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
847 /* 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
|
848 # 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
|
849 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
850 /* 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
|
851 # 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
|
852 |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
853 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
|
854 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
855 # 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
|
856 # 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
|
857 # 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
|
858 # 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
|
859 # 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
|
860 # 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
|
861 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
|
862 # 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
|
863 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
|
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 |
|
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 /* 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
|
867 |
|
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 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
|
869 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
|
870 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
|
871 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
872 unsigned was_a_range = 0; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
873 unsigned i = 0; |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
874 |
|
441
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 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
|
876 { |
|
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 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
|
878 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
879 was_a_range = 0; |
| 941 | 880 putchar (i - 1); |
| 881 while (i < (1 << BYTEWIDTH) && fastmap[i]) | |
| 882 { | |
| 883 was_a_range = 1; | |
| 884 i++; | |
| 885 } | |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
886 if (was_a_range) |
| 941 | 887 { |
| 888 printf ("-"); | |
| 889 putchar (i - 1); | |
| 890 } | |
| 891 } | |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
892 } |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
893 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
|
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 |
|
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 /* 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
|
898 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
|
899 |
|
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 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
|
901 print_partial_compiled_pattern (start, 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
|
902 unsigned char *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
|
903 unsigned char *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
|
904 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
905 int mcnt, mcnt2; |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
906 unsigned char *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
|
907 unsigned char *pend = 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
|
908 |
|
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 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
|
910 { |
|
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 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
|
912 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
|
913 } |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
914 |
|
441
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 /* 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
|
916 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
|
917 { |
|
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 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
|
919 |
|
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 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
|
921 { |
| 941 | 922 case no_op: |
| 923 printf ("/no_op"); | |
| 924 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
|
925 |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
926 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
|
927 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
|
928 break; |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
929 |
|
441
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 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
|
931 mcnt = *p++; |
| 941 | 932 printf ("/exactn/%d", mcnt); |
| 933 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
|
934 { |
| 941 | 935 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
|
936 putchar (*p++); |
| 941 | 937 } |
| 938 while (--mcnt); | |
| 939 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
|
940 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
941 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
|
942 printf ("/start_memory/%d", *p++); |
| 941 | 943 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
|
944 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
945 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
|
946 printf ("/stop_memory/%d", *p++); |
| 941 | 947 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
|
948 |
|
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 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
|
950 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
|
951 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
|
952 |
|
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 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
|
954 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
|
955 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
|
956 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
957 case charset: |
| 941 | 958 case charset_not: |
| 959 { | |
| 960 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
|
961 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
|
962 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
|
963 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
|
964 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
965 printf ("/charset [%s", |
| 941 | 966 (re_opcode_t) *(p - 1) == charset_not ? "^" : ""); |
| 967 | |
| 968 assert (p + *p < pend); | |
| 969 | |
| 970 for (c = 0; c < 256; c++) | |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
971 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
|
972 && (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
|
973 { |
|
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 /* 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
|
975 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
|
976 { |
|
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 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
|
978 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
|
979 } |
|
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 /* 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
|
981 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
|
982 { |
|
441
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 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
|
984 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
|
985 } |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
986 |
|
441
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 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
|
988 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
|
989 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
990 last = c; |
| 941 | 991 } |
|
441
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 |
|
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 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
|
994 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
|
995 |
|
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 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
|
997 |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
998 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
|
999 |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
1000 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
|
1001 { |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
1002 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
|
1003 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
|
1004 |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
1005 /* ??? 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
|
1006 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
|
1007 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
|
1008 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
|
1009 } |
|
441
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 } |
|
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 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
|
1012 |
|
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 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
|
1014 printf ("/begline"); |
| 941 | 1015 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
|
1016 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1017 case endline: |
| 941 | 1018 printf ("/endline"); |
| 1019 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
|
1020 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1021 case on_failure_jump: |
| 941 | 1022 extract_number_and_incr (&mcnt, &p); |
| 1023 printf ("/on_failure_jump to %d", p + mcnt - start); | |
| 1024 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
|
1025 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1026 case on_failure_keep_string_jump: |
| 941 | 1027 extract_number_and_incr (&mcnt, &p); |
| 1028 printf ("/on_failure_keep_string_jump to %d", p + mcnt - start); | |
| 1029 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
|
1030 |
|
2370
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
1031 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
|
1032 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
|
1033 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
|
1034 break; |
|
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
1035 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1036 case on_failure_jump_loop: |
| 941 | 1037 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
|
1038 printf ("/on_failure_jump_loop to %d", p + mcnt - start); |
| 941 | 1039 break; |
| 1040 | |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1041 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
|
1042 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
|
1043 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
|
1044 break; |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1045 |
| 941 | 1046 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
|
1047 extract_number_and_incr (&mcnt, &p); |
| 941 | 1048 printf ("/jump to %d", p + mcnt - start); |
| 679 | 1049 break; |
| 1050 | |
| 941 | 1051 case succeed_n: |
| 1052 extract_number_and_incr (&mcnt, &p); | |
| 1053 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
|
1054 printf ("/succeed_n to %d, %d times", p - 2 + mcnt - start, mcnt2); |
| 941 | 1055 break; |
| 1056 | |
| 1057 case jump_n: | |
| 1058 extract_number_and_incr (&mcnt, &p); | |
| 1059 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
|
1060 printf ("/jump_n to %d, %d times", p - 2 + mcnt - start, mcnt2); |
| 941 | 1061 break; |
| 1062 | |
| 1063 case set_number_at: | |
| 1064 extract_number_and_incr (&mcnt, &p); | |
| 1065 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
|
1066 printf ("/set_number_at location %d to %d", p - 2 + mcnt - start, mcnt2); |
| 941 | 1067 break; |
| 1068 | |
| 1069 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
|
1070 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
|
1071 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
|
1072 |
|
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 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
|
1074 printf ("/notwordbound"); |
| 941 | 1075 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
|
1076 |
|
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 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
|
1078 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
|
1079 break; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1080 |
|
441
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 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
|
1082 printf ("/wordend"); |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1083 |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1084 case syntaxspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1085 printf ("/syntaxspec"); |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1086 mcnt = *p++; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1087 printf ("/%d", mcnt); |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1088 break; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1089 |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1090 case notsyntaxspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1091 printf ("/notsyntaxspec"); |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1092 mcnt = *p++; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1093 printf ("/%d", mcnt); |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1094 break; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1095 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1096 # 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
|
1097 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
|
1098 printf ("/before_dot"); |
| 941 | 1099 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
|
1100 |
|
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 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
|
1102 printf ("/at_dot"); |
| 941 | 1103 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
|
1104 |
|
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 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
|
1106 printf ("/after_dot"); |
| 941 | 1107 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
|
1108 |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1109 case categoryspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1110 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
|
1111 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
|
1112 printf ("/%d", mcnt); |
| 941 | 1113 break; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1114 |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1115 case notcategoryspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1116 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
|
1117 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
|
1118 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
|
1119 break; |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1120 # 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
|
1121 |
|
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 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
|
1123 printf ("/begbuf"); |
| 941 | 1124 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
|
1125 |
|
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 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
|
1127 printf ("/endbuf"); |
| 941 | 1128 break; |
| 1129 | |
| 1130 default: | |
| 1131 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
|
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 |
|
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 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
|
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 |
|
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 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
|
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 |
|
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 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
|
1142 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
|
1143 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
|
1144 { |
|
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 unsigned char *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
|
1146 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1147 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
|
1148 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
|
1149 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
|
1150 |
|
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 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
|
1152 { |
|
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 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
|
1154 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
|
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 |
|
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 ("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
|
1158 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
|
1159 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
|
1160 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
|
1161 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
|
1162 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
|
1163 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
|
1164 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
|
1165 /* 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
|
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 |
|
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 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
|
1170 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
|
1171 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
|
1172 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
|
1173 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
|
1174 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
|
1175 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
|
1176 { |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1177 int this_char; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1178 |
|
441
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 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
|
1180 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
|
1181 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
|
1182 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1183 if (FIRST_STRING_P (where)) |
| 941 | 1184 { |
| 1185 for (this_char = where - string1; this_char < size1; this_char++) | |
| 1186 putchar (string1[this_char]); | |
| 1187 | |
| 1188 where = string2; | |
| 1189 } | |
|
441
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 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1191 for (this_char = where - string2; this_char < size2; this_char++) |
| 941 | 1192 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
|
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 |
|
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 #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
|
1197 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1198 # undef assert |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1199 # define assert(e) |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1200 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1201 # 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
|
1202 # 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
|
1203 # 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
|
1204 # 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
|
1205 # 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
|
1206 # 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
|
1207 # 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
|
1208 |
|
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 #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
|
1210 |
|
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 /* 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
|
1212 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
|
1213 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
|
1214 /* 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
|
1215 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
|
1216 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
|
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 |
|
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 /* 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
|
1220 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
|
1221 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
|
1222 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1223 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
|
1224 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
|
1225 |
|
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 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
|
1227 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
|
1228 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
|
1229 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1230 reg_syntax_t ret = re_syntax_options; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1231 |
|
441
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 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
|
1233 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
|
1234 } |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
1235 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
|
1236 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1237 /* 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
|
1238 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
|
1239 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
|
1240 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
|
1241 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1242 static const char *re_error_msgid[] = |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1243 { |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1244 gettext_noop ("Success"), /* REG_NOERROR */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1245 gettext_noop ("No match"), /* REG_NOMATCH */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1246 gettext_noop ("Invalid regular expression"), /* REG_BADPAT */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1247 gettext_noop ("Invalid collation character"), /* REG_ECOLLATE */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1248 gettext_noop ("Invalid character class name"), /* REG_ECTYPE */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1249 gettext_noop ("Trailing backslash"), /* REG_EESCAPE */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1250 gettext_noop ("Invalid back reference"), /* REG_ESUBREG */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1251 gettext_noop ("Unmatched [ or [^"), /* REG_EBRACK */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1252 gettext_noop ("Unmatched ( or \\("), /* REG_EPAREN */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1253 gettext_noop ("Unmatched \\{"), /* REG_EBRACE */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1254 gettext_noop ("Invalid content of \\{\\}"), /* REG_BADBR */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1255 gettext_noop ("Invalid range end"), /* REG_ERANGE */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1256 gettext_noop ("Memory exhausted"), /* REG_ESPACE */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1257 gettext_noop ("Invalid preceding regular expression"), /* REG_BADRPT */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1258 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
|
1259 gettext_noop ("Regular expression too big"), /* REG_ESIZE */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1260 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
|
1261 }; |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1262 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1263 /* 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
|
1264 |
|
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 /* 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
|
1266 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
|
1267 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
|
1268 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
|
1269 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
|
1270 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
|
1271 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
|
1272 |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1273 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
|
1274 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
|
1275 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
|
1276 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
|
1277 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
|
1278 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
|
1279 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
|
1280 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
|
1281 |
|
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 /* 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
|
1283 #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
|
1284 |
|
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 /* 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
|
1286 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
|
1287 #ifdef __GNUC__ |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1288 # 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
|
1289 #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
|
1290 |
|
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 /* 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
|
1292 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
|
1293 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
|
1294 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
|
1295 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
|
1296 #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
|
1297 # 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
|
1298 #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
|
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 |
|
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 /* 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
|
1302 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
|
1303 REGEX_ALLOCATE_STACK. */ |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1304 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1305 |
|
1156
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1306 /* 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
|
1307 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
|
1308 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
|
1309 #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
|
1310 # 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
|
1311 #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
|
1312 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1313 /* 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
|
1314 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
|
1315 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
|
1316 change it ourselves. */ |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
1317 # 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
|
1318 /* 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
|
1319 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
|
1320 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
|
1321 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
|
1322 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
|
1323 # else |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
1324 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
|
1325 # 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
|
1326 |
|
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 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
|
1328 { |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
1329 const unsigned char *pointer; |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
1330 /* 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
|
1331 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
|
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 |
|
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 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
|
1335 |
|
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 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
|
1337 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1338 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
|
1339 size_t size; |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
1340 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
|
1341 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
|
1342 } 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
|
1343 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1344 #define PATTERN_STACK_EMPTY() (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
|
1345 #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
|
1346 #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
|
1347 |
|
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 |
|
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 /* 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
|
1350 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
|
1351 |
|
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 #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
|
1353 # 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
|
1354 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
|
1355 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
|
1356 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
|
1357 * 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
|
1358 \ |
|
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 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
|
1360 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
|
1361 \ |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1362 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
|
1363 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
|
1364 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
|
1365 } 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
|
1366 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1367 # 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
|
1368 #else |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1369 # 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
|
1370 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
|
1371 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
|
1372 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
|
1373 } 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
|
1374 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1375 # 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
|
1376 #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
|
1377 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1378 |
|
1156
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1379 /* 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
|
1380 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
|
1381 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1382 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
|
1383 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
|
1384 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1385 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
|
1386 |
|
1156
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1387 /* 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
|
1388 when we increase it. |
|
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1389 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
|
1390 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
|
1391 were as ultimate, maximum-size stack. */ |
|
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1392 #define FAIL_STACK_GROWTH_FACTOR 4 |
|
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1393 |
|
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1394 #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
|
1395 (((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
|
1396 >= 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
|
1397 ? 0 \ |
|
1156
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1398 : ((fail_stack).stack \ |
|
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1399 = (fail_stack_elt_t *) \ |
| 941 | 1400 REGEX_REALLOCATE_STACK ((fail_stack).stack, \ |
| 1401 (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
|
1402 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
|
1403 ((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
|
1404 * 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
|
1405 \ |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1406 (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
|
1407 ? 0 \ |
|
1157
5aa89bba935d
(GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents:
1156
diff
changeset
|
1408 : ((fail_stack).size \ |
|
5aa89bba935d
(GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents:
1156
diff
changeset
|
1409 = (MIN (re_max_failures * TYPICAL_FAILURE_SIZE, \ |
|
5aa89bba935d
(GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents:
1156
diff
changeset
|
1410 ((fail_stack).size * sizeof (fail_stack_elt_t) \ |
|
5aa89bba935d
(GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents:
1156
diff
changeset
|
1411 * FAIL_STACK_GROWTH_FACTOR)) \ |
|
5aa89bba935d
(GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents:
1156
diff
changeset
|
1412 / sizeof (fail_stack_elt_t)), \ |
| 941 | 1413 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
|
1414 |
|
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 |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1416 /* Push pointer POINTER on 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
|
1417 Return 1 if was able to do so and 0 if ran out of memory allocating |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1418 space to do so. */ |
|
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 #define PUSH_PATTERN_OP(POINTER, 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
|
1420 ((FAIL_STACK_FULL () \ |
|
1156
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1421 && !GROW_FAIL_STACK (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
|
1422 ? 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
|
1423 : ((FAIL_STACK).stack[(FAIL_STACK).avail++].pointer = 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
|
1424 1)) |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1425 #define POP_PATTERN_OP() POP_FAILURE_POINTER () |
|
441
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 |
|
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 /* 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
|
1428 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
|
1429 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
|
1430 #define PUSH_FAILURE_POINTER(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 fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (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
|
1432 |
|
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 /* 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
|
1434 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
|
1435 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
|
1436 #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
|
1437 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
|
1438 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1439 /* 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
|
1440 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
|
1441 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
|
1442 #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
|
1443 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
|
1444 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1445 /* 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
|
1446 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
|
1447 #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
|
1448 #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
|
1449 #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
|
1450 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1451 /* 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
|
1452 #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
|
1453 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1454 /* 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
|
1455 #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
|
1456 #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
|
1457 #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
|
1458 #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
|
1459 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1460 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1461 #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
|
1462 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
|
1463 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
|
1464 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
|
1465 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
|
1466 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
|
1467 } |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1468 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1469 /* 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
|
1470 #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
|
1471 do { \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1472 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
|
1473 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
|
1474 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
|
1475 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
|
1476 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
|
1477 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
|
1478 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
|
1479 } 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
|
1480 |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1481 #define PUSH_FAILURE_COUNT(ptr) \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1482 do { \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1483 char *destination; \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1484 int c; \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1485 ENSURE_FAIL_STACK(3); \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1486 EXTRACT_NUMBER (c, ptr); \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1487 DEBUG_PRINT3 (" Push counter %p = %d\n", ptr, c); \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1488 PUSH_FAILURE_INT (c); \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1489 PUSH_FAILURE_POINTER (ptr); \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1490 PUSH_FAILURE_INT (-1); \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1491 } while (0) |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1492 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1493 /* Pop a saved register off the stack. */ |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1494 #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
|
1495 do { \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1496 int reg = POP_FAILURE_INT (); \ |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1497 if (reg == -1) \ |
|
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 /* It's a counter. */ \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1500 unsigned char *ptr = (unsigned char*) POP_FAILURE_POINTER (); \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1501 reg = POP_FAILURE_INT (); \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1502 STORE_NUMBER (ptr, reg); \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1503 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
|
1504 } \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1505 else \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1506 { \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1507 regend[reg] = POP_FAILURE_POINTER (); \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1508 regstart[reg] = POP_FAILURE_POINTER (); \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1509 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
|
1510 reg, regstart[reg], regend[reg]); \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1511 } \ |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1512 } 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
|
1513 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1514 /* 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
|
1515 #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
|
1516 do { \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1517 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
|
1518 /* 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
|
1519 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
|
1520 (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
|
1521 || 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
|
1522 { \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1523 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
|
1524 && 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
|
1525 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
|
1526 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
|
1527 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
|
1528 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
|
1529 } \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1530 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
|
1531 } 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
|
1532 |
|
441
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 /* 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
|
1534 if we ever fail back to it. |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1535 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1536 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
|
1537 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
|
1538 declared. |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1539 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1540 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
|
1541 |
|
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 #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
|
1543 do { \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1544 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
|
1545 /* 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
|
1546 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
|
1547 \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1548 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
|
1549 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
|
1550 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
|
1551 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
|
1552 \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1553 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
|
1554 \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1555 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
|
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 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
|
1558 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
|
1559 \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1560 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
|
1561 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
|
1562 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
|
1563 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
|
1564 \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1565 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
|
1566 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
|
1567 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
|
1568 \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1569 /* 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
|
1570 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
|
1571 } 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
|
1572 |
|
1156
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1573 /* 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
|
1574 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
|
1575 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
|
1576 |
|
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1577 #define TYPICAL_FAILURE_SIZE 20 |
|
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1578 |
|
441
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 /* 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
|
1580 #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
|
1581 |
|
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 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1583 /* 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
|
1584 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1585 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
|
1586 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
|
1587 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
|
1588 REGSTART, REGEND -- arrays of string positions. |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1589 |
|
441
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 Also assumes the variables `fail_stack' and (if debugging), `bufp', |
| 941 | 1591 `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
|
1592 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1593 #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
|
1594 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
|
1595 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
|
1596 \ |
|
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 /* 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
|
1598 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
|
1599 DEBUG_PRINT2 (" Before pop, next avail: %d\n", fail_stack.avail); \ |
| 941 | 1600 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
|
1601 \ |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1602 /* 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
|
1603 while (fail_stack.frame < fail_stack.avail) \ |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1604 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
|
1605 \ |
|
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 pat = (unsigned char *) POP_FAILURE_POINTER (); \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1607 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
|
1608 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
|
1609 \ |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1610 /* 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
|
1611 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
|
1612 saved NULL, thus retaining our current position in the 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
|
1613 str = (re_char *) 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
|
1614 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
|
1615 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
|
1616 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
|
1617 \ |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1618 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
|
1619 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
|
1620 \ |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1621 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
|
1622 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
|
1623 \ |
|
441
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 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
|
1625 } 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
|
1626 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1627 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1628 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1629 /* 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
|
1630 #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
|
1631 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1632 /* 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
|
1633 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1634 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
|
1635 reg_syntax_t syntax, |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1636 struct re_pattern_buffer *bufp)); |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1637 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
|
1638 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
|
1639 int arg1, int arg2)); |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1640 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
|
1641 int arg, unsigned char *end)); |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1642 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
|
1643 int arg1, int arg2, unsigned char *end)); |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1644 static boolean at_begline_loc_p _RE_ARGS ((const unsigned char *pattern, |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1645 const unsigned char *p, |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1646 reg_syntax_t syntax)); |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1647 static boolean at_endline_loc_p _RE_ARGS ((const unsigned char *p, |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1648 const unsigned char *pend, |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1649 reg_syntax_t syntax)); |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1650 static unsigned char *skip_one_char _RE_ARGS ((unsigned char *p)); |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1651 static int analyse_first _RE_ARGS ((unsigned char *p, unsigned char *pend, |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1652 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
|
1653 |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1654 /* Fetch the next character in the uncompiled pattern---translating it |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1655 if necessary. Also cast from a signed character in the constant |
|
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 string passed to us by the user to an unsigned char that we can 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
|
1657 as an array index (in, e.g., `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
|
1658 #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
|
1659 do { \ |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
1660 PATFETCH_RAW (c); \ |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
1661 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
|
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 /* 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
|
1665 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
|
1666 #define PATFETCH_RAW(c) \ |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
1667 do { \ |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
1668 int len; \ |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
1669 if (p == pend) return REG_EEND; \ |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
1670 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
|
1671 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
|
1672 } 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
|
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 /* 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
|
1676 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
|
1677 `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
|
1678 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
|
1679 #ifndef TRANSLATE |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1680 # 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
|
1681 (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
|
1682 #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
|
1683 |
|
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 /* 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
|
1686 |
|
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 /* 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
|
1688 #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
|
1689 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1690 /* 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
|
1691 #define GET_BUFFER_SPACE(n) \ |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1692 while ((unsigned long) (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
|
1693 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
|
1694 |
|
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 /* 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
|
1696 #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
|
1697 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
|
1698 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
|
1699 *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
|
1700 } 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
|
1701 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1702 |
|
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 /* 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
|
1704 #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
|
1705 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
|
1706 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
|
1707 *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
|
1708 *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
|
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 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1712 /* 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
|
1713 #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
|
1714 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
|
1715 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
|
1716 *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
|
1717 *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
|
1718 *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
|
1719 } 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
|
1720 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1721 |
|
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 /* 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
|
1723 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
|
1724 #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
|
1725 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
|
1726 |
|
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 /* 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
|
1728 #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
|
1729 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
|
1730 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1731 /* 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
|
1732 #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
|
1733 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
|
1734 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1735 /* 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
|
1736 #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
|
1737 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
|
1738 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1739 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1740 /* 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
|
1741 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
|
1742 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
|
1743 /* 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
|
1744 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
|
1745 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
|
1746 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
|
1747 You have been warned!! */ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1748 #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
|
1749 /* 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
|
1750 # define MAX_BUF_SIZE 65500L |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1751 #else |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1752 # 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
|
1753 #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
|
1754 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1755 /* 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
|
1756 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
|
1757 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
|
1758 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
|
1759 #if __BOUNDED_POINTERS__ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1760 # 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
|
1761 # define MOVE_BUFFER_POINTER(P) \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1762 (__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
|
1763 # 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
|
1764 else \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1765 { \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1766 SET_HIGH_BOUND (b); \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1767 SET_HIGH_BOUND (begalt); \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1768 if (fixup_alt_jump) \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1769 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
|
1770 if (laststart) \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1771 SET_HIGH_BOUND (laststart); \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1772 if (pending_exact) \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1773 SET_HIGH_BOUND (pending_exact); \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1774 } |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1775 #else |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1776 # 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
|
1777 # 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
|
1778 #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
|
1779 #define EXTEND_BUFFER() \ |
| 941 | 1780 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
|
1781 unsigned char *old_buffer = bufp->buffer; \ |
| 941 | 1782 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
|
1783 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
|
1784 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
|
1785 if (bufp->allocated > MAX_BUF_SIZE) \ |
| 941 | 1786 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
|
1787 bufp->buffer = (unsigned char *) realloc (bufp->buffer, bufp->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
|
1788 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
|
1789 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
|
1790 /* 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
|
1791 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
|
1792 { \ |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1793 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
|
1794 MOVE_BUFFER_POINTER (b); \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1795 MOVE_BUFFER_POINTER (begalt); \ |
| 941 | 1796 if (fixup_alt_jump) \ |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1797 MOVE_BUFFER_POINTER (fixup_alt_jump); \ |
| 941 | 1798 if (laststart) \ |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1799 MOVE_BUFFER_POINTER (laststart); \ |
| 941 | 1800 if (pending_exact) \ |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1801 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
|
1802 } \ |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1803 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
|
1804 } 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
|
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 /* 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
|
1808 {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
|
1809 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
|
1810 #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
|
1811 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1812 /* 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
|
1813 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
|
1814 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
|
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 |
|
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 /* 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
|
1818 |
|
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 /* 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
|
1820 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
|
1821 /* 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
|
1822 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
|
1823 |
|
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 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
|
1825 { |
|
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 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
|
1827 pattern_offset_t fixup_alt_jump; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1828 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
|
1829 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
|
1830 } 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
|
1831 |
|
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 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
|
1834 { |
|
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 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
|
1836 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
|
1837 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
|
1838 } 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
|
1839 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1840 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1841 #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
|
1842 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1843 #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
|
1844 #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
|
1845 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1846 /* 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
|
1847 #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
|
1848 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1849 |
| 939 | 1850 /* Structure to manage work area for range table. */ |
| 1851 struct range_table_work_area | |
| 1852 { | |
| 1853 int *table; /* actual work area. */ | |
| 1854 int allocated; /* allocated size for work area in bytes. */ | |
| 941 | 1855 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
|
1856 int bits; /* flag to record character classes */ |
| 939 | 1857 }; |
| 1858 | |
| 1859 /* Make sure that WORK_AREA can hold more N multibyte characters. */ | |
| 1860 #define EXTEND_RANGE_TABLE_WORK_AREA(work_area, n) \ | |
| 1861 do { \ | |
| 1862 if (((work_area).used + (n)) * sizeof (int) > (work_area).allocated) \ | |
| 1863 { \ | |
| 1864 (work_area).allocated += 16 * sizeof (int); \ | |
| 1865 if ((work_area).table) \ | |
| 1866 (work_area).table \ | |
| 1867 = (int *) realloc ((work_area).table, (work_area).allocated); \ | |
| 1868 else \ | |
| 1869 (work_area).table \ | |
| 1870 = (int *) malloc ((work_area).allocated); \ | |
| 1871 if ((work_area).table == 0) \ | |
| 1872 FREE_STACK_RETURN (REG_ESPACE); \ | |
| 1873 } \ | |
| 1874 } while (0) | |
| 1875 | |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
1876 #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
|
1877 (work_area).bits |= (bit) |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
1878 |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1879 /* 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
|
1880 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
|
1881 #define BIT_WORD 0x1 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1882 #define BIT_LOWER 0x2 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1883 #define BIT_PUNCT 0x4 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1884 #define BIT_SPACE 0x8 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1885 #define BIT_UPPER 0x10 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1886 #define BIT_MULTIBYTE 0x20 |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
1887 |
| 939 | 1888 /* Set a range (RANGE_START, RANGE_END) to WORK_AREA. */ |
| 1889 #define SET_RANGE_TABLE_WORK_AREA(work_area, range_start, range_end) \ | |
| 1890 do { \ | |
| 1891 EXTEND_RANGE_TABLE_WORK_AREA ((work_area), 2); \ | |
| 1892 (work_area).table[(work_area).used++] = (range_start); \ | |
| 1893 (work_area).table[(work_area).used++] = (range_end); \ | |
| 1894 } while (0) | |
| 1895 | |
| 941 | 1896 /* Free allocated memory for WORK_AREA. */ |
| 939 | 1897 #define FREE_RANGE_TABLE_WORK_AREA(work_area) \ |
| 1898 do { \ | |
| 1899 if ((work_area).table) \ | |
| 1900 free ((work_area).table); \ | |
| 1901 } while (0) | |
| 1902 | |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
1903 #define CLEAR_RANGE_TABLE_WORK_USED(work_area) ((work_area).used = 0, (work_area).bits = 0) |
| 939 | 1904 #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
|
1905 #define RANGE_TABLE_WORK_BITS(work_area) ((work_area).bits) |
| 939 | 1906 #define RANGE_TABLE_WORK_ELT(work_area, i) ((work_area).table[i]) |
| 1907 | |
| 1908 | |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1909 /* Set the bit for character C in a list. */ |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1910 #define SET_LIST_BIT(c) \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1911 (b[((unsigned char) (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
|
1912 |= 1 << (((unsigned char) c) % 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
|
1913 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1914 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1915 /* Get the next unsigned number in the uncompiled pattern. */ |
| 941 | 1916 #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
|
1917 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
|
1918 { \ |
| 941 | 1919 PATFETCH (c); \ |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1920 while ('0' <= c && c <= '9') \ |
| 941 | 1921 { \ |
| 1922 if (num < 0) \ | |
| 1923 num = 0; \ | |
| 1924 num = num * 10 + c - '0'; \ | |
| 1925 if (p == pend) \ | |
| 1926 break; \ | |
| 1927 PATFETCH (c); \ | |
| 1928 } \ | |
| 1929 } \ | |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
1930 } 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
|
1931 |
|
2881
d3634ee92a43
(WIDE_CHAR_SUPPORT): Define if _LIBC as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2872
diff
changeset
|
1932 #if WIDE_CHAR_SUPPORT |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1933 /* 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
|
1934 and the functions from ISO C amendement 1. */ |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1935 # ifdef CHARCLASS_NAME_MAX |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1936 # define CHAR_CLASS_MAX_LENGTH CHARCLASS_NAME_MAX |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1937 # else |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1938 /* 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
|
1939 problem. Use a reasonable default value. */ |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1940 # define CHAR_CLASS_MAX_LENGTH 256 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1941 # endif |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1942 typedef wctype_t re_wctype_t; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1943 # define re_wctype wctype |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1944 # define re_iswctype iswctype |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1945 # define re_wctype_to_bit(cc) 0 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1946 #else |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1947 # define CHAR_CLASS_MAX_LENGTH 9 /* Namely, `multibyte'. */ |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1948 # define btowc(c) c |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1949 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1950 /* Character classes' indices. */ |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1951 typedef enum { RECC_ERROR = 0, |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1952 RECC_ALNUM, RECC_ALPHA, RECC_WORD, |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1953 RECC_GRAPH, RECC_PRINT, |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1954 RECC_LOWER, RECC_UPPER, |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1955 RECC_PUNCT, RECC_CNTRL, |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1956 RECC_DIGIT, RECC_XDIGIT, |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1957 RECC_BLANK, RECC_SPACE, |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1958 RECC_MULTIBYTE, RECC_NONASCII, |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1959 RECC_ASCII, RECC_UNIBYTE |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1960 } re_wctype_t; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1961 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1962 /* 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
|
1963 static re_wctype_t |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1964 re_wctype (string) |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1965 unsigned char *string; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1966 { |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1967 if (STREQ (string, "alnum")) return RECC_ALNUM; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1968 else if (STREQ (string, "alpha")) return RECC_ALPHA; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1969 else if (STREQ (string, "word")) return RECC_WORD; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1970 else if (STREQ (string, "ascii")) return RECC_ASCII; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1971 else if (STREQ (string, "nonascii")) return RECC_NONASCII; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1972 else if (STREQ (string, "graph")) return RECC_GRAPH; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1973 else if (STREQ (string, "lower")) return RECC_LOWER; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1974 else if (STREQ (string, "print")) return RECC_PRINT; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1975 else if (STREQ (string, "punct")) return RECC_PUNCT; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1976 else if (STREQ (string, "space")) return RECC_SPACE; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1977 else if (STREQ (string, "upper")) return RECC_UPPER; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1978 else if (STREQ (string, "unibyte")) return RECC_UNIBYTE; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1979 else if (STREQ (string, "multibyte")) return RECC_MULTIBYTE; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1980 else if (STREQ (string, "digit")) return RECC_DIGIT; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1981 else if (STREQ (string, "xdigit")) return RECC_XDIGIT; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1982 else if (STREQ (string, "cntrl")) return RECC_CNTRL; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1983 else if (STREQ (string, "blank")) return RECC_BLANK; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1984 else return 0; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1985 } |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1986 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1987 /* 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
|
1988 static boolean |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1989 re_iswctype (ch, cc) |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1990 int ch; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1991 re_wctype_t cc; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1992 { |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1993 switch (cc) |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1994 { |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1995 case RECC_ALNUM: return ISALNUM (ch); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1996 case RECC_ALPHA: return ISALPHA (ch); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1997 case RECC_BLANK: return ISBLANK (ch); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1998 case RECC_CNTRL: return ISCNTRL (ch); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1999 case RECC_DIGIT: return ISDIGIT (ch); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2000 case RECC_GRAPH: return ISGRAPH (ch); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2001 case RECC_LOWER: return ISLOWER (ch); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2002 case RECC_PRINT: return ISPRINT (ch); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2003 case RECC_PUNCT: return ISPUNCT (ch); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2004 case RECC_SPACE: return ISSPACE (ch); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2005 case RECC_UPPER: return ISUPPER (ch); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2006 case RECC_XDIGIT: return ISXDIGIT (ch); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2007 case RECC_ASCII: return IS_REAL_ASCII (ch); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2008 case RECC_NONASCII: return !IS_REAL_ASCII (ch); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2009 case RECC_UNIBYTE: return ISUNIBYTE (ch); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2010 case RECC_MULTIBYTE: return !ISUNIBYTE (ch); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2011 case RECC_WORD: return ISWORD (ch); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2012 case RECC_ERROR: return false; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2013 } |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2014 } |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2015 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2016 /* 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
|
2017 chars of class CC. */ |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2018 static int |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2019 re_wctype_to_bit (cc) |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2020 re_wctype_t cc; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2021 { |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2022 switch (cc) |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2023 { |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2024 case RECC_NONASCII: case RECC_PRINT: case RECC_GRAPH: |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2025 case RECC_MULTIBYTE: return BIT_MULTIBYTE; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2026 case RECC_ALPHA: case RECC_ALNUM: case RECC_WORD: return BIT_WORD; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2027 case RECC_LOWER: return BIT_LOWER; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2028 case RECC_UPPER: return BIT_UPPER; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2029 case RECC_PUNCT: return BIT_PUNCT; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2030 case RECC_SPACE: return BIT_SPACE; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2031 case RECC_ASCII: case RECC_DIGIT: case RECC_XDIGIT: case RECC_CNTRL: |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2032 case RECC_BLANK: case RECC_UNIBYTE: case RECC_ERROR: return 0; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2033 } |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2034 } |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2035 #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
|
2036 |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
2037 /* QUIT is only used on NTemacs. */ |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
2038 #if !defined WINDOWSNT || !defined emacs || !defined QUIT |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
2039 # undef QUIT |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
2040 # define QUIT |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
2041 #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
|
2042 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2043 #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
|
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 /* 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
|
2046 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
|
2047 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
|
2048 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
|
2049 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
|
2050 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
|
2051 |
|
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 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
|
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 /* 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
|
2055 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
|
2056 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
|
2057 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
|
2058 |
|
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
|
2059 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
|
2060 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
|
2061 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2062 /* 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
|
2063 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
|
2064 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2065 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
|
2066 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
|
2067 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
|
2068 { |
|
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 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
|
2070 { |
|
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
|
2071 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
|
2072 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
|
2073 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
|
2074 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
|
2075 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2076 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
|
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 } |
|
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 #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
|
2081 |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
2082 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
|
2083 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
|
2084 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
|
2085 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2086 /* `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
|
2087 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
|
2088 |
|
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 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
|
2090 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
|
2091 |
|
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 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
|
2093 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
|
2094 `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
|
2095 `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
|
2096 `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
|
2097 `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
|
2098 `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
|
2099 `not_bol' and `not_eol' are zero; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
2100 |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
2101 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
|
2102 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
2103 /* 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
|
2104 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
|
2105 #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
|
2106 do { \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
2107 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
|
2108 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
|
2109 } 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
|
2110 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
2111 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2112 /* 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
|
2113 #define FREE_STACK_RETURN(value) \ |
| 939 | 2114 do { \ |
| 2115 FREE_RANGE_TABLE_WORK_AREA (range_table_work); \ | |
| 2116 free (compile_stack.stack); \ | |
| 2117 return value; \ | |
| 2118 } 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
|
2119 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2120 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
|
2121 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
|
2122 re_char *pattern; |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
2123 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
|
2124 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
|
2125 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
|
2126 { |
|
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 /* We fetch characters from PATTERN here. Even though 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
|
2128 `char *' (i.e., signed), we declare these variables as unsigned, so |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2129 they can be reliably used as array indices. */ |
| 939 | 2130 register unsigned int 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 | 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 | 2181 /* Work area for range table of charset. */ |
| 2182 struct range_table_work_area range_table_work; | |
| 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 | 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 | 2208 range_table_work.table = 0; |
| 2209 range_table_work.allocated = 0; | |
| 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 | 2233 enough space. This loses if buffer's address is bogus, but |
| 2234 that is the user's responsibility. */ | |
| 2235 RETALLOC (bufp->buffer, INIT_BUF_SIZE, unsigned char); | |
| 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 | 2238 { /* Caller did not allocate a buffer. Do it for them. */ |
| 2239 bufp->buffer = TALLOC (INIT_BUF_SIZE, unsigned char); | |
| 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 | 2254 { |
| 2255 case '^': | |
| 2256 { | |
| 2257 if ( /* If at start of pattern, it's an operator. */ | |
| 2258 p == pattern + 1 | |
| 2259 /* If context independent, it's an operator. */ | |
| 2260 || syntax & RE_CONTEXT_INDEP_ANCHORS | |
| 2261 /* Otherwise, depends on what's come before. */ | |
| 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 | 2264 else |
| 2265 goto normal_char; | |
| 2266 } | |
| 2267 break; | |
| 2268 | |
| 2269 | |
| 2270 case '$': | |
| 2271 { | |
| 2272 if ( /* If at end of pattern, it's an operator. */ | |
| 2273 p == pend | |
| 2274 /* If context independent, it's an operator. */ | |
| 2275 || syntax & RE_CONTEXT_INDEP_ANCHORS | |
| 2276 /* Otherwise, depends on what's next. */ | |
| 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 | 2279 else |
| 2280 goto normal_char; | |
| 2281 } | |
| 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 | 2286 case '?': |
| 2287 if ((syntax & RE_BK_PLUS_QM) | |
| 2288 || (syntax & RE_LIMITED_OPS)) | |
| 2289 goto normal_char; | |
| 2290 handle_plus: | |
| 2291 case '*': | |
| 2292 /* If there is no previous pattern... */ | |
| 2293 if (!laststart) | |
| 2294 { | |
| 2295 if (syntax & RE_CONTEXT_INVALID_OPS) | |
| 2296 FREE_STACK_RETURN (REG_BADRPT); | |
| 2297 else if (!(syntax & RE_CONTEXT_INDEP_OPS)) | |
| 2298 goto normal_char; | |
| 2299 } | |
| 2300 | |
| 2301 { | |
| 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 | 2305 |
| 2306 /* If there is a sequence of repetition chars, collapse it | |
| 2307 down to just one (the right one). We can't combine | |
| 2308 interval operators with these because of, e.g., `a{2}*', | |
| 2309 which should only match an even number of `a's. */ | |
| 2310 | |
| 2311 for (;;) | |
| 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 | 2321 |
| 2322 if (p == pend) | |
| 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 | 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 | 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 | 2336 } |
| 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 | 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 | 2342 |
| 2343 /* Star, etc. applied to an empty pattern is equivalent | |
| 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 | 2346 break; |
| 2347 | |
| 2348 /* Now we know whether or not zero matches is allowed | |
| 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 = |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
2357 (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
|
2358 on_failure_jump : on_failure_jump_loop; |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2359 assert (skip_one_char (laststart) <= b); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2360 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2361 if (!zero_times_ok && simple) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2362 { /* 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
|
2363 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
|
2364 into PP* if P is simple. */ |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2365 unsigned char *p1, *p2; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2366 startoffset = b - laststart; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2367 GET_BUFFER_SPACE (startoffset); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2368 p1 = b; p2 = laststart; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2369 while (p2 < p1) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2370 *b++ = *p2++; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2371 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
|
2372 } |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2373 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2374 GET_BUFFER_SPACE (6); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2375 if (!zero_times_ok) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2376 /* A + loop. */ |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
2377 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
|
2378 else |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2379 /* 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
|
2380 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
|
2381 that yet, we leave the decision up to |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2382 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
|
2383 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
|
2384 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
|
2385 b += 3; |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2386 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
|
2387 b += 3; |
| 941 | 2388 } |
| 2389 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
|
2390 { |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2391 /* A simple ? pattern. */ |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2392 assert (zero_times_ok); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2393 GET_BUFFER_SPACE (3); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2394 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
|
2395 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
|
2396 } |
|
2034
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2397 } |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2398 else /* not greedy */ |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2399 { /* 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
|
2400 |
|
2370
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
2401 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
|
2402 if (many_times_ok) |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2403 { |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
2404 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
|
2405 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
2406 /* 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
|
2407 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
|
2408 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
|
2409 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
|
2410 : 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
|
2411 b += 3; |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2412 if (zero_times_ok) |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2413 { |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2414 /* 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
|
2415 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
|
2416 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
|
2417 INSERT_JUMP (jump, laststart, b); |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2418 b += 3; |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2419 } |
|
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 else |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2422 { |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2423 /* non-greedy a?? */ |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2424 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
|
2425 b += 3; |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2426 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
|
2427 b += 3; |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2428 } |
|
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 } |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2431 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
|
2432 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
|
2433 |
|
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 case '.': |
| 941 | 2436 laststart = b; |
| 2437 BUF_PUSH (anychar); | |
| 2438 break; | |
| 2439 | |
| 2440 | |
| 2441 case '[': | |
| 2442 { | |
| 939 | 2443 CLEAR_RANGE_TABLE_WORK_USED (range_table_work); |
| 2444 | |
| 941 | 2445 if (p == pend) FREE_STACK_RETURN (REG_EBRACK); |
| 2446 | |
| 2447 /* Ensure that we have enough space to push a charset: the | |
| 2448 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
|
2449 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
|
2450 |
| 941 | 2451 laststart = b; |
| 2452 | |
| 2453 /* We test `*p == '^' twice, instead of using an if | |
| 2454 statement, so we only need one BUF_PUSH. */ | |
| 2455 BUF_PUSH (*p == '^' ? charset_not : charset); | |
| 2456 if (*p == '^') | |
| 2457 p++; | |
| 2458 | |
| 2459 /* Remember the first position in the bracket expression. */ | |
| 2460 p1 = p; | |
| 2461 | |
| 2462 /* Push the number of bytes in the bitmap. */ | |
| 2463 BUF_PUSH ((1 << BYTEWIDTH) / BYTEWIDTH); | |
| 2464 | |
| 2465 /* Clear the whole map. */ | |
| 2466 bzero (b, (1 << BYTEWIDTH) / BYTEWIDTH); | |
| 2467 | |
| 2468 /* charset_not matches newline according to a syntax bit. */ | |
| 2469 if ((re_opcode_t) b[-2] == charset_not | |
| 2470 && (syntax & RE_HAT_LISTS_NOT_NEWLINE)) | |
| 2471 SET_LIST_BIT ('\n'); | |
| 2472 | |
| 2473 /* Read in characters and ranges, setting map bits. */ | |
| 2474 for (;;) | |
| 2475 { | |
| 939 | 2476 boolean escaped_char = false; |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
2477 const unsigned char *p2 = p; |
| 939 | 2478 |
| 941 | 2479 if (p == pend) FREE_STACK_RETURN (REG_EBRACK); |
| 2480 | |
| 2481 PATFETCH (c); | |
| 2482 | |
| 2483 /* \ might escape characters inside [...] and [^...]. */ | |
| 2484 if ((syntax & RE_BACKSLASH_ESCAPE_IN_LISTS) && c == '\\') | |
| 2485 { | |
| 2486 if (p == pend) FREE_STACK_RETURN (REG_EESCAPE); | |
| 679 | 2487 |
| 2488 PATFETCH (c); | |
| 939 | 2489 escaped_char = true; |
| 941 | 2490 } |
| 939 | 2491 else |
| 2492 { | |
| 992 | 2493 /* Could be the end of the bracket expression. If it's |
| 2494 not (i.e., when the bracket expression is `[]' so | |
| 2495 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
|
2496 if (c == ']' && p2 != p1) |
| 992 | 2497 break; |
| 941 | 2498 } |
| 939 | 2499 |
| 2500 /* What should we do for the character which is | |
| 2501 greater than 0x7F, but not BASE_LEADING_CODE_P? | |
| 2502 XXX */ | |
| 2503 | |
| 941 | 2504 /* See if we're at the beginning of a possible character |
| 2505 class. */ | |
| 939 | 2506 |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
2507 if (!escaped_char && |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
2508 syntax & RE_CHAR_CLASSES && c == '[' && *p == ':') |
| 992 | 2509 { |
| 2510 /* Leave room for the null. */ | |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2511 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
|
2512 const unsigned char *class_beg; |
| 941 | 2513 |
| 2514 PATFETCH (c); | |
| 2515 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
|
2516 class_beg = p; |
| 941 | 2517 |
| 2518 /* If pattern is `[[:'. */ | |
| 2519 if (p == pend) FREE_STACK_RETURN (REG_EBRACK); | |
| 2520 | |
| 2521 for (;;) | |
| 2522 { | |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2523 PATFETCH (c); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2524 if ((c == ':' && *p == ']') || p == pend) |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2525 break; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2526 if (c1 < CHAR_CLASS_MAX_LENGTH) |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2527 str[c1++] = c; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2528 else |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2529 /* 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
|
2530 str[0] = '\0'; |
| 941 | 2531 } |
| 2532 str[c1] = '\0'; | |
| 939 | 2533 |
| 2534 /* If isn't a word bracketed by `[:' and `:]': | |
| 2535 undo the ending character, the letters, and | |
| 2536 leave the leading `:' and `[' (but set bits for | |
| 2537 them). */ | |
| 941 | 2538 if (c == ':' && *p == ']') |
| 2539 { | |
| 2540 int ch; | |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2541 re_wctype_t cc; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2542 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2543 cc = re_wctype (str); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2544 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2545 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
|
2546 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
|
2547 |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2548 /* 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
|
2549 class. */ |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2550 PATFETCH (c); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2551 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2552 if (p == pend) FREE_STACK_RETURN (REG_EBRACK); |
| 941 | 2553 |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
2554 /* Most character classes in a multibyte match |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
2555 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
|
2556 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
|
2557 they can only match ASCII characters. We |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2558 don't need to handle them for multibyte. |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2559 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
|
2560 |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
2561 if (multibyte) |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2562 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
|
2563 re_wctype_to_bit (cc)); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2564 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2565 for (ch = 0; ch < 1 << BYTEWIDTH; ++ch) |
| 941 | 2566 { |
|
692
1036844e8833
(regex_compile): Use TRANSLATE before calling SET_LIST_BIT.
Richard Stallman <rms@gnu.org>
parents:
680
diff
changeset
|
2567 int translated = TRANSLATE (ch); |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2568 if (re_iswctype (btowc (ch), cc)) |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
2569 SET_LIST_BIT (translated); |
| 941 | 2570 } |
| 939 | 2571 |
| 2572 /* Repeat the loop. */ | |
| 2573 continue; | |
| 941 | 2574 } |
| 2575 else | |
| 2576 { | |
|
2371
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
2577 /* 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
|
2578 p = class_beg; |
| 941 | 2579 SET_LIST_BIT ('['); |
| 939 | 2580 |
| 2581 /* Because the `:' may starts the range, we | |
| 2582 can't simply set bit and repeat the loop. | |
| 941 | 2583 Instead, just set it to C and handle below. */ |
| 939 | 2584 c = ':'; |
| 941 | 2585 } |
| 2586 } | |
| 939 | 2587 |
| 2588 if (p < pend && p[0] == '-' && p[1] != ']') | |
| 2589 { | |
| 2590 | |
| 2591 /* Discard the `-'. */ | |
| 2592 PATFETCH (c1); | |
| 2593 | |
| 2594 /* Fetch the character which ends the range. */ | |
| 2595 PATFETCH (c1); | |
| 2596 | |
|
2581
34ebbdf4dda0
(MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents:
2551
diff
changeset
|
2597 if (SINGLE_BYTE_CHAR_P (c)) |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
2598 { |
|
2581
34ebbdf4dda0
(MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents:
2551
diff
changeset
|
2599 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
|
2600 { |
|
2909
d9e0603fc9d4
(regex_compile): Change the way of handling a range from a char less
Kenichi Handa <handa@m17n.org>
parents:
2887
diff
changeset
|
2601 /* 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
|
2602 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
|
2603 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
|
2604 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
|
2605 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
|
2606 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
|
2607 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
|
2608 int charset = CHAR_CHARSET (c1); |
|
34ebbdf4dda0
(MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents:
2551
diff
changeset
|
2609 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
|
2610 |
|
34ebbdf4dda0
(MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents:
2551
diff
changeset
|
2611 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
|
2612 c2, c1); |
|
2909
d9e0603fc9d4
(regex_compile): Change the way of handling a range from a char less
Kenichi Handa <handa@m17n.org>
parents:
2887
diff
changeset
|
2613 c1 = 377; |
|
2581
34ebbdf4dda0
(MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents:
2551
diff
changeset
|
2614 } |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
2615 } |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
2616 else if (!SAME_CHARSET_P (c, c1)) |
| 939 | 2617 FREE_STACK_RETURN (REG_ERANGE); |
| 2618 } | |
| 941 | 2619 else |
| 939 | 2620 /* Range from C to C. */ |
| 2621 c1 = c; | |
| 2622 | |
| 2623 /* Set the range ... */ | |
| 2624 if (SINGLE_BYTE_CHAR_P (c)) | |
| 2625 /* ... into bitmap. */ | |
| 941 | 2626 { |
| 939 | 2627 unsigned this_char; |
| 2628 int range_start = c, range_end = c1; | |
| 2629 | |
| 2630 /* If the start is after the end, the range is empty. */ | |
| 2631 if (range_start > range_end) | |
| 2632 { | |
| 2633 if (syntax & RE_NO_EMPTY_RANGES) | |
| 2634 FREE_STACK_RETURN (REG_ERANGE); | |
| 2635 /* Else, repeat the loop. */ | |
| 679 | 2636 } |
| 2637 else | |
| 2638 { | |
| 939 | 2639 for (this_char = range_start; this_char <= range_end; |
| 2640 this_char++) | |
| 2641 SET_LIST_BIT (TRANSLATE (this_char)); | |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
2642 } |
| 941 | 2643 } |
| 679 | 2644 else |
| 939 | 2645 /* ... into range table. */ |
| 2646 SET_RANGE_TABLE_WORK_AREA (range_table_work, c, c1); | |
| 679 | 2647 } |
| 2648 | |
| 941 | 2649 /* Discard any (non)matching list bytes that are all 0 at the |
| 2650 end of the map. Decrease the map-length byte too. */ | |
| 2651 while ((int) b[-1] > 0 && b[b[-1] - 1] == 0) | |
| 2652 b[-1]--; | |
| 2653 b += b[-1]; | |
| 939 | 2654 |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
2655 /* Build real range table from work area. */ |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
2656 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
|
2657 || RANGE_TABLE_WORK_BITS (range_table_work)) |
| 939 | 2658 { |
| 2659 int i; | |
| 2660 int used = RANGE_TABLE_WORK_USED (range_table_work); | |
| 2661 | |
| 2662 /* 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
|
2663 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
|
2664 each character. */ |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
2665 GET_BUFFER_SPACE (4 + used * 3); |
| 939 | 2666 |
| 2667 /* Indicate the existence of range table. */ | |
| 2668 laststart[1] |= 0x80; | |
| 2669 | |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
2670 /* 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
|
2671 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
|
2672 *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
|
2673 *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
|
2674 |
| 939 | 2675 STORE_NUMBER_AND_INCR (b, used / 2); |
| 2676 for (i = 0; i < used; i++) | |
| 2677 STORE_CHARACTER_AND_INCR | |
| 2678 (b, RANGE_TABLE_WORK_ELT (range_table_work, i)); | |
| 2679 } | |
| 941 | 2680 } |
| 2681 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
|
2682 |
|
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 case '(': |
| 941 | 2685 if (syntax & RE_NO_BK_PARENS) |
| 2686 goto handle_open; | |
| 2687 else | |
| 2688 goto normal_char; | |
| 2689 | |
| 2690 | |
| 2691 case ')': | |
| 2692 if (syntax & RE_NO_BK_PARENS) | |
| 2693 goto handle_close; | |
| 2694 else | |
| 2695 goto normal_char; | |
| 2696 | |
| 2697 | |
| 2698 case '\n': | |
| 2699 if (syntax & RE_NEWLINE_ALT) | |
| 2700 goto handle_alt; | |
| 2701 else | |
| 2702 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
|
2703 |
|
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 case '|': |
| 941 | 2706 if (syntax & RE_NO_BK_VBAR) |
| 2707 goto handle_alt; | |
| 2708 else | |
| 2709 goto normal_char; | |
| 2710 | |
| 2711 | |
| 2712 case '{': | |
| 2713 if (syntax & RE_INTERVALS && syntax & RE_NO_BK_BRACES) | |
| 2714 goto handle_interval; | |
| 2715 else | |
| 2716 goto normal_char; | |
| 2717 | |
| 2718 | |
| 2719 case '\\': | |
| 2720 if (p == pend) FREE_STACK_RETURN (REG_EESCAPE); | |
| 2721 | |
| 2722 /* Do not translate the character after the \, so that we can | |
| 2723 distinguish, e.g., \B from \b, even if we normally would | |
| 2724 translate, e.g., B to b. */ | |
| 2725 PATFETCH_RAW (c); | |
| 2726 | |
| 2727 switch (c) | |
| 2728 { | |
| 2729 case '(': | |
| 2730 if (syntax & RE_NO_BK_PARENS) | |
| 2731 goto normal_backslash; | |
| 2732 | |
| 2733 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
|
2734 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
2735 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
|
2736 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
|
2737 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
2738 /* 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
|
2739 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
|
2740 { |
|
2371
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
2741 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
|
2742 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
|
2743 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
|
2744 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
2745 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
|
2746 default: |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
2747 /* 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
|
2748 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
|
2749 } |
|
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 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
|
2754 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
2755 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
|
2756 regnum++; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
2757 } |
| 941 | 2758 |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
2759 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
|
2760 { |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
2761 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
|
2762 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
|
2763 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
|
2764 |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
2765 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
|
2766 } |
|
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 /* 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
|
2769 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
|
2770 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
|
2771 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
|
2772 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
|
2773 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
|
2774 = 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
|
2775 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
|
2776 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
|
2777 |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
2778 /* 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
|
2779 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
|
2780 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
|
2781 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
|
2782 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
|
2783 |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
2784 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
|
2785 |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
2786 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
|
2787 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
|
2788 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
|
2789 /* 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
|
2790 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
|
2791 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
|
2792 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
|
2793 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
|
2794 } |
| 941 | 2795 |
| 2796 case ')': | |
| 2797 if (syntax & RE_NO_BK_PARENS) goto normal_backslash; | |
| 2798 | |
| 2799 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
|
2800 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
2801 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
|
2802 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
|
2803 else |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
2804 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
|
2805 } |
| 941 | 2806 |
| 2807 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
|
2808 FIXUP_ALT_JUMP (); |
| 941 | 2809 |
| 2810 /* See similar code for backslashed left paren above. */ | |
| 2811 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
|
2812 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
2813 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
|
2814 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
|
2815 else |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
2816 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
|
2817 } |
| 941 | 2818 |
| 2819 /* Since we just checked for an empty stack above, this | |
| 2820 ``can't happen''. */ | |
| 2821 assert (compile_stack.avail != 0); | |
| 2822 { | |
| 2823 /* We don't just want to restore into `regnum', because | |
| 2824 later groups should continue to be numbered higher, | |
| 2825 as in `(ab)c(de)' -- the second group is #2. */ | |
| 2826 regnum_t this_group_regnum; | |
| 2827 | |
| 2828 compile_stack.avail--; | |
| 2829 begalt = bufp->buffer + COMPILE_STACK_TOP.begalt_offset; | |
| 2830 fixup_alt_jump | |
| 2831 = COMPILE_STACK_TOP.fixup_alt_jump | |
| 2832 ? bufp->buffer + COMPILE_STACK_TOP.fixup_alt_jump - 1 | |
| 2833 : 0; | |
| 2834 laststart = bufp->buffer + COMPILE_STACK_TOP.laststart_offset; | |
| 2835 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
|
2836 /* 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
|
2837 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
|
2838 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
|
2839 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
|
2840 |
| 941 | 2841 /* We're at the end of the group, so now we know how many |
| 2842 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
|
2843 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
|
2844 BUF_PUSH_2 (stop_memory, this_group_regnum); |
| 941 | 2845 } |
| 2846 break; | |
| 2847 | |
| 2848 | |
| 2849 case '|': /* `\|'. */ | |
| 2850 if (syntax & RE_LIMITED_OPS || syntax & RE_NO_BK_VBAR) | |
| 2851 goto normal_backslash; | |
| 2852 handle_alt: | |
| 2853 if (syntax & RE_LIMITED_OPS) | |
| 2854 goto normal_char; | |
| 2855 | |
| 2856 /* Insert before the previous alternative a jump which | |
| 2857 jumps to this alternative if the former fails. */ | |
| 2858 GET_BUFFER_SPACE (3); | |
| 2859 INSERT_JUMP (on_failure_jump, begalt, b + 6); | |
| 2860 pending_exact = 0; | |
| 2861 b += 3; | |
| 2862 | |
| 2863 /* The alternative before this one has a jump after it | |
| 2864 which gets executed if it gets matched. Adjust that | |
| 2865 jump so it will jump to this alternative's analogous | |
| 2866 jump (put in below, which in turn will jump to the next | |
| 2867 (if any) alternative's such jump, etc.). The last such | |
| 2868 jump jumps to the correct final destination. A picture: | |
| 2869 _____ _____ | |
| 2870 | | | | | |
| 2871 | v | v | |
| 2872 a | b | c | |
| 2873 | |
| 2874 If we are at `b', then fixup_alt_jump right now points to a | |
| 2875 three-byte space after `a'. We'll put in the jump, set | |
| 2876 fixup_alt_jump to right after `b', and leave behind three | |
| 2877 bytes which we'll fill in when we get to after `c'. */ | |
| 2878 | |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
2879 FIXUP_ALT_JUMP (); |
| 941 | 2880 |
| 2881 /* Mark and leave space for a jump after this alternative, | |
| 2882 to be filled in later either by next alternative or | |
| 2883 when know we're at the end of a series of alternatives. */ | |
| 2884 fixup_alt_jump = b; | |
| 2885 GET_BUFFER_SPACE (3); | |
| 2886 b += 3; | |
| 2887 | |
| 2888 laststart = 0; | |
| 2889 begalt = b; | |
| 2890 break; | |
| 2891 | |
| 2892 | |
| 2893 case '{': | |
| 2894 /* If \{ is a literal. */ | |
| 2895 if (!(syntax & RE_INTERVALS) | |
| 2896 /* If we're at `\{' and it's not the open-interval | |
| 2897 operator. */ | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
2898 || (syntax & RE_NO_BK_BRACES)) |
| 941 | 2899 goto normal_backslash; |
| 2900 | |
| 2901 handle_interval: | |
| 2902 { | |
| 2903 /* If got here, then the syntax allows intervals. */ | |
| 2904 | |
| 2905 /* 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
|
2906 int lower_bound = 0, upper_bound = -1; |
| 941 | 2907 |
|
2371
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
2908 beg_interval = p; |
| 941 | 2909 |
| 2910 if (p == pend) | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
2911 FREE_STACK_RETURN (REG_EBRACE); |
| 941 | 2912 |
| 2913 GET_UNSIGNED_NUMBER (lower_bound); | |
| 2914 | |
| 2915 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
|
2916 GET_UNSIGNED_NUMBER (upper_bound); |
| 941 | 2917 else |
| 2918 /* Interval such as `{1}' => match exactly once. */ | |
| 2919 upper_bound = lower_bound; | |
| 2920 | |
| 2921 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
|
2922 || (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
|
2923 FREE_STACK_RETURN (REG_BADBR); |
| 941 | 2924 |
| 2925 if (!(syntax & RE_NO_BK_BRACES)) | |
| 2926 { | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
2927 if (c != '\\') |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
2928 FREE_STACK_RETURN (REG_BADBR); |
| 941 | 2929 |
| 2930 PATFETCH (c); | |
| 2931 } | |
| 2932 | |
| 2933 if (c != '}') | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
2934 FREE_STACK_RETURN (REG_BADBR); |
| 941 | 2935 |
| 2936 /* We just parsed a valid interval. */ | |
| 2937 | |
| 2938 /* If it's invalid to have no preceding re. */ | |
| 2939 if (!laststart) | |
| 2940 { | |
| 2941 if (syntax & RE_CONTEXT_INVALID_OPS) | |
| 2942 FREE_STACK_RETURN (REG_BADRPT); | |
| 2943 else if (syntax & RE_CONTEXT_INDEP_OPS) | |
| 2944 laststart = b; | |
| 2945 else | |
| 2946 goto unfetch_interval; | |
| 2947 } | |
| 2948 | |
| 2949 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
|
2950 /* 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
|
2951 altogether. */ |
|
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
2952 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
|
2953 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
|
2954 /* 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
|
2955 ; |
| 941 | 2956 |
| 2957 /* Otherwise, we have a nontrivial interval. When | |
| 2958 we're all done, the pattern will look like: | |
| 2959 set_number_at <jump count> <upper bound> | |
| 2960 set_number_at <succeed_n count> <lower bound> | |
| 2961 succeed_n <after jump addr> <succeed_n count> | |
| 2962 <body of loop> | |
| 2963 jump_n <succeed_n addr> <jump count> | |
| 2964 (The upper bound and `jump_n' are omitted if | |
| 2965 `upper_bound' is 1, though.) */ | |
| 2966 else | |
| 2967 { /* If the upper bound is > 1, we need to insert | |
| 2968 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
|
2969 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
|
2970 : 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
|
2971 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
|
2972 |
|
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
2973 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
|
2974 |
|
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
2975 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
|
2976 { |
|
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
2977 /* 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
|
2978 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
|
2979 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
|
2980 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
|
2981 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
|
2982 } |
|
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
2983 else |
|
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
2984 { |
|
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
2985 /* 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
|
2986 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
|
2987 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
|
2988 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
|
2989 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
|
2990 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
|
2991 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
|
2992 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
|
2993 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
|
2994 |
|
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
2995 /* 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
|
2996 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
|
2997 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
|
2998 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
|
2999 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
|
3000 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
|
3001 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
|
3002 } |
|
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 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
|
3005 { |
|
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
3006 /* 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
|
3007 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
|
3008 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
|
3009 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
|
3010 } |
|
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
3011 else if (upper_bound > 1) |
| 941 | 3012 { /* More than one repetition is allowed, so |
| 3013 append a backward jump to the `succeed_n' | |
| 3014 that starts this interval. | |
| 3015 | |
| 3016 When we've reached this during matching, | |
| 3017 we'll have matched the interval once, so | |
| 3018 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
|
3019 STORE_JUMP2 (jump_n, b, laststart + startoffset, |
| 941 | 3020 upper_bound - 1); |
| 3021 b += 5; | |
| 3022 | |
| 3023 /* The location we want to set is the second | |
| 3024 parameter of the `jump_n'; that is `b-2' as | |
| 3025 an absolute address. `laststart' will be | |
| 3026 the `set_number_at' we're about to insert; | |
| 3027 `laststart+3' the number to set, the source | |
| 3028 for the relative address. But we are | |
| 3029 inserting into the middle of the pattern -- | |
| 3030 so everything is getting moved up by 5. | |
| 3031 Conclusion: (b - 2) - (laststart + 3) + 5, | |
| 3032 i.e., b - laststart. | |
| 3033 | |
| 3034 We insert this at the beginning of the loop | |
| 3035 so that if we fail during matching, we'll | |
| 3036 reinitialize the bounds. */ | |
| 3037 insert_op2 (set_number_at, laststart, b - laststart, | |
| 3038 upper_bound - 1, b); | |
| 3039 b += 5; | |
| 3040 } | |
| 3041 } | |
| 3042 pending_exact = 0; | |
| 3043 beg_interval = NULL; | |
| 3044 } | |
| 3045 break; | |
| 3046 | |
| 3047 unfetch_interval: | |
| 3048 /* If an invalid interval, match the characters as literals. */ | |
| 3049 assert (beg_interval); | |
| 3050 p = beg_interval; | |
| 3051 beg_interval = NULL; | |
| 3052 | |
| 3053 /* 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
|
3054 c = '{'; |
| 941 | 3055 |
| 3056 if (!(syntax & RE_NO_BK_BRACES)) | |
| 3057 { | |
|
2371
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
3058 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
|
3059 goto normal_backslash; |
| 941 | 3060 } |
|
2371
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
3061 else |
|
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
3062 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
|
3063 |
|
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 #ifdef emacs |
| 941 | 3065 /* There is no way to specify the before_dot and after_dot |
| 3066 operators. rms says this is ok. --karl */ | |
| 3067 case '=': | |
| 3068 BUF_PUSH (at_dot); | |
| 3069 break; | |
| 3070 | |
| 3071 case 's': | |
| 3072 laststart = b; | |
| 3073 PATFETCH (c); | |
| 3074 BUF_PUSH_2 (syntaxspec, syntax_spec_code[c]); | |
| 3075 break; | |
| 3076 | |
| 3077 case 'S': | |
| 3078 laststart = b; | |
| 3079 PATFETCH (c); | |
| 3080 BUF_PUSH_2 (notsyntaxspec, syntax_spec_code[c]); | |
| 3081 break; | |
| 939 | 3082 |
| 3083 case 'c': | |
| 679 | 3084 laststart = b; |
| 939 | 3085 PATFETCH_RAW (c); |
| 3086 BUF_PUSH_2 (categoryspec, c); | |
| 679 | 3087 break; |
| 3088 | |
| 939 | 3089 case 'C': |
| 679 | 3090 laststart = b; |
| 939 | 3091 PATFETCH_RAW (c); |
| 3092 BUF_PUSH_2 (notcategoryspec, c); | |
| 679 | 3093 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
|
3094 #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
|
3095 |
|
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 |
| 941 | 3097 case 'w': |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3098 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
|
3099 goto normal_char; |
| 941 | 3100 laststart = b; |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3101 BUF_PUSH_2 (syntaxspec, Sword); |
| 941 | 3102 break; |
| 3103 | |
| 3104 | |
| 3105 case 'W': | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3106 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
|
3107 goto normal_char; |
| 941 | 3108 laststart = b; |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3109 BUF_PUSH_2 (notsyntaxspec, Sword); |
| 941 | 3110 break; |
| 3111 | |
| 3112 | |
| 3113 case '<': | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3114 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
|
3115 goto normal_char; |
| 941 | 3116 BUF_PUSH (wordbeg); |
| 3117 break; | |
| 3118 | |
| 3119 case '>': | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3120 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
|
3121 goto normal_char; |
| 941 | 3122 BUF_PUSH (wordend); |
| 3123 break; | |
| 3124 | |
| 3125 case 'b': | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3126 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
|
3127 goto normal_char; |
| 941 | 3128 BUF_PUSH (wordbound); |
| 3129 break; | |
| 3130 | |
| 3131 case 'B': | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3132 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
|
3133 goto normal_char; |
| 941 | 3134 BUF_PUSH (notwordbound); |
| 3135 break; | |
| 3136 | |
| 3137 case '`': | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3138 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
|
3139 goto normal_char; |
| 941 | 3140 BUF_PUSH (begbuf); |
| 3141 break; | |
| 3142 | |
| 3143 case '\'': | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3144 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
|
3145 goto normal_char; |
| 941 | 3146 BUF_PUSH (endbuf); |
| 3147 break; | |
| 3148 | |
| 3149 case '1': case '2': case '3': case '4': case '5': | |
| 3150 case '6': case '7': case '8': case '9': | |
| 3151 if (syntax & RE_NO_BK_REFS) | |
| 3152 goto normal_char; | |
| 3153 | |
| 3154 c1 = c - '0'; | |
| 3155 | |
| 3156 if (c1 > regnum) | |
| 3157 FREE_STACK_RETURN (REG_ESUBREG); | |
| 3158 | |
| 3159 /* 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
|
3160 if (group_in_compile_stack (compile_stack, (regnum_t) c1)) |
| 941 | 3161 goto normal_char; |
| 3162 | |
| 3163 laststart = b; | |
| 3164 BUF_PUSH_2 (duplicate, c1); | |
| 3165 break; | |
| 3166 | |
| 3167 | |
| 3168 case '+': | |
| 3169 case '?': | |
| 3170 if (syntax & RE_BK_PLUS_QM) | |
| 3171 goto handle_plus; | |
| 3172 else | |
| 3173 goto normal_backslash; | |
| 3174 | |
| 3175 default: | |
| 3176 normal_backslash: | |
| 3177 /* You might think it would be useful for \ to mean | |
| 3178 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
|
3179 it will never match anything. */ |
| 941 | 3180 c = TRANSLATE (c); |
| 3181 goto normal_char; | |
| 3182 } | |
| 3183 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
|
3184 |
|
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 default: |
| 941 | 3187 /* 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
|
3188 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
|
3189 /* If no exactn currently being built. */ |
| 941 | 3190 if (!pending_exact |
| 3191 | |
| 3192 /* If last exactn not at current position. */ | |
| 3193 || pending_exact + *pending_exact + 1 != b | |
| 3194 | |
| 3195 /* 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
|
3196 || *pending_exact >= (1 << BYTEWIDTH) - MAX_MULTIBYTE_LENGTH |
| 939 | 3197 |
| 941 | 3198 /* If followed by a repetition operator. */ |
|
1342
e5cbc689bc64
(regex_compile): When checking after exactn
Richard Stallman <rms@gnu.org>
parents:
1335
diff
changeset
|
3199 || (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
|
3200 || ((syntax & RE_BK_PLUS_QM) |
|
1342
e5cbc689bc64
(regex_compile): When checking after exactn
Richard Stallman <rms@gnu.org>
parents:
1335
diff
changeset
|
3201 ? p + 1 < pend && *p == '\\' && (p[1] == '+' || p[1] == '?') |
|
e5cbc689bc64
(regex_compile): When checking after exactn
Richard Stallman <rms@gnu.org>
parents:
1335
diff
changeset
|
3202 : 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
|
3203 || ((syntax & RE_INTERVALS) |
| 941 | 3204 && ((syntax & RE_NO_BK_BRACES) |
|
1342
e5cbc689bc64
(regex_compile): When checking after exactn
Richard Stallman <rms@gnu.org>
parents:
1335
diff
changeset
|
3205 ? p != pend && *p == '{' |
|
e5cbc689bc64
(regex_compile): When checking after exactn
Richard Stallman <rms@gnu.org>
parents:
1335
diff
changeset
|
3206 : 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
|
3207 { |
|
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 /* Start building a new exactn. */ |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3209 |
| 941 | 3210 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
|
3211 |
|
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 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
|
3213 pending_exact = b - 1; |
| 941 | 3214 } |
| 939 | 3215 |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
3216 GET_BUFFER_SPACE (MAX_MULTIBYTE_LENGTH); |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
3217 { |
|
2816
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3218 int len; |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3219 |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3220 if (multibyte) |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3221 len = CHAR_STRING (c, b); |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3222 else |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3223 *b = c, len = 1; |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
3224 b += len; |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
3225 (*pending_exact) += len; |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
3226 } |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
3227 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3228 break; |
| 941 | 3229 } /* 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
|
3230 } /* 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
|
3231 |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3232 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3233 /* Through the pattern now. */ |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3234 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3235 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
|
3236 |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3237 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
|
3238 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
|
3239 |
|
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 /* 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
|
3241 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
|
3242 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
|
3243 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
|
3244 |
|
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 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
|
3246 |
|
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 /* 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
|
3248 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
|
3249 |
|
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 #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
|
3251 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
|
3252 { |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3253 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
|
3254 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
|
3255 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
|
3256 } |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
3257 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
|
3258 #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
|
3259 |
|
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 #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
|
3261 /* 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
|
3262 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
|
3263 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
|
3264 { |
|
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 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
|
3266 |
|
1156
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
3267 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
|
3268 { |
|
1297
ac5117571763
(regex_compile) [!MATCH_MAY_ALLOCATE]: Fix paren error.
Richard Stallman <rms@gnu.org>
parents:
1296
diff
changeset
|
3269 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
|
3270 |
|
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 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
|
3272 fail_stack.stack |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3273 = (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
|
3274 * 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
|
3275 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
|
3276 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
|
3277 = (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
|
3278 (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
|
3279 * 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
|
3280 } |
|
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 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
|
3283 } |
|
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 #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
|
3285 |
|
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 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
|
3287 } /* 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
|
3288 |
|
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 /* 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
|
3290 |
| 941 | 3291 /* 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
|
3292 |
|
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 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
|
3294 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
|
3295 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
|
3296 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
|
3297 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
|
3298 { |
|
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 *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
|
3300 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
|
3301 } |
|
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 /* 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
|
3305 |
|
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 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
|
3307 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
|
3308 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
|
3309 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
|
3310 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
|
3311 { |
|
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 *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
|
3313 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
|
3314 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
|
3315 } |
|
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 /* 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
|
3319 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
|
3320 |
|
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 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
|
3322 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
|
3323 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
|
3324 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
|
3325 int arg; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3326 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
|
3327 { |
|
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 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
|
3329 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
|
3330 |
|
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 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
|
3332 *--pto = *--pfrom; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3333 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3334 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
|
3335 } |
|
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 /* 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
|
3339 |
|
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 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
|
3341 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
|
3342 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
|
3343 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
|
3344 int arg1, arg2; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3345 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
|
3346 { |
|
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 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
|
3348 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
|
3349 |
|
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 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
|
3351 *--pto = *--pfrom; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3352 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3353 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
|
3354 } |
|
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 /* 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
|
3358 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
|
3359 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
|
3360 |
|
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 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
|
3362 at_begline_loc_p (pattern, p, syntax) |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
3363 const unsigned 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
|
3364 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
|
3365 { |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
3366 const unsigned 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
|
3367 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
|
3368 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3369 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
|
3370 /* 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
|
3371 (*prev == '(' && (syntax & RE_NO_BK_PARENS || prev_prev_backslash)) |
| 941 | 3372 /* After an alternative? */ |
|
2537
c971620b680c
(at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2438
diff
changeset
|
3373 || (*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
|
3374 /* After a shy subexpression? */ |
|
c971620b680c
(at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2438
diff
changeset
|
3375 || ((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
|
3376 && prev[-1] == '?' && prev[-2] == '(' |
|
c971620b680c
(at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2438
diff
changeset
|
3377 && (syntax & RE_NO_BK_PARENS |
|
c971620b680c
(at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2438
diff
changeset
|
3378 || (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
|
3379 } |
|
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 /* 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
|
3383 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
|
3384 |
|
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 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
|
3386 at_endline_loc_p (p, pend, syntax) |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
3387 const unsigned char *p, *pend; |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
3388 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
|
3389 { |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
3390 const unsigned 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
|
3391 boolean next_backslash = *next == '\\'; |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
3392 const unsigned 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
|
3393 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3394 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
|
3395 /* 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
|
3396 (syntax & RE_NO_BK_PARENS ? *next == ')' |
| 941 | 3397 : 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
|
3398 /* 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
|
3399 || (syntax & RE_NO_BK_VBAR ? *next == '|' |
| 941 | 3400 : 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
|
3401 } |
|
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 |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3404 /* 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
|
3405 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
|
3406 |
|
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 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
|
3408 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
|
3409 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
|
3410 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
|
3411 { |
|
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 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
|
3413 |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3414 for (this_element = compile_stack.avail - 1; |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3415 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
|
3416 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
|
3417 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
|
3418 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
|
3419 |
|
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 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
|
3421 } |
|
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 |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3423 /* analyse_first. |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3424 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
|
3425 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
|
3426 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
|
3427 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
|
3428 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3429 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
|
3430 Return 0 if p..pend matches at least one char. |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3431 Return -1 if p..pend matches at least one char, but fastmap was not |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3432 updated accurately. |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3433 Return -2 if an error occurred. */ |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3434 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3435 static int |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3436 analyse_first (p, pend, fastmap, multibyte) |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3437 unsigned char *p, *pend; |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3438 char *fastmap; |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3439 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
|
3440 { |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3441 int j, k; |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3442 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
|
3443 #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
|
3444 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
|
3445 #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
|
3446 #ifndef 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
|
3447 char *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
|
3448 #endif |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3449 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
3450 #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
|
3451 /* 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
|
3452 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
|
3453 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
|
3454 #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
|
3455 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3456 /* Assume that each path through the pattern can be null until |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3457 proven otherwise. We set this false at the bottom of switch |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3458 statement, to which we get only if a particular path doesn'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
|
3459 match the empty 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
|
3460 boolean path_can_be_null = 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
|
3461 |
| 939 | 3462 /* If all elements for base leading-codes in fastmap is set, this |
| 941 | 3463 flag is set true. */ |
| 939 | 3464 boolean match_any_multibyte_characters = false; |
| 3465 | |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3466 assert (p); |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3467 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3468 INIT_FAIL_STACK (); |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3469 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3470 /* 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
|
3471 - 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
|
3472 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
|
3473 - 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
|
3474 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
|
3475 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
|
3476 - 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
|
3477 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
|
3478 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
|
3479 (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
|
3480 worklist. |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3481 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
|
3482 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
|
3483 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
|
3484 |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3485 while (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
|
3486 { |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3487 /* `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
|
3488 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
|
3489 (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
|
3490 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
|
3491 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
|
3492 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
|
3493 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
|
3494 as used for the *? operator. */ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3495 unsigned char *p1 = p; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3496 |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3497 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
|
3498 { |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3499 if (path_can_be_null) |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3500 return (RESET_FAIL_STACK (), 1); |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3501 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3502 /* We have reached the (effective) end of pattern. */ |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3503 if (PATTERN_STACK_EMPTY ()) |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3504 return (RESET_FAIL_STACK (), 0); |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3505 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3506 p = (unsigned char*) POP_PATTERN_OP (); |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3507 path_can_be_null = true; |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3508 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
|
3509 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3510 |
| 941 | 3511 /* We should never be about to go beyond the end of the 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
|
3512 assert (p < pend); |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3513 |
|
441
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 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
|
3515 { |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3516 case succeed: |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3517 p = pend; |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3518 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
|
3519 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3520 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
|
3521 /* 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
|
3522 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
|
3523 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
|
3524 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
|
3525 p++; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3526 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
|
3527 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3528 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3529 /* Following are the cases which match a character. These end |
| 941 | 3530 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
|
3531 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3532 case exactn: |
|
2816
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3533 if (fastmap) |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3534 { |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3535 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
|
3536 |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3537 if (SINGLE_BYTE_CHAR_P (c)) |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3538 fastmap[c] = 1; |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3539 else |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3540 fastmap[p[1]] = 1; |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3541 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3542 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
|
3543 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3544 |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3545 case anychar: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3546 /* 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
|
3547 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
|
3548 if (!fastmap) break; |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3549 return (RESET_FAIL_STACK (), -1); |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3550 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3551 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3552 case charset_not: |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3553 /* 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
|
3554 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
|
3555 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
|
3556 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
|
3557 if (!fastmap) break; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3558 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
|
3559 j < (1 << BYTEWIDTH); j++) |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3560 fastmap[j] = 1; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3561 /* Fallthrough */ |
| 939 | 3562 case charset: |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3563 if (!fastmap) break; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3564 not = (re_opcode_t) *(p - 1) == charset_not; |
| 939 | 3565 for (j = CHARSET_BITMAP_SIZE (&p[-1]) * BYTEWIDTH - 1, p++; |
| 3566 j >= 0; j--) | |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3567 if (!!(p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH))) ^ not) |
| 939 | 3568 fastmap[j] = 1; |
| 3569 | |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3570 if ((not && multibyte) |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3571 /* 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
|
3572 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
|
3573 || (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
|
3574 && 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
|
3575 /* 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
|
3576 any character set. */ |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3577 { |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3578 set_fastmap_for_multibyte_characters: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3579 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
|
3580 { |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3581 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
|
3582 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
|
3583 fastmap[j] = 1; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3584 match_any_multibyte_characters = true; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3585 } |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3586 } |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3587 |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3588 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
|
3589 && match_any_multibyte_characters == false) |
| 939 | 3590 { |
| 3591 /* Set fastmap[I] 1 where I is a base leading code of each | |
| 3592 multibyte character in the range table. */ | |
| 3593 int c, count; | |
| 3594 | |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3595 /* 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
|
3596 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
|
3597 p += CHARSET_BITMAP_SIZE (&p[-2]) + 2; |
| 939 | 3598 |
|
1965
058a9ce57dd7
1999-09-04 Richard Stallman <rms@gnu.org>
Dave Love <fx@gnu.org>
parents:
1933
diff
changeset
|
3599 /* Extract the number of ranges in range table into COUNT. */ |
| 939 | 3600 EXTRACT_NUMBER_AND_INCR (count, p); |
| 3601 for (; count > 0; count--, p += 2 * 3) /* XXX */ | |
| 3602 { | |
| 3603 /* Extract the start of each range. */ | |
| 3604 EXTRACT_CHARACTER (c, p); | |
| 3605 j = CHAR_CHARSET (c); | |
| 3606 fastmap[CHARSET_LEADING_CODE_BASE (j)] = 1; | |
| 3607 } | |
| 3608 } | |
| 3609 break; | |
| 3610 | |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3611 case syntaxspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3612 case notsyntaxspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3613 if (!fastmap) break; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3614 #ifndef emacs |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3615 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
|
3616 k = *p++; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3617 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
|
3618 if ((SYNTAX (j) == (enum syntaxcode) k) ^ not) |
| 939 | 3619 fastmap[j] = 1; |
| 3620 break; | |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3621 #else /* emacs */ |
| 939 | 3622 /* This match depends on text properties. These end with |
| 3623 aborting optimizations. */ | |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3624 return (RESET_FAIL_STACK (), -1); |
| 939 | 3625 |
| 3626 case categoryspec: | |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3627 case notcategoryspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3628 if (!fastmap) break; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3629 not = (re_opcode_t)p[-1] == notcategoryspec; |
| 939 | 3630 k = *p++; |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3631 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
|
3632 if ((CHAR_HAS_CATEGORY (j, k)) ^ not) |
| 939 | 3633 fastmap[j] = 1; |
| 3634 | |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3635 if (multibyte) |
| 939 | 3636 /* 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
|
3637 whose category is K (or not). */ |
| 939 | 3638 goto set_fastmap_for_multibyte_characters; |
| 3639 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
|
3640 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3641 /* All cases after this match the empty string. These end with |
| 941 | 3642 `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
|
3643 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3644 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
|
3645 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
|
3646 case after_dot: |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3647 #endif /* !emacs */ |
| 941 | 3648 case no_op: |
| 3649 case begline: | |
| 3650 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
|
3651 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
|
3652 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
|
3653 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
|
3654 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
|
3655 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
|
3656 case wordend: |
| 941 | 3657 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
|
3658 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3659 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3660 case jump: |
| 941 | 3661 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
|
3662 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
|
3663 /* 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
|
3664 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
|
3665 break; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3666 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
|
3667 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
|
3668 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3669 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
|
3670 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
|
3671 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
|
3672 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
|
3673 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
|
3674 p++; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3675 break; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3676 default: |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3677 continue; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3678 }; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3679 /* 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
|
3680 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
|
3681 /* Fallthrough */ |
| 941 | 3682 |
| 3683 case on_failure_jump: | |
| 3684 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
|
3685 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
|
3686 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
|
3687 case on_failure_jump_smart: |
| 941 | 3688 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
|
3689 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
|
3690 ; /* Backward jump to be ignored. */ |
|
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
3691 else if (!PUSH_PATTERN_OP (p + j, fail_stack)) |
|
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
3692 return (RESET_FAIL_STACK (), -2); |
| 941 | 3693 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
|
3694 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3695 |
|
2371
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
3696 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
|
3697 /* 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
|
3698 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
|
3699 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
|
3700 /* 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
|
3701 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
|
3702 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
|
3703 continue; |
|
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
3704 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3705 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
|
3706 /* 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
|
3707 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
|
3708 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
|
3709 /* 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
|
3710 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
|
3711 on_failure_jump. */ |
| 941 | 3712 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
|
3713 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3714 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3715 case set_number_at: |
| 941 | 3716 p += 4; |
| 3717 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
|
3718 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3719 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3720 case start_memory: |
| 941 | 3721 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
|
3722 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
|
3723 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
|
3724 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3725 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3726 default: |
| 941 | 3727 abort (); /* We have listed all the cases. */ |
| 3728 } /* 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
|
3729 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3730 /* Getting here means we have found the possible starting |
| 941 | 3731 characters for one path of the pattern -- and that the empty |
| 3732 string does not match. We need not follow this path further. | |
| 3733 Instead, look at the next alternative (remembered on the | |
| 3734 stack), or quit if no more. The test at the top of the loop | |
| 3735 does these things. */ | |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3736 path_can_be_null = 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
|
3737 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
|
3738 } /* 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
|
3739 |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3740 return (RESET_FAIL_STACK (), 0); |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3741 } /* analyse_first */ |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3742 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3743 /* 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
|
3744 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
|
3745 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
|
3746 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
|
3747 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3748 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
|
3749 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
|
3750 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
|
3751 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3752 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
|
3753 area as BUFP->fastmap. |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3754 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3755 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
|
3756 the pattern buffer. |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3757 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3758 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
|
3759 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3760 int |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3761 re_compile_fastmap (bufp) |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3762 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
|
3763 { |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3764 char *fastmap = bufp->fastmap; |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3765 int analysis; |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3766 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3767 assert (fastmap && bufp->buffer); |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3768 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3769 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
|
3770 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
|
3771 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3772 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
|
3773 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
|
3774 bufp->can_be_null = (analysis != 0); |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3775 if (analysis < -1) |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3776 return analysis; |
|
441
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 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
|
3778 } /* 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
|
3779 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3780 /* 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
|
3781 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
|
3782 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
|
3783 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
|
3784 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
|
3785 |
|
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 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
|
3787 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
|
3788 |
|
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 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
|
3790 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
|
3791 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
|
3792 |
|
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 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
|
3794 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
|
3795 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
|
3796 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
|
3797 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
|
3798 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
|
3799 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3800 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
|
3801 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3802 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
|
3803 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
|
3804 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
|
3805 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
|
3806 } |
|
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 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
|
3808 { |
|
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 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
|
3810 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
|
3811 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
|
3812 } |
|
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 } |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
3814 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
|
3815 |
| 941 | 3816 /* 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
|
3817 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3818 /* 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
|
3819 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
|
3820 |
|
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 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
|
3822 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
|
3823 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
|
3824 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
|
3825 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
|
3826 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
|
3827 { |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3828 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
|
3829 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
|
3830 } |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
3831 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
|
3832 |
| 939 | 3833 /* End address of virtual concatenation of string. */ |
| 3834 #define STOP_ADDR_VSTRING(P) \ | |
| 3835 (((P) >= size1 ? string2 + size2 : string1 + size1)) | |
| 3836 | |
| 3837 /* Address of POS in the concatenation of virtual string. */ | |
| 3838 #define POS_ADDR_VSTRING(POS) \ | |
| 3839 (((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
|
3840 |
|
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 /* 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
|
3842 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
|
3843 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
|
3844 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3845 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
|
3846 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3847 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
|
3848 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
|
3849 RANGE. |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3850 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3851 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
|
3852 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
|
3853 subexpressions. |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3854 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3855 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
|
3856 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
|
3857 |
|
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 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
|
3859 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
|
3860 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
|
3861 |
|
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 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
|
3863 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
|
3864 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
|
3865 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
|
3866 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
|
3867 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
|
3868 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
|
3869 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
|
3870 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
|
3871 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3872 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
|
3873 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
|
3874 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
|
3875 register char *fastmap = bufp->fastmap; |
|
501
f29b13c2cefd
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard Stallman <rms@gnu.org>
parents:
490
diff
changeset
|
3876 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
|
3877 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
|
3878 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
|
3879 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
|
3880 |
| 941 | 3881 /* 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
|
3882 const boolean multibyte = RE_MULTIBYTE_P (bufp); |
| 939 | 3883 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3884 /* 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
|
3885 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
|
3886 return -1; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3887 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3888 /* 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
|
3889 the virtual concatenation of STRING1 and STRING2. |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3890 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
|
3891 if (endpos < 0) |
|
985fe9826996
(re_search_2): Use 0, not -1, as the lower bound
Richard Stallman <rms@gnu.org>
parents:
481
diff
changeset
|
3892 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
|
3893 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
|
3894 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
|
3895 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3896 /* 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
|
3897 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
|
3898 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
|
3899 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3900 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
|
3901 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
|
3902 else |
|
1329
818db3848f2b
(re_search_2): Fix handling of at_dot.
Richard Stallman <rms@gnu.org>
parents:
1328
diff
changeset
|
3903 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
|
3904 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3905 |
|
481
35afc74165b7
(re_search_2): If pattern starts with \=, optimize search.
Richard Stallman <rms@gnu.org>
parents:
480
diff
changeset
|
3906 #ifdef emacs |
|
35afc74165b7
(re_search_2): If pattern starts with \=, optimize search.
Richard Stallman <rms@gnu.org>
parents:
480
diff
changeset
|
3907 /* 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
|
3908 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
|
3909 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
|
3910 { |
|
1329
818db3848f2b
(re_search_2): Fix handling of at_dot.
Richard Stallman <rms@gnu.org>
parents:
1328
diff
changeset
|
3911 range = PT_BYTE - BEGV_BYTE - startpos; |
|
818db3848f2b
(re_search_2): Fix handling of at_dot.
Richard Stallman <rms@gnu.org>
parents:
1328
diff
changeset
|
3912 if (range < 0) |
|
481
35afc74165b7
(re_search_2): If pattern starts with \=, optimize search.
Richard Stallman <rms@gnu.org>
parents:
480
diff
changeset
|
3913 return -1; |
|
35afc74165b7
(re_search_2): If pattern starts with \=, optimize search.
Richard Stallman <rms@gnu.org>
parents:
480
diff
changeset
|
3914 } |
|
35afc74165b7
(re_search_2): If pattern starts with \=, optimize search.
Richard Stallman <rms@gnu.org>
parents:
480
diff
changeset
|
3915 #endif /* emacs */ |
|
35afc74165b7
(re_search_2): If pattern starts with \=, optimize search.
Richard Stallman <rms@gnu.org>
parents:
480
diff
changeset
|
3916 |
|
441
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 /* 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
|
3918 if (fastmap && !bufp->fastmap_accurate) |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3919 if (re_compile_fastmap (bufp) == -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
|
3920 return -2; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3921 |
|
678
bd677f8ba924
(re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents:
677
diff
changeset
|
3922 /* 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
|
3923 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
|
3924 |
| 939 | 3925 #ifdef emacs |
|
1321
a37088328c87
(re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents:
1313
diff
changeset
|
3926 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
|
3927 { |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
3928 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
|
3929 |
|
a37088328c87
(re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents:
1313
diff
changeset
|
3930 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
|
3931 } |
| 939 | 3932 #endif |
| 3933 | |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3934 /* 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
|
3935 for (;;) |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3936 { |
|
678
bd677f8ba924
(re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents:
677
diff
changeset
|
3937 /* If the pattern is anchored, |
|
bd677f8ba924
(re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents:
677
diff
changeset
|
3938 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
|
3939 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
|
3940 because that case doesn't repeat. */ |
|
bd677f8ba924
(re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents:
677
diff
changeset
|
3941 if (anchored_start && startpos > 0) |
|
bd677f8ba924
(re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents:
677
diff
changeset
|
3942 { |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
3943 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
|
3944 : string2[startpos - size1 - 1]) |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
3945 == '\n')) |
|
678
bd677f8ba924
(re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents:
677
diff
changeset
|
3946 goto advance; |
|
bd677f8ba924
(re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents:
677
diff
changeset
|
3947 } |
|
bd677f8ba924
(re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents:
677
diff
changeset
|
3948 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3949 /* If a fastmap is supplied, skip quickly over characters that |
| 941 | 3950 cannot be the start of a match. If the pattern can match the |
| 3951 null string, however, we don't need to skip characters; we want | |
| 3952 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
|
3953 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
|
3954 { |
|
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
|
3955 register re_char *d; |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3956 register unsigned int buf_ch; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3957 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3958 d = POS_ADDR_VSTRING (startpos); |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3959 |
| 941 | 3960 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
|
3961 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3962 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
|
3963 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
|
3964 |
| 941 | 3965 if (startpos < size1 && startpos + range >= size1) |
| 3966 lim = range - (size1 - startpos); | |
| 939 | 3967 |
| 941 | 3968 /* Written out as an if-else to avoid testing `translate' |
| 3969 inside the loop. */ | |
|
1335
97f50084cc62
(re_search_2): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents:
1329
diff
changeset
|
3970 if (RE_TRANSLATE_P (translate)) |
|
97f50084cc62
(re_search_2): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents:
1329
diff
changeset
|
3971 { |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3972 if (multibyte) |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3973 while (range > lim) |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3974 { |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3975 int buf_charlen; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3976 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3977 buf_ch = STRING_CHAR_AND_LENGTH (d, range - lim, |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3978 buf_charlen); |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3979 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3980 buf_ch = RE_TRANSLATE (translate, buf_ch); |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3981 if (buf_ch >= 0400 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3982 || fastmap[buf_ch]) |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3983 break; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3984 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3985 range -= buf_charlen; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3986 d += buf_charlen; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3987 } |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3988 else |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3989 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
|
3990 && !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
|
3991 { |
|
24423cbaf6a9
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents:
1342
diff
changeset
|
3992 d++; |
|
24423cbaf6a9
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents:
1342
diff
changeset
|
3993 range--; |
|
24423cbaf6a9
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents:
1342
diff
changeset
|
3994 } |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
3995 } |
|
441
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 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
|
3997 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
|
3998 { |
|
24423cbaf6a9
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents:
1342
diff
changeset
|
3999 d++; |
|
24423cbaf6a9
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents:
1342
diff
changeset
|
4000 range--; |
|
24423cbaf6a9
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents:
1342
diff
changeset
|
4001 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4002 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4003 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
|
4004 } |
| 941 | 4005 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
|
4006 { |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
4007 int room = (startpos >= size1 |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
4008 ? size2 + size1 - startpos |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
4009 : size1 - startpos); |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
4010 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
|
4011 buf_ch = TRANSLATE (buf_ch); |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4012 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4013 if (! (buf_ch >= 0400 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4014 || 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
|
4015 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
|
4016 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4017 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4018 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4019 /* 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
|
4020 if (range >= 0 && startpos == total_size && fastmap |
| 941 | 4021 && !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
|
4022 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
|
4023 |
|
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 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
|
4025 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
|
4026 #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
|
4027 # 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
|
4028 alloca (0); |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
4029 # 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
|
4030 #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
|
4031 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4032 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
|
4033 return startpos; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4034 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4035 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
|
4036 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
|
4037 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4038 advance: |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4039 if (!range) |
| 941 | 4040 break; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4041 else if (range > 0) |
| 941 | 4042 { |
| 939 | 4043 /* Update STARTPOS to the next character boundary. */ |
| 4044 if (multibyte) | |
| 4045 { | |
|
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
|
4046 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
|
4047 re_char *pend = STOP_ADDR_VSTRING (startpos); |
| 939 | 4048 int len = MULTIBYTE_FORM_LENGTH (p, pend - p); |
| 4049 | |
| 4050 range -= len; | |
| 4051 if (range < 0) | |
| 4052 break; | |
| 4053 startpos += len; | |
| 4054 } | |
| 4055 else | |
| 4056 { | |
|
961
6959c7741ed2
(re_search_2): Cast result of POS_ADDR_VSTRING.
Richard Stallman <rms@gnu.org>
parents:
942
diff
changeset
|
4057 range--; |
|
6959c7741ed2
(re_search_2): Cast result of POS_ADDR_VSTRING.
Richard Stallman <rms@gnu.org>
parents:
942
diff
changeset
|
4058 startpos++; |
|
6959c7741ed2
(re_search_2): Cast result of POS_ADDR_VSTRING.
Richard Stallman <rms@gnu.org>
parents:
942
diff
changeset
|
4059 } |
| 679 | 4060 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4061 else |
| 941 | 4062 { |
| 4063 range++; | |
| 4064 startpos--; | |
| 939 | 4065 |
| 4066 /* Update STARTPOS to the previous character boundary. */ | |
| 4067 if (multibyte) | |
| 4068 { | |
|
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
|
4069 re_char *p = POS_ADDR_VSTRING (startpos); |
| 939 | 4070 int len = 0; |
| 4071 | |
| 4072 /* 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
|
4073 while (!CHAR_HEAD_P (*p)) |
| 939 | 4074 p--, len++; |
| 4075 | |
| 4076 /* Adjust it. */ | |
| 4077 #if 0 /* XXX */ | |
| 4078 if (MULTIBYTE_FORM_LENGTH (p, len + 1) != (len + 1)) | |
| 4079 ; | |
| 4080 else | |
| 4081 #endif | |
| 4082 { | |
| 4083 range += len; | |
| 4084 if (range > 0) | |
| 4085 break; | |
| 4086 | |
| 4087 startpos -= len; | |
| 4088 } | |
| 4089 } | |
| 941 | 4090 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4091 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4092 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
|
4093 } /* re_search_2 */ |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
4094 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
|
4095 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4096 /* 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
|
4097 |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
4098 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
|
4099 register int len, |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
4100 RE_TRANSLATE_TYPE translate, |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
4101 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
|
4102 |
|
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 /* 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
|
4104 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
|
4105 #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
|
4106 (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
|
4107 ? ((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
|
4108 : ((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
|
4109 |
|
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 /* 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
|
4111 string2 if necessary. |
|
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
4112 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
|
4113 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
|
4114 #define PREFETCH() \ |
| 941 | 4115 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
|
4116 { \ |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4117 /* End of string2 => fail. */ \ |
| 941 | 4118 if (dend == end_match_2) \ |
| 4119 goto fail; \ | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
4120 /* End of string1 => advance to string2. */ \ |
| 941 | 4121 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
|
4122 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
|
4123 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4124 |
|
2551
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
4125 /* 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
|
4126 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
|
4127 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
|
4128 outside of the LIMITs (i.e past `stop'). */ |
|
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
4129 #define PREFETCH_NOLIMIT() \ |
|
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
4130 if (d == end1) \ |
|
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
4131 { \ |
|
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
4132 d = string2; \ |
|
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
4133 dend = end_match_2; \ |
|
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
4134 } \ |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4135 |
|
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 /* Test if at very beginning or at very end of the virtual concatenation |
| 941 | 4137 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
|
4138 #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
|
4139 #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
|
4140 |
|
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 |
|
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 /* 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
|
4143 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
|
4144 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
|
4145 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
|
4146 #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
|
4147 (SYNTAX ((d) == end1 ? *string2 \ |
| 941 | 4148 : (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
|
4149 == 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
|
4150 |
|
521
7089c3a3a164
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
515
diff
changeset
|
4151 /* Disabled due to a compiler bug -- see comment at case wordbound */ |
| 939 | 4152 |
| 4153 /* The comment at case wordbound is following one, but we don't use | |
| 4154 AT_WORD_BOUNDARY anymore to support multibyte form. | |
| 4155 | |
| 4156 The DEC Alpha C compiler 3.x generates incorrect code for the | |
| 941 | 4157 test WORDCHAR_P (d - 1) != WORDCHAR_P (d) in the expansion of |
| 4158 AT_WORD_BOUNDARY, so this code is disabled. Expanding the | |
| 939 | 4159 macro and introducing temporary variables works around the bug. */ |
| 4160 | |
|
521
7089c3a3a164
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
515
diff
changeset
|
4161 #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
|
4162 /* 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
|
4163 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
|
4164 #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
|
4165 (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
|
4166 || WORDCHAR_P (d - 1) != WORDCHAR_P (d)) |
|
521
7089c3a3a164
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
515
diff
changeset
|
4167 #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
|
4168 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4169 /* 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
|
4170 #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
|
4171 # 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
|
4172 # 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
|
4173 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
|
4174 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
|
4175 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
|
4176 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
|
4177 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
|
4178 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
|
4179 } 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
|
4180 #else |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
4181 # 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
|
4182 #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
|
4183 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4184 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4185 /* 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
|
4186 |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4187 /* 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
|
4188 return a pointer to the next operation, else return NULL. */ |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4189 static unsigned char * |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4190 skip_one_char (p) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4191 unsigned char *p; |
|
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 switch (SWITCH_ENUM_CAST (*p++)) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4194 { |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4195 case anychar: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4196 break; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4197 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4198 case exactn: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4199 p += *p + 1; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4200 break; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4201 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4202 case charset_not: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4203 case charset: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4204 if (CHARSET_RANGE_TABLE_EXISTS_P (p - 1)) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4205 { |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4206 int mcnt; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4207 p = CHARSET_RANGE_TABLE (p - 1); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4208 EXTRACT_NUMBER_AND_INCR (mcnt, p); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4209 p = CHARSET_RANGE_TABLE_END (p, mcnt); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4210 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4211 else |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4212 p += 1 + CHARSET_BITMAP_SIZE (p - 1); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4213 break; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4214 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4215 case syntaxspec: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4216 case notsyntaxspec: |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
4217 #ifdef emacs |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4218 case categoryspec: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4219 case notcategoryspec: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4220 #endif /* emacs */ |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4221 p++; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4222 break; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4223 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4224 default: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4225 p = NULL; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4226 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4227 return p; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4228 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4229 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4230 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4231 /* 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
|
4232 static unsigned char * |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4233 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
|
4234 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
|
4235 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4236 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
|
4237 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
|
4238 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4239 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
|
4240 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4241 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
|
4242 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
|
4243 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
|
4244 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
|
4245 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
|
4246 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
|
4247 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
|
4248 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
|
4249 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
|
4250 break; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4251 default: |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4252 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
|
4253 } |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4254 } |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4255 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
|
4256 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
|
4257 } |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4258 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4259 /* 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
|
4260 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
|
4261 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
|
4262 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
|
4263 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
|
4264 { |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4265 re_opcode_t op2; |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
4266 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
|
4267 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
|
4268 |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4269 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
|
4270 && 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
|
4271 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4272 /* 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
|
4273 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
|
4274 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
|
4275 match at least one of that. */ |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4276 p2 = skip_noops (p2, pend); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4277 /* 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
|
4278 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
|
4279 /* p1 = skip_noops (p1, pend); */ |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4280 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4281 assert (p1 >= bufp->buffer && p1 < pend |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4282 && p2 >= bufp->buffer && p2 <= pend); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4283 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4284 op2 = p2 == pend ? succeed : *p2; |
|
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 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
|
4287 { |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4288 case succeed: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4289 case endbuf: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4290 /* 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
|
4291 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
|
4292 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4293 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
|
4294 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
|
4295 } |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4296 break; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4297 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4298 case endline: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4299 case exactn: |
|
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 register unsigned int c |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4302 = (re_opcode_t) *p2 == endline ? '\n' |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4303 : RE_STRING_CHAR(p2 + 2, pend - p2 - 2); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4304 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4305 if ((re_opcode_t) *p1 == exactn) |
|
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 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
|
4308 { |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4309 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
|
4310 return 1; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4311 } |
|
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 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4314 else if ((re_opcode_t) *p1 == charset |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4315 || (re_opcode_t) *p1 == charset_not) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4316 { |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4317 int not = (re_opcode_t) *p1 == charset_not; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4318 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4319 /* 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
|
4320 at `p1'. */ |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4321 if (SINGLE_BYTE_CHAR_P (c)) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4322 { |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4323 if (c < CHARSET_BITMAP_SIZE (p1) * BYTEWIDTH |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4324 && p1[2 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH))) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4325 not = !not; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4326 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4327 else if (CHARSET_RANGE_TABLE_EXISTS_P (p1)) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4328 CHARSET_LOOKUP_RANGE_TABLE (not, c, p1); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4329 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4330 /* `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
|
4331 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
|
4332 if (!not) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4333 { |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4334 DEBUG_PRINT1 (" No match => fast loop.\n"); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4335 return 1; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4336 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4337 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4338 else if ((re_opcode_t) *p1 == anychar |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4339 && c == '\n') |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4340 { |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4341 DEBUG_PRINT1 (" . != \\n => fast loop.\n"); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4342 return 1; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4343 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4344 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4345 break; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4346 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4347 case charset: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4348 case charset_not: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4349 { |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4350 if ((re_opcode_t) *p1 == exactn) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4351 /* Reuse the code above. */ |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4352 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
|
4353 |
|
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 /* 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
|
4356 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
|
4357 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
|
4358 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
|
4359 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4360 /* 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
|
4361 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
|
4362 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
|
4363 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
|
4364 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
|
4365 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4366 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
|
4367 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
|
4368 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
|
4369 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4370 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
|
4371 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4372 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
|
4373 /* 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
|
4374 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
|
4375 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
|
4376 (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
|
4377 && 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
|
4378 idx++) |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4379 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
|
4380 break; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4381 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4382 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
|
4383 || 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
|
4384 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4385 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
|
4386 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
|
4387 } |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4388 } |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4389 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
|
4390 || (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
|
4391 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4392 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
|
4393 /* 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
|
4394 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
|
4395 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
|
4396 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
|
4397 || (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
|
4398 && ((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
|
4399 break; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4400 |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4401 if (idx == p2[1]) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4402 { |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4403 DEBUG_PRINT1 (" No match => fast loop.\n"); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4404 return 1; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4405 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4406 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4407 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4408 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4409 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4410 case wordend: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4411 case notsyntaxspec: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4412 return ((re_opcode_t) *p1 == syntaxspec |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4413 && p1[1] == (op2 == wordend ? Sword : p2[1])); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4414 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4415 case wordbeg: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4416 case syntaxspec: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4417 return ((re_opcode_t) *p1 == notsyntaxspec |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4418 && p1[1] == (op2 == wordend ? Sword : p2[1])); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4419 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4420 case wordbound: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4421 return (((re_opcode_t) *p1 == notsyntaxspec |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4422 || (re_opcode_t) *p1 == syntaxspec) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4423 && p1[1] == Sword); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4424 |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
4425 #ifdef emacs |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4426 case categoryspec: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4427 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
|
4428 case notcategoryspec: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4429 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
|
4430 #endif /* emacs */ |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4431 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4432 default: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4433 ; |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4434 } |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4435 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4436 /* 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
|
4437 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
|
4438 } |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4439 |
|
441
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 /* 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
|
4442 |
| 941 | 4443 #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
|
4444 /* 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
|
4445 |
|
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 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
|
4447 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
|
4448 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
|
4449 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
|
4450 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
|
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 { |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
4453 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
|
4454 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
|
4455 # 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
|
4456 alloca (0); |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
4457 # 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
|
4458 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
|
4459 } |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
4460 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
|
4461 #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
|
4462 |
| 939 | 4463 #ifdef emacs |
| 4464 /* In Emacs, this is the string or buffer in which we | |
| 941 | 4465 are matching. It is used for looking up syntax properties. */ |
| 939 | 4466 Lisp_Object re_match_object; |
| 4467 #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
|
4468 |
|
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 /* 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
|
4470 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
|
4471 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
|
4472 matching at STOP. |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4473 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4474 If REGS is non-null and the `no_sub' field of BUFP is nonzero, we |
| 941 | 4475 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
|
4476 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
|
4477 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4478 We return -1 if no match, -2 if an internal error (such as the |
| 941 | 4479 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
|
4480 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
|
4481 |
|
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 |
|
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 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
|
4484 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
|
4485 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
|
4486 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
|
4487 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
|
4488 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
|
4489 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
|
4490 { |
| 939 | 4491 int result; |
| 941 | 4492 |
| 939 | 4493 #ifdef emacs |
|
1321
a37088328c87
(re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents:
1313
diff
changeset
|
4494 int charpos; |
|
a37088328c87
(re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents:
1313
diff
changeset
|
4495 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
|
4496 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
|
4497 SETUP_SYNTAX_TABLE_FOR_OBJECT (re_match_object, charpos, 1); |
| 939 | 4498 #endif |
| 4499 | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
4500 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
|
4501 (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
|
4502 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
|
4503 #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
|
4504 alloca (0); |
|
2615
31b85fc23c04
(re_match, re_match_2): Protect calls to alloca (0).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2581
diff
changeset
|
4505 #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
|
4506 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
|
4507 } |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
4508 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
|
4509 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4510 /* This is a separate function so that we can force an alloca cleanup |
| 941 | 4511 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
|
4512 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
|
4513 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
|
4514 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
|
4515 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
|
4516 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
|
4517 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
|
4518 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
|
4519 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
|
4520 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4521 /* 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
|
4522 int mcnt; |
|
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
|
4523 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
|
4524 unsigned char *p1; |
|
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 |
|
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 /* 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
|
4527 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
|
4528 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4529 /* Pointers into string1 and string2, just past the last characters in |
| 941 | 4530 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
|
4531 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
|
4532 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4533 /* 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
|
4534 re_char *d, *dend; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4535 |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
4536 /* 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
|
4537 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
|
4538 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
|
4539 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
|
4540 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
|
4541 |
|
441
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 /* Where we are in the pattern, and the end of 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
|
4543 unsigned char *p = 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
|
4544 register unsigned char *pend = p + bufp->used; |
|
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 |
| 941 | 4546 /* 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
|
4547 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
|
4548 |
| 941 | 4549 /* 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
|
4550 const boolean multibyte = RE_MULTIBYTE_P (bufp); |
| 939 | 4551 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4552 /* 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
|
4553 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
|
4554 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
|
4555 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
|
4556 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
|
4557 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
|
4558 scanning the strings. */ |
| 941 | 4559 #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
|
4560 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
|
4561 #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
|
4562 #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
|
4563 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
|
4564 #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
|
4565 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
4566 #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
|
4567 /* 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
|
4568 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
|
4569 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
|
4570 #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
|
4571 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4572 /* We fill all the registers internally, independent of what we |
| 941 | 4573 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
|
4574 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
|
4575 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
|
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 /* 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
|
4578 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
|
4579 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
|
4580 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
|
4581 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
|
4582 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
|
4583 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
|
4584 #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
|
4585 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
|
4586 #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
|
4587 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4588 /* 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
|
4589 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
|
4590 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
|
4591 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
|
4592 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
|
4593 #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
|
4594 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
|
4595 #endif |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
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 /* 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
|
4598 allocate space for that if we're not allocating space for anything |
| 941 | 4599 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
|
4600 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
|
4601 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
|
4602 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
|
4603 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
|
4604 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
|
4605 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
|
4606 |
|
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 #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
|
4608 /* Counts the total number of registers pushed. */ |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4609 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
|
4610 #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
|
4611 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4612 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
|
4613 |
|
441
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 INIT_FAIL_STACK (); |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4615 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4616 #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
|
4617 /* 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
|
4618 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
|
4619 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
|
4620 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
|
4621 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
|
4622 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
|
4623 { |
|
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
|
4624 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
|
4625 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
|
4626 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
|
4627 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
|
4628 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4629 if (!(regstart && regend && best_regstart && best_regend)) |
| 941 | 4630 { |
| 4631 FREE_VARIABLES (); | |
| 4632 return -2; | |
| 4633 } | |
|
441
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 } |
|
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 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
|
4636 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4637 /* We must initialize all our variables to NULL, so that |
| 941 | 4638 `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
|
4639 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
|
4640 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4641 #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
|
4642 |
|
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 /* 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
|
4644 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
|
4645 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4646 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
|
4647 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
|
4648 } |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4649 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4650 /* 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
|
4651 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
|
4652 register information 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
|
4653 for (mcnt = 1; mcnt < num_regs; mcnt++) |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
4654 regstart[mcnt] = regend[mcnt] = 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
|
4655 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4656 /* We move `string1' into `string2' if the latter's empty -- but not if |
| 941 | 4657 `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
|
4658 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
|
4659 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4660 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
|
4661 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
|
4662 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
|
4663 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
|
4664 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4665 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
|
4666 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
|
4667 |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4668 /* `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
|
4669 `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
|
4670 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
|
4671 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
|
4672 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
|
4673 equal `string2'. */ |
|
2438
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
4674 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
|
4675 { |
|
2438
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
4676 /* 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
|
4677 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
|
4678 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
|
4679 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
|
4680 } |
|
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 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
|
4682 { |
|
2551
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
4683 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
|
4684 { |
|
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
4685 /* 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
|
4686 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
|
4687 /* BEWARE! |
|
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
4688 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
|
4689 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
|
4690 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
|
4691 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
|
4692 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
|
4693 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
|
4694 end_match_2). */ |
|
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
4695 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
|
4696 } |
|
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
4697 else |
|
2551
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
4698 { /* 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
|
4699 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
|
4700 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
|
4701 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
|
4702 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
|
4703 } |
|
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
4704 d = string1 + pos; |
|
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
4705 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
|
4706 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4707 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4708 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
|
4709 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
|
4710 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
|
4711 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
|
4712 DEBUG_PRINT1 ("'\n"); |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4713 |
| 941 | 4714 /* 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
|
4715 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
|
4716 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
|
4717 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
|
4718 { |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4719 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
|
4720 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4721 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
|
4722 { /* End of pattern means we might have succeeded. */ |
| 941 | 4723 DEBUG_PRINT1 ("end of pattern ... "); |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4724 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4725 /* If we haven't matched the entire string, and we want the |
| 941 | 4726 longest match, try backtracking. */ |
| 4727 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
|
4728 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4729 /* 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
|
4730 as the best previous match. */ |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4731 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
|
4732 == 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
|
4733 /* 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
|
4734 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
|
4735 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4736 /* AIX compiler got confused when this was combined |
| 941 | 4737 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
|
4738 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
|
4739 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
|
4740 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
|
4741 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
|
4742 |
| 941 | 4743 DEBUG_PRINT1 ("backtracking.\n"); |
| 4744 | |
| 4745 if (!FAIL_STACK_EMPTY ()) | |
| 4746 { /* More failure points to try. */ | |
| 4747 | |
| 4748 /* If exceeds best match so far, save it. */ | |
| 4749 if (!best_regs_set || best_match_p) | |
| 4750 { | |
| 4751 best_regs_set = true; | |
| 4752 match_end = d; | |
| 4753 | |
| 4754 DEBUG_PRINT1 ("\nSAVING match as best so far.\n"); | |
| 4755 | |
| 4756 for (mcnt = 1; mcnt < num_regs; mcnt++) | |
| 4757 { | |
| 4758 best_regstart[mcnt] = regstart[mcnt]; | |
| 4759 best_regend[mcnt] = regend[mcnt]; | |
| 4760 } | |
| 4761 } | |
| 4762 goto fail; | |
| 4763 } | |
| 4764 | |
| 4765 /* If no failure points, don't restore garbage. And if | |
| 4766 last match is real best match, don't restore second | |
| 4767 best one. */ | |
| 4768 else if (best_regs_set && !best_match_p) | |
| 4769 { | |
| 4770 restore_best_regs: | |
| 4771 /* Restore best match. It may happen that `dend == | |
| 4772 end_match_1' while the restored d is in string2. | |
| 4773 For example, the pattern `x.*y.*z' against the | |
| 4774 strings `x-' and `y-z-', if the two strings are | |
| 4775 not consecutive in memory. */ | |
| 4776 DEBUG_PRINT1 ("Restoring best registers.\n"); | |
| 4777 | |
| 4778 d = match_end; | |
| 4779 dend = ((d >= string1 && d <= end1) | |
| 4780 ? 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
|
4781 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4782 for (mcnt = 1; mcnt < num_regs; 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
|
4783 { |
|
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 regstart[mcnt] = best_regstart[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
|
4785 regend[mcnt] = best_regend[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
|
4786 } |
| 941 | 4787 } |
| 4788 } /* 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
|
4789 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4790 succeed_label: |
| 941 | 4791 DEBUG_PRINT1 ("Accepting match.\n"); |
| 4792 | |
| 4793 /* If caller wants register contents data back, do it. */ | |
| 4794 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
|
4795 { |
| 941 | 4796 /* Have the register data arrays been allocated? */ |
| 4797 if (bufp->regs_allocated == REGS_UNALLOCATED) | |
| 4798 { /* No. So allocate them with malloc. We need one | |
| 4799 extra element beyond `num_regs' for the `-1' marker | |
| 4800 GNU code uses. */ | |
| 4801 regs->num_regs = MAX (RE_NREGS, num_regs + 1); | |
| 4802 regs->start = TALLOC (regs->num_regs, regoff_t); | |
| 4803 regs->end = TALLOC (regs->num_regs, regoff_t); | |
| 4804 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
|
4805 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4806 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
|
4807 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
|
4808 } |
| 941 | 4809 bufp->regs_allocated = REGS_REALLOCATE; |
| 4810 } | |
| 4811 else if (bufp->regs_allocated == REGS_REALLOCATE) | |
| 4812 { /* Yes. If we need more elements than were already | |
| 4813 allocated, reallocate them. If we need fewer, just | |
| 4814 leave it alone. */ | |
| 4815 if (regs->num_regs < num_regs + 1) | |
| 4816 { | |
| 4817 regs->num_regs = num_regs + 1; | |
| 4818 RETALLOC (regs->start, regs->num_regs, regoff_t); | |
| 4819 RETALLOC (regs->end, regs->num_regs, regoff_t); | |
| 4820 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
|
4821 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4822 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
|
4823 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
|
4824 } |
| 941 | 4825 } |
| 4826 } | |
| 4827 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
|
4828 { |
|
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 /* These braces fend off a "empty body in an else-statement" |
| 941 | 4830 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
|
4831 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
|
4832 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4833 |
| 941 | 4834 /* Convert the pointer data in `regstart' and `regend' to |
| 4835 indices. Register zero has to be set differently, | |
| 4836 since we haven't kept track of any info for it. */ | |
| 4837 if (regs->num_regs > 0) | |
| 4838 { | |
| 4839 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
|
4840 regs->end[0] = POINTER_TO_OFFSET (d); |
| 941 | 4841 } |
| 4842 | |
| 4843 /* Go through the first `min (num_regs, regs->num_regs)' | |
| 4844 registers, since that is all we 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
|
4845 for (mcnt = 1; mcnt < MIN (num_regs, regs->num_regs); 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
|
4846 { |
| 941 | 4847 if (REG_UNSET (regstart[mcnt]) || REG_UNSET (regend[mcnt])) |
| 4848 regs->start[mcnt] = regs->end[mcnt] = -1; | |
| 4849 else | |
| 4850 { | |
|
441
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 regs->start[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
|
4852 = (regoff_t) POINTER_TO_OFFSET (regstart[mcnt]); |
| 941 | 4853 regs->end[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
|
4854 = (regoff_t) POINTER_TO_OFFSET (regend[mcnt]); |
| 941 | 4855 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4856 } |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4857 |
| 941 | 4858 /* If the regs structure we return has more elements than |
| 4859 were in the pattern, set the extra elements to -1. If | |
| 4860 we (re)allocated the registers, this is the case, | |
| 4861 because we always allocate enough to have at least one | |
| 4862 -1 at the end. */ | |
| 4863 for (mcnt = num_regs; mcnt < regs->num_regs; mcnt++) | |
| 4864 regs->start[mcnt] = regs->end[mcnt] = -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
|
4865 } /* 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
|
4866 |
| 941 | 4867 DEBUG_PRINT4 ("%u failure points pushed, %u popped (%u remain).\n", |
| 4868 nfailure_points_pushed, nfailure_points_popped, | |
| 4869 nfailure_points_pushed - nfailure_points_popped); | |
| 4870 DEBUG_PRINT2 ("%u registers pushed.\n", num_regs_pushed); | |
| 4871 | |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
4872 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
|
4873 |
| 941 | 4874 DEBUG_PRINT2 ("Returning %d from re_match_2.\n", mcnt); |
| 4875 | |
| 4876 FREE_VARIABLES (); | |
| 4877 return mcnt; | |
| 4878 } | |
| 4879 | |
| 4880 /* 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
|
4881 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
|
4882 { |
| 941 | 4883 /* Ignore these. Used to ignore the n of succeed_n's which |
| 4884 currently have n == 0. */ | |
| 4885 case no_op: | |
| 4886 DEBUG_PRINT1 ("EXECUTING no_op.\n"); | |
| 4887 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
|
4888 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4889 case succeed: |
| 941 | 4890 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
|
4891 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
|
4892 |
| 941 | 4893 /* Match the next n pattern characters exactly. The following |
| 4894 byte in the pattern defines n, and the n bytes after that | |
| 4895 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
|
4896 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
|
4897 mcnt = *p++; |
| 941 | 4898 DEBUG_PRINT2 ("EXECUTING exactn %d.\n", mcnt); |
| 4899 | |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
4900 /* 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
|
4901 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
|
4902 |
| 941 | 4903 /* This is written out as an if-else so we don't waste time |
| 4904 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
|
4905 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
|
4906 { |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4907 if (multibyte) |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4908 do |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4909 { |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4910 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
|
4911 unsigned int pat_ch, buf_ch; |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4912 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4913 PREFETCH (); |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4914 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
|
4915 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
|
4916 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4917 if (RE_TRANSLATE (translate, buf_ch) |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4918 != 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
|
4919 { |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
4920 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
|
4921 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
|
4922 } |
|
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 p += pat_charlen; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4925 d += buf_charlen; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4926 mcnt -= pat_charlen; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4927 } |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4928 while (mcnt > 0); |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4929 else |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4930 do |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4931 { |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4932 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
|
4933 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
|
4934 { |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
4935 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
|
4936 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
|
4937 } |
|
1381
24423cbaf6a9
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents:
1342
diff
changeset
|
4938 d++; |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4939 } |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4940 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
|
4941 } |
|
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 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
|
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 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
|
4945 { |
|
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 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
|
4947 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
|
4948 { |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
4949 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
|
4950 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
|
4951 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4952 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4953 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
|
4954 } |
| 941 | 4955 break; |
| 4956 | |
| 4957 | |
| 4958 /* 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
|
4959 case anychar: |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4960 { |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4961 int buf_charlen; |
|
1312
a9a56c9deb21
(re_match_2_internal): Declare buf_ch unsigned int.
Richard Stallman <rms@gnu.org>
parents:
1297
diff
changeset
|
4962 unsigned int buf_ch; |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4963 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4964 DEBUG_PRINT1 ("EXECUTING anychar.\n"); |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4965 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4966 PREFETCH (); |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
4967 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
|
4968 buf_ch = TRANSLATE (buf_ch); |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4969 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4970 if ((!(bufp->syntax & RE_DOT_NEWLINE) |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4971 && buf_ch == '\n') |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4972 || ((bufp->syntax & RE_DOT_NOT_NULL) |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4973 && buf_ch == '\000')) |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4974 goto fail; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4975 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4976 DEBUG_PRINT2 (" Matched `%d'.\n", *d); |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4977 d += buf_charlen; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4978 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4979 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
|
4980 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4981 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4982 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
|
4983 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
|
4984 { |
| 939 | 4985 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
|
4986 boolean not = (re_opcode_t) *(p - 1) == charset_not; |
| 939 | 4987 int len; |
| 4988 | |
| 4989 /* Start of actual range_table, or end of bitmap if there is no | |
| 4990 range table. */ | |
| 4991 unsigned char *range_table; | |
| 4992 | |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
4993 /* Nonzero if there is a range table. */ |
| 939 | 4994 int range_table_exists; |
| 4995 | |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
4996 /* 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
|
4997 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
|
4998 int count = 0; |
| 939 | 4999 |
| 941 | 5000 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
|
5001 |
| 939 | 5002 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
|
5003 |
| 939 | 5004 if (range_table_exists) |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5005 { |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5006 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
|
5007 EXTRACT_NUMBER_AND_INCR (count, range_table); |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5008 } |
| 939 | 5009 |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5010 PREFETCH (); |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5011 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
|
5012 c = TRANSLATE (c); /* The character to match. */ |
| 939 | 5013 |
| 5014 if (SINGLE_BYTE_CHAR_P (c)) | |
| 5015 { /* Lookup bitmap. */ | |
| 5016 /* Cast to `unsigned' instead of `unsigned char' in | |
| 5017 case the bit list is a full 32 bytes long. */ | |
| 5018 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
|
5019 && p[1 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH))) |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5020 not = !not; |
| 939 | 5021 } |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5022 #ifdef emacs |
| 939 | 5023 else if (range_table_exists) |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5024 { |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5025 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
|
5026 |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
5027 if ( (class_bits & BIT_LOWER && ISLOWER (c)) |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
5028 | (class_bits & BIT_MULTIBYTE) |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5029 | (class_bits & BIT_PUNCT && ISPUNCT (c)) |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5030 | (class_bits & BIT_SPACE && ISSPACE (c)) |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5031 | (class_bits & BIT_UPPER && ISUPPER (c)) |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5032 | (class_bits & BIT_WORD && ISWORD (c))) |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5033 not = !not; |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5034 else |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5035 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
|
5036 } |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5037 #endif /* emacs */ |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5038 |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5039 if (range_table_exists) |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5040 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
|
5041 else |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5042 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
|
5043 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5044 if (!not) goto fail; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5045 |
| 939 | 5046 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
|
5047 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
|
5048 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5049 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5050 |
| 941 | 5051 /* 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
|
5052 The argument is the register number. The text |
| 941 | 5053 matched within the group is recorded (in the internal |
| 5054 registers data structure) under the register number. */ | |
| 5055 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
|
5056 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
|
5057 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5058 /* 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
|
5059 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
|
5060 |
| 941 | 5061 regstart[*p] = d; |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
5062 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
|
5063 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
|
5064 |
| 941 | 5065 /* 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
|
5066 p += 1; |
| 941 | 5067 break; |
| 5068 | |
| 5069 | |
| 5070 /* 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
|
5071 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
|
5072 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
|
5073 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
|
5074 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5075 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
|
5076 /* 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
|
5077 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
5078 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
|
5079 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
|
5080 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5081 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
|
5082 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
|
5083 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
|
5084 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
|
5085 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
|
5086 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
|
5087 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
|
5088 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
|
5089 |
| 941 | 5090 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
|
5091 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
|
5092 |
| 941 | 5093 /* 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
|
5094 p += 1; |
| 941 | 5095 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
|
5096 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5097 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5098 /* \<digit> has been turned into a `duplicate' command which is |
| 941 | 5099 followed by the numeric value of <digit> as the register number. */ |
| 5100 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
|
5101 { |
|
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
|
5102 register re_char *d2, *dend2; |
| 941 | 5103 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
|
5104 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
|
5105 |
| 941 | 5106 /* Can't back reference a group which we've never matched. */ |
| 5107 if (REG_UNSET (regstart[regno]) || REG_UNSET (regend[regno])) | |
| 5108 goto fail; | |
| 5109 | |
| 5110 /* Where in input to try to start matching. */ | |
| 5111 d2 = regstart[regno]; | |
| 5112 | |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
5113 /* 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
|
5114 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
|
5115 |
| 941 | 5116 /* Where to stop matching; if both the place to start and |
| 5117 the place to stop matching are in the same string, then | |
| 5118 set to the place to stop, otherwise, for now have to use | |
| 5119 the end of the first string. */ | |
| 5120 | |
| 5121 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
|
5122 == 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
|
5123 ? 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
|
5124 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
|
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 /* If necessary, advance to next segment in register |
| 941 | 5127 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
|
5128 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
|
5129 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5130 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
|
5131 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
|
5132 |
| 941 | 5133 /* End of string1 => advance to string2. */ |
| 5134 d2 = string2; | |
| 5135 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
|
5136 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5137 /* 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
|
5138 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
|
5139 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5140 /* 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
|
5141 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
|
5142 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5143 /* 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
|
5144 mcnt = dend - d; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5145 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5146 /* Want how many consecutive characters we can match in |
| 941 | 5147 one shot, so, if necessary, adjust the count. */ |
| 5148 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
|
5149 mcnt = dend2 - d2; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5150 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5151 /* Compare that many; failure if mismatch, else move |
| 941 | 5152 past them. */ |
|
1328
0aa10b723959
Use RE_TRANSLATE_P to check whether translation is
Andreas Schwab <schwab@suse.de>
parents:
1326
diff
changeset
|
5153 if (RE_TRANSLATE_P (translate) |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5154 ? 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
|
5155 : 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
|
5156 { |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
5157 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
|
5158 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
|
5159 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5160 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
|
5161 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5162 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5163 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
|
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 |
| 941 | 5166 /* 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
|
5167 (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
|
5168 case begline: |
| 941 | 5169 DEBUG_PRINT1 ("EXECUTING begline.\n"); |
| 5170 | |
| 5171 if (AT_STRINGS_BEG (d)) | |
| 5172 { | |
| 5173 if (!bufp->not_bol) break; | |
| 5174 } | |
|
2438
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
5175 else |
| 941 | 5176 { |
|
2438
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
5177 unsigned char c; |
|
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
5178 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
|
5179 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
|
5180 break; |
| 941 | 5181 } |
| 5182 /* In all other cases, we fail. */ | |
| 5183 goto fail; | |
| 5184 | |
| 5185 | |
| 5186 /* 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
|
5187 case endline: |
| 941 | 5188 DEBUG_PRINT1 ("EXECUTING endline.\n"); |
| 5189 | |
| 5190 if (AT_STRINGS_END (d)) | |
| 5191 { | |
| 5192 if (!bufp->not_eol) break; | |
| 5193 } | |
|
2551
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
5194 else |
| 941 | 5195 { |
|
2551
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
5196 PREFETCH_NOLIMIT (); |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
5197 if (*d == '\n') |
|
2551
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
5198 break; |
| 941 | 5199 } |
| 5200 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
|
5201 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5202 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5203 /* Match at the very beginning of the data. */ |
| 941 | 5204 case begbuf: |
| 5205 DEBUG_PRINT1 ("EXECUTING begbuf.\n"); | |
| 5206 if (AT_STRINGS_BEG (d)) | |
| 5207 break; | |
| 5208 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
|
5209 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5210 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5211 /* Match at the very end of the data. */ |
| 941 | 5212 case endbuf: |
| 5213 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
|
5214 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
|
5215 break; |
| 941 | 5216 goto fail; |
| 5217 | |
| 5218 | |
| 5219 /* on_failure_keep_string_jump is used to optimize `.*\n'. It | |
| 5220 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
|
5221 `POP_FAILURE_POINT' will keep the current value for the |
| 941 | 5222 string, instead of restoring it. To see why, consider |
| 5223 matching `foo\nbar' against `.*\n'. The .* matches the foo; | |
| 5224 then the . fails against the \n. But the next thing we want | |
| 5225 to do is match the \n against the \n; if we restored the | |
| 5226 string value, we would be back at the foo. | |
| 5227 | |
| 5228 Because this is used only in specific cases, we don't need to | |
| 5229 check all the things that `on_failure_jump' does, to make | |
| 5230 sure the right things get saved on the stack. Hence we don't | |
| 5231 share its code. The only reason to push anything on the | |
| 5232 stack at all is that otherwise we would have to change | |
| 5233 `anychar's code to do something besides goto fail in this | |
| 5234 case; that seems worse than this. */ | |
| 5235 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
|
5236 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
|
5237 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
|
5238 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
|
5239 |
|
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, NULL); |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5241 break; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5242 |
|
2370
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5243 /* 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
|
5244 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
|
5245 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
|
5246 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
|
5247 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
|
5248 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
|
5249 loop. |
|
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5250 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
|
5251 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
|
5252 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
|
5253 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
|
5254 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
|
5255 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
|
5256 the loop. */ |
|
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5257 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
|
5258 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
|
5259 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
|
5260 mcnt, p + mcnt); |
|
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5261 |
|
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5262 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
|
5263 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
|
5264 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
|
5265 break; |
|
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5266 |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
5267 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
5268 /* 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
|
5269 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
|
5270 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
|
5271 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
|
5272 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
|
5273 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
|
5274 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
|
5275 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5276 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
|
5277 PUSH_FAILURE_POINT (p - 3, d); |
| 941 | 5278 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
|
5279 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5280 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5281 /* Uses of on_failure_jump: |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5282 |
| 941 | 5283 Each alternative starts with an on_failure_jump that points |
| 5284 to the beginning of the next alternative. Each alternative | |
| 5285 except the last ends with a jump that in effect jumps past | |
| 5286 the rest of the alternatives. (They really jump to the | |
| 5287 ending jump of the following alternative, because tensioning | |
| 5288 these jumps is a hassle.) | |
| 5289 | |
| 5290 Repeats start with an on_failure_jump that points past both | |
| 5291 the repetition text and either the following jump or | |
| 5292 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
|
5293 case on_failure_jump: |
|
1660
ef1f39a7e7c3
(re_match_2_internal) [WINDOWSNT & emacs]: Insert QUIT at various places.
Richard Stallman <rms@gnu.org>
parents:
1583
diff
changeset
|
5294 QUIT; |
| 941 | 5295 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
|
5296 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
|
5297 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
|
5298 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5299 PUSH_FAILURE_POINT (p -3, d); |
| 941 | 5300 break; |
| 5301 | |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
5302 /* 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
|
5303 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
|
5304 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
|
5305 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
|
5306 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
|
5307 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
|
5308 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
|
5309 case on_failure_jump_smart: |
|
1660
ef1f39a7e7c3
(re_match_2_internal) [WINDOWSNT & emacs]: Insert QUIT at various places.
Richard Stallman <rms@gnu.org>
parents:
1583
diff
changeset
|
5310 QUIT; |
| 941 | 5311 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
|
5312 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
|
5313 mcnt, p + mcnt); |
| 941 | 5314 { |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5315 unsigned char *p1 = p; /* Next operation. */ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5316 unsigned char *p2 = p + mcnt; /* Destination of the jump. */ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5317 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5318 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
|
5319 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
|
5320 |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
5321 EXTRACT_NUMBER (mcnt, p2 - 2); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
5322 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
5323 /* 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
|
5324 we are expecting. */ |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
5325 assert (skip_one_char (p1) == p2 - 3); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
5326 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
|
5327 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
|
5328 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
|
5329 { |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5330 /* 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
|
5331 DEBUG_PRINT1 (" smart exclusive => fast loop.\n"); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
5332 *p = (unsigned char) on_failure_keep_string_jump; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
5333 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
|
5334 } |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5335 else |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5336 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5337 /* 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
|
5338 DEBUG_PRINT1 (" smart default => slow loop.\n"); |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
5339 *p = (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
|
5340 } |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
5341 DEBUG_STATEMENT (debug -= 2); |
| 939 | 5342 } |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5343 break; |
| 941 | 5344 |
| 5345 /* Unconditionally jump (without popping any failure points). */ | |
| 5346 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
|
5347 unconditional_jump: |
|
1660
ef1f39a7e7c3
(re_match_2_internal) [WINDOWSNT & emacs]: Insert QUIT at various places.
Richard Stallman <rms@gnu.org>
parents:
1583
diff
changeset
|
5348 QUIT; |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5349 EXTRACT_NUMBER_AND_INCR (mcnt, p); /* Get the amount to jump. */ |
| 941 | 5350 DEBUG_PRINT2 ("EXECUTING jump %d ", mcnt); |
| 5351 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
|
5352 DEBUG_PRINT2 ("(to %p).\n", p); |
| 941 | 5353 break; |
| 5354 | |
| 5355 | |
| 5356 /* Have to succeed matching what follows at least n times. | |
| 5357 After that, handle like `on_failure_jump'. */ | |
| 5358 case succeed_n: | |
| 5359 EXTRACT_NUMBER (mcnt, p + 2); | |
| 5360 DEBUG_PRINT2 ("EXECUTING succeed_n %d.\n", mcnt); | |
| 5361 | |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
5362 /* 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
|
5363 if (mcnt != 0) |
| 941 | 5364 { |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
5365 mcnt--; |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
5366 p += 2; |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
5367 PUSH_FAILURE_COUNT (p); |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
5368 DEBUG_PRINT3 (" Setting %p to %d.\n", p, mcnt); |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
5369 STORE_NUMBER_AND_INCR (p, mcnt); |
| 941 | 5370 } |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
5371 else |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
5372 /* 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
|
5373 goto on_failure; |
| 941 | 5374 break; |
| 5375 | |
| 5376 case jump_n: | |
| 5377 EXTRACT_NUMBER (mcnt, p + 2); | |
| 5378 DEBUG_PRINT2 ("EXECUTING jump_n %d.\n", mcnt); | |
| 5379 | |
| 5380 /* 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
|
5381 if (mcnt != 0) |
| 941 | 5382 { |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
5383 mcnt--; |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
5384 PUSH_FAILURE_COUNT (p + 2); |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
5385 STORE_NUMBER (p + 2, mcnt); |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
5386 goto unconditional_jump; |
| 941 | 5387 } |
| 5388 /* 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
|
5389 else |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5390 p += 4; |
| 941 | 5391 break; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5392 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5393 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
|
5394 { |
| 941 | 5395 DEBUG_PRINT1 ("EXECUTING set_number_at.\n"); |
| 5396 | |
| 5397 EXTRACT_NUMBER_AND_INCR (mcnt, p); | |
| 5398 p1 = p + mcnt; | |
| 5399 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
|
5400 DEBUG_PRINT3 (" Setting %p to %d.\n", p1, mcnt); |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
5401 PUSH_FAILURE_COUNT (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
|
5402 STORE_NUMBER (p1, mcnt); |
| 941 | 5403 break; |
| 5404 } | |
|
521
7089c3a3a164
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
515
diff
changeset
|
5405 |
|
7089c3a3a164
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
515
diff
changeset
|
5406 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
|
5407 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
|
5408 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
|
5409 DEBUG_PRINT2 ("EXECUTING %swordbound.\n", not?"not":""); |
| 939 | 5410 |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
5411 /* We SUCCEED (or FAIL) in one of the following cases: */ |
| 939 | 5412 |
| 5413 /* 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
|
5414 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
|
5415 not = !not; |
| 939 | 5416 else |
| 5417 { | |
| 5418 /* C1 is the character before D, S1 is the syntax of C1, C2 | |
| 5419 is the character at D, and S2 is the syntax of C2. */ | |
| 5420 int c1, c2, s1, s2; | |
| 5421 #ifdef emacs | |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5422 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
|
5423 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
|
5424 UPDATE_SYNTAX_TABLE (charpos); |
| 941 | 5425 #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
|
5426 GET_CHAR_BEFORE_2 (c1, d, string1, end1, string2, end2); |
| 939 | 5427 s1 = SYNTAX (c1); |
| 5428 #ifdef emacs | |
|
1204
28ff40a118b8
(re_search_2): Fix call to CHAR_HEAD_P.
Richard Stallman <rms@gnu.org>
parents:
1158
diff
changeset
|
5429 UPDATE_SYNTAX_TABLE_FORWARD (charpos + 1); |
| 941 | 5430 #endif |
|
2551
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
5431 PREFETCH_NOLIMIT (); |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5432 c2 = RE_STRING_CHAR (d, dend - d); |
| 939 | 5433 s2 = SYNTAX (c2); |
| 5434 | |
| 5435 if (/* Case 2: Only one of S1 and S2 is Sword. */ | |
| 5436 ((s1 == Sword) != (s2 == Sword)) | |
| 5437 /* Case 3: Both of S1 and S2 are Sword, and macro | |
| 941 | 5438 WORD_BOUNDARY_P (C1, C2) returns nonzero. */ |
| 939 | 5439 || ((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
|
5440 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
|
5441 } |
|
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
|
5442 if (not) |
|
521
7089c3a3a164
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
515
diff
changeset
|
5443 break; |
| 939 | 5444 else |
|
521
7089c3a3a164
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
515
diff
changeset
|
5445 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
|
5446 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5447 case wordbeg: |
| 941 | 5448 DEBUG_PRINT1 ("EXECUTING wordbeg.\n"); |
| 939 | 5449 |
| 5450 /* We FAIL in one of the following cases: */ | |
| 5451 | |
| 941 | 5452 /* Case 1: D is at the end of string. */ |
| 939 | 5453 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
|
5454 goto fail; |
| 939 | 5455 else |
| 5456 { | |
| 5457 /* C1 is the character before D, S1 is the syntax of C1, C2 | |
| 5458 is the character at D, and S2 is the syntax of C2. */ | |
| 5459 int c1, c2, s1, s2; | |
| 5460 #ifdef emacs | |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5461 int offset = PTR_TO_OFFSET (d); |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5462 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
|
5463 UPDATE_SYNTAX_TABLE (charpos); |
| 941 | 5464 #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
|
5465 PREFETCH (); |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5466 c2 = RE_STRING_CHAR (d, dend - d); |
| 939 | 5467 s2 = SYNTAX (c2); |
| 941 | 5468 |
| 939 | 5469 /* Case 2: S2 is not Sword. */ |
| 5470 if (s2 != Sword) | |
| 5471 goto fail; | |
| 5472 | |
| 5473 /* Case 3: D is not at the beginning of string ... */ | |
| 5474 if (!AT_STRINGS_BEG (d)) | |
| 5475 { | |
| 5476 GET_CHAR_BEFORE_2 (c1, d, string1, end1, string2, end2); | |
| 5477 #ifdef emacs | |
|
1204
28ff40a118b8
(re_search_2): Fix call to CHAR_HEAD_P.
Richard Stallman <rms@gnu.org>
parents:
1158
diff
changeset
|
5478 UPDATE_SYNTAX_TABLE_BACKWARD (charpos - 1); |
| 941 | 5479 #endif |
| 939 | 5480 s1 = SYNTAX (c1); |
| 5481 | |
| 5482 /* ... and S1 is Sword, and WORD_BOUNDARY_P (C1, C2) | |
| 941 | 5483 returns 0. */ |
| 939 | 5484 if ((s1 == Sword) && !WORD_BOUNDARY_P (c1, c2)) |
| 5485 goto fail; | |
| 5486 } | |
| 5487 } | |
| 5488 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
|
5489 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5490 case wordend: |
| 941 | 5491 DEBUG_PRINT1 ("EXECUTING wordend.\n"); |
| 939 | 5492 |
| 5493 /* We FAIL in one of the following cases: */ | |
| 5494 | |
| 5495 /* Case 1: D is at the beginning of string. */ | |
| 5496 if (AT_STRINGS_BEG (d)) | |
| 5497 goto fail; | |
| 5498 else | |
| 5499 { | |
| 5500 /* C1 is the character before D, S1 is the syntax of C1, C2 | |
| 5501 is the character at D, and S2 is the syntax of C2. */ | |
| 5502 int c1, c2, s1, s2; | |
|
1204
28ff40a118b8
(re_search_2): Fix call to CHAR_HEAD_P.
Richard Stallman <rms@gnu.org>
parents:
1158
diff
changeset
|
5503 #ifdef emacs |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5504 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
|
5505 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
|
5506 UPDATE_SYNTAX_TABLE (charpos); |
|
1204
28ff40a118b8
(re_search_2): Fix call to CHAR_HEAD_P.
Richard Stallman <rms@gnu.org>
parents:
1158
diff
changeset
|
5507 #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
|
5508 GET_CHAR_BEFORE_2 (c1, d, string1, end1, string2, end2); |
| 939 | 5509 s1 = SYNTAX (c1); |
| 5510 | |
| 5511 /* Case 2: S1 is not Sword. */ | |
| 5512 if (s1 != Sword) | |
| 5513 goto fail; | |
| 5514 | |
| 5515 /* Case 3: D is not at the end of string ... */ | |
| 5516 if (!AT_STRINGS_END (d)) | |
| 5517 { | |
|
2551
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
5518 PREFETCH_NOLIMIT (); |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5519 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
|
5520 #ifdef emacs |
|
28ff40a118b8
(re_search_2): Fix call to CHAR_HEAD_P.
Richard Stallman <rms@gnu.org>
parents:
1158
diff
changeset
|
5521 UPDATE_SYNTAX_TABLE_FORWARD (charpos); |
|
28ff40a118b8
(re_search_2): Fix call to CHAR_HEAD_P.
Richard Stallman <rms@gnu.org>
parents:
1158
diff
changeset
|
5522 #endif |
| 939 | 5523 s2 = SYNTAX (c2); |
| 5524 | |
| 5525 /* ... and S2 is Sword, and WORD_BOUNDARY_P (C1, C2) | |
| 941 | 5526 returns 0. */ |
| 939 | 5527 if ((s2 == Sword) && !WORD_BOUNDARY_P (c1, c2)) |
| 941 | 5528 goto fail; |
| 939 | 5529 } |
| 5530 } | |
| 5531 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
|
5532 |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5533 case syntaxspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5534 case notsyntaxspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5535 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
|
5536 mcnt = *p++; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5537 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
|
5538 PREFETCH (); |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5539 #ifdef emacs |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5540 { |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5541 int offset = PTR_TO_OFFSET (d); |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5542 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
|
5543 UPDATE_SYNTAX_TABLE (pos1); |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5544 } |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5545 #endif |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5546 { |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5547 int c, len; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5548 |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5549 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
|
5550 |
|
2359
dbf725277cfc
(enum syntaxcode): Provide default for non-Emacs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2357
diff
changeset
|
5551 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
|
5552 goto fail; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5553 d += len; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5554 } |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5555 break; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5556 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5557 #ifdef emacs |
| 941 | 5558 case before_dot: |
| 5559 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
|
5560 if (PTR_BYTE_POS (d) >= PT_BYTE) |
| 941 | 5561 goto fail; |
| 5562 break; | |
| 5563 | |
| 5564 case at_dot: | |
| 5565 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
|
5566 if (PTR_BYTE_POS (d) != PT_BYTE) |
| 941 | 5567 goto fail; |
| 5568 break; | |
| 5569 | |
| 5570 case after_dot: | |
| 5571 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
|
5572 if (PTR_BYTE_POS (d) <= PT_BYTE) |
| 941 | 5573 goto fail; |
| 5574 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
|
5575 |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5576 case categoryspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5577 case notcategoryspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5578 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
|
5579 mcnt = *p++; |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5580 DEBUG_PRINT3 ("EXECUTING %scategoryspec %d.\n", not?"not":"", mcnt); |
| 939 | 5581 PREFETCH (); |
| 5582 { | |
| 5583 int c, len; | |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5584 c = RE_STRING_CHAR_AND_LENGTH (d, dend - d, len); |
| 939 | 5585 |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5586 if ((!CHAR_HAS_CATEGORY (c, mcnt)) ^ not) |
| 939 | 5587 goto fail; |
| 5588 d += len; | |
| 5589 } | |
| 5590 break; | |
| 5591 | |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5592 #endif /* emacs */ |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5593 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
5594 default: |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
5595 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
|
5596 } |
| 939 | 5597 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
|
5598 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5599 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5600 /* 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
|
5601 fail: |
|
1660
ef1f39a7e7c3
(re_match_2_internal) [WINDOWSNT & emacs]: Insert QUIT at various places.
Richard Stallman <rms@gnu.org>
parents:
1583
diff
changeset
|
5602 QUIT; |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5603 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
|
5604 { |
|
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
|
5605 re_char *str; |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5606 unsigned char *pat; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5607 /* 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
|
5608 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
|
5609 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
|
5610 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
|
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 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
|
5613 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
|
5614 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
|
5615 |
|
2370
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5616 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
|
5617 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
|
5618 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
|
5619 /* Fallthrough */ |
|
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5620 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5621 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
|
5622 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
|
5623 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
|
5624 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
|
5625 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
|
5626 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
|
5627 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
|
5628 break; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5629 |
|
2370
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5630 case no_op: |
|
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5631 /* 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
|
5632 goto fail; |
|
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5633 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5634 default: |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5635 abort(); |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5636 } |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5637 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5638 assert (p >= bufp->buffer && p <= pend); |
| 939 | 5639 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
5640 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
|
5641 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
|
5642 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5643 else |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
5644 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
|
5645 } /* 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
|
5646 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5647 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
|
5648 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
|
5649 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5650 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
|
5651 |
| 939 | 5652 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
|
5653 } /* 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
|
5654 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5655 /* 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
|
5656 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5657 /* 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
|
5658 bytes; nonzero otherwise. */ |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5659 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5660 static int |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5661 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
|
5662 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
|
5663 register int len; |
|
501
f29b13c2cefd
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard Stallman <rms@gnu.org>
parents:
490
diff
changeset
|
5664 RE_TRANSLATE_TYPE translate; |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5665 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
|
5666 { |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5667 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
|
5668 re_char *p1_end = s1 + len; |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5669 re_char *p2_end = s2 + len; |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5670 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
5671 /* 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
|
5672 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
|
5673 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
|
5674 { |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5675 int p1_charlen, p2_charlen; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5676 int p1_ch, p2_ch; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5677 |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5678 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
|
5679 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
|
5680 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5681 if (RE_TRANSLATE (translate, p1_ch) |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5682 != 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
|
5683 return 1; |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5684 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5685 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
|
5686 } |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5687 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5688 if (p1 != p1_end || p2 != p2_end) |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5689 return 1; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5690 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5691 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
|
5692 } |
|
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 |
|
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 /* 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
|
5695 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5696 /* 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
|
5697 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
|
5698 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
|
5699 |
|
441
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 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
|
5701 are set in BUFP on entry. |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5702 |
| 939 | 5703 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
|
5704 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5705 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
|
5706 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
|
5707 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
|
5708 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
|
5709 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
|
5710 { |
|
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 reg_errcode_t ret; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5712 |
|
441
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 /* 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
|
5714 (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
|
5715 bufp->regs_allocated = REGS_UNALLOCATED; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5716 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5717 /* 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
|
5718 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
|
5719 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
|
5720 bufp->no_sub = 0; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5721 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
5722 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
|
5723 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5724 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
|
5725 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
|
5726 return gettext (re_error_msgid[(int) ret]); |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5727 } |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
5728 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
|
5729 |
| 939 | 5730 /* Entry points compatible with 4.2 BSD regex library. We don't define |
| 5731 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
|
5732 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
5733 #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
|
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 /* 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
|
5736 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
|
5737 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5738 char * |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
5739 # 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
|
5740 /* 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
|
5741 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
|
5742 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
|
5743 weak_function |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
5744 # 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
|
5745 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
|
5746 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
|
5747 { |
|
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 reg_errcode_t ret; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5749 |
|
441
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 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
|
5751 { |
|
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 (!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
|
5753 /* 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
|
5754 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
|
5755 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
|
5756 } |
|
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 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
|
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 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
|
5761 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
|
5762 /* 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
|
5763 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
|
5764 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
|
5765 |
|
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 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
|
5767 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
|
5768 /* 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
|
5769 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
|
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 |
|
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 /* 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
|
5773 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
|
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 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
|
5776 |
|
441
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 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
|
5778 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
|
5779 |
|
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 /* 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
|
5781 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
|
5782 } |
|
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 |
|
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 |
|
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 int |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
5786 # 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
|
5787 weak_function |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
5788 # 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
|
5789 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
|
5790 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
|
5791 { |
|
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 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
|
5793 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
|
5794 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
|
5795 } |
|
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 #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
|
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 /* 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
|
5799 |
|
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 #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
|
5801 |
|
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 /* 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
|
5803 |
| 939 | 5804 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
|
5805 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
|
5806 |
|
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 `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
|
5808 `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
|
5809 `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
|
5810 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
|
5811 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
|
5812 `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
|
5813 `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
|
5814 `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
|
5815 |
|
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 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
|
5817 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5818 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
|
5819 |
|
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 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
|
5821 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
|
5822 |
|
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 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
|
5824 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
|
5825 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5826 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
|
5827 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
|
5828 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5829 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
|
5830 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
|
5831 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
|
5832 |
| 939 | 5833 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
|
5834 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
|
5835 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5836 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
|
5837 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
|
5838 regex_t *preg; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5839 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
|
5840 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
|
5841 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5842 reg_errcode_t ret; |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
5843 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
|
5844 = (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
|
5845 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
|
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 /* 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
|
5848 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
|
5849 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
|
5850 preg->used = 0; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5851 |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
5852 /* 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
|
5853 preg->fastmap = (char *) malloc (1 << BYTEWIDTH); |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5854 |
|
441
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 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
|
5856 { |
|
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 unsigned i; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5858 |
|
501
f29b13c2cefd
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard Stallman <rms@gnu.org>
parents:
490
diff
changeset
|
5859 preg->translate |
|
f29b13c2cefd
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard Stallman <rms@gnu.org>
parents:
490
diff
changeset
|
5860 = (RE_TRANSLATE_TYPE) malloc (CHAR_SET_SIZE |
|
f29b13c2cefd
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard Stallman <rms@gnu.org>
parents:
490
diff
changeset
|
5861 * 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
|
5862 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
|
5863 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
|
5864 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5865 /* 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
|
5866 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
|
5867 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
|
5868 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5869 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
|
5870 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
|
5871 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5872 /* 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
|
5873 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
|
5874 { /* 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
|
5875 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
|
5876 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
|
5877 } |
|
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 else |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
5879 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
|
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 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
|
5882 |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5883 /* 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
|
5884 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
|
5885 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
|
5886 |
|
441
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 /* 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
|
5888 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
|
5889 if (ret == REG_ERPAREN) |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
5890 ret = REG_EPAREN; |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
5891 |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
5892 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
|
5893 { /* 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
|
5894 buffer. */ |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
5895 re_compile_fastmap (preg); |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
5896 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
|
5897 { /* 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
|
5898 free (preg->fastmap); |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
5899 preg->fastmap = NULL; |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
5900 } |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
5901 } |
|
441
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 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
|
5903 } |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
5904 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
|
5905 |
|
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 |
|
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 /* 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
|
5908 string STRING. |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5909 |
|
441
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 If NMATCH is zero or REG_NOSUB was set in the cflags argument to |
| 939 | 5911 `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
|
5912 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
|
5913 corresponding matched substrings. |
|
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 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
|
5916 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
|
5917 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
|
5918 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5919 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
|
5920 |
|
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 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
|
5922 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
|
5923 const regex_t *preg; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5924 const char *string; |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5925 size_t nmatch; |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5926 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
|
5927 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
|
5928 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5929 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
|
5930 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
|
5931 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
|
5932 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
|
5933 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
|
5934 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5935 private_preg = *preg; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5936 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5937 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
|
5938 private_preg.not_eol = !!(eflags & REG_NOTEOL); |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5939 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5940 /* 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
|
5941 information about, via `nmatch'. We have to pass that on to the |
| 939 | 5942 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
|
5943 private_preg.regs_allocated = REGS_FIXED; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5944 |
|
441
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 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
|
5946 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5947 regs.num_regs = nmatch; |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
5948 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
|
5949 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
|
5950 return (int) REG_NOMATCH; |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
5951 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
|
5952 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5953 |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
5954 /* 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
|
5955 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
|
5956 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
|
5957 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
|
5958 '\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
|
5959 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
|
5960 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
|
5961 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
|
5962 |
|
441
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 /* 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
|
5964 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
|
5965 /* 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
|
5966 want_reg_info ? ®s : (struct re_registers *) 0); |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5967 |
|
441
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 /* 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
|
5969 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
|
5970 { |
|
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 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
|
5972 { |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
5973 unsigned r; |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
5974 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
5975 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
|
5976 { |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
5977 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
|
5978 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
|
5979 } |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
5980 } |
| 939 | 5981 |
| 5982 /* 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
|
5983 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
|
5984 } |
|
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 |
|
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 /* 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
|
5987 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
|
5988 } |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
5989 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
|
5990 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5991 |
|
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 /* 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
|
5993 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
|
5994 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5995 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
|
5996 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
|
5997 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
|
5998 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
|
5999 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
|
6000 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
|
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 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
|
6003 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
|
6004 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6005 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
|
6006 || 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
|
6007 /* Only error codes returned by the rest of the code should be passed |
| 939 | 6008 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
|
6009 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
|
6010 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
|
6011 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
|
6012 |
|
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 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
|
6014 |
|
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 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
|
6016 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6017 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
|
6018 { |
|
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 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
|
6020 { |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
6021 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
|
6022 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
|
6023 } |
|
441
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 else |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
6025 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
|
6026 } |
|
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 |
|
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 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
|
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 (__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
|
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 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6033 /* 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
|
6034 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6035 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
|
6036 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
|
6037 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
|
6038 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6039 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
|
6040 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
|
6041 preg->buffer = NULL; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
6042 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6043 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
|
6044 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
|
6045 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6046 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
|
6047 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
|
6048 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
|
6049 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
|
6050 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6051 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
|
6052 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
|
6053 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
|
6054 } |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
6055 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
|
6056 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6057 #endif /* not emacs */ |