Mercurial > hg > octave-nkf > gnulib-hg
annotate regex.c @ 3976:df9c91af417b
(_GNU_SOURCE): Don't define.
| author | Dave Love <fx@gnu.org> |
|---|---|
| date | Mon, 18 Nov 2002 15:40:28 +0000 |
| parents | f9f4c9631e62 |
| children | 2a2694bf4ece |
| 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 |
|
3933
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
22 /* TODO: |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
23 - structure the opcode space into opcode+flag. |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
24 - merge with glibc's regex.[ch]. |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
25 - replace (succeed_n + jump_n + set_number_at) with something that doesn't |
|
2925
71f30fc93bf9
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2921
diff
changeset
|
26 need to modify the compiled regexp so that re_match can be reentrant. |
|
71f30fc93bf9
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2921
diff
changeset
|
27 - get rid of on_failure_jump_smart by doing the optimization in re_comp |
|
71f30fc93bf9
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2921
diff
changeset
|
28 rather than at run-time, so that re_match can be reentrant. |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
29 */ |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
30 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
31 /* 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
|
32 #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
|
33 #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
|
34 #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
|
35 |
|
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 #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
|
37 # 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
|
38 #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
|
39 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
40 #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
|
41 # include <stddef.h> |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
42 #else |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
43 /* 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
|
44 # include <sys/types.h> |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
45 #endif |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
46 |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
47 /* 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
|
48 Those should not be used for Emacs since it uses its own. */ |
|
3544
f56c62a4b58c
(WIDE_CHAR_SUPPORT): Do not use defined() in macro.
Gerd Moellmann <gerd@gnu.org>
parents:
3238
diff
changeset
|
49 #if defined _LIBC |
|
f56c62a4b58c
(WIDE_CHAR_SUPPORT): Do not use defined() in macro.
Gerd Moellmann <gerd@gnu.org>
parents:
3238
diff
changeset
|
50 #define WIDE_CHAR_SUPPORT 1 |
|
f56c62a4b58c
(WIDE_CHAR_SUPPORT): Do not use defined() in macro.
Gerd Moellmann <gerd@gnu.org>
parents:
3238
diff
changeset
|
51 #else |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
52 #define WIDE_CHAR_SUPPORT \ |
|
3544
f56c62a4b58c
(WIDE_CHAR_SUPPORT): Do not use defined() in macro.
Gerd Moellmann <gerd@gnu.org>
parents:
3238
diff
changeset
|
53 (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC && !emacs) |
|
f56c62a4b58c
(WIDE_CHAR_SUPPORT): Do not use defined() in macro.
Gerd Moellmann <gerd@gnu.org>
parents:
3238
diff
changeset
|
54 #endif |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
55 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
56 /* 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
|
57 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
|
58 #if WIDE_CHAR_SUPPORT |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
59 /* 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
|
60 # include <wchar.h> |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
61 # include <wctype.h> |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
62 #endif |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
63 |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
64 #ifdef _LIBC |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
65 /* 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
|
66 # 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
|
67 # 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
|
68 # 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
|
69 # 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
|
70 __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
|
71 # 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
|
72 __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
|
73 # 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
|
74 __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
|
75 # 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
|
76 __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
|
77 # 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
|
78 __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
|
79 # 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
|
80 __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
|
81 # 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
|
82 # 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
|
83 __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
|
84 # 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
|
85 |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
86 /* 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
|
87 # define btowc __btowc |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
88 # define iswctype __iswctype |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
89 # define wctype __wctype |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
90 |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
91 # 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
|
92 |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
93 /* 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
|
94 # include <locale/localeinfo.h> |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
95 # 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
|
96 # include <langinfo.h> |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
97 #else |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
98 # 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
|
99 #endif |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
100 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
101 /* 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
|
102 #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
|
103 # 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
|
104 #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
|
105 # 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
|
106 #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
|
107 |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
108 #ifndef gettext_noop |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
109 /* 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
|
110 strings. */ |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
111 # define gettext_noop(String) String |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
112 #endif |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
113 |
|
441
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 /* 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
|
115 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
|
116 #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
|
117 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
118 # include "lisp.h" |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
119 # include "buffer.h" |
| 939 | 120 |
| 121 /* 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
|
122 # 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
|
123 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
124 # include "syntax.h" |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
125 # include "charset.h" |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
126 # include "category.h" |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
127 |
|
3238
94b544bcb2c4
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
3129
diff
changeset
|
128 # ifdef malloc |
|
94b544bcb2c4
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
3129
diff
changeset
|
129 # undef malloc |
|
94b544bcb2c4
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
3129
diff
changeset
|
130 # endif |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
131 # define malloc xmalloc |
|
3238
94b544bcb2c4
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
3129
diff
changeset
|
132 # ifdef realloc |
|
94b544bcb2c4
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
3129
diff
changeset
|
133 # undef realloc |
|
94b544bcb2c4
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
3129
diff
changeset
|
134 # endif |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
135 # define realloc xrealloc |
|
3238
94b544bcb2c4
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
3129
diff
changeset
|
136 # ifdef free |
|
94b544bcb2c4
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
3129
diff
changeset
|
137 # undef free |
|
94b544bcb2c4
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
3129
diff
changeset
|
138 # endif |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
139 # define free xfree |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
140 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
141 /* 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
|
142 # 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
|
143 # 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
|
144 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
145 # 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
|
146 # define RE_STRING_CHAR(p, s) \ |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
147 (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
|
148 # 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
|
149 (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
|
150 |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
151 /* 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
|
152 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
|
153 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
|
154 # 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
|
155 do { \ |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
156 if (multibyte) \ |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
157 { \ |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
158 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
|
159 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
|
160 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
|
161 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
|
162 } \ |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
163 else \ |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
164 (c = ((p) == (str2) ? (end1) : (p))[-1]); \ |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
165 } while (0) |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
166 |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
167 |
|
441
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 #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
|
169 |
|
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 /* 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
|
171 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
|
172 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
|
173 # undef REL_ALLOC |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
174 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
175 # 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
|
176 # include <stdlib.h> |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
177 # 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
|
178 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
|
179 char *realloc (); |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
180 # 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
|
181 |
|
451
b08ce70c8b7c
Undefined INHIBIT_STRING_HEADER when we have no
Karl Heuer <kwzh@gnu.org>
parents:
449
diff
changeset
|
182 /* 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
|
183 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
|
184 # 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
|
185 # 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
|
186 # 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
|
187 # 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
|
188 # endif |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
189 # endif |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
190 # endif |
|
451
b08ce70c8b7c
Undefined INHIBIT_STRING_HEADER when we have no
Karl Heuer <kwzh@gnu.org>
parents:
449
diff
changeset
|
191 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
192 /* 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
|
193 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
|
194 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
|
195 # 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
|
196 # 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
|
197 # include <string.h> |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
198 # ifndef bzero |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
199 # ifndef _LIBC |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
200 # 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
|
201 # else |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
202 # 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
|
203 # endif |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
204 # endif |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
205 # else |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
206 # include <strings.h> |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
207 # ifndef memcmp |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
208 # 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
|
209 # endif |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
210 # ifndef memcpy |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
211 # 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
|
212 # endif |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
213 # endif |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
214 # 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
|
215 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
216 /* 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
|
217 |
|
2359
dbf725277cfc
(enum syntaxcode): Provide default for non-Emacs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2357
diff
changeset
|
218 /* 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
|
219 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
|
220 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
221 # 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
|
222 # 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
|
223 # else |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
224 # 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
|
225 # endif |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
226 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
227 /* 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
|
228 # 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
|
229 # 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
|
230 # 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
|
231 # 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
|
232 # 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
|
233 # 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
|
234 # 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
|
235 # 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
|
236 # 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
|
237 # 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
|
238 # 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
|
239 # 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
|
240 # 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
|
241 # 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
|
242 # 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
|
243 # 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
|
244 (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
|
245 # 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
|
246 #endif /* not emacs */ |
|
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 #ifndef RE_TRANSLATE |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
249 # 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
|
250 # 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
|
251 #endif |
|
2841
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 /* 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
|
254 #include "regex.h" |
|
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 /* 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
|
257 #include <ctype.h> |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
258 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
259 #ifdef emacs |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
260 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
261 /* 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
|
262 # 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
|
263 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
264 /* 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
|
265 # 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
|
266 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
267 /* 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
|
268 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
269 /* 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
|
270 # 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
|
271 # 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
|
272 # 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
|
273 || ((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
|
274 || ((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
|
275 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
276 /* 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
|
277 # 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
|
278 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
279 /* 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
|
280 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
281 # 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
|
282 ? (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
|
283 : 1) |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
284 |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
285 # 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
|
286 ? (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
|
287 : 1) |
|
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 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
|
290 ? (((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
|
291 || ((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
|
292 || ((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
|
293 : SYNTAX (c) == Sword) |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
294 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
295 # 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
|
296 ? (((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
|
297 || ((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
|
298 : SYNTAX (c) == Sword) |
|
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 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
|
301 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
302 # 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
|
303 ? ((c) > ' ' && (c) < 0177 \ |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
304 && !(((c) >= 'a' && (c) <= 'z') \ |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
305 || ((c) >= 'A' && (c) <= 'Z') \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
306 || ((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
|
307 : SYNTAX (c) != Sword) |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
308 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
309 # 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
|
310 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
311 # 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
|
312 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
313 # 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
|
314 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
315 #else /* not emacs */ |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
316 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
317 /* Jim Meyering writes: |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
318 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
319 "... 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
|
320 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
|
321 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
|
322 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
|
323 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
|
324 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
|
325 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
|
326 eliminate the && through constant folding." |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
327 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
|
328 |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
329 # undef ISASCII |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
330 # 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
|
331 # 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
|
332 # else |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
333 # define 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
|
334 # endif |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
335 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
336 /* 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
|
337 # 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
|
338 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
339 /* 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
|
340 # 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
|
341 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
342 # ifdef isblank |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
343 # 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
|
344 # else |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
345 # 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
|
346 # endif |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
347 # ifdef isgraph |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
348 # 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
|
349 # else |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
350 # 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
|
351 # endif |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
352 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
353 # undef ISPRINT |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
354 # 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
|
355 # 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
|
356 # 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
|
357 # 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
|
358 # 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
|
359 # 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
|
360 # 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
|
361 # 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
|
362 # 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
|
363 # 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
|
364 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
365 # 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
|
366 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
367 # ifdef _tolower |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
368 # define TOLOWER(c) _tolower(c) |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
369 # else |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
370 # define TOLOWER(c) tolower(c) |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
371 # endif |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
372 |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
373 /* 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
|
374 # define CHAR_SET_SIZE 256 |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
375 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
376 # 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
|
377 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
378 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
|
379 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
380 # 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
|
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 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
|
383 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
384 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
|
385 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
|
386 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
387 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
|
388 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
|
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 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
|
391 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
|
392 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
393 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
|
394 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
395 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
|
396 if (ISALNUM (c)) |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
397 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
|
398 |
|
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 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
|
400 |
|
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 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
|
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 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
404 # endif /* not SYNTAX_TABLE */ |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
405 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
406 # 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
|
407 |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
408 #endif /* not emacs */ |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
409 |
|
441
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 #ifndef NULL |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
411 # 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
|
412 #endif |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
413 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
414 /* 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
|
415 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
|
416 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
|
417 (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
|
418 #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
|
419 #if __STDC__ |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
420 # 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
|
421 #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
|
422 /* 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
|
423 # 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
|
424 #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
|
425 |
|
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 /* 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
|
427 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
|
428 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
|
429 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
|
430 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
|
431 |
|
441
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 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
|
433 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
|
434 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
|
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 #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
|
437 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
438 # 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
|
439 # 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
|
440 # 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
|
441 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
442 #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
|
443 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
444 /* 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
|
445 # 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
|
446 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
447 /* 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
|
448 # ifdef __GNUC__ |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
449 # 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
|
450 # else /* not __GNUC__ */ |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
451 # 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
|
452 # include <alloca.h> |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
453 # 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
|
454 # endif /* not __GNUC__ */ |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
455 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
456 # endif /* not alloca */ |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
457 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
458 # 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
|
459 |
|
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 /* 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
|
461 # 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
|
462 (destination = (char *) alloca (nsize), \ |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
463 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
|
464 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
465 /* 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
|
466 # 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
|
467 |
|
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 #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
|
469 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
470 /* 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
|
471 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
472 #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
|
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(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
|
475 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
|
476 # 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
|
477 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
|
478 # 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
|
479 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
|
480 |
|
462
115ffc5a3b13
Don't use relocatable allocator.
Richard Stallman <rms@gnu.org>
parents:
460
diff
changeset
|
481 #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
|
482 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
483 # ifdef REGEX_MALLOC |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
484 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
485 # 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
|
486 # 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
|
487 # 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
|
488 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
489 # 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
|
490 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
491 # 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
|
492 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
493 # 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
|
494 REGEX_REALLOCATE (source, osize, nsize) |
| 941 | 495 /* 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
|
496 # 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
|
497 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
498 # endif /* not REGEX_MALLOC */ |
|
462
115ffc5a3b13
Don't use relocatable allocator.
Richard Stallman <rms@gnu.org>
parents:
460
diff
changeset
|
499 #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
|
500 |
|
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 |
|
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 /* 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
|
503 `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
|
504 a good thing. */ |
| 941 | 505 #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
|
506 (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
|
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 /* (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
|
509 #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
|
510 #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
|
511 #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
|
512 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
|
513 #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
|
514 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
515 #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
|
516 |
|
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 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
|
518 |
|
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 #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
|
520 #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
|
521 #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
|
522 #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
|
523 |
|
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
|
524 /* 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
|
525 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
|
526 |
|
441
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 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
|
528 #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
|
529 #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
|
530 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
531 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
|
532 re_char *string1, int size1, |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
533 re_char *string2, int size2, |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
534 int pos, |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
535 struct re_registers *regs, |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
536 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
|
537 |
|
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 /* 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
|
539 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
|
540 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
|
541 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
|
542 |
|
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 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
|
544 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
545 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
|
546 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
547 /* 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
|
548 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
|
549 |
| 941 | 550 /* 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
|
551 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
|
552 |
| 941 | 553 /* 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
|
554 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
|
555 |
| 941 | 556 /* Matches any one char belonging to specified set. First |
| 557 following byte is number of bitmap bytes. Then come bytes | |
| 558 for a bitmap saying which chars are in. Bits in each byte | |
| 559 are ordered low-bit-first. A character is in the set if its | |
| 560 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
|
561 automatically not in the set. |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
562 |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
563 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
|
564 is followed by a range table: |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
565 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
|
566 See RANGE_TABLE_WORK_BITS below. |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
567 2 bytes, the number of pairs that follow (upto 32767) |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
568 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
|
569 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
|
570 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
|
571 |
| 941 | 572 /* 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
|
573 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
|
574 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
|
575 |
| 941 | 576 /* Start remembering the text that is matched, for storing in a |
| 577 register. Followed by one byte with the register number, in | |
| 578 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
|
579 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
|
580 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
|
581 |
| 941 | 582 /* Stop remembering the text that is matched and store it in a |
| 583 memory register. Followed by one byte with the register | |
| 584 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
|
585 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
|
586 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
|
587 |
| 941 | 588 /* 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
|
589 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
|
590 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
|
591 |
| 941 | 592 /* 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
|
593 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
|
594 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
595 /* 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
|
596 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
|
597 |
| 941 | 598 /* Succeeds if at beginning of buffer (if emacs) or at beginning |
| 599 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
|
600 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
|
601 |
| 941 | 602 /* 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
|
603 endbuf, |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
604 |
| 941 | 605 /* 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
|
606 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
|
607 |
| 941 | 608 /* Followed by two-byte relative address of place to resume at |
| 609 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
|
610 on_failure_jump, |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
611 |
| 941 | 612 /* Like on_failure_jump, but pushes a placeholder instead of the |
| 613 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
|
614 on_failure_keep_string_jump, |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
615 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
616 /* 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
|
617 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
|
618 indefinitely). */ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
619 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
|
620 |
|
2370
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
621 /* 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
|
622 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
|
623 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
|
624 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
|
625 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
|
626 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
627 /* 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
|
628 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
|
629 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
|
630 `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
|
631 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
|
632 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
|
633 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
|
634 |
| 941 | 635 /* 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
|
636 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
|
637 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
|
638 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
|
639 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
|
640 |
| 941 | 641 /* Followed by two-byte relative address, and two-byte number n. |
| 642 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
|
643 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
|
644 |
| 941 | 645 /* Set the following two-byte relative address to the |
| 646 subsequent two-byte number. The address *includes* the two | |
| 647 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
|
648 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
|
649 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
650 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
|
651 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
|
652 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
653 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
|
654 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
|
655 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
656 /* Matches any character whose syntax is specified. Followed by |
| 941 | 657 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
|
658 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
|
659 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
660 /* 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
|
661 notsyntaxspec |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
662 |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
663 #ifdef emacs |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
664 ,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
|
665 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
|
666 after_dot, /* Succeeds if after point. */ |
| 939 | 667 |
| 668 /* Matches any character whose category-set contains the specified | |
| 941 | 669 category. The operator is followed by a byte which contains a |
| 670 category code (mnemonic ASCII character). */ | |
| 939 | 671 categoryspec, |
| 672 | |
| 673 /* Matches any character whose category-set does not contain the | |
| 674 specified category. The operator is followed by a byte which | |
| 675 contains the category code (mnemonic ASCII character). */ | |
| 676 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
|
677 #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
|
678 } 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
|
679 |
|
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 /* 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
|
681 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
682 /* 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
|
683 |
|
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 #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
|
685 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
|
686 (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
|
687 (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
|
688 } 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
|
689 |
|
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 /* 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
|
691 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
|
692 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
|
693 |
|
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 #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
|
695 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
|
696 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
|
697 (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
|
698 } 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
|
699 |
|
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 /* 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
|
701 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
|
702 |
|
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 #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
|
704 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
|
705 (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
|
706 (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
|
707 } 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
|
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 #ifdef DEBUG |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
710 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
|
711 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
|
712 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
|
713 int *dest; |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
714 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
|
715 { |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
716 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
|
717 *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
|
718 *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
|
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 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
721 # 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
|
722 # undef EXTRACT_NUMBER |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
723 # 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
|
724 # 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
|
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 #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
|
727 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
728 /* 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
|
729 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
|
730 |
|
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 #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
|
732 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
|
733 EXTRACT_NUMBER (destination, source); \ |
| 941 | 734 (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
|
735 } 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
|
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 #ifdef DEBUG |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
738 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
|
739 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
|
740 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
|
741 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
|
742 int *destination; |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
743 re_char **source; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
744 { |
|
441
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 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
|
746 *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
|
747 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
748 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
749 # ifndef EXTRACT_MACROS |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
750 # 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
|
751 # 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
|
752 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
|
753 # 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
|
754 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
755 #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
|
756 |
| 939 | 757 /* Store a multibyte character in three contiguous bytes starting |
| 758 DESTINATION, and increment DESTINATION to the byte after where the | |
| 941 | 759 character is stored. Therefore, DESTINATION must be an lvalue. */ |
| 939 | 760 |
| 761 #define STORE_CHARACTER_AND_INCR(destination, character) \ | |
| 762 do { \ | |
| 763 (destination)[0] = (character) & 0377; \ | |
| 764 (destination)[1] = ((character) >> 8) & 0377; \ | |
| 765 (destination)[2] = (character) >> 16; \ | |
| 766 (destination) += 3; \ | |
| 767 } while (0) | |
| 768 | |
| 769 /* Put into DESTINATION a character stored in three contiguous bytes | |
| 941 | 770 starting at SOURCE. */ |
| 939 | 771 |
| 772 #define EXTRACT_CHARACTER(destination, source) \ | |
| 773 do { \ | |
| 774 (destination) = ((source)[0] \ | |
| 775 | ((source)[1] << 8) \ | |
| 776 | ((source)[2] << 16)); \ | |
| 777 } while (0) | |
| 778 | |
| 779 | |
| 780 /* Macros for charset. */ | |
| 781 | |
| 782 /* Size of bitmap of charset P in bytes. P is a start of charset, | |
| 783 i.e. *P is (re_opcode_t) charset or (re_opcode_t) charset_not. */ | |
| 784 #define CHARSET_BITMAP_SIZE(p) ((p)[1] & 0x7F) | |
| 785 | |
| 786 /* Nonzero if charset P has range table. */ | |
| 941 | 787 #define CHARSET_RANGE_TABLE_EXISTS_P(p) ((p)[1] & 0x80) |
| 939 | 788 |
| 789 /* Return the address of range table of charset P. But not the start | |
| 790 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
|
791 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
|
792 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
|
793 #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
|
794 |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
795 /* 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
|
796 #define CHARSET_RANGE_TABLE_BITS(p) \ |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
797 ((p)[2 + CHARSET_BITMAP_SIZE (p)] \ |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
798 + (p)[3 + CHARSET_BITMAP_SIZE (p)] * 0x100) |
| 939 | 799 |
| 800 /* Test if C is listed in the bitmap of charset P. */ | |
| 801 #define CHARSET_LOOKUP_BITMAP(p, c) \ | |
| 802 ((c) < CHARSET_BITMAP_SIZE (p) * BYTEWIDTH \ | |
| 803 && (p)[2 + (c) / BYTEWIDTH] & (1 << ((c) % BYTEWIDTH))) | |
| 804 | |
| 805 /* Return the address of end of RANGE_TABLE. COUNT is number of | |
| 941 | 806 ranges (which is a pair of (start, end)) in the RANGE_TABLE. `* 2' |
| 807 is start of range and end of range. `* 3' is size of each start | |
| 939 | 808 and end. */ |
| 809 #define CHARSET_RANGE_TABLE_END(range_table, count) \ | |
| 810 ((range_table) + (count) * 2 * 3) | |
| 811 | |
| 941 | 812 /* Test if C is in RANGE_TABLE. A flag NOT is negated if C is in. |
| 939 | 813 COUNT is number of ranges in RANGE_TABLE. */ |
| 814 #define CHARSET_LOOKUP_RANGE_TABLE_RAW(not, c, range_table, count) \ | |
| 815 do \ | |
| 816 { \ | |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
817 re_wchar_t range_start, range_end; \ |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
818 re_char *p; \ |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
819 re_char *range_table_end \ |
| 939 | 820 = CHARSET_RANGE_TABLE_END ((range_table), (count)); \ |
| 821 \ | |
| 822 for (p = (range_table); p < range_table_end; p += 2 * 3) \ | |
| 823 { \ | |
| 824 EXTRACT_CHARACTER (range_start, p); \ | |
| 825 EXTRACT_CHARACTER (range_end, p + 3); \ | |
| 826 \ | |
| 827 if (range_start <= (c) && (c) <= range_end) \ | |
| 828 { \ | |
| 829 (not) = !(not); \ | |
| 830 break; \ | |
| 831 } \ | |
| 832 } \ | |
| 833 } \ | |
| 834 while (0) | |
| 835 | |
| 836 /* Test if C is in range table of CHARSET. The flag NOT is negated if | |
| 837 C is listed in it. */ | |
| 838 #define CHARSET_LOOKUP_RANGE_TABLE(not, c, charset) \ | |
| 839 do \ | |
| 840 { \ | |
| 841 /* Number of ranges in range table. */ \ | |
| 842 int count; \ | |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
843 re_char *range_table = CHARSET_RANGE_TABLE (charset); \ |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
844 \ |
| 939 | 845 EXTRACT_NUMBER_AND_INCR (count, range_table); \ |
| 846 CHARSET_LOOKUP_RANGE_TABLE_RAW ((not), (c), range_table, count); \ | |
| 847 } \ | |
| 848 while (0) | |
| 849 | |
|
441
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 /* 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
|
851 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
|
852 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
|
853 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
|
854 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
|
855 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
856 #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
|
857 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
858 /* 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
|
859 # 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
|
860 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
861 /* 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
|
862 # 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
|
863 |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
864 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
|
865 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
866 # 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
|
867 # 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
|
868 # 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
|
869 # 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
|
870 # 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
|
871 # 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
|
872 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
|
873 # 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
|
874 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
|
875 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
876 |
|
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 /* 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
|
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 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
|
880 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
|
881 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
|
882 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
883 unsigned was_a_range = 0; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
884 unsigned i = 0; |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
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 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
|
887 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
888 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
|
889 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
890 was_a_range = 0; |
| 941 | 891 putchar (i - 1); |
| 892 while (i < (1 << BYTEWIDTH) && fastmap[i]) | |
| 893 { | |
| 894 was_a_range = 1; | |
| 895 i++; | |
| 896 } | |
|
441
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 if (was_a_range) |
| 941 | 898 { |
| 899 printf ("-"); | |
| 900 putchar (i - 1); | |
| 901 } | |
| 902 } | |
|
441
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 } |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
904 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
|
905 } |
|
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 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
907 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
908 /* 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
|
909 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
|
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 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
|
912 print_partial_compiled_pattern (start, end) |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
913 re_char *start; |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
914 re_char *end; |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
915 { |
|
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 int mcnt, mcnt2; |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
917 re_char *p = start; |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
918 re_char *pend = end; |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
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 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
|
921 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
922 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
|
923 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
|
924 } |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
925 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
926 /* 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
|
927 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
|
928 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
929 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
|
930 |
|
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 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
|
932 { |
| 941 | 933 case no_op: |
| 934 printf ("/no_op"); | |
| 935 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
|
936 |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
937 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
|
938 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
|
939 break; |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
940 |
|
441
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 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
|
942 mcnt = *p++; |
| 941 | 943 printf ("/exactn/%d", mcnt); |
| 944 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
|
945 { |
| 941 | 946 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
|
947 putchar (*p++); |
| 941 | 948 } |
| 949 while (--mcnt); | |
| 950 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
|
951 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
952 case 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
|
953 printf ("/start_memory/%d", *p++); |
| 941 | 954 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
|
955 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
956 case 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
|
957 printf ("/stop_memory/%d", *p++); |
| 941 | 958 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
|
959 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
960 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
|
961 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
|
962 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
|
963 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
964 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
|
965 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
|
966 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
|
967 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
968 case charset: |
| 941 | 969 case charset_not: |
| 970 { | |
| 971 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
|
972 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
|
973 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
|
974 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
|
975 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
976 printf ("/charset [%s", |
| 941 | 977 (re_opcode_t) *(p - 1) == charset_not ? "^" : ""); |
| 978 | |
| 979 assert (p + *p < pend); | |
| 980 | |
| 981 for (c = 0; c < 256; c++) | |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
982 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
|
983 && (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
|
984 { |
|
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 /* 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
|
986 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
|
987 { |
|
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 ('-'); |
|
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 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
|
990 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
991 /* 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
|
992 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
|
993 { |
|
441
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 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
|
996 } |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
997 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
998 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
|
999 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
|
1000 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1001 last = c; |
| 941 | 1002 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1003 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1004 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
|
1005 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
|
1006 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1007 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
|
1008 |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
1009 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
|
1010 |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
1011 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
|
1012 { |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
1013 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
|
1014 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
|
1015 |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
1016 /* ??? 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
|
1017 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
|
1018 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
|
1019 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
|
1020 } |
|
441
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 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1022 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
|
1023 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1024 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
|
1025 printf ("/begline"); |
| 941 | 1026 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
|
1027 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1028 case endline: |
| 941 | 1029 printf ("/endline"); |
| 1030 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
|
1031 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1032 case on_failure_jump: |
| 941 | 1033 extract_number_and_incr (&mcnt, &p); |
| 1034 printf ("/on_failure_jump to %d", p + mcnt - start); | |
| 1035 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
|
1036 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1037 case on_failure_keep_string_jump: |
| 941 | 1038 extract_number_and_incr (&mcnt, &p); |
| 1039 printf ("/on_failure_keep_string_jump to %d", p + mcnt - start); | |
| 1040 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
|
1041 |
|
2370
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
1042 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
|
1043 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
|
1044 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
|
1045 break; |
|
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
1046 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1047 case on_failure_jump_loop: |
| 941 | 1048 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
|
1049 printf ("/on_failure_jump_loop to %d", p + mcnt - start); |
| 941 | 1050 break; |
| 1051 | |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1052 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
|
1053 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
|
1054 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
|
1055 break; |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1056 |
| 941 | 1057 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
|
1058 extract_number_and_incr (&mcnt, &p); |
| 941 | 1059 printf ("/jump to %d", p + mcnt - start); |
| 679 | 1060 break; |
| 1061 | |
| 941 | 1062 case succeed_n: |
| 1063 extract_number_and_incr (&mcnt, &p); | |
| 1064 extract_number_and_incr (&mcnt2, &p); | |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
1065 printf ("/succeed_n to %d, %d times", p - 2 + mcnt - start, mcnt2); |
| 941 | 1066 break; |
| 1067 | |
| 1068 case jump_n: | |
| 1069 extract_number_and_incr (&mcnt, &p); | |
| 1070 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
|
1071 printf ("/jump_n to %d, %d times", p - 2 + mcnt - start, mcnt2); |
| 941 | 1072 break; |
| 1073 | |
| 1074 case set_number_at: | |
| 1075 extract_number_and_incr (&mcnt, &p); | |
| 1076 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
|
1077 printf ("/set_number_at location %d to %d", p - 2 + mcnt - start, mcnt2); |
| 941 | 1078 break; |
| 1079 | |
| 1080 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
|
1081 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
|
1082 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
|
1083 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1084 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
|
1085 printf ("/notwordbound"); |
| 941 | 1086 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
|
1087 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1088 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
|
1089 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
|
1090 break; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1091 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1092 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
|
1093 printf ("/wordend"); |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1094 |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1095 case syntaxspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1096 printf ("/syntaxspec"); |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1097 mcnt = *p++; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1098 printf ("/%d", mcnt); |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1099 break; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1100 |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1101 case notsyntaxspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1102 printf ("/notsyntaxspec"); |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1103 mcnt = *p++; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1104 printf ("/%d", mcnt); |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1105 break; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1106 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1107 # 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
|
1108 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
|
1109 printf ("/before_dot"); |
| 941 | 1110 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
|
1111 |
|
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 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
|
1113 printf ("/at_dot"); |
| 941 | 1114 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
|
1115 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1116 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
|
1117 printf ("/after_dot"); |
| 941 | 1118 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
|
1119 |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1120 case categoryspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1121 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
|
1122 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
|
1123 printf ("/%d", mcnt); |
| 941 | 1124 break; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1125 |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1126 case notcategoryspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
1127 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
|
1128 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
|
1129 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
|
1130 break; |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1131 # 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
|
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 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
|
1134 printf ("/begbuf"); |
| 941 | 1135 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
|
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 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
|
1138 printf ("/endbuf"); |
| 941 | 1139 break; |
| 1140 | |
| 1141 default: | |
| 1142 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
|
1143 } |
|
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 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
|
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 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1148 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
|
1149 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1150 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1151 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1152 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
|
1153 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
|
1154 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
|
1155 { |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1156 re_char *buffer = bufp->buffer; |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1157 |
|
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 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
|
1159 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
|
1160 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
|
1161 |
|
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 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
|
1163 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1164 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
|
1165 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
|
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 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
|
1169 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
|
1170 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
|
1171 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
|
1172 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
|
1173 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
|
1174 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
|
1175 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
|
1176 /* 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
|
1177 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1178 |
|
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 |
|
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 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
|
1181 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
|
1182 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
|
1183 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
|
1184 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
|
1185 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
|
1186 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
|
1187 { |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1188 int this_char; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
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 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
|
1191 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
|
1192 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
|
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 if (FIRST_STRING_P (where)) |
| 941 | 1195 { |
| 1196 for (this_char = where - string1; this_char < size1; this_char++) | |
| 1197 putchar (string1[this_char]); | |
| 1198 | |
| 1199 where = string2; | |
| 1200 } | |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1201 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1202 for (this_char = where - string2; this_char < size2; this_char++) |
| 941 | 1203 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
|
1204 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1205 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1206 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1207 #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
|
1208 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1209 # undef assert |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1210 # define assert(e) |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1211 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1212 # 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
|
1213 # 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
|
1214 # 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
|
1215 # 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
|
1216 # 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
|
1217 # 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
|
1218 # 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
|
1219 |
|
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 #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
|
1221 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1222 /* 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
|
1223 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
|
1224 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
|
1225 /* 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
|
1226 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
|
1227 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
|
1228 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1229 |
|
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 /* 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
|
1231 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
|
1232 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
|
1233 |
|
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 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
|
1235 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
|
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 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
|
1238 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
|
1239 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
|
1240 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1241 reg_syntax_t ret = re_syntax_options; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1242 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1243 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
|
1244 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
|
1245 } |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
1246 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
|
1247 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1248 /* 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
|
1249 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
|
1250 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
|
1251 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
|
1252 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1253 static const char *re_error_msgid[] = |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1254 { |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1255 gettext_noop ("Success"), /* REG_NOERROR */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1256 gettext_noop ("No match"), /* REG_NOMATCH */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1257 gettext_noop ("Invalid regular expression"), /* REG_BADPAT */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1258 gettext_noop ("Invalid collation character"), /* REG_ECOLLATE */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1259 gettext_noop ("Invalid character class name"), /* REG_ECTYPE */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1260 gettext_noop ("Trailing backslash"), /* REG_EESCAPE */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1261 gettext_noop ("Invalid back reference"), /* REG_ESUBREG */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1262 gettext_noop ("Unmatched [ or [^"), /* REG_EBRACK */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1263 gettext_noop ("Unmatched ( or \\("), /* REG_EPAREN */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1264 gettext_noop ("Unmatched \\{"), /* REG_EBRACE */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1265 gettext_noop ("Invalid content of \\{\\}"), /* REG_BADBR */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1266 gettext_noop ("Invalid range end"), /* REG_ERANGE */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1267 gettext_noop ("Memory exhausted"), /* REG_ESPACE */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1268 gettext_noop ("Invalid preceding regular expression"), /* REG_BADRPT */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1269 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
|
1270 gettext_noop ("Regular expression too big"), /* REG_ESIZE */ |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1271 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
|
1272 }; |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1273 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1274 /* 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
|
1275 |
|
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 /* 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
|
1277 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
|
1278 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
|
1279 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
|
1280 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
|
1281 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
|
1282 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
|
1283 |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1284 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
|
1285 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
|
1286 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
|
1287 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
|
1288 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
|
1289 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
|
1290 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
|
1291 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
|
1292 |
|
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 /* 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
|
1294 #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
|
1295 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1296 /* 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
|
1297 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
|
1298 #ifdef __GNUC__ |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1299 # 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
|
1300 #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
|
1301 |
|
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 /* 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
|
1303 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
|
1304 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
|
1305 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
|
1306 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
|
1307 #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
|
1308 # 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
|
1309 #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
|
1310 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1311 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1312 /* 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
|
1313 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
|
1314 REGEX_ALLOCATE_STACK. */ |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1315 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1316 |
|
1156
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1317 /* 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
|
1318 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
|
1319 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
|
1320 #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
|
1321 # 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
|
1322 #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
|
1323 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1324 /* 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
|
1325 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
|
1326 This is a variable only so users of regex can assign to it; we never |
|
3581
68530c9df63a
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3544
diff
changeset
|
1327 change it ourselves. We always multiply it by TYPICAL_FAILURE_SIZE |
|
68530c9df63a
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3544
diff
changeset
|
1328 before using it, so it should probably be a byte-count instead. */ |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
1329 # 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
|
1330 /* 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
|
1331 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
|
1332 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
|
1333 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
|
1334 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
|
1335 # else |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
1336 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
|
1337 # 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
|
1338 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1339 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
|
1340 { |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1341 re_char *pointer; |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
1342 /* 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
|
1343 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
|
1344 }; |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1345 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1346 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
|
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 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
|
1349 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1350 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
|
1351 size_t size; |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
1352 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
|
1353 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
|
1354 } 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
|
1355 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1356 #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
|
1357 #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
|
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 |
|
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 /* 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
|
1361 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
|
1362 |
|
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 #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
|
1364 # 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
|
1365 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
|
1366 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
|
1367 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
|
1368 * 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
|
1369 \ |
|
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 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
|
1371 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
|
1372 \ |
|
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 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
|
1374 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
|
1375 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
|
1376 } 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
|
1377 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1378 # 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
|
1379 #else |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1380 # 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
|
1381 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
|
1382 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
|
1383 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
|
1384 } 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
|
1385 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1386 # 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
|
1387 #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
|
1388 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1389 |
|
1156
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1390 /* 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
|
1391 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
|
1392 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1393 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
|
1394 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
|
1395 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1396 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
|
1397 |
|
1156
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1398 /* 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
|
1399 when we increase it. |
|
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1400 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
|
1401 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
|
1402 were as ultimate, maximum-size stack. */ |
|
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1403 #define FAIL_STACK_GROWTH_FACTOR 4 |
|
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1404 |
|
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1405 #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
|
1406 (((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
|
1407 >= 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
|
1408 ? 0 \ |
|
1156
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1409 : ((fail_stack).stack \ |
|
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1410 = (fail_stack_elt_t *) \ |
| 941 | 1411 REGEX_REALLOCATE_STACK ((fail_stack).stack, \ |
| 1412 (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
|
1413 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
|
1414 ((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
|
1415 * 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
|
1416 \ |
|
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 (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
|
1418 ? 0 \ |
|
1157
5aa89bba935d
(GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents:
1156
diff
changeset
|
1419 : ((fail_stack).size \ |
|
5aa89bba935d
(GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents:
1156
diff
changeset
|
1420 = (MIN (re_max_failures * TYPICAL_FAILURE_SIZE, \ |
|
5aa89bba935d
(GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents:
1156
diff
changeset
|
1421 ((fail_stack).size * sizeof (fail_stack_elt_t) \ |
|
5aa89bba935d
(GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents:
1156
diff
changeset
|
1422 * FAIL_STACK_GROWTH_FACTOR)) \ |
|
5aa89bba935d
(GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents:
1156
diff
changeset
|
1423 / sizeof (fail_stack_elt_t)), \ |
| 941 | 1424 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
|
1425 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1426 |
|
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) \ |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1431 fail_stack.stack[fail_stack.avail++].pointer = (item) |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
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 |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1481 /* Change the counter's value to VAL, but make sure that it will |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1482 be reset when backtracking. */ |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1483 #define PUSH_NUMBER(ptr,val) \ |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1484 do { \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1485 char *destination; \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1486 int c; \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1487 ENSURE_FAIL_STACK(3); \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1488 EXTRACT_NUMBER (c, ptr); \ |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1489 DEBUG_PRINT4 (" Push number %p = %d -> %d\n", ptr, c, val); \ |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1490 PUSH_FAILURE_INT (c); \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1491 PUSH_FAILURE_POINTER (ptr); \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1492 PUSH_FAILURE_INT (-1); \ |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1493 STORE_NUMBER (ptr, val); \ |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1494 } while (0) |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1495 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1496 /* Pop a saved register off the stack. */ |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1497 #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
|
1498 do { \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1499 int reg = POP_FAILURE_INT (); \ |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1500 if (reg == -1) \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1501 { \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1502 /* It's a counter. */ \ |
|
2925
71f30fc93bf9
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2921
diff
changeset
|
1503 /* Here, we discard `const', making re_match non-reentrant. */ \ |
|
71f30fc93bf9
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2921
diff
changeset
|
1504 unsigned char *ptr = (unsigned char*) POP_FAILURE_POINTER (); \ |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1505 reg = POP_FAILURE_INT (); \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1506 STORE_NUMBER (ptr, reg); \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1507 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
|
1508 } \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1509 else \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1510 { \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1511 regend[reg] = POP_FAILURE_POINTER (); \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1512 regstart[reg] = POP_FAILURE_POINTER (); \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1513 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
|
1514 reg, regstart[reg], regend[reg]); \ |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1515 } \ |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1516 } 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
|
1517 |
|
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 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
|
1519 #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
|
1520 do { \ |
|
3789
06f52f435b13
(DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard Stallman <rms@gnu.org>
parents:
3581
diff
changeset
|
1521 int failure = TOP_FAILURE_HANDLE (); \ |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1522 /* Check for infinite matching loops */ \ |
|
3789
06f52f435b13
(DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard Stallman <rms@gnu.org>
parents:
3581
diff
changeset
|
1523 while (failure > 0 \ |
|
06f52f435b13
(DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard Stallman <rms@gnu.org>
parents:
3581
diff
changeset
|
1524 && (FAILURE_STR (failure) == string_place \ |
|
06f52f435b13
(DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard Stallman <rms@gnu.org>
parents:
3581
diff
changeset
|
1525 || FAILURE_STR (failure) == NULL)) \ |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1526 { \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1527 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
|
1528 && 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
|
1529 if (FAILURE_PAT (failure) == pat_cur) \ |
|
3789
06f52f435b13
(DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard Stallman <rms@gnu.org>
parents:
3581
diff
changeset
|
1530 { \ |
|
3933
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
1531 cycle = 1; \ |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
1532 break; \ |
|
3789
06f52f435b13
(DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard Stallman <rms@gnu.org>
parents:
3581
diff
changeset
|
1533 } \ |
|
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
|
1534 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
|
1535 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
|
1536 } \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1537 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
|
1538 } while (0) |
|
3933
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
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 /* 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
|
1541 if we ever fail back to it. |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1542 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1543 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
|
1544 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
|
1545 declared. |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1546 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1547 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
|
1548 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1549 #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
|
1550 do { \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1551 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
|
1552 /* 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
|
1553 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
|
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_STATEMENT (nfailure_points_pushed++); \ |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1556 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
|
1557 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
|
1558 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
|
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 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
|
1561 \ |
|
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 \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1564 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
|
1565 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
|
1566 \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1567 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
|
1568 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
|
1569 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
|
1570 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
|
1571 \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1572 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
|
1573 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
|
1574 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
|
1575 \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1576 /* 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
|
1577 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
|
1578 } 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
|
1579 |
|
1156
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1580 /* 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
|
1581 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
|
1582 is to choose a limit for how big to make the failure stack. */ |
|
3581
68530c9df63a
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3544
diff
changeset
|
1583 /* BEWARE, the value `20' is hard-coded in emacs.c:main(). */ |
|
1156
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1584 #define TYPICAL_FAILURE_SIZE 20 |
|
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
1585 |
|
441
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 /* 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
|
1587 #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
|
1588 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1589 |
|
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 /* 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
|
1591 |
|
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 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
|
1593 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
|
1594 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
|
1595 REGSTART, REGEND -- arrays of string positions. |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1596 |
|
441
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 Also assumes the variables `fail_stack' and (if debugging), `bufp', |
| 941 | 1598 `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
|
1599 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1600 #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
|
1601 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
|
1602 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
|
1603 \ |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1604 /* 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
|
1605 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
|
1606 DEBUG_PRINT2 (" Before pop, next avail: %d\n", fail_stack.avail); \ |
| 941 | 1607 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
|
1608 \ |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1609 /* 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
|
1610 while (fail_stack.frame < fail_stack.avail) \ |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
1611 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
|
1612 \ |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1613 pat = POP_FAILURE_POINTER (); \ |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1614 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
|
1615 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
|
1616 \ |
|
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 /* 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
|
1618 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
|
1619 saved NULL, thus retaining our current position in the string. */ \ |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1620 str = POP_FAILURE_POINTER (); \ |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1621 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
|
1622 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
|
1623 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
|
1624 \ |
|
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 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
|
1626 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
|
1627 \ |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
1628 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
|
1629 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
|
1630 \ |
|
441
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 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
|
1632 } 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
|
1633 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1634 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1635 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1636 /* 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
|
1637 #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
|
1638 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1639 /* 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
|
1640 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1641 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
|
1642 reg_syntax_t syntax, |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1643 struct re_pattern_buffer *bufp)); |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1644 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
|
1645 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
|
1646 int arg1, int arg2)); |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1647 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
|
1648 int arg, unsigned char *end)); |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1649 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
|
1650 int arg1, int arg2, unsigned char *end)); |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1651 static boolean at_begline_loc_p _RE_ARGS ((re_char *pattern, |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1652 re_char *p, |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1653 reg_syntax_t syntax)); |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1654 static boolean at_endline_loc_p _RE_ARGS ((re_char *p, |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1655 re_char *pend, |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1656 reg_syntax_t syntax)); |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1657 static re_char *skip_one_char _RE_ARGS ((re_char *p)); |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1658 static int analyse_first _RE_ARGS ((re_char *p, re_char *pend, |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1659 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
|
1660 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1661 /* 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
|
1662 translation. */ |
|
3925
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
1663 #define PATFETCH(c) \ |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
1664 do { \ |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
1665 int len; \ |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
1666 if (p == pend) return REG_EEND; \ |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
1667 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
|
1668 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
|
1669 } 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
|
1670 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1671 |
|
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 /* 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
|
1673 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
|
1674 `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
|
1675 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
|
1676 #ifndef TRANSLATE |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
1677 # 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
|
1678 (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
|
1679 #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
|
1680 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1681 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1682 /* 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
|
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 /* 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
|
1685 #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
|
1686 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1687 /* 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
|
1688 #define GET_BUFFER_SPACE(n) \ |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1689 while ((size_t) (b - bufp->buffer + (n)) > bufp->allocated) \ |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1690 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
|
1691 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1692 /* 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
|
1693 #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
|
1694 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
|
1695 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
|
1696 *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
|
1697 } 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
|
1698 |
|
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 |
|
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 /* 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
|
1701 #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
|
1702 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
|
1703 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
|
1704 *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
|
1705 *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
|
1706 } 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
|
1707 |
|
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 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1709 /* 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
|
1710 #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
|
1711 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
|
1712 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
|
1713 *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
|
1714 *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
|
1715 *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
|
1716 } 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
|
1717 |
|
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 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1719 /* Store 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
|
1720 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
|
1721 #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
|
1722 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
|
1723 |
|
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 /* 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
|
1725 #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
|
1726 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
|
1727 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1728 /* 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
|
1729 #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
|
1730 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
|
1731 |
|
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 /* 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
|
1733 #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
|
1734 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
|
1735 |
|
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 |
|
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 /* 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
|
1738 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
|
1739 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
|
1740 /* 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
|
1741 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
|
1742 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
|
1743 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
|
1744 You have been warned!! */ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1745 #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
|
1746 /* 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
|
1747 # define MAX_BUF_SIZE 65500L |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1748 #else |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1749 # 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
|
1750 #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
|
1751 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1752 /* 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
|
1753 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
|
1754 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
|
1755 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
|
1756 #if __BOUNDED_POINTERS__ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1757 # 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
|
1758 # define MOVE_BUFFER_POINTER(P) \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1759 (__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
|
1760 # 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
|
1761 else \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1762 { \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1763 SET_HIGH_BOUND (b); \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1764 SET_HIGH_BOUND (begalt); \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1765 if (fixup_alt_jump) \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1766 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
|
1767 if (laststart) \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1768 SET_HIGH_BOUND (laststart); \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1769 if (pending_exact) \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1770 SET_HIGH_BOUND (pending_exact); \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1771 } |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1772 #else |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1773 # 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
|
1774 # 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
|
1775 #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
|
1776 #define EXTEND_BUFFER() \ |
| 941 | 1777 do { \ |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1778 re_char *old_buffer = bufp->buffer; \ |
| 941 | 1779 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
|
1780 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
|
1781 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
|
1782 if (bufp->allocated > MAX_BUF_SIZE) \ |
| 941 | 1783 bufp->allocated = MAX_BUF_SIZE; \ |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1784 RETALLOC (bufp->buffer, bufp->allocated, unsigned char); \ |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1785 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
|
1786 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
|
1787 /* 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
|
1788 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
|
1789 { \ |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1790 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
|
1791 MOVE_BUFFER_POINTER (b); \ |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1792 MOVE_BUFFER_POINTER (begalt); \ |
| 941 | 1793 if (fixup_alt_jump) \ |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1794 MOVE_BUFFER_POINTER (fixup_alt_jump); \ |
| 941 | 1795 if (laststart) \ |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1796 MOVE_BUFFER_POINTER (laststart); \ |
| 941 | 1797 if (pending_exact) \ |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1798 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
|
1799 } \ |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1800 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
|
1801 } 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
|
1802 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1803 |
|
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 /* 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
|
1805 {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
|
1806 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
|
1807 #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
|
1808 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1809 /* 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
|
1810 ignore the excess. */ |
|
3932
9a7f7ab024aa
(regnum_t): Use signed int, not unsigned int.
Richard Stallman <rms@gnu.org>
parents:
3931
diff
changeset
|
1811 typedef int regnum_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
|
1812 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1813 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1814 /* 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
|
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 /* 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
|
1817 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
|
1818 /* 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
|
1819 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
|
1820 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1821 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
|
1822 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1823 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
|
1824 pattern_offset_t fixup_alt_jump; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
1825 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
|
1826 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
|
1827 } 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
|
1828 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1829 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1830 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
|
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 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
|
1833 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
|
1834 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
|
1835 } 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
|
1836 |
|
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 |
|
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 #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
|
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 #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
|
1841 #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
|
1842 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1843 /* 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
|
1844 #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
|
1845 |
|
3930
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1846 /* Explicit quit checking is only used on NTemacs. */ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1847 #if defined WINDOWSNT && defined emacs && defined QUIT |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1848 extern int immediate_quit; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1849 # define IMMEDIATE_QUIT_CHECK \ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1850 do { \ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1851 if (immediate_quit) QUIT; \ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1852 } while (0) |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1853 #else |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1854 # define IMMEDIATE_QUIT_CHECK ((void)0) |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1855 #endif |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1856 |
| 939 | 1857 /* Structure to manage work area for range table. */ |
| 1858 struct range_table_work_area | |
| 1859 { | |
| 1860 int *table; /* actual work area. */ | |
| 1861 int allocated; /* allocated size for work area in bytes. */ | |
| 941 | 1862 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
|
1863 int bits; /* flag to record character classes */ |
| 939 | 1864 }; |
| 1865 | |
|
3930
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1866 /* Make sure that WORK_AREA can hold more N multibyte characters. |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1867 This is used only in set_image_of_range and set_image_of_range_1. |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1868 It expects WORK_AREA to be a pointer. |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1869 If it can't get the space, it returns from the surrounding function. */ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1870 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1871 #define EXTEND_RANGE_TABLE(work_area, n) \ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1872 do { \ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1873 if (((work_area)->used + (n)) * sizeof (int) > (work_area)->allocated) \ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1874 { \ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1875 extend_range_table_work_area (work_area); \ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1876 if ((work_area)->table == 0) \ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1877 return (REG_ESPACE); \ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1878 } \ |
| 939 | 1879 } while (0) |
| 1880 | |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
1881 #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
|
1882 (work_area).bits |= (bit) |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
1883 |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1884 /* 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
|
1885 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
|
1886 #define BIT_WORD 0x1 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1887 #define BIT_LOWER 0x2 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1888 #define BIT_PUNCT 0x4 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1889 #define BIT_SPACE 0x8 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1890 #define BIT_UPPER 0x10 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1891 #define BIT_MULTIBYTE 0x20 |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
1892 |
|
3925
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
1893 /* Set a range START..END to WORK_AREA. |
|
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
1894 The range is passed through TRANSLATE, so START and END |
|
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
1895 should be untranslated. */ |
|
3930
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1896 #define SET_RANGE_TABLE_WORK_AREA(work_area, start, end) \ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1897 do { \ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1898 int tem; \ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1899 tem = set_image_of_range (&work_area, start, end, translate); \ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1900 if (tem > 0) \ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1901 FREE_STACK_RETURN (tem); \ |
| 939 | 1902 } while (0) |
| 1903 | |
| 941 | 1904 /* Free allocated memory for WORK_AREA. */ |
| 939 | 1905 #define FREE_RANGE_TABLE_WORK_AREA(work_area) \ |
| 1906 do { \ | |
| 1907 if ((work_area).table) \ | |
| 1908 free ((work_area).table); \ | |
| 1909 } while (0) | |
| 1910 | |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
1911 #define CLEAR_RANGE_TABLE_WORK_USED(work_area) ((work_area).used = 0, (work_area).bits = 0) |
| 939 | 1912 #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
|
1913 #define RANGE_TABLE_WORK_BITS(work_area) ((work_area).bits) |
| 939 | 1914 #define RANGE_TABLE_WORK_ELT(work_area, i) ((work_area).table[i]) |
|
3930
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1915 |
| 939 | 1916 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1917 /* Set the bit for character C in a list. */ |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1918 #define SET_LIST_BIT(c) (b[((c)) / BYTEWIDTH] |= 1 << ((c) % BYTEWIDTH)) |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1919 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1920 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
1921 /* Get the next unsigned number in the uncompiled pattern. */ |
| 941 | 1922 #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
|
1923 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
|
1924 { \ |
| 941 | 1925 PATFETCH (c); \ |
|
3790
9009dff1b90b
(GET_UNSIGNED_NUMBER): Give proper error for spaces.
Richard Stallman <rms@gnu.org>
parents:
3789
diff
changeset
|
1926 if (c == ' ') \ |
|
9009dff1b90b
(GET_UNSIGNED_NUMBER): Give proper error for spaces.
Richard Stallman <rms@gnu.org>
parents:
3789
diff
changeset
|
1927 FREE_STACK_RETURN (REG_BADBR); \ |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
1928 while ('0' <= c && c <= '9') \ |
| 941 | 1929 { \ |
|
3789
06f52f435b13
(DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard Stallman <rms@gnu.org>
parents:
3581
diff
changeset
|
1930 int prev; \ |
| 941 | 1931 if (num < 0) \ |
|
3789
06f52f435b13
(DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard Stallman <rms@gnu.org>
parents:
3581
diff
changeset
|
1932 num = 0; \ |
|
06f52f435b13
(DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard Stallman <rms@gnu.org>
parents:
3581
diff
changeset
|
1933 prev = num; \ |
| 941 | 1934 num = num * 10 + c - '0'; \ |
|
3789
06f52f435b13
(DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard Stallman <rms@gnu.org>
parents:
3581
diff
changeset
|
1935 if (num / 10 != prev) \ |
|
06f52f435b13
(DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard Stallman <rms@gnu.org>
parents:
3581
diff
changeset
|
1936 FREE_STACK_RETURN (REG_BADBR); \ |
| 941 | 1937 if (p == pend) \ |
|
3789
06f52f435b13
(DISCARD_FAILURE_REG_OR_COUNT): New macro.
Richard Stallman <rms@gnu.org>
parents:
3581
diff
changeset
|
1938 break; \ |
| 941 | 1939 PATFETCH (c); \ |
| 1940 } \ | |
|
3790
9009dff1b90b
(GET_UNSIGNED_NUMBER): Give proper error for spaces.
Richard Stallman <rms@gnu.org>
parents:
3789
diff
changeset
|
1941 if (c == ' ') \ |
|
9009dff1b90b
(GET_UNSIGNED_NUMBER): Give proper error for spaces.
Richard Stallman <rms@gnu.org>
parents:
3789
diff
changeset
|
1942 FREE_STACK_RETURN (REG_BADBR); \ |
| 941 | 1943 } \ |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
1944 } while (0) |
|
3930
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
1945 |
|
2881
d3634ee92a43
(WIDE_CHAR_SUPPORT): Define if _LIBC as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2872
diff
changeset
|
1946 #if WIDE_CHAR_SUPPORT |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1947 /* 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
|
1948 and the functions from ISO C amendement 1. */ |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1949 # ifdef CHARCLASS_NAME_MAX |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1950 # define CHAR_CLASS_MAX_LENGTH CHARCLASS_NAME_MAX |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1951 # else |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1952 /* 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
|
1953 problem. Use a reasonable default value. */ |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1954 # define CHAR_CLASS_MAX_LENGTH 256 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1955 # endif |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1956 typedef wctype_t re_wctype_t; |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1957 typedef wchar_t re_wchar_t; |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1958 # define re_wctype wctype |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1959 # define re_iswctype iswctype |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1960 # define re_wctype_to_bit(cc) 0 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1961 #else |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1962 # define CHAR_CLASS_MAX_LENGTH 9 /* Namely, `multibyte'. */ |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1963 # define btowc(c) c |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1964 |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1965 /* Character classes. */ |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1966 typedef enum { RECC_ERROR = 0, |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1967 RECC_ALNUM, RECC_ALPHA, RECC_WORD, |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1968 RECC_GRAPH, RECC_PRINT, |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1969 RECC_LOWER, RECC_UPPER, |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1970 RECC_PUNCT, RECC_CNTRL, |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1971 RECC_DIGIT, RECC_XDIGIT, |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1972 RECC_BLANK, RECC_SPACE, |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1973 RECC_MULTIBYTE, RECC_NONASCII, |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1974 RECC_ASCII, RECC_UNIBYTE |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1975 } re_wctype_t; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1976 |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1977 typedef int re_wchar_t; |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
1978 |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1979 /* 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
|
1980 static re_wctype_t |
|
3581
68530c9df63a
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3544
diff
changeset
|
1981 re_wctype (str) |
|
68530c9df63a
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3544
diff
changeset
|
1982 re_char *str; |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1983 { |
|
3581
68530c9df63a
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3544
diff
changeset
|
1984 const char *string = str; |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1985 if (STREQ (string, "alnum")) return RECC_ALNUM; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1986 else if (STREQ (string, "alpha")) return RECC_ALPHA; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1987 else if (STREQ (string, "word")) return RECC_WORD; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1988 else if (STREQ (string, "ascii")) return RECC_ASCII; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1989 else if (STREQ (string, "nonascii")) return RECC_NONASCII; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1990 else if (STREQ (string, "graph")) return RECC_GRAPH; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1991 else if (STREQ (string, "lower")) return RECC_LOWER; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1992 else if (STREQ (string, "print")) return RECC_PRINT; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1993 else if (STREQ (string, "punct")) return RECC_PUNCT; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1994 else if (STREQ (string, "space")) return RECC_SPACE; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1995 else if (STREQ (string, "upper")) return RECC_UPPER; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1996 else if (STREQ (string, "unibyte")) return RECC_UNIBYTE; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1997 else if (STREQ (string, "multibyte")) return RECC_MULTIBYTE; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1998 else if (STREQ (string, "digit")) return RECC_DIGIT; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
1999 else if (STREQ (string, "xdigit")) return RECC_XDIGIT; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2000 else if (STREQ (string, "cntrl")) return RECC_CNTRL; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2001 else if (STREQ (string, "blank")) return RECC_BLANK; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2002 else return 0; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2003 } |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2004 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2005 /* 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
|
2006 static boolean |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2007 re_iswctype (ch, cc) |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2008 int ch; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2009 re_wctype_t cc; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2010 { |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2011 switch (cc) |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2012 { |
|
2945
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2013 case RECC_ALNUM: return ISALNUM (ch); |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2014 case RECC_ALPHA: return ISALPHA (ch); |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2015 case RECC_BLANK: return ISBLANK (ch); |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2016 case RECC_CNTRL: return ISCNTRL (ch); |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2017 case RECC_DIGIT: return ISDIGIT (ch); |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2018 case RECC_GRAPH: return ISGRAPH (ch); |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2019 case RECC_LOWER: return ISLOWER (ch); |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2020 case RECC_PRINT: return ISPRINT (ch); |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2021 case RECC_PUNCT: return ISPUNCT (ch); |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2022 case RECC_SPACE: return ISSPACE (ch); |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2023 case RECC_UPPER: return ISUPPER (ch); |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2024 case RECC_XDIGIT: return ISXDIGIT (ch); |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2025 case RECC_ASCII: return IS_REAL_ASCII (ch); |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2026 case RECC_NONASCII: return !IS_REAL_ASCII (ch); |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2027 case RECC_UNIBYTE: return ISUNIBYTE (ch); |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2028 case RECC_MULTIBYTE: return !ISUNIBYTE (ch); |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2029 case RECC_WORD: return ISWORD (ch); |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2030 case RECC_ERROR: return false; |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2031 default: |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2032 abort(); |
|
2851
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 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2036 /* 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
|
2037 chars of class CC. */ |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2038 static int |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2039 re_wctype_to_bit (cc) |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2040 re_wctype_t cc; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2041 { |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2042 switch (cc) |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2043 { |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2044 case RECC_NONASCII: case RECC_PRINT: case RECC_GRAPH: |
|
2945
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2045 case RECC_MULTIBYTE: return BIT_MULTIBYTE; |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2046 case RECC_ALPHA: case RECC_ALNUM: case RECC_WORD: return BIT_WORD; |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2047 case RECC_LOWER: return BIT_LOWER; |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2048 case RECC_UPPER: return BIT_UPPER; |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2049 case RECC_PUNCT: return BIT_PUNCT; |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2050 case RECC_SPACE: return BIT_SPACE; |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2051 case RECC_ASCII: case RECC_DIGIT: case RECC_XDIGIT: case RECC_CNTRL: |
|
2945
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2052 case RECC_BLANK: case RECC_UNIBYTE: case RECC_ERROR: return 0; |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2053 default: |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
2054 abort(); |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2055 } |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2056 } |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2057 #endif |
|
3930
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2058 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2059 /* Filling in the work area of a range. */ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2060 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2061 /* Actually extend the space in WORK_AREA. */ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2062 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2063 static void |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2064 extend_range_table_work_area (work_area) |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2065 struct range_table_work_area *work_area; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2066 { |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2067 work_area->allocated += 16 * sizeof (int); |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2068 if (work_area->table) |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2069 work_area->table |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2070 = (int *) realloc (work_area->table, work_area->allocated); |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2071 else |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2072 work_area->table |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2073 = (int *) malloc (work_area->allocated); |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2074 } |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2075 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2076 #ifdef emacs |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2077 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2078 /* Carefully find the ranges of codes that are equivalent |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2079 under case conversion to the range start..end when passed through |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2080 TRANSLATE. Handle the case where non-letters can come in between |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2081 two upper-case letters (which happens in Latin-1). |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2082 Also handle the case of groups of more than 2 case-equivalent chars. |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2083 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2084 The basic method is to look at consecutive characters and see |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2085 if they can form a run that can be handled as one. |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2086 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2087 Returns -1 if successful, REG_ESPACE if ran out of space. */ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2088 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2089 static int |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2090 set_image_of_range_1 (work_area, start, end, translate) |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2091 RE_TRANSLATE_TYPE translate; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2092 struct range_table_work_area *work_area; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2093 re_wchar_t start, end; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2094 { |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2095 /* `one_case' indicates a character, or a run of characters, |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2096 each of which is an isolate (no case-equivalents). |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2097 This includes all ASCII non-letters. |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2098 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2099 `two_case' indicates a character, or a run of characters, |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2100 each of which has two case-equivalent forms. |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2101 This includes all ASCII letters. |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2102 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2103 `strange' indicates a character that has more than one |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2104 case-equivalent. */ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2105 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2106 enum case_type {one_case, two_case, strange}; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2107 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2108 /* Describe the run that is in progress, |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2109 which the next character can try to extend. |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2110 If run_type is strange, that means there really is no run. |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2111 If run_type is one_case, then run_start...run_end is the run. |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2112 If run_type is two_case, then the run is run_start...run_end, |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2113 and the case-equivalents end at run_eqv_end. */ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2114 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2115 enum case_type run_type = strange; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2116 int run_start, run_end, run_eqv_end; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2117 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2118 Lisp_Object eqv_table; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2119 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2120 if (!RE_TRANSLATE_P (translate)) |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2121 { |
|
3931
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2122 EXTEND_RANGE_TABLE (work_area, 2); |
|
3930
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2123 work_area->table[work_area->used++] = (start); |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2124 work_area->table[work_area->used++] = (end); |
|
3931
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2125 return -1; |
|
3930
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2126 } |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2127 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2128 eqv_table = XCHAR_TABLE (translate)->extras[2]; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2129 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2130 for (; start <= end; start++) |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2131 { |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2132 enum case_type this_type; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2133 int eqv = RE_TRANSLATE (eqv_table, start); |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2134 int minchar, maxchar; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2135 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2136 /* Classify this character */ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2137 if (eqv == start) |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2138 this_type = one_case; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2139 else if (RE_TRANSLATE (eqv_table, eqv) == start) |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2140 this_type = two_case; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2141 else |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2142 this_type = strange; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2143 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2144 if (start < eqv) |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2145 minchar = start, maxchar = eqv; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2146 else |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2147 minchar = eqv, maxchar = start; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2148 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2149 /* Can this character extend the run in progress? */ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2150 if (this_type == strange || this_type != run_type |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2151 || !(minchar == run_end + 1 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2152 && (run_type == two_case |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2153 ? maxchar == run_eqv_end + 1 : 1))) |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2154 { |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2155 /* No, end the run. |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2156 Record each of its equivalent ranges. */ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2157 if (run_type == one_case) |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2158 { |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2159 EXTEND_RANGE_TABLE (work_area, 2); |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2160 work_area->table[work_area->used++] = run_start; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2161 work_area->table[work_area->used++] = run_end; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2162 } |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2163 else if (run_type == two_case) |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2164 { |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2165 EXTEND_RANGE_TABLE (work_area, 4); |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2166 work_area->table[work_area->used++] = run_start; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2167 work_area->table[work_area->used++] = run_end; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2168 work_area->table[work_area->used++] |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2169 = RE_TRANSLATE (eqv_table, run_start); |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2170 work_area->table[work_area->used++] |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2171 = RE_TRANSLATE (eqv_table, run_end); |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2172 } |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2173 run_type = strange; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2174 } |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2175 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2176 if (this_type == strange) |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2177 { |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2178 /* For a strange character, add each of its equivalents, one |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2179 by one. Don't start a range. */ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2180 do |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2181 { |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2182 EXTEND_RANGE_TABLE (work_area, 2); |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2183 work_area->table[work_area->used++] = eqv; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2184 work_area->table[work_area->used++] = eqv; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2185 eqv = RE_TRANSLATE (eqv_table, eqv); |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2186 } |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2187 while (eqv != start); |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2188 } |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2189 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2190 /* Add this char to the run, or start a new run. */ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2191 else if (run_type == strange) |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2192 { |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2193 /* Initialize a new range. */ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2194 run_type = this_type; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2195 run_start = start; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2196 run_end = start; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2197 run_eqv_end = RE_TRANSLATE (eqv_table, run_end); |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2198 } |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2199 else |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2200 { |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2201 /* Extend a running range. */ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2202 run_end = minchar; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2203 run_eqv_end = RE_TRANSLATE (eqv_table, run_end); |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2204 } |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2205 } |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2206 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2207 /* If a run is still in progress at the end, finish it now |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2208 by recording its equivalent ranges. */ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2209 if (run_type == one_case) |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2210 { |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2211 EXTEND_RANGE_TABLE (work_area, 2); |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2212 work_area->table[work_area->used++] = run_start; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2213 work_area->table[work_area->used++] = run_end; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2214 } |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2215 else if (run_type == two_case) |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2216 { |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2217 EXTEND_RANGE_TABLE (work_area, 4); |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2218 work_area->table[work_area->used++] = run_start; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2219 work_area->table[work_area->used++] = run_end; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2220 work_area->table[work_area->used++] |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2221 = RE_TRANSLATE (eqv_table, run_start); |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2222 work_area->table[work_area->used++] |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2223 = RE_TRANSLATE (eqv_table, run_end); |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2224 } |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2225 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2226 return -1; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2227 } |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2228 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2229 #endif /* emacs */ |
|
3925
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
2230 |
|
3931
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2231 /* Record the the image of the range start..end when passed through |
|
3925
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
2232 TRANSLATE. This is not necessarily TRANSLATE(start)..TRANSLATE(end) |
|
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
2233 and is not even necessarily contiguous. |
|
3931
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2234 Normally we approximate it with the smallest contiguous range that contains |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2235 all the chars we need. However, for Latin-1 we go to extra effort |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2236 to do a better job. |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2237 |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2238 This function is not called for ASCII ranges. |
|
3930
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2239 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2240 Returns -1 if successful, REG_ESPACE if ran out of space. */ |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2241 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2242 static int |
|
3925
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
2243 set_image_of_range (work_area, start, end, translate) |
|
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
2244 RE_TRANSLATE_TYPE translate; |
|
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
2245 struct range_table_work_area *work_area; |
|
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
2246 re_wchar_t start, end; |
|
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
2247 { |
|
3930
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2248 re_wchar_t cmin, cmax; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2249 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2250 #ifdef emacs |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2251 /* For Latin-1 ranges, use set_image_of_range_1 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2252 to get proper handling of ranges that include letters and nonletters. |
|
3931
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2253 For a range that includes the whole of Latin-1, this is not necessary. |
|
3930
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2254 For other character sets, we don't bother to get this right. */ |
|
3931
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2255 if (RE_TRANSLATE_P (translate) && start < 04400 |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2256 && !(start < 04200 && end >= 04377)) |
|
3930
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2257 { |
|
3931
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2258 int newend; |
|
3930
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2259 int tem; |
|
3931
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2260 newend = end; |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2261 if (newend > 04377) |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2262 newend = 04377; |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2263 tem = set_image_of_range_1 (work_area, start, newend, translate); |
|
3930
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2264 if (tem > 0) |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2265 return tem; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2266 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2267 start = 04400; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2268 if (end < 04400) |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2269 return -1; |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2270 } |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2271 #endif |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2272 |
|
3931
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2273 EXTEND_RANGE_TABLE (work_area, 2); |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2274 work_area->table[work_area->used++] = (start); |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2275 work_area->table[work_area->used++] = (end); |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2276 |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2277 cmin = -1, cmax = -1; |
|
3930
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2278 |
|
3925
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
2279 if (RE_TRANSLATE_P (translate)) |
|
3931
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2280 { |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2281 int ch; |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2282 |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2283 for (ch = start; ch <= end; ch++) |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2284 { |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2285 re_wchar_t c = TRANSLATE (ch); |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2286 if (! (start <= c && c <= end)) |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2287 { |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2288 if (cmin == -1) |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2289 cmin = c, cmax = c; |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2290 else |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2291 { |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2292 cmin = MIN (cmin, c); |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2293 cmax = MAX (cmax, c); |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2294 } |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2295 } |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2296 } |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2297 |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2298 if (cmin != -1) |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2299 { |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2300 EXTEND_RANGE_TABLE (work_area, 2); |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2301 work_area->table[work_area->used++] = (cmin); |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2302 work_area->table[work_area->used++] = (cmax); |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2303 } |
|
9f0064f1b6d8
(set_image_of_range_1): In no-TRANSLATE case,
Richard Stallman <rms@gnu.org>
parents:
3930
diff
changeset
|
2304 } |
|
3930
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2305 |
|
b553adc49338
(set_image_of_range_1): New function.
Richard Stallman <rms@gnu.org>
parents:
3925
diff
changeset
|
2306 return -1; |
|
3925
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
2307 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2308 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2309 #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
|
2310 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2311 /* 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
|
2312 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
|
2313 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
|
2314 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
|
2315 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
|
2316 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
|
2317 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2318 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
|
2319 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2320 /* 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
|
2321 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
|
2322 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
|
2323 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
|
2324 |
|
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
|
2325 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
|
2326 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
|
2327 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2328 /* 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
|
2329 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
|
2330 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2331 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
|
2332 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
|
2333 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
|
2334 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2335 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
|
2336 { |
|
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
|
2337 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
|
2338 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
|
2339 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
|
2340 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
|
2341 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2342 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
|
2343 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2344 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2345 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2346 #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
|
2347 |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
2348 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
|
2349 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
|
2350 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
|
2351 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2352 /* `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
|
2353 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
|
2354 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2355 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
|
2356 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
|
2357 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2358 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
|
2359 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
|
2360 `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
|
2361 `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
|
2362 `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
|
2363 `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
|
2364 `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
|
2365 `not_bol' and `not_eol' are zero; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
2366 |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
2367 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
|
2368 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
2369 /* 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
|
2370 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
|
2371 #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
|
2372 do { \ |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
2373 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
|
2374 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
|
2375 } 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
|
2376 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
2377 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2378 /* 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
|
2379 #define FREE_STACK_RETURN(value) \ |
| 939 | 2380 do { \ |
| 2381 FREE_RANGE_TABLE_WORK_AREA (range_table_work); \ | |
| 2382 free (compile_stack.stack); \ | |
| 2383 return value; \ | |
| 2384 } 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
|
2385 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2386 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
|
2387 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
|
2388 re_char *pattern; |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
2389 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
|
2390 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
|
2391 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
|
2392 { |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
2393 /* We fetch characters from PATTERN here. */ |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
2394 register re_wchar_t c, c1; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
2395 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2396 /* 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
|
2397 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
|
2398 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2399 /* 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
|
2400 register unsigned char *b; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
2401 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2402 /* 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
|
2403 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
|
2404 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2405 /* 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
|
2406 #ifdef AIX |
|
ba6fdbf593bb
(regex_compile): Declare p with non-const type on AIX.
Richard Stallman <rms@gnu.org>
parents:
1383
diff
changeset
|
2407 /* `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
|
2408 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
|
2409 #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
|
2410 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
|
2411 #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
|
2412 re_char *pend = pattern + size; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
2413 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2414 /* 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
|
2415 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
|
2416 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2417 /* 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
|
2418 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
|
2419 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
|
2420 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
|
2421 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
|
2422 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2423 /* 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
|
2424 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
|
2425 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
|
2426 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
|
2427 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2428 /* 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
|
2429 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
|
2430 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2431 /* 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
|
2432 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
|
2433 re_char *beg_interval; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
2434 |
|
441
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 /* Address of the place where a forward jump should go to the end of |
| 941 | 2436 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
|
2437 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
|
2438 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
|
2439 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2440 /* 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
|
2441 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
|
2442 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
|
2443 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
|
2444 |
| 939 | 2445 /* Work area for range table of charset. */ |
| 2446 struct range_table_work_area range_table_work; | |
| 2447 | |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
2448 /* 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
|
2449 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
|
2450 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2451 #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
|
2452 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
|
2453 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
|
2454 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
|
2455 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2456 unsigned debug_count; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
2457 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2458 for (debug_count = 0; debug_count < size; debug_count++) |
| 941 | 2459 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
|
2460 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
|
2461 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2462 #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
|
2463 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2464 /* 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
|
2465 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
|
2466 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
|
2467 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
|
2468 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2469 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
|
2470 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
|
2471 |
| 939 | 2472 range_table_work.table = 0; |
| 2473 range_table_work.allocated = 0; | |
| 2474 | |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2475 /* 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
|
2476 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
|
2477 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
|
2478 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
|
2479 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2480 /* 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
|
2481 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
|
2482 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
|
2483 bufp->used = 0; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
2484 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2485 /* 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
|
2486 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
|
2487 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
2488 #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
|
2489 /* 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
|
2490 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
|
2491 #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
|
2492 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2493 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
|
2494 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2495 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
|
2496 { /* If zero allocated, but buffer is non-null, try to realloc |
| 941 | 2497 enough space. This loses if buffer's address is bogus, but |
| 2498 that is the user's responsibility. */ | |
| 2499 RETALLOC (bufp->buffer, INIT_BUF_SIZE, unsigned char); | |
| 2500 } | |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2501 else |
| 941 | 2502 { /* Caller did not allocate a buffer. Do it for them. */ |
| 2503 bufp->buffer = TALLOC (INIT_BUF_SIZE, unsigned char); | |
| 2504 } | |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2505 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
|
2506 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2507 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
|
2508 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2509 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2510 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
|
2511 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2512 /* 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
|
2513 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
|
2514 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2515 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
|
2516 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2517 switch (c) |
| 941 | 2518 { |
| 2519 case '^': | |
| 2520 { | |
| 2521 if ( /* If at start of pattern, it's an operator. */ | |
| 2522 p == pattern + 1 | |
| 2523 /* If context independent, it's an operator. */ | |
| 2524 || syntax & RE_CONTEXT_INDEP_ANCHORS | |
| 2525 /* Otherwise, depends on what's come before. */ | |
| 2526 || 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
|
2527 BUF_PUSH ((syntax & RE_NO_NEWLINE_ANCHOR) ? begbuf : begline); |
| 941 | 2528 else |
| 2529 goto normal_char; | |
| 2530 } | |
| 2531 break; | |
| 2532 | |
| 2533 | |
| 2534 case '$': | |
| 2535 { | |
| 2536 if ( /* If at end of pattern, it's an operator. */ | |
| 2537 p == pend | |
| 2538 /* If context independent, it's an operator. */ | |
| 2539 || syntax & RE_CONTEXT_INDEP_ANCHORS | |
| 2540 /* Otherwise, depends on what's next. */ | |
| 2541 || 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
|
2542 BUF_PUSH ((syntax & RE_NO_NEWLINE_ANCHOR) ? endbuf : endline); |
| 941 | 2543 else |
| 2544 goto normal_char; | |
| 2545 } | |
| 2546 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
|
2547 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2548 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2549 case '+': |
| 941 | 2550 case '?': |
| 2551 if ((syntax & RE_BK_PLUS_QM) | |
| 2552 || (syntax & RE_LIMITED_OPS)) | |
| 2553 goto normal_char; | |
| 2554 handle_plus: | |
| 2555 case '*': | |
| 2556 /* If there is no previous pattern... */ | |
| 2557 if (!laststart) | |
| 2558 { | |
| 2559 if (syntax & RE_CONTEXT_INVALID_OPS) | |
| 2560 FREE_STACK_RETURN (REG_BADRPT); | |
| 2561 else if (!(syntax & RE_CONTEXT_INDEP_OPS)) | |
| 2562 goto normal_char; | |
| 2563 } | |
| 2564 | |
| 2565 { | |
| 2566 /* 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
|
2567 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
|
2568 boolean greedy = 1; |
| 941 | 2569 |
| 2570 /* If there is a sequence of repetition chars, collapse it | |
| 2571 down to just one (the right one). We can't combine | |
| 2572 interval operators with these because of, e.g., `a{2}*', | |
| 2573 which should only match an even number of `a's. */ | |
| 2574 | |
| 2575 for (;;) | |
| 2576 { | |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
2577 if ((syntax & RE_FRUGAL) |
|
2034
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2578 && 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
|
2579 greedy = 0; |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2580 else |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2581 { |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2582 zero_times_ok |= c != '+'; |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2583 many_times_ok |= c != '?'; |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2584 } |
| 941 | 2585 |
| 2586 if (p == pend) | |
| 2587 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
|
2588 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
|
2589 || (!(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
|
2590 && (*p == '+' || *p == '?'))) |
| 941 | 2591 ; |
|
2371
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
2592 else if (syntax & RE_BK_PLUS_QM && *p == '\\') |
| 941 | 2593 { |
|
2371
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
2594 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
|
2595 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
|
2596 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
|
2597 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
|
2598 else |
|
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
2599 break; |
| 941 | 2600 } |
| 2601 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
|
2602 break; |
| 941 | 2603 /* 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
|
2604 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
|
2605 } |
| 941 | 2606 |
| 2607 /* Star, etc. applied to an empty pattern is equivalent | |
| 2608 to an empty pattern. */ | |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2609 if (!laststart || laststart == b) |
| 941 | 2610 break; |
| 2611 | |
| 2612 /* Now we know whether or not zero matches is allowed | |
| 2613 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
|
2614 if (greedy) |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2615 { |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
2616 if (many_times_ok) |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2617 { |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2618 boolean simple = skip_one_char (laststart) == b; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2619 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
|
2620 re_opcode_t ofj = |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
2621 /* Check if the loop can match the empty string. */ |
|
3933
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
2622 (simple || !analyse_first (laststart, b, NULL, 0)) |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
2623 ? on_failure_jump : on_failure_jump_loop; |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2624 assert (skip_one_char (laststart) <= b); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2625 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2626 if (!zero_times_ok && simple) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2627 { /* 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
|
2628 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
|
2629 into PP* if P is simple. */ |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2630 unsigned char *p1, *p2; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2631 startoffset = b - laststart; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2632 GET_BUFFER_SPACE (startoffset); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2633 p1 = b; p2 = laststart; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2634 while (p2 < p1) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2635 *b++ = *p2++; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2636 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
|
2637 } |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2638 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2639 GET_BUFFER_SPACE (6); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2640 if (!zero_times_ok) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2641 /* A + loop. */ |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
2642 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
|
2643 else |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2644 /* 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
|
2645 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
|
2646 that yet, we leave the decision up to |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2647 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
|
2648 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
|
2649 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
|
2650 b += 3; |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2651 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
|
2652 b += 3; |
| 941 | 2653 } |
| 2654 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
|
2655 { |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2656 /* A simple ? pattern. */ |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2657 assert (zero_times_ok); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2658 GET_BUFFER_SPACE (3); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2659 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
|
2660 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
|
2661 } |
|
2034
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2662 } |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2663 else /* not greedy */ |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2664 { /* 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
|
2665 |
|
2370
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
2666 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
|
2667 if (many_times_ok) |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2668 { |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
2669 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
|
2670 |
|
3933
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
2671 /* The non-greedy multiple match looks like |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
2672 a repeat..until: we only need a conditional jump |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
2673 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
|
2674 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
|
2675 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
|
2676 : 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
|
2677 b += 3; |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2678 if (zero_times_ok) |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2679 { |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2680 /* 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
|
2681 To also match zero times, we need to first jump to |
|
3933
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
2682 the end of the loop (its conditional jump). */ |
|
2034
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2683 INSERT_JUMP (jump, laststart, b); |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2684 b += 3; |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2685 } |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2686 } |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2687 else |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2688 { |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2689 /* non-greedy a?? */ |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2690 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
|
2691 b += 3; |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2692 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
|
2693 b += 3; |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2694 } |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2695 } |
|
00db7733320d
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
1972
diff
changeset
|
2696 } |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
2697 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
|
2698 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
|
2699 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2700 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2701 case '.': |
| 941 | 2702 laststart = b; |
| 2703 BUF_PUSH (anychar); | |
| 2704 break; | |
| 2705 | |
| 2706 | |
| 2707 case '[': | |
| 2708 { | |
| 939 | 2709 CLEAR_RANGE_TABLE_WORK_USED (range_table_work); |
| 2710 | |
| 941 | 2711 if (p == pend) FREE_STACK_RETURN (REG_EBRACK); |
| 2712 | |
| 2713 /* Ensure that we have enough space to push a charset: the | |
| 2714 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
|
2715 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
|
2716 |
| 941 | 2717 laststart = b; |
| 2718 | |
| 2719 /* We test `*p == '^' twice, instead of using an if | |
| 2720 statement, so we only need one BUF_PUSH. */ | |
| 2721 BUF_PUSH (*p == '^' ? charset_not : charset); | |
| 2722 if (*p == '^') | |
| 2723 p++; | |
| 2724 | |
| 2725 /* Remember the first position in the bracket expression. */ | |
| 2726 p1 = p; | |
| 2727 | |
| 2728 /* Push the number of bytes in the bitmap. */ | |
| 2729 BUF_PUSH ((1 << BYTEWIDTH) / BYTEWIDTH); | |
| 2730 | |
| 2731 /* Clear the whole map. */ | |
| 2732 bzero (b, (1 << BYTEWIDTH) / BYTEWIDTH); | |
| 2733 | |
| 2734 /* charset_not matches newline according to a syntax bit. */ | |
| 2735 if ((re_opcode_t) b[-2] == charset_not | |
| 2736 && (syntax & RE_HAT_LISTS_NOT_NEWLINE)) | |
| 2737 SET_LIST_BIT ('\n'); | |
| 2738 | |
| 2739 /* Read in characters and ranges, setting map bits. */ | |
| 2740 for (;;) | |
| 2741 { | |
| 939 | 2742 boolean escaped_char = false; |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
2743 const unsigned char *p2 = p; |
| 939 | 2744 |
| 941 | 2745 if (p == pend) FREE_STACK_RETURN (REG_EBRACK); |
| 2746 | |
|
3925
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
2747 /* Don't translate yet. The range TRANSLATE(X..Y) cannot |
|
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
2748 always be determined from TRANSLATE(X) and TRANSLATE(Y) |
|
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
2749 So the translation is done later in a loop. Example: |
|
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
2750 (let ((case-fold-search t)) (string-match "[A-_]" "A")) */ |
| 941 | 2751 PATFETCH (c); |
| 2752 | |
| 2753 /* \ might escape characters inside [...] and [^...]. */ | |
| 2754 if ((syntax & RE_BACKSLASH_ESCAPE_IN_LISTS) && c == '\\') | |
| 2755 { | |
| 2756 if (p == pend) FREE_STACK_RETURN (REG_EESCAPE); | |
| 679 | 2757 |
| 2758 PATFETCH (c); | |
| 939 | 2759 escaped_char = true; |
| 941 | 2760 } |
| 939 | 2761 else |
| 2762 { | |
| 992 | 2763 /* Could be the end of the bracket expression. If it's |
| 2764 not (i.e., when the bracket expression is `[]' so | |
| 2765 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
|
2766 if (c == ']' && p2 != p1) |
| 992 | 2767 break; |
| 941 | 2768 } |
| 939 | 2769 |
| 2770 /* What should we do for the character which is | |
| 2771 greater than 0x7F, but not BASE_LEADING_CODE_P? | |
| 2772 XXX */ | |
| 2773 | |
| 941 | 2774 /* See if we're at the beginning of a possible character |
| 2775 class. */ | |
| 939 | 2776 |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
2777 if (!escaped_char && |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
2778 syntax & RE_CHAR_CLASSES && c == '[' && *p == ':') |
| 992 | 2779 { |
| 2780 /* Leave room for the null. */ | |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2781 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
|
2782 const unsigned char *class_beg; |
| 941 | 2783 |
| 2784 PATFETCH (c); | |
| 2785 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
|
2786 class_beg = p; |
| 941 | 2787 |
| 2788 /* If pattern is `[[:'. */ | |
| 2789 if (p == pend) FREE_STACK_RETURN (REG_EBRACK); | |
| 2790 | |
| 2791 for (;;) | |
| 2792 { | |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2793 PATFETCH (c); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2794 if ((c == ':' && *p == ']') || p == pend) |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2795 break; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2796 if (c1 < CHAR_CLASS_MAX_LENGTH) |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2797 str[c1++] = c; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2798 else |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2799 /* 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
|
2800 str[0] = '\0'; |
| 941 | 2801 } |
| 2802 str[c1] = '\0'; | |
| 939 | 2803 |
| 2804 /* If isn't a word bracketed by `[:' and `:]': | |
| 2805 undo the ending character, the letters, and | |
| 2806 leave the leading `:' and `[' (but set bits for | |
| 2807 them). */ | |
| 941 | 2808 if (c == ':' && *p == ']') |
| 2809 { | |
|
3925
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
2810 re_wchar_t ch; |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2811 re_wctype_t cc; |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2812 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2813 cc = re_wctype (str); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2814 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2815 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
|
2816 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
|
2817 |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2818 /* 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
|
2819 class. */ |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2820 PATFETCH (c); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2821 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2822 if (p == pend) FREE_STACK_RETURN (REG_EBRACK); |
| 941 | 2823 |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
2824 /* Most character classes in a multibyte match |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
2825 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
|
2826 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
|
2827 they can only match ASCII characters. We |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2828 don't need to handle them for multibyte. |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2829 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
|
2830 |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
2831 if (multibyte) |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2832 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
|
2833 re_wctype_to_bit (cc)); |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2834 |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2835 for (ch = 0; ch < 1 << BYTEWIDTH; ++ch) |
| 941 | 2836 { |
|
692
1036844e8833
(regex_compile): Use TRANSLATE before calling SET_LIST_BIT.
Richard Stallman <rms@gnu.org>
parents:
680
diff
changeset
|
2837 int translated = TRANSLATE (ch); |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
2838 if (re_iswctype (btowc (ch), cc)) |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
2839 SET_LIST_BIT (translated); |
| 941 | 2840 } |
| 939 | 2841 |
| 2842 /* Repeat the loop. */ | |
| 2843 continue; | |
| 941 | 2844 } |
| 2845 else | |
| 2846 { | |
|
2371
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
2847 /* 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
|
2848 p = class_beg; |
| 941 | 2849 SET_LIST_BIT ('['); |
| 939 | 2850 |
| 2851 /* Because the `:' may starts the range, we | |
| 2852 can't simply set bit and repeat the loop. | |
| 941 | 2853 Instead, just set it to C and handle below. */ |
| 939 | 2854 c = ':'; |
| 941 | 2855 } |
| 2856 } | |
| 939 | 2857 |
| 2858 if (p < pend && p[0] == '-' && p[1] != ']') | |
| 2859 { | |
| 2860 | |
| 2861 /* Discard the `-'. */ | |
| 2862 PATFETCH (c1); | |
| 2863 | |
| 2864 /* Fetch the character which ends the range. */ | |
| 2865 PATFETCH (c1); | |
| 2866 | |
|
2581
34ebbdf4dda0
(MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents:
2551
diff
changeset
|
2867 if (SINGLE_BYTE_CHAR_P (c)) |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
2868 { |
|
2581
34ebbdf4dda0
(MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents:
2551
diff
changeset
|
2869 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
|
2870 { |
|
2909
d9e0603fc9d4
(regex_compile): Change the way of handling a range from a char less
Kenichi Handa <handa@m17n.org>
parents:
2887
diff
changeset
|
2871 /* 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
|
2872 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
|
2873 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
|
2874 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
|
2875 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
|
2876 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
|
2877 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
|
2878 int charset = CHAR_CHARSET (c1); |
|
3925
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
2879 re_wchar_t c2 = MAKE_CHAR (charset, 0, 0); |
|
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
2880 |
|
2581
34ebbdf4dda0
(MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents:
2551
diff
changeset
|
2881 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
|
2882 c2, c1); |
|
2912
98856b23a038
(regex_compile): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
2909
diff
changeset
|
2883 c1 = 0377; |
|
2581
34ebbdf4dda0
(MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents:
2551
diff
changeset
|
2884 } |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
2885 } |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
2886 else if (!SAME_CHARSET_P (c, c1)) |
| 939 | 2887 FREE_STACK_RETURN (REG_ERANGE); |
| 2888 } | |
| 941 | 2889 else |
| 939 | 2890 /* Range from C to C. */ |
| 2891 c1 = c; | |
| 2892 | |
| 2893 /* Set the range ... */ | |
| 2894 if (SINGLE_BYTE_CHAR_P (c)) | |
| 2895 /* ... into bitmap. */ | |
| 941 | 2896 { |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
2897 re_wchar_t this_char; |
|
3925
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
2898 re_wchar_t range_start = c, range_end = c1; |
| 939 | 2899 |
| 2900 /* If the start is after the end, the range is empty. */ | |
| 2901 if (range_start > range_end) | |
| 2902 { | |
| 2903 if (syntax & RE_NO_EMPTY_RANGES) | |
| 2904 FREE_STACK_RETURN (REG_ERANGE); | |
| 2905 /* Else, repeat the loop. */ | |
| 679 | 2906 } |
| 2907 else | |
| 2908 { | |
| 939 | 2909 for (this_char = range_start; this_char <= range_end; |
| 2910 this_char++) | |
| 2911 SET_LIST_BIT (TRANSLATE (this_char)); | |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
2912 } |
| 941 | 2913 } |
| 679 | 2914 else |
| 939 | 2915 /* ... into range table. */ |
| 2916 SET_RANGE_TABLE_WORK_AREA (range_table_work, c, c1); | |
| 679 | 2917 } |
| 2918 | |
| 941 | 2919 /* Discard any (non)matching list bytes that are all 0 at the |
| 2920 end of the map. Decrease the map-length byte too. */ | |
| 2921 while ((int) b[-1] > 0 && b[b[-1] - 1] == 0) | |
| 2922 b[-1]--; | |
| 2923 b += b[-1]; | |
| 939 | 2924 |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
2925 /* Build real range table from work area. */ |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
2926 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
|
2927 || RANGE_TABLE_WORK_BITS (range_table_work)) |
| 939 | 2928 { |
| 2929 int i; | |
| 2930 int used = RANGE_TABLE_WORK_USED (range_table_work); | |
| 2931 | |
| 2932 /* 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
|
2933 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
|
2934 each character. */ |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
2935 GET_BUFFER_SPACE (4 + used * 3); |
| 939 | 2936 |
| 2937 /* Indicate the existence of range table. */ | |
| 2938 laststart[1] |= 0x80; | |
| 2939 | |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
2940 /* 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
|
2941 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
|
2942 *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
|
2943 *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
|
2944 |
| 939 | 2945 STORE_NUMBER_AND_INCR (b, used / 2); |
| 2946 for (i = 0; i < used; i++) | |
| 2947 STORE_CHARACTER_AND_INCR | |
| 2948 (b, RANGE_TABLE_WORK_ELT (range_table_work, i)); | |
| 2949 } | |
| 941 | 2950 } |
| 2951 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
|
2952 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2953 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2954 case '(': |
| 941 | 2955 if (syntax & RE_NO_BK_PARENS) |
| 2956 goto handle_open; | |
| 2957 else | |
| 2958 goto normal_char; | |
| 2959 | |
| 2960 | |
| 2961 case ')': | |
| 2962 if (syntax & RE_NO_BK_PARENS) | |
| 2963 goto handle_close; | |
| 2964 else | |
| 2965 goto normal_char; | |
| 2966 | |
| 2967 | |
| 2968 case '\n': | |
| 2969 if (syntax & RE_NEWLINE_ALT) | |
| 2970 goto handle_alt; | |
| 2971 else | |
| 2972 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
|
2973 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2974 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
2975 case '|': |
| 941 | 2976 if (syntax & RE_NO_BK_VBAR) |
| 2977 goto handle_alt; | |
| 2978 else | |
| 2979 goto normal_char; | |
| 2980 | |
| 2981 | |
| 2982 case '{': | |
| 2983 if (syntax & RE_INTERVALS && syntax & RE_NO_BK_BRACES) | |
| 2984 goto handle_interval; | |
| 2985 else | |
| 2986 goto normal_char; | |
| 2987 | |
| 2988 | |
| 2989 case '\\': | |
| 2990 if (p == pend) FREE_STACK_RETURN (REG_EESCAPE); | |
| 2991 | |
| 2992 /* Do not translate the character after the \, so that we can | |
| 2993 distinguish, e.g., \B from \b, even if we normally would | |
| 2994 translate, e.g., B to b. */ | |
|
3925
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
2995 PATFETCH (c); |
| 941 | 2996 |
| 2997 switch (c) | |
| 2998 { | |
| 2999 case '(': | |
| 3000 if (syntax & RE_NO_BK_PARENS) | |
| 3001 goto normal_backslash; | |
| 3002 | |
| 3003 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
|
3004 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3005 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
|
3006 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
|
3007 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3008 /* 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
|
3009 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
|
3010 { |
|
2371
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
3011 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
|
3012 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
|
3013 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
|
3014 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3015 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
|
3016 default: |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3017 /* 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
|
3018 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
|
3019 } |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3020 } |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3021 } |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3022 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3023 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
|
3024 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3025 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
|
3026 regnum++; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3027 } |
| 941 | 3028 |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
3029 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
|
3030 { |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
3031 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
|
3032 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
|
3033 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
|
3034 |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
3035 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
|
3036 } |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
3037 |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
3038 /* 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
|
3039 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
|
3040 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
|
3041 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
|
3042 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
|
3043 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
|
3044 = 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
|
3045 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
|
3046 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
|
3047 |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
3048 /* 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
|
3049 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
|
3050 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
|
3051 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
|
3052 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
|
3053 |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
3054 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
|
3055 |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
3056 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
|
3057 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
|
3058 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
|
3059 /* 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
|
3060 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
|
3061 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
|
3062 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
|
3063 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
|
3064 } |
| 941 | 3065 |
| 3066 case ')': | |
| 3067 if (syntax & RE_NO_BK_PARENS) goto normal_backslash; | |
| 3068 | |
| 3069 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
|
3070 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3071 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
|
3072 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
|
3073 else |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3074 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
|
3075 } |
| 941 | 3076 |
| 3077 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
|
3078 FIXUP_ALT_JUMP (); |
| 941 | 3079 |
| 3080 /* See similar code for backslashed left paren above. */ | |
| 3081 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
|
3082 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3083 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
|
3084 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
|
3085 else |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3086 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
|
3087 } |
| 941 | 3088 |
| 3089 /* Since we just checked for an empty stack above, this | |
| 3090 ``can't happen''. */ | |
| 3091 assert (compile_stack.avail != 0); | |
| 3092 { | |
| 3093 /* We don't just want to restore into `regnum', because | |
| 3094 later groups should continue to be numbered higher, | |
| 3095 as in `(ab)c(de)' -- the second group is #2. */ | |
| 3096 regnum_t this_group_regnum; | |
| 3097 | |
| 3098 compile_stack.avail--; | |
| 3099 begalt = bufp->buffer + COMPILE_STACK_TOP.begalt_offset; | |
| 3100 fixup_alt_jump | |
| 3101 = COMPILE_STACK_TOP.fixup_alt_jump | |
| 3102 ? bufp->buffer + COMPILE_STACK_TOP.fixup_alt_jump - 1 | |
| 3103 : 0; | |
| 3104 laststart = bufp->buffer + COMPILE_STACK_TOP.laststart_offset; | |
| 3105 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
|
3106 /* 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
|
3107 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
|
3108 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
|
3109 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
|
3110 |
| 941 | 3111 /* We're at the end of the group, so now we know how many |
| 3112 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
|
3113 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
|
3114 BUF_PUSH_2 (stop_memory, this_group_regnum); |
| 941 | 3115 } |
| 3116 break; | |
| 3117 | |
| 3118 | |
| 3119 case '|': /* `\|'. */ | |
| 3120 if (syntax & RE_LIMITED_OPS || syntax & RE_NO_BK_VBAR) | |
| 3121 goto normal_backslash; | |
| 3122 handle_alt: | |
| 3123 if (syntax & RE_LIMITED_OPS) | |
| 3124 goto normal_char; | |
| 3125 | |
| 3126 /* Insert before the previous alternative a jump which | |
| 3127 jumps to this alternative if the former fails. */ | |
| 3128 GET_BUFFER_SPACE (3); | |
| 3129 INSERT_JUMP (on_failure_jump, begalt, b + 6); | |
| 3130 pending_exact = 0; | |
| 3131 b += 3; | |
| 3132 | |
| 3133 /* The alternative before this one has a jump after it | |
| 3134 which gets executed if it gets matched. Adjust that | |
| 3135 jump so it will jump to this alternative's analogous | |
| 3136 jump (put in below, which in turn will jump to the next | |
| 3137 (if any) alternative's such jump, etc.). The last such | |
| 3138 jump jumps to the correct final destination. A picture: | |
| 3139 _____ _____ | |
| 3140 | | | | | |
| 3141 | v | v | |
| 3142 a | b | c | |
| 3143 | |
| 3144 If we are at `b', then fixup_alt_jump right now points to a | |
| 3145 three-byte space after `a'. We'll put in the jump, set | |
| 3146 fixup_alt_jump to right after `b', and leave behind three | |
| 3147 bytes which we'll fill in when we get to after `c'. */ | |
| 3148 | |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3149 FIXUP_ALT_JUMP (); |
| 941 | 3150 |
| 3151 /* Mark and leave space for a jump after this alternative, | |
| 3152 to be filled in later either by next alternative or | |
| 3153 when know we're at the end of a series of alternatives. */ | |
| 3154 fixup_alt_jump = b; | |
| 3155 GET_BUFFER_SPACE (3); | |
| 3156 b += 3; | |
| 3157 | |
| 3158 laststart = 0; | |
| 3159 begalt = b; | |
| 3160 break; | |
| 3161 | |
| 3162 | |
| 3163 case '{': | |
| 3164 /* If \{ is a literal. */ | |
| 3165 if (!(syntax & RE_INTERVALS) | |
| 3166 /* If we're at `\{' and it's not the open-interval | |
| 3167 operator. */ | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3168 || (syntax & RE_NO_BK_BRACES)) |
| 941 | 3169 goto normal_backslash; |
| 3170 | |
| 3171 handle_interval: | |
| 3172 { | |
| 3173 /* If got here, then the syntax allows intervals. */ | |
| 3174 | |
| 3175 /* 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
|
3176 int lower_bound = 0, upper_bound = -1; |
| 941 | 3177 |
|
2371
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
3178 beg_interval = p; |
| 941 | 3179 |
| 3180 if (p == pend) | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3181 FREE_STACK_RETURN (REG_EBRACE); |
| 941 | 3182 |
| 3183 GET_UNSIGNED_NUMBER (lower_bound); | |
| 3184 | |
| 3185 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
|
3186 GET_UNSIGNED_NUMBER (upper_bound); |
| 941 | 3187 else |
| 3188 /* Interval such as `{1}' => match exactly once. */ | |
| 3189 upper_bound = lower_bound; | |
| 3190 | |
| 3191 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
|
3192 || (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
|
3193 FREE_STACK_RETURN (REG_BADBR); |
| 941 | 3194 |
| 3195 if (!(syntax & RE_NO_BK_BRACES)) | |
| 3196 { | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3197 if (c != '\\') |
|
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3198 FREE_STACK_RETURN (REG_BADBR); |
| 941 | 3199 |
| 3200 PATFETCH (c); | |
| 3201 } | |
| 3202 | |
| 3203 if (c != '}') | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3204 FREE_STACK_RETURN (REG_BADBR); |
| 941 | 3205 |
| 3206 /* We just parsed a valid interval. */ | |
| 3207 | |
| 3208 /* If it's invalid to have no preceding re. */ | |
| 3209 if (!laststart) | |
| 3210 { | |
| 3211 if (syntax & RE_CONTEXT_INVALID_OPS) | |
| 3212 FREE_STACK_RETURN (REG_BADRPT); | |
| 3213 else if (syntax & RE_CONTEXT_INDEP_OPS) | |
| 3214 laststart = b; | |
| 3215 else | |
| 3216 goto unfetch_interval; | |
| 3217 } | |
| 3218 | |
|
3933
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3219 if (upper_bound == 0) |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3220 /* If the upper bound is zero, just drop the sub pattern |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3221 altogether. */ |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3222 b = laststart; |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3223 else if (lower_bound == 1 && upper_bound == 1) |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3224 /* Just match it once: nothing to do here. */ |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3225 ; |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3226 |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3227 /* Otherwise, we have a nontrivial interval. When |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3228 we're all done, the pattern will look like: |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3229 set_number_at <jump count> <upper bound> |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3230 set_number_at <succeed_n count> <lower bound> |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3231 succeed_n <after jump addr> <succeed_n count> |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3232 <body of loop> |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3233 jump_n <succeed_n addr> <jump count> |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3234 (The upper bound and `jump_n' are omitted if |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3235 `upper_bound' is 1, though.) */ |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3236 else |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3237 { /* If the upper bound is > 1, we need to insert |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3238 more at the end of the loop. */ |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3239 unsigned int nbytes = (upper_bound < 0 ? 3 |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3240 : upper_bound > 1 ? 5 : 0); |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3241 unsigned int startoffset = 0; |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3242 |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3243 GET_BUFFER_SPACE (20); /* We might use less. */ |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3244 |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3245 if (lower_bound == 0) |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3246 { |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3247 /* A succeed_n that starts with 0 is really a |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3248 a simple on_failure_jump_loop. */ |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3249 INSERT_JUMP (on_failure_jump_loop, laststart, |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3250 b + 3 + nbytes); |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3251 b += 3; |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3252 } |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3253 else |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3254 { |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3255 /* Initialize lower bound of the `succeed_n', even |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3256 though it will be set during matching by its |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3257 attendant `set_number_at' (inserted next), |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3258 because `re_compile_fastmap' needs to know. |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3259 Jump to the `jump_n' we might insert below. */ |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3260 INSERT_JUMP2 (succeed_n, laststart, |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3261 b + 5 + nbytes, |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3262 lower_bound); |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3263 b += 5; |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3264 |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3265 /* Code to initialize the lower bound. Insert |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3266 before the `succeed_n'. The `5' is the last two |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3267 bytes of this `set_number_at', plus 3 bytes of |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3268 the following `succeed_n'. */ |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3269 insert_op2 (set_number_at, laststart, 5, lower_bound, b); |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3270 b += 5; |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3271 startoffset += 5; |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3272 } |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3273 |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3274 if (upper_bound < 0) |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3275 { |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3276 /* A negative upper bound stands for infinity, |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3277 in which case it degenerates to a plain jump. */ |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3278 STORE_JUMP (jump, b, laststart + startoffset); |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3279 b += 3; |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3280 } |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3281 else if (upper_bound > 1) |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3282 { /* More than one repetition is allowed, so |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3283 append a backward jump to the `succeed_n' |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3284 that starts this interval. |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3285 |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3286 When we've reached this during matching, |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3287 we'll have matched the interval once, so |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3288 jump back only `upper_bound - 1' times. */ |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3289 STORE_JUMP2 (jump_n, b, laststart + startoffset, |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3290 upper_bound - 1); |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3291 b += 5; |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3292 |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3293 /* The location we want to set is the second |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3294 parameter of the `jump_n'; that is `b-2' as |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3295 an absolute address. `laststart' will be |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3296 the `set_number_at' we're about to insert; |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3297 `laststart+3' the number to set, the source |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3298 for the relative address. But we are |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3299 inserting into the middle of the pattern -- |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3300 so everything is getting moved up by 5. |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3301 Conclusion: (b - 2) - (laststart + 3) + 5, |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3302 i.e., b - laststart. |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3303 |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3304 We insert this at the beginning of the loop |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3305 so that if we fail during matching, we'll |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3306 reinitialize the bounds. */ |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3307 insert_op2 (set_number_at, laststart, b - laststart, |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3308 upper_bound - 1, b); |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3309 b += 5; |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3310 } |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
3311 } |
| 941 | 3312 pending_exact = 0; |
| 3313 beg_interval = NULL; | |
| 3314 } | |
| 3315 break; | |
| 3316 | |
| 3317 unfetch_interval: | |
| 3318 /* If an invalid interval, match the characters as literals. */ | |
| 3319 assert (beg_interval); | |
| 3320 p = beg_interval; | |
| 3321 beg_interval = NULL; | |
| 3322 | |
| 3323 /* 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
|
3324 c = '{'; |
| 941 | 3325 |
| 3326 if (!(syntax & RE_NO_BK_BRACES)) | |
| 3327 { | |
|
2371
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
3328 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
|
3329 goto normal_backslash; |
| 941 | 3330 } |
|
2371
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
3331 else |
|
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
3332 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
|
3333 |
|
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 #ifdef emacs |
| 941 | 3335 /* There is no way to specify the before_dot and after_dot |
| 3336 operators. rms says this is ok. --karl */ | |
| 3337 case '=': | |
| 3338 BUF_PUSH (at_dot); | |
| 3339 break; | |
| 3340 | |
| 3341 case 's': | |
| 3342 laststart = b; | |
| 3343 PATFETCH (c); | |
| 3344 BUF_PUSH_2 (syntaxspec, syntax_spec_code[c]); | |
| 3345 break; | |
| 3346 | |
| 3347 case 'S': | |
| 3348 laststart = b; | |
| 3349 PATFETCH (c); | |
| 3350 BUF_PUSH_2 (notsyntaxspec, syntax_spec_code[c]); | |
| 3351 break; | |
| 939 | 3352 |
| 3353 case 'c': | |
| 679 | 3354 laststart = b; |
|
3925
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
3355 PATFETCH (c); |
| 939 | 3356 BUF_PUSH_2 (categoryspec, c); |
| 679 | 3357 break; |
| 3358 | |
| 939 | 3359 case 'C': |
| 679 | 3360 laststart = b; |
|
3925
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
3361 PATFETCH (c); |
| 939 | 3362 BUF_PUSH_2 (notcategoryspec, c); |
| 679 | 3363 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
|
3364 #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
|
3365 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3366 |
| 941 | 3367 case 'w': |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3368 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
|
3369 goto normal_char; |
| 941 | 3370 laststart = b; |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3371 BUF_PUSH_2 (syntaxspec, Sword); |
| 941 | 3372 break; |
| 3373 | |
| 3374 | |
| 3375 case 'W': | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3376 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
|
3377 goto normal_char; |
| 941 | 3378 laststart = b; |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3379 BUF_PUSH_2 (notsyntaxspec, Sword); |
| 941 | 3380 break; |
| 3381 | |
| 3382 | |
| 3383 case '<': | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3384 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
|
3385 goto normal_char; |
| 941 | 3386 BUF_PUSH (wordbeg); |
| 3387 break; | |
| 3388 | |
| 3389 case '>': | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3390 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
|
3391 goto normal_char; |
| 941 | 3392 BUF_PUSH (wordend); |
| 3393 break; | |
| 3394 | |
| 3395 case 'b': | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3396 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
|
3397 goto normal_char; |
| 941 | 3398 BUF_PUSH (wordbound); |
| 3399 break; | |
| 3400 | |
| 3401 case 'B': | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3402 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
|
3403 goto normal_char; |
| 941 | 3404 BUF_PUSH (notwordbound); |
| 3405 break; | |
| 3406 | |
| 3407 case '`': | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3408 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
|
3409 goto normal_char; |
| 941 | 3410 BUF_PUSH (begbuf); |
| 3411 break; | |
| 3412 | |
| 3413 case '\'': | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
3414 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
|
3415 goto normal_char; |
| 941 | 3416 BUF_PUSH (endbuf); |
| 3417 break; | |
| 3418 | |
| 3419 case '1': case '2': case '3': case '4': case '5': | |
| 3420 case '6': case '7': case '8': case '9': | |
|
2945
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
3421 { |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
3422 regnum_t reg; |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
3423 |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
3424 if (syntax & RE_NO_BK_REFS) |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
3425 goto normal_backslash; |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
3426 |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
3427 reg = c - '0'; |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
3428 |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
3429 /* Can't back reference to a subexpression before its end. */ |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
3430 if (reg > regnum || group_in_compile_stack (compile_stack, reg)) |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
3431 FREE_STACK_RETURN (REG_ESUBREG); |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
3432 |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
3433 laststart = b; |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
3434 BUF_PUSH_2 (duplicate, reg); |
|
7e16e0f368fd
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2925
diff
changeset
|
3435 } |
| 941 | 3436 break; |
| 3437 | |
| 3438 | |
| 3439 case '+': | |
| 3440 case '?': | |
| 3441 if (syntax & RE_BK_PLUS_QM) | |
| 3442 goto handle_plus; | |
| 3443 else | |
| 3444 goto normal_backslash; | |
| 3445 | |
| 3446 default: | |
| 3447 normal_backslash: | |
| 3448 /* You might think it would be useful for \ to mean | |
| 3449 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
|
3450 it will never match anything. */ |
| 941 | 3451 goto normal_char; |
| 3452 } | |
| 3453 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
|
3454 |
|
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 default: |
| 941 | 3457 /* 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
|
3458 normal_char: |
|
3925
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
3459 /* If no exactn currently being built. */ |
| 941 | 3460 if (!pending_exact |
| 3461 | |
| 3462 /* If last exactn not at current position. */ | |
| 3463 || pending_exact + *pending_exact + 1 != b | |
| 3464 | |
| 3465 /* 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
|
3466 || *pending_exact >= (1 << BYTEWIDTH) - MAX_MULTIBYTE_LENGTH |
| 939 | 3467 |
| 941 | 3468 /* If followed by a repetition operator. */ |
|
1342
e5cbc689bc64
(regex_compile): When checking after exactn
Richard Stallman <rms@gnu.org>
parents:
1335
diff
changeset
|
3469 || (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
|
3470 || ((syntax & RE_BK_PLUS_QM) |
|
1342
e5cbc689bc64
(regex_compile): When checking after exactn
Richard Stallman <rms@gnu.org>
parents:
1335
diff
changeset
|
3471 ? p + 1 < pend && *p == '\\' && (p[1] == '+' || p[1] == '?') |
|
e5cbc689bc64
(regex_compile): When checking after exactn
Richard Stallman <rms@gnu.org>
parents:
1335
diff
changeset
|
3472 : 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
|
3473 || ((syntax & RE_INTERVALS) |
| 941 | 3474 && ((syntax & RE_NO_BK_BRACES) |
|
1342
e5cbc689bc64
(regex_compile): When checking after exactn
Richard Stallman <rms@gnu.org>
parents:
1335
diff
changeset
|
3475 ? p != pend && *p == '{' |
|
e5cbc689bc64
(regex_compile): When checking after exactn
Richard Stallman <rms@gnu.org>
parents:
1335
diff
changeset
|
3476 : 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
|
3477 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3478 /* Start building a new exactn. */ |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3479 |
| 941 | 3480 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
|
3481 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3482 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
|
3483 pending_exact = b - 1; |
| 941 | 3484 } |
| 939 | 3485 |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
3486 GET_BUFFER_SPACE (MAX_MULTIBYTE_LENGTH); |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
3487 { |
|
2816
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3488 int len; |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3489 |
|
3925
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
3490 c = TRANSLATE (c); |
|
2816
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3491 if (multibyte) |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3492 len = CHAR_STRING (c, b); |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3493 else |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3494 *b = c, len = 1; |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
3495 b += len; |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
3496 (*pending_exact) += len; |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
3497 } |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
3498 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3499 break; |
| 941 | 3500 } /* 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
|
3501 } /* 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
|
3502 |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3503 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3504 /* Through the pattern now. */ |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3505 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3506 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
|
3507 |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3508 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
|
3509 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
|
3510 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3511 /* 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
|
3512 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
|
3513 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
|
3514 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
|
3515 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3516 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
|
3517 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3518 /* 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
|
3519 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
|
3520 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3521 #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
|
3522 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
|
3523 { |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3524 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
|
3525 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
|
3526 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
|
3527 } |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
3528 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
|
3529 #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
|
3530 |
|
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 #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
|
3532 /* 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
|
3533 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
|
3534 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
|
3535 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3536 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
|
3537 |
|
1156
8e1cbb305ddc
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
992
diff
changeset
|
3538 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
|
3539 { |
|
1297
ac5117571763
(regex_compile) [!MATCH_MAY_ALLOCATE]: Fix paren error.
Richard Stallman <rms@gnu.org>
parents:
1296
diff
changeset
|
3540 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
|
3541 |
|
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 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
|
3543 fail_stack.stack |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3544 = (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
|
3545 * 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
|
3546 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
|
3547 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
|
3548 = (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
|
3549 (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
|
3550 * 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
|
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 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3553 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
|
3554 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3555 #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
|
3556 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3557 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
|
3558 } /* 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
|
3559 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3560 /* 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
|
3561 |
| 941 | 3562 /* 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
|
3563 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3564 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
|
3565 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
|
3566 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
|
3567 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
|
3568 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
|
3569 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3570 *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
|
3571 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
|
3572 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3573 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3574 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3575 /* 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
|
3576 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3577 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
|
3578 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
|
3579 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
|
3580 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
|
3581 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
|
3582 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3583 *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
|
3584 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
|
3585 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
|
3586 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3587 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3588 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3589 /* 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
|
3590 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
|
3591 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3592 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
|
3593 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
|
3594 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
|
3595 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
|
3596 int arg; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3597 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
|
3598 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3599 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
|
3600 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
|
3601 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3602 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
|
3603 *--pto = *--pfrom; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3604 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3605 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
|
3606 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3607 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3608 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3609 /* 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
|
3610 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3611 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
|
3612 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
|
3613 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
|
3614 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
|
3615 int arg1, arg2; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3616 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
|
3617 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3618 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
|
3619 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
|
3620 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3621 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
|
3622 *--pto = *--pfrom; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3623 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3624 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
|
3625 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3626 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3627 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3628 /* 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
|
3629 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
|
3630 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
|
3631 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3632 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
|
3633 at_begline_loc_p (pattern, p, syntax) |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3634 re_char *pattern, *p; |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3635 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
|
3636 { |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3637 re_char *prev = p - 2; |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3638 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
|
3639 |
|
441
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 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
|
3641 /* 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
|
3642 (*prev == '(' && (syntax & RE_NO_BK_PARENS || prev_prev_backslash)) |
| 941 | 3643 /* After an alternative? */ |
|
2537
c971620b680c
(at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2438
diff
changeset
|
3644 || (*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
|
3645 /* After a shy subexpression? */ |
|
c971620b680c
(at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2438
diff
changeset
|
3646 || ((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
|
3647 && prev[-1] == '?' && prev[-2] == '(' |
|
c971620b680c
(at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2438
diff
changeset
|
3648 && (syntax & RE_NO_BK_PARENS |
|
c971620b680c
(at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2438
diff
changeset
|
3649 || (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
|
3650 } |
|
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 |
|
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 |
|
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 /* 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
|
3654 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
|
3655 |
|
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 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
|
3657 at_endline_loc_p (p, pend, syntax) |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3658 re_char *p, *pend; |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
3659 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
|
3660 { |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3661 re_char *next = p; |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3662 boolean next_backslash = *next == '\\'; |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3663 re_char *next_next = p + 1 < pend ? p + 1 : 0; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3664 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3665 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
|
3666 /* 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
|
3667 (syntax & RE_NO_BK_PARENS ? *next == ')' |
| 941 | 3668 : 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
|
3669 /* 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
|
3670 || (syntax & RE_NO_BK_VBAR ? *next == '|' |
| 941 | 3671 : 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
|
3672 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3673 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3674 |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3675 /* 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
|
3676 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
|
3677 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3678 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
|
3679 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
|
3680 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
|
3681 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
|
3682 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3683 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
|
3684 |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3685 for (this_element = compile_stack.avail - 1; |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3686 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
|
3687 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
|
3688 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
|
3689 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
|
3690 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3691 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
|
3692 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3693 |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3694 /* analyse_first. |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3695 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
|
3696 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
|
3697 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
|
3698 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
|
3699 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3700 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
|
3701 Return 0 if p..pend matches at least one char. |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3702 Return -1 if fastmap was not updated accurately. */ |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3703 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3704 static int |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3705 analyse_first (p, pend, fastmap, multibyte) |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3706 re_char *p, *pend; |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3707 char *fastmap; |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3708 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
|
3709 { |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3710 int j, k; |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3711 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
|
3712 |
| 939 | 3713 /* If all elements for base leading-codes in fastmap is set, this |
| 941 | 3714 flag is set true. */ |
| 939 | 3715 boolean match_any_multibyte_characters = false; |
| 3716 | |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3717 assert (p); |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3718 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3719 /* 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
|
3720 - 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
|
3721 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
|
3722 - 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
|
3723 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
|
3724 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
|
3725 - 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
|
3726 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
|
3727 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
|
3728 (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
|
3729 worklist. |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3730 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
|
3731 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
|
3732 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
|
3733 |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3734 while (p < pend) |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3735 { |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3736 /* `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
|
3737 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
|
3738 (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
|
3739 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
|
3740 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
|
3741 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
|
3742 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
|
3743 as used for the *? operator. */ |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3744 re_char *p1 = p; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3745 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3746 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
|
3747 { |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3748 case succeed: |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3749 return 1; |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3750 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
|
3751 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3752 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
|
3753 /* 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
|
3754 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
|
3755 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
|
3756 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
|
3757 p++; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3758 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
|
3759 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3760 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3761 /* Following are the cases which match a character. These end |
| 941 | 3762 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
|
3763 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3764 case exactn: |
|
2816
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3765 if (fastmap) |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3766 { |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3767 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
|
3768 |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3769 if (SINGLE_BYTE_CHAR_P (c)) |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3770 fastmap[c] = 1; |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3771 else |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3772 fastmap[p[1]] = 1; |
|
bd9c110a1342
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
2615
diff
changeset
|
3773 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3774 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
|
3775 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3776 |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3777 case anychar: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3778 /* 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
|
3779 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
|
3780 if (!fastmap) break; |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3781 return -1; |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3782 |
|
441
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 |
|
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 case charset_not: |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3785 /* 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
|
3786 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
|
3787 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
|
3788 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
|
3789 if (!fastmap) break; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3790 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
|
3791 j < (1 << BYTEWIDTH); j++) |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3792 fastmap[j] = 1; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3793 /* Fallthrough */ |
| 939 | 3794 case charset: |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3795 if (!fastmap) break; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3796 not = (re_opcode_t) *(p - 1) == charset_not; |
| 939 | 3797 for (j = CHARSET_BITMAP_SIZE (&p[-1]) * BYTEWIDTH - 1, p++; |
| 3798 j >= 0; j--) | |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3799 if (!!(p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH))) ^ not) |
| 939 | 3800 fastmap[j] = 1; |
| 3801 | |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3802 if ((not && multibyte) |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3803 /* 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
|
3804 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
|
3805 || (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
|
3806 && 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
|
3807 /* 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
|
3808 any character set. */ |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3809 { |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3810 set_fastmap_for_multibyte_characters: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3811 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
|
3812 { |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3813 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
|
3814 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
|
3815 fastmap[j] = 1; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3816 match_any_multibyte_characters = true; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3817 } |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3818 } |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3819 |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3820 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
|
3821 && match_any_multibyte_characters == false) |
| 939 | 3822 { |
| 3823 /* Set fastmap[I] 1 where I is a base leading code of each | |
| 3824 multibyte character in the range table. */ | |
| 3825 int c, count; | |
| 3826 | |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3827 /* 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
|
3828 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
|
3829 p += CHARSET_BITMAP_SIZE (&p[-2]) + 2; |
| 939 | 3830 |
|
1965
058a9ce57dd7
1999-09-04 Richard Stallman <rms@gnu.org>
Dave Love <fx@gnu.org>
parents:
1933
diff
changeset
|
3831 /* Extract the number of ranges in range table into COUNT. */ |
| 939 | 3832 EXTRACT_NUMBER_AND_INCR (count, p); |
| 3833 for (; count > 0; count--, p += 2 * 3) /* XXX */ | |
| 3834 { | |
| 3835 /* Extract the start of each range. */ | |
| 3836 EXTRACT_CHARACTER (c, p); | |
| 3837 j = CHAR_CHARSET (c); | |
| 3838 fastmap[CHARSET_LEADING_CODE_BASE (j)] = 1; | |
| 3839 } | |
| 3840 } | |
| 3841 break; | |
| 3842 | |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3843 case syntaxspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3844 case notsyntaxspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3845 if (!fastmap) break; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3846 #ifndef emacs |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3847 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
|
3848 k = *p++; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3849 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
|
3850 if ((SYNTAX (j) == (enum syntaxcode) k) ^ not) |
| 939 | 3851 fastmap[j] = 1; |
| 3852 break; | |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3853 #else /* emacs */ |
| 939 | 3854 /* This match depends on text properties. These end with |
| 3855 aborting optimizations. */ | |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3856 return -1; |
| 939 | 3857 |
| 3858 case categoryspec: | |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3859 case notcategoryspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3860 if (!fastmap) break; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3861 not = (re_opcode_t)p[-1] == notcategoryspec; |
| 939 | 3862 k = *p++; |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3863 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
|
3864 if ((CHAR_HAS_CATEGORY (j, k)) ^ not) |
| 939 | 3865 fastmap[j] = 1; |
| 3866 | |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3867 if (multibyte) |
| 939 | 3868 /* 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
|
3869 whose category is K (or not). */ |
| 939 | 3870 goto set_fastmap_for_multibyte_characters; |
| 3871 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
|
3872 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3873 /* All cases after this match the empty string. These end with |
| 941 | 3874 `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
|
3875 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3876 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
|
3877 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
|
3878 case after_dot: |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
3879 #endif /* !emacs */ |
| 941 | 3880 case no_op: |
| 3881 case begline: | |
| 3882 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
|
3883 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
|
3884 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
|
3885 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
|
3886 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
|
3887 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
|
3888 case wordend: |
| 941 | 3889 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
|
3890 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3891 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3892 case jump: |
| 941 | 3893 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
|
3894 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
|
3895 /* 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
|
3896 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
|
3897 break; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
3898 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
|
3899 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
|
3900 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3901 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
|
3902 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
|
3903 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
|
3904 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
|
3905 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
|
3906 p++; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3907 break; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3908 default: |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3909 continue; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3910 }; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
3911 /* 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
|
3912 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
|
3913 /* Fallthrough */ |
| 941 | 3914 |
| 3915 case on_failure_jump: | |
| 3916 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
|
3917 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
|
3918 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
|
3919 case on_failure_jump_smart: |
| 941 | 3920 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
|
3921 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
|
3922 ; /* Backward jump to be ignored. */ |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3923 else |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3924 { /* We have to look down both arms. |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3925 We first go down the "straight" path so as to minimize |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3926 stack usage when going through alternatives. */ |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3927 int r = analyse_first (p, pend, fastmap, multibyte); |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3928 if (r) return r; |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3929 p += j; |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3930 } |
| 941 | 3931 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
|
3932 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3933 |
|
2371
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
3934 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
|
3935 /* 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
|
3936 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
|
3937 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
|
3938 /* 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
|
3939 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
|
3940 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
|
3941 continue; |
|
3274fb530385
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2370
diff
changeset
|
3942 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3943 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
|
3944 /* 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
|
3945 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
|
3946 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
|
3947 /* 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
|
3948 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
|
3949 on_failure_jump. */ |
| 941 | 3950 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
|
3951 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3952 |
|
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 case set_number_at: |
| 941 | 3954 p += 4; |
| 3955 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
|
3956 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3957 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3958 case start_memory: |
| 941 | 3959 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
|
3960 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
|
3961 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
|
3962 |
|
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 |
|
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 default: |
| 941 | 3965 abort (); /* We have listed all the cases. */ |
| 3966 } /* 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
|
3967 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3968 /* Getting here means we have found the possible starting |
| 941 | 3969 characters for one path of the pattern -- and that the empty |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3970 string does not match. We need not follow this path further. */ |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3971 return 0; |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
3972 } /* 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
|
3973 |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3974 /* We reached the end without matching anything. */ |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3975 return 1; |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
3976 |
|
2372
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3977 } /* analyse_first */ |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3978 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3979 /* 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
|
3980 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
|
3981 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
|
3982 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
|
3983 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3984 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
|
3985 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
|
3986 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
|
3987 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3988 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
|
3989 area as BUFP->fastmap. |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3990 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3991 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
|
3992 the pattern buffer. |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3993 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3994 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
|
3995 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3996 int |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3997 re_compile_fastmap (bufp) |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
3998 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
|
3999 { |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
4000 char *fastmap = bufp->fastmap; |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
4001 int analysis; |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
4002 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
4003 assert (fastmap && bufp->buffer); |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
4004 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
4005 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
|
4006 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
|
4007 |
|
c0c46914f4fe
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2371
diff
changeset
|
4008 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
|
4009 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
|
4010 bufp->can_be_null = (analysis != 0); |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4011 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
|
4012 } /* 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
|
4013 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4014 /* 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
|
4015 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
|
4016 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
|
4017 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
|
4018 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
|
4019 |
|
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 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
|
4021 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
|
4022 |
|
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 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
|
4024 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
|
4025 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
|
4026 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4027 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
|
4028 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
|
4029 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
|
4030 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
|
4031 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
|
4032 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
|
4033 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4034 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
|
4035 { |
|
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 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
|
4037 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
|
4038 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
|
4039 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
|
4040 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4041 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
|
4042 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4043 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
|
4044 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
|
4045 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
|
4046 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4047 } |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
4048 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
|
4049 |
| 941 | 4050 /* 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
|
4051 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4052 /* 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
|
4053 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
|
4054 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4055 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
|
4056 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
|
4057 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
|
4058 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
|
4059 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
|
4060 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
|
4061 { |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4062 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
|
4063 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
|
4064 } |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
4065 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
|
4066 |
| 939 | 4067 /* End address of virtual concatenation of string. */ |
| 4068 #define STOP_ADDR_VSTRING(P) \ | |
| 4069 (((P) >= size1 ? string2 + size2 : string1 + size1)) | |
| 4070 | |
| 4071 /* Address of POS in the concatenation of virtual string. */ | |
| 4072 #define POS_ADDR_VSTRING(POS) \ | |
| 4073 (((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
|
4074 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4075 /* 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
|
4076 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
|
4077 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
|
4078 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4079 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
|
4080 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4081 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
|
4082 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
|
4083 RANGE. |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4084 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4085 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
|
4086 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
|
4087 subexpressions. |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4088 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4089 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
|
4090 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
|
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 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
|
4093 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
|
4094 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
|
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 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
|
4097 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
|
4098 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
|
4099 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
|
4100 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
|
4101 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
|
4102 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
|
4103 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
|
4104 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
|
4105 { |
|
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 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
|
4107 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
|
4108 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
|
4109 register char *fastmap = bufp->fastmap; |
|
501
f29b13c2cefd
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard Stallman <rms@gnu.org>
parents:
490
diff
changeset
|
4110 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
|
4111 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
|
4112 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
|
4113 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
|
4114 |
| 941 | 4115 /* 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
|
4116 const boolean multibyte = RE_MULTIBYTE_P (bufp); |
| 939 | 4117 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4118 /* 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
|
4119 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
|
4120 return -1; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4121 |
|
441
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 /* 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
|
4123 the virtual concatenation of STRING1 and STRING2. |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4124 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
|
4125 if (endpos < 0) |
|
985fe9826996
(re_search_2): Use 0, not -1, as the lower bound
Richard Stallman <rms@gnu.org>
parents:
481
diff
changeset
|
4126 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
|
4127 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
|
4128 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
|
4129 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4130 /* 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
|
4131 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
|
4132 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
|
4133 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4134 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
|
4135 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
|
4136 else |
|
1329
818db3848f2b
(re_search_2): Fix handling of at_dot.
Richard Stallman <rms@gnu.org>
parents:
1328
diff
changeset
|
4137 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
|
4138 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4139 |
|
481
35afc74165b7
(re_search_2): If pattern starts with \=, optimize search.
Richard Stallman <rms@gnu.org>
parents:
480
diff
changeset
|
4140 #ifdef emacs |
|
35afc74165b7
(re_search_2): If pattern starts with \=, optimize search.
Richard Stallman <rms@gnu.org>
parents:
480
diff
changeset
|
4141 /* 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
|
4142 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
|
4143 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
|
4144 { |
|
1329
818db3848f2b
(re_search_2): Fix handling of at_dot.
Richard Stallman <rms@gnu.org>
parents:
1328
diff
changeset
|
4145 range = PT_BYTE - BEGV_BYTE - startpos; |
|
818db3848f2b
(re_search_2): Fix handling of at_dot.
Richard Stallman <rms@gnu.org>
parents:
1328
diff
changeset
|
4146 if (range < 0) |
|
481
35afc74165b7
(re_search_2): If pattern starts with \=, optimize search.
Richard Stallman <rms@gnu.org>
parents:
480
diff
changeset
|
4147 return -1; |
|
35afc74165b7
(re_search_2): If pattern starts with \=, optimize search.
Richard Stallman <rms@gnu.org>
parents:
480
diff
changeset
|
4148 } |
|
35afc74165b7
(re_search_2): If pattern starts with \=, optimize search.
Richard Stallman <rms@gnu.org>
parents:
480
diff
changeset
|
4149 #endif /* emacs */ |
|
35afc74165b7
(re_search_2): If pattern starts with \=, optimize search.
Richard Stallman <rms@gnu.org>
parents:
480
diff
changeset
|
4150 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4151 /* 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
|
4152 if (fastmap && !bufp->fastmap_accurate) |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
4153 re_compile_fastmap (bufp); |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4154 |
|
678
bd677f8ba924
(re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents:
677
diff
changeset
|
4155 /* 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
|
4156 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
|
4157 |
| 939 | 4158 #ifdef emacs |
|
1321
a37088328c87
(re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents:
1313
diff
changeset
|
4159 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
|
4160 { |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
4161 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
|
4162 |
|
a37088328c87
(re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents:
1313
diff
changeset
|
4163 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
|
4164 } |
| 939 | 4165 #endif |
| 4166 | |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4167 /* 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
|
4168 for (;;) |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4169 { |
|
678
bd677f8ba924
(re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents:
677
diff
changeset
|
4170 /* If the pattern is anchored, |
|
bd677f8ba924
(re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents:
677
diff
changeset
|
4171 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
|
4172 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
|
4173 because that case doesn't repeat. */ |
|
bd677f8ba924
(re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents:
677
diff
changeset
|
4174 if (anchored_start && startpos > 0) |
|
bd677f8ba924
(re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents:
677
diff
changeset
|
4175 { |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
4176 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
|
4177 : string2[startpos - size1 - 1]) |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
4178 == '\n')) |
|
678
bd677f8ba924
(re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents:
677
diff
changeset
|
4179 goto advance; |
|
bd677f8ba924
(re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents:
677
diff
changeset
|
4180 } |
|
bd677f8ba924
(re_search_2): Optimize regexp that starts with ^.
Richard Stallman <rms@gnu.org>
parents:
677
diff
changeset
|
4181 |
|
441
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 /* If a fastmap is supplied, skip quickly over characters that |
| 941 | 4183 cannot be the start of a match. If the pattern can match the |
| 4184 null string, however, we don't need to skip characters; we want | |
| 4185 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
|
4186 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
|
4187 { |
|
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
|
4188 register re_char *d; |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
4189 register re_wchar_t buf_ch; |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4190 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4191 d = POS_ADDR_VSTRING (startpos); |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4192 |
| 941 | 4193 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
|
4194 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4195 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
|
4196 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
|
4197 |
| 941 | 4198 if (startpos < size1 && startpos + range >= size1) |
| 4199 lim = range - (size1 - startpos); | |
| 939 | 4200 |
| 941 | 4201 /* Written out as an if-else to avoid testing `translate' |
| 4202 inside the loop. */ | |
|
1335
97f50084cc62
(re_search_2): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents:
1329
diff
changeset
|
4203 if (RE_TRANSLATE_P (translate)) |
|
97f50084cc62
(re_search_2): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents:
1329
diff
changeset
|
4204 { |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4205 if (multibyte) |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4206 while (range > lim) |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4207 { |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4208 int buf_charlen; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4209 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4210 buf_ch = STRING_CHAR_AND_LENGTH (d, range - lim, |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4211 buf_charlen); |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4212 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4213 buf_ch = RE_TRANSLATE (translate, buf_ch); |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4214 if (buf_ch >= 0400 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4215 || fastmap[buf_ch]) |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4216 break; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4217 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4218 range -= buf_charlen; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4219 d += buf_charlen; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4220 } |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4221 else |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4222 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
|
4223 && !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
|
4224 { |
|
24423cbaf6a9
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents:
1342
diff
changeset
|
4225 d++; |
|
24423cbaf6a9
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents:
1342
diff
changeset
|
4226 range--; |
|
24423cbaf6a9
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents:
1342
diff
changeset
|
4227 } |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4228 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4229 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
|
4230 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
|
4231 { |
|
24423cbaf6a9
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents:
1342
diff
changeset
|
4232 d++; |
|
24423cbaf6a9
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents:
1342
diff
changeset
|
4233 range--; |
|
24423cbaf6a9
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents:
1342
diff
changeset
|
4234 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4235 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4236 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
|
4237 } |
| 941 | 4238 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
|
4239 { |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
4240 int room = (startpos >= size1 |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
4241 ? size2 + size1 - startpos |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
4242 : size1 - startpos); |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
4243 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
|
4244 buf_ch = TRANSLATE (buf_ch); |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4245 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4246 if (! (buf_ch >= 0400 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
4247 || 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
|
4248 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
|
4249 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4250 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4251 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4252 /* 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
|
4253 if (range >= 0 && startpos == total_size && fastmap |
| 941 | 4254 && !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
|
4255 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
|
4256 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4257 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
|
4258 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
|
4259 #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
|
4260 # 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
|
4261 alloca (0); |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
4262 # 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
|
4263 #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
|
4264 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4265 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
|
4266 return startpos; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4267 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4268 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
|
4269 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
|
4270 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4271 advance: |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4272 if (!range) |
| 941 | 4273 break; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4274 else if (range > 0) |
| 941 | 4275 { |
| 939 | 4276 /* Update STARTPOS to the next character boundary. */ |
| 4277 if (multibyte) | |
| 4278 { | |
|
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
|
4279 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
|
4280 re_char *pend = STOP_ADDR_VSTRING (startpos); |
| 939 | 4281 int len = MULTIBYTE_FORM_LENGTH (p, pend - p); |
| 4282 | |
| 4283 range -= len; | |
| 4284 if (range < 0) | |
| 4285 break; | |
| 4286 startpos += len; | |
| 4287 } | |
| 4288 else | |
| 4289 { | |
|
961
6959c7741ed2
(re_search_2): Cast result of POS_ADDR_VSTRING.
Richard Stallman <rms@gnu.org>
parents:
942
diff
changeset
|
4290 range--; |
|
6959c7741ed2
(re_search_2): Cast result of POS_ADDR_VSTRING.
Richard Stallman <rms@gnu.org>
parents:
942
diff
changeset
|
4291 startpos++; |
|
6959c7741ed2
(re_search_2): Cast result of POS_ADDR_VSTRING.
Richard Stallman <rms@gnu.org>
parents:
942
diff
changeset
|
4292 } |
| 679 | 4293 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4294 else |
| 941 | 4295 { |
| 4296 range++; | |
| 4297 startpos--; | |
| 939 | 4298 |
| 4299 /* Update STARTPOS to the previous character boundary. */ | |
| 4300 if (multibyte) | |
| 4301 { | |
|
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
|
4302 re_char *p = POS_ADDR_VSTRING (startpos); |
| 939 | 4303 int len = 0; |
| 4304 | |
| 4305 /* 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
|
4306 while (!CHAR_HEAD_P (*p)) |
| 939 | 4307 p--, len++; |
| 4308 | |
| 4309 /* Adjust it. */ | |
| 4310 #if 0 /* XXX */ | |
| 4311 if (MULTIBYTE_FORM_LENGTH (p, len + 1) != (len + 1)) | |
| 4312 ; | |
| 4313 else | |
| 4314 #endif | |
| 4315 { | |
| 4316 range += len; | |
| 4317 if (range > 0) | |
| 4318 break; | |
| 4319 | |
| 4320 startpos -= len; | |
| 4321 } | |
| 4322 } | |
| 941 | 4323 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4324 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4325 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
|
4326 } /* re_search_2 */ |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
4327 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
|
4328 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4329 /* 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
|
4330 |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
4331 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
|
4332 register int len, |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
4333 RE_TRANSLATE_TYPE translate, |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
4334 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
|
4335 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4336 /* 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
|
4337 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
|
4338 #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
|
4339 (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
|
4340 ? ((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
|
4341 : ((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
|
4342 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4343 /* 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
|
4344 string2 if necessary. |
|
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
4345 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
|
4346 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
|
4347 #define PREFETCH() \ |
| 941 | 4348 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
|
4349 { \ |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4350 /* End of string2 => fail. */ \ |
| 941 | 4351 if (dend == end_match_2) \ |
| 4352 goto fail; \ | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
4353 /* End of string1 => advance to string2. */ \ |
| 941 | 4354 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
|
4355 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
|
4356 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4357 |
|
2551
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
4358 /* 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
|
4359 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
|
4360 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
|
4361 outside of the LIMITs (i.e past `stop'). */ |
|
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
4362 #define PREFETCH_NOLIMIT() \ |
|
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
4363 if (d == end1) \ |
|
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
4364 { \ |
|
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
4365 d = string2; \ |
|
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
4366 dend = end_match_2; \ |
|
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
4367 } \ |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4368 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4369 /* Test if at very beginning or at very end of the virtual concatenation |
| 941 | 4370 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
|
4371 #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
|
4372 #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
|
4373 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4374 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4375 /* 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
|
4376 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
|
4377 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
|
4378 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
|
4379 #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
|
4380 (SYNTAX ((d) == end1 ? *string2 \ |
| 941 | 4381 : (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
|
4382 == 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
|
4383 |
|
521
7089c3a3a164
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
515
diff
changeset
|
4384 /* Disabled due to a compiler bug -- see comment at case wordbound */ |
| 939 | 4385 |
| 4386 /* The comment at case wordbound is following one, but we don't use | |
| 4387 AT_WORD_BOUNDARY anymore to support multibyte form. | |
| 4388 | |
| 4389 The DEC Alpha C compiler 3.x generates incorrect code for the | |
| 941 | 4390 test WORDCHAR_P (d - 1) != WORDCHAR_P (d) in the expansion of |
| 4391 AT_WORD_BOUNDARY, so this code is disabled. Expanding the | |
| 939 | 4392 macro and introducing temporary variables works around the bug. */ |
| 4393 | |
|
521
7089c3a3a164
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
515
diff
changeset
|
4394 #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
|
4395 /* 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
|
4396 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
|
4397 #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
|
4398 (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
|
4399 || WORDCHAR_P (d - 1) != WORDCHAR_P (d)) |
|
521
7089c3a3a164
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
515
diff
changeset
|
4400 #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
|
4401 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4402 /* 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
|
4403 #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
|
4404 # 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
|
4405 # 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
|
4406 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
|
4407 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
|
4408 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
|
4409 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
|
4410 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
|
4411 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
|
4412 } 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
|
4413 #else |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
4414 # 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
|
4415 #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
|
4416 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4417 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4418 /* 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
|
4419 |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4420 /* 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
|
4421 return a pointer to the next operation, else return NULL. */ |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
4422 static re_char * |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4423 skip_one_char (p) |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
4424 re_char *p; |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4425 { |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4426 switch (SWITCH_ENUM_CAST (*p++)) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4427 { |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4428 case anychar: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4429 break; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4430 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4431 case exactn: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4432 p += *p + 1; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4433 break; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4434 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4435 case charset_not: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4436 case charset: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4437 if (CHARSET_RANGE_TABLE_EXISTS_P (p - 1)) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4438 { |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4439 int mcnt; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4440 p = CHARSET_RANGE_TABLE (p - 1); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4441 EXTRACT_NUMBER_AND_INCR (mcnt, p); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4442 p = CHARSET_RANGE_TABLE_END (p, mcnt); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4443 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4444 else |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4445 p += 1 + CHARSET_BITMAP_SIZE (p - 1); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4446 break; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4447 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4448 case syntaxspec: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4449 case notsyntaxspec: |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
4450 #ifdef emacs |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4451 case categoryspec: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4452 case notcategoryspec: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4453 #endif /* emacs */ |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4454 p++; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4455 break; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4456 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4457 default: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4458 p = NULL; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4459 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4460 return p; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4461 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4462 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4463 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4464 /* 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
|
4465 static unsigned char * |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4466 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
|
4467 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
|
4468 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4469 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
|
4470 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
|
4471 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4472 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
|
4473 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4474 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
|
4475 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
|
4476 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
|
4477 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
|
4478 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
|
4479 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
|
4480 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
|
4481 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
|
4482 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
|
4483 break; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4484 default: |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4485 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
|
4486 } |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4487 } |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4488 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
|
4489 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
|
4490 } |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4491 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4492 /* 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
|
4493 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
|
4494 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
|
4495 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
|
4496 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
|
4497 { |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4498 re_opcode_t op2; |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
4499 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
|
4500 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
|
4501 |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4502 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
|
4503 && 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
|
4504 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4505 /* 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
|
4506 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
|
4507 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
|
4508 match at least one of that. */ |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4509 p2 = skip_noops (p2, pend); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4510 /* 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
|
4511 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
|
4512 /* p1 = skip_noops (p1, pend); */ |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4513 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4514 assert (p1 >= bufp->buffer && p1 < pend |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4515 && p2 >= bufp->buffer && p2 <= pend); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4516 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4517 op2 = p2 == pend ? succeed : *p2; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4518 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4519 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
|
4520 { |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4521 case succeed: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4522 case endbuf: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4523 /* 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
|
4524 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
|
4525 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4526 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
|
4527 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
|
4528 } |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4529 break; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4530 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4531 case endline: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4532 case exactn: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4533 { |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
4534 register re_wchar_t c |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4535 = (re_opcode_t) *p2 == endline ? '\n' |
|
3127
ad24d342cb6a
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2945
diff
changeset
|
4536 : RE_STRING_CHAR (p2 + 2, pend - p2 - 2); |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4537 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4538 if ((re_opcode_t) *p1 == exactn) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4539 { |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4540 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
|
4541 { |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4542 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
|
4543 return 1; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4544 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4545 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4546 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4547 else if ((re_opcode_t) *p1 == charset |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4548 || (re_opcode_t) *p1 == charset_not) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4549 { |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4550 int not = (re_opcode_t) *p1 == charset_not; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4551 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4552 /* 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
|
4553 at `p1'. */ |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4554 if (SINGLE_BYTE_CHAR_P (c)) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4555 { |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4556 if (c < CHARSET_BITMAP_SIZE (p1) * BYTEWIDTH |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4557 && p1[2 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH))) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4558 not = !not; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4559 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4560 else if (CHARSET_RANGE_TABLE_EXISTS_P (p1)) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4561 CHARSET_LOOKUP_RANGE_TABLE (not, c, p1); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4562 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4563 /* `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
|
4564 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
|
4565 if (!not) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4566 { |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4567 DEBUG_PRINT1 (" No match => fast loop.\n"); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4568 return 1; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4569 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4570 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4571 else if ((re_opcode_t) *p1 == anychar |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4572 && c == '\n') |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4573 { |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4574 DEBUG_PRINT1 (" . != \\n => fast loop.\n"); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4575 return 1; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4576 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4577 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4578 break; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4579 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4580 case charset: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4581 { |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4582 if ((re_opcode_t) *p1 == exactn) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4583 /* Reuse the code above. */ |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4584 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
|
4585 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4586 /* 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
|
4587 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
|
4588 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
|
4589 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
|
4590 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4591 /* 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
|
4592 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
|
4593 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
|
4594 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
|
4595 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
|
4596 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4597 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
|
4598 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
|
4599 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
|
4600 |
|
3127
ad24d342cb6a
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2945
diff
changeset
|
4601 if ((re_opcode_t) *p1 == charset) |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4602 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4603 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
|
4604 /* 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
|
4605 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
|
4606 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
|
4607 (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
|
4608 && 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
|
4609 idx++) |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4610 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
|
4611 break; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4612 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4613 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
|
4614 || 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
|
4615 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4616 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
|
4617 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
|
4618 } |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4619 } |
|
3127
ad24d342cb6a
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2945
diff
changeset
|
4620 else if ((re_opcode_t) *p1 == charset_not) |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4621 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4622 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
|
4623 /* 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
|
4624 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
|
4625 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
|
4626 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
|
4627 || (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
|
4628 && ((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
|
4629 break; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4630 |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4631 if (idx == p2[1]) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4632 { |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4633 DEBUG_PRINT1 (" No match => fast loop.\n"); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4634 return 1; |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4635 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4636 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4637 } |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4638 } |
|
3129
eba97616ebb9
(mutually_exclusive_p): Add missing `break' at the end of `charset' processing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3127
diff
changeset
|
4639 break; |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4640 |
|
3127
ad24d342cb6a
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2945
diff
changeset
|
4641 case charset_not: |
|
ad24d342cb6a
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2945
diff
changeset
|
4642 switch (SWITCH_ENUM_CAST (*p1)) |
|
ad24d342cb6a
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2945
diff
changeset
|
4643 { |
|
ad24d342cb6a
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2945
diff
changeset
|
4644 case exactn: |
|
ad24d342cb6a
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2945
diff
changeset
|
4645 case charset: |
|
ad24d342cb6a
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2945
diff
changeset
|
4646 /* Reuse the code above. */ |
|
ad24d342cb6a
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2945
diff
changeset
|
4647 return mutually_exclusive_p (bufp, p2, p1); |
|
ad24d342cb6a
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2945
diff
changeset
|
4648 case charset_not: |
|
ad24d342cb6a
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2945
diff
changeset
|
4649 /* When we have two charset_not, it's very unlikely that |
|
ad24d342cb6a
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2945
diff
changeset
|
4650 they don't overlap. The union of the two sets of excluded |
|
ad24d342cb6a
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2945
diff
changeset
|
4651 chars should cover all possible chars, which, as a matter of |
|
ad24d342cb6a
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2945
diff
changeset
|
4652 fact, is virtually impossible in multibyte buffers. */ |
|
3925
098b9043b95d
(PATFETCH): Remove the translating fetch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3790
diff
changeset
|
4653 break; |
|
3127
ad24d342cb6a
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2945
diff
changeset
|
4654 } |
|
ad24d342cb6a
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2945
diff
changeset
|
4655 break; |
|
ad24d342cb6a
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2945
diff
changeset
|
4656 |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4657 case wordend: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4658 case notsyntaxspec: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4659 return ((re_opcode_t) *p1 == syntaxspec |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4660 && p1[1] == (op2 == wordend ? Sword : p2[1])); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4661 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4662 case wordbeg: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4663 case syntaxspec: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4664 return ((re_opcode_t) *p1 == notsyntaxspec |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4665 && p1[1] == (op2 == wordend ? Sword : p2[1])); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4666 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4667 case wordbound: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4668 return (((re_opcode_t) *p1 == notsyntaxspec |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4669 || (re_opcode_t) *p1 == syntaxspec) |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4670 && p1[1] == Sword); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4671 |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
4672 #ifdef emacs |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4673 case categoryspec: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4674 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
|
4675 case notcategoryspec: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4676 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
|
4677 #endif /* emacs */ |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4678 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4679 default: |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
4680 ; |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4681 } |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4682 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4683 /* 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
|
4684 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
|
4685 } |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4686 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4687 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4688 /* 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
|
4689 |
| 941 | 4690 #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
|
4691 /* 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
|
4692 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4693 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
|
4694 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
|
4695 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
|
4696 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
|
4697 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
|
4698 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
|
4699 { |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
4700 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
|
4701 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
|
4702 # 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
|
4703 alloca (0); |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
4704 # 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
|
4705 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
|
4706 } |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
4707 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
|
4708 #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
|
4709 |
| 939 | 4710 #ifdef emacs |
| 4711 /* In Emacs, this is the string or buffer in which we | |
| 941 | 4712 are matching. It is used for looking up syntax properties. */ |
| 939 | 4713 Lisp_Object re_match_object; |
| 4714 #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
|
4715 |
|
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 /* 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
|
4717 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
|
4718 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
|
4719 matching at STOP. |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4720 |
|
441
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 REGS is non-null and the `no_sub' field of BUFP is nonzero, we |
| 941 | 4722 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
|
4723 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
|
4724 |
|
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 We return -1 if no match, -2 if an internal error (such as the |
| 941 | 4726 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
|
4727 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
|
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 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
|
4730 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
|
4731 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
|
4732 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
|
4733 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
|
4734 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
|
4735 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
|
4736 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
|
4737 { |
| 939 | 4738 int result; |
| 941 | 4739 |
| 939 | 4740 #ifdef emacs |
|
1321
a37088328c87
(re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents:
1313
diff
changeset
|
4741 int charpos; |
|
a37088328c87
(re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents:
1313
diff
changeset
|
4742 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
|
4743 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
|
4744 SETUP_SYNTAX_TABLE_FOR_OBJECT (re_match_object, charpos, 1); |
| 939 | 4745 #endif |
| 4746 | |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
4747 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
|
4748 (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
|
4749 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
|
4750 #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
|
4751 alloca (0); |
|
2615
31b85fc23c04
(re_match, re_match_2): Protect calls to alloca (0).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2581
diff
changeset
|
4752 #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
|
4753 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
|
4754 } |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
4755 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
|
4756 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4757 /* This is a separate function so that we can force an alloca cleanup |
| 941 | 4758 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
|
4759 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
|
4760 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
|
4761 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
|
4762 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
|
4763 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
|
4764 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
|
4765 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
|
4766 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
|
4767 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4768 /* 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
|
4769 int mcnt; |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
4770 size_t reg; |
|
2349
5fa185a9956e
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2345
diff
changeset
|
4771 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
|
4772 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4773 /* 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
|
4774 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
|
4775 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4776 /* Pointers into string1 and string2, just past the last characters in |
| 941 | 4777 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
|
4778 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
|
4779 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4780 /* 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
|
4781 re_char *d, *dend; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4782 |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
4783 /* 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
|
4784 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
|
4785 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
|
4786 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
|
4787 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
|
4788 |
|
441
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 /* Where we are in the pattern, and the end of the pattern. */ |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
4790 re_char *p = bufp->buffer; |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
4791 re_char *pend = p + bufp->used; |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4792 |
| 941 | 4793 /* 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
|
4794 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
|
4795 |
| 941 | 4796 /* 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
|
4797 const boolean multibyte = RE_MULTIBYTE_P (bufp); |
| 939 | 4798 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4799 /* 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
|
4800 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
|
4801 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
|
4802 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
|
4803 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
|
4804 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
|
4805 scanning the strings. */ |
| 941 | 4806 #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
|
4807 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
|
4808 #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
|
4809 #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
|
4810 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
|
4811 #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
|
4812 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
4813 #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
|
4814 /* 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
|
4815 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
|
4816 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
|
4817 #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
|
4818 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4819 /* We fill all the registers internally, independent of what we |
| 941 | 4820 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
|
4821 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
|
4822 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
|
4823 |
|
441
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 /* 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
|
4825 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
|
4826 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
|
4827 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
|
4828 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
|
4829 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
|
4830 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
|
4831 #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
|
4832 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
|
4833 #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
|
4834 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4835 /* 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
|
4836 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
|
4837 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
|
4838 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
|
4839 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
|
4840 #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
|
4841 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
|
4842 #endif |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4843 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4844 /* 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
|
4845 allocate space for that if we're not allocating space for anything |
| 941 | 4846 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
|
4847 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
|
4848 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
|
4849 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
|
4850 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
|
4851 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
|
4852 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
|
4853 |
|
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 #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
|
4855 /* Counts the total number of registers pushed. */ |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4856 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
|
4857 #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
|
4858 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4859 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
|
4860 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4861 INIT_FAIL_STACK (); |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4862 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4863 #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
|
4864 /* 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
|
4865 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
|
4866 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
|
4867 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
|
4868 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
|
4869 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
|
4870 { |
|
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
|
4871 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
|
4872 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
|
4873 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
|
4874 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
|
4875 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4876 if (!(regstart && regend && best_regstart && best_regend)) |
| 941 | 4877 { |
| 4878 FREE_VARIABLES (); | |
| 4879 return -2; | |
| 4880 } | |
|
441
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 } |
|
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 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
|
4883 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4884 /* We must initialize all our variables to NULL, so that |
| 941 | 4885 `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
|
4886 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
|
4887 } |
|
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 #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
|
4889 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4890 /* 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
|
4891 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
|
4892 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4893 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
|
4894 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
|
4895 } |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4896 |
|
441
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 /* 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
|
4898 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
|
4899 register information struct. */ |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
4900 for (reg = 1; reg < num_regs; reg++) |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
4901 regstart[reg] = regend[reg] = NULL; |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
4902 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4903 /* We move `string1' into `string2' if the latter's empty -- but not if |
| 941 | 4904 `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
|
4905 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
|
4906 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4907 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
|
4908 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
|
4909 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
|
4910 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
|
4911 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4912 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
|
4913 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
|
4914 |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4915 /* `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
|
4916 `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
|
4917 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
|
4918 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
|
4919 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
|
4920 equal `string2'. */ |
|
2438
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
4921 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
|
4922 { |
|
2438
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
4923 /* 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
|
4924 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
|
4925 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
|
4926 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
|
4927 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4928 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
|
4929 { |
|
2551
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
4930 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
|
4931 { |
|
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
4932 /* 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
|
4933 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
|
4934 /* BEWARE! |
|
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
4935 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
|
4936 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
|
4937 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
|
4938 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
|
4939 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
|
4940 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
|
4941 end_match_2). */ |
|
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
4942 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
|
4943 } |
|
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
4944 else |
|
2551
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
4945 { /* 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
|
4946 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
|
4947 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
|
4948 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
|
4949 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
|
4950 } |
|
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
4951 d = string1 + pos; |
|
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
4952 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
|
4953 } |
|
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 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4955 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
|
4956 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
|
4957 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
|
4958 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
|
4959 DEBUG_PRINT1 ("'\n"); |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4960 |
| 941 | 4961 /* 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
|
4962 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
|
4963 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
|
4964 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
|
4965 { |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
4966 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
|
4967 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4968 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
|
4969 { /* End of pattern means we might have succeeded. */ |
| 941 | 4970 DEBUG_PRINT1 ("end of pattern ... "); |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4971 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4972 /* If we haven't matched the entire string, and we want the |
| 941 | 4973 longest match, try backtracking. */ |
| 4974 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
|
4975 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
4976 /* 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
|
4977 as the best previous match. */ |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
4978 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
|
4979 == 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
|
4980 /* 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
|
4981 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
|
4982 |
|
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 /* AIX compiler got confused when this was combined |
| 941 | 4984 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
|
4985 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
|
4986 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
|
4987 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
|
4988 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
|
4989 |
| 941 | 4990 DEBUG_PRINT1 ("backtracking.\n"); |
| 4991 | |
| 4992 if (!FAIL_STACK_EMPTY ()) | |
| 4993 { /* More failure points to try. */ | |
| 4994 | |
| 4995 /* If exceeds best match so far, save it. */ | |
| 4996 if (!best_regs_set || best_match_p) | |
| 4997 { | |
| 4998 best_regs_set = true; | |
| 4999 match_end = d; | |
| 5000 | |
| 5001 DEBUG_PRINT1 ("\nSAVING match as best so far.\n"); | |
| 5002 | |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5003 for (reg = 1; reg < num_regs; reg++) |
| 941 | 5004 { |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5005 best_regstart[reg] = regstart[reg]; |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5006 best_regend[reg] = regend[reg]; |
| 941 | 5007 } |
| 5008 } | |
| 5009 goto fail; | |
| 5010 } | |
| 5011 | |
| 5012 /* If no failure points, don't restore garbage. And if | |
| 5013 last match is real best match, don't restore second | |
| 5014 best one. */ | |
| 5015 else if (best_regs_set && !best_match_p) | |
| 5016 { | |
| 5017 restore_best_regs: | |
| 5018 /* Restore best match. It may happen that `dend == | |
| 5019 end_match_1' while the restored d is in string2. | |
| 5020 For example, the pattern `x.*y.*z' against the | |
| 5021 strings `x-' and `y-z-', if the two strings are | |
| 5022 not consecutive in memory. */ | |
| 5023 DEBUG_PRINT1 ("Restoring best registers.\n"); | |
| 5024 | |
| 5025 d = match_end; | |
| 5026 dend = ((d >= string1 && d <= end1) | |
| 5027 ? 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
|
5028 |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5029 for (reg = 1; reg < num_regs; reg++) |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5030 { |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5031 regstart[reg] = best_regstart[reg]; |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5032 regend[reg] = best_regend[reg]; |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5033 } |
| 941 | 5034 } |
| 5035 } /* 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
|
5036 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5037 succeed_label: |
| 941 | 5038 DEBUG_PRINT1 ("Accepting match.\n"); |
| 5039 | |
| 5040 /* If caller wants register contents data back, do it. */ | |
| 5041 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
|
5042 { |
| 941 | 5043 /* Have the register data arrays been allocated? */ |
| 5044 if (bufp->regs_allocated == REGS_UNALLOCATED) | |
| 5045 { /* No. So allocate them with malloc. We need one | |
| 5046 extra element beyond `num_regs' for the `-1' marker | |
| 5047 GNU code uses. */ | |
| 5048 regs->num_regs = MAX (RE_NREGS, num_regs + 1); | |
| 5049 regs->start = TALLOC (regs->num_regs, regoff_t); | |
| 5050 regs->end = TALLOC (regs->num_regs, regoff_t); | |
| 5051 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
|
5052 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5053 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
|
5054 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
|
5055 } |
| 941 | 5056 bufp->regs_allocated = REGS_REALLOCATE; |
| 5057 } | |
| 5058 else if (bufp->regs_allocated == REGS_REALLOCATE) | |
| 5059 { /* Yes. If we need more elements than were already | |
| 5060 allocated, reallocate them. If we need fewer, just | |
| 5061 leave it alone. */ | |
| 5062 if (regs->num_regs < num_regs + 1) | |
| 5063 { | |
| 5064 regs->num_regs = num_regs + 1; | |
| 5065 RETALLOC (regs->start, regs->num_regs, regoff_t); | |
| 5066 RETALLOC (regs->end, regs->num_regs, regoff_t); | |
| 5067 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
|
5068 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5069 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
|
5070 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
|
5071 } |
| 941 | 5072 } |
| 5073 } | |
| 5074 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
|
5075 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5076 /* These braces fend off a "empty body in an else-statement" |
| 941 | 5077 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
|
5078 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
|
5079 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5080 |
| 941 | 5081 /* Convert the pointer data in `regstart' and `regend' to |
| 5082 indices. Register zero has to be set differently, | |
| 5083 since we haven't kept track of any info for it. */ | |
| 5084 if (regs->num_regs > 0) | |
| 5085 { | |
| 5086 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
|
5087 regs->end[0] = POINTER_TO_OFFSET (d); |
| 941 | 5088 } |
| 5089 | |
| 5090 /* Go through the first `min (num_regs, regs->num_regs)' | |
| 5091 registers, since that is all we initialized. */ | |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5092 for (reg = 1; reg < MIN (num_regs, regs->num_regs); reg++) |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5093 { |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5094 if (REG_UNSET (regstart[reg]) || REG_UNSET (regend[reg])) |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5095 regs->start[reg] = regs->end[reg] = -1; |
| 941 | 5096 else |
| 5097 { | |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5098 regs->start[reg] |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5099 = (regoff_t) POINTER_TO_OFFSET (regstart[reg]); |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5100 regs->end[reg] |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5101 = (regoff_t) POINTER_TO_OFFSET (regend[reg]); |
| 941 | 5102 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5103 } |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5104 |
| 941 | 5105 /* If the regs structure we return has more elements than |
| 5106 were in the pattern, set the extra elements to -1. If | |
| 5107 we (re)allocated the registers, this is the case, | |
| 5108 because we always allocate enough to have at least one | |
| 5109 -1 at the end. */ | |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5110 for (reg = num_regs; reg < regs->num_regs; reg++) |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5111 regs->start[reg] = regs->end[reg] = -1; |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5112 } /* 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
|
5113 |
| 941 | 5114 DEBUG_PRINT4 ("%u failure points pushed, %u popped (%u remain).\n", |
| 5115 nfailure_points_pushed, nfailure_points_popped, | |
| 5116 nfailure_points_pushed - nfailure_points_popped); | |
| 5117 DEBUG_PRINT2 ("%u registers pushed.\n", num_regs_pushed); | |
| 5118 | |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
5119 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
|
5120 |
| 941 | 5121 DEBUG_PRINT2 ("Returning %d from re_match_2.\n", mcnt); |
| 5122 | |
| 5123 FREE_VARIABLES (); | |
| 5124 return mcnt; | |
| 5125 } | |
| 5126 | |
| 5127 /* 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
|
5128 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
|
5129 { |
| 941 | 5130 /* Ignore these. Used to ignore the n of succeed_n's which |
| 5131 currently have n == 0. */ | |
| 5132 case no_op: | |
| 5133 DEBUG_PRINT1 ("EXECUTING no_op.\n"); | |
| 5134 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
|
5135 |
|
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 case succeed: |
| 941 | 5137 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
|
5138 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
|
5139 |
| 941 | 5140 /* Match the next n pattern characters exactly. The following |
| 5141 byte in the pattern defines n, and the n bytes after that | |
| 5142 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
|
5143 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
|
5144 mcnt = *p++; |
| 941 | 5145 DEBUG_PRINT2 ("EXECUTING exactn %d.\n", mcnt); |
| 5146 | |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
5147 /* 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
|
5148 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
|
5149 |
| 941 | 5150 /* This is written out as an if-else so we don't waste time |
| 5151 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
|
5152 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
|
5153 { |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5154 if (multibyte) |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5155 do |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5156 { |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5157 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
|
5158 unsigned int pat_ch, buf_ch; |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5159 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5160 PREFETCH (); |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5161 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
|
5162 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
|
5163 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5164 if (RE_TRANSLATE (translate, buf_ch) |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5165 != 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
|
5166 { |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
5167 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
|
5168 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
|
5169 } |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5170 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5171 p += pat_charlen; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5172 d += buf_charlen; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5173 mcnt -= pat_charlen; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5174 } |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5175 while (mcnt > 0); |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5176 else |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5177 do |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5178 { |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5179 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
|
5180 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
|
5181 { |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
5182 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
|
5183 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
|
5184 } |
|
1381
24423cbaf6a9
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard Stallman <rms@gnu.org>
parents:
1342
diff
changeset
|
5185 d++; |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5186 } |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5187 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
|
5188 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5189 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
|
5190 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5191 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
|
5192 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5193 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
|
5194 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
|
5195 { |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
5196 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
|
5197 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
|
5198 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5199 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5200 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
|
5201 } |
| 941 | 5202 break; |
| 5203 | |
| 5204 | |
| 5205 /* 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
|
5206 case anychar: |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5207 { |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5208 int buf_charlen; |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5209 re_wchar_t buf_ch; |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5210 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5211 DEBUG_PRINT1 ("EXECUTING anychar.\n"); |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5212 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5213 PREFETCH (); |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5214 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
|
5215 buf_ch = TRANSLATE (buf_ch); |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5216 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5217 if ((!(bufp->syntax & RE_DOT_NEWLINE) |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5218 && buf_ch == '\n') |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5219 || ((bufp->syntax & RE_DOT_NOT_NULL) |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5220 && buf_ch == '\000')) |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5221 goto fail; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5222 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5223 DEBUG_PRINT2 (" Matched `%d'.\n", *d); |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5224 d += buf_charlen; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5225 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5226 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
|
5227 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5228 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5229 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
|
5230 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
|
5231 { |
| 939 | 5232 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
|
5233 boolean not = (re_opcode_t) *(p - 1) == charset_not; |
| 939 | 5234 int len; |
| 5235 | |
| 5236 /* Start of actual range_table, or end of bitmap if there is no | |
| 5237 range table. */ | |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5238 re_char *range_table; |
| 939 | 5239 |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5240 /* Nonzero if there is a range table. */ |
| 939 | 5241 int range_table_exists; |
| 5242 | |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5243 /* 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
|
5244 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
|
5245 int count = 0; |
| 939 | 5246 |
| 941 | 5247 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
|
5248 |
| 939 | 5249 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
|
5250 |
| 939 | 5251 if (range_table_exists) |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5252 { |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5253 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
|
5254 EXTRACT_NUMBER_AND_INCR (count, range_table); |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5255 } |
| 939 | 5256 |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5257 PREFETCH (); |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5258 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
|
5259 c = TRANSLATE (c); /* The character to match. */ |
| 939 | 5260 |
| 5261 if (SINGLE_BYTE_CHAR_P (c)) | |
| 5262 { /* Lookup bitmap. */ | |
| 5263 /* Cast to `unsigned' instead of `unsigned char' in | |
| 5264 case the bit list is a full 32 bytes long. */ | |
| 5265 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
|
5266 && p[1 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH))) |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5267 not = !not; |
| 939 | 5268 } |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5269 #ifdef emacs |
| 939 | 5270 else if (range_table_exists) |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5271 { |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5272 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
|
5273 |
|
2851
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
5274 if ( (class_bits & BIT_LOWER && ISLOWER (c)) |
|
d2bf7ab893af
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2849
diff
changeset
|
5275 | (class_bits & BIT_MULTIBYTE) |
|
1933
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5276 | (class_bits & BIT_PUNCT && ISPUNCT (c)) |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5277 | (class_bits & BIT_SPACE && ISSPACE (c)) |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5278 | (class_bits & BIT_UPPER && ISUPPER (c)) |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5279 | (class_bits & BIT_WORD && ISWORD (c))) |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5280 not = !not; |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5281 else |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5282 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
|
5283 } |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5284 #endif /* emacs */ |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5285 |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5286 if (range_table_exists) |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5287 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
|
5288 else |
|
5ffa81ab1988
[emacs]: Handle character classes for multibyte chars:
Richard Stallman <rms@gnu.org>
parents:
1660
diff
changeset
|
5289 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
|
5290 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5291 if (!not) goto fail; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5292 |
| 939 | 5293 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
|
5294 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
|
5295 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5296 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5297 |
| 941 | 5298 /* 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
|
5299 The argument is the register number. The text |
| 941 | 5300 matched within the group is recorded (in the internal |
| 5301 registers data structure) under the register number. */ | |
| 5302 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
|
5303 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
|
5304 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5305 /* 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
|
5306 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
|
5307 |
| 941 | 5308 regstart[*p] = d; |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
5309 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
|
5310 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
|
5311 |
| 941 | 5312 /* 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
|
5313 p += 1; |
| 941 | 5314 break; |
| 5315 | |
| 5316 | |
| 5317 /* 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
|
5318 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
|
5319 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
|
5320 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
|
5321 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5322 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
|
5323 /* 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
|
5324 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
5325 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
|
5326 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
|
5327 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5328 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
|
5329 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
|
5330 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
|
5331 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
|
5332 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
|
5333 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
|
5334 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
|
5335 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
|
5336 |
| 941 | 5337 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
|
5338 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
|
5339 |
| 941 | 5340 /* 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
|
5341 p += 1; |
| 941 | 5342 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
|
5343 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5344 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5345 /* \<digit> has been turned into a `duplicate' command which is |
| 941 | 5346 followed by the numeric value of <digit> as the register number. */ |
| 5347 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
|
5348 { |
|
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
|
5349 register re_char *d2, *dend2; |
| 941 | 5350 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
|
5351 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
|
5352 |
| 941 | 5353 /* Can't back reference a group which we've never matched. */ |
| 5354 if (REG_UNSET (regstart[regno]) || REG_UNSET (regend[regno])) | |
| 5355 goto fail; | |
| 5356 | |
| 5357 /* Where in input to try to start matching. */ | |
| 5358 d2 = regstart[regno]; | |
| 5359 | |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
5360 /* 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
|
5361 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
|
5362 |
| 941 | 5363 /* Where to stop matching; if both the place to start and |
| 5364 the place to stop matching are in the same string, then | |
| 5365 set to the place to stop, otherwise, for now have to use | |
| 5366 the end of the first string. */ | |
| 5367 | |
| 5368 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
|
5369 == 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
|
5370 ? 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
|
5371 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
|
5372 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5373 /* If necessary, advance to next segment in register |
| 941 | 5374 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
|
5375 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
|
5376 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5377 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
|
5378 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
|
5379 |
| 941 | 5380 /* End of string1 => advance to string2. */ |
| 5381 d2 = string2; | |
| 5382 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
|
5383 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5384 /* 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
|
5385 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
|
5386 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5387 /* 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
|
5388 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
|
5389 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5390 /* 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
|
5391 mcnt = dend - d; |
|
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 /* Want how many consecutive characters we can match in |
| 941 | 5394 one shot, so, if necessary, adjust the count. */ |
| 5395 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
|
5396 mcnt = dend2 - d2; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5397 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5398 /* Compare that many; failure if mismatch, else move |
| 941 | 5399 past them. */ |
|
1328
0aa10b723959
Use RE_TRANSLATE_P to check whether translation is
Andreas Schwab <schwab@suse.de>
parents:
1326
diff
changeset
|
5400 if (RE_TRANSLATE_P (translate) |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5401 ? 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
|
5402 : 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
|
5403 { |
|
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
5404 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
|
5405 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
|
5406 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5407 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
|
5408 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5409 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5410 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
|
5411 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5412 |
| 941 | 5413 /* 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
|
5414 (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
|
5415 case begline: |
| 941 | 5416 DEBUG_PRINT1 ("EXECUTING begline.\n"); |
| 5417 | |
| 5418 if (AT_STRINGS_BEG (d)) | |
| 5419 { | |
| 5420 if (!bufp->not_bol) break; | |
| 5421 } | |
|
2438
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
5422 else |
| 941 | 5423 { |
|
2438
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
5424 unsigned char c; |
|
c6d2b36bed68
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2375
diff
changeset
|
5425 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
|
5426 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
|
5427 break; |
| 941 | 5428 } |
| 5429 /* In all other cases, we fail. */ | |
| 5430 goto fail; | |
| 5431 | |
| 5432 | |
| 5433 /* 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
|
5434 case endline: |
| 941 | 5435 DEBUG_PRINT1 ("EXECUTING endline.\n"); |
| 5436 | |
| 5437 if (AT_STRINGS_END (d)) | |
| 5438 { | |
| 5439 if (!bufp->not_eol) break; | |
| 5440 } | |
|
2551
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
5441 else |
| 941 | 5442 { |
|
2551
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
5443 PREFETCH_NOLIMIT (); |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
5444 if (*d == '\n') |
|
2551
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
5445 break; |
| 941 | 5446 } |
| 5447 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
|
5448 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5449 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5450 /* Match at the very beginning of the data. */ |
| 941 | 5451 case begbuf: |
| 5452 DEBUG_PRINT1 ("EXECUTING begbuf.\n"); | |
| 5453 if (AT_STRINGS_BEG (d)) | |
| 5454 break; | |
| 5455 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
|
5456 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5457 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5458 /* Match at the very end of the data. */ |
| 941 | 5459 case endbuf: |
| 5460 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
|
5461 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
|
5462 break; |
| 941 | 5463 goto fail; |
| 5464 | |
| 5465 | |
| 5466 /* on_failure_keep_string_jump is used to optimize `.*\n'. It | |
| 5467 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
|
5468 `POP_FAILURE_POINT' will keep the current value for the |
| 941 | 5469 string, instead of restoring it. To see why, consider |
| 5470 matching `foo\nbar' against `.*\n'. The .* matches the foo; | |
| 5471 then the . fails against the \n. But the next thing we want | |
| 5472 to do is match the \n against the \n; if we restored the | |
| 5473 string value, we would be back at the foo. | |
| 5474 | |
| 5475 Because this is used only in specific cases, we don't need to | |
| 5476 check all the things that `on_failure_jump' does, to make | |
| 5477 sure the right things get saved on the stack. Hence we don't | |
| 5478 share its code. The only reason to push anything on the | |
| 5479 stack at all is that otherwise we would have to change | |
| 5480 `anychar's code to do something besides goto fail in this | |
| 5481 case; that seems worse than this. */ | |
| 5482 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
|
5483 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
|
5484 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
|
5485 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
|
5486 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5487 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
|
5488 break; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5489 |
|
2370
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5490 /* 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
|
5491 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
|
5492 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
|
5493 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
|
5494 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
|
5495 detect a cycle (between different instantiations of the same |
|
3933
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5496 loop). |
|
2370
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5497 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
|
5498 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
|
5499 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
|
5500 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
|
5501 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
|
5502 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
|
5503 the loop. */ |
|
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5504 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
|
5505 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
|
5506 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
|
5507 mcnt, p + mcnt); |
|
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5508 |
|
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5509 assert ((re_opcode_t)p[-4] == no_op); |
|
3933
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5510 { |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5511 int cycle = 0; |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5512 CHECK_INFINITE_LOOP (p - 4, d); |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5513 if (!cycle) |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5514 /* If there's a cycle, just continue without pushing |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5515 this failure point. The failure point is the "try again" |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5516 option, which shouldn't be tried. |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5517 We want (x?)*?y\1z to match both xxyz and xxyxz. */ |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5518 PUSH_FAILURE_POINT (p - 3, d); |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5519 } |
|
2370
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5520 break; |
|
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5521 |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
5522 /* 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
|
5523 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
|
5524 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
|
5525 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
|
5526 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
|
5527 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
|
5528 mcnt, p + mcnt); |
|
3933
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5529 { |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5530 int cycle = 0; |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5531 CHECK_INFINITE_LOOP (p - 3, d); |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5532 if (cycle) |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5533 /* If there's a cycle, get out of the loop, as if the matching |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5534 had failed. We used to just `goto fail' here, but that was |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5535 aborting the search a bit too early: we want to keep the |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5536 empty-loop-match and keep matching after the loop. |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5537 We want (x?)*y\1z to match both xxyz and xxyxz. */ |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5538 p += mcnt; |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5539 else |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5540 PUSH_FAILURE_POINT (p - 3, d); |
|
91cfbab32c36
(DISCARD_FAILURE_REG_OR_COUNT): Delete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3932
diff
changeset
|
5541 } |
| 941 | 5542 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
|
5543 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5544 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5545 /* Uses of on_failure_jump: |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5546 |
| 941 | 5547 Each alternative starts with an on_failure_jump that points |
| 5548 to the beginning of the next alternative. Each alternative | |
| 5549 except the last ends with a jump that in effect jumps past | |
| 5550 the rest of the alternatives. (They really jump to the | |
| 5551 ending jump of the following alternative, because tensioning | |
| 5552 these jumps is a hassle.) | |
| 5553 | |
| 5554 Repeats start with an on_failure_jump that points past both | |
| 5555 the repetition text and either the following jump or | |
| 5556 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
|
5557 case on_failure_jump: |
|
2913
9e8ab826e86c
(IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents:
2912
diff
changeset
|
5558 IMMEDIATE_QUIT_CHECK; |
| 941 | 5559 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
|
5560 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
|
5561 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
|
5562 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5563 PUSH_FAILURE_POINT (p -3, d); |
| 941 | 5564 break; |
| 5565 | |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
5566 /* 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
|
5567 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
|
5568 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
|
5569 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
|
5570 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
|
5571 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
|
5572 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
|
5573 case on_failure_jump_smart: |
|
2913
9e8ab826e86c
(IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents:
2912
diff
changeset
|
5574 IMMEDIATE_QUIT_CHECK; |
| 941 | 5575 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
|
5576 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
|
5577 mcnt, p + mcnt); |
| 941 | 5578 { |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5579 re_char *p1 = p; /* Next operation. */ |
|
2925
71f30fc93bf9
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2921
diff
changeset
|
5580 /* Here, we discard `const', making re_match non-reentrant. */ |
|
71f30fc93bf9
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2921
diff
changeset
|
5581 unsigned char *p2 = (unsigned char*) p + mcnt; /* Jump dest. */ |
|
71f30fc93bf9
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2921
diff
changeset
|
5582 unsigned char *p3 = (unsigned char*) p - 3; /* opcode location. */ |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5583 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5584 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
|
5585 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
|
5586 |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
5587 EXTRACT_NUMBER (mcnt, p2 - 2); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
5588 |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
5589 /* 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
|
5590 we are expecting. */ |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
5591 assert (skip_one_char (p1) == p2 - 3); |
|
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
5592 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
|
5593 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
|
5594 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
|
5595 { |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5596 /* 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
|
5597 DEBUG_PRINT1 (" smart exclusive => fast loop.\n"); |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5598 *p3 = (unsigned char) on_failure_keep_string_jump; |
|
2355
0786b40fdf1c
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2350
diff
changeset
|
5599 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
|
5600 } |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5601 else |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5602 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5603 /* 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
|
5604 DEBUG_PRINT1 (" smart default => slow loop.\n"); |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5605 *p3 = (unsigned char) on_failure_jump; |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5606 } |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
5607 DEBUG_STATEMENT (debug -= 2); |
| 939 | 5608 } |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5609 break; |
| 941 | 5610 |
| 5611 /* Unconditionally jump (without popping any failure points). */ | |
| 5612 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
|
5613 unconditional_jump: |
|
2913
9e8ab826e86c
(IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents:
2912
diff
changeset
|
5614 IMMEDIATE_QUIT_CHECK; |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5615 EXTRACT_NUMBER_AND_INCR (mcnt, p); /* Get the amount to jump. */ |
| 941 | 5616 DEBUG_PRINT2 ("EXECUTING jump %d ", mcnt); |
| 5617 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
|
5618 DEBUG_PRINT2 ("(to %p).\n", p); |
| 941 | 5619 break; |
| 5620 | |
| 5621 | |
| 5622 /* Have to succeed matching what follows at least n times. | |
| 5623 After that, handle like `on_failure_jump'. */ | |
| 5624 case succeed_n: | |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5625 /* Signedness doesn't matter since we only compare MCNT to 0. */ |
| 941 | 5626 EXTRACT_NUMBER (mcnt, p + 2); |
| 5627 DEBUG_PRINT2 ("EXECUTING succeed_n %d.\n", mcnt); | |
| 5628 | |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
5629 /* 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
|
5630 if (mcnt != 0) |
| 941 | 5631 { |
|
2925
71f30fc93bf9
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2921
diff
changeset
|
5632 /* Here, we discard `const', making re_match non-reentrant. */ |
|
71f30fc93bf9
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2921
diff
changeset
|
5633 unsigned char *p2 = (unsigned char*) p + 2; /* counter loc. */ |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
5634 mcnt--; |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5635 p += 4; |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5636 PUSH_NUMBER (p2, mcnt); |
| 941 | 5637 } |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
5638 else |
|
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
5639 /* 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
|
5640 goto on_failure; |
| 941 | 5641 break; |
| 5642 | |
| 5643 case jump_n: | |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5644 /* Signedness doesn't matter since we only compare MCNT to 0. */ |
| 941 | 5645 EXTRACT_NUMBER (mcnt, p + 2); |
| 5646 DEBUG_PRINT2 ("EXECUTING jump_n %d.\n", mcnt); | |
| 5647 | |
| 5648 /* 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
|
5649 if (mcnt != 0) |
| 941 | 5650 { |
|
2925
71f30fc93bf9
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2921
diff
changeset
|
5651 /* Here, we discard `const', making re_match non-reentrant. */ |
|
71f30fc93bf9
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2921
diff
changeset
|
5652 unsigned char *p2 = (unsigned char*) p + 2; /* counter loc. */ |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
5653 mcnt--; |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5654 PUSH_NUMBER (p2, mcnt); |
|
2828
a52061981f50
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2816
diff
changeset
|
5655 goto unconditional_jump; |
| 941 | 5656 } |
| 5657 /* 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
|
5658 else |
|
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5659 p += 4; |
| 941 | 5660 break; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5661 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5662 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
|
5663 { |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5664 unsigned char *p2; /* Location of the counter. */ |
| 941 | 5665 DEBUG_PRINT1 ("EXECUTING set_number_at.\n"); |
| 5666 | |
| 5667 EXTRACT_NUMBER_AND_INCR (mcnt, p); | |
|
2925
71f30fc93bf9
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2921
diff
changeset
|
5668 /* Here, we discard `const', making re_match non-reentrant. */ |
|
71f30fc93bf9
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2921
diff
changeset
|
5669 p2 = (unsigned char*) p + mcnt; |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5670 /* Signedness doesn't matter since we only copy MCNT's bits . */ |
| 941 | 5671 EXTRACT_NUMBER_AND_INCR (mcnt, p); |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5672 DEBUG_PRINT3 (" Setting %p to %d.\n", p2, mcnt); |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5673 PUSH_NUMBER (p2, mcnt); |
| 941 | 5674 break; |
| 5675 } | |
|
521
7089c3a3a164
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
515
diff
changeset
|
5676 |
|
7089c3a3a164
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
515
diff
changeset
|
5677 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
|
5678 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
|
5679 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
|
5680 DEBUG_PRINT2 ("EXECUTING %swordbound.\n", not?"not":""); |
| 939 | 5681 |
|
2350
f3edfed6aa96
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2349
diff
changeset
|
5682 /* We SUCCEED (or FAIL) in one of the following cases: */ |
| 939 | 5683 |
| 5684 /* 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
|
5685 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
|
5686 not = !not; |
| 939 | 5687 else |
| 5688 { | |
| 5689 /* C1 is the character before D, S1 is the syntax of C1, C2 | |
| 5690 is the character at D, and S2 is the syntax of C2. */ | |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5691 re_wchar_t c1, c2; |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5692 int s1, s2; |
| 939 | 5693 #ifdef emacs |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5694 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
|
5695 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
|
5696 UPDATE_SYNTAX_TABLE (charpos); |
| 941 | 5697 #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
|
5698 GET_CHAR_BEFORE_2 (c1, d, string1, end1, string2, end2); |
| 939 | 5699 s1 = SYNTAX (c1); |
| 5700 #ifdef emacs | |
|
1204
28ff40a118b8
(re_search_2): Fix call to CHAR_HEAD_P.
Richard Stallman <rms@gnu.org>
parents:
1158
diff
changeset
|
5701 UPDATE_SYNTAX_TABLE_FORWARD (charpos + 1); |
| 941 | 5702 #endif |
|
2551
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
5703 PREFETCH_NOLIMIT (); |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5704 c2 = RE_STRING_CHAR (d, dend - d); |
| 939 | 5705 s2 = SYNTAX (c2); |
| 5706 | |
| 5707 if (/* Case 2: Only one of S1 and S2 is Sword. */ | |
| 5708 ((s1 == Sword) != (s2 == Sword)) | |
| 5709 /* Case 3: Both of S1 and S2 are Sword, and macro | |
| 941 | 5710 WORD_BOUNDARY_P (C1, C2) returns nonzero. */ |
| 939 | 5711 || ((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
|
5712 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
|
5713 } |
|
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
|
5714 if (not) |
|
521
7089c3a3a164
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
515
diff
changeset
|
5715 break; |
| 939 | 5716 else |
|
521
7089c3a3a164
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
515
diff
changeset
|
5717 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
|
5718 |
|
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 case wordbeg: |
| 941 | 5720 DEBUG_PRINT1 ("EXECUTING wordbeg.\n"); |
| 939 | 5721 |
| 5722 /* We FAIL in one of the following cases: */ | |
| 5723 | |
| 941 | 5724 /* Case 1: D is at the end of string. */ |
| 939 | 5725 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
|
5726 goto fail; |
| 939 | 5727 else |
| 5728 { | |
| 5729 /* C1 is the character before D, S1 is the syntax of C1, C2 | |
| 5730 is the character at D, and S2 is the syntax of C2. */ | |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5731 re_wchar_t c1, c2; |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5732 int s1, s2; |
| 939 | 5733 #ifdef emacs |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5734 int offset = PTR_TO_OFFSET (d); |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5735 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
|
5736 UPDATE_SYNTAX_TABLE (charpos); |
| 941 | 5737 #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
|
5738 PREFETCH (); |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5739 c2 = RE_STRING_CHAR (d, dend - d); |
| 939 | 5740 s2 = SYNTAX (c2); |
| 941 | 5741 |
| 939 | 5742 /* Case 2: S2 is not Sword. */ |
| 5743 if (s2 != Sword) | |
| 5744 goto fail; | |
| 5745 | |
| 5746 /* Case 3: D is not at the beginning of string ... */ | |
| 5747 if (!AT_STRINGS_BEG (d)) | |
| 5748 { | |
| 5749 GET_CHAR_BEFORE_2 (c1, d, string1, end1, string2, end2); | |
| 5750 #ifdef emacs | |
|
1204
28ff40a118b8
(re_search_2): Fix call to CHAR_HEAD_P.
Richard Stallman <rms@gnu.org>
parents:
1158
diff
changeset
|
5751 UPDATE_SYNTAX_TABLE_BACKWARD (charpos - 1); |
| 941 | 5752 #endif |
| 939 | 5753 s1 = SYNTAX (c1); |
| 5754 | |
| 5755 /* ... and S1 is Sword, and WORD_BOUNDARY_P (C1, C2) | |
| 941 | 5756 returns 0. */ |
| 939 | 5757 if ((s1 == Sword) && !WORD_BOUNDARY_P (c1, c2)) |
| 5758 goto fail; | |
| 5759 } | |
| 5760 } | |
| 5761 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
|
5762 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5763 case wordend: |
| 941 | 5764 DEBUG_PRINT1 ("EXECUTING wordend.\n"); |
| 939 | 5765 |
| 5766 /* We FAIL in one of the following cases: */ | |
| 5767 | |
| 5768 /* Case 1: D is at the beginning of string. */ | |
| 5769 if (AT_STRINGS_BEG (d)) | |
| 5770 goto fail; | |
| 5771 else | |
| 5772 { | |
| 5773 /* C1 is the character before D, S1 is the syntax of C1, C2 | |
| 5774 is the character at D, and S2 is the syntax of C2. */ | |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5775 re_wchar_t c1, c2; |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5776 int s1, s2; |
|
1204
28ff40a118b8
(re_search_2): Fix call to CHAR_HEAD_P.
Richard Stallman <rms@gnu.org>
parents:
1158
diff
changeset
|
5777 #ifdef emacs |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5778 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
|
5779 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
|
5780 UPDATE_SYNTAX_TABLE (charpos); |
|
1204
28ff40a118b8
(re_search_2): Fix call to CHAR_HEAD_P.
Richard Stallman <rms@gnu.org>
parents:
1158
diff
changeset
|
5781 #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
|
5782 GET_CHAR_BEFORE_2 (c1, d, string1, end1, string2, end2); |
| 939 | 5783 s1 = SYNTAX (c1); |
| 5784 | |
| 5785 /* Case 2: S1 is not Sword. */ | |
| 5786 if (s1 != Sword) | |
| 5787 goto fail; | |
| 5788 | |
| 5789 /* Case 3: D is not at the end of string ... */ | |
| 5790 if (!AT_STRINGS_END (d)) | |
| 5791 { | |
|
2551
b341325934ed
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2537
diff
changeset
|
5792 PREFETCH_NOLIMIT (); |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5793 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
|
5794 #ifdef emacs |
|
28ff40a118b8
(re_search_2): Fix call to CHAR_HEAD_P.
Richard Stallman <rms@gnu.org>
parents:
1158
diff
changeset
|
5795 UPDATE_SYNTAX_TABLE_FORWARD (charpos); |
|
28ff40a118b8
(re_search_2): Fix call to CHAR_HEAD_P.
Richard Stallman <rms@gnu.org>
parents:
1158
diff
changeset
|
5796 #endif |
| 939 | 5797 s2 = SYNTAX (c2); |
| 5798 | |
| 5799 /* ... and S2 is Sword, and WORD_BOUNDARY_P (C1, C2) | |
| 941 | 5800 returns 0. */ |
| 939 | 5801 if ((s2 == Sword) && !WORD_BOUNDARY_P (c1, c2)) |
| 941 | 5802 goto fail; |
| 939 | 5803 } |
| 5804 } | |
| 5805 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
|
5806 |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5807 case syntaxspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5808 case notsyntaxspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5809 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
|
5810 mcnt = *p++; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5811 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
|
5812 PREFETCH (); |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5813 #ifdef emacs |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5814 { |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5815 int offset = PTR_TO_OFFSET (d); |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5816 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
|
5817 UPDATE_SYNTAX_TABLE (pos1); |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5818 } |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5819 #endif |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5820 { |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5821 int len; |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5822 re_wchar_t c; |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5823 |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5824 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
|
5825 |
|
2359
dbf725277cfc
(enum syntaxcode): Provide default for non-Emacs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2357
diff
changeset
|
5826 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
|
5827 goto fail; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5828 d += len; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5829 } |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5830 break; |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5831 |
|
441
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 #ifdef emacs |
| 941 | 5833 case before_dot: |
| 5834 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
|
5835 if (PTR_BYTE_POS (d) >= PT_BYTE) |
| 941 | 5836 goto fail; |
| 5837 break; | |
| 5838 | |
| 5839 case at_dot: | |
| 5840 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
|
5841 if (PTR_BYTE_POS (d) != PT_BYTE) |
| 941 | 5842 goto fail; |
| 5843 break; | |
| 5844 | |
| 5845 case after_dot: | |
| 5846 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
|
5847 if (PTR_BYTE_POS (d) <= PT_BYTE) |
| 941 | 5848 goto fail; |
| 5849 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
|
5850 |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5851 case categoryspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5852 case notcategoryspec: |
|
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5853 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
|
5854 mcnt = *p++; |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5855 DEBUG_PRINT3 ("EXECUTING %scategoryspec %d.\n", not?"not":"", mcnt); |
| 939 | 5856 PREFETCH (); |
| 5857 { | |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5858 int len; |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5859 re_wchar_t c; |
|
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5860 |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5861 c = RE_STRING_CHAR_AND_LENGTH (d, dend - d, len); |
| 939 | 5862 |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5863 if ((!CHAR_HAS_CATEGORY (c, mcnt)) ^ not) |
| 939 | 5864 goto fail; |
| 5865 d += len; | |
| 5866 } | |
| 5867 break; | |
| 5868 | |
|
2356
d93889e88226
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2355
diff
changeset
|
5869 #endif /* emacs */ |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5870 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
5871 default: |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
5872 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
|
5873 } |
| 939 | 5874 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
|
5875 |
|
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 |
|
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 /* 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
|
5878 fail: |
|
2913
9e8ab826e86c
(IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents:
2912
diff
changeset
|
5879 IMMEDIATE_QUIT_CHECK; |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5880 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
|
5881 { |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5882 re_char *str, *pat; |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5883 /* 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
|
5884 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
|
5885 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
|
5886 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
|
5887 { |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5888 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
|
5889 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
|
5890 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
|
5891 |
|
2370
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5892 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
|
5893 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
|
5894 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
|
5895 /* Fallthrough */ |
|
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5896 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5897 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
|
5898 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
|
5899 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
|
5900 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
|
5901 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
|
5902 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
|
5903 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
|
5904 break; |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5905 |
|
2370
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5906 case no_op: |
|
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5907 /* 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
|
5908 goto fail; |
|
d8ded9c0e20c
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2359
diff
changeset
|
5909 |
|
2345
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5910 default: |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5911 abort(); |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5912 } |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5913 |
|
93d6633849d6
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2153
diff
changeset
|
5914 assert (p >= bufp->buffer && p <= pend); |
| 939 | 5915 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
5916 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
|
5917 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
|
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 else |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
5920 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
|
5921 } /* 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
|
5922 |
|
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 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
|
5924 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
|
5925 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5926 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
|
5927 |
| 939 | 5928 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
|
5929 } /* 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
|
5930 |
|
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 /* 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
|
5932 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5933 /* 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
|
5934 bytes; nonzero otherwise. */ |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5935 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5936 static int |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5937 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
|
5938 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
|
5939 register int len; |
|
501
f29b13c2cefd
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard Stallman <rms@gnu.org>
parents:
490
diff
changeset
|
5940 RE_TRANSLATE_TYPE translate; |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5941 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
|
5942 { |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5943 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
|
5944 re_char *p1_end = s1 + len; |
|
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5945 re_char *p2_end = s2 + len; |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5946 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
5947 /* 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
|
5948 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
|
5949 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
|
5950 { |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5951 int p1_charlen, p2_charlen; |
|
2921
15cff6b2cb7d
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2913
diff
changeset
|
5952 re_wchar_t p1_ch, p2_ch; |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5953 |
|
2375
f25b865f900c
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2372
diff
changeset
|
5954 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
|
5955 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
|
5956 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5957 if (RE_TRANSLATE (translate, p1_ch) |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5958 != 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
|
5959 return 1; |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5960 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5961 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
|
5962 } |
|
1296
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5963 |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5964 if (p1 != p1_end || p2 != p2_end) |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5965 return 1; |
|
7b938cc81ae2
(compile_range): Unused function deleted.
Richard Stallman <rms@gnu.org>
parents:
1218
diff
changeset
|
5966 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5967 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
|
5968 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5969 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5970 /* 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
|
5971 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5972 /* 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
|
5973 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
|
5974 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
|
5975 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5976 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
|
5977 are set in BUFP on entry. |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5978 |
| 939 | 5979 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
|
5980 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5981 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
|
5982 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
|
5983 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
|
5984 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
|
5985 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
|
5986 { |
|
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 reg_errcode_t ret; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5988 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
5989 /* 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
|
5990 (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
|
5991 bufp->regs_allocated = REGS_UNALLOCATED; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5992 |
|
441
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 /* 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
|
5994 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
|
5995 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
|
5996 bufp->no_sub = 0; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
5997 |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
5998 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
|
5999 |
|
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 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
|
6001 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
|
6002 return gettext (re_error_msgid[(int) ret]); |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
6003 } |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
6004 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
|
6005 |
| 939 | 6006 /* Entry points compatible with 4.2 BSD regex library. We don't define |
| 6007 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
|
6008 |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
6009 #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
|
6010 |
|
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 /* 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
|
6012 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
|
6013 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6014 char * |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
6015 # 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
|
6016 /* 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
|
6017 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
|
6018 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
|
6019 weak_function |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
6020 # 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
|
6021 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
|
6022 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
|
6023 { |
|
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 reg_errcode_t ret; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
6025 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6026 if (!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
|
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 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
|
6029 /* 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
|
6030 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
|
6031 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
|
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 |
|
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 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
|
6035 { |
|
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 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
|
6037 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
|
6038 /* 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
|
6039 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
|
6040 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
|
6041 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6042 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
|
6043 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
|
6044 /* 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
|
6045 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
|
6046 } |
|
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 |
|
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 /* 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
|
6049 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
|
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 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
|
6052 |
|
441
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 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
|
6054 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
|
6055 |
|
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 /* 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
|
6057 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
|
6058 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6059 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6060 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6061 int |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
6062 # 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
|
6063 weak_function |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
6064 # 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
|
6065 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
|
6066 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
|
6067 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6068 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
|
6069 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
|
6070 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
|
6071 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6072 #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
|
6073 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6074 /* 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
|
6075 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6076 #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
|
6077 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6078 /* 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
|
6079 |
| 939 | 6080 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
|
6081 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
|
6082 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6083 `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
|
6084 `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
|
6085 `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
|
6086 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
|
6087 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
|
6088 `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
|
6089 `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
|
6090 `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
|
6091 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6092 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
|
6093 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6094 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
|
6095 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6096 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
|
6097 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
|
6098 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6099 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
|
6100 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
|
6101 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6102 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
|
6103 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
|
6104 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6105 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
|
6106 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
|
6107 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
|
6108 |
| 939 | 6109 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
|
6110 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
|
6111 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6112 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
|
6113 regcomp (preg, pattern, cflags) |
|
3581
68530c9df63a
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3544
diff
changeset
|
6114 regex_t *__restrict preg; |
|
68530c9df63a
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3544
diff
changeset
|
6115 const char *__restrict 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
|
6116 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
|
6117 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6118 reg_errcode_t ret; |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
6119 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
|
6120 = (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
|
6121 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
|
6122 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6123 /* 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
|
6124 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
|
6125 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
|
6126 preg->used = 0; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
6127 |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
6128 /* 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
|
6129 preg->fastmap = (char *) malloc (1 << BYTEWIDTH); |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
6130 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6131 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
|
6132 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6133 unsigned i; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
6134 |
|
501
f29b13c2cefd
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard Stallman <rms@gnu.org>
parents:
490
diff
changeset
|
6135 preg->translate |
|
f29b13c2cefd
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard Stallman <rms@gnu.org>
parents:
490
diff
changeset
|
6136 = (RE_TRANSLATE_TYPE) malloc (CHAR_SET_SIZE |
|
f29b13c2cefd
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard Stallman <rms@gnu.org>
parents:
490
diff
changeset
|
6137 * 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
|
6138 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
|
6139 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
|
6140 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6141 /* 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
|
6142 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
|
6143 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
|
6144 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6145 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
|
6146 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
|
6147 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6148 /* 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
|
6149 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
|
6150 { /* 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
|
6151 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
|
6152 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
|
6153 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6154 else |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
6155 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
|
6156 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6157 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
|
6158 |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
6159 /* 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
|
6160 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
|
6161 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
|
6162 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6163 /* 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
|
6164 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
|
6165 if (ret == REG_ERPAREN) |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
6166 ret = REG_EPAREN; |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
6167 |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
6168 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
|
6169 { /* 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
|
6170 buffer. */ |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
6171 re_compile_fastmap (preg); |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
6172 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
|
6173 { /* 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
|
6174 free (preg->fastmap); |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
6175 preg->fastmap = NULL; |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
6176 } |
|
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
6177 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6178 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
|
6179 } |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
6180 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
|
6181 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6182 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6183 /* 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
|
6184 string STRING. |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
6185 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6186 If NMATCH is zero or REG_NOSUB was set in the cflags argument to |
| 939 | 6187 `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
|
6188 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
|
6189 corresponding matched substrings. |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
6190 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6191 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
|
6192 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
|
6193 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
|
6194 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6195 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
|
6196 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6197 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
|
6198 regexec (preg, string, nmatch, pmatch, eflags) |
|
3581
68530c9df63a
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3544
diff
changeset
|
6199 const regex_t *__restrict preg; |
|
68530c9df63a
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
3544
diff
changeset
|
6200 const char *__restrict string; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
6201 size_t nmatch; |
| 3969 | 6202 regmatch_t pmatch[__restrict_arr]; |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6203 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
|
6204 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6205 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
|
6206 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
|
6207 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
|
6208 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
|
6209 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
|
6210 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6211 private_preg = *preg; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
6212 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6213 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
|
6214 private_preg.not_eol = !!(eflags & REG_NOTEOL); |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
6215 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6216 /* 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
|
6217 information about, via `nmatch'. We have to pass that on to the |
| 939 | 6218 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
|
6219 private_preg.regs_allocated = REGS_FIXED; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
6220 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6221 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
|
6222 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6223 regs.num_regs = nmatch; |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
6224 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
|
6225 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
|
6226 return (int) REG_NOMATCH; |
|
2848
99ba697d0902
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2841
diff
changeset
|
6227 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
|
6228 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6229 |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
6230 /* 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
|
6231 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
|
6232 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
|
6233 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
|
6234 '\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
|
6235 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
|
6236 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
|
6237 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
|
6238 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6239 /* 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
|
6240 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
|
6241 /* 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
|
6242 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
|
6243 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6244 /* 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
|
6245 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
|
6246 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6247 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
|
6248 { |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
6249 unsigned r; |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
6250 |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
6251 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
|
6252 { |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
6253 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
|
6254 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
|
6255 } |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
6256 } |
| 939 | 6257 |
| 6258 /* 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
|
6259 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
|
6260 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6261 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6262 /* 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
|
6263 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
|
6264 } |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
6265 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
|
6266 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6267 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6268 /* 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
|
6269 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
|
6270 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6271 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
|
6272 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
|
6273 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
|
6274 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
|
6275 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
|
6276 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
|
6277 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6278 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
|
6279 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
|
6280 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6281 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
|
6282 || 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
|
6283 /* Only error codes returned by the rest of the code should be passed |
| 939 | 6284 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
|
6285 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
|
6286 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
|
6287 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
|
6288 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6289 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
|
6290 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6291 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
|
6292 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6293 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
|
6294 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6295 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
|
6296 { |
|
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
6297 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
|
6298 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
|
6299 } |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6300 else |
|
2841
a19cab2eaa6d
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2828
diff
changeset
|
6301 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
|
6302 } |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6303 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6304 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
|
6305 } |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
6306 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
|
6307 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6308 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6309 /* 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
|
6310 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6311 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
|
6312 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
|
6313 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
|
6314 { |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6315 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
|
6316 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
|
6317 preg->buffer = NULL; |
|
515
69ba3b63e1d1
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
511
diff
changeset
|
6318 |
|
441
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6319 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
|
6320 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
|
6321 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6322 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
|
6323 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
|
6324 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
|
6325 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
|
6326 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6327 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
|
6328 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
|
6329 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
|
6330 } |
|
2849
a7cffadea321
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
2848
diff
changeset
|
6331 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
|
6332 |
|
403b2dfdfa0b
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
438
diff
changeset
|
6333 #endif /* not emacs */ |