Mercurial > emacs
annotate src/regex.c @ 42229:0340f1accfdf
Fix last change.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Fri, 21 Dec 2001 12:29:36 +0000 |
parents | ded4aa3c81b2 |
children | fd6c1f8ebd4e 06da178fab0e |
rev | line source |
---|---|
16010 | 1 /* Extended regular expression matching and search library, version |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
2 0.12. (Implements POSIX draft P1003.2/D11.2, except for some of the |
1155 | 3 internationalization features.) |
4 | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
5 Copyright (C) 1993,94,95,96,97,98,99,2000 Free Software Foundation, Inc. |
1155 | 6 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
7 This program is free software; you can redistribute it and/or modify |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
8 it under the terms of the GNU General Public License as published by |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
9 the Free Software Foundation; either version 2, or (at your option) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
10 any later version. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
11 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
12 This program is distributed in the hope that it will be useful, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
13 but WITHOUT ANY WARRANTY; without even the implied warranty of |
18262 | 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
15 GNU General Public License for more details. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
16 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
17 You should have received a copy of the GNU General Public License |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
18 along with this program; if not, write to the Free Software |
14414 | 19 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
18262 | 20 USA. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
21 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
22 /* TODO: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
23 - structure the opcode space into opcode+flag. |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
24 - merge with glibc's regex.[ch]. |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
25 - replace (succeed_n + jump_n + set_number_at) with something that doesn't |
32954
f77e6c51dd07
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32891
diff
changeset
|
26 need to modify the compiled regexp so that re_match can be reentrant. |
f77e6c51dd07
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32891
diff
changeset
|
27 - get rid of on_failure_jump_smart by doing the optimization in re_comp |
f77e6c51dd07
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32891
diff
changeset
|
28 rather than at run-time, so that re_match can be reentrant. |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
29 */ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
30 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
31 /* AIX requires this to be the first thing in the file. */ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
32 #if defined _AIX && !defined REGEX_MALLOC |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
33 #pragma alloca |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
34 #endif |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
35 |
13517
e50cebfd1d7a
(NUM_FAILURE_ITEMS, POP_FAILURE_POINT, PUSH_FAILURE_POINT):
Richard M. Stallman <rms@gnu.org>
parents:
13323
diff
changeset
|
36 #undef _GNU_SOURCE |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
37 #define _GNU_SOURCE |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
38 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
39 #ifdef HAVE_CONFIG_H |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
40 # include <config.h> |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
41 #endif |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
42 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
43 #if defined STDC_HEADERS && !defined emacs |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
44 # include <stddef.h> |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
45 #else |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
46 /* We need this for `regex.h', and perhaps for the Emacs include files. */ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
47 # include <sys/types.h> |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
48 #endif |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
49 |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
50 /* Whether to use ISO C Amendment 1 wide char functions. |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
51 Those should not be used for Emacs since it uses its own. */ |
39718
287021d71c8a
(WIDE_CHAR_SUPPORT): Do not use defined() in macro.
Gerd Moellmann <gerd@gnu.org>
parents:
37705
diff
changeset
|
52 #if defined _LIBC |
287021d71c8a
(WIDE_CHAR_SUPPORT): Do not use defined() in macro.
Gerd Moellmann <gerd@gnu.org>
parents:
37705
diff
changeset
|
53 #define WIDE_CHAR_SUPPORT 1 |
287021d71c8a
(WIDE_CHAR_SUPPORT): Do not use defined() in macro.
Gerd Moellmann <gerd@gnu.org>
parents:
37705
diff
changeset
|
54 #else |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
55 #define WIDE_CHAR_SUPPORT \ |
39718
287021d71c8a
(WIDE_CHAR_SUPPORT): Do not use defined() in macro.
Gerd Moellmann <gerd@gnu.org>
parents:
37705
diff
changeset
|
56 (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC && !emacs) |
287021d71c8a
(WIDE_CHAR_SUPPORT): Do not use defined() in macro.
Gerd Moellmann <gerd@gnu.org>
parents:
37705
diff
changeset
|
57 #endif |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
58 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
59 /* For platform which support the ISO C amendement 1 functionality we |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
60 support user defined character classes. */ |
32499
3a5e6f70d313
(WIDE_CHAR_SUPPORT): Define if _LIBC as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31729
diff
changeset
|
61 #if WIDE_CHAR_SUPPORT |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
62 /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */ |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
63 # include <wchar.h> |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
64 # include <wctype.h> |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
65 #endif |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
66 |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
67 #ifdef _LIBC |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
68 /* We have to keep the namespace clean. */ |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
69 # define regfree(preg) __regfree (preg) |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
70 # define regexec(pr, st, nm, pm, ef) __regexec (pr, st, nm, pm, ef) |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
71 # define regcomp(preg, pattern, cflags) __regcomp (preg, pattern, cflags) |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
72 # define regerror(errcode, preg, errbuf, errbuf_size) \ |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
73 __regerror(errcode, preg, errbuf, errbuf_size) |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
74 # define re_set_registers(bu, re, nu, st, en) \ |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
75 __re_set_registers (bu, re, nu, st, en) |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
76 # define re_match_2(bufp, string1, size1, string2, size2, pos, regs, stop) \ |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
77 __re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
78 # define re_match(bufp, string, size, pos, regs) \ |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
79 __re_match (bufp, string, size, pos, regs) |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
80 # define re_search(bufp, string, size, startpos, range, regs) \ |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
81 __re_search (bufp, string, size, startpos, range, regs) |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
82 # define re_compile_pattern(pattern, length, bufp) \ |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
83 __re_compile_pattern (pattern, length, bufp) |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
84 # define re_set_syntax(syntax) __re_set_syntax (syntax) |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
85 # define re_search_2(bufp, st1, s1, st2, s2, startpos, range, regs, stop) \ |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
86 __re_search_2 (bufp, st1, s1, st2, s2, startpos, range, regs, stop) |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
87 # define re_compile_fastmap(bufp) __re_compile_fastmap (bufp) |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
88 |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
89 /* Make sure we call libc's function even if the user overrides them. */ |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
90 # define btowc __btowc |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
91 # define iswctype __iswctype |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
92 # define wctype __wctype |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
93 |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
94 # define WEAK_ALIAS(a,b) weak_alias (a, b) |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
95 |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
96 /* We are also using some library internals. */ |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
97 # include <locale/localeinfo.h> |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
98 # include <locale/elem-hash.h> |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
99 # include <langinfo.h> |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
100 #else |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
101 # define WEAK_ALIAS(a,b) |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
102 #endif |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
103 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
104 /* This is for other GNU distributions with internationalized messages. */ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
105 #if HAVE_LIBINTL_H || defined _LIBC |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
106 # include <libintl.h> |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
107 #else |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
108 # define gettext(msgid) (msgid) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
109 #endif |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
110 |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
111 #ifndef gettext_noop |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
112 /* This define is so xgettext can find the internationalizable |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
113 strings. */ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
114 # define gettext_noop(String) String |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
115 #endif |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
116 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
117 /* The `emacs' switch turns on certain matching commands |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
118 that make sense only in Emacs. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
119 #ifdef emacs |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
120 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
121 # include "lisp.h" |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
122 # include "buffer.h" |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
123 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
124 /* Make syntax table lookup grant data in gl_state. */ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
125 # define SYNTAX_ENTRY_VIA_PROPERTY |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
126 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
127 # include "syntax.h" |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
128 # include "charset.h" |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
129 # include "category.h" |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
130 |
37705
a8725acacca5
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
35533
diff
changeset
|
131 # ifdef malloc |
a8725acacca5
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
35533
diff
changeset
|
132 # undef malloc |
a8725acacca5
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
35533
diff
changeset
|
133 # endif |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
134 # define malloc xmalloc |
37705
a8725acacca5
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
35533
diff
changeset
|
135 # ifdef realloc |
a8725acacca5
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
35533
diff
changeset
|
136 # undef realloc |
a8725acacca5
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
35533
diff
changeset
|
137 # endif |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
138 # define realloc xrealloc |
37705
a8725acacca5
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
35533
diff
changeset
|
139 # ifdef free |
a8725acacca5
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
35533
diff
changeset
|
140 # undef free |
a8725acacca5
(malloc, realloc, free) [emacs]: Undefine before
Eli Zaretskii <eliz@gnu.org>
parents:
35533
diff
changeset
|
141 # endif |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
142 # define free xfree |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
143 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
144 /* Converts the pointer to the char to BEG-based offset from the start. */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
145 # define PTR_TO_OFFSET(d) POS_AS_IN_BUFFER (POINTER_TO_OFFSET (d)) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
146 # define POS_AS_IN_BUFFER(p) ((p) + (NILP (re_match_object) || BUFFERP (re_match_object))) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
147 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
148 # define RE_MULTIBYTE_P(bufp) ((bufp)->multibyte) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
149 # define RE_STRING_CHAR(p, s) \ |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
150 (multibyte ? (STRING_CHAR (p, s)) : (*(p))) |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
151 # define RE_STRING_CHAR_AND_LENGTH(p, s, len) \ |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
152 (multibyte ? (STRING_CHAR_AND_LENGTH (p, s, len)) : ((len) = 1, *(p))) |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
153 |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
154 /* Set C a (possibly multibyte) character before P. P points into a |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
155 string which is the virtual concatenation of STR1 (which ends at |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
156 END1) or STR2 (which ends at END2). */ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
157 # define GET_CHAR_BEFORE_2(c, p, str1, end1, str2, end2) \ |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
158 do { \ |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
159 if (multibyte) \ |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
160 { \ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
161 re_char *dtemp = (p) == (str2) ? (end1) : (p); \ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
162 re_char *dlimit = ((p) > (str2) && (p) <= (end2)) ? (str2) : (str1); \ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
163 while (dtemp-- > dlimit && !CHAR_HEAD_P (*dtemp)); \ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
164 c = STRING_CHAR (dtemp, (p) - dtemp); \ |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
165 } \ |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
166 else \ |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
167 (c = ((p) == (str2) ? (end1) : (p))[-1]); \ |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
168 } while (0) |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
169 |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
170 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
171 #else /* not emacs */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
172 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
173 /* If we are not linking with Emacs proper, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
174 we can't use the relocating allocator |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
175 even if config.h says that we can. */ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
176 # undef REL_ALLOC |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
177 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
178 # if defined STDC_HEADERS || defined _LIBC |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
179 # include <stdlib.h> |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
180 # else |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
181 char *malloc (); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
182 char *realloc (); |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
183 # endif |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
184 |
12065
094636c759bf
Undefined INHIBIT_STRING_HEADER when we have no
Karl Heuer <kwzh@gnu.org>
parents:
11974
diff
changeset
|
185 /* When used in Emacs's lib-src, we need to get bzero and bcopy somehow. |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
186 If nothing else has been done, use the method below. */ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
187 # ifdef INHIBIT_STRING_HEADER |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
188 # if !(defined HAVE_BZERO && defined HAVE_BCOPY) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
189 # if !defined bzero && !defined bcopy |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
190 # undef INHIBIT_STRING_HEADER |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
191 # endif |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
192 # endif |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
193 # endif |
12065
094636c759bf
Undefined INHIBIT_STRING_HEADER when we have no
Karl Heuer <kwzh@gnu.org>
parents:
11974
diff
changeset
|
194 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
195 /* This is the normal way of making sure we have memcpy, memcmp and bzero. |
12065
094636c759bf
Undefined INHIBIT_STRING_HEADER when we have no
Karl Heuer <kwzh@gnu.org>
parents:
11974
diff
changeset
|
196 This is used in most programs--a few other programs avoid this |
094636c759bf
Undefined INHIBIT_STRING_HEADER when we have no
Karl Heuer <kwzh@gnu.org>
parents:
11974
diff
changeset
|
197 by defining INHIBIT_STRING_HEADER. */ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
198 # ifndef INHIBIT_STRING_HEADER |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
199 # if defined HAVE_STRING_H || defined STDC_HEADERS || defined _LIBC |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
200 # include <string.h> |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
201 # ifndef bzero |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
202 # ifndef _LIBC |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
203 # define bzero(s, n) (memset (s, '\0', n), (s)) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
204 # else |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
205 # define bzero(s, n) __bzero (s, n) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
206 # endif |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
207 # endif |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
208 # else |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
209 # include <strings.h> |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
210 # ifndef memcmp |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
211 # define memcmp(s1, s2, n) bcmp (s1, s2, n) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
212 # endif |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
213 # ifndef memcpy |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
214 # define memcpy(d, s, n) (bcopy (s, d, n), (d)) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
215 # endif |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
216 # endif |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
217 # endif |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
218 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
219 /* Define the syntax stuff for \<, \>, etc. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
220 |
28279
24a23e27dac6
(enum syntaxcode): Provide default for non-Emacs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28268
diff
changeset
|
221 /* Sword must be nonzero for the wordchar pattern commands in re_match_2. */ |
24a23e27dac6
(enum syntaxcode): Provide default for non-Emacs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28268
diff
changeset
|
222 enum syntaxcode { Swhitespace = 0, Sword = 1 }; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
223 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
224 # ifdef SWITCH_ENUM_BUG |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
225 # define SWITCH_ENUM_CAST(x) ((int)(x)) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
226 # else |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
227 # define SWITCH_ENUM_CAST(x) (x) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
228 # endif |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
229 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
230 /* Dummy macros for non-Emacs environments. */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
231 # define BASE_LEADING_CODE_P(c) (0) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
232 # define CHAR_CHARSET(c) 0 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
233 # define CHARSET_LEADING_CODE_BASE(c) 0 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
234 # define MAX_MULTIBYTE_LENGTH 1 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
235 # define RE_MULTIBYTE_P(x) 0 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
236 # define WORD_BOUNDARY_P(c1, c2) (0) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
237 # define CHAR_HEAD_P(p) (1) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
238 # define SINGLE_BYTE_CHAR_P(c) (1) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
239 # define SAME_CHARSET_P(c1, c2) (1) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
240 # define MULTIBYTE_FORM_LENGTH(p, s) (1) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
241 # define STRING_CHAR(p, s) (*(p)) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
242 # define RE_STRING_CHAR STRING_CHAR |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
243 # define CHAR_STRING(c, s) (*(s) = (c), 1) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
244 # define STRING_CHAR_AND_LENGTH(p, s, actual_len) ((actual_len) = 1, *(p)) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
245 # define RE_STRING_CHAR_AND_LENGTH STRING_CHAR_AND_LENGTH |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
246 # define GET_CHAR_BEFORE_2(c, p, str1, end1, str2, end2) \ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
247 (c = ((p) == (str2) ? *((end1) - 1) : *((p) - 1))) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
248 # define MAKE_CHAR(charset, c1, c2) (c1) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
249 #endif /* not emacs */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
250 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
251 #ifndef RE_TRANSLATE |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
252 # define RE_TRANSLATE(TBL, C) ((unsigned char)(TBL)[C]) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
253 # define RE_TRANSLATE_P(TBL) (TBL) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
254 #endif |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
255 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
256 /* Get the interface, including the syntax bits. */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
257 #include "regex.h" |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
258 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
259 /* isalpha etc. are used for the character classes. */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
260 #include <ctype.h> |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
261 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
262 #ifdef emacs |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
263 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
264 /* 1 if C is an ASCII character. */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
265 # define IS_REAL_ASCII(c) ((c) < 0200) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
266 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
267 /* 1 if C is a unibyte character. */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
268 # define ISUNIBYTE(c) (SINGLE_BYTE_CHAR_P ((c))) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
269 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
270 /* The Emacs definitions should not be directly affected by locales. */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
271 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
272 /* In Emacs, these are only used for single-byte characters. */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
273 # define ISDIGIT(c) ((c) >= '0' && (c) <= '9') |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
274 # define ISCNTRL(c) ((c) < ' ') |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
275 # define ISXDIGIT(c) (((c) >= '0' && (c) <= '9') \ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
276 || ((c) >= 'a' && (c) <= 'f') \ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
277 || ((c) >= 'A' && (c) <= 'F')) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
278 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
279 /* This is only used for single-byte characters. */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
280 # define ISBLANK(c) ((c) == ' ' || (c) == '\t') |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
281 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
282 /* The rest must handle multibyte characters. */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
283 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
284 # define ISGRAPH(c) (SINGLE_BYTE_CHAR_P (c) \ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
285 ? (c) > ' ' && !((c) >= 0177 && (c) <= 0237) \ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
286 : 1) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
287 |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
288 # define ISPRINT(c) (SINGLE_BYTE_CHAR_P (c) \ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
289 ? (c) >= ' ' && !((c) >= 0177 && (c) <= 0237) \ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
290 : 1) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
291 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
292 # define ISALNUM(c) (IS_REAL_ASCII (c) \ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
293 ? (((c) >= 'a' && (c) <= 'z') \ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
294 || ((c) >= 'A' && (c) <= 'Z') \ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
295 || ((c) >= '0' && (c) <= '9')) \ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
296 : SYNTAX (c) == Sword) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
297 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
298 # define ISALPHA(c) (IS_REAL_ASCII (c) \ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
299 ? (((c) >= 'a' && (c) <= 'z') \ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
300 || ((c) >= 'A' && (c) <= 'Z')) \ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
301 : SYNTAX (c) == Sword) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
302 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
303 # define ISLOWER(c) (LOWERCASEP (c)) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
304 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
305 # define ISPUNCT(c) (IS_REAL_ASCII (c) \ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
306 ? ((c) > ' ' && (c) < 0177 \ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
307 && !(((c) >= 'a' && (c) <= 'z') \ |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
308 || ((c) >= 'A' && (c) <= 'Z') \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
309 || ((c) >= '0' && (c) <= '9'))) \ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
310 : SYNTAX (c) != Sword) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
311 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
312 # define ISSPACE(c) (SYNTAX (c) == Swhitespace) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
313 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
314 # define ISUPPER(c) (UPPERCASEP (c)) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
315 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
316 # define ISWORD(c) (SYNTAX (c) == Sword) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
317 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
318 #else /* not emacs */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
319 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
320 /* Jim Meyering writes: |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
321 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
322 "... Some ctype macros are valid only for character codes that |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
323 isascii says are ASCII (SGI's IRIX-4.0.5 is one such system --when |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
324 using /bin/cc or gcc but without giving an ansi option). So, all |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
325 ctype uses should be through macros like ISPRINT... If |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
326 STDC_HEADERS is defined, then autoconf has verified that the ctype |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
327 macros don't need to be guarded with references to isascii. ... |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
328 Defining isascii to 1 should let any compiler worth its salt |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
329 eliminate the && through constant folding." |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
330 Solaris defines some of these symbols so we must undefine them first. */ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
331 |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
332 # undef ISASCII |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
333 # if defined STDC_HEADERS || (!defined isascii && !defined HAVE_ISASCII) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
334 # define ISASCII(c) 1 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
335 # else |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
336 # define ISASCII(c) isascii(c) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
337 # endif |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
338 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
339 /* 1 if C is an ASCII character. */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
340 # define IS_REAL_ASCII(c) ((c) < 0200) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
341 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
342 /* This distinction is not meaningful, except in Emacs. */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
343 # define ISUNIBYTE(c) 1 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
344 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
345 # ifdef isblank |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
346 # define ISBLANK(c) (ISASCII (c) && isblank (c)) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
347 # else |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
348 # define ISBLANK(c) ((c) == ' ' || (c) == '\t') |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
349 # endif |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
350 # ifdef isgraph |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
351 # define ISGRAPH(c) (ISASCII (c) && isgraph (c)) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
352 # else |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
353 # define ISGRAPH(c) (ISASCII (c) && isprint (c) && !isspace (c)) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
354 # endif |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
355 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
356 # undef ISPRINT |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
357 # define ISPRINT(c) (ISASCII (c) && isprint (c)) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
358 # define ISDIGIT(c) (ISASCII (c) && isdigit (c)) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
359 # define ISALNUM(c) (ISASCII (c) && isalnum (c)) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
360 # define ISALPHA(c) (ISASCII (c) && isalpha (c)) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
361 # define ISCNTRL(c) (ISASCII (c) && iscntrl (c)) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
362 # define ISLOWER(c) (ISASCII (c) && islower (c)) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
363 # define ISPUNCT(c) (ISASCII (c) && ispunct (c)) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
364 # define ISSPACE(c) (ISASCII (c) && isspace (c)) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
365 # define ISUPPER(c) (ISASCII (c) && isupper (c)) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
366 # define ISXDIGIT(c) (ISASCII (c) && isxdigit (c)) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
367 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
368 # define ISWORD(c) ISALPHA(c) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
369 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
370 # ifdef _tolower |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
371 # define TOLOWER(c) _tolower(c) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
372 # else |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
373 # define TOLOWER(c) tolower(c) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
374 # endif |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
375 |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
376 /* How many characters in the character set. */ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
377 # define CHAR_SET_SIZE 256 |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
378 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
379 # ifdef SYNTAX_TABLE |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
380 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
381 extern char *re_syntax_table; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
382 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
383 # else /* not SYNTAX_TABLE */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
384 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
385 static char re_syntax_table[CHAR_SET_SIZE]; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
386 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
387 static void |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
388 init_syntax_once () |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
389 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
390 register int c; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
391 static int done = 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
392 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
393 if (done) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
394 return; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
395 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
396 bzero (re_syntax_table, sizeof re_syntax_table); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
397 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
398 for (c = 0; c < CHAR_SET_SIZE; ++c) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
399 if (ISALNUM (c)) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
400 re_syntax_table[c] = Sword; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
401 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
402 re_syntax_table['_'] = Sword; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
403 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
404 done = 1; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
405 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
406 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
407 # endif /* not SYNTAX_TABLE */ |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
408 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
409 # define SYNTAX(c) re_syntax_table[(c)] |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
410 |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
411 #endif /* not emacs */ |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
412 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
413 #ifndef NULL |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
414 # define NULL (void *)0 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
415 #endif |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
416 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
417 /* We remove any previous definition of `SIGN_EXTEND_CHAR', |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
418 since ours (we hope) works properly with all combinations of |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
419 machines, compilers, `char' and `unsigned char' argument types. |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
420 (Per Bothner suggested the basic approach.) */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
421 #undef SIGN_EXTEND_CHAR |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
422 #if __STDC__ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
423 # define SIGN_EXTEND_CHAR(c) ((signed char) (c)) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
424 #else /* not __STDC__ */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
425 /* As in Harbison and Steele. */ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
426 # define SIGN_EXTEND_CHAR(c) ((((unsigned char) (c)) ^ 128) - 128) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
427 #endif |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
428 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
429 /* Should we use malloc or alloca? If REGEX_MALLOC is not defined, we |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
430 use `alloca' instead of `malloc'. This is because using malloc in |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
431 re_search* or re_match* could cause memory leaks when C-g is used in |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
432 Emacs; also, malloc is slower and causes storage fragmentation. On |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
433 the other hand, malloc is more portable, and easier to debug. |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
434 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
435 Because we sometimes use alloca, some routines have to be macros, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
436 not functions -- `alloca'-allocated space disappears at the end of the |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
437 function it is called in. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
438 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
439 #ifdef REGEX_MALLOC |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
440 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
441 # define REGEX_ALLOCATE malloc |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
442 # define REGEX_REALLOCATE(source, osize, nsize) realloc (source, nsize) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
443 # define REGEX_FREE free |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
444 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
445 #else /* not REGEX_MALLOC */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
446 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
447 /* Emacs already defines alloca, sometimes. */ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
448 # ifndef alloca |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
449 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
450 /* Make alloca work the best possible way. */ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
451 # ifdef __GNUC__ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
452 # define alloca __builtin_alloca |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
453 # else /* not __GNUC__ */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
454 # if HAVE_ALLOCA_H |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
455 # include <alloca.h> |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
456 # endif /* HAVE_ALLOCA_H */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
457 # endif /* not __GNUC__ */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
458 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
459 # endif /* not alloca */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
460 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
461 # define REGEX_ALLOCATE alloca |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
462 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
463 /* Assumes a `char *destination' variable. */ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
464 # define REGEX_REALLOCATE(source, osize, nsize) \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
465 (destination = (char *) alloca (nsize), \ |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
466 memcpy (destination, source, osize)) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
467 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
468 /* No need to do anything to free, after alloca. */ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
469 # define REGEX_FREE(arg) ((void)0) /* Do nothing! But inhibit gcc warning. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
470 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
471 #endif /* not REGEX_MALLOC */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
472 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
473 /* Define how to allocate the failure stack. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
474 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
475 #if defined REL_ALLOC && defined REGEX_MALLOC |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
476 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
477 # define REGEX_ALLOCATE_STACK(size) \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
478 r_alloc (&failure_stack_ptr, (size)) |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
479 # define REGEX_REALLOCATE_STACK(source, osize, nsize) \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
480 r_re_alloc (&failure_stack_ptr, (nsize)) |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
481 # define REGEX_FREE_STACK(ptr) \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
482 r_alloc_free (&failure_stack_ptr) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
483 |
12478
533b6d02cf04
Don't use relocatable allocator.
Richard M. Stallman <rms@gnu.org>
parents:
12331
diff
changeset
|
484 #else /* not using relocating allocator */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
485 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
486 # ifdef REGEX_MALLOC |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
487 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
488 # define REGEX_ALLOCATE_STACK malloc |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
489 # define REGEX_REALLOCATE_STACK(source, osize, nsize) realloc (source, nsize) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
490 # define REGEX_FREE_STACK free |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
491 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
492 # else /* not REGEX_MALLOC */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
493 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
494 # define REGEX_ALLOCATE_STACK alloca |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
495 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
496 # define REGEX_REALLOCATE_STACK(source, osize, nsize) \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
497 REGEX_REALLOCATE (source, osize, nsize) |
18262 | 498 /* No need to explicitly free anything. */ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
499 # define REGEX_FREE_STACK(arg) ((void)0) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
500 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
501 # endif /* not REGEX_MALLOC */ |
12478
533b6d02cf04
Don't use relocatable allocator.
Richard M. Stallman <rms@gnu.org>
parents:
12331
diff
changeset
|
502 #endif /* not using relocating allocator */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
503 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
504 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
505 /* True if `size1' is non-NULL and PTR is pointing anywhere inside |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
506 `string1' or just past its end. This works if PTR is NULL, which is |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
507 a good thing. */ |
18262 | 508 #define FIRST_STRING_P(ptr) \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
509 (size1 && string1 <= (ptr) && (ptr) <= string1 + size1) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
510 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
511 /* (Re)Allocate N items of type T using malloc, or fail. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
512 #define TALLOC(n, t) ((t *) malloc ((n) * sizeof (t))) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
513 #define RETALLOC(addr, n, t) ((addr) = (t *) realloc (addr, (n) * sizeof (t))) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
514 #define RETALLOC_IF(addr, n, t) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
515 if (addr) RETALLOC((addr), (n), t); else (addr) = TALLOC ((n), t) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
516 #define REGEX_TALLOC(n, t) ((t *) REGEX_ALLOCATE ((n) * sizeof (t))) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
517 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
518 #define BYTEWIDTH 8 /* In bits. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
519 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
520 #define STREQ(s1, s2) ((strcmp (s1, s2) == 0)) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
521 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
522 #undef MAX |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
523 #undef MIN |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
524 #define MAX(a, b) ((a) > (b) ? (a) : (b)) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
525 #define MIN(a, b) ((a) < (b) ? (a) : (b)) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
526 |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
527 /* Type of source-pattern and string chars. */ |
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
528 typedef const unsigned char re_char; |
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
529 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
530 typedef char boolean; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
531 #define false 0 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
532 #define true 1 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
533 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
534 static int re_match_2_internal _RE_ARGS ((struct re_pattern_buffer *bufp, |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
535 re_char *string1, int size1, |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
536 re_char *string2, int size2, |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
537 int pos, |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
538 struct re_registers *regs, |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
539 int stop)); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
540 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
541 /* These are the command codes that appear in compiled regular |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
542 expressions. Some opcodes are followed by argument bytes. A |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
543 command code can specify any interpretation whatsoever for its |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
544 arguments. Zero bytes may appear in the compiled regular expression. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
545 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
546 typedef enum |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
547 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
548 no_op = 0, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
549 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
550 /* Succeed right away--no more backtracking. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
551 succeed, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
552 |
18262 | 553 /* Followed by one byte giving n, then by n literal bytes. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
554 exactn, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
555 |
18262 | 556 /* Matches any (more or less) character. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
557 anychar, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
558 |
18262 | 559 /* Matches any one char belonging to specified set. First |
560 following byte is number of bitmap bytes. Then come bytes | |
561 for a bitmap saying which chars are in. Bits in each byte | |
562 are ordered low-bit-first. A character is in the set if its | |
563 bit is 1. A character too large to have a bit in the map is | |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
564 automatically not in the set. |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
565 |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
566 If the length byte has the 0x80 bit set, then that stuff |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
567 is followed by a range table: |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
568 2 bytes of flags for character sets (low 8 bits, high 8 bits) |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
569 See RANGE_TABLE_WORK_BITS below. |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
570 2 bytes, the number of pairs that follow (upto 32767) |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
571 pairs, each 2 multibyte characters, |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
572 each multibyte character represented as 3 bytes. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
573 charset, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
574 |
18262 | 575 /* Same parameters as charset, but match any character that is |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
576 not one of those specified. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
577 charset_not, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
578 |
18262 | 579 /* Start remembering the text that is matched, for storing in a |
580 register. Followed by one byte with the register number, in | |
581 the range 0 to one less than the pattern buffer's re_nsub | |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
582 field. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
583 start_memory, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
584 |
18262 | 585 /* Stop remembering the text that is matched and store it in a |
586 memory register. Followed by one byte with the register | |
587 number, in the range 0 to one less than `re_nsub' in the | |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
588 pattern buffer. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
589 stop_memory, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
590 |
18262 | 591 /* Match a duplicate of something remembered. Followed by one |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
592 byte containing the register number. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
593 duplicate, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
594 |
18262 | 595 /* Fail unless at beginning of line. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
596 begline, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
597 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
598 /* Fail unless at end of line. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
599 endline, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
600 |
18262 | 601 /* Succeeds if at beginning of buffer (if emacs) or at beginning |
602 of string to be matched (if not). */ | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
603 begbuf, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
604 |
18262 | 605 /* Analogously, for end of buffer/string. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
606 endbuf, |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
607 |
18262 | 608 /* Followed by two byte relative address to which to jump. */ |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
609 jump, |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
610 |
18262 | 611 /* Followed by two-byte relative address of place to resume at |
612 in case of failure. */ | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
613 on_failure_jump, |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
614 |
18262 | 615 /* Like on_failure_jump, but pushes a placeholder instead of the |
616 current string position when executed. */ | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
617 on_failure_keep_string_jump, |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
618 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
619 /* Just like `on_failure_jump', except that it checks that we |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
620 don't get stuck in an infinite loop (matching an empty string |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
621 indefinitely). */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
622 on_failure_jump_loop, |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
623 |
28342
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
624 /* Just like `on_failure_jump_loop', except that it checks for |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
625 a different kind of loop (the kind that shows up with non-greedy |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
626 operators). This operation has to be immediately preceded |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
627 by a `no_op'. */ |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
628 on_failure_jump_nastyloop, |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
629 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
630 /* A smart `on_failure_jump' used for greedy * and + operators. |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
631 It analyses the loop before which it is put and if the |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
632 loop does not require backtracking, it changes itself to |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
633 `on_failure_keep_string_jump' and short-circuits the loop, |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
634 else it just defaults to changing itself into `on_failure_jump'. |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
635 It assumes that it is pointing to just past a `jump'. */ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
636 on_failure_jump_smart, |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
637 |
18262 | 638 /* Followed by two-byte relative address and two-byte number n. |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
639 After matching N times, jump to the address upon failure. |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
640 Does not work if N starts at 0: use on_failure_jump_loop |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
641 instead. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
642 succeed_n, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
643 |
18262 | 644 /* Followed by two-byte relative address, and two-byte number n. |
645 Jump to the address N times, then fail. */ | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
646 jump_n, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
647 |
18262 | 648 /* Set the following two-byte relative address to the |
649 subsequent two-byte number. The address *includes* the two | |
650 bytes of number. */ | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
651 set_number_at, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
652 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
653 wordbeg, /* Succeeds if at word beginning. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
654 wordend, /* Succeeds if at word end. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
655 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
656 wordbound, /* Succeeds if at a word boundary. */ |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
657 notwordbound, /* Succeeds if not at a word boundary. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
658 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
659 /* Matches any character whose syntax is specified. Followed by |
18262 | 660 a byte which contains a syntax code, e.g., Sword. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
661 syntaxspec, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
662 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
663 /* Matches any character whose syntax is not that specified. */ |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
664 notsyntaxspec |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
665 |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
666 #ifdef emacs |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
667 ,before_dot, /* Succeeds if before point. */ |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
668 at_dot, /* Succeeds if at point. */ |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
669 after_dot, /* Succeeds if after point. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
670 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
671 /* Matches any character whose category-set contains the specified |
18262 | 672 category. The operator is followed by a byte which contains a |
673 category code (mnemonic ASCII character). */ | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
674 categoryspec, |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
675 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
676 /* Matches any character whose category-set does not contain the |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
677 specified category. The operator is followed by a byte which |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
678 contains the category code (mnemonic ASCII character). */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
679 notcategoryspec |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
680 #endif /* emacs */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
681 } re_opcode_t; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
682 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
683 /* Common operations on the compiled pattern. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
684 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
685 /* Store NUMBER in two contiguous bytes starting at DESTINATION. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
686 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
687 #define STORE_NUMBER(destination, number) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
688 do { \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
689 (destination)[0] = (number) & 0377; \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
690 (destination)[1] = (number) >> 8; \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
691 } while (0) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
692 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
693 /* Same as STORE_NUMBER, except increment DESTINATION to |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
694 the byte after where the number is stored. Therefore, DESTINATION |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
695 must be an lvalue. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
696 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
697 #define STORE_NUMBER_AND_INCR(destination, number) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
698 do { \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
699 STORE_NUMBER (destination, number); \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
700 (destination) += 2; \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
701 } while (0) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
702 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
703 /* Put into DESTINATION a number stored in two contiguous bytes starting |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
704 at SOURCE. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
705 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
706 #define EXTRACT_NUMBER(destination, source) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
707 do { \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
708 (destination) = *(source) & 0377; \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
709 (destination) += SIGN_EXTEND_CHAR (*((source) + 1)) << 8; \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
710 } while (0) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
711 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
712 #ifdef DEBUG |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
713 static void extract_number _RE_ARGS ((int *dest, re_char *source)); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
714 static void |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
715 extract_number (dest, source) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
716 int *dest; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
717 re_char *source; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
718 { |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
719 int temp = SIGN_EXTEND_CHAR (*(source + 1)); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
720 *dest = *source & 0377; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
721 *dest += temp << 8; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
722 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
723 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
724 # ifndef EXTRACT_MACROS /* To debug the macros. */ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
725 # undef EXTRACT_NUMBER |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
726 # define EXTRACT_NUMBER(dest, src) extract_number (&dest, src) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
727 # endif /* not EXTRACT_MACROS */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
728 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
729 #endif /* DEBUG */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
730 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
731 /* Same as EXTRACT_NUMBER, except increment SOURCE to after the number. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
732 SOURCE must be an lvalue. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
733 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
734 #define EXTRACT_NUMBER_AND_INCR(destination, source) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
735 do { \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
736 EXTRACT_NUMBER (destination, source); \ |
18262 | 737 (source) += 2; \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
738 } while (0) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
739 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
740 #ifdef DEBUG |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
741 static void extract_number_and_incr _RE_ARGS ((int *destination, |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
742 re_char **source)); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
743 static void |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
744 extract_number_and_incr (destination, source) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
745 int *destination; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
746 re_char **source; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
747 { |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
748 extract_number (destination, *source); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
749 *source += 2; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
750 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
751 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
752 # ifndef EXTRACT_MACROS |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
753 # undef EXTRACT_NUMBER_AND_INCR |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
754 # define EXTRACT_NUMBER_AND_INCR(dest, src) \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
755 extract_number_and_incr (&dest, &src) |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
756 # endif /* not EXTRACT_MACROS */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
757 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
758 #endif /* DEBUG */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
759 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
760 /* Store a multibyte character in three contiguous bytes starting |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
761 DESTINATION, and increment DESTINATION to the byte after where the |
18262 | 762 character is stored. Therefore, DESTINATION must be an lvalue. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
763 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
764 #define STORE_CHARACTER_AND_INCR(destination, character) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
765 do { \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
766 (destination)[0] = (character) & 0377; \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
767 (destination)[1] = ((character) >> 8) & 0377; \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
768 (destination)[2] = (character) >> 16; \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
769 (destination) += 3; \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
770 } while (0) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
771 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
772 /* Put into DESTINATION a character stored in three contiguous bytes |
18262 | 773 starting at SOURCE. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
774 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
775 #define EXTRACT_CHARACTER(destination, source) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
776 do { \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
777 (destination) = ((source)[0] \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
778 | ((source)[1] << 8) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
779 | ((source)[2] << 16)); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
780 } while (0) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
781 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
782 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
783 /* Macros for charset. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
784 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
785 /* Size of bitmap of charset P in bytes. P is a start of charset, |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
786 i.e. *P is (re_opcode_t) charset or (re_opcode_t) charset_not. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
787 #define CHARSET_BITMAP_SIZE(p) ((p)[1] & 0x7F) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
788 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
789 /* Nonzero if charset P has range table. */ |
18262 | 790 #define CHARSET_RANGE_TABLE_EXISTS_P(p) ((p)[1] & 0x80) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
791 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
792 /* Return the address of range table of charset P. But not the start |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
793 of table itself, but the before where the number of ranges is |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
794 stored. `2 +' means to skip re_opcode_t and size of bitmap, |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
795 and the 2 bytes of flags at the start of the range table. */ |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
796 #define CHARSET_RANGE_TABLE(p) (&(p)[4 + CHARSET_BITMAP_SIZE (p)]) |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
797 |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
798 /* Extract the bit flags that start a range table. */ |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
799 #define CHARSET_RANGE_TABLE_BITS(p) \ |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
800 ((p)[2 + CHARSET_BITMAP_SIZE (p)] \ |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
801 + (p)[3 + CHARSET_BITMAP_SIZE (p)] * 0x100) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
802 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
803 /* Test if C is listed in the bitmap of charset P. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
804 #define CHARSET_LOOKUP_BITMAP(p, c) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
805 ((c) < CHARSET_BITMAP_SIZE (p) * BYTEWIDTH \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
806 && (p)[2 + (c) / BYTEWIDTH] & (1 << ((c) % BYTEWIDTH))) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
807 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
808 /* Return the address of end of RANGE_TABLE. COUNT is number of |
18262 | 809 ranges (which is a pair of (start, end)) in the RANGE_TABLE. `* 2' |
810 is start of range and end of range. `* 3' is size of each start | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
811 and end. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
812 #define CHARSET_RANGE_TABLE_END(range_table, count) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
813 ((range_table) + (count) * 2 * 3) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
814 |
18262 | 815 /* Test if C is in RANGE_TABLE. A flag NOT is negated if C is in. |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
816 COUNT is number of ranges in RANGE_TABLE. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
817 #define CHARSET_LOOKUP_RANGE_TABLE_RAW(not, c, range_table, count) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
818 do \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
819 { \ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
820 re_wchar_t range_start, range_end; \ |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
821 re_char *p; \ |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
822 re_char *range_table_end \ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
823 = CHARSET_RANGE_TABLE_END ((range_table), (count)); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
824 \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
825 for (p = (range_table); p < range_table_end; p += 2 * 3) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
826 { \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
827 EXTRACT_CHARACTER (range_start, p); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
828 EXTRACT_CHARACTER (range_end, p + 3); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
829 \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
830 if (range_start <= (c) && (c) <= range_end) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
831 { \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
832 (not) = !(not); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
833 break; \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
834 } \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
835 } \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
836 } \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
837 while (0) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
838 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
839 /* Test if C is in range table of CHARSET. The flag NOT is negated if |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
840 C is listed in it. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
841 #define CHARSET_LOOKUP_RANGE_TABLE(not, c, charset) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
842 do \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
843 { \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
844 /* Number of ranges in range table. */ \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
845 int count; \ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
846 re_char *range_table = CHARSET_RANGE_TABLE (charset); \ |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
847 \ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
848 EXTRACT_NUMBER_AND_INCR (count, range_table); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
849 CHARSET_LOOKUP_RANGE_TABLE_RAW ((not), (c), range_table, count); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
850 } \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
851 while (0) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
852 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
853 /* If DEBUG is defined, Regex prints many voluminous messages about what |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
854 it is doing (if the variable `debug' is nonzero). If linked with the |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
855 main program in `iregex.c', you can enter patterns and strings |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
856 interactively. And if linked with the main program in `main.c' and |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
857 the other test files, you can run the already-written tests. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
858 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
859 #ifdef DEBUG |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
860 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
861 /* We use standard I/O for debugging. */ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
862 # include <stdio.h> |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
863 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
864 /* It is useful to test things that ``must'' be true when debugging. */ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
865 # include <assert.h> |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
866 |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
867 static int debug = -100000; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
868 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
869 # define DEBUG_STATEMENT(e) e |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
870 # define DEBUG_PRINT1(x) if (debug > 0) printf (x) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
871 # define DEBUG_PRINT2(x1, x2) if (debug > 0) printf (x1, x2) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
872 # define DEBUG_PRINT3(x1, x2, x3) if (debug > 0) printf (x1, x2, x3) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
873 # define DEBUG_PRINT4(x1, x2, x3, x4) if (debug > 0) printf (x1, x2, x3, x4) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
874 # define DEBUG_PRINT_COMPILED_PATTERN(p, s, e) \ |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
875 if (debug > 0) print_partial_compiled_pattern (s, e) |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
876 # define DEBUG_PRINT_DOUBLE_STRING(w, s1, sz1, s2, sz2) \ |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
877 if (debug > 0) print_double_string (w, s1, sz1, s2, sz2) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
878 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
879 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
880 /* Print the fastmap in human-readable form. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
881 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
882 void |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
883 print_fastmap (fastmap) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
884 char *fastmap; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
885 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
886 unsigned was_a_range = 0; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
887 unsigned i = 0; |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
888 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
889 while (i < (1 << BYTEWIDTH)) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
890 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
891 if (fastmap[i++]) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
892 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
893 was_a_range = 0; |
18262 | 894 putchar (i - 1); |
895 while (i < (1 << BYTEWIDTH) && fastmap[i]) | |
896 { | |
897 was_a_range = 1; | |
898 i++; | |
899 } | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
900 if (was_a_range) |
18262 | 901 { |
902 printf ("-"); | |
903 putchar (i - 1); | |
904 } | |
905 } | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
906 } |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
907 putchar ('\n'); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
908 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
909 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
910 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
911 /* Print a compiled pattern string in human-readable form, starting at |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
912 the START pointer into it and ending just before the pointer END. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
913 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
914 void |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
915 print_partial_compiled_pattern (start, end) |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
916 re_char *start; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
917 re_char *end; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
918 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
919 int mcnt, mcnt2; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
920 re_char *p = start; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
921 re_char *pend = end; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
922 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
923 if (start == NULL) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
924 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
925 printf ("(null)\n"); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
926 return; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
927 } |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
928 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
929 /* Loop over pattern commands. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
930 while (p < pend) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
931 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
932 printf ("%d:\t", p - start); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
933 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
934 switch ((re_opcode_t) *p++) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
935 { |
18262 | 936 case no_op: |
937 printf ("/no_op"); | |
938 break; | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
939 |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
940 case succeed: |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
941 printf ("/succeed"); |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
942 break; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
943 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
944 case exactn: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
945 mcnt = *p++; |
18262 | 946 printf ("/exactn/%d", mcnt); |
947 do | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
948 { |
18262 | 949 putchar ('/'); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
950 putchar (*p++); |
18262 | 951 } |
952 while (--mcnt); | |
953 break; | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
954 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
955 case start_memory: |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
956 printf ("/start_memory/%d", *p++); |
18262 | 957 break; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
958 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
959 case stop_memory: |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
960 printf ("/stop_memory/%d", *p++); |
18262 | 961 break; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
962 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
963 case duplicate: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
964 printf ("/duplicate/%d", *p++); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
965 break; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
966 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
967 case anychar: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
968 printf ("/anychar"); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
969 break; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
970 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
971 case charset: |
18262 | 972 case charset_not: |
973 { | |
974 register int c, last = -100; | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
975 register int in_range = 0; |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
976 int length = CHARSET_BITMAP_SIZE (p - 1); |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
977 int has_range_table = CHARSET_RANGE_TABLE_EXISTS_P (p - 1); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
978 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
979 printf ("/charset [%s", |
18262 | 980 (re_opcode_t) *(p - 1) == charset_not ? "^" : ""); |
981 | |
982 assert (p + *p < pend); | |
983 | |
984 for (c = 0; c < 256; c++) | |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
985 if (c / 8 < length |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
986 && (p[1 + (c/8)] & (1 << (c % 8)))) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
987 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
988 /* Are we starting a range? */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
989 if (last + 1 == c && ! in_range) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
990 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
991 putchar ('-'); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
992 in_range = 1; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
993 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
994 /* Have we broken a range? */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
995 else if (last + 1 != c && in_range) |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
996 { |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
997 putchar (last); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
998 in_range = 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
999 } |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1000 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1001 if (! in_range) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1002 putchar (c); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1003 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1004 last = c; |
18262 | 1005 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1006 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1007 if (in_range) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1008 putchar (last); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1009 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1010 putchar (']'); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1011 |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1012 p += 1 + length; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1013 |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
1014 if (has_range_table) |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1015 { |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1016 int count; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1017 printf ("has-range-table"); |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1018 |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1019 /* ??? Should print the range table; for now, just skip it. */ |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1020 p += 2; /* skip range table bits */ |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1021 EXTRACT_NUMBER_AND_INCR (count, p); |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1022 p = CHARSET_RANGE_TABLE_END (p, count); |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1023 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1024 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1025 break; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1026 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1027 case begline: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1028 printf ("/begline"); |
18262 | 1029 break; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1030 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1031 case endline: |
18262 | 1032 printf ("/endline"); |
1033 break; | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1034 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1035 case on_failure_jump: |
18262 | 1036 extract_number_and_incr (&mcnt, &p); |
1037 printf ("/on_failure_jump to %d", p + mcnt - start); | |
1038 break; | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1039 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1040 case on_failure_keep_string_jump: |
18262 | 1041 extract_number_and_incr (&mcnt, &p); |
1042 printf ("/on_failure_keep_string_jump to %d", p + mcnt - start); | |
1043 break; | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1044 |
28342
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
1045 case on_failure_jump_nastyloop: |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
1046 extract_number_and_incr (&mcnt, &p); |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
1047 printf ("/on_failure_jump_nastyloop to %d", p + mcnt - start); |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
1048 break; |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
1049 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1050 case on_failure_jump_loop: |
18262 | 1051 extract_number_and_incr (&mcnt, &p); |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1052 printf ("/on_failure_jump_loop to %d", p + mcnt - start); |
18262 | 1053 break; |
1054 | |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1055 case on_failure_jump_smart: |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1056 extract_number_and_incr (&mcnt, &p); |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1057 printf ("/on_failure_jump_smart to %d", p + mcnt - start); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1058 break; |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1059 |
18262 | 1060 case jump: |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1061 extract_number_and_incr (&mcnt, &p); |
18262 | 1062 printf ("/jump to %d", p + mcnt - start); |
16010 | 1063 break; |
1064 | |
18262 | 1065 case succeed_n: |
1066 extract_number_and_incr (&mcnt, &p); | |
1067 extract_number_and_incr (&mcnt2, &p); | |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1068 printf ("/succeed_n to %d, %d times", p - 2 + mcnt - start, mcnt2); |
18262 | 1069 break; |
1070 | |
1071 case jump_n: | |
1072 extract_number_and_incr (&mcnt, &p); | |
1073 extract_number_and_incr (&mcnt2, &p); | |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1074 printf ("/jump_n to %d, %d times", p - 2 + mcnt - start, mcnt2); |
18262 | 1075 break; |
1076 | |
1077 case set_number_at: | |
1078 extract_number_and_incr (&mcnt, &p); | |
1079 extract_number_and_incr (&mcnt2, &p); | |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1080 printf ("/set_number_at location %d to %d", p - 2 + mcnt - start, mcnt2); |
18262 | 1081 break; |
1082 | |
1083 case wordbound: | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1084 printf ("/wordbound"); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1085 break; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1086 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1087 case notwordbound: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1088 printf ("/notwordbound"); |
18262 | 1089 break; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1090 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1091 case wordbeg: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1092 printf ("/wordbeg"); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1093 break; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1094 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1095 case wordend: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1096 printf ("/wordend"); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1097 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1098 case syntaxspec: |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1099 printf ("/syntaxspec"); |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1100 mcnt = *p++; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1101 printf ("/%d", mcnt); |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1102 break; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1103 |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1104 case notsyntaxspec: |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1105 printf ("/notsyntaxspec"); |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1106 mcnt = *p++; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1107 printf ("/%d", mcnt); |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1108 break; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1109 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1110 # ifdef emacs |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1111 case before_dot: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1112 printf ("/before_dot"); |
18262 | 1113 break; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1114 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1115 case at_dot: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1116 printf ("/at_dot"); |
18262 | 1117 break; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1118 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1119 case after_dot: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1120 printf ("/after_dot"); |
18262 | 1121 break; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1122 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1123 case categoryspec: |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1124 printf ("/categoryspec"); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1125 mcnt = *p++; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1126 printf ("/%d", mcnt); |
18262 | 1127 break; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1128 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1129 case notcategoryspec: |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
1130 printf ("/notcategoryspec"); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1131 mcnt = *p++; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1132 printf ("/%d", mcnt); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1133 break; |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1134 # endif /* emacs */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1135 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1136 case begbuf: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1137 printf ("/begbuf"); |
18262 | 1138 break; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1139 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1140 case endbuf: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1141 printf ("/endbuf"); |
18262 | 1142 break; |
1143 | |
1144 default: | |
1145 printf ("?%d", *(p-1)); | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1146 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1147 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1148 putchar ('\n'); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1149 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1150 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1151 printf ("%d:\tend of pattern.\n", p - start); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1152 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1153 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1154 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1155 void |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1156 print_compiled_pattern (bufp) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1157 struct re_pattern_buffer *bufp; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1158 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1159 re_char *buffer = bufp->buffer; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1160 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1161 print_partial_compiled_pattern (buffer, buffer + bufp->used); |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1162 printf ("%ld bytes used/%ld bytes allocated.\n", |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1163 bufp->used, bufp->allocated); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1164 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1165 if (bufp->fastmap_accurate && bufp->fastmap) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1166 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1167 printf ("fastmap: "); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1168 print_fastmap (bufp->fastmap); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1169 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1170 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1171 printf ("re_nsub: %d\t", bufp->re_nsub); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1172 printf ("regs_alloc: %d\t", bufp->regs_allocated); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1173 printf ("can_be_null: %d\t", bufp->can_be_null); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1174 printf ("no_sub: %d\t", bufp->no_sub); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1175 printf ("not_bol: %d\t", bufp->not_bol); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1176 printf ("not_eol: %d\t", bufp->not_eol); |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1177 printf ("syntax: %lx\n", bufp->syntax); |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1178 fflush (stdout); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1179 /* Perhaps we should print the translate table? */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1180 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1181 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1182 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1183 void |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1184 print_double_string (where, string1, size1, string2, size2) |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
1185 re_char *where; |
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
1186 re_char *string1; |
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
1187 re_char *string2; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1188 int size1; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1189 int size2; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1190 { |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1191 int this_char; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1192 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1193 if (where == NULL) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1194 printf ("(null)"); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1195 else |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1196 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1197 if (FIRST_STRING_P (where)) |
18262 | 1198 { |
1199 for (this_char = where - string1; this_char < size1; this_char++) | |
1200 putchar (string1[this_char]); | |
1201 | |
1202 where = string2; | |
1203 } | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1204 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1205 for (this_char = where - string2; this_char < size2; this_char++) |
18262 | 1206 putchar (string2[this_char]); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1207 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1208 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1209 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1210 #else /* not DEBUG */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1211 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1212 # undef assert |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1213 # define assert(e) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1214 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1215 # define DEBUG_STATEMENT(e) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1216 # define DEBUG_PRINT1(x) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1217 # define DEBUG_PRINT2(x1, x2) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1218 # define DEBUG_PRINT3(x1, x2, x3) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1219 # define DEBUG_PRINT4(x1, x2, x3, x4) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1220 # define DEBUG_PRINT_COMPILED_PATTERN(p, s, e) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1221 # define DEBUG_PRINT_DOUBLE_STRING(w, s1, sz1, s2, sz2) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1222 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1223 #endif /* not DEBUG */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1224 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1225 /* Set by `re_set_syntax' to the current regexp syntax to recognize. Can |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1226 also be assigned to arbitrarily: each pattern buffer stores its own |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1227 syntax, so it can be changed between regex compilations. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1228 /* This has no initializer because initialized variables in Emacs |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1229 become read-only after dumping. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1230 reg_syntax_t re_syntax_options; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1231 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1232 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1233 /* Specify the precise syntax of regexps for compilation. This provides |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1234 for compatibility for various utilities which historically have |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1235 different, incompatible syntaxes. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1236 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1237 The argument SYNTAX is a bit mask comprised of the various bits |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1238 defined in regex.h. We return the old syntax. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1239 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1240 reg_syntax_t |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1241 re_set_syntax (syntax) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1242 reg_syntax_t syntax; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1243 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1244 reg_syntax_t ret = re_syntax_options; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1245 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1246 re_syntax_options = syntax; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1247 return ret; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1248 } |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
1249 WEAK_ALIAS (__re_set_syntax, re_set_syntax) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1250 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1251 /* This table gives an error message for each of the error codes listed |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1252 in regex.h. Obviously the order here has to be same as there. |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1253 POSIX doesn't require that we do anything for REG_NOERROR, |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1254 but why not be nice? */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1255 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1256 static const char *re_error_msgid[] = |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1257 { |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1258 gettext_noop ("Success"), /* REG_NOERROR */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1259 gettext_noop ("No match"), /* REG_NOMATCH */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1260 gettext_noop ("Invalid regular expression"), /* REG_BADPAT */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1261 gettext_noop ("Invalid collation character"), /* REG_ECOLLATE */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1262 gettext_noop ("Invalid character class name"), /* REG_ECTYPE */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1263 gettext_noop ("Trailing backslash"), /* REG_EESCAPE */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1264 gettext_noop ("Invalid back reference"), /* REG_ESUBREG */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1265 gettext_noop ("Unmatched [ or [^"), /* REG_EBRACK */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1266 gettext_noop ("Unmatched ( or \\("), /* REG_EPAREN */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1267 gettext_noop ("Unmatched \\{"), /* REG_EBRACE */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1268 gettext_noop ("Invalid content of \\{\\}"), /* REG_BADBR */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1269 gettext_noop ("Invalid range end"), /* REG_ERANGE */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1270 gettext_noop ("Memory exhausted"), /* REG_ESPACE */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1271 gettext_noop ("Invalid preceding regular expression"), /* REG_BADRPT */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1272 gettext_noop ("Premature end of regular expression"), /* REG_EEND */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1273 gettext_noop ("Regular expression too big"), /* REG_ESIZE */ |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1274 gettext_noop ("Unmatched ) or \\)"), /* REG_ERPAREN */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1275 }; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1276 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1277 /* Avoiding alloca during matching, to placate r_alloc. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1278 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1279 /* Define MATCH_MAY_ALLOCATE unless we need to make sure that the |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1280 searching and matching functions should not call alloca. On some |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1281 systems, alloca is implemented in terms of malloc, and if we're |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1282 using the relocating allocator routines, then malloc could cause a |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1283 relocation, which might (if the strings being searched are in the |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1284 ralloc heap) shift the data out from underneath the regexp |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1285 routines. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1286 |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1287 Here's another reason to avoid allocation: Emacs |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1288 processes input from X in a signal handler; processing X input may |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1289 call malloc; if input arrives while a matching routine is calling |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1290 malloc, then we're scrod. But Emacs can't just block input while |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1291 calling matching routines; then we don't notice interrupts when |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1292 they come in. So, Emacs blocks input around all regexp calls |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1293 except the matching calls, which it leaves unprotected, in the |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1294 faith that they will not malloc. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1295 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1296 /* Normally, this is fine. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1297 #define MATCH_MAY_ALLOCATE |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1298 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1299 /* When using GNU C, we are not REALLY using the C alloca, no matter |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1300 what config.h may say. So don't take precautions for it. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1301 #ifdef __GNUC__ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1302 # undef C_ALLOCA |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1303 #endif |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1304 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1305 /* The match routines may not allocate if (1) they would do it with malloc |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1306 and (2) it's not safe for them to use malloc. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1307 Note that if REL_ALLOC is defined, matching would not use malloc for the |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1308 failure stack, but we would still use it for the register vectors; |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1309 so REL_ALLOC should not affect this. */ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1310 #if (defined C_ALLOCA || defined REGEX_MALLOC) && defined emacs |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1311 # undef MATCH_MAY_ALLOCATE |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1312 #endif |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1313 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1314 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1315 /* Failure stack declarations and macros; both re_compile_fastmap and |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1316 re_match_2 use a failure stack. These have to be macros because of |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1317 REGEX_ALLOCATE_STACK. */ |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1318 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1319 |
20449
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1320 /* Approximate number of failure points for which to initially allocate space |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1321 when matching. If this number is exceeded, we allocate more |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1322 space, so it is not a hard limit. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1323 #ifndef INIT_FAILURE_ALLOC |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1324 # define INIT_FAILURE_ALLOC 20 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1325 #endif |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1326 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1327 /* Roughly the maximum number of failure points on the stack. Would be |
20449
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1328 exactly that if always used TYPICAL_FAILURE_SIZE items each time we failed. |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1329 This is a variable only so users of regex can assign to it; we never |
40650
ded4aa3c81b2
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39718
diff
changeset
|
1330 change it ourselves. We always multiply it by TYPICAL_FAILURE_SIZE |
ded4aa3c81b2
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39718
diff
changeset
|
1331 before using it, so it should probably be a byte-count instead. */ |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
1332 # if defined MATCH_MAY_ALLOCATE |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
1333 /* Note that 4400 was enough to cause a crash on Alpha OSF/1, |
20449
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1334 whose default stack limit is 2mb. In order for a larger |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1335 value to work reliably, you have to try to make it accord |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1336 with the process stack limit. */ |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
1337 size_t re_max_failures = 40000; |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
1338 # else |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
1339 size_t re_max_failures = 4000; |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
1340 # endif |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1341 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1342 union fail_stack_elt |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1343 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1344 re_char *pointer; |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
1345 /* This should be the biggest `int' that's no bigger than a pointer. */ |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
1346 long integer; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1347 }; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1348 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1349 typedef union fail_stack_elt fail_stack_elt_t; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1350 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1351 typedef struct |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1352 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1353 fail_stack_elt_t *stack; |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
1354 size_t size; |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
1355 size_t avail; /* Offset of next open position. */ |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
1356 size_t frame; /* Offset of the cur constructed frame. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1357 } fail_stack_type; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1358 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1359 #define FAIL_STACK_EMPTY() (fail_stack.frame == 0) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1360 #define FAIL_STACK_FULL() (fail_stack.avail == fail_stack.size) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1361 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1362 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1363 /* Define macros to initialize and free the failure stack. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1364 Do `return -2' if the alloc fails. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1365 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1366 #ifdef MATCH_MAY_ALLOCATE |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1367 # define INIT_FAIL_STACK() \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1368 do { \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1369 fail_stack.stack = (fail_stack_elt_t *) \ |
20449
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1370 REGEX_ALLOCATE_STACK (INIT_FAILURE_ALLOC * TYPICAL_FAILURE_SIZE \ |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1371 * sizeof (fail_stack_elt_t)); \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1372 \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1373 if (fail_stack.stack == NULL) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1374 return -2; \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1375 \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1376 fail_stack.size = INIT_FAILURE_ALLOC; \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1377 fail_stack.avail = 0; \ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1378 fail_stack.frame = 0; \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1379 } while (0) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1380 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1381 # define RESET_FAIL_STACK() REGEX_FREE_STACK (fail_stack.stack) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1382 #else |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1383 # define INIT_FAIL_STACK() \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1384 do { \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1385 fail_stack.avail = 0; \ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1386 fail_stack.frame = 0; \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1387 } while (0) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1388 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1389 # define RESET_FAIL_STACK() ((void)0) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1390 #endif |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1391 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1392 |
20449
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1393 /* Double the size of FAIL_STACK, up to a limit |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1394 which allows approximately `re_max_failures' items. |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1395 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1396 Return 1 if succeeds, and 0 if either ran out of memory |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1397 allocating space for it or it was already too large. |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1398 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1399 REGEX_REALLOCATE_STACK requires `destination' be declared. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1400 |
20449
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1401 /* Factor to increase the failure stack size by |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1402 when we increase it. |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1403 This used to be 2, but 2 was too wasteful |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1404 because the old discarded stacks added up to as much space |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1405 were as ultimate, maximum-size stack. */ |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1406 #define FAIL_STACK_GROWTH_FACTOR 4 |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1407 |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1408 #define GROW_FAIL_STACK(fail_stack) \ |
20455
aff2a2638ef4
(GROW_FAIL_STACK): Fix test for stack size at max.
Karl Heuer <kwzh@gnu.org>
parents:
20450
diff
changeset
|
1409 (((fail_stack).size * sizeof (fail_stack_elt_t) \ |
aff2a2638ef4
(GROW_FAIL_STACK): Fix test for stack size at max.
Karl Heuer <kwzh@gnu.org>
parents:
20450
diff
changeset
|
1410 >= re_max_failures * TYPICAL_FAILURE_SIZE) \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1411 ? 0 \ |
20449
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1412 : ((fail_stack).stack \ |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1413 = (fail_stack_elt_t *) \ |
18262 | 1414 REGEX_REALLOCATE_STACK ((fail_stack).stack, \ |
1415 (fail_stack).size * sizeof (fail_stack_elt_t), \ | |
20449
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1416 MIN (re_max_failures * TYPICAL_FAILURE_SIZE, \ |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1417 ((fail_stack).size * sizeof (fail_stack_elt_t) \ |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1418 * FAIL_STACK_GROWTH_FACTOR))), \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1419 \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1420 (fail_stack).stack == NULL \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1421 ? 0 \ |
20450
8f05356e9dc3
(GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents:
20449
diff
changeset
|
1422 : ((fail_stack).size \ |
8f05356e9dc3
(GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents:
20449
diff
changeset
|
1423 = (MIN (re_max_failures * TYPICAL_FAILURE_SIZE, \ |
8f05356e9dc3
(GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents:
20449
diff
changeset
|
1424 ((fail_stack).size * sizeof (fail_stack_elt_t) \ |
8f05356e9dc3
(GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents:
20449
diff
changeset
|
1425 * FAIL_STACK_GROWTH_FACTOR)) \ |
8f05356e9dc3
(GROW_FAIL_STACK): Fix previous change:
Karl Heuer <kwzh@gnu.org>
parents:
20449
diff
changeset
|
1426 / sizeof (fail_stack_elt_t)), \ |
18262 | 1427 1))) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1428 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1429 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1430 /* Push a pointer value onto the failure stack. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1431 Assumes the variable `fail_stack'. Probably should only |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1432 be called from within `PUSH_FAILURE_POINT'. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1433 #define PUSH_FAILURE_POINTER(item) \ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1434 fail_stack.stack[fail_stack.avail++].pointer = (item) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1435 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1436 /* This pushes an integer-valued item onto the failure stack. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1437 Assumes the variable `fail_stack'. Probably should only |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1438 be called from within `PUSH_FAILURE_POINT'. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1439 #define PUSH_FAILURE_INT(item) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1440 fail_stack.stack[fail_stack.avail++].integer = (item) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1441 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1442 /* Push a fail_stack_elt_t value onto the failure stack. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1443 Assumes the variable `fail_stack'. Probably should only |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1444 be called from within `PUSH_FAILURE_POINT'. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1445 #define PUSH_FAILURE_ELT(item) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1446 fail_stack.stack[fail_stack.avail++] = (item) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1447 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1448 /* These three POP... operations complement the three PUSH... operations. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1449 All assume that `fail_stack' is nonempty. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1450 #define POP_FAILURE_POINTER() fail_stack.stack[--fail_stack.avail].pointer |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1451 #define POP_FAILURE_INT() fail_stack.stack[--fail_stack.avail].integer |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1452 #define POP_FAILURE_ELT() fail_stack.stack[--fail_stack.avail] |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1453 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1454 /* Individual items aside from the registers. */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1455 #define NUM_NONREG_ITEMS 3 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1456 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1457 /* Used to examine the stack (to detect infinite loops). */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1458 #define FAILURE_PAT(h) fail_stack.stack[(h) - 1].pointer |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
1459 #define FAILURE_STR(h) (fail_stack.stack[(h) - 2].pointer) |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1460 #define NEXT_FAILURE_HANDLE(h) fail_stack.stack[(h) - 3].integer |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1461 #define TOP_FAILURE_HANDLE() fail_stack.frame |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1462 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1463 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1464 #define ENSURE_FAIL_STACK(space) \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1465 while (REMAINING_AVAIL_SLOTS <= space) { \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1466 if (!GROW_FAIL_STACK (fail_stack)) \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1467 return -2; \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1468 DEBUG_PRINT2 ("\n Doubled stack; size now: %d\n", (fail_stack).size);\ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1469 DEBUG_PRINT2 (" slots available: %d\n", REMAINING_AVAIL_SLOTS);\ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1470 } |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1471 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1472 /* Push register NUM onto the stack. */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1473 #define PUSH_FAILURE_REG(num) \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1474 do { \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1475 char *destination; \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1476 ENSURE_FAIL_STACK(3); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1477 DEBUG_PRINT4 (" Push reg %d (spanning %p -> %p)\n", \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1478 num, regstart[num], regend[num]); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1479 PUSH_FAILURE_POINTER (regstart[num]); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1480 PUSH_FAILURE_POINTER (regend[num]); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1481 PUSH_FAILURE_INT (num); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1482 } while (0) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1483 |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1484 /* Change the counter's value to VAL, but make sure that it will |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1485 be reset when backtracking. */ |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1486 #define PUSH_NUMBER(ptr,val) \ |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1487 do { \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1488 char *destination; \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1489 int c; \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1490 ENSURE_FAIL_STACK(3); \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1491 EXTRACT_NUMBER (c, ptr); \ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1492 DEBUG_PRINT4 (" Push number %p = %d -> %d\n", ptr, c, val); \ |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1493 PUSH_FAILURE_INT (c); \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1494 PUSH_FAILURE_POINTER (ptr); \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1495 PUSH_FAILURE_INT (-1); \ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1496 STORE_NUMBER (ptr, val); \ |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1497 } while (0) |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1498 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1499 /* Pop a saved register off the stack. */ |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1500 #define POP_FAILURE_REG_OR_COUNT() \ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1501 do { \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1502 int reg = POP_FAILURE_INT (); \ |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1503 if (reg == -1) \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1504 { \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1505 /* It's a counter. */ \ |
32954
f77e6c51dd07
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32891
diff
changeset
|
1506 /* Here, we discard `const', making re_match non-reentrant. */ \ |
f77e6c51dd07
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32891
diff
changeset
|
1507 unsigned char *ptr = (unsigned char*) POP_FAILURE_POINTER (); \ |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1508 reg = POP_FAILURE_INT (); \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1509 STORE_NUMBER (ptr, reg); \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1510 DEBUG_PRINT3 (" Pop counter %p = %d\n", ptr, reg); \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1511 } \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1512 else \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1513 { \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1514 regend[reg] = POP_FAILURE_POINTER (); \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1515 regstart[reg] = POP_FAILURE_POINTER (); \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1516 DEBUG_PRINT4 (" Pop reg %d (spanning %p -> %p)\n", \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1517 reg, regstart[reg], regend[reg]); \ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1518 } \ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1519 } while (0) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1520 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1521 /* Check that we are not stuck in an infinite loop. */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1522 #define CHECK_INFINITE_LOOP(pat_cur, string_place) \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1523 do { \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1524 int failure = TOP_FAILURE_HANDLE(); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1525 /* Check for infinite matching loops */ \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1526 while (failure > 0 && \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1527 (FAILURE_STR (failure) == string_place \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1528 || FAILURE_STR (failure) == NULL)) \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1529 { \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1530 assert (FAILURE_PAT (failure) >= bufp->buffer \ |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
1531 && FAILURE_PAT (failure) <= bufp->buffer + bufp->used); \ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1532 if (FAILURE_PAT (failure) == pat_cur) \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1533 goto fail; \ |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
1534 DEBUG_PRINT2 (" Other pattern: %p\n", FAILURE_PAT (failure)); \ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1535 failure = NEXT_FAILURE_HANDLE(failure); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1536 } \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1537 DEBUG_PRINT2 (" Other string: %p\n", FAILURE_STR (failure)); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1538 } while (0) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1539 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1540 /* Push the information about the state we will need |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1541 if we ever fail back to it. |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1542 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1543 Requires variables fail_stack, regstart, regend and |
20449
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1544 num_regs be declared. GROW_FAIL_STACK requires `destination' be |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1545 declared. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1546 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1547 Does `return FAILURE_CODE' if runs out of memory. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1548 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1549 #define PUSH_FAILURE_POINT(pattern, string_place) \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1550 do { \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1551 char *destination; \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1552 /* Must be int, so when we don't save any registers, the arithmetic \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1553 of 0 + -1 isn't done as unsigned. */ \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1554 \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1555 DEBUG_STATEMENT (nfailure_points_pushed++); \ |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1556 DEBUG_PRINT1 ("\nPUSH_FAILURE_POINT:\n"); \ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1557 DEBUG_PRINT2 (" Before push, next avail: %d\n", (fail_stack).avail); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1558 DEBUG_PRINT2 (" size: %d\n", (fail_stack).size);\ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1559 \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1560 ENSURE_FAIL_STACK (NUM_NONREG_ITEMS); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1561 \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1562 DEBUG_PRINT1 ("\n"); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1563 \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1564 DEBUG_PRINT2 (" Push frame index: %d\n", fail_stack.frame); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1565 PUSH_FAILURE_INT (fail_stack.frame); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1566 \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1567 DEBUG_PRINT2 (" Push string %p: `", string_place); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1568 DEBUG_PRINT_DOUBLE_STRING (string_place, string1, size1, string2, size2);\ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1569 DEBUG_PRINT1 ("'\n"); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1570 PUSH_FAILURE_POINTER (string_place); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1571 \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1572 DEBUG_PRINT2 (" Push pattern %p: ", pattern); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1573 DEBUG_PRINT_COMPILED_PATTERN (bufp, pattern, pend); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1574 PUSH_FAILURE_POINTER (pattern); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1575 \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1576 /* Close the frame by moving the frame pointer past it. */ \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1577 fail_stack.frame = fail_stack.avail; \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1578 } while (0) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1579 |
20449
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1580 /* Estimate the size of data pushed by a typical failure stack entry. |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1581 An estimate is all we need, because all we use this for |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1582 is to choose a limit for how big to make the failure stack. */ |
40650
ded4aa3c81b2
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39718
diff
changeset
|
1583 /* BEWARE, the value `20' is hard-coded in emacs.c:main(). */ |
20449
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1584 #define TYPICAL_FAILURE_SIZE 20 |
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
1585 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1586 /* How many items can still be added to the stack without overflowing it. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1587 #define REMAINING_AVAIL_SLOTS ((fail_stack).size - (fail_stack).avail) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1588 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1589 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1590 /* Pops what PUSH_FAIL_STACK pushes. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1591 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1592 We restore into the parameters, all of which should be lvalues: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1593 STR -- the saved data position. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1594 PAT -- the saved pattern position. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1595 REGSTART, REGEND -- arrays of string positions. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1596 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1597 Also assumes the variables `fail_stack' and (if debugging), `bufp', |
18262 | 1598 `pend', `string1', `size1', `string2', and `size2'. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1599 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1600 #define POP_FAILURE_POINT(str, pat) \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1601 do { \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1602 assert (!FAIL_STACK_EMPTY ()); \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1603 \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1604 /* Remove failure points and point to how many regs pushed. */ \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1605 DEBUG_PRINT1 ("POP_FAILURE_POINT:\n"); \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1606 DEBUG_PRINT2 (" Before pop, next avail: %d\n", fail_stack.avail); \ |
18262 | 1607 DEBUG_PRINT2 (" size: %d\n", fail_stack.size); \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1608 \ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1609 /* Pop the saved registers. */ \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1610 while (fail_stack.frame < fail_stack.avail) \ |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
1611 POP_FAILURE_REG_OR_COUNT (); \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1612 \ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1613 pat = POP_FAILURE_POINTER (); \ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1614 DEBUG_PRINT2 (" Popping pattern %p: ", pat); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1615 DEBUG_PRINT_COMPILED_PATTERN (bufp, pat, pend); \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1616 \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1617 /* If the saved string location is NULL, it came from an \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1618 on_failure_keep_string_jump opcode, and we want to throw away the \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1619 saved NULL, thus retaining our current position in the string. */ \ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1620 str = POP_FAILURE_POINTER (); \ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1621 DEBUG_PRINT2 (" Popping string %p: `", str); \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1622 DEBUG_PRINT_DOUBLE_STRING (str, string1, size1, string2, size2); \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1623 DEBUG_PRINT1 ("'\n"); \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1624 \ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1625 fail_stack.frame = POP_FAILURE_INT (); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1626 DEBUG_PRINT2 (" Popping frame index: %d\n", fail_stack.frame); \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1627 \ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1628 assert (fail_stack.avail >= 0); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1629 assert (fail_stack.frame <= fail_stack.avail); \ |
12931
30dad6bfce63
(PUSH_FAILURE_POINT, POP_FAILURE_POINT): Don't push or pop
Richard M. Stallman <rms@gnu.org>
parents:
12570
diff
changeset
|
1630 \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1631 DEBUG_STATEMENT (nfailure_points_popped++); \ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
1632 } while (0) /* POP_FAILURE_POINT */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1633 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1634 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1635 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1636 /* Registers are set to a sentinel when they haven't yet matched. */ |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1637 #define REG_UNSET(e) ((e) == NULL) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1638 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1639 /* Subroutine declarations and macros for regex_compile. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1640 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1641 static reg_errcode_t regex_compile _RE_ARGS ((re_char *pattern, size_t size, |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1642 reg_syntax_t syntax, |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1643 struct re_pattern_buffer *bufp)); |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1644 static void store_op1 _RE_ARGS ((re_opcode_t op, unsigned char *loc, int arg)); |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1645 static void store_op2 _RE_ARGS ((re_opcode_t op, unsigned char *loc, |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1646 int arg1, int arg2)); |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1647 static void insert_op1 _RE_ARGS ((re_opcode_t op, unsigned char *loc, |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1648 int arg, unsigned char *end)); |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1649 static void insert_op2 _RE_ARGS ((re_opcode_t op, unsigned char *loc, |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1650 int arg1, int arg2, unsigned char *end)); |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1651 static boolean at_begline_loc_p _RE_ARGS ((re_char *pattern, |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1652 re_char *p, |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1653 reg_syntax_t syntax)); |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1654 static boolean at_endline_loc_p _RE_ARGS ((re_char *p, |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1655 re_char *pend, |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1656 reg_syntax_t syntax)); |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1657 static re_char *skip_one_char _RE_ARGS ((re_char *p)); |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1658 static int analyse_first _RE_ARGS ((re_char *p, re_char *pend, |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1659 char *fastmap, const int multibyte)); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1660 |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1661 /* Fetch the next character in the uncompiled pattern---translating it |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1662 if necessary. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1663 #define PATFETCH(c) \ |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1664 do { \ |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1665 PATFETCH_RAW (c); \ |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
1666 c = TRANSLATE (c); \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1667 } while (0) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1668 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1669 /* Fetch the next character in the uncompiled pattern, with no |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1670 translation. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1671 #define PATFETCH_RAW(c) \ |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
1672 do { \ |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
1673 int len; \ |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
1674 if (p == pend) return REG_EEND; \ |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
1675 c = RE_STRING_CHAR_AND_LENGTH (p, pend - p, len); \ |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
1676 p += len; \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1677 } while (0) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1678 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1679 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1680 /* If `translate' is non-null, return translate[D], else just D. We |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1681 cast the subscript to translate because some data is declared as |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1682 `char *', to avoid warnings when a string constant is passed. But |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1683 when we use a character as a subscript we must make it unsigned. */ |
13250
52e053f46f76
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard M. Stallman <rms@gnu.org>
parents:
13100
diff
changeset
|
1684 #ifndef TRANSLATE |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
1685 # define TRANSLATE(d) \ |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
1686 (RE_TRANSLATE_P (translate) ? RE_TRANSLATE (translate, (d)) : (d)) |
13250
52e053f46f76
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard M. Stallman <rms@gnu.org>
parents:
13100
diff
changeset
|
1687 #endif |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1688 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1689 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1690 /* Macros for outputting the compiled pattern into `buffer'. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1691 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1692 /* If the buffer isn't allocated when it comes in, use this. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1693 #define INIT_BUF_SIZE 32 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1694 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1695 /* Make sure we have at least N more bytes of space in buffer. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1696 #define GET_BUFFER_SPACE(n) \ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1697 while ((size_t) (b - bufp->buffer + (n)) > bufp->allocated) \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1698 EXTEND_BUFFER () |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1699 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1700 /* Make sure we have one more byte of buffer space and then add C to it. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1701 #define BUF_PUSH(c) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1702 do { \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1703 GET_BUFFER_SPACE (1); \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1704 *b++ = (unsigned char) (c); \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1705 } while (0) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1706 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1707 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1708 /* Ensure we have two more bytes of buffer space and then append C1 and C2. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1709 #define BUF_PUSH_2(c1, c2) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1710 do { \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1711 GET_BUFFER_SPACE (2); \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1712 *b++ = (unsigned char) (c1); \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1713 *b++ = (unsigned char) (c2); \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1714 } while (0) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1715 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1716 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1717 /* As with BUF_PUSH_2, except for three bytes. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1718 #define BUF_PUSH_3(c1, c2, c3) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1719 do { \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1720 GET_BUFFER_SPACE (3); \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1721 *b++ = (unsigned char) (c1); \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1722 *b++ = (unsigned char) (c2); \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1723 *b++ = (unsigned char) (c3); \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1724 } while (0) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1725 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1726 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1727 /* Store a jump with opcode OP at LOC to location TO. We store a |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1728 relative address offset by the three bytes the jump itself occupies. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1729 #define STORE_JUMP(op, loc, to) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1730 store_op1 (op, loc, (to) - (loc) - 3) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1731 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1732 /* Likewise, for a two-argument jump. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1733 #define STORE_JUMP2(op, loc, to, arg) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1734 store_op2 (op, loc, (to) - (loc) - 3, arg) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1735 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1736 /* Like `STORE_JUMP', but for inserting. Assume `b' is the buffer end. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1737 #define INSERT_JUMP(op, loc, to) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1738 insert_op1 (op, loc, (to) - (loc) - 3, b) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1739 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1740 /* Like `STORE_JUMP2', but for inserting. Assume `b' is the buffer end. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1741 #define INSERT_JUMP2(op, loc, to, arg) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1742 insert_op2 (op, loc, (to) - (loc) - 3, arg, b) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1743 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1744 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1745 /* This is not an arbitrary limit: the arguments which represent offsets |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1746 into the pattern are two bytes long. So if 2^16 bytes turns out to |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1747 be too small, many things would have to change. */ |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1748 /* Any other compiler which, like MSC, has allocation limit below 2^16 |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1749 bytes will have to use approach similar to what was done below for |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1750 MSC and drop MAX_BUF_SIZE a bit. Otherwise you may end up |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1751 reallocating to 0 bytes. Such thing is not going to work too well. |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1752 You have been warned!! */ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1753 #if defined _MSC_VER && !defined WIN32 |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1754 /* Microsoft C 16-bit versions limit malloc to approx 65512 bytes. */ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1755 # define MAX_BUF_SIZE 65500L |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1756 #else |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1757 # define MAX_BUF_SIZE (1L << 16) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1758 #endif |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1759 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1760 /* Extend the buffer by twice its current size via realloc and |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1761 reset the pointers that pointed into the old block to point to the |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1762 correct places in the new one. If extending the buffer results in it |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1763 being larger than MAX_BUF_SIZE, then flag memory exhausted. */ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1764 #if __BOUNDED_POINTERS__ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1765 # define SET_HIGH_BOUND(P) (__ptrhigh (P) = __ptrlow (P) + bufp->allocated) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1766 # define MOVE_BUFFER_POINTER(P) \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1767 (__ptrlow (P) += incr, SET_HIGH_BOUND (P), __ptrvalue (P) += incr) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1768 # define ELSE_EXTEND_BUFFER_HIGH_BOUND \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1769 else \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1770 { \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1771 SET_HIGH_BOUND (b); \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1772 SET_HIGH_BOUND (begalt); \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1773 if (fixup_alt_jump) \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1774 SET_HIGH_BOUND (fixup_alt_jump); \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1775 if (laststart) \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1776 SET_HIGH_BOUND (laststart); \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1777 if (pending_exact) \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1778 SET_HIGH_BOUND (pending_exact); \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1779 } |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1780 #else |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1781 # define MOVE_BUFFER_POINTER(P) (P) += incr |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1782 # define ELSE_EXTEND_BUFFER_HIGH_BOUND |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1783 #endif |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1784 #define EXTEND_BUFFER() \ |
18262 | 1785 do { \ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1786 re_char *old_buffer = bufp->buffer; \ |
18262 | 1787 if (bufp->allocated == MAX_BUF_SIZE) \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1788 return REG_ESIZE; \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1789 bufp->allocated <<= 1; \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1790 if (bufp->allocated > MAX_BUF_SIZE) \ |
18262 | 1791 bufp->allocated = MAX_BUF_SIZE; \ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1792 RETALLOC (bufp->buffer, bufp->allocated, unsigned char); \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1793 if (bufp->buffer == NULL) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1794 return REG_ESPACE; \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1795 /* If the buffer moved, move all the pointers into it. */ \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1796 if (old_buffer != bufp->buffer) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1797 { \ |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1798 int incr = bufp->buffer - old_buffer; \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1799 MOVE_BUFFER_POINTER (b); \ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1800 MOVE_BUFFER_POINTER (begalt); \ |
18262 | 1801 if (fixup_alt_jump) \ |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1802 MOVE_BUFFER_POINTER (fixup_alt_jump); \ |
18262 | 1803 if (laststart) \ |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1804 MOVE_BUFFER_POINTER (laststart); \ |
18262 | 1805 if (pending_exact) \ |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1806 MOVE_BUFFER_POINTER (pending_exact); \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1807 } \ |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1808 ELSE_EXTEND_BUFFER_HIGH_BOUND \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1809 } while (0) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1810 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1811 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1812 /* Since we have one byte reserved for the register number argument to |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1813 {start,stop}_memory, the maximum number of groups we can report |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1814 things about is what fits in that byte. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1815 #define MAX_REGNUM 255 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1816 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1817 /* But patterns can have more than `MAX_REGNUM' registers. We just |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1818 ignore the excess. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1819 typedef unsigned regnum_t; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1820 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1821 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1822 /* Macros for the compile stack. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1823 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1824 /* Since offsets can go either forwards or backwards, this type needs to |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1825 be able to hold values from -(MAX_BUF_SIZE - 1) to MAX_BUF_SIZE - 1. */ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1826 /* int may be not enough when sizeof(int) == 2. */ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1827 typedef long pattern_offset_t; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1828 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1829 typedef struct |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1830 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1831 pattern_offset_t begalt_offset; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1832 pattern_offset_t fixup_alt_jump; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
1833 pattern_offset_t laststart_offset; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1834 regnum_t regnum; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1835 } compile_stack_elt_t; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1836 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1837 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1838 typedef struct |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1839 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1840 compile_stack_elt_t *stack; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1841 unsigned size; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1842 unsigned avail; /* Offset of next open position. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1843 } compile_stack_type; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1844 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1845 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1846 #define INIT_COMPILE_STACK_SIZE 32 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1847 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1848 #define COMPILE_STACK_EMPTY (compile_stack.avail == 0) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1849 #define COMPILE_STACK_FULL (compile_stack.avail == compile_stack.size) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1850 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1851 /* The next available element. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1852 #define COMPILE_STACK_TOP (compile_stack.stack[compile_stack.avail]) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1853 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1854 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1855 /* Structure to manage work area for range table. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1856 struct range_table_work_area |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1857 { |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1858 int *table; /* actual work area. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1859 int allocated; /* allocated size for work area in bytes. */ |
18262 | 1860 int used; /* actually used size in words. */ |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
1861 int bits; /* flag to record character classes */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1862 }; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1863 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1864 /* Make sure that WORK_AREA can hold more N multibyte characters. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1865 #define EXTEND_RANGE_TABLE_WORK_AREA(work_area, n) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1866 do { \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1867 if (((work_area).used + (n)) * sizeof (int) > (work_area).allocated) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1868 { \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1869 (work_area).allocated += 16 * sizeof (int); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1870 if ((work_area).table) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1871 (work_area).table \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1872 = (int *) realloc ((work_area).table, (work_area).allocated); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1873 else \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1874 (work_area).table \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1875 = (int *) malloc ((work_area).allocated); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1876 if ((work_area).table == 0) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1877 FREE_STACK_RETURN (REG_ESPACE); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1878 } \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1879 } while (0) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1880 |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
1881 #define SET_RANGE_TABLE_WORK_AREA_BIT(work_area, bit) \ |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
1882 (work_area).bits |= (bit) |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
1883 |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1884 /* Bits used to implement the multibyte-part of the various character classes |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1885 such as [:alnum:] in a charset's range table. */ |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1886 #define BIT_WORD 0x1 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1887 #define BIT_LOWER 0x2 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1888 #define BIT_PUNCT 0x4 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1889 #define BIT_SPACE 0x8 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1890 #define BIT_UPPER 0x10 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1891 #define BIT_MULTIBYTE 0x20 |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
1892 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1893 /* Set a range (RANGE_START, RANGE_END) to WORK_AREA. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1894 #define SET_RANGE_TABLE_WORK_AREA(work_area, range_start, range_end) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1895 do { \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1896 EXTEND_RANGE_TABLE_WORK_AREA ((work_area), 2); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1897 (work_area).table[(work_area).used++] = (range_start); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1898 (work_area).table[(work_area).used++] = (range_end); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1899 } while (0) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1900 |
18262 | 1901 /* Free allocated memory for WORK_AREA. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1902 #define FREE_RANGE_TABLE_WORK_AREA(work_area) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1903 do { \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1904 if ((work_area).table) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1905 free ((work_area).table); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1906 } while (0) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1907 |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
1908 #define CLEAR_RANGE_TABLE_WORK_USED(work_area) ((work_area).used = 0, (work_area).bits = 0) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1909 #define RANGE_TABLE_WORK_USED(work_area) ((work_area).used) |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
1910 #define RANGE_TABLE_WORK_BITS(work_area) ((work_area).bits) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1911 #define RANGE_TABLE_WORK_ELT(work_area, i) ((work_area).table[i]) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1912 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
1913 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1914 /* Set the bit for character C in a list. */ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1915 #define SET_LIST_BIT(c) (b[((c)) / BYTEWIDTH] |= 1 << ((c) % BYTEWIDTH)) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1916 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1917 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1918 /* Get the next unsigned number in the uncompiled pattern. */ |
18262 | 1919 #define GET_UNSIGNED_NUMBER(num) \ |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1920 do { if (p != pend) \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1921 { \ |
18262 | 1922 PATFETCH (c); \ |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
1923 while ('0' <= c && c <= '9') \ |
18262 | 1924 { \ |
1925 if (num < 0) \ | |
1926 num = 0; \ | |
1927 num = num * 10 + c - '0'; \ | |
1928 if (p == pend) \ | |
1929 break; \ | |
1930 PATFETCH (c); \ | |
1931 } \ | |
1932 } \ | |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
1933 } while (0) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
1934 |
32499
3a5e6f70d313
(WIDE_CHAR_SUPPORT): Define if _LIBC as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31729
diff
changeset
|
1935 #if WIDE_CHAR_SUPPORT |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1936 /* The GNU C library provides support for user-defined character classes |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1937 and the functions from ISO C amendement 1. */ |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1938 # ifdef CHARCLASS_NAME_MAX |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1939 # define CHAR_CLASS_MAX_LENGTH CHARCLASS_NAME_MAX |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1940 # else |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1941 /* This shouldn't happen but some implementation might still have this |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1942 problem. Use a reasonable default value. */ |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1943 # define CHAR_CLASS_MAX_LENGTH 256 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1944 # endif |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1945 typedef wctype_t re_wctype_t; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1946 typedef wchar_t re_wchar_t; |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1947 # define re_wctype wctype |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1948 # define re_iswctype iswctype |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1949 # define re_wctype_to_bit(cc) 0 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1950 #else |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1951 # define CHAR_CLASS_MAX_LENGTH 9 /* Namely, `multibyte'. */ |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1952 # define btowc(c) c |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1953 |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1954 /* Character classes. */ |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1955 typedef enum { RECC_ERROR = 0, |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1956 RECC_ALNUM, RECC_ALPHA, RECC_WORD, |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1957 RECC_GRAPH, RECC_PRINT, |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1958 RECC_LOWER, RECC_UPPER, |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1959 RECC_PUNCT, RECC_CNTRL, |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1960 RECC_DIGIT, RECC_XDIGIT, |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1961 RECC_BLANK, RECC_SPACE, |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1962 RECC_MULTIBYTE, RECC_NONASCII, |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1963 RECC_ASCII, RECC_UNIBYTE |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1964 } re_wctype_t; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1965 |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1966 typedef int re_wchar_t; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
1967 |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1968 /* Map a string to the char class it names (if any). */ |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1969 static re_wctype_t |
40650
ded4aa3c81b2
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39718
diff
changeset
|
1970 re_wctype (str) |
ded4aa3c81b2
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39718
diff
changeset
|
1971 re_char *str; |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1972 { |
40650
ded4aa3c81b2
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39718
diff
changeset
|
1973 const char *string = str; |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1974 if (STREQ (string, "alnum")) return RECC_ALNUM; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1975 else if (STREQ (string, "alpha")) return RECC_ALPHA; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1976 else if (STREQ (string, "word")) return RECC_WORD; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1977 else if (STREQ (string, "ascii")) return RECC_ASCII; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1978 else if (STREQ (string, "nonascii")) return RECC_NONASCII; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1979 else if (STREQ (string, "graph")) return RECC_GRAPH; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1980 else if (STREQ (string, "lower")) return RECC_LOWER; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1981 else if (STREQ (string, "print")) return RECC_PRINT; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1982 else if (STREQ (string, "punct")) return RECC_PUNCT; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1983 else if (STREQ (string, "space")) return RECC_SPACE; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1984 else if (STREQ (string, "upper")) return RECC_UPPER; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1985 else if (STREQ (string, "unibyte")) return RECC_UNIBYTE; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1986 else if (STREQ (string, "multibyte")) return RECC_MULTIBYTE; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1987 else if (STREQ (string, "digit")) return RECC_DIGIT; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1988 else if (STREQ (string, "xdigit")) return RECC_XDIGIT; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1989 else if (STREQ (string, "cntrl")) return RECC_CNTRL; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1990 else if (STREQ (string, "blank")) return RECC_BLANK; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1991 else return 0; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1992 } |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1993 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1994 /* True iff CH is in the char class CC. */ |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1995 static boolean |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1996 re_iswctype (ch, cc) |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1997 int ch; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1998 re_wctype_t cc; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
1999 { |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2000 switch (cc) |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2001 { |
33066
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2002 case RECC_ALNUM: return ISALNUM (ch); |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2003 case RECC_ALPHA: return ISALPHA (ch); |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2004 case RECC_BLANK: return ISBLANK (ch); |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2005 case RECC_CNTRL: return ISCNTRL (ch); |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2006 case RECC_DIGIT: return ISDIGIT (ch); |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2007 case RECC_GRAPH: return ISGRAPH (ch); |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2008 case RECC_LOWER: return ISLOWER (ch); |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2009 case RECC_PRINT: return ISPRINT (ch); |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2010 case RECC_PUNCT: return ISPUNCT (ch); |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2011 case RECC_SPACE: return ISSPACE (ch); |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2012 case RECC_UPPER: return ISUPPER (ch); |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2013 case RECC_XDIGIT: return ISXDIGIT (ch); |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2014 case RECC_ASCII: return IS_REAL_ASCII (ch); |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2015 case RECC_NONASCII: return !IS_REAL_ASCII (ch); |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2016 case RECC_UNIBYTE: return ISUNIBYTE (ch); |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2017 case RECC_MULTIBYTE: return !ISUNIBYTE (ch); |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2018 case RECC_WORD: return ISWORD (ch); |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2019 case RECC_ERROR: return false; |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2020 default: |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2021 abort(); |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2022 } |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2023 } |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2024 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2025 /* Return a bit-pattern to use in the range-table bits to match multibyte |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2026 chars of class CC. */ |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2027 static int |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2028 re_wctype_to_bit (cc) |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2029 re_wctype_t cc; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2030 { |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2031 switch (cc) |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2032 { |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2033 case RECC_NONASCII: case RECC_PRINT: case RECC_GRAPH: |
33066
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2034 case RECC_MULTIBYTE: return BIT_MULTIBYTE; |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2035 case RECC_ALPHA: case RECC_ALNUM: case RECC_WORD: return BIT_WORD; |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2036 case RECC_LOWER: return BIT_LOWER; |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2037 case RECC_UPPER: return BIT_UPPER; |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2038 case RECC_PUNCT: return BIT_PUNCT; |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2039 case RECC_SPACE: return BIT_SPACE; |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2040 case RECC_ASCII: case RECC_DIGIT: case RECC_XDIGIT: case RECC_CNTRL: |
33066
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2041 case RECC_BLANK: case RECC_UNIBYTE: case RECC_ERROR: return 0; |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2042 default: |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
2043 abort(); |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2044 } |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2045 } |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2046 #endif |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2047 |
32823
2a7f61d7ae12
(IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents:
32805
diff
changeset
|
2048 /* Explicit quit checking is only used on NTemacs. */ |
2a7f61d7ae12
(IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents:
32805
diff
changeset
|
2049 #if defined WINDOWSNT && defined emacs && defined QUIT |
2a7f61d7ae12
(IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents:
32805
diff
changeset
|
2050 extern int immediate_quit; |
2a7f61d7ae12
(IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents:
32805
diff
changeset
|
2051 # define IMMEDIATE_QUIT_CHECK \ |
2a7f61d7ae12
(IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents:
32805
diff
changeset
|
2052 do { \ |
2a7f61d7ae12
(IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents:
32805
diff
changeset
|
2053 if (immediate_quit) QUIT; \ |
2a7f61d7ae12
(IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents:
32805
diff
changeset
|
2054 } while (0) |
2a7f61d7ae12
(IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents:
32805
diff
changeset
|
2055 #else |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
2056 # define IMMEDIATE_QUIT_CHECK ((void)0) |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2057 #endif |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2058 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2059 #ifndef MATCH_MAY_ALLOCATE |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2060 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2061 /* If we cannot allocate large objects within re_match_2_internal, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2062 we make the fail stack and register vectors global. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2063 The fail stack, we grow to the maximum size when a regexp |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2064 is compiled. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2065 The register vectors, we adjust in size each time we |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2066 compile a regexp, according to the number of registers it needs. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2067 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2068 static fail_stack_type fail_stack; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2069 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2070 /* Size with which the following vectors are currently allocated. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2071 That is so we can make them bigger as needed, |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
2072 but never make them smaller. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2073 static int regs_allocated_size; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2074 |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
2075 static re_char ** regstart, ** regend; |
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
2076 static re_char **best_regstart, **best_regend; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2077 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2078 /* Make the register vectors big enough for NUM_REGS registers, |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
2079 but don't make them smaller. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2080 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2081 static |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2082 regex_grow_registers (num_regs) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2083 int num_regs; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2084 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2085 if (num_regs > regs_allocated_size) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2086 { |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
2087 RETALLOC_IF (regstart, num_regs, re_char *); |
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
2088 RETALLOC_IF (regend, num_regs, re_char *); |
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
2089 RETALLOC_IF (best_regstart, num_regs, re_char *); |
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
2090 RETALLOC_IF (best_regend, num_regs, re_char *); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2091 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2092 regs_allocated_size = num_regs; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2093 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2094 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2095 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2096 #endif /* not MATCH_MAY_ALLOCATE */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2097 |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2098 static boolean group_in_compile_stack _RE_ARGS ((compile_stack_type |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2099 compile_stack, |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2100 regnum_t regnum)); |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2101 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2102 /* `regex_compile' compiles PATTERN (of length SIZE) according to SYNTAX. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2103 Returns one of error codes defined in `regex.h', or zero for success. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2104 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2105 Assumes the `allocated' (and perhaps `buffer') and `translate' |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2106 fields are set in BUFP on entry. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2107 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2108 If it succeeds, results are put in BUFP (if it returns an error, the |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2109 contents of BUFP are undefined): |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2110 `buffer' is the compiled pattern; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2111 `syntax' is set to SYNTAX; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2112 `used' is set to the length of the compiled pattern; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2113 `fastmap_accurate' is zero; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2114 `re_nsub' is the number of subexpressions in PATTERN; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2115 `not_bol' and `not_eol' are zero; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
2116 |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
2117 The `fastmap' field is neither examined nor set. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2118 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2119 /* Insert the `jump' from the end of last alternative to "here". |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2120 The space for the jump has already been allocated. */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2121 #define FIXUP_ALT_JUMP() \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2122 do { \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2123 if (fixup_alt_jump) \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2124 STORE_JUMP (jump, fixup_alt_jump, b); \ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2125 } while (0) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2126 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2127 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2128 /* Return, freeing storage we allocated. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2129 #define FREE_STACK_RETURN(value) \ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2130 do { \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2131 FREE_RANGE_TABLE_WORK_AREA (range_table_work); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2132 free (compile_stack.stack); \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2133 return value; \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2134 } while (0) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2135 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2136 static reg_errcode_t |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2137 regex_compile (pattern, size, syntax, bufp) |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
2138 re_char *pattern; |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
2139 size_t size; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2140 reg_syntax_t syntax; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2141 struct re_pattern_buffer *bufp; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2142 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
2143 /* We fetch characters from PATTERN here. */ |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
2144 register re_wchar_t c, c1; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
2145 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2146 /* A random temporary spot in PATTERN. */ |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
2147 re_char *p1; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2148 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2149 /* Points to the end of the buffer, where we should append. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2150 register unsigned char *b; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
2151 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2152 /* Keeps track of unclosed groups. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2153 compile_stack_type compile_stack; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2154 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2155 /* Points to the current (ending) position in the pattern. */ |
22821
dc8ce74d8633
(regex_compile): Declare p with non-const type on AIX.
Richard M. Stallman <rms@gnu.org>
parents:
22411
diff
changeset
|
2156 #ifdef AIX |
dc8ce74d8633
(regex_compile): Declare p with non-const type on AIX.
Richard M. Stallman <rms@gnu.org>
parents:
22411
diff
changeset
|
2157 /* `const' makes AIX compiler fail. */ |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
2158 unsigned char *p = pattern; |
22821
dc8ce74d8633
(regex_compile): Declare p with non-const type on AIX.
Richard M. Stallman <rms@gnu.org>
parents:
22411
diff
changeset
|
2159 #else |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
2160 re_char *p = pattern; |
22821
dc8ce74d8633
(regex_compile): Declare p with non-const type on AIX.
Richard M. Stallman <rms@gnu.org>
parents:
22411
diff
changeset
|
2161 #endif |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
2162 re_char *pend = pattern + size; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
2163 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2164 /* How to translate the characters in the pattern. */ |
13250
52e053f46f76
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard M. Stallman <rms@gnu.org>
parents:
13100
diff
changeset
|
2165 RE_TRANSLATE_TYPE translate = bufp->translate; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2166 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2167 /* Address of the count-byte of the most recently inserted `exactn' |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2168 command. This makes it possible to tell if a new exact-match |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2169 character can be added to that command or if the character requires |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2170 a new `exactn' command. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2171 unsigned char *pending_exact = 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2172 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2173 /* Address of start of the most recently finished expression. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2174 This tells, e.g., postfix * where to find the start of its |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2175 operand. Reset at the beginning of groups and alternatives. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2176 unsigned char *laststart = 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2177 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2178 /* Address of beginning of regexp, or inside of last group. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2179 unsigned char *begalt; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2180 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2181 /* Place in the uncompiled pattern (i.e., the {) to |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2182 which to go back if the interval is invalid. */ |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
2183 re_char *beg_interval; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
2184 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2185 /* Address of the place where a forward jump should go to the end of |
18262 | 2186 the containing expression. Each alternative of an `or' -- except the |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2187 last -- ends with a forward jump of this sort. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2188 unsigned char *fixup_alt_jump = 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2189 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2190 /* Counts open-groups as they are encountered. Remembered for the |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2191 matching close-group on the compile stack, so the same register |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2192 number is put in the stop_memory as the start_memory. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2193 regnum_t regnum = 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2194 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2195 /* Work area for range table of charset. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2196 struct range_table_work_area range_table_work; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2197 |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
2198 /* If the object matched can contain multibyte characters. */ |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
2199 const boolean multibyte = RE_MULTIBYTE_P (bufp); |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
2200 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2201 #ifdef DEBUG |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2202 debug++; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2203 DEBUG_PRINT1 ("\nCompiling pattern: "); |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2204 if (debug > 0) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2205 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2206 unsigned debug_count; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
2207 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2208 for (debug_count = 0; debug_count < size; debug_count++) |
18262 | 2209 putchar (pattern[debug_count]); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2210 putchar ('\n'); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2211 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2212 #endif /* DEBUG */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2213 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2214 /* Initialize the compile stack. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2215 compile_stack.stack = TALLOC (INIT_COMPILE_STACK_SIZE, compile_stack_elt_t); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2216 if (compile_stack.stack == NULL) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2217 return REG_ESPACE; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2218 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2219 compile_stack.size = INIT_COMPILE_STACK_SIZE; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2220 compile_stack.avail = 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2221 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2222 range_table_work.table = 0; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2223 range_table_work.allocated = 0; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2224 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2225 /* Initialize the pattern buffer. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2226 bufp->syntax = syntax; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2227 bufp->fastmap_accurate = 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2228 bufp->not_bol = bufp->not_eol = 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2229 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2230 /* Set `used' to zero, so that if we return an error, the pattern |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2231 printer (for debugging) will think there's no pattern. We reset it |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2232 at the end. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2233 bufp->used = 0; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
2234 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2235 /* Always count groups, whether or not bufp->no_sub is set. */ |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
2236 bufp->re_nsub = 0; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2237 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
2238 #if !defined emacs && !defined SYNTAX_TABLE |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2239 /* Initialize the syntax table. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2240 init_syntax_once (); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2241 #endif |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2242 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2243 if (bufp->allocated == 0) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2244 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2245 if (bufp->buffer) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2246 { /* If zero allocated, but buffer is non-null, try to realloc |
18262 | 2247 enough space. This loses if buffer's address is bogus, but |
2248 that is the user's responsibility. */ | |
2249 RETALLOC (bufp->buffer, INIT_BUF_SIZE, unsigned char); | |
2250 } | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2251 else |
18262 | 2252 { /* Caller did not allocate a buffer. Do it for them. */ |
2253 bufp->buffer = TALLOC (INIT_BUF_SIZE, unsigned char); | |
2254 } | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2255 if (!bufp->buffer) FREE_STACK_RETURN (REG_ESPACE); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2256 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2257 bufp->allocated = INIT_BUF_SIZE; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2258 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2259 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2260 begalt = b = bufp->buffer; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2261 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2262 /* Loop through the uncompiled pattern until we're at the end. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2263 while (p != pend) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2264 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2265 PATFETCH (c); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2266 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2267 switch (c) |
18262 | 2268 { |
2269 case '^': | |
2270 { | |
2271 if ( /* If at start of pattern, it's an operator. */ | |
2272 p == pattern + 1 | |
2273 /* If context independent, it's an operator. */ | |
2274 || syntax & RE_CONTEXT_INDEP_ANCHORS | |
2275 /* Otherwise, depends on what's come before. */ | |
2276 || at_begline_loc_p (pattern, p, syntax)) | |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
2277 BUF_PUSH ((syntax & RE_NO_NEWLINE_ANCHOR) ? begbuf : begline); |
18262 | 2278 else |
2279 goto normal_char; | |
2280 } | |
2281 break; | |
2282 | |
2283 | |
2284 case '$': | |
2285 { | |
2286 if ( /* If at end of pattern, it's an operator. */ | |
2287 p == pend | |
2288 /* If context independent, it's an operator. */ | |
2289 || syntax & RE_CONTEXT_INDEP_ANCHORS | |
2290 /* Otherwise, depends on what's next. */ | |
2291 || at_endline_loc_p (p, pend, syntax)) | |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
2292 BUF_PUSH ((syntax & RE_NO_NEWLINE_ANCHOR) ? endbuf : endline); |
18262 | 2293 else |
2294 goto normal_char; | |
2295 } | |
2296 break; | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2297 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2298 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2299 case '+': |
18262 | 2300 case '?': |
2301 if ((syntax & RE_BK_PLUS_QM) | |
2302 || (syntax & RE_LIMITED_OPS)) | |
2303 goto normal_char; | |
2304 handle_plus: | |
2305 case '*': | |
2306 /* If there is no previous pattern... */ | |
2307 if (!laststart) | |
2308 { | |
2309 if (syntax & RE_CONTEXT_INVALID_OPS) | |
2310 FREE_STACK_RETURN (REG_BADRPT); | |
2311 else if (!(syntax & RE_CONTEXT_INDEP_OPS)) | |
2312 goto normal_char; | |
2313 } | |
2314 | |
2315 { | |
2316 /* 1 means zero (many) matches is allowed. */ | |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
2317 boolean zero_times_ok = 0, many_times_ok = 0; |
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
2318 boolean greedy = 1; |
18262 | 2319 |
2320 /* If there is a sequence of repetition chars, collapse it | |
2321 down to just one (the right one). We can't combine | |
2322 interval operators with these because of, e.g., `a{2}*', | |
2323 which should only match an even number of `a's. */ | |
2324 | |
2325 for (;;) | |
2326 { | |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
2327 if ((syntax & RE_FRUGAL) |
26906
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2328 && c == '?' && (zero_times_ok || many_times_ok)) |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2329 greedy = 0; |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2330 else |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2331 { |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2332 zero_times_ok |= c != '+'; |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2333 many_times_ok |= c != '?'; |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2334 } |
18262 | 2335 |
2336 if (p == pend) | |
2337 break; | |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2338 else if (*p == '*' |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2339 || (!(syntax & RE_BK_PLUS_QM) |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2340 && (*p == '+' || *p == '?'))) |
18262 | 2341 ; |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2342 else if (syntax & RE_BK_PLUS_QM && *p == '\\') |
18262 | 2343 { |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2344 if (p+1 == pend) |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2345 FREE_STACK_RETURN (REG_EESCAPE); |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2346 if (p[1] == '+' || p[1] == '?') |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2347 PATFETCH (c); /* Gobble up the backslash. */ |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2348 else |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2349 break; |
18262 | 2350 } |
2351 else | |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2352 break; |
18262 | 2353 /* If we get here, we found another repeat character. */ |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2354 PATFETCH (c); |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2355 } |
18262 | 2356 |
2357 /* Star, etc. applied to an empty pattern is equivalent | |
2358 to an empty pattern. */ | |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2359 if (!laststart || laststart == b) |
18262 | 2360 break; |
2361 | |
2362 /* Now we know whether or not zero matches is allowed | |
2363 and also whether or not two or more matches is allowed. */ | |
26906
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2364 if (greedy) |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2365 { |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2366 if (many_times_ok) |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2367 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2368 boolean simple = skip_one_char (laststart) == b; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2369 unsigned int startoffset = 0; |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
2370 re_opcode_t ofj = |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
2371 /* Check if the loop can match the empty string. */ |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
2372 (simple || !analyse_first (laststart, b, NULL, 0)) ? |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
2373 on_failure_jump : on_failure_jump_loop; |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2374 assert (skip_one_char (laststart) <= b); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2375 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2376 if (!zero_times_ok && simple) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2377 { /* Since simple * loops can be made faster by using |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2378 on_failure_keep_string_jump, we turn simple P+ |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2379 into PP* if P is simple. */ |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2380 unsigned char *p1, *p2; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2381 startoffset = b - laststart; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2382 GET_BUFFER_SPACE (startoffset); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2383 p1 = b; p2 = laststart; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2384 while (p2 < p1) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2385 *b++ = *p2++; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2386 zero_times_ok = 1; |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2387 } |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2388 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2389 GET_BUFFER_SPACE (6); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2390 if (!zero_times_ok) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2391 /* A + loop. */ |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
2392 STORE_JUMP (ofj, b, b + 6); |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2393 else |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2394 /* Simple * loops can use on_failure_keep_string_jump |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2395 depending on what follows. But since we don't know |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2396 that yet, we leave the decision up to |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2397 on_failure_jump_smart. */ |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
2398 INSERT_JUMP (simple ? on_failure_jump_smart : ofj, |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2399 laststart + startoffset, b + 6); |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2400 b += 3; |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2401 STORE_JUMP (jump, b, laststart + startoffset); |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2402 b += 3; |
18262 | 2403 } |
2404 else | |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2405 { |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2406 /* A simple ? pattern. */ |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2407 assert (zero_times_ok); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2408 GET_BUFFER_SPACE (3); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2409 INSERT_JUMP (on_failure_jump, laststart, b + 3); |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2410 b += 3; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2411 } |
26906
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2412 } |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2413 else /* not greedy */ |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2414 { /* I wish the greedy and non-greedy cases could be merged. */ |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2415 |
28342
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
2416 GET_BUFFER_SPACE (7); /* We might use less. */ |
26906
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2417 if (many_times_ok) |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2418 { |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
2419 boolean emptyp = analyse_first (laststart, b, NULL, 0); |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
2420 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2421 /* The non-greedy multiple match looks like a repeat..until: |
26906
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2422 we only need a conditional jump at the end of the loop */ |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
2423 if (emptyp) BUF_PUSH (no_op); |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
2424 STORE_JUMP (emptyp ? on_failure_jump_nastyloop |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
2425 : on_failure_jump, b, laststart); |
26906
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2426 b += 3; |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2427 if (zero_times_ok) |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2428 { |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2429 /* The repeat...until naturally matches one or more. |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2430 To also match zero times, we need to first jump to |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2431 the end of the loop (its conditional jump). */ |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2432 INSERT_JUMP (jump, laststart, b); |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2433 b += 3; |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2434 } |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2435 } |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2436 else |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2437 { |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2438 /* non-greedy a?? */ |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2439 INSERT_JUMP (jump, laststart, b + 3); |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2440 b += 3; |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2441 INSERT_JUMP (on_failure_jump, laststart, laststart + 6); |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2442 b += 3; |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2443 } |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2444 } |
5eb1e428de28
1999-12-15 Kenichi Handa <handa@etl.go.jp>
Dave Love <fx@gnu.org>
parents:
26237
diff
changeset
|
2445 } |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
2446 pending_exact = 0; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2447 break; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2448 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2449 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2450 case '.': |
18262 | 2451 laststart = b; |
2452 BUF_PUSH (anychar); | |
2453 break; | |
2454 | |
2455 | |
2456 case '[': | |
2457 { | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2458 CLEAR_RANGE_TABLE_WORK_USED (range_table_work); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2459 |
18262 | 2460 if (p == pend) FREE_STACK_RETURN (REG_EBRACK); |
2461 | |
2462 /* Ensure that we have enough space to push a charset: the | |
2463 opcode, the length count, and the bitset; 34 bytes in all. */ | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2464 GET_BUFFER_SPACE (34); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2465 |
18262 | 2466 laststart = b; |
2467 | |
2468 /* We test `*p == '^' twice, instead of using an if | |
2469 statement, so we only need one BUF_PUSH. */ | |
2470 BUF_PUSH (*p == '^' ? charset_not : charset); | |
2471 if (*p == '^') | |
2472 p++; | |
2473 | |
2474 /* Remember the first position in the bracket expression. */ | |
2475 p1 = p; | |
2476 | |
2477 /* Push the number of bytes in the bitmap. */ | |
2478 BUF_PUSH ((1 << BYTEWIDTH) / BYTEWIDTH); | |
2479 | |
2480 /* Clear the whole map. */ | |
2481 bzero (b, (1 << BYTEWIDTH) / BYTEWIDTH); | |
2482 | |
2483 /* charset_not matches newline according to a syntax bit. */ | |
2484 if ((re_opcode_t) b[-2] == charset_not | |
2485 && (syntax & RE_HAT_LISTS_NOT_NEWLINE)) | |
2486 SET_LIST_BIT ('\n'); | |
2487 | |
2488 /* Read in characters and ranges, setting map bits. */ | |
2489 for (;;) | |
2490 { | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2491 boolean escaped_char = false; |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
2492 const unsigned char *p2 = p; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2493 |
18262 | 2494 if (p == pend) FREE_STACK_RETURN (REG_EBRACK); |
2495 | |
2496 PATFETCH (c); | |
2497 | |
2498 /* \ might escape characters inside [...] and [^...]. */ | |
2499 if ((syntax & RE_BACKSLASH_ESCAPE_IN_LISTS) && c == '\\') | |
2500 { | |
2501 if (p == pend) FREE_STACK_RETURN (REG_EESCAPE); | |
16010 | 2502 |
2503 PATFETCH (c); | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2504 escaped_char = true; |
18262 | 2505 } |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2506 else |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2507 { |
19184 | 2508 /* Could be the end of the bracket expression. If it's |
2509 not (i.e., when the bracket expression is `[]' so | |
2510 far), the ']' character bit gets set way below. */ | |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
2511 if (c == ']' && p2 != p1) |
19184 | 2512 break; |
18262 | 2513 } |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2514 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2515 /* What should we do for the character which is |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2516 greater than 0x7F, but not BASE_LEADING_CODE_P? |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2517 XXX */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2518 |
18262 | 2519 /* See if we're at the beginning of a possible character |
2520 class. */ | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2521 |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
2522 if (!escaped_char && |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
2523 syntax & RE_CHAR_CLASSES && c == '[' && *p == ':') |
19184 | 2524 { |
2525 /* Leave room for the null. */ | |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2526 unsigned char str[CHAR_CLASS_MAX_LENGTH + 1]; |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2527 const unsigned char *class_beg; |
18262 | 2528 |
2529 PATFETCH (c); | |
2530 c1 = 0; | |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2531 class_beg = p; |
18262 | 2532 |
2533 /* If pattern is `[[:'. */ | |
2534 if (p == pend) FREE_STACK_RETURN (REG_EBRACK); | |
2535 | |
2536 for (;;) | |
2537 { | |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2538 PATFETCH (c); |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2539 if ((c == ':' && *p == ']') || p == pend) |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2540 break; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2541 if (c1 < CHAR_CLASS_MAX_LENGTH) |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2542 str[c1++] = c; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2543 else |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2544 /* This is in any case an invalid class name. */ |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2545 str[0] = '\0'; |
18262 | 2546 } |
2547 str[c1] = '\0'; | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2548 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2549 /* If isn't a word bracketed by `[:' and `:]': |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2550 undo the ending character, the letters, and |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2551 leave the leading `:' and `[' (but set bits for |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2552 them). */ |
18262 | 2553 if (c == ':' && *p == ']') |
2554 { | |
2555 int ch; | |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2556 re_wctype_t cc; |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2557 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2558 cc = re_wctype (str); |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2559 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2560 if (cc == 0) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2561 FREE_STACK_RETURN (REG_ECTYPE); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2562 |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2563 /* Throw away the ] at the end of the character |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2564 class. */ |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2565 PATFETCH (c); |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2566 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2567 if (p == pend) FREE_STACK_RETURN (REG_EBRACK); |
18262 | 2568 |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
2569 /* Most character classes in a multibyte match |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
2570 just set a flag. Exceptions are is_blank, |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
2571 is_digit, is_cntrl, and is_xdigit, since |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
2572 they can only match ASCII characters. We |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2573 don't need to handle them for multibyte. |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2574 They are distinguished by a negative wctype. */ |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
2575 |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
2576 if (multibyte) |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2577 SET_RANGE_TABLE_WORK_AREA_BIT (range_table_work, |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2578 re_wctype_to_bit (cc)); |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2579 |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2580 for (ch = 0; ch < 1 << BYTEWIDTH; ++ch) |
18262 | 2581 { |
16239
c196d1ded35c
(regex_compile): Use TRANSLATE before calling SET_LIST_BIT.
Richard M. Stallman <rms@gnu.org>
parents:
16034
diff
changeset
|
2582 int translated = TRANSLATE (ch); |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
2583 if (re_iswctype (btowc (ch), cc)) |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
2584 SET_LIST_BIT (translated); |
18262 | 2585 } |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2586 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2587 /* Repeat the loop. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2588 continue; |
18262 | 2589 } |
2590 else | |
2591 { | |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2592 /* Go back to right after the "[:". */ |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2593 p = class_beg; |
18262 | 2594 SET_LIST_BIT ('['); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2595 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2596 /* Because the `:' may starts the range, we |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2597 can't simply set bit and repeat the loop. |
18262 | 2598 Instead, just set it to C and handle below. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2599 c = ':'; |
18262 | 2600 } |
2601 } | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2602 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2603 if (p < pend && p[0] == '-' && p[1] != ']') |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2604 { |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2605 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2606 /* Discard the `-'. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2607 PATFETCH (c1); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2608 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2609 /* Fetch the character which ends the range. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2610 PATFETCH (c1); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2611 |
29546
fbe764633971
(MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents:
29296
diff
changeset
|
2612 if (SINGLE_BYTE_CHAR_P (c)) |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
2613 { |
29546
fbe764633971
(MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents:
29296
diff
changeset
|
2614 if (! SINGLE_BYTE_CHAR_P (c1)) |
fbe764633971
(MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents:
29296
diff
changeset
|
2615 { |
32804
45c2b9e0aa68
(regex_compile): Change the way of handling a range from a char less
Kenichi Handa <handa@m17n.org>
parents:
32565
diff
changeset
|
2616 /* Handle a range starting with a |
45c2b9e0aa68
(regex_compile): Change the way of handling a range from a char less
Kenichi Handa <handa@m17n.org>
parents:
32565
diff
changeset
|
2617 character of less than 256, and ending |
45c2b9e0aa68
(regex_compile): Change the way of handling a range from a char less
Kenichi Handa <handa@m17n.org>
parents:
32565
diff
changeset
|
2618 with a character of not less than 256. |
45c2b9e0aa68
(regex_compile): Change the way of handling a range from a char less
Kenichi Handa <handa@m17n.org>
parents:
32565
diff
changeset
|
2619 Split that into two ranges, the low one |
45c2b9e0aa68
(regex_compile): Change the way of handling a range from a char less
Kenichi Handa <handa@m17n.org>
parents:
32565
diff
changeset
|
2620 ending at 0377, and the high one |
45c2b9e0aa68
(regex_compile): Change the way of handling a range from a char less
Kenichi Handa <handa@m17n.org>
parents:
32565
diff
changeset
|
2621 starting at the smallest character in |
45c2b9e0aa68
(regex_compile): Change the way of handling a range from a char less
Kenichi Handa <handa@m17n.org>
parents:
32565
diff
changeset
|
2622 the charset of C1 and ending at C1. */ |
29546
fbe764633971
(MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents:
29296
diff
changeset
|
2623 int charset = CHAR_CHARSET (c1); |
fbe764633971
(MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents:
29296
diff
changeset
|
2624 int c2 = MAKE_CHAR (charset, 0, 0); |
fbe764633971
(MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents:
29296
diff
changeset
|
2625 |
fbe764633971
(MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents:
29296
diff
changeset
|
2626 SET_RANGE_TABLE_WORK_AREA (range_table_work, |
fbe764633971
(MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents:
29296
diff
changeset
|
2627 c2, c1); |
32805
112b31ea0526
(regex_compile): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
32804
diff
changeset
|
2628 c1 = 0377; |
29546
fbe764633971
(MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
Kenichi Handa <handa@m17n.org>
parents:
29296
diff
changeset
|
2629 } |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
2630 } |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
2631 else if (!SAME_CHARSET_P (c, c1)) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2632 FREE_STACK_RETURN (REG_ERANGE); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2633 } |
18262 | 2634 else |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2635 /* Range from C to C. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2636 c1 = c; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2637 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2638 /* Set the range ... */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2639 if (SINGLE_BYTE_CHAR_P (c)) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2640 /* ... into bitmap. */ |
18262 | 2641 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
2642 re_wchar_t this_char; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2643 int range_start = c, range_end = c1; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2644 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2645 /* If the start is after the end, the range is empty. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2646 if (range_start > range_end) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2647 { |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2648 if (syntax & RE_NO_EMPTY_RANGES) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2649 FREE_STACK_RETURN (REG_ERANGE); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2650 /* Else, repeat the loop. */ |
16010 | 2651 } |
2652 else | |
2653 { | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2654 for (this_char = range_start; this_char <= range_end; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2655 this_char++) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2656 SET_LIST_BIT (TRANSLATE (this_char)); |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
2657 } |
18262 | 2658 } |
16010 | 2659 else |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2660 /* ... into range table. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2661 SET_RANGE_TABLE_WORK_AREA (range_table_work, c, c1); |
16010 | 2662 } |
2663 | |
18262 | 2664 /* Discard any (non)matching list bytes that are all 0 at the |
2665 end of the map. Decrease the map-length byte too. */ | |
2666 while ((int) b[-1] > 0 && b[b[-1] - 1] == 0) | |
2667 b[-1]--; | |
2668 b += b[-1]; | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2669 |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
2670 /* Build real range table from work area. */ |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
2671 if (RANGE_TABLE_WORK_USED (range_table_work) |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
2672 || RANGE_TABLE_WORK_BITS (range_table_work)) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2673 { |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2674 int i; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2675 int used = RANGE_TABLE_WORK_USED (range_table_work); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2676 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2677 /* Allocate space for COUNT + RANGE_TABLE. Needs two |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
2678 bytes for flags, two for COUNT, and three bytes for |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
2679 each character. */ |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
2680 GET_BUFFER_SPACE (4 + used * 3); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2681 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2682 /* Indicate the existence of range table. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2683 laststart[1] |= 0x80; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2684 |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
2685 /* Store the character class flag bits into the range table. |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
2686 If not in emacs, these flag bits are always 0. */ |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
2687 *b++ = RANGE_TABLE_WORK_BITS (range_table_work) & 0xff; |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
2688 *b++ = RANGE_TABLE_WORK_BITS (range_table_work) >> 8; |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
2689 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2690 STORE_NUMBER_AND_INCR (b, used / 2); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2691 for (i = 0; i < used; i++) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2692 STORE_CHARACTER_AND_INCR |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2693 (b, RANGE_TABLE_WORK_ELT (range_table_work, i)); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
2694 } |
18262 | 2695 } |
2696 break; | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2697 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2698 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2699 case '(': |
18262 | 2700 if (syntax & RE_NO_BK_PARENS) |
2701 goto handle_open; | |
2702 else | |
2703 goto normal_char; | |
2704 | |
2705 | |
2706 case ')': | |
2707 if (syntax & RE_NO_BK_PARENS) | |
2708 goto handle_close; | |
2709 else | |
2710 goto normal_char; | |
2711 | |
2712 | |
2713 case '\n': | |
2714 if (syntax & RE_NEWLINE_ALT) | |
2715 goto handle_alt; | |
2716 else | |
2717 goto normal_char; | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2718 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2719 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2720 case '|': |
18262 | 2721 if (syntax & RE_NO_BK_VBAR) |
2722 goto handle_alt; | |
2723 else | |
2724 goto normal_char; | |
2725 | |
2726 | |
2727 case '{': | |
2728 if (syntax & RE_INTERVALS && syntax & RE_NO_BK_BRACES) | |
2729 goto handle_interval; | |
2730 else | |
2731 goto normal_char; | |
2732 | |
2733 | |
2734 case '\\': | |
2735 if (p == pend) FREE_STACK_RETURN (REG_EESCAPE); | |
2736 | |
2737 /* Do not translate the character after the \, so that we can | |
2738 distinguish, e.g., \B from \b, even if we normally would | |
2739 translate, e.g., B to b. */ | |
2740 PATFETCH_RAW (c); | |
2741 | |
2742 switch (c) | |
2743 { | |
2744 case '(': | |
2745 if (syntax & RE_NO_BK_PARENS) | |
2746 goto normal_backslash; | |
2747 | |
2748 handle_open: | |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2749 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2750 int shy = 0; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2751 if (p+1 < pend) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2752 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2753 /* Look for a special (?...) construct */ |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2754 if ((syntax & RE_SHY_GROUPS) && *p == '?') |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2755 { |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2756 PATFETCH (c); /* Gobble up the '?'. */ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2757 PATFETCH (c); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2758 switch (c) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2759 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2760 case ':': shy = 1; break; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2761 default: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2762 /* Only (?:...) is supported right now. */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2763 FREE_STACK_RETURN (REG_BADPAT); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2764 } |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2765 } |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2766 } |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2767 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2768 if (!shy) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2769 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2770 bufp->re_nsub++; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2771 regnum++; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2772 } |
18262 | 2773 |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2774 if (COMPILE_STACK_FULL) |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2775 { |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2776 RETALLOC (compile_stack.stack, compile_stack.size << 1, |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2777 compile_stack_elt_t); |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2778 if (compile_stack.stack == NULL) return REG_ESPACE; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2779 |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2780 compile_stack.size <<= 1; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2781 } |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2782 |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2783 /* These are the values to restore when we hit end of this |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2784 group. They are all relative offsets, so that if the |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2785 whole pattern moves because of realloc, they will still |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2786 be valid. */ |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2787 COMPILE_STACK_TOP.begalt_offset = begalt - bufp->buffer; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2788 COMPILE_STACK_TOP.fixup_alt_jump |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2789 = fixup_alt_jump ? fixup_alt_jump - bufp->buffer + 1 : 0; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2790 COMPILE_STACK_TOP.laststart_offset = b - bufp->buffer; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2791 COMPILE_STACK_TOP.regnum = shy ? -regnum : regnum; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2792 |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2793 /* Do not push a |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2794 start_memory for groups beyond the last one we can |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2795 represent in the compiled pattern. */ |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2796 if (regnum <= MAX_REGNUM && !shy) |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2797 BUF_PUSH_2 (start_memory, regnum); |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2798 |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2799 compile_stack.avail++; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2800 |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2801 fixup_alt_jump = 0; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2802 laststart = 0; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2803 begalt = b; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2804 /* If we've reached MAX_REGNUM groups, then this open |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2805 won't actually generate any code, so we'll have to |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2806 clear pending_exact explicitly. */ |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2807 pending_exact = 0; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2808 break; |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2809 } |
18262 | 2810 |
2811 case ')': | |
2812 if (syntax & RE_NO_BK_PARENS) goto normal_backslash; | |
2813 | |
2814 if (COMPILE_STACK_EMPTY) | |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2815 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2816 if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2817 goto normal_backslash; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2818 else |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2819 FREE_STACK_RETURN (REG_ERPAREN); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2820 } |
18262 | 2821 |
2822 handle_close: | |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2823 FIXUP_ALT_JUMP (); |
18262 | 2824 |
2825 /* See similar code for backslashed left paren above. */ | |
2826 if (COMPILE_STACK_EMPTY) | |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2827 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2828 if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2829 goto normal_char; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2830 else |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2831 FREE_STACK_RETURN (REG_ERPAREN); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2832 } |
18262 | 2833 |
2834 /* Since we just checked for an empty stack above, this | |
2835 ``can't happen''. */ | |
2836 assert (compile_stack.avail != 0); | |
2837 { | |
2838 /* We don't just want to restore into `regnum', because | |
2839 later groups should continue to be numbered higher, | |
2840 as in `(ab)c(de)' -- the second group is #2. */ | |
2841 regnum_t this_group_regnum; | |
2842 | |
2843 compile_stack.avail--; | |
2844 begalt = bufp->buffer + COMPILE_STACK_TOP.begalt_offset; | |
2845 fixup_alt_jump | |
2846 = COMPILE_STACK_TOP.fixup_alt_jump | |
2847 ? bufp->buffer + COMPILE_STACK_TOP.fixup_alt_jump - 1 | |
2848 : 0; | |
2849 laststart = bufp->buffer + COMPILE_STACK_TOP.laststart_offset; | |
2850 this_group_regnum = COMPILE_STACK_TOP.regnum; | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2851 /* If we've reached MAX_REGNUM groups, then this open |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2852 won't actually generate any code, so we'll have to |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2853 clear pending_exact explicitly. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2854 pending_exact = 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
2855 |
18262 | 2856 /* We're at the end of the group, so now we know how many |
2857 groups were inside this one. */ | |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2858 if (this_group_regnum <= MAX_REGNUM && this_group_regnum > 0) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2859 BUF_PUSH_2 (stop_memory, this_group_regnum); |
18262 | 2860 } |
2861 break; | |
2862 | |
2863 | |
2864 case '|': /* `\|'. */ | |
2865 if (syntax & RE_LIMITED_OPS || syntax & RE_NO_BK_VBAR) | |
2866 goto normal_backslash; | |
2867 handle_alt: | |
2868 if (syntax & RE_LIMITED_OPS) | |
2869 goto normal_char; | |
2870 | |
2871 /* Insert before the previous alternative a jump which | |
2872 jumps to this alternative if the former fails. */ | |
2873 GET_BUFFER_SPACE (3); | |
2874 INSERT_JUMP (on_failure_jump, begalt, b + 6); | |
2875 pending_exact = 0; | |
2876 b += 3; | |
2877 | |
2878 /* The alternative before this one has a jump after it | |
2879 which gets executed if it gets matched. Adjust that | |
2880 jump so it will jump to this alternative's analogous | |
2881 jump (put in below, which in turn will jump to the next | |
2882 (if any) alternative's such jump, etc.). The last such | |
2883 jump jumps to the correct final destination. A picture: | |
2884 _____ _____ | |
2885 | | | | | |
2886 | v | v | |
2887 a | b | c | |
2888 | |
2889 If we are at `b', then fixup_alt_jump right now points to a | |
2890 three-byte space after `a'. We'll put in the jump, set | |
2891 fixup_alt_jump to right after `b', and leave behind three | |
2892 bytes which we'll fill in when we get to after `c'. */ | |
2893 | |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
2894 FIXUP_ALT_JUMP (); |
18262 | 2895 |
2896 /* Mark and leave space for a jump after this alternative, | |
2897 to be filled in later either by next alternative or | |
2898 when know we're at the end of a series of alternatives. */ | |
2899 fixup_alt_jump = b; | |
2900 GET_BUFFER_SPACE (3); | |
2901 b += 3; | |
2902 | |
2903 laststart = 0; | |
2904 begalt = b; | |
2905 break; | |
2906 | |
2907 | |
2908 case '{': | |
2909 /* If \{ is a literal. */ | |
2910 if (!(syntax & RE_INTERVALS) | |
2911 /* If we're at `\{' and it's not the open-interval | |
2912 operator. */ | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
2913 || (syntax & RE_NO_BK_BRACES)) |
18262 | 2914 goto normal_backslash; |
2915 | |
2916 handle_interval: | |
2917 { | |
2918 /* If got here, then the syntax allows intervals. */ | |
2919 | |
2920 /* At least (most) this many matches must be made. */ | |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
2921 int lower_bound = 0, upper_bound = -1; |
18262 | 2922 |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2923 beg_interval = p; |
18262 | 2924 |
2925 if (p == pend) | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
2926 FREE_STACK_RETURN (REG_EBRACE); |
18262 | 2927 |
2928 GET_UNSIGNED_NUMBER (lower_bound); | |
2929 | |
2930 if (c == ',') | |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2931 GET_UNSIGNED_NUMBER (upper_bound); |
18262 | 2932 else |
2933 /* Interval such as `{1}' => match exactly once. */ | |
2934 upper_bound = lower_bound; | |
2935 | |
2936 if (lower_bound < 0 || upper_bound > RE_DUP_MAX | |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2937 || (upper_bound >= 0 && lower_bound > upper_bound)) |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
2938 FREE_STACK_RETURN (REG_BADBR); |
18262 | 2939 |
2940 if (!(syntax & RE_NO_BK_BRACES)) | |
2941 { | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
2942 if (c != '\\') |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
2943 FREE_STACK_RETURN (REG_BADBR); |
18262 | 2944 |
2945 PATFETCH (c); | |
2946 } | |
2947 | |
2948 if (c != '}') | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
2949 FREE_STACK_RETURN (REG_BADBR); |
18262 | 2950 |
2951 /* We just parsed a valid interval. */ | |
2952 | |
2953 /* If it's invalid to have no preceding re. */ | |
2954 if (!laststart) | |
2955 { | |
2956 if (syntax & RE_CONTEXT_INVALID_OPS) | |
2957 FREE_STACK_RETURN (REG_BADRPT); | |
2958 else if (syntax & RE_CONTEXT_INDEP_OPS) | |
2959 laststart = b; | |
2960 else | |
2961 goto unfetch_interval; | |
2962 } | |
2963 | |
2964 if (upper_bound == 0) | |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2965 /* If the upper bound is zero, just drop the sub pattern |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2966 altogether. */ |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2967 b = laststart; |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2968 else if (lower_bound == 1 && upper_bound == 1) |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2969 /* Just match it once: nothing to do here. */ |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2970 ; |
18262 | 2971 |
2972 /* Otherwise, we have a nontrivial interval. When | |
2973 we're all done, the pattern will look like: | |
2974 set_number_at <jump count> <upper bound> | |
2975 set_number_at <succeed_n count> <lower bound> | |
2976 succeed_n <after jump addr> <succeed_n count> | |
2977 <body of loop> | |
2978 jump_n <succeed_n addr> <jump count> | |
2979 (The upper bound and `jump_n' are omitted if | |
2980 `upper_bound' is 1, though.) */ | |
2981 else | |
2982 { /* If the upper bound is > 1, we need to insert | |
2983 more at the end of the loop. */ | |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2984 unsigned int nbytes = (upper_bound < 0 ? 3 |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2985 : upper_bound > 1 ? 5 : 0); |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2986 unsigned int startoffset = 0; |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2987 |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2988 GET_BUFFER_SPACE (20); /* We might use less. */ |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2989 |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2990 if (lower_bound == 0) |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2991 { |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2992 /* A succeed_n that starts with 0 is really a |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2993 a simple on_failure_jump_loop. */ |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2994 INSERT_JUMP (on_failure_jump_loop, laststart, |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2995 b + 3 + nbytes); |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2996 b += 3; |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2997 } |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2998 else |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
2999 { |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3000 /* Initialize lower bound of the `succeed_n', even |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3001 though it will be set during matching by its |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3002 attendant `set_number_at' (inserted next), |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3003 because `re_compile_fastmap' needs to know. |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3004 Jump to the `jump_n' we might insert below. */ |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3005 INSERT_JUMP2 (succeed_n, laststart, |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3006 b + 5 + nbytes, |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3007 lower_bound); |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3008 b += 5; |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3009 |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3010 /* Code to initialize the lower bound. Insert |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3011 before the `succeed_n'. The `5' is the last two |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3012 bytes of this `set_number_at', plus 3 bytes of |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3013 the following `succeed_n'. */ |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3014 insert_op2 (set_number_at, laststart, 5, lower_bound, b); |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3015 b += 5; |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3016 startoffset += 5; |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3017 } |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3018 |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3019 if (upper_bound < 0) |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3020 { |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3021 /* A negative upper bound stands for infinity, |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3022 in which case it degenerates to a plain jump. */ |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3023 STORE_JUMP (jump, b, laststart + startoffset); |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3024 b += 3; |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3025 } |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3026 else if (upper_bound > 1) |
18262 | 3027 { /* More than one repetition is allowed, so |
3028 append a backward jump to the `succeed_n' | |
3029 that starts this interval. | |
3030 | |
3031 When we've reached this during matching, | |
3032 we'll have matched the interval once, so | |
3033 jump back only `upper_bound - 1' times. */ | |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3034 STORE_JUMP2 (jump_n, b, laststart + startoffset, |
18262 | 3035 upper_bound - 1); |
3036 b += 5; | |
3037 | |
3038 /* The location we want to set is the second | |
3039 parameter of the `jump_n'; that is `b-2' as | |
3040 an absolute address. `laststart' will be | |
3041 the `set_number_at' we're about to insert; | |
3042 `laststart+3' the number to set, the source | |
3043 for the relative address. But we are | |
3044 inserting into the middle of the pattern -- | |
3045 so everything is getting moved up by 5. | |
3046 Conclusion: (b - 2) - (laststart + 3) + 5, | |
3047 i.e., b - laststart. | |
3048 | |
3049 We insert this at the beginning of the loop | |
3050 so that if we fail during matching, we'll | |
3051 reinitialize the bounds. */ | |
3052 insert_op2 (set_number_at, laststart, b - laststart, | |
3053 upper_bound - 1, b); | |
3054 b += 5; | |
3055 } | |
3056 } | |
3057 pending_exact = 0; | |
3058 beg_interval = NULL; | |
3059 } | |
3060 break; | |
3061 | |
3062 unfetch_interval: | |
3063 /* If an invalid interval, match the characters as literals. */ | |
3064 assert (beg_interval); | |
3065 p = beg_interval; | |
3066 beg_interval = NULL; | |
3067 | |
3068 /* normal_char and normal_backslash need `c'. */ | |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3069 c = '{'; |
18262 | 3070 |
3071 if (!(syntax & RE_NO_BK_BRACES)) | |
3072 { | |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3073 assert (p > pattern && p[-1] == '\\'); |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3074 goto normal_backslash; |
18262 | 3075 } |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3076 else |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3077 goto normal_char; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3078 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3079 #ifdef emacs |
18262 | 3080 /* There is no way to specify the before_dot and after_dot |
3081 operators. rms says this is ok. --karl */ | |
3082 case '=': | |
3083 BUF_PUSH (at_dot); | |
3084 break; | |
3085 | |
3086 case 's': | |
3087 laststart = b; | |
3088 PATFETCH (c); | |
3089 BUF_PUSH_2 (syntaxspec, syntax_spec_code[c]); | |
3090 break; | |
3091 | |
3092 case 'S': | |
3093 laststart = b; | |
3094 PATFETCH (c); | |
3095 BUF_PUSH_2 (notsyntaxspec, syntax_spec_code[c]); | |
3096 break; | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3097 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3098 case 'c': |
16010 | 3099 laststart = b; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3100 PATFETCH_RAW (c); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3101 BUF_PUSH_2 (categoryspec, c); |
16010 | 3102 break; |
3103 | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3104 case 'C': |
16010 | 3105 laststart = b; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3106 PATFETCH_RAW (c); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3107 BUF_PUSH_2 (notcategoryspec, c); |
16010 | 3108 break; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3109 #endif /* emacs */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3110 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3111 |
18262 | 3112 case 'w': |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3113 if (syntax & RE_NO_GNU_OPS) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3114 goto normal_char; |
18262 | 3115 laststart = b; |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3116 BUF_PUSH_2 (syntaxspec, Sword); |
18262 | 3117 break; |
3118 | |
3119 | |
3120 case 'W': | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3121 if (syntax & RE_NO_GNU_OPS) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3122 goto normal_char; |
18262 | 3123 laststart = b; |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3124 BUF_PUSH_2 (notsyntaxspec, Sword); |
18262 | 3125 break; |
3126 | |
3127 | |
3128 case '<': | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3129 if (syntax & RE_NO_GNU_OPS) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3130 goto normal_char; |
18262 | 3131 BUF_PUSH (wordbeg); |
3132 break; | |
3133 | |
3134 case '>': | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3135 if (syntax & RE_NO_GNU_OPS) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3136 goto normal_char; |
18262 | 3137 BUF_PUSH (wordend); |
3138 break; | |
3139 | |
3140 case 'b': | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3141 if (syntax & RE_NO_GNU_OPS) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3142 goto normal_char; |
18262 | 3143 BUF_PUSH (wordbound); |
3144 break; | |
3145 | |
3146 case 'B': | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3147 if (syntax & RE_NO_GNU_OPS) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3148 goto normal_char; |
18262 | 3149 BUF_PUSH (notwordbound); |
3150 break; | |
3151 | |
3152 case '`': | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3153 if (syntax & RE_NO_GNU_OPS) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3154 goto normal_char; |
18262 | 3155 BUF_PUSH (begbuf); |
3156 break; | |
3157 | |
3158 case '\'': | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3159 if (syntax & RE_NO_GNU_OPS) |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3160 goto normal_char; |
18262 | 3161 BUF_PUSH (endbuf); |
3162 break; | |
3163 | |
3164 case '1': case '2': case '3': case '4': case '5': | |
3165 case '6': case '7': case '8': case '9': | |
33066
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3166 { |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3167 regnum_t reg; |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3168 |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3169 if (syntax & RE_NO_BK_REFS) |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3170 goto normal_backslash; |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3171 |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3172 reg = c - '0'; |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3173 |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3174 /* Can't back reference to a subexpression before its end. */ |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3175 if (reg > regnum || group_in_compile_stack (compile_stack, reg)) |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3176 FREE_STACK_RETURN (REG_ESUBREG); |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3177 |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3178 laststart = b; |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3179 BUF_PUSH_2 (duplicate, reg); |
c782e22760e0
(re_iswctype, re_wctype_to_bit): Fix braino.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32954
diff
changeset
|
3180 } |
18262 | 3181 break; |
3182 | |
3183 | |
3184 case '+': | |
3185 case '?': | |
3186 if (syntax & RE_BK_PLUS_QM) | |
3187 goto handle_plus; | |
3188 else | |
3189 goto normal_backslash; | |
3190 | |
3191 default: | |
3192 normal_backslash: | |
3193 /* You might think it would be useful for \ to mean | |
3194 not to translate; but if we don't translate it | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
3195 it will never match anything. */ |
18262 | 3196 c = TRANSLATE (c); |
3197 goto normal_char; | |
3198 } | |
3199 break; | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3200 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3201 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3202 default: |
18262 | 3203 /* Expects the character in `c'. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3204 normal_char: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3205 /* If no exactn currently being built. */ |
18262 | 3206 if (!pending_exact |
3207 | |
3208 /* If last exactn not at current position. */ | |
3209 || pending_exact + *pending_exact + 1 != b | |
3210 | |
3211 /* We have only one byte following the exactn for the count. */ | |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
3212 || *pending_exact >= (1 << BYTEWIDTH) - MAX_MULTIBYTE_LENGTH |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3213 |
18262 | 3214 /* If followed by a repetition operator. */ |
21963
b717a61747c5
(regex_compile): When checking after exactn
Richard M. Stallman <rms@gnu.org>
parents:
21838
diff
changeset
|
3215 || (p != pend && (*p == '*' || *p == '^')) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3216 || ((syntax & RE_BK_PLUS_QM) |
21963
b717a61747c5
(regex_compile): When checking after exactn
Richard M. Stallman <rms@gnu.org>
parents:
21838
diff
changeset
|
3217 ? p + 1 < pend && *p == '\\' && (p[1] == '+' || p[1] == '?') |
b717a61747c5
(regex_compile): When checking after exactn
Richard M. Stallman <rms@gnu.org>
parents:
21838
diff
changeset
|
3218 : p != pend && (*p == '+' || *p == '?')) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3219 || ((syntax & RE_INTERVALS) |
18262 | 3220 && ((syntax & RE_NO_BK_BRACES) |
21963
b717a61747c5
(regex_compile): When checking after exactn
Richard M. Stallman <rms@gnu.org>
parents:
21838
diff
changeset
|
3221 ? p != pend && *p == '{' |
b717a61747c5
(regex_compile): When checking after exactn
Richard M. Stallman <rms@gnu.org>
parents:
21838
diff
changeset
|
3222 : p + 1 < pend && p[0] == '\\' && p[1] == '{'))) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3223 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3224 /* Start building a new exactn. */ |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3225 |
18262 | 3226 laststart = b; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3227 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3228 BUF_PUSH_2 (exactn, 0); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3229 pending_exact = b - 1; |
18262 | 3230 } |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3231 |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
3232 GET_BUFFER_SPACE (MAX_MULTIBYTE_LENGTH); |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
3233 { |
30752
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
3234 int len; |
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
3235 |
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
3236 if (multibyte) |
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
3237 len = CHAR_STRING (c, b); |
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
3238 else |
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
3239 *b = c, len = 1; |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
3240 b += len; |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
3241 (*pending_exact) += len; |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
3242 } |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
3243 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3244 break; |
18262 | 3245 } /* switch (c) */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3246 } /* while p != pend */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3247 |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3248 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3249 /* Through the pattern now. */ |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3250 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3251 FIXUP_ALT_JUMP (); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3252 |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3253 if (!COMPILE_STACK_EMPTY) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3254 FREE_STACK_RETURN (REG_EPAREN); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3255 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3256 /* If we don't want backtracking, force success |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3257 the first time we reach the end of the compiled pattern. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3258 if (syntax & RE_NO_POSIX_BACKTRACKING) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3259 BUF_PUSH (succeed); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3260 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3261 free (compile_stack.stack); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3262 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3263 /* We have succeeded; set the length of the buffer. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3264 bufp->used = b - bufp->buffer; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3265 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3266 #ifdef DEBUG |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
3267 if (debug > 0) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3268 { |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3269 re_compile_fastmap (bufp); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3270 DEBUG_PRINT1 ("\nCompiled pattern: \n"); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3271 print_compiled_pattern (bufp); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3272 } |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
3273 debug--; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3274 #endif /* DEBUG */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3275 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3276 #ifndef MATCH_MAY_ALLOCATE |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3277 /* Initialize the failure stack to the largest possible stack. This |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3278 isn't necessary unless we're trying to avoid calling alloca in |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3279 the search and match routines. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3280 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3281 int num_regs = bufp->re_nsub + 1; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3282 |
20449
fc965930c738
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Karl Heuer <kwzh@gnu.org>
parents:
19184
diff
changeset
|
3283 if (fail_stack.size < re_max_failures * TYPICAL_FAILURE_SIZE) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3284 { |
21352
b9275822b6f5
(regex_compile) [!MATCH_MAY_ALLOCATE]: Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents:
21348
diff
changeset
|
3285 fail_stack.size = re_max_failures * TYPICAL_FAILURE_SIZE; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3286 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3287 if (! fail_stack.stack) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3288 fail_stack.stack |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3289 = (fail_stack_elt_t *) malloc (fail_stack.size |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3290 * sizeof (fail_stack_elt_t)); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3291 else |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3292 fail_stack.stack |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3293 = (fail_stack_elt_t *) realloc (fail_stack.stack, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3294 (fail_stack.size |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3295 * sizeof (fail_stack_elt_t))); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3296 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3297 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3298 regex_grow_registers (num_regs); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3299 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3300 #endif /* not MATCH_MAY_ALLOCATE */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3301 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3302 return REG_NOERROR; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3303 } /* regex_compile */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3304 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3305 /* Subroutines for `regex_compile'. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3306 |
18262 | 3307 /* Store OP at LOC followed by two-byte integer parameter ARG. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3308 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3309 static void |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3310 store_op1 (op, loc, arg) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3311 re_opcode_t op; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3312 unsigned char *loc; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3313 int arg; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3314 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3315 *loc = (unsigned char) op; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3316 STORE_NUMBER (loc + 1, arg); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3317 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3318 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3319 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3320 /* Like `store_op1', but for two two-byte parameters ARG1 and ARG2. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3321 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3322 static void |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3323 store_op2 (op, loc, arg1, arg2) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3324 re_opcode_t op; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3325 unsigned char *loc; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3326 int arg1, arg2; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3327 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3328 *loc = (unsigned char) op; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3329 STORE_NUMBER (loc + 1, arg1); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3330 STORE_NUMBER (loc + 3, arg2); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3331 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3332 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3333 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3334 /* Copy the bytes from LOC to END to open up three bytes of space at LOC |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3335 for OP followed by two-byte integer parameter ARG. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3336 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3337 static void |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3338 insert_op1 (op, loc, arg, end) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3339 re_opcode_t op; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3340 unsigned char *loc; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3341 int arg; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3342 unsigned char *end; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3343 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3344 register unsigned char *pfrom = end; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3345 register unsigned char *pto = end + 3; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3346 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3347 while (pfrom != loc) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3348 *--pto = *--pfrom; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3349 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3350 store_op1 (op, loc, arg); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3351 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3352 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3353 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3354 /* Like `insert_op1', but for two two-byte parameters ARG1 and ARG2. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3355 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3356 static void |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3357 insert_op2 (op, loc, arg1, arg2, end) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3358 re_opcode_t op; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3359 unsigned char *loc; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3360 int arg1, arg2; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3361 unsigned char *end; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3362 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3363 register unsigned char *pfrom = end; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3364 register unsigned char *pto = end + 5; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3365 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3366 while (pfrom != loc) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3367 *--pto = *--pfrom; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3368 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3369 store_op2 (op, loc, arg1, arg2); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3370 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3371 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3372 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3373 /* P points to just after a ^ in PATTERN. Return true if that ^ comes |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3374 after an alternative or a begin-subexpression. We assume there is at |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3375 least one character before the ^. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3376 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3377 static boolean |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3378 at_begline_loc_p (pattern, p, syntax) |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3379 re_char *pattern, *p; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3380 reg_syntax_t syntax; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3381 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3382 re_char *prev = p - 2; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3383 boolean prev_prev_backslash = prev > pattern && prev[-1] == '\\'; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3384 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3385 return |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3386 /* After a subexpression? */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3387 (*prev == '(' && (syntax & RE_NO_BK_PARENS || prev_prev_backslash)) |
18262 | 3388 /* After an alternative? */ |
29194
fe06affca294
(at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28662
diff
changeset
|
3389 || (*prev == '|' && (syntax & RE_NO_BK_VBAR || prev_prev_backslash)) |
fe06affca294
(at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28662
diff
changeset
|
3390 /* After a shy subexpression? */ |
fe06affca294
(at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28662
diff
changeset
|
3391 || ((syntax & RE_SHY_GROUPS) && prev - 2 >= pattern |
fe06affca294
(at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28662
diff
changeset
|
3392 && prev[-1] == '?' && prev[-2] == '(' |
fe06affca294
(at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28662
diff
changeset
|
3393 && (syntax & RE_NO_BK_PARENS |
fe06affca294
(at_begline_loc_p): Also recognize the \\(?:^ case
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28662
diff
changeset
|
3394 || (prev - 3 >= pattern && prev[-3] == '\\'))); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3395 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3396 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3397 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3398 /* The dual of at_begline_loc_p. This one is for $. We assume there is |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3399 at least one character after the $, i.e., `P < PEND'. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3400 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3401 static boolean |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3402 at_endline_loc_p (p, pend, syntax) |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3403 re_char *p, *pend; |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
3404 reg_syntax_t syntax; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3405 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3406 re_char *next = p; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3407 boolean next_backslash = *next == '\\'; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3408 re_char *next_next = p + 1 < pend ? p + 1 : 0; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3409 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3410 return |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3411 /* Before a subexpression? */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3412 (syntax & RE_NO_BK_PARENS ? *next == ')' |
18262 | 3413 : next_backslash && next_next && *next_next == ')') |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3414 /* Before an alternative? */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3415 || (syntax & RE_NO_BK_VBAR ? *next == '|' |
18262 | 3416 : next_backslash && next_next && *next_next == '|'); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3417 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3418 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3419 |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3420 /* Returns true if REGNUM is in one of COMPILE_STACK's elements and |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3421 false if it's not. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3422 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3423 static boolean |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3424 group_in_compile_stack (compile_stack, regnum) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3425 compile_stack_type compile_stack; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3426 regnum_t regnum; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3427 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3428 int this_element; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3429 |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3430 for (this_element = compile_stack.avail - 1; |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3431 this_element >= 0; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3432 this_element--) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3433 if (compile_stack.stack[this_element].regnum == regnum) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3434 return true; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3435 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3436 return false; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3437 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3438 |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3439 /* analyse_first. |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3440 If fastmap is non-NULL, go through the pattern and fill fastmap |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3441 with all the possible leading chars. If fastmap is NULL, don't |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3442 bother filling it up (obviously) and only return whether the |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3443 pattern could potentially match the empty string. |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3444 |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3445 Return 1 if p..pend might match the empty string. |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3446 Return 0 if p..pend matches at least one char. |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3447 Return -1 if fastmap was not updated accurately. */ |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3448 |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3449 static int |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3450 analyse_first (p, pend, fastmap, multibyte) |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3451 re_char *p, *pend; |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3452 char *fastmap; |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3453 const int multibyte; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3454 { |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3455 int j, k; |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3456 boolean not; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3457 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3458 /* If all elements for base leading-codes in fastmap is set, this |
18262 | 3459 flag is set true. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3460 boolean match_any_multibyte_characters = false; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3461 |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3462 assert (p); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3463 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3464 /* The loop below works as follows: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3465 - It has a working-list kept in the PATTERN_STACK and which basically |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3466 starts by only containing a pointer to the first operation. |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3467 - If the opcode we're looking at is a match against some set of |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3468 chars, then we add those chars to the fastmap and go on to the |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3469 next work element from the worklist (done via `break'). |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3470 - If the opcode is a control operator on the other hand, we either |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3471 ignore it (if it's meaningless at this point, such as `start_memory') |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3472 or execute it (if it's a jump). If the jump has several destinations |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3473 (i.e. `on_failure_jump'), then we push the other destination onto the |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3474 worklist. |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3475 We guarantee termination by ignoring backward jumps (more or less), |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3476 so that `p' is monotonically increasing. More to the point, we |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3477 never set `p' (or push) anything `<= p1'. */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3478 |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3479 while (p < pend) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3480 { |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3481 /* `p1' is used as a marker of how far back a `on_failure_jump' |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3482 can go without being ignored. It is normally equal to `p' |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3483 (which prevents any backward `on_failure_jump') except right |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3484 after a plain `jump', to allow patterns such as: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3485 0: jump 10 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3486 3..9: <body> |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3487 10: on_failure_jump 3 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3488 as used for the *? operator. */ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3489 re_char *p1 = p; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3490 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3491 switch (SWITCH_ENUM_CAST ((re_opcode_t) *p++)) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3492 { |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3493 case succeed: |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3494 return 1; |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3495 continue; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3496 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3497 case duplicate: |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3498 /* If the first character has to match a backreference, that means |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3499 that the group was empty (since it already matched). Since this |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3500 is the only case that interests us here, we can assume that the |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3501 backreference must match the empty string. */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3502 p++; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3503 continue; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3504 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3505 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3506 /* Following are the cases which match a character. These end |
18262 | 3507 with `break'. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3508 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3509 case exactn: |
30752
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
3510 if (fastmap) |
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
3511 { |
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
3512 int c = RE_STRING_CHAR (p + 1, pend - p); |
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
3513 |
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
3514 if (SINGLE_BYTE_CHAR_P (c)) |
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
3515 fastmap[c] = 1; |
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
3516 else |
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
3517 fastmap[p[1]] = 1; |
db737e34fc36
(regex_compile) <normal_char>: Pay attention to multibyteness.
Kenichi Handa <handa@m17n.org>
parents:
29801
diff
changeset
|
3518 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3519 break; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3520 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3521 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3522 case anychar: |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3523 /* We could put all the chars except for \n (and maybe \0) |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3524 but we don't bother since it is generally not worth it. */ |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3525 if (!fastmap) break; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3526 return -1; |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3527 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3528 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3529 case charset_not: |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3530 /* Chars beyond end of bitmap are possible matches. |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3531 All the single-byte codes can occur in multibyte buffers. |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3532 So any that are not listed in the charset |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3533 are possible matches, even in multibyte buffers. */ |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3534 if (!fastmap) break; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3535 for (j = CHARSET_BITMAP_SIZE (&p[-1]) * BYTEWIDTH; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3536 j < (1 << BYTEWIDTH); j++) |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3537 fastmap[j] = 1; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3538 /* Fallthrough */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3539 case charset: |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3540 if (!fastmap) break; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3541 not = (re_opcode_t) *(p - 1) == charset_not; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3542 for (j = CHARSET_BITMAP_SIZE (&p[-1]) * BYTEWIDTH - 1, p++; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3543 j >= 0; j--) |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3544 if (!!(p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH))) ^ not) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3545 fastmap[j] = 1; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3546 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3547 if ((not && multibyte) |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3548 /* Any character set can possibly contain a character |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3549 which doesn't match the specified set of characters. */ |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3550 || (CHARSET_RANGE_TABLE_EXISTS_P (&p[-2]) |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3551 && CHARSET_RANGE_TABLE_BITS (&p[-2]) != 0)) |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3552 /* If we can match a character class, we can match |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3553 any character set. */ |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3554 { |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3555 set_fastmap_for_multibyte_characters: |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3556 if (match_any_multibyte_characters == false) |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3557 { |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3558 for (j = 0x80; j < 0xA0; j++) /* XXX */ |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3559 if (BASE_LEADING_CODE_P (j)) |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3560 fastmap[j] = 1; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3561 match_any_multibyte_characters = true; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3562 } |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3563 } |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3564 |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3565 else if (!not && CHARSET_RANGE_TABLE_EXISTS_P (&p[-2]) |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3566 && match_any_multibyte_characters == false) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3567 { |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3568 /* Set fastmap[I] 1 where I is a base leading code of each |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3569 multibyte character in the range table. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3570 int c, count; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3571 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3572 /* Make P points the range table. `+ 2' is to skip flag |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
3573 bits for a character class. */ |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3574 p += CHARSET_BITMAP_SIZE (&p[-2]) + 2; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3575 |
25877
9a7d8b436a5d
1999-09-04 Richard Stallman <rms@gnu.org>
Dave Love <fx@gnu.org>
parents:
25440
diff
changeset
|
3576 /* Extract the number of ranges in range table into COUNT. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3577 EXTRACT_NUMBER_AND_INCR (count, p); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3578 for (; count > 0; count--, p += 2 * 3) /* XXX */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3579 { |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3580 /* Extract the start of each range. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3581 EXTRACT_CHARACTER (c, p); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3582 j = CHAR_CHARSET (c); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3583 fastmap[CHARSET_LEADING_CODE_BASE (j)] = 1; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3584 } |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3585 } |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3586 break; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3587 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3588 case syntaxspec: |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3589 case notsyntaxspec: |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3590 if (!fastmap) break; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3591 #ifndef emacs |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3592 not = (re_opcode_t)p[-1] == notsyntaxspec; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3593 k = *p++; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3594 for (j = 0; j < (1 << BYTEWIDTH); j++) |
28279
24a23e27dac6
(enum syntaxcode): Provide default for non-Emacs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28268
diff
changeset
|
3595 if ((SYNTAX (j) == (enum syntaxcode) k) ^ not) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3596 fastmap[j] = 1; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3597 break; |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3598 #else /* emacs */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3599 /* This match depends on text properties. These end with |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3600 aborting optimizations. */ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3601 return -1; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3602 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3603 case categoryspec: |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3604 case notcategoryspec: |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3605 if (!fastmap) break; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3606 not = (re_opcode_t)p[-1] == notcategoryspec; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3607 k = *p++; |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3608 for (j = 0; j < (1 << BYTEWIDTH); j++) |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3609 if ((CHAR_HAS_CATEGORY (j, k)) ^ not) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3610 fastmap[j] = 1; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3611 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3612 if (multibyte) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3613 /* Any character set can possibly contain a character |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3614 whose category is K (or not). */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3615 goto set_fastmap_for_multibyte_characters; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3616 break; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3617 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3618 /* All cases after this match the empty string. These end with |
18262 | 3619 `continue'. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3620 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3621 case before_dot: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3622 case at_dot: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3623 case after_dot: |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
3624 #endif /* !emacs */ |
18262 | 3625 case no_op: |
3626 case begline: | |
3627 case endline: | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3628 case begbuf: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3629 case endbuf: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3630 case wordbound: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3631 case notwordbound: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3632 case wordbeg: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3633 case wordend: |
18262 | 3634 continue; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3635 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3636 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3637 case jump: |
18262 | 3638 EXTRACT_NUMBER_AND_INCR (j, p); |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3639 if (j < 0) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3640 /* Backward jumps can only go back to code that we've already |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3641 visited. `re_compile' should make sure this is true. */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3642 break; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3643 p += j; |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3644 switch (SWITCH_ENUM_CAST ((re_opcode_t) *p)) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3645 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3646 case on_failure_jump: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3647 case on_failure_keep_string_jump: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3648 case on_failure_jump_loop: |
28342
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
3649 case on_failure_jump_nastyloop: |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3650 case on_failure_jump_smart: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3651 p++; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3652 break; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3653 default: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3654 continue; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3655 }; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3656 /* Keep `p1' to allow the `on_failure_jump' we are jumping to |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3657 to jump back to "just after here". */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3658 /* Fallthrough */ |
18262 | 3659 |
3660 case on_failure_jump: | |
3661 case on_failure_keep_string_jump: | |
28342
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
3662 case on_failure_jump_nastyloop: |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3663 case on_failure_jump_loop: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3664 case on_failure_jump_smart: |
18262 | 3665 EXTRACT_NUMBER_AND_INCR (j, p); |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3666 if (p + j <= p1) |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3667 ; /* Backward jump to be ignored. */ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3668 else |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3669 { /* We have to look down both arms. |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3670 We first go down the "straight" path so as to minimize |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3671 stack usage when going through alternatives. */ |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3672 int r = analyse_first (p, pend, fastmap, multibyte); |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3673 if (r) return r; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3674 p += j; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3675 } |
18262 | 3676 continue; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3677 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3678 |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3679 case jump_n: |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3680 /* This code simply does not properly handle forward jump_n. */ |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3681 DEBUG_STATEMENT (EXTRACT_NUMBER (j, p); assert (j < 0)); |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3682 p += 4; |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3683 /* jump_n can either jump or fall through. The (backward) jump |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3684 case has already been handled, so we only need to look at the |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3685 fallthrough case. */ |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3686 continue; |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3687 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3688 case succeed_n: |
28372
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3689 /* If N == 0, it should be an on_failure_jump_loop instead. */ |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3690 DEBUG_STATEMENT (EXTRACT_NUMBER (j, p + 2); assert (j > 0)); |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3691 p += 4; |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3692 /* We only care about one iteration of the loop, so we don't |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3693 need to consider the case where this behaves like an |
bc86be15099e
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28342
diff
changeset
|
3694 on_failure_jump. */ |
18262 | 3695 continue; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3696 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3697 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3698 case set_number_at: |
18262 | 3699 p += 4; |
3700 continue; | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3701 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3702 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3703 case start_memory: |
18262 | 3704 case stop_memory: |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
3705 p += 1; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3706 continue; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3707 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3708 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3709 default: |
18262 | 3710 abort (); /* We have listed all the cases. */ |
3711 } /* switch *p++ */ | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3712 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3713 /* Getting here means we have found the possible starting |
18262 | 3714 characters for one path of the pattern -- and that the empty |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3715 string does not match. We need not follow this path further. */ |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3716 return 0; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3717 } /* while p */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3718 |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3719 /* We reached the end without matching anything. */ |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3720 return 1; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3721 |
28380
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3722 } /* analyse_first */ |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3723 |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3724 /* re_compile_fastmap computes a ``fastmap'' for the compiled pattern in |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3725 BUFP. A fastmap records which of the (1 << BYTEWIDTH) possible |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3726 characters can start a string that matches the pattern. This fastmap |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3727 is used by re_search to skip quickly over impossible starting points. |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3728 |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3729 Character codes above (1 << BYTEWIDTH) are not represented in the |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3730 fastmap, but the leading codes are represented. Thus, the fastmap |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3731 indicates which character sets could start a match. |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3732 |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3733 The caller must supply the address of a (1 << BYTEWIDTH)-byte data |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3734 area as BUFP->fastmap. |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3735 |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3736 We set the `fastmap', `fastmap_accurate', and `can_be_null' fields in |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3737 the pattern buffer. |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3738 |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3739 Returns 0 if we succeed, -2 if an internal error. */ |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3740 |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3741 int |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3742 re_compile_fastmap (bufp) |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3743 struct re_pattern_buffer *bufp; |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3744 { |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3745 char *fastmap = bufp->fastmap; |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3746 int analysis; |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3747 |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3748 assert (fastmap && bufp->buffer); |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3749 |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3750 bzero (fastmap, 1 << BYTEWIDTH); /* Assume nothing's valid. */ |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3751 bufp->fastmap_accurate = 1; /* It will be when we're done. */ |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3752 |
5478842aea4c
(analyse_first): New function obtained by ripping out most
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28372
diff
changeset
|
3753 analysis = analyse_first (bufp->buffer, bufp->buffer + bufp->used, |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
3754 fastmap, RE_MULTIBYTE_P (bufp)); |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
3755 bufp->can_be_null = (analysis != 0); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3756 return 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3757 } /* re_compile_fastmap */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3758 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3759 /* Set REGS to hold NUM_REGS registers, storing them in STARTS and |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3760 ENDS. Subsequent matches using PATTERN_BUFFER and REGS will use |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3761 this memory for recording register information. STARTS and ENDS |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3762 must be allocated using the malloc library routine, and must each |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3763 be at least NUM_REGS * sizeof (regoff_t) bytes long. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3764 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3765 If NUM_REGS == 0, then subsequent matches should allocate their own |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3766 register data. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3767 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3768 Unless this function is called, the first search or match using |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3769 PATTERN_BUFFER will allocate its own register data, without |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3770 freeing the old data. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3771 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3772 void |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3773 re_set_registers (bufp, regs, num_regs, starts, ends) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3774 struct re_pattern_buffer *bufp; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3775 struct re_registers *regs; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3776 unsigned num_regs; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3777 regoff_t *starts, *ends; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3778 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3779 if (num_regs) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3780 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3781 bufp->regs_allocated = REGS_REALLOCATE; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3782 regs->num_regs = num_regs; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3783 regs->start = starts; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3784 regs->end = ends; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3785 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3786 else |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3787 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3788 bufp->regs_allocated = REGS_UNALLOCATED; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3789 regs->num_regs = 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3790 regs->start = regs->end = (regoff_t *) 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3791 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3792 } |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
3793 WEAK_ALIAS (__re_set_registers, re_set_registers) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3794 |
18262 | 3795 /* Searching routines. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3796 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3797 /* Like re_search_2, below, but only one string is specified, and |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3798 doesn't let you say where to stop matching. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3799 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3800 int |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3801 re_search (bufp, string, size, startpos, range, regs) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3802 struct re_pattern_buffer *bufp; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3803 const char *string; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3804 int size, startpos, range; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3805 struct re_registers *regs; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3806 { |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3807 return re_search_2 (bufp, NULL, 0, string, size, startpos, range, |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3808 regs, size); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3809 } |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
3810 WEAK_ALIAS (__re_search, re_search) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3811 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3812 /* End address of virtual concatenation of string. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3813 #define STOP_ADDR_VSTRING(P) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3814 (((P) >= size1 ? string2 + size2 : string1 + size1)) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3815 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3816 /* Address of POS in the concatenation of virtual string. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3817 #define POS_ADDR_VSTRING(POS) \ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3818 (((POS) >= size1 ? string2 - size1 : string1) + (POS)) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3819 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3820 /* Using the compiled pattern in BUFP->buffer, first tries to match the |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3821 virtual concatenation of STRING1 and STRING2, starting first at index |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3822 STARTPOS, then at STARTPOS + 1, and so on. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3823 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3824 STRING1 and STRING2 have length SIZE1 and SIZE2, respectively. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3825 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3826 RANGE is how far to scan while trying to match. RANGE = 0 means try |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3827 only at STARTPOS; in general, the last start tried is STARTPOS + |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3828 RANGE. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3829 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3830 In REGS, return the indices of the virtual concatenation of STRING1 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3831 and STRING2 that matched the entire BUFP->buffer and its contained |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3832 subexpressions. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3833 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3834 Do not consider matching one past the index STOP in the virtual |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3835 concatenation of STRING1 and STRING2. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3836 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3837 We return either the position in the strings at which the match was |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3838 found, -1 if no match, or -2 if error (such as failure |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3839 stack overflow). */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3840 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3841 int |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
3842 re_search_2 (bufp, str1, size1, str2, size2, startpos, range, regs, stop) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3843 struct re_pattern_buffer *bufp; |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
3844 const char *str1, *str2; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3845 int size1, size2; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3846 int startpos; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3847 int range; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3848 struct re_registers *regs; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3849 int stop; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3850 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3851 int val; |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
3852 re_char *string1 = (re_char*) str1; |
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
3853 re_char *string2 = (re_char*) str2; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3854 register char *fastmap = bufp->fastmap; |
13250
52e053f46f76
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard M. Stallman <rms@gnu.org>
parents:
13100
diff
changeset
|
3855 register RE_TRANSLATE_TYPE translate = bufp->translate; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3856 int total_size = size1 + size2; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3857 int endpos = startpos + range; |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
3858 boolean anchored_start; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3859 |
18262 | 3860 /* Nonzero if we have to concern multibyte character. */ |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
3861 const boolean multibyte = RE_MULTIBYTE_P (bufp); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3862 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3863 /* Check for out-of-range STARTPOS. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3864 if (startpos < 0 || startpos > total_size) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3865 return -1; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3866 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3867 /* Fix up RANGE if it might eventually take us outside |
13100
4f0f50fc3aaf
(re_search_2): Use 0, not -1, as the lower bound
Richard M. Stallman <rms@gnu.org>
parents:
12983
diff
changeset
|
3868 the virtual concatenation of STRING1 and STRING2. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3869 Make sure we won't move STARTPOS below 0 or above TOTAL_SIZE. */ |
13100
4f0f50fc3aaf
(re_search_2): Use 0, not -1, as the lower bound
Richard M. Stallman <rms@gnu.org>
parents:
12983
diff
changeset
|
3870 if (endpos < 0) |
4f0f50fc3aaf
(re_search_2): Use 0, not -1, as the lower bound
Richard M. Stallman <rms@gnu.org>
parents:
12983
diff
changeset
|
3871 range = 0 - startpos; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3872 else if (endpos > total_size) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3873 range = total_size - startpos; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3874 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3875 /* If the search isn't to be a backwards one, don't waste time in a |
21760
f97c01dfd603
(re_search_2): Fix handling of at_dot.
Richard M. Stallman <rms@gnu.org>
parents:
21562
diff
changeset
|
3876 search for a pattern anchored at beginning of buffer. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3877 if (bufp->used > 0 && (re_opcode_t) bufp->buffer[0] == begbuf && range > 0) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3878 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3879 if (startpos > 0) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3880 return -1; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3881 else |
21760
f97c01dfd603
(re_search_2): Fix handling of at_dot.
Richard M. Stallman <rms@gnu.org>
parents:
21562
diff
changeset
|
3882 range = 0; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3883 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3884 |
12983
ed39ba26313b
(re_search_2): If pattern starts with \=, optimize search.
Richard M. Stallman <rms@gnu.org>
parents:
12931
diff
changeset
|
3885 #ifdef emacs |
ed39ba26313b
(re_search_2): If pattern starts with \=, optimize search.
Richard M. Stallman <rms@gnu.org>
parents:
12931
diff
changeset
|
3886 /* In a forward search for something that starts with \=. |
ed39ba26313b
(re_search_2): If pattern starts with \=, optimize search.
Richard M. Stallman <rms@gnu.org>
parents:
12931
diff
changeset
|
3887 don't keep searching past point. */ |
ed39ba26313b
(re_search_2): If pattern starts with \=, optimize search.
Richard M. Stallman <rms@gnu.org>
parents:
12931
diff
changeset
|
3888 if (bufp->used > 0 && (re_opcode_t) bufp->buffer[0] == at_dot && range > 0) |
ed39ba26313b
(re_search_2): If pattern starts with \=, optimize search.
Richard M. Stallman <rms@gnu.org>
parents:
12931
diff
changeset
|
3889 { |
21760
f97c01dfd603
(re_search_2): Fix handling of at_dot.
Richard M. Stallman <rms@gnu.org>
parents:
21562
diff
changeset
|
3890 range = PT_BYTE - BEGV_BYTE - startpos; |
f97c01dfd603
(re_search_2): Fix handling of at_dot.
Richard M. Stallman <rms@gnu.org>
parents:
21562
diff
changeset
|
3891 if (range < 0) |
12983
ed39ba26313b
(re_search_2): If pattern starts with \=, optimize search.
Richard M. Stallman <rms@gnu.org>
parents:
12931
diff
changeset
|
3892 return -1; |
ed39ba26313b
(re_search_2): If pattern starts with \=, optimize search.
Richard M. Stallman <rms@gnu.org>
parents:
12931
diff
changeset
|
3893 } |
ed39ba26313b
(re_search_2): If pattern starts with \=, optimize search.
Richard M. Stallman <rms@gnu.org>
parents:
12931
diff
changeset
|
3894 #endif /* emacs */ |
ed39ba26313b
(re_search_2): If pattern starts with \=, optimize search.
Richard M. Stallman <rms@gnu.org>
parents:
12931
diff
changeset
|
3895 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3896 /* Update the fastmap now if not correct already. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3897 if (fastmap && !bufp->fastmap_accurate) |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3898 re_compile_fastmap (bufp); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3899 |
16009
2a4da819f152
(re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents:
16008
diff
changeset
|
3900 /* See whether the pattern is anchored. */ |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
3901 anchored_start = (bufp->buffer[0] == begline); |
16009
2a4da819f152
(re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents:
16008
diff
changeset
|
3902 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3903 #ifdef emacs |
21482
9898a4994a12
(re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents:
21404
diff
changeset
|
3904 gl_state.object = re_match_object; |
9898a4994a12
(re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents:
21404
diff
changeset
|
3905 { |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
3906 int charpos = SYNTAX_TABLE_BYTE_TO_CHAR (POS_AS_IN_BUFFER (startpos)); |
21482
9898a4994a12
(re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents:
21404
diff
changeset
|
3907 |
9898a4994a12
(re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents:
21404
diff
changeset
|
3908 SETUP_SYNTAX_TABLE_FOR_OBJECT (re_match_object, charpos, 1); |
9898a4994a12
(re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents:
21404
diff
changeset
|
3909 } |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3910 #endif |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3911 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3912 /* Loop through the string, looking for a place to start matching. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3913 for (;;) |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
3914 { |
16009
2a4da819f152
(re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents:
16008
diff
changeset
|
3915 /* If the pattern is anchored, |
2a4da819f152
(re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents:
16008
diff
changeset
|
3916 skip quickly past places we cannot match. |
2a4da819f152
(re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents:
16008
diff
changeset
|
3917 We don't bother to treat startpos == 0 specially |
2a4da819f152
(re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents:
16008
diff
changeset
|
3918 because that case doesn't repeat. */ |
2a4da819f152
(re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents:
16008
diff
changeset
|
3919 if (anchored_start && startpos > 0) |
2a4da819f152
(re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents:
16008
diff
changeset
|
3920 { |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
3921 if (! ((startpos <= size1 ? string1[startpos - 1] |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
3922 : string2[startpos - size1 - 1]) |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
3923 == '\n')) |
16009
2a4da819f152
(re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents:
16008
diff
changeset
|
3924 goto advance; |
2a4da819f152
(re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents:
16008
diff
changeset
|
3925 } |
2a4da819f152
(re_search_2): Optimize regexp that starts with ^.
Richard M. Stallman <rms@gnu.org>
parents:
16008
diff
changeset
|
3926 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3927 /* If a fastmap is supplied, skip quickly over characters that |
18262 | 3928 cannot be the start of a match. If the pattern can match the |
3929 null string, however, we don't need to skip characters; we want | |
3930 the first null string. */ | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3931 if (fastmap && startpos < total_size && !bufp->can_be_null) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3932 { |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
3933 register re_char *d; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
3934 register re_wchar_t buf_ch; |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3935 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3936 d = POS_ADDR_VSTRING (startpos); |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3937 |
18262 | 3938 if (range > 0) /* Searching forwards. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3939 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3940 register int lim = 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3941 int irange = range; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3942 |
18262 | 3943 if (startpos < size1 && startpos + range >= size1) |
3944 lim = range - (size1 - startpos); | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
3945 |
18262 | 3946 /* Written out as an if-else to avoid testing `translate' |
3947 inside the loop. */ | |
21838
1d93b782b983
(re_search_2): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents:
21760
diff
changeset
|
3948 if (RE_TRANSLATE_P (translate)) |
1d93b782b983
(re_search_2): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents:
21760
diff
changeset
|
3949 { |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3950 if (multibyte) |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3951 while (range > lim) |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3952 { |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3953 int buf_charlen; |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3954 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3955 buf_ch = STRING_CHAR_AND_LENGTH (d, range - lim, |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3956 buf_charlen); |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3957 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3958 buf_ch = RE_TRANSLATE (translate, buf_ch); |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3959 if (buf_ch >= 0400 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3960 || fastmap[buf_ch]) |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3961 break; |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3962 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3963 range -= buf_charlen; |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3964 d += buf_charlen; |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3965 } |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3966 else |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3967 while (range > lim |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
3968 && !fastmap[RE_TRANSLATE (translate, *d)]) |
22237
566c88b62de6
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard M. Stallman <rms@gnu.org>
parents:
21963
diff
changeset
|
3969 { |
566c88b62de6
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard M. Stallman <rms@gnu.org>
parents:
21963
diff
changeset
|
3970 d++; |
566c88b62de6
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard M. Stallman <rms@gnu.org>
parents:
21963
diff
changeset
|
3971 range--; |
566c88b62de6
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard M. Stallman <rms@gnu.org>
parents:
21963
diff
changeset
|
3972 } |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3973 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3974 else |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
3975 while (range > lim && !fastmap[*d]) |
22237
566c88b62de6
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard M. Stallman <rms@gnu.org>
parents:
21963
diff
changeset
|
3976 { |
566c88b62de6
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard M. Stallman <rms@gnu.org>
parents:
21963
diff
changeset
|
3977 d++; |
566c88b62de6
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard M. Stallman <rms@gnu.org>
parents:
21963
diff
changeset
|
3978 range--; |
566c88b62de6
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard M. Stallman <rms@gnu.org>
parents:
21963
diff
changeset
|
3979 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3980 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3981 startpos += irange - range; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3982 } |
18262 | 3983 else /* Searching backwards. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3984 { |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
3985 int room = (startpos >= size1 |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
3986 ? size2 + size1 - startpos |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
3987 : size1 - startpos); |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
3988 buf_ch = RE_STRING_CHAR (d, room); |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
3989 buf_ch = TRANSLATE (buf_ch); |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3990 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3991 if (! (buf_ch >= 0400 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
3992 || fastmap[buf_ch])) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3993 goto advance; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3994 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3995 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3996 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3997 /* If can't match the null string, and that's all we have left, fail. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
3998 if (range >= 0 && startpos == total_size && fastmap |
18262 | 3999 && !bufp->can_be_null) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4000 return -1; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4001 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4002 val = re_match_2_internal (bufp, string1, size1, string2, size2, |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4003 startpos, regs, stop); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4004 #ifndef REGEX_MALLOC |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
4005 # ifdef C_ALLOCA |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4006 alloca (0); |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
4007 # endif |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4008 #endif |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4009 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4010 if (val >= 0) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4011 return startpos; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4012 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4013 if (val == -2) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4014 return -2; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4015 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4016 advance: |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4017 if (!range) |
18262 | 4018 break; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4019 else if (range > 0) |
18262 | 4020 { |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4021 /* Update STARTPOS to the next character boundary. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4022 if (multibyte) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4023 { |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
4024 re_char *p = POS_ADDR_VSTRING (startpos); |
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
4025 re_char *pend = STOP_ADDR_VSTRING (startpos); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4026 int len = MULTIBYTE_FORM_LENGTH (p, pend - p); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4027 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4028 range -= len; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4029 if (range < 0) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4030 break; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4031 startpos += len; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4032 } |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4033 else |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4034 { |
18532
488df9d19f5e
(re_search_2): Cast result of POS_ADDR_VSTRING.
Richard M. Stallman <rms@gnu.org>
parents:
18263
diff
changeset
|
4035 range--; |
488df9d19f5e
(re_search_2): Cast result of POS_ADDR_VSTRING.
Richard M. Stallman <rms@gnu.org>
parents:
18263
diff
changeset
|
4036 startpos++; |
488df9d19f5e
(re_search_2): Cast result of POS_ADDR_VSTRING.
Richard M. Stallman <rms@gnu.org>
parents:
18263
diff
changeset
|
4037 } |
16010 | 4038 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4039 else |
18262 | 4040 { |
4041 range++; | |
4042 startpos--; | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4043 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4044 /* Update STARTPOS to the previous character boundary. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4045 if (multibyte) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4046 { |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
4047 re_char *p = POS_ADDR_VSTRING (startpos); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4048 int len = 0; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4049 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4050 /* Find the head of multibyte form. */ |
20633
063756386696
(re_search_2): Fix call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20455
diff
changeset
|
4051 while (!CHAR_HEAD_P (*p)) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4052 p--, len++; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4053 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4054 /* Adjust it. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4055 #if 0 /* XXX */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4056 if (MULTIBYTE_FORM_LENGTH (p, len + 1) != (len + 1)) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4057 ; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4058 else |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4059 #endif |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4060 { |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4061 range += len; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4062 if (range > 0) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4063 break; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4064 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4065 startpos -= len; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4066 } |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4067 } |
18262 | 4068 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4069 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4070 return -1; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4071 } /* re_search_2 */ |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
4072 WEAK_ALIAS (__re_search_2, re_search_2) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4073 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4074 /* Declarations and macros for re_match_2. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4075 |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
4076 static int bcmp_translate _RE_ARGS((re_char *s1, re_char *s2, |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
4077 register int len, |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
4078 RE_TRANSLATE_TYPE translate, |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
4079 const int multibyte)); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4080 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4081 /* This converts PTR, a pointer into one of the search strings `string1' |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4082 and `string2' into an offset from the beginning of that string. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4083 #define POINTER_TO_OFFSET(ptr) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4084 (FIRST_STRING_P (ptr) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4085 ? ((regoff_t) ((ptr) - string1)) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4086 : ((regoff_t) ((ptr) - string2 + size1))) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4087 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4088 /* Call before fetching a character with *d. This switches over to |
28662
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4089 string2 if necessary. |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4090 Check re_match_2_internal for a discussion of why end_match_2 might |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4091 not be within string2 (but be equal to end_match_1 instead). */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4092 #define PREFETCH() \ |
18262 | 4093 while (d == dend) \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4094 { \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4095 /* End of string2 => fail. */ \ |
18262 | 4096 if (dend == end_match_2) \ |
4097 goto fail; \ | |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
4098 /* End of string1 => advance to string2. */ \ |
18262 | 4099 d = string2; \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4100 dend = end_match_2; \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4101 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4102 |
29296
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
4103 /* Call before fetching a char with *d if you already checked other limits. |
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
4104 This is meant for use in lookahead operations like wordend, etc.. |
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
4105 where we might need to look at parts of the string that might be |
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
4106 outside of the LIMITs (i.e past `stop'). */ |
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
4107 #define PREFETCH_NOLIMIT() \ |
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
4108 if (d == end1) \ |
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
4109 { \ |
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
4110 d = string2; \ |
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
4111 dend = end_match_2; \ |
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
4112 } \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4113 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4114 /* Test if at very beginning or at very end of the virtual concatenation |
18262 | 4115 of `string1' and `string2'. If only one string, it's `string2'. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4116 #define AT_STRINGS_BEG(d) ((d) == (size1 ? string1 : string2) || !size2) |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4117 #define AT_STRINGS_END(d) ((d) == end2) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4118 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4119 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4120 /* Test if D points to a character which is word-constituent. We have |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4121 two special cases to check for: if past the end of string1, look at |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4122 the first character in string2; and if before the beginning of |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4123 string2, look at the last character in string1. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4124 #define WORDCHAR_P(d) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4125 (SYNTAX ((d) == end1 ? *string2 \ |
18262 | 4126 : (d) == string2 - 1 ? *(end1 - 1) : *(d)) \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4127 == Sword) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4128 |
13722
e2669b8a46e2
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
13565
diff
changeset
|
4129 /* Disabled due to a compiler bug -- see comment at case wordbound */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4130 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4131 /* The comment at case wordbound is following one, but we don't use |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4132 AT_WORD_BOUNDARY anymore to support multibyte form. |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4133 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4134 The DEC Alpha C compiler 3.x generates incorrect code for the |
18262 | 4135 test WORDCHAR_P (d - 1) != WORDCHAR_P (d) in the expansion of |
4136 AT_WORD_BOUNDARY, so this code is disabled. Expanding the | |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4137 macro and introducing temporary variables works around the bug. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4138 |
13722
e2669b8a46e2
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
13565
diff
changeset
|
4139 #if 0 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4140 /* Test if the character before D and the one at D differ with respect |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4141 to being word-constituent. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4142 #define AT_WORD_BOUNDARY(d) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4143 (AT_STRINGS_BEG (d) || AT_STRINGS_END (d) \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4144 || WORDCHAR_P (d - 1) != WORDCHAR_P (d)) |
13722
e2669b8a46e2
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
13565
diff
changeset
|
4145 #endif |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4146 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4147 /* Free everything we malloc. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4148 #ifdef MATCH_MAY_ALLOCATE |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
4149 # define FREE_VAR(var) if (var) { REGEX_FREE (var); var = NULL; } else |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
4150 # define FREE_VARIABLES() \ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4151 do { \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4152 REGEX_FREE_STACK (fail_stack.stack); \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4153 FREE_VAR (regstart); \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4154 FREE_VAR (regend); \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4155 FREE_VAR (best_regstart); \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4156 FREE_VAR (best_regend); \ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4157 } while (0) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4158 #else |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
4159 # define FREE_VARIABLES() ((void)0) /* Do nothing! But inhibit gcc warning. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4160 #endif /* not MATCH_MAY_ALLOCATE */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4161 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4162 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4163 /* Optimization routines. */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4164 |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4165 /* If the operation is a match against one or more chars, |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4166 return a pointer to the next operation, else return NULL. */ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4167 static re_char * |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4168 skip_one_char (p) |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4169 re_char *p; |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4170 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4171 switch (SWITCH_ENUM_CAST (*p++)) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4172 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4173 case anychar: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4174 break; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4175 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4176 case exactn: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4177 p += *p + 1; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4178 break; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4179 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4180 case charset_not: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4181 case charset: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4182 if (CHARSET_RANGE_TABLE_EXISTS_P (p - 1)) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4183 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4184 int mcnt; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4185 p = CHARSET_RANGE_TABLE (p - 1); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4186 EXTRACT_NUMBER_AND_INCR (mcnt, p); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4187 p = CHARSET_RANGE_TABLE_END (p, mcnt); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4188 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4189 else |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4190 p += 1 + CHARSET_BITMAP_SIZE (p - 1); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4191 break; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4192 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4193 case syntaxspec: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4194 case notsyntaxspec: |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4195 #ifdef emacs |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4196 case categoryspec: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4197 case notcategoryspec: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4198 #endif /* emacs */ |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4199 p++; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4200 break; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4201 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4202 default: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4203 p = NULL; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4204 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4205 return p; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4206 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4207 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4208 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4209 /* Jump over non-matching operations. */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4210 static unsigned char * |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4211 skip_noops (p, pend) |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4212 unsigned char *p, *pend; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4213 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4214 int mcnt; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4215 while (p < pend) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4216 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4217 switch (SWITCH_ENUM_CAST ((re_opcode_t) *p)) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4218 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4219 case start_memory: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4220 case stop_memory: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4221 p += 2; break; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4222 case no_op: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4223 p += 1; break; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4224 case jump: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4225 p += 1; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4226 EXTRACT_NUMBER_AND_INCR (mcnt, p); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4227 p += mcnt; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4228 break; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4229 default: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4230 return p; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4231 } |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4232 } |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4233 assert (p == pend); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4234 return p; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4235 } |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4236 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4237 /* Non-zero if "p1 matches something" implies "p2 fails". */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4238 static int |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4239 mutually_exclusive_p (bufp, p1, p2) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4240 struct re_pattern_buffer *bufp; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4241 unsigned char *p1, *p2; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4242 { |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4243 re_opcode_t op2; |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
4244 const boolean multibyte = RE_MULTIBYTE_P (bufp); |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4245 unsigned char *pend = bufp->buffer + bufp->used; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4246 |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4247 assert (p1 >= bufp->buffer && p1 < pend |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4248 && p2 >= bufp->buffer && p2 <= pend); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4249 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4250 /* Skip over open/close-group commands. |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4251 If what follows this loop is a ...+ construct, |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4252 look at what begins its body, since we will have to |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4253 match at least one of that. */ |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4254 p2 = skip_noops (p2, pend); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4255 /* The same skip can be done for p1, except that this function |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4256 is only used in the case where p1 is a simple match operator. */ |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4257 /* p1 = skip_noops (p1, pend); */ |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4258 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4259 assert (p1 >= bufp->buffer && p1 < pend |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4260 && p2 >= bufp->buffer && p2 <= pend); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4261 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4262 op2 = p2 == pend ? succeed : *p2; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4263 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4264 switch (SWITCH_ENUM_CAST (op2)) |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4265 { |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4266 case succeed: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4267 case endbuf: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4268 /* If we're at the end of the pattern, we can change. */ |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4269 if (skip_one_char (p1)) |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4270 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4271 DEBUG_PRINT1 (" End of pattern: fast loop.\n"); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4272 return 1; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4273 } |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4274 break; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4275 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4276 case endline: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4277 case exactn: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4278 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4279 register re_wchar_t c |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4280 = (re_opcode_t) *p2 == endline ? '\n' |
35525
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
4281 : RE_STRING_CHAR (p2 + 2, pend - p2 - 2); |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4282 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4283 if ((re_opcode_t) *p1 == exactn) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4284 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4285 if (c != RE_STRING_CHAR (p1 + 2, pend - p1 - 2)) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4286 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4287 DEBUG_PRINT3 (" '%c' != '%c' => fast loop.\n", c, p1[2]); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4288 return 1; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4289 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4290 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4291 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4292 else if ((re_opcode_t) *p1 == charset |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4293 || (re_opcode_t) *p1 == charset_not) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4294 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4295 int not = (re_opcode_t) *p1 == charset_not; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4296 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4297 /* Test if C is listed in charset (or charset_not) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4298 at `p1'. */ |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4299 if (SINGLE_BYTE_CHAR_P (c)) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4300 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4301 if (c < CHARSET_BITMAP_SIZE (p1) * BYTEWIDTH |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4302 && p1[2 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH))) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4303 not = !not; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4304 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4305 else if (CHARSET_RANGE_TABLE_EXISTS_P (p1)) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4306 CHARSET_LOOKUP_RANGE_TABLE (not, c, p1); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4307 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4308 /* `not' is equal to 1 if c would match, which means |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4309 that we can't change to pop_failure_jump. */ |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4310 if (!not) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4311 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4312 DEBUG_PRINT1 (" No match => fast loop.\n"); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4313 return 1; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4314 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4315 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4316 else if ((re_opcode_t) *p1 == anychar |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4317 && c == '\n') |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4318 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4319 DEBUG_PRINT1 (" . != \\n => fast loop.\n"); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4320 return 1; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4321 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4322 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4323 break; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4324 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4325 case charset: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4326 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4327 if ((re_opcode_t) *p1 == exactn) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4328 /* Reuse the code above. */ |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4329 return mutually_exclusive_p (bufp, p2, p1); |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4330 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4331 /* It is hard to list up all the character in charset |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4332 P2 if it includes multibyte character. Give up in |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4333 such case. */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4334 else if (!multibyte || !CHARSET_RANGE_TABLE_EXISTS_P (p2)) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4335 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4336 /* Now, we are sure that P2 has no range table. |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4337 So, for the size of bitmap in P2, `p2[1]' is |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4338 enough. But P1 may have range table, so the |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4339 size of bitmap table of P1 is extracted by |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4340 using macro `CHARSET_BITMAP_SIZE'. |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4341 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4342 Since we know that all the character listed in |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4343 P2 is ASCII, it is enough to test only bitmap |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4344 table of P1. */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4345 |
35525
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
4346 if ((re_opcode_t) *p1 == charset) |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4347 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4348 int idx; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4349 /* We win if the charset inside the loop |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4350 has no overlap with the one after the loop. */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4351 for (idx = 0; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4352 (idx < (int) p2[1] |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4353 && idx < CHARSET_BITMAP_SIZE (p1)); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4354 idx++) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4355 if ((p2[2 + idx] & p1[2 + idx]) != 0) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4356 break; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4357 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4358 if (idx == p2[1] |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4359 || idx == CHARSET_BITMAP_SIZE (p1)) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4360 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4361 DEBUG_PRINT1 (" No match => fast loop.\n"); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4362 return 1; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4363 } |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4364 } |
35525
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
4365 else if ((re_opcode_t) *p1 == charset_not) |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4366 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4367 int idx; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4368 /* We win if the charset_not inside the loop lists |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4369 every character listed in the charset after. */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4370 for (idx = 0; idx < (int) p2[1]; idx++) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4371 if (! (p2[2 + idx] == 0 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4372 || (idx < CHARSET_BITMAP_SIZE (p1) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4373 && ((p2[2 + idx] & ~ p1[2 + idx]) == 0)))) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4374 break; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4375 |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4376 if (idx == p2[1]) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4377 { |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4378 DEBUG_PRINT1 (" No match => fast loop.\n"); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4379 return 1; |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4380 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4381 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4382 } |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4383 } |
35533
6bd789b0ccc3
(mutually_exclusive_p): Add missing `break' at the end of `charset' processing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35525
diff
changeset
|
4384 break; |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4385 |
35525
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
4386 case charset_not: |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
4387 switch (SWITCH_ENUM_CAST (*p1)) |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
4388 { |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
4389 case exactn: |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
4390 case charset: |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
4391 /* Reuse the code above. */ |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
4392 return mutually_exclusive_p (bufp, p2, p1); |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
4393 case charset_not: |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
4394 /* When we have two charset_not, it's very unlikely that |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
4395 they don't overlap. The union of the two sets of excluded |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
4396 chars should cover all possible chars, which, as a matter of |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
4397 fact, is virtually impossible in multibyte buffers. */ |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
4398 ; |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
4399 } |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
4400 break; |
95c2eedea354
(mutually_exclusive_p): Don't blindly handle `charset_not'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33066
diff
changeset
|
4401 |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4402 case wordend: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4403 case notsyntaxspec: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4404 return ((re_opcode_t) *p1 == syntaxspec |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4405 && p1[1] == (op2 == wordend ? Sword : p2[1])); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4406 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4407 case wordbeg: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4408 case syntaxspec: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4409 return ((re_opcode_t) *p1 == notsyntaxspec |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4410 && p1[1] == (op2 == wordend ? Sword : p2[1])); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4411 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4412 case wordbound: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4413 return (((re_opcode_t) *p1 == notsyntaxspec |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4414 || (re_opcode_t) *p1 == syntaxspec) |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4415 && p1[1] == Sword); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4416 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
4417 #ifdef emacs |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4418 case categoryspec: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4419 return ((re_opcode_t) *p1 == notcategoryspec && p1[1] == p2[1]); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4420 case notcategoryspec: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4421 return ((re_opcode_t) *p1 == categoryspec && p1[1] == p2[1]); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4422 #endif /* emacs */ |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4423 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4424 default: |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
4425 ; |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4426 } |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4427 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4428 /* Safe default. */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4429 return 0; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4430 } |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4431 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4432 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4433 /* Matching routines. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4434 |
18262 | 4435 #ifndef emacs /* Emacs never uses this. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4436 /* re_match is like re_match_2 except it takes only a single string. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4437 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4438 int |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4439 re_match (bufp, string, size, pos, regs) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4440 struct re_pattern_buffer *bufp; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4441 const char *string; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4442 int size, pos; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4443 struct re_registers *regs; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4444 { |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
4445 int result = re_match_2_internal (bufp, NULL, 0, (re_char*) string, size, |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4446 pos, regs, size); |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
4447 # if defined C_ALLOCA && !defined REGEX_MALLOC |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4448 alloca (0); |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
4449 # endif |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4450 return result; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4451 } |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
4452 WEAK_ALIAS (__re_match, re_match) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4453 #endif /* not emacs */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4454 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4455 #ifdef emacs |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4456 /* In Emacs, this is the string or buffer in which we |
18262 | 4457 are matching. It is used for looking up syntax properties. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4458 Lisp_Object re_match_object; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4459 #endif |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4460 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4461 /* re_match_2 matches the compiled pattern in BUFP against the |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4462 the (virtual) concatenation of STRING1 and STRING2 (of length SIZE1 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4463 and SIZE2, respectively). We start matching at POS, and stop |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4464 matching at STOP. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4465 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4466 If REGS is non-null and the `no_sub' field of BUFP is nonzero, we |
18262 | 4467 store offsets for the substring each group matched in REGS. See the |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4468 documentation for exactly how many groups we fill. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4469 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4470 We return -1 if no match, -2 if an internal error (such as the |
18262 | 4471 failure stack overflowing). Otherwise, we return the length of the |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4472 matched substring. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4473 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4474 int |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4475 re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4476 struct re_pattern_buffer *bufp; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4477 const char *string1, *string2; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4478 int size1, size2; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4479 int pos; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4480 struct re_registers *regs; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4481 int stop; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4482 { |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4483 int result; |
18262 | 4484 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4485 #ifdef emacs |
21482
9898a4994a12
(re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents:
21404
diff
changeset
|
4486 int charpos; |
9898a4994a12
(re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents:
21404
diff
changeset
|
4487 gl_state.object = re_match_object; |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4488 charpos = SYNTAX_TABLE_BYTE_TO_CHAR (POS_AS_IN_BUFFER (pos)); |
21482
9898a4994a12
(re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents:
21404
diff
changeset
|
4489 SETUP_SYNTAX_TABLE_FOR_OBJECT (re_match_object, charpos, 1); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4490 #endif |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4491 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
4492 result = re_match_2_internal (bufp, (re_char*) string1, size1, |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
4493 (re_char*) string2, size2, |
21482
9898a4994a12
(re_match_2, re_search_2): Convert position to a charpos,
Karl Heuer <kwzh@gnu.org>
parents:
21404
diff
changeset
|
4494 pos, regs, stop); |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
4495 #if defined C_ALLOCA && !defined REGEX_MALLOC |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4496 alloca (0); |
29801
3ea64112b4ba
(re_match, re_match_2): Protect calls to alloca (0).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29546
diff
changeset
|
4497 #endif |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4498 return result; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4499 } |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
4500 WEAK_ALIAS (__re_match_2, re_match_2) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4501 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4502 /* This is a separate function so that we can force an alloca cleanup |
18262 | 4503 afterwards. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4504 static int |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4505 re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4506 struct re_pattern_buffer *bufp; |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
4507 re_char *string1, *string2; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4508 int size1, size2; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4509 int pos; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4510 struct re_registers *regs; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4511 int stop; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4512 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4513 /* General temporaries. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4514 int mcnt; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4515 size_t reg; |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
4516 boolean not; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4517 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4518 /* Just past the end of the corresponding string. */ |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
4519 re_char *end1, *end2; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4520 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4521 /* Pointers into string1 and string2, just past the last characters in |
18262 | 4522 each to consider matching. */ |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
4523 re_char *end_match_1, *end_match_2; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4524 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4525 /* Where we are in the data, and the end of the current string. */ |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
4526 re_char *d, *dend; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4527 |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4528 /* Used sometimes to remember where we were before starting matching |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4529 an operator so that we can go back in case of failure. This "atomic" |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4530 behavior of matching opcodes is indispensable to the correctness |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4531 of the on_failure_keep_string_jump optimization. */ |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4532 re_char *dfail; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4533 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4534 /* Where we are in the pattern, and the end of the pattern. */ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4535 re_char *p = bufp->buffer; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4536 re_char *pend = p + bufp->used; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4537 |
18262 | 4538 /* We use this to map every character in the string. */ |
13250
52e053f46f76
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard M. Stallman <rms@gnu.org>
parents:
13100
diff
changeset
|
4539 RE_TRANSLATE_TYPE translate = bufp->translate; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4540 |
18262 | 4541 /* Nonzero if we have to concern multibyte character. */ |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
4542 const boolean multibyte = RE_MULTIBYTE_P (bufp); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4543 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4544 /* Failure point stack. Each place that can handle a failure further |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4545 down the line pushes a failure point on this stack. It consists of |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4546 regstart, and regend for all registers corresponding to |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4547 the subexpressions we're currently inside, plus the number of such |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4548 registers, and, finally, two char *'s. The first char * is where |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4549 to resume scanning the pattern; the second one is where to resume |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4550 scanning the strings. */ |
18262 | 4551 #ifdef MATCH_MAY_ALLOCATE /* otherwise, this is global. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4552 fail_stack_type fail_stack; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4553 #endif |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4554 #ifdef DEBUG |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4555 unsigned nfailure_points_pushed = 0, nfailure_points_popped = 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4556 #endif |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4557 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
4558 #if defined REL_ALLOC && defined REGEX_MALLOC |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4559 /* This holds the pointer to the failure stack, when |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4560 it is allocated relocatably. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4561 fail_stack_elt_t *failure_stack_ptr; |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4562 #endif |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4563 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4564 /* We fill all the registers internally, independent of what we |
18262 | 4565 return, for use in backreferences. The number here includes |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4566 an element for register zero. */ |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
4567 size_t num_regs = bufp->re_nsub + 1; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4568 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4569 /* Information on the contents of registers. These are pointers into |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4570 the input strings; they record just what was matched (on this |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4571 attempt) by a subexpression part of the pattern, that is, the |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4572 regnum-th regstart pointer points to where in the pattern we began |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4573 matching and the regnum-th regend points to right after where we |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4574 stopped matching the regnum-th subexpression. (The zeroth register |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4575 keeps track of what the whole pattern matches.) */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4576 #ifdef MATCH_MAY_ALLOCATE /* otherwise, these are global. */ |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
4577 re_char **regstart, **regend; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4578 #endif |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4579 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4580 /* The following record the register info as found in the above |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4581 variables when we find a match better than any we've seen before. |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4582 This happens as we backtrack through the failure points, which in |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4583 turn happens only if we have not yet matched the entire string. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4584 unsigned best_regs_set = false; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4585 #ifdef MATCH_MAY_ALLOCATE /* otherwise, these are global. */ |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
4586 re_char **best_regstart, **best_regend; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4587 #endif |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4588 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4589 /* Logically, this is `best_regend[0]'. But we don't want to have to |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4590 allocate space for that if we're not allocating space for anything |
18262 | 4591 else (see below). Also, we never need info about register 0 for |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4592 any of the other register vectors, and it seems rather a kludge to |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4593 treat `best_regend' differently than the rest. So we keep track of |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4594 the end of the best match so far in a separate variable. We |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4595 initialize this to NULL so that when we backtrack the first time |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4596 and need to test it, it's not garbage. */ |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
4597 re_char *match_end = NULL; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4598 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4599 #ifdef DEBUG |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4600 /* Counts the total number of registers pushed. */ |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4601 unsigned num_regs_pushed = 0; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4602 #endif |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4603 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4604 DEBUG_PRINT1 ("\n\nEntering re_match_2.\n"); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4605 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4606 INIT_FAIL_STACK (); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4607 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4608 #ifdef MATCH_MAY_ALLOCATE |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4609 /* Do not bother to initialize all the register variables if there are |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4610 no groups in the pattern, as it takes a fair amount of time. If |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4611 there are groups, we include space for register 0 (the whole |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4612 pattern), even though we never use it, since it simplifies the |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4613 array indexing. We should fix this. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4614 if (bufp->re_nsub) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4615 { |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
4616 regstart = REGEX_TALLOC (num_regs, re_char *); |
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
4617 regend = REGEX_TALLOC (num_regs, re_char *); |
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
4618 best_regstart = REGEX_TALLOC (num_regs, re_char *); |
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
4619 best_regend = REGEX_TALLOC (num_regs, re_char *); |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4620 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4621 if (!(regstart && regend && best_regstart && best_regend)) |
18262 | 4622 { |
4623 FREE_VARIABLES (); | |
4624 return -2; | |
4625 } | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4626 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4627 else |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4628 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4629 /* We must initialize all our variables to NULL, so that |
18262 | 4630 `FREE_VARIABLES' doesn't try to free them. */ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4631 regstart = regend = best_regstart = best_regend = NULL; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4632 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4633 #endif /* MATCH_MAY_ALLOCATE */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4634 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4635 /* The starting position is bogus. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4636 if (pos < 0 || pos > size1 + size2) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4637 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4638 FREE_VARIABLES (); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4639 return -1; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4640 } |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4641 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4642 /* Initialize subexpression text positions to -1 to mark ones that no |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4643 start_memory/stop_memory has been seen for. Also initialize the |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4644 register information struct. */ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4645 for (reg = 1; reg < num_regs; reg++) |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4646 regstart[reg] = regend[reg] = NULL; |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4647 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4648 /* We move `string1' into `string2' if the latter's empty -- but not if |
18262 | 4649 `string1' is null. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4650 if (size2 == 0 && string1 != NULL) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4651 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4652 string2 = string1; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4653 size2 = size1; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4654 string1 = 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4655 size1 = 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4656 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4657 end1 = string1 + size1; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4658 end2 = string2 + size2; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4659 |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4660 /* `p' scans through the pattern as `d' scans through the data. |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4661 `dend' is the end of the input string that `d' points within. `d' |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4662 is advanced into the following input string whenever necessary, but |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4663 this happens before fetching; therefore, at the beginning of the |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4664 loop, `d' can be pointing at the end of a string, but it cannot |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4665 equal `string2'. */ |
28662
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4666 if (pos >= size1) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4667 { |
28662
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4668 /* Only match within string2. */ |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4669 d = string2 + pos - size1; |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4670 dend = end_match_2 = string2 + stop - size1; |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4671 end_match_1 = end1; /* Just to give it a value. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4672 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4673 else |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4674 { |
29296
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
4675 if (stop < size1) |
28662
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4676 { |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4677 /* Only match within string1. */ |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4678 end_match_1 = string1 + stop; |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4679 /* BEWARE! |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4680 When we reach end_match_1, PREFETCH normally switches to string2. |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4681 But in the present case, this means that just doing a PREFETCH |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4682 makes us jump from `stop' to `gap' within the string. |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4683 What we really want here is for the search to stop as |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4684 soon as we hit end_match_1. That's why we set end_match_2 |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4685 to end_match_1 (since PREFETCH fails as soon as we hit |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4686 end_match_2). */ |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4687 end_match_2 = end_match_1; |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4688 } |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4689 else |
29296
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
4690 { /* It's important to use this code when stop == size so that |
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
4691 moving `d' from end1 to string2 will not prevent the d == dend |
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
4692 check from catching the end of string. */ |
28662
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4693 end_match_1 = end1; |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4694 end_match_2 = string2 + stop - size1; |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4695 } |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4696 d = string1 + pos; |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
4697 dend = end_match_1; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4698 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4699 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4700 DEBUG_PRINT1 ("The compiled pattern is: "); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4701 DEBUG_PRINT_COMPILED_PATTERN (bufp, p, pend); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4702 DEBUG_PRINT1 ("The string to match is: `"); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4703 DEBUG_PRINT_DOUBLE_STRING (d, string1, size1, string2, size2); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4704 DEBUG_PRINT1 ("'\n"); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4705 |
18262 | 4706 /* This loops over pattern commands. It exits by returning from the |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4707 function if the match is complete, or it drops through if the match |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4708 fails at this starting point in the input data. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4709 for (;;) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4710 { |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
4711 DEBUG_PRINT2 ("\n%p: ", p); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4712 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4713 if (p == pend) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4714 { /* End of pattern means we might have succeeded. */ |
18262 | 4715 DEBUG_PRINT1 ("end of pattern ... "); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4716 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4717 /* If we haven't matched the entire string, and we want the |
18262 | 4718 longest match, try backtracking. */ |
4719 if (d != end_match_2) | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4720 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4721 /* 1 if this match ends in the same string (string1 or string2) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4722 as the best previous match. */ |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4723 boolean same_str_p = (FIRST_STRING_P (match_end) |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4724 == FIRST_STRING_P (d)); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4725 /* 1 if this match is the best seen so far. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4726 boolean best_match_p; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4727 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4728 /* AIX compiler got confused when this was combined |
18262 | 4729 with the previous declaration. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4730 if (same_str_p) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4731 best_match_p = d > match_end; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4732 else |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4733 best_match_p = !FIRST_STRING_P (d); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4734 |
18262 | 4735 DEBUG_PRINT1 ("backtracking.\n"); |
4736 | |
4737 if (!FAIL_STACK_EMPTY ()) | |
4738 { /* More failure points to try. */ | |
4739 | |
4740 /* If exceeds best match so far, save it. */ | |
4741 if (!best_regs_set || best_match_p) | |
4742 { | |
4743 best_regs_set = true; | |
4744 match_end = d; | |
4745 | |
4746 DEBUG_PRINT1 ("\nSAVING match as best so far.\n"); | |
4747 | |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4748 for (reg = 1; reg < num_regs; reg++) |
18262 | 4749 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4750 best_regstart[reg] = regstart[reg]; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4751 best_regend[reg] = regend[reg]; |
18262 | 4752 } |
4753 } | |
4754 goto fail; | |
4755 } | |
4756 | |
4757 /* If no failure points, don't restore garbage. And if | |
4758 last match is real best match, don't restore second | |
4759 best one. */ | |
4760 else if (best_regs_set && !best_match_p) | |
4761 { | |
4762 restore_best_regs: | |
4763 /* Restore best match. It may happen that `dend == | |
4764 end_match_1' while the restored d is in string2. | |
4765 For example, the pattern `x.*y.*z' against the | |
4766 strings `x-' and `y-z-', if the two strings are | |
4767 not consecutive in memory. */ | |
4768 DEBUG_PRINT1 ("Restoring best registers.\n"); | |
4769 | |
4770 d = match_end; | |
4771 dend = ((d >= string1 && d <= end1) | |
4772 ? end_match_1 : end_match_2); | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4773 |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4774 for (reg = 1; reg < num_regs; reg++) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4775 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4776 regstart[reg] = best_regstart[reg]; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4777 regend[reg] = best_regend[reg]; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4778 } |
18262 | 4779 } |
4780 } /* d != end_match_2 */ | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4781 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4782 succeed_label: |
18262 | 4783 DEBUG_PRINT1 ("Accepting match.\n"); |
4784 | |
4785 /* If caller wants register contents data back, do it. */ | |
4786 if (regs && !bufp->no_sub) | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4787 { |
18262 | 4788 /* Have the register data arrays been allocated? */ |
4789 if (bufp->regs_allocated == REGS_UNALLOCATED) | |
4790 { /* No. So allocate them with malloc. We need one | |
4791 extra element beyond `num_regs' for the `-1' marker | |
4792 GNU code uses. */ | |
4793 regs->num_regs = MAX (RE_NREGS, num_regs + 1); | |
4794 regs->start = TALLOC (regs->num_regs, regoff_t); | |
4795 regs->end = TALLOC (regs->num_regs, regoff_t); | |
4796 if (regs->start == NULL || regs->end == NULL) | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4797 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4798 FREE_VARIABLES (); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4799 return -2; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4800 } |
18262 | 4801 bufp->regs_allocated = REGS_REALLOCATE; |
4802 } | |
4803 else if (bufp->regs_allocated == REGS_REALLOCATE) | |
4804 { /* Yes. If we need more elements than were already | |
4805 allocated, reallocate them. If we need fewer, just | |
4806 leave it alone. */ | |
4807 if (regs->num_regs < num_regs + 1) | |
4808 { | |
4809 regs->num_regs = num_regs + 1; | |
4810 RETALLOC (regs->start, regs->num_regs, regoff_t); | |
4811 RETALLOC (regs->end, regs->num_regs, regoff_t); | |
4812 if (regs->start == NULL || regs->end == NULL) | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4813 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4814 FREE_VARIABLES (); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4815 return -2; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4816 } |
18262 | 4817 } |
4818 } | |
4819 else | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4820 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4821 /* These braces fend off a "empty body in an else-statement" |
18262 | 4822 warning under GCC when assert expands to nothing. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4823 assert (bufp->regs_allocated == REGS_FIXED); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4824 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4825 |
18262 | 4826 /* Convert the pointer data in `regstart' and `regend' to |
4827 indices. Register zero has to be set differently, | |
4828 since we haven't kept track of any info for it. */ | |
4829 if (regs->num_regs > 0) | |
4830 { | |
4831 regs->start[0] = pos; | |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4832 regs->end[0] = POINTER_TO_OFFSET (d); |
18262 | 4833 } |
4834 | |
4835 /* Go through the first `min (num_regs, regs->num_regs)' | |
4836 registers, since that is all we initialized. */ | |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4837 for (reg = 1; reg < MIN (num_regs, regs->num_regs); reg++) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4838 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4839 if (REG_UNSET (regstart[reg]) || REG_UNSET (regend[reg])) |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4840 regs->start[reg] = regs->end[reg] = -1; |
18262 | 4841 else |
4842 { | |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4843 regs->start[reg] |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4844 = (regoff_t) POINTER_TO_OFFSET (regstart[reg]); |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4845 regs->end[reg] |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4846 = (regoff_t) POINTER_TO_OFFSET (regend[reg]); |
18262 | 4847 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4848 } |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
4849 |
18262 | 4850 /* If the regs structure we return has more elements than |
4851 were in the pattern, set the extra elements to -1. If | |
4852 we (re)allocated the registers, this is the case, | |
4853 because we always allocate enough to have at least one | |
4854 -1 at the end. */ | |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4855 for (reg = num_regs; reg < regs->num_regs; reg++) |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4856 regs->start[reg] = regs->end[reg] = -1; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4857 } /* regs && !bufp->no_sub */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4858 |
18262 | 4859 DEBUG_PRINT4 ("%u failure points pushed, %u popped (%u remain).\n", |
4860 nfailure_points_pushed, nfailure_points_popped, | |
4861 nfailure_points_pushed - nfailure_points_popped); | |
4862 DEBUG_PRINT2 ("%u registers pushed.\n", num_regs_pushed); | |
4863 | |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4864 mcnt = POINTER_TO_OFFSET (d) - pos; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4865 |
18262 | 4866 DEBUG_PRINT2 ("Returning %d from re_match_2.\n", mcnt); |
4867 | |
4868 FREE_VARIABLES (); | |
4869 return mcnt; | |
4870 } | |
4871 | |
4872 /* Otherwise match next pattern command. */ | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4873 switch (SWITCH_ENUM_CAST ((re_opcode_t) *p++)) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4874 { |
18262 | 4875 /* Ignore these. Used to ignore the n of succeed_n's which |
4876 currently have n == 0. */ | |
4877 case no_op: | |
4878 DEBUG_PRINT1 ("EXECUTING no_op.\n"); | |
4879 break; | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4880 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4881 case succeed: |
18262 | 4882 DEBUG_PRINT1 ("EXECUTING succeed.\n"); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4883 goto succeed_label; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4884 |
18262 | 4885 /* Match the next n pattern characters exactly. The following |
4886 byte in the pattern defines n, and the n bytes after that | |
4887 are the characters to match. */ | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4888 case exactn: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4889 mcnt = *p++; |
18262 | 4890 DEBUG_PRINT2 ("EXECUTING exactn %d.\n", mcnt); |
4891 | |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4892 /* Remember the start point to rollback upon failure. */ |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4893 dfail = d; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4894 |
18262 | 4895 /* This is written out as an if-else so we don't waste time |
4896 testing `translate' inside the loop. */ | |
21562
afd0a04106ec
Use RE_TRANSLATE_P to check whether translation is
Andreas Schwab <schwab@suse.de>
parents:
21558
diff
changeset
|
4897 if (RE_TRANSLATE_P (translate)) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4898 { |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4899 if (multibyte) |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4900 do |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4901 { |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4902 int pat_charlen, buf_charlen; |
21401
7afa39c82ea2
(re_match_2_internal): Declare buf_ch unsigned int.
Richard M. Stallman <rms@gnu.org>
parents:
21352
diff
changeset
|
4903 unsigned int pat_ch, buf_ch; |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4904 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4905 PREFETCH (); |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4906 pat_ch = STRING_CHAR_AND_LENGTH (p, pend - p, pat_charlen); |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4907 buf_ch = STRING_CHAR_AND_LENGTH (d, dend - d, buf_charlen); |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4908 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4909 if (RE_TRANSLATE (translate, buf_ch) |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4910 != pat_ch) |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4911 { |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4912 d = dfail; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4913 goto fail; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4914 } |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4915 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4916 p += pat_charlen; |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4917 d += buf_charlen; |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4918 mcnt -= pat_charlen; |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4919 } |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4920 while (mcnt > 0); |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4921 else |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4922 do |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4923 { |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4924 PREFETCH (); |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
4925 if (RE_TRANSLATE (translate, *d) != *p++) |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4926 { |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4927 d = dfail; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4928 goto fail; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4929 } |
22237
566c88b62de6
(re_search_2): Don't use ++ inside RE_TRANSLATE.
Richard M. Stallman <rms@gnu.org>
parents:
21963
diff
changeset
|
4930 d++; |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4931 } |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4932 while (--mcnt); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4933 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4934 else |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4935 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4936 do |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4937 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4938 PREFETCH (); |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4939 if (*d++ != *p++) |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4940 { |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4941 d = dfail; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4942 goto fail; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
4943 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4944 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4945 while (--mcnt); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4946 } |
18262 | 4947 break; |
4948 | |
4949 | |
4950 /* Match any character except possibly a newline or a null. */ | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4951 case anychar: |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4952 { |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4953 int buf_charlen; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4954 re_wchar_t buf_ch; |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4955 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4956 DEBUG_PRINT1 ("EXECUTING anychar.\n"); |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4957 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4958 PREFETCH (); |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
4959 buf_ch = RE_STRING_CHAR_AND_LENGTH (d, dend - d, buf_charlen); |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4960 buf_ch = TRANSLATE (buf_ch); |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4961 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4962 if ((!(bufp->syntax & RE_DOT_NEWLINE) |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4963 && buf_ch == '\n') |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4964 || ((bufp->syntax & RE_DOT_NOT_NULL) |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4965 && buf_ch == '\000')) |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4966 goto fail; |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4967 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4968 DEBUG_PRINT2 (" Matched `%d'.\n", *d); |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4969 d += buf_charlen; |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
4970 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4971 break; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4972 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4973 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4974 case charset: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4975 case charset_not: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4976 { |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4977 register unsigned int c; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4978 boolean not = (re_opcode_t) *(p - 1) == charset_not; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4979 int len; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4980 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4981 /* Start of actual range_table, or end of bitmap if there is no |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4982 range table. */ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
4983 re_char *range_table; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4984 |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
4985 /* Nonzero if there is a range table. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4986 int range_table_exists; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4987 |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
4988 /* Number of ranges of range table. This is not included |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
4989 in the initial byte-length of the command. */ |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
4990 int count = 0; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4991 |
18262 | 4992 DEBUG_PRINT2 ("EXECUTING charset%s.\n", not ? "_not" : ""); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
4993 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4994 range_table_exists = CHARSET_RANGE_TABLE_EXISTS_P (&p[-1]); |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
4995 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
4996 if (range_table_exists) |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
4997 { |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
4998 range_table = CHARSET_RANGE_TABLE (&p[-1]); /* Past the bitmap. */ |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
4999 EXTRACT_NUMBER_AND_INCR (count, range_table); |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5000 } |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5001 |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5002 PREFETCH (); |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5003 c = RE_STRING_CHAR_AND_LENGTH (d, dend - d, len); |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5004 c = TRANSLATE (c); /* The character to match. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5005 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5006 if (SINGLE_BYTE_CHAR_P (c)) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5007 { /* Lookup bitmap. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5008 /* Cast to `unsigned' instead of `unsigned char' in |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5009 case the bit list is a full 32 bytes long. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5010 if (c < (unsigned) (CHARSET_BITMAP_SIZE (&p[-1]) * BYTEWIDTH) |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5011 && p[1 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH))) |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5012 not = !not; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5013 } |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5014 #ifdef emacs |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5015 else if (range_table_exists) |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5016 { |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5017 int class_bits = CHARSET_RANGE_TABLE_BITS (&p[-1]); |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5018 |
31360
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
5019 if ( (class_bits & BIT_LOWER && ISLOWER (c)) |
b8513fe83893
(WIDE_CHAR_SUPPORT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31312
diff
changeset
|
5020 | (class_bits & BIT_MULTIBYTE) |
25440
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5021 | (class_bits & BIT_PUNCT && ISPUNCT (c)) |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5022 | (class_bits & BIT_SPACE && ISSPACE (c)) |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5023 | (class_bits & BIT_UPPER && ISUPPER (c)) |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5024 | (class_bits & BIT_WORD && ISWORD (c))) |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5025 not = !not; |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5026 else |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5027 CHARSET_LOOKUP_RANGE_TABLE_RAW (not, c, range_table, count); |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5028 } |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5029 #endif /* emacs */ |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5030 |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5031 if (range_table_exists) |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5032 p = CHARSET_RANGE_TABLE_END (range_table, count); |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5033 else |
0a1099580297
[emacs]: Handle character classes for multibyte chars:
Richard M. Stallman <rms@gnu.org>
parents:
24119
diff
changeset
|
5034 p += CHARSET_BITMAP_SIZE (&p[-1]) + 1; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5035 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5036 if (!not) goto fail; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5037 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5038 d += len; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5039 break; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5040 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5041 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5042 |
18262 | 5043 /* The beginning of a group is represented by start_memory. |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5044 The argument is the register number. The text |
18262 | 5045 matched within the group is recorded (in the internal |
5046 registers data structure) under the register number. */ | |
5047 case start_memory: | |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5048 DEBUG_PRINT2 ("EXECUTING start_memory %d:\n", *p); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5049 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5050 /* In case we need to undo this operation (via backtracking). */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5051 PUSH_FAILURE_REG ((unsigned int)*p); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5052 |
18262 | 5053 regstart[*p] = d; |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
5054 regend[*p] = NULL; /* probably unnecessary. -sm */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5055 DEBUG_PRINT2 (" regstart: %d\n", POINTER_TO_OFFSET (regstart[*p])); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5056 |
18262 | 5057 /* Move past the register number and inner group count. */ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5058 p += 1; |
18262 | 5059 break; |
5060 | |
5061 | |
5062 /* The stop_memory opcode represents the end of a group. Its | |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5063 argument is the same as start_memory's: the register number. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5064 case stop_memory: |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5065 DEBUG_PRINT2 ("EXECUTING stop_memory %d:\n", *p); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5066 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5067 assert (!REG_UNSET (regstart[*p])); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5068 /* Strictly speaking, there should be code such as: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5069 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5070 assert (REG_UNSET (regend[*p])); |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5071 PUSH_FAILURE_REGSTOP ((unsigned int)*p); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5072 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5073 But the only info to be pushed is regend[*p] and it is known to |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5074 be UNSET, so there really isn't anything to push. |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5075 Not pushing anything, on the other hand deprives us from the |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5076 guarantee that regend[*p] is UNSET since undoing this operation |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5077 will not reset its value properly. This is not important since |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5078 the value will only be read on the next start_memory or at |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5079 the very end and both events can only happen if this stop_memory |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5080 is *not* undone. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5081 |
18262 | 5082 regend[*p] = d; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5083 DEBUG_PRINT2 (" regend: %d\n", POINTER_TO_OFFSET (regend[*p])); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5084 |
18262 | 5085 /* Move past the register number and the inner group count. */ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5086 p += 1; |
18262 | 5087 break; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5088 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5089 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5090 /* \<digit> has been turned into a `duplicate' command which is |
18262 | 5091 followed by the numeric value of <digit> as the register number. */ |
5092 case duplicate: | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5093 { |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
5094 register re_char *d2, *dend2; |
18262 | 5095 int regno = *p++; /* Get which register to match against. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5096 DEBUG_PRINT2 ("EXECUTING duplicate %d.\n", regno); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5097 |
18262 | 5098 /* Can't back reference a group which we've never matched. */ |
5099 if (REG_UNSET (regstart[regno]) || REG_UNSET (regend[regno])) | |
5100 goto fail; | |
5101 | |
5102 /* Where in input to try to start matching. */ | |
5103 d2 = regstart[regno]; | |
5104 | |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
5105 /* Remember the start point to rollback upon failure. */ |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
5106 dfail = d; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
5107 |
18262 | 5108 /* Where to stop matching; if both the place to start and |
5109 the place to stop matching are in the same string, then | |
5110 set to the place to stop, otherwise, for now have to use | |
5111 the end of the first string. */ | |
5112 | |
5113 dend2 = ((FIRST_STRING_P (regstart[regno]) | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5114 == FIRST_STRING_P (regend[regno])) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5115 ? regend[regno] : end_match_1); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5116 for (;;) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5117 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5118 /* If necessary, advance to next segment in register |
18262 | 5119 contents. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5120 while (d2 == dend2) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5121 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5122 if (dend2 == end_match_2) break; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5123 if (dend2 == regend[regno]) break; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5124 |
18262 | 5125 /* End of string1 => advance to string2. */ |
5126 d2 = string2; | |
5127 dend2 = regend[regno]; | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5128 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5129 /* At end of register contents => success */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5130 if (d2 == dend2) break; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5131 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5132 /* If necessary, advance to next segment in data. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5133 PREFETCH (); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5134 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5135 /* How many characters left in this segment to match. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5136 mcnt = dend - d; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5137 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5138 /* Want how many consecutive characters we can match in |
18262 | 5139 one shot, so, if necessary, adjust the count. */ |
5140 if (mcnt > dend2 - d2) | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5141 mcnt = dend2 - d2; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5142 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5143 /* Compare that many; failure if mismatch, else move |
18262 | 5144 past them. */ |
21562
afd0a04106ec
Use RE_TRANSLATE_P to check whether translation is
Andreas Schwab <schwab@suse.de>
parents:
21558
diff
changeset
|
5145 if (RE_TRANSLATE_P (translate) |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5146 ? bcmp_translate (d, d2, mcnt, translate, multibyte) |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
5147 : memcmp (d, d2, mcnt)) |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
5148 { |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
5149 d = dfail; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
5150 goto fail; |
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
5151 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5152 d += mcnt, d2 += mcnt; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5153 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5154 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5155 break; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5156 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5157 |
18262 | 5158 /* begline matches the empty string at the beginning of the string |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5159 (unless `not_bol' is set in `bufp'), and after newlines. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5160 case begline: |
18262 | 5161 DEBUG_PRINT1 ("EXECUTING begline.\n"); |
5162 | |
5163 if (AT_STRINGS_BEG (d)) | |
5164 { | |
5165 if (!bufp->not_bol) break; | |
5166 } | |
28662
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
5167 else |
18262 | 5168 { |
28662
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
5169 unsigned char c; |
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
5170 GET_CHAR_BEFORE_2 (c, d, string1, end1, string2, end2); |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5171 if (c == '\n') |
28662
d40a7f046efe
(re_match_2_internal): Don't shorten the strings anymore,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28473
diff
changeset
|
5172 break; |
18262 | 5173 } |
5174 /* In all other cases, we fail. */ | |
5175 goto fail; | |
5176 | |
5177 | |
5178 /* endline is the dual of begline. */ | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5179 case endline: |
18262 | 5180 DEBUG_PRINT1 ("EXECUTING endline.\n"); |
5181 | |
5182 if (AT_STRINGS_END (d)) | |
5183 { | |
5184 if (!bufp->not_eol) break; | |
5185 } | |
29296
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
5186 else |
18262 | 5187 { |
29296
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
5188 PREFETCH_NOLIMIT (); |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5189 if (*d == '\n') |
29296
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
5190 break; |
18262 | 5191 } |
5192 goto fail; | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5193 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5194 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5195 /* Match at the very beginning of the data. */ |
18262 | 5196 case begbuf: |
5197 DEBUG_PRINT1 ("EXECUTING begbuf.\n"); | |
5198 if (AT_STRINGS_BEG (d)) | |
5199 break; | |
5200 goto fail; | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5201 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5202 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5203 /* Match at the very end of the data. */ |
18262 | 5204 case endbuf: |
5205 DEBUG_PRINT1 ("EXECUTING endbuf.\n"); | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5206 if (AT_STRINGS_END (d)) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5207 break; |
18262 | 5208 goto fail; |
5209 | |
5210 | |
5211 /* on_failure_keep_string_jump is used to optimize `.*\n'. It | |
5212 pushes NULL as the value for the string on the stack. Then | |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5213 `POP_FAILURE_POINT' will keep the current value for the |
18262 | 5214 string, instead of restoring it. To see why, consider |
5215 matching `foo\nbar' against `.*\n'. The .* matches the foo; | |
5216 then the . fails against the \n. But the next thing we want | |
5217 to do is match the \n against the \n; if we restored the | |
5218 string value, we would be back at the foo. | |
5219 | |
5220 Because this is used only in specific cases, we don't need to | |
5221 check all the things that `on_failure_jump' does, to make | |
5222 sure the right things get saved on the stack. Hence we don't | |
5223 share its code. The only reason to push anything on the | |
5224 stack at all is that otherwise we would have to change | |
5225 `anychar's code to do something besides goto fail in this | |
5226 case; that seems worse than this. */ | |
5227 case on_failure_keep_string_jump: | |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5228 EXTRACT_NUMBER_AND_INCR (mcnt, p); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5229 DEBUG_PRINT3 ("EXECUTING on_failure_keep_string_jump %d (to %p):\n", |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5230 mcnt, p + mcnt); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5231 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5232 PUSH_FAILURE_POINT (p - 3, NULL); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5233 break; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5234 |
28342
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5235 /* A nasty loop is introduced by the non-greedy *? and +?. |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5236 With such loops, the stack only ever contains one failure point |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5237 at a time, so that a plain on_failure_jump_loop kind of |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5238 cycle detection cannot work. Worse yet, such a detection |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5239 can not only fail to detect a cycle, but it can also wrongly |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5240 detect a cycle (between different instantiations of the same |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5241 loop. |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5242 So the method used for those nasty loops is a little different: |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5243 We use a special cycle-detection-stack-frame which is pushed |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5244 when the on_failure_jump_nastyloop failure-point is *popped*. |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5245 This special frame thus marks the beginning of one iteration |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5246 through the loop and we can hence easily check right here |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5247 whether something matched between the beginning and the end of |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5248 the loop. */ |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5249 case on_failure_jump_nastyloop: |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5250 EXTRACT_NUMBER_AND_INCR (mcnt, p); |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5251 DEBUG_PRINT3 ("EXECUTING on_failure_jump_nastyloop %d (to %p):\n", |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5252 mcnt, p + mcnt); |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5253 |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5254 assert ((re_opcode_t)p[-4] == no_op); |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5255 CHECK_INFINITE_LOOP (p - 4, d); |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5256 PUSH_FAILURE_POINT (p - 3, d); |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5257 break; |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5258 |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5259 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5260 /* Simple loop detecting on_failure_jump: just check on the |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5261 failure stack if the same spot was already hit earlier. */ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5262 case on_failure_jump_loop: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5263 on_failure: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5264 EXTRACT_NUMBER_AND_INCR (mcnt, p); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5265 DEBUG_PRINT3 ("EXECUTING on_failure_jump_loop %d (to %p):\n", |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5266 mcnt, p + mcnt); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5267 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5268 CHECK_INFINITE_LOOP (p - 3, d); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5269 PUSH_FAILURE_POINT (p - 3, d); |
18262 | 5270 break; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5271 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5272 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5273 /* Uses of on_failure_jump: |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5274 |
18262 | 5275 Each alternative starts with an on_failure_jump that points |
5276 to the beginning of the next alternative. Each alternative | |
5277 except the last ends with a jump that in effect jumps past | |
5278 the rest of the alternatives. (They really jump to the | |
5279 ending jump of the following alternative, because tensioning | |
5280 these jumps is a hassle.) | |
5281 | |
5282 Repeats start with an on_failure_jump that points past both | |
5283 the repetition text and either the following jump or | |
5284 pop_failure_jump back to this on_failure_jump. */ | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5285 case on_failure_jump: |
32823
2a7f61d7ae12
(IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents:
32805
diff
changeset
|
5286 IMMEDIATE_QUIT_CHECK; |
18262 | 5287 EXTRACT_NUMBER_AND_INCR (mcnt, p); |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5288 DEBUG_PRINT3 ("EXECUTING on_failure_jump %d (to %p):\n", |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5289 mcnt, p + mcnt); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5290 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5291 PUSH_FAILURE_POINT (p -3, d); |
18262 | 5292 break; |
5293 | |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5294 /* This operation is used for greedy *. |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5295 Compare the beginning of the repeat with what in the |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5296 pattern follows its end. If we can establish that there |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5297 is nothing that they would both match, i.e., that we |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5298 would have to backtrack because of (as in, e.g., `a*a') |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5299 then we can use a non-backtracking loop based on |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5300 on_failure_keep_string_jump instead of on_failure_jump. */ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5301 case on_failure_jump_smart: |
32823
2a7f61d7ae12
(IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents:
32805
diff
changeset
|
5302 IMMEDIATE_QUIT_CHECK; |
18262 | 5303 EXTRACT_NUMBER_AND_INCR (mcnt, p); |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5304 DEBUG_PRINT3 ("EXECUTING on_failure_jump_smart %d (to %p).\n", |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5305 mcnt, p + mcnt); |
18262 | 5306 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5307 re_char *p1 = p; /* Next operation. */ |
32954
f77e6c51dd07
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32891
diff
changeset
|
5308 /* Here, we discard `const', making re_match non-reentrant. */ |
f77e6c51dd07
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32891
diff
changeset
|
5309 unsigned char *p2 = (unsigned char*) p + mcnt; /* Jump dest. */ |
f77e6c51dd07
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32891
diff
changeset
|
5310 unsigned char *p3 = (unsigned char*) p - 3; /* opcode location. */ |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5311 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5312 p -= 3; /* Reset so that we will re-execute the |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5313 instruction once it's been changed. */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5314 |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5315 EXTRACT_NUMBER (mcnt, p2 - 2); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5316 |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5317 /* Ensure this is a indeed the trivial kind of loop |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5318 we are expecting. */ |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5319 assert (skip_one_char (p1) == p2 - 3); |
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5320 assert ((re_opcode_t) p2[-3] == jump && p2 + mcnt == p); |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
5321 DEBUG_STATEMENT (debug += 2); |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5322 if (mutually_exclusive_p (bufp, p1, p2)) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5323 { |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5324 /* Use a fast `on_failure_keep_string_jump' loop. */ |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5325 DEBUG_PRINT1 (" smart exclusive => fast loop.\n"); |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5326 *p3 = (unsigned char) on_failure_keep_string_jump; |
28203
c10ee0e6982b
(RE_STRING_CHAR): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28163
diff
changeset
|
5327 STORE_NUMBER (p2 - 2, mcnt + 3); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5328 } |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5329 else |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5330 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5331 /* Default to a safe `on_failure_jump' loop. */ |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5332 DEBUG_PRINT1 (" smart default => slow loop.\n"); |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5333 *p3 = (unsigned char) on_failure_jump; |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5334 } |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
5335 DEBUG_STATEMENT (debug -= 2); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5336 } |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5337 break; |
18262 | 5338 |
5339 /* Unconditionally jump (without popping any failure points). */ | |
5340 case jump: | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5341 unconditional_jump: |
32823
2a7f61d7ae12
(IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents:
32805
diff
changeset
|
5342 IMMEDIATE_QUIT_CHECK; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5343 EXTRACT_NUMBER_AND_INCR (mcnt, p); /* Get the amount to jump. */ |
18262 | 5344 DEBUG_PRINT2 ("EXECUTING jump %d ", mcnt); |
5345 p += mcnt; /* Do the jump. */ | |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5346 DEBUG_PRINT2 ("(to %p).\n", p); |
18262 | 5347 break; |
5348 | |
5349 | |
5350 /* Have to succeed matching what follows at least n times. | |
5351 After that, handle like `on_failure_jump'. */ | |
5352 case succeed_n: | |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5353 /* Signedness doesn't matter since we only compare MCNT to 0. */ |
18262 | 5354 EXTRACT_NUMBER (mcnt, p + 2); |
5355 DEBUG_PRINT2 ("EXECUTING succeed_n %d.\n", mcnt); | |
5356 | |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
5357 /* Originally, mcnt is how many times we HAVE to succeed. */ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
5358 if (mcnt != 0) |
18262 | 5359 { |
32954
f77e6c51dd07
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32891
diff
changeset
|
5360 /* Here, we discard `const', making re_match non-reentrant. */ |
f77e6c51dd07
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32891
diff
changeset
|
5361 unsigned char *p2 = (unsigned char*) p + 2; /* counter loc. */ |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
5362 mcnt--; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5363 p += 4; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5364 PUSH_NUMBER (p2, mcnt); |
18262 | 5365 } |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
5366 else |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
5367 /* The two bytes encoding mcnt == 0 are two no_op opcodes. */ |
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
5368 goto on_failure; |
18262 | 5369 break; |
5370 | |
5371 case jump_n: | |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5372 /* Signedness doesn't matter since we only compare MCNT to 0. */ |
18262 | 5373 EXTRACT_NUMBER (mcnt, p + 2); |
5374 DEBUG_PRINT2 ("EXECUTING jump_n %d.\n", mcnt); | |
5375 | |
5376 /* Originally, this is how many times we CAN jump. */ | |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
5377 if (mcnt != 0) |
18262 | 5378 { |
32954
f77e6c51dd07
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32891
diff
changeset
|
5379 /* Here, we discard `const', making re_match non-reentrant. */ |
f77e6c51dd07
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32891
diff
changeset
|
5380 unsigned char *p2 = (unsigned char*) p + 2; /* counter loc. */ |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
5381 mcnt--; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5382 PUSH_NUMBER (p2, mcnt); |
31172
0ee53ec2081a
(PUSH_FAILURE_COUNT): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30752
diff
changeset
|
5383 goto unconditional_jump; |
18262 | 5384 } |
5385 /* If don't have to jump any more, skip over the rest of command. */ | |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5386 else |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5387 p += 4; |
18262 | 5388 break; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5389 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5390 case set_number_at: |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5391 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5392 unsigned char *p2; /* Location of the counter. */ |
18262 | 5393 DEBUG_PRINT1 ("EXECUTING set_number_at.\n"); |
5394 | |
5395 EXTRACT_NUMBER_AND_INCR (mcnt, p); | |
32954
f77e6c51dd07
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32891
diff
changeset
|
5396 /* Here, we discard `const', making re_match non-reentrant. */ |
f77e6c51dd07
(POP_FAILURE_REG_OR_COUNT, re_match_2_internal)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32891
diff
changeset
|
5397 p2 = (unsigned char*) p + mcnt; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5398 /* Signedness doesn't matter since we only copy MCNT's bits . */ |
18262 | 5399 EXTRACT_NUMBER_AND_INCR (mcnt, p); |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5400 DEBUG_PRINT3 (" Setting %p to %d.\n", p2, mcnt); |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5401 PUSH_NUMBER (p2, mcnt); |
18262 | 5402 break; |
5403 } | |
13722
e2669b8a46e2
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
13565
diff
changeset
|
5404 |
e2669b8a46e2
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
13565
diff
changeset
|
5405 case wordbound: |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
5406 case notwordbound: |
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
5407 not = (re_opcode_t) *(p - 1) == notwordbound; |
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
5408 DEBUG_PRINT2 ("EXECUTING %swordbound.\n", not?"not":""); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5409 |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
5410 /* We SUCCEED (or FAIL) in one of the following cases: */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5411 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5412 /* Case 1: D is at the beginning or the end of string. */ |
13722
e2669b8a46e2
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
13565
diff
changeset
|
5413 if (AT_STRINGS_BEG (d) || AT_STRINGS_END (d)) |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
5414 not = !not; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5415 else |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5416 { |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5417 /* C1 is the character before D, S1 is the syntax of C1, C2 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5418 is the character at D, and S2 is the syntax of C2. */ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5419 re_wchar_t c1, c2; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5420 int s1, s2; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5421 #ifdef emacs |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5422 int offset = PTR_TO_OFFSET (d - 1); |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5423 int charpos = SYNTAX_TABLE_BYTE_TO_CHAR (offset); |
20633
063756386696
(re_search_2): Fix call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20455
diff
changeset
|
5424 UPDATE_SYNTAX_TABLE (charpos); |
18262 | 5425 #endif |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
5426 GET_CHAR_BEFORE_2 (c1, d, string1, end1, string2, end2); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5427 s1 = SYNTAX (c1); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5428 #ifdef emacs |
20633
063756386696
(re_search_2): Fix call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20455
diff
changeset
|
5429 UPDATE_SYNTAX_TABLE_FORWARD (charpos + 1); |
18262 | 5430 #endif |
29296
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
5431 PREFETCH_NOLIMIT (); |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5432 c2 = RE_STRING_CHAR (d, dend - d); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5433 s2 = SYNTAX (c2); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5434 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5435 if (/* Case 2: Only one of S1 and S2 is Sword. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5436 ((s1 == Sword) != (s2 == Sword)) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5437 /* Case 3: Both of S1 and S2 are Sword, and macro |
18262 | 5438 WORD_BOUNDARY_P (C1, C2) returns nonzero. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5439 || ((s1 == Sword) && WORD_BOUNDARY_P (c1, c2))) |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
5440 not = !not; |
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
5441 } |
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
5442 if (not) |
13722
e2669b8a46e2
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
13565
diff
changeset
|
5443 break; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5444 else |
13722
e2669b8a46e2
(AT_WORD_BOUNDARY): Disable macro.
Karl Heuer <kwzh@gnu.org>
parents:
13565
diff
changeset
|
5445 goto fail; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5446 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5447 case wordbeg: |
18262 | 5448 DEBUG_PRINT1 ("EXECUTING wordbeg.\n"); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5449 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5450 /* We FAIL in one of the following cases: */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5451 |
18262 | 5452 /* Case 1: D is at the end of string. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5453 if (AT_STRINGS_END (d)) |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
5454 goto fail; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5455 else |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5456 { |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5457 /* C1 is the character before D, S1 is the syntax of C1, C2 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5458 is the character at D, and S2 is the syntax of C2. */ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5459 re_wchar_t c1, c2; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5460 int s1, s2; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5461 #ifdef emacs |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5462 int offset = PTR_TO_OFFSET (d); |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5463 int charpos = SYNTAX_TABLE_BYTE_TO_CHAR (offset); |
20650
427fa7757472
(re_match_2_internal): Use SYNTAX_TABLE_BYTE_TO_CHAR.
Richard M. Stallman <rms@gnu.org>
parents:
20633
diff
changeset
|
5464 UPDATE_SYNTAX_TABLE (charpos); |
18262 | 5465 #endif |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
5466 PREFETCH (); |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5467 c2 = RE_STRING_CHAR (d, dend - d); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5468 s2 = SYNTAX (c2); |
18262 | 5469 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5470 /* Case 2: S2 is not Sword. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5471 if (s2 != Sword) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5472 goto fail; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5473 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5474 /* Case 3: D is not at the beginning of string ... */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5475 if (!AT_STRINGS_BEG (d)) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5476 { |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5477 GET_CHAR_BEFORE_2 (c1, d, string1, end1, string2, end2); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5478 #ifdef emacs |
20633
063756386696
(re_search_2): Fix call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20455
diff
changeset
|
5479 UPDATE_SYNTAX_TABLE_BACKWARD (charpos - 1); |
18262 | 5480 #endif |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5481 s1 = SYNTAX (c1); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5482 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5483 /* ... and S1 is Sword, and WORD_BOUNDARY_P (C1, C2) |
18262 | 5484 returns 0. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5485 if ((s1 == Sword) && !WORD_BOUNDARY_P (c1, c2)) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5486 goto fail; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5487 } |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5488 } |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5489 break; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5490 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5491 case wordend: |
18262 | 5492 DEBUG_PRINT1 ("EXECUTING wordend.\n"); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5493 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5494 /* We FAIL in one of the following cases: */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5495 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5496 /* Case 1: D is at the beginning of string. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5497 if (AT_STRINGS_BEG (d)) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5498 goto fail; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5499 else |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5500 { |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5501 /* C1 is the character before D, S1 is the syntax of C1, C2 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5502 is the character at D, and S2 is the syntax of C2. */ |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5503 re_wchar_t c1, c2; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5504 int s1, s2; |
20633
063756386696
(re_search_2): Fix call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20455
diff
changeset
|
5505 #ifdef emacs |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5506 int offset = PTR_TO_OFFSET (d) - 1; |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5507 int charpos = SYNTAX_TABLE_BYTE_TO_CHAR (offset); |
20650
427fa7757472
(re_match_2_internal): Use SYNTAX_TABLE_BYTE_TO_CHAR.
Richard M. Stallman <rms@gnu.org>
parents:
20633
diff
changeset
|
5508 UPDATE_SYNTAX_TABLE (charpos); |
20633
063756386696
(re_search_2): Fix call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20455
diff
changeset
|
5509 #endif |
28163
c314d747a819
(re_match_2): Fix string shortening (to fit `stop') to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28138
diff
changeset
|
5510 GET_CHAR_BEFORE_2 (c1, d, string1, end1, string2, end2); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5511 s1 = SYNTAX (c1); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5512 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5513 /* Case 2: S1 is not Sword. */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5514 if (s1 != Sword) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5515 goto fail; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5516 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5517 /* Case 3: D is not at the end of string ... */ |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5518 if (!AT_STRINGS_END (d)) |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5519 { |
29296
b2c75746a989
(PREFETCH_NOLIMIT): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29194
diff
changeset
|
5520 PREFETCH_NOLIMIT (); |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5521 c2 = RE_STRING_CHAR (d, dend - d); |
20633
063756386696
(re_search_2): Fix call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20455
diff
changeset
|
5522 #ifdef emacs |
063756386696
(re_search_2): Fix call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20455
diff
changeset
|
5523 UPDATE_SYNTAX_TABLE_FORWARD (charpos); |
063756386696
(re_search_2): Fix call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20455
diff
changeset
|
5524 #endif |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5525 s2 = SYNTAX (c2); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5526 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5527 /* ... and S2 is Sword, and WORD_BOUNDARY_P (C1, C2) |
18262 | 5528 returns 0. */ |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5529 if ((s2 == Sword) && !WORD_BOUNDARY_P (c1, c2)) |
18262 | 5530 goto fail; |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5531 } |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5532 } |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5533 break; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5534 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5535 case syntaxspec: |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5536 case notsyntaxspec: |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5537 not = (re_opcode_t) *(p - 1) == notsyntaxspec; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5538 mcnt = *p++; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5539 DEBUG_PRINT3 ("EXECUTING %ssyntaxspec %d.\n", not?"not":"", mcnt); |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5540 PREFETCH (); |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5541 #ifdef emacs |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5542 { |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5543 int offset = PTR_TO_OFFSET (d); |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5544 int pos1 = SYNTAX_TABLE_BYTE_TO_CHAR (offset); |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5545 UPDATE_SYNTAX_TABLE (pos1); |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5546 } |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5547 #endif |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5548 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5549 int len; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5550 re_wchar_t c; |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5551 |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5552 c = RE_STRING_CHAR_AND_LENGTH (d, dend - d, len); |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5553 |
28279
24a23e27dac6
(enum syntaxcode): Provide default for non-Emacs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28268
diff
changeset
|
5554 if ((SYNTAX (c) != (enum syntaxcode) mcnt) ^ not) |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5555 goto fail; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5556 d += len; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5557 } |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5558 break; |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5559 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5560 #ifdef emacs |
18262 | 5561 case before_dot: |
5562 DEBUG_PRINT1 ("EXECUTING before_dot.\n"); | |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
5563 if (PTR_BYTE_POS (d) >= PT_BYTE) |
18262 | 5564 goto fail; |
5565 break; | |
5566 | |
5567 case at_dot: | |
5568 DEBUG_PRINT1 ("EXECUTING at_dot.\n"); | |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
5569 if (PTR_BYTE_POS (d) != PT_BYTE) |
18262 | 5570 goto fail; |
5571 break; | |
5572 | |
5573 case after_dot: | |
5574 DEBUG_PRINT1 ("EXECUTING after_dot.\n"); | |
28138
d2e19a90c9ef
* regex.c: Declare a new type `re_char' used throughout the code for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28062
diff
changeset
|
5575 if (PTR_BYTE_POS (d) <= PT_BYTE) |
18262 | 5576 goto fail; |
5577 break; | |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5578 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5579 case categoryspec: |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5580 case notcategoryspec: |
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5581 not = (re_opcode_t) *(p - 1) == notcategoryspec; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5582 mcnt = *p++; |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5583 DEBUG_PRINT3 ("EXECUTING %scategoryspec %d.\n", not?"not":"", mcnt); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5584 PREFETCH (); |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5585 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5586 int len; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5587 re_wchar_t c; |
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5588 |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5589 c = RE_STRING_CHAR_AND_LENGTH (d, dend - d, len); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5590 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5591 if ((!CHAR_HAS_CATEGORY (c, mcnt)) ^ not) |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5592 goto fail; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5593 d += len; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5594 } |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5595 break; |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5596 |
28261
f955117a1fcd
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28203
diff
changeset
|
5597 #endif /* emacs */ |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5598 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5599 default: |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5600 abort (); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5601 } |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5602 continue; /* Successfully executed one pattern command; keep going. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5603 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5604 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5605 /* We goto here if a matching operation fails. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5606 fail: |
32823
2a7f61d7ae12
(IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on
Andrew Innes <andrewi@gnu.org>
parents:
32805
diff
changeset
|
5607 IMMEDIATE_QUIT_CHECK; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5608 if (!FAIL_STACK_EMPTY ()) |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5609 { |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5610 re_char *str, *pat; |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5611 /* A restart point is known. Restore to that state. */ |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5612 DEBUG_PRINT1 ("\nFAIL:\n"); |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5613 POP_FAILURE_POINT (str, pat); |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5614 switch (SWITCH_ENUM_CAST ((re_opcode_t) *pat++)) |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5615 { |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5616 case on_failure_keep_string_jump: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5617 assert (str == NULL); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5618 goto continue_failure_jump; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5619 |
28342
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5620 case on_failure_jump_nastyloop: |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5621 assert ((re_opcode_t)pat[-2] == no_op); |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5622 PUSH_FAILURE_POINT (pat - 2, str); |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5623 /* Fallthrough */ |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5624 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5625 case on_failure_jump_loop: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5626 case on_failure_jump: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5627 case succeed_n: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5628 d = str; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5629 continue_failure_jump: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5630 EXTRACT_NUMBER_AND_INCR (mcnt, pat); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5631 p = pat + mcnt; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5632 break; |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5633 |
28342
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5634 case no_op: |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5635 /* A special frame used for nastyloops. */ |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5636 goto fail; |
9761cf2351fa
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28279
diff
changeset
|
5637 |
28062
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5638 default: |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5639 abort(); |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5640 } |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5641 |
26edef632c89
This is a big redesign of failure-stack and register handling, prompted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27359
diff
changeset
|
5642 assert (p >= bufp->buffer && p <= pend); |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5643 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5644 if (d >= string1 && d <= end1) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5645 dend = end_match_1; |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5646 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5647 else |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5648 break; /* Matching at this starting point really fails. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5649 } /* for (;;) */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5650 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5651 if (best_regs_set) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5652 goto restore_best_regs; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5653 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5654 FREE_VARIABLES (); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5655 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5656 return -1; /* Failure to match. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5657 } /* re_match_2 */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5658 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5659 /* Subroutine definitions for re_match_2. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5660 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5661 /* Return zero if TRANSLATE[S1] and TRANSLATE[S2] are identical for LEN |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5662 bytes; nonzero otherwise. */ |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5663 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5664 static int |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5665 bcmp_translate (s1, s2, len, translate, multibyte) |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5666 re_char *s1, *s2; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5667 register int len; |
13250
52e053f46f76
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard M. Stallman <rms@gnu.org>
parents:
13100
diff
changeset
|
5668 RE_TRANSLATE_TYPE translate; |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5669 const int multibyte; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5670 { |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5671 register re_char *p1 = s1, *p2 = s2; |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5672 re_char *p1_end = s1 + len; |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5673 re_char *p2_end = s2 + len; |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5674 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
5675 /* FIXME: Checking both p1 and p2 presumes that the two strings might have |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
5676 different lengths, but relying on a single `len' would break this. -sm */ |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
5677 while (p1 < p1_end && p2 < p2_end) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5678 { |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5679 int p1_charlen, p2_charlen; |
32891
56a4ce418f35
More `unsigned char' -> `re_char' changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32823
diff
changeset
|
5680 re_wchar_t p1_ch, p2_ch; |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5681 |
28473
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5682 p1_ch = RE_STRING_CHAR_AND_LENGTH (p1, p1_end - p1, p1_charlen); |
975fe3d8922e
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28380
diff
changeset
|
5683 p2_ch = RE_STRING_CHAR_AND_LENGTH (p2, p2_end - p2, p2_charlen); |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5684 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5685 if (RE_TRANSLATE (translate, p1_ch) |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5686 != RE_TRANSLATE (translate, p2_ch)) |
18614
a9bf61beded5
(TRANSLATE, re_search_2, re_match_2_internal,bcmp_translate):
Richard M. Stallman <rms@gnu.org>
parents:
18532
diff
changeset
|
5687 return 1; |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5688 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5689 p1 += p1_charlen, p2 += p2_charlen; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5690 } |
21348
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5691 |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5692 if (p1 != p1_end || p2 != p2_end) |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5693 return 1; |
64590f10c605
(compile_range): Unused function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20650
diff
changeset
|
5694 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5695 return 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5696 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5697 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5698 /* Entry points for GNU code. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5699 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5700 /* re_compile_pattern is the GNU regular expression compiler: it |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5701 compiles PATTERN (of length SIZE) and puts the result in BUFP. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5702 Returns 0 if the pattern was valid, otherwise an error string. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5703 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5704 Assumes the `allocated' (and perhaps `buffer') and `translate' fields |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5705 are set in BUFP on entry. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5706 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5707 We call regex_compile to do the actual compilation. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5708 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5709 const char * |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5710 re_compile_pattern (pattern, length, bufp) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5711 const char *pattern; |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5712 size_t length; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5713 struct re_pattern_buffer *bufp; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5714 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5715 reg_errcode_t ret; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5716 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5717 /* GNU code is written to assume at least RE_NREGS registers will be set |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5718 (and at least one extra will be -1). */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5719 bufp->regs_allocated = REGS_UNALLOCATED; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5720 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5721 /* And GNU code determines whether or not to get register information |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5722 by passing null for the REGS argument to re_match, etc., not by |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5723 setting no_sub. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5724 bufp->no_sub = 0; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5725 |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
5726 ret = regex_compile ((re_char*) pattern, length, re_syntax_options, bufp); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5727 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5728 if (!ret) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5729 return NULL; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5730 return gettext (re_error_msgid[(int) ret]); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5731 } |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5732 WEAK_ALIAS (__re_compile_pattern, re_compile_pattern) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5733 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5734 /* Entry points compatible with 4.2 BSD regex library. We don't define |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5735 them unless specifically requested. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5736 |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5737 #if defined _REGEX_RE_COMP || defined _LIBC |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5738 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5739 /* BSD has one and only one pattern buffer. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5740 static struct re_pattern_buffer re_comp_buf; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5741 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5742 char * |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5743 # ifdef _LIBC |
15635
89f7ba4ccd22
[_LIBC] (re_comp, re_exec): Use `weak_function' keyword in defn instead of
Roland McGrath <roland@gnu.org>
parents:
15516
diff
changeset
|
5744 /* Make these definitions weak in libc, so POSIX programs can redefine |
89f7ba4ccd22
[_LIBC] (re_comp, re_exec): Use `weak_function' keyword in defn instead of
Roland McGrath <roland@gnu.org>
parents:
15516
diff
changeset
|
5745 these names if they don't use our functions, and still use |
89f7ba4ccd22
[_LIBC] (re_comp, re_exec): Use `weak_function' keyword in defn instead of
Roland McGrath <roland@gnu.org>
parents:
15516
diff
changeset
|
5746 regcomp/regexec below without link errors. */ |
89f7ba4ccd22
[_LIBC] (re_comp, re_exec): Use `weak_function' keyword in defn instead of
Roland McGrath <roland@gnu.org>
parents:
15516
diff
changeset
|
5747 weak_function |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5748 # endif |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5749 re_comp (s) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5750 const char *s; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5751 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5752 reg_errcode_t ret; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5753 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5754 if (!s) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5755 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5756 if (!re_comp_buf.buffer) |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5757 /* Yes, we're discarding `const' here if !HAVE_LIBINTL. */ |
29801
3ea64112b4ba
(re_match, re_match_2): Protect calls to alloca (0).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29546
diff
changeset
|
5758 return (char *) gettext ("No previous regular expression"); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5759 return 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5760 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5761 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5762 if (!re_comp_buf.buffer) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5763 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5764 re_comp_buf.buffer = (unsigned char *) malloc (200); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5765 if (re_comp_buf.buffer == NULL) |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5766 /* Yes, we're discarding `const' here if !HAVE_LIBINTL. */ |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5767 return (char *) gettext (re_error_msgid[(int) REG_ESPACE]); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5768 re_comp_buf.allocated = 200; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5769 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5770 re_comp_buf.fastmap = (char *) malloc (1 << BYTEWIDTH); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5771 if (re_comp_buf.fastmap == NULL) |
29801
3ea64112b4ba
(re_match, re_match_2): Protect calls to alloca (0).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29546
diff
changeset
|
5772 /* Yes, we're discarding `const' here if !HAVE_LIBINTL. */ |
3ea64112b4ba
(re_match, re_match_2): Protect calls to alloca (0).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29546
diff
changeset
|
5773 return (char *) gettext (re_error_msgid[(int) REG_ESPACE]); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5774 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5775 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5776 /* Since `re_exec' always passes NULL for the `regs' argument, we |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5777 don't need to initialize the pattern buffer fields which affect it. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5778 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5779 ret = regex_compile (s, strlen (s), re_syntax_options, &re_comp_buf); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5780 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5781 if (!ret) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5782 return NULL; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5783 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5784 /* Yes, we're discarding `const' here if !HAVE_LIBINTL. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5785 return (char *) gettext (re_error_msgid[(int) ret]); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5786 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5787 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5788 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5789 int |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5790 # ifdef _LIBC |
15635
89f7ba4ccd22
[_LIBC] (re_comp, re_exec): Use `weak_function' keyword in defn instead of
Roland McGrath <roland@gnu.org>
parents:
15516
diff
changeset
|
5791 weak_function |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5792 # endif |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5793 re_exec (s) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5794 const char *s; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5795 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5796 const int len = strlen (s); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5797 return |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5798 0 <= re_search (&re_comp_buf, s, len, 0, len, (struct re_registers *) 0); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5799 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5800 #endif /* _REGEX_RE_COMP */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5801 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5802 /* POSIX.2 functions. Don't define these for Emacs. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5803 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5804 #ifndef emacs |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5805 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5806 /* regcomp takes a regular expression as a string and compiles it. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5807 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5808 PREG is a regex_t *. We do not expect any fields to be initialized, |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5809 since POSIX says we shouldn't. Thus, we set |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5810 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5811 `buffer' to the compiled pattern; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5812 `used' to the length of the compiled pattern; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5813 `syntax' to RE_SYNTAX_POSIX_EXTENDED if the |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5814 REG_EXTENDED bit in CFLAGS is set; otherwise, to |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5815 RE_SYNTAX_POSIX_BASIC; |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5816 `fastmap' to an allocated space for the fastmap; |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5817 `fastmap_accurate' to zero; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5818 `re_nsub' to the number of subexpressions in PATTERN. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5819 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5820 PATTERN is the address of the pattern string. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5821 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5822 CFLAGS is a series of bits which affect compilation. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5823 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5824 If REG_EXTENDED is set, we use POSIX extended syntax; otherwise, we |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5825 use POSIX basic syntax. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5826 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5827 If REG_NEWLINE is set, then . and [^...] don't match newline. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5828 Also, regexec will try a match beginning after every newline. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5829 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5830 If REG_ICASE is set, then we considers upper- and lowercase |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5831 versions of letters to be equivalent when matching. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5832 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5833 If REG_NOSUB is set, then when PREG is passed to regexec, that |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5834 routine will report only success or failure, and nothing about the |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5835 registers. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5836 |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5837 It returns 0 if it succeeds, nonzero if it doesn't. (See regex.h for |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5838 the return codes and their meanings.) */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5839 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5840 int |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5841 regcomp (preg, pattern, cflags) |
40650
ded4aa3c81b2
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39718
diff
changeset
|
5842 regex_t *__restrict preg; |
ded4aa3c81b2
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39718
diff
changeset
|
5843 const char *__restrict pattern; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5844 int cflags; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5845 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5846 reg_errcode_t ret; |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
5847 reg_syntax_t syntax |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5848 = (cflags & REG_EXTENDED) ? |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5849 RE_SYNTAX_POSIX_EXTENDED : RE_SYNTAX_POSIX_BASIC; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5850 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5851 /* regex_compile will allocate the space for the compiled pattern. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5852 preg->buffer = 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5853 preg->allocated = 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5854 preg->used = 0; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5855 |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5856 /* Try to allocate space for the fastmap. */ |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5857 preg->fastmap = (char *) malloc (1 << BYTEWIDTH); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5858 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5859 if (cflags & REG_ICASE) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5860 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5861 unsigned i; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5862 |
13250
52e053f46f76
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard M. Stallman <rms@gnu.org>
parents:
13100
diff
changeset
|
5863 preg->translate |
52e053f46f76
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard M. Stallman <rms@gnu.org>
parents:
13100
diff
changeset
|
5864 = (RE_TRANSLATE_TYPE) malloc (CHAR_SET_SIZE |
52e053f46f76
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Richard M. Stallman <rms@gnu.org>
parents:
13100
diff
changeset
|
5865 * sizeof (*(RE_TRANSLATE_TYPE)0)); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5866 if (preg->translate == NULL) |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5867 return (int) REG_ESPACE; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5868 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5869 /* Map uppercase characters to corresponding lowercase ones. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5870 for (i = 0; i < CHAR_SET_SIZE; i++) |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
5871 preg->translate[i] = ISUPPER (i) ? TOLOWER (i) : i; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5872 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5873 else |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5874 preg->translate = NULL; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5875 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5876 /* If REG_NEWLINE is set, newlines are treated differently. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5877 if (cflags & REG_NEWLINE) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5878 { /* REG_NEWLINE implies neither . nor [^...] match newline. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5879 syntax &= ~RE_DOT_NEWLINE; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5880 syntax |= RE_HAT_LISTS_NOT_NEWLINE; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5881 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5882 else |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5883 syntax |= RE_NO_NEWLINE_ANCHOR; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5884 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5885 preg->no_sub = !!(cflags & REG_NOSUB); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5886 |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5887 /* POSIX says a null character in the pattern terminates it, so we |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5888 can use strlen here in compiling the pattern. */ |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
5889 ret = regex_compile ((re_char*) pattern, strlen (pattern), syntax, preg); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5890 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5891 /* POSIX doesn't distinguish between an unmatched open-group and an |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5892 unmatched close-group: both are REG_EPAREN. */ |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5893 if (ret == REG_ERPAREN) |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5894 ret = REG_EPAREN; |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5895 |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5896 if (ret == REG_NOERROR && preg->fastmap) |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5897 { /* Compute the fastmap now, since regexec cannot modify the pattern |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5898 buffer. */ |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5899 re_compile_fastmap (preg); |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5900 if (preg->can_be_null) |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5901 { /* The fastmap can't be used anyway. */ |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5902 free (preg->fastmap); |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5903 preg->fastmap = NULL; |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5904 } |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5905 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5906 return (int) ret; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5907 } |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5908 WEAK_ALIAS (__regcomp, regcomp) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5909 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5910 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5911 /* regexec searches for a given pattern, specified by PREG, in the |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5912 string STRING. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5913 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5914 If NMATCH is zero or REG_NOSUB was set in the cflags argument to |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5915 `regcomp', we ignore PMATCH. Otherwise, we assume PMATCH has at |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5916 least NMATCH elements, and we set them to the offsets of the |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5917 corresponding matched substrings. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5918 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5919 EFLAGS specifies `execution flags' which affect matching: if |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5920 REG_NOTBOL is set, then ^ does not match at the beginning of the |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5921 string; if REG_NOTEOL is set, then $ does not match at the end. |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5922 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5923 We return 0 if we find a match and REG_NOMATCH if not. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5924 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5925 int |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5926 regexec (preg, string, nmatch, pmatch, eflags) |
40650
ded4aa3c81b2
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39718
diff
changeset
|
5927 const regex_t *__restrict preg; |
ded4aa3c81b2
(re_wctype): Try to fix some warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39718
diff
changeset
|
5928 const char *__restrict string; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5929 size_t nmatch; |
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5930 regmatch_t pmatch[]; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5931 int eflags; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5932 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5933 int ret; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5934 struct re_registers regs; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5935 regex_t private_preg; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5936 int len = strlen (string); |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5937 boolean want_reg_info = !preg->no_sub && nmatch > 0 && pmatch; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5938 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5939 private_preg = *preg; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5940 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5941 private_preg.not_bol = !!(eflags & REG_NOTBOL); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5942 private_preg.not_eol = !!(eflags & REG_NOTEOL); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5943 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5944 /* The user has told us exactly how many registers to return |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5945 information about, via `nmatch'. We have to pass that on to the |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5946 matching routines. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5947 private_preg.regs_allocated = REGS_FIXED; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5948 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5949 if (want_reg_info) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5950 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5951 regs.num_regs = nmatch; |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
5952 regs.start = TALLOC (nmatch * 2, regoff_t); |
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
5953 if (regs.start == NULL) |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5954 return (int) REG_NOMATCH; |
31299
34c25566aab3
Merge some changes from GNU libc. Add prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31213
diff
changeset
|
5955 regs.end = regs.start + nmatch; |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5956 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5957 |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5958 /* Instead of using not_eol to implement REG_NOTEOL, we could simply |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5959 pass (&private_preg, string, len + 1, 0, len, ...) pretending the string |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5960 was a little bit longer but still only matching the real part. |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5961 This works because the `endline' will check for a '\n' and will find a |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5962 '\0', correctly deciding that this is not the end of a line. |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5963 But it doesn't work out so nicely for REG_NOTBOL, since we don't have |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5964 a convenient '\0' there. For all we know, the string could be preceded |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5965 by '\n' which would throw things off. */ |
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5966 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5967 /* Perform the searching operation. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5968 ret = re_search (&private_preg, string, len, |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5969 /* start: */ 0, /* range: */ len, |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5970 want_reg_info ? ®s : (struct re_registers *) 0); |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
5971 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5972 /* Copy the register information to the POSIX structure. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5973 if (want_reg_info) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5974 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5975 if (ret >= 0) |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5976 { |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5977 unsigned r; |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5978 |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5979 for (r = 0; r < nmatch; r++) |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5980 { |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5981 pmatch[r].rm_so = regs.start[r]; |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5982 pmatch[r].rm_eo = regs.end[r]; |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5983 } |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
5984 } |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5985 |
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
5986 /* If we needed the temporary register info, free the space now. */ |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5987 free (regs.start); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5988 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5989 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5990 /* We want zero return to mean success, unlike `re_search'. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5991 return ret >= 0 ? (int) REG_NOERROR : (int) REG_NOMATCH; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5992 } |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
5993 WEAK_ALIAS (__regexec, regexec) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5994 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5995 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5996 /* Returns a message corresponding to an error code, ERRCODE, returned |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5997 from either regcomp or regexec. We don't use PREG here. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5998 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
5999 size_t |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6000 regerror (errcode, preg, errbuf, errbuf_size) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6001 int errcode; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6002 const regex_t *preg; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6003 char *errbuf; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6004 size_t errbuf_size; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6005 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6006 const char *msg; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6007 size_t msg_size; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6008 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6009 if (errcode < 0 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6010 || errcode >= (sizeof (re_error_msgid) / sizeof (re_error_msgid[0]))) |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6011 /* Only error codes returned by the rest of the code should be passed |
18260
a642c99198ec
(PTR_TO_OFFSET): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
16537
diff
changeset
|
6012 to this routine. If we are given anything else, or if other regex |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6013 code generates an invalid error code, then the program has a bug. |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6014 Dump core so we can fix it. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6015 abort (); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6016 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6017 msg = gettext (re_error_msgid[errcode]); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6018 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6019 msg_size = strlen (msg) + 1; /* Includes the null. */ |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6020 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6021 if (errbuf_size != 0) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6022 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6023 if (msg_size > errbuf_size) |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
6024 { |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
6025 strncpy (errbuf, msg, errbuf_size - 1); |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
6026 errbuf[errbuf_size - 1] = 0; |
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
6027 } |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6028 else |
31213
9efb8adfefa4
* regex.c: Indent cpp directives and remove parens after `defined'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31172
diff
changeset
|
6029 strcpy (errbuf, msg); |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6030 } |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6031 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6032 return msg_size; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6033 } |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
6034 WEAK_ALIAS (__regerror, regerror) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6035 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6036 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6037 /* Free dynamically allocated space used by PREG. */ |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6038 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6039 void |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6040 regfree (preg) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6041 regex_t *preg; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6042 { |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6043 if (preg->buffer != NULL) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6044 free (preg->buffer); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6045 preg->buffer = NULL; |
13565
c66885b6330c
(gettext_noop): New macro, identity fn.
Roland McGrath <roland@gnu.org>
parents:
13517
diff
changeset
|
6046 |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6047 preg->allocated = 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6048 preg->used = 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6049 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6050 if (preg->fastmap != NULL) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6051 free (preg->fastmap); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6052 preg->fastmap = NULL; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6053 preg->fastmap_accurate = 0; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6054 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6055 if (preg->translate != NULL) |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6056 free (preg->translate); |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6057 preg->translate = NULL; |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6058 } |
31312
e6b19a60e035
* regex.h (RE_NO_NEWLINE_ANCHOR): New syntax flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31299
diff
changeset
|
6059 WEAK_ALIAS (__regfree, regfree) |
11864
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6060 |
620c7195b48f
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
Roland McGrath <roland@gnu.org>
parents:
11843
diff
changeset
|
6061 #endif /* not emacs */ |